Sweetgum/sweetgum-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename and clean up MapleCharacter

Browse Source
This commit is contained in:
P0nk
2021-09-09 21:09:45 +02:00
parent 46bd0570d7
commit 7dc3a2159a
379 changed files with 3418 additions and 3373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/net/server/guild/GuildPackets.java
View File

@@ -1,6 +1,6 @@
package net.server.guild;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import net.opcodes.SendOpcode;
import net.packet.OutPacket;
@@ -16,7 +16,7 @@ import java.util.Collection;
import java.util.List;
public class GuildPackets {
public static Packet showGuildInfo(MapleCharacter chr) {
public static Packet showGuildInfo(Character chr) {
OutPacket p = OutPacket.create(SendOpcode.GUILD_OPERATION);
p.writeByte(0x1A); //signature for showing guild info
if (chr == null) { //show empty guild (used for leaving, expelled)
@@ -432,7 +432,7 @@ public class GuildPackets {
return p;
}
public static Packet allianceMemberOnline(MapleCharacter mc, boolean online) {
public static Packet allianceMemberOnline(Character mc, boolean online) {
OutPacket p = OutPacket.create(SendOpcode.ALLIANCE_OPERATION);
p.writeByte(0x0E);
p.writeInt(mc.getGuild().getAllianceId());
@@ -460,7 +460,7 @@ public class GuildPackets {
return p;
}
public static Packet updateAllianceJobLevel(MapleCharacter mc) {
public static Packet updateAllianceJobLevel(Character mc) {
OutPacket p = OutPacket.create(SendOpcode.ALLIANCE_OPERATION);
p.writeByte(0x18);
p.writeInt(mc.getGuild().getAllianceId());
@@ -498,7 +498,7 @@ public class GuildPackets {
return p;
}
public static Packet allianceInvite(int allianceid, MapleCharacter chr) {
public static Packet allianceInvite(int allianceid, Character chr) {
OutPacket p = OutPacket.create(SendOpcode.ALLIANCE_OPERATION);
p.writeByte(0x03);
p.writeInt(allianceid);

24
src/main/java/net/server/guild/MapleAlliance.java
View File

@@ -21,7 +21,7 @@
*/
package net.server.guild;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import net.packet.Packet;
import net.server.Server;
@@ -83,13 +83,13 @@ public class MapleAlliance {
}
}
private static List<MapleCharacter> getPartyGuildMasters(MapleParty party) {
List<MapleCharacter> mcl = new LinkedList<>();
private static List<Character> getPartyGuildMasters(MapleParty party) {
List<Character> mcl = new LinkedList<>();
for (MaplePartyCharacter mpc : party.getMembers()) {
MapleCharacter chr = mpc.getPlayer();
Character chr = mpc.getPlayer();
if (chr != null) {
MapleCharacter lchr = party.getLeader().getPlayer();
Character lchr = party.getLeader().getPlayer();
if (chr.getGuildRank() == 1 && lchr != null && chr.getMapId() == lchr.getMapId()) {
mcl.add(chr);
}
@@ -99,7 +99,7 @@ public class MapleAlliance {
if (!mcl.isEmpty() && !mcl.get(0).isPartyLeader()) {
for (int i = 1; i < mcl.size(); i++) {
if (mcl.get(i).isPartyLeader()) {
MapleCharacter temp = mcl.get(0);
Character temp = mcl.get(0);
mcl.set(0, mcl.get(i));
mcl.set(i, temp);
}
@@ -110,13 +110,13 @@ public class MapleAlliance {
}
public static MapleAlliance createAlliance(MapleParty party, String name) {
List<MapleCharacter> guildMasters = getPartyGuildMasters(party);
List<Character> guildMasters = getPartyGuildMasters(party);
if (guildMasters.size() != 2) {
return null;
}
List<Integer> guilds = new LinkedList<>();
for (MapleCharacter mc : guildMasters) {
for (Character mc : guildMasters) {
guilds.add(mc.getGuildId());
}
MapleAlliance alliance = MapleAlliance.createAllianceOnDb(guilds, name);
@@ -132,7 +132,7 @@ public class MapleAlliance {
Server.getInstance().setGuildAllianceId(guilds.get(i), id);
Server.getInstance().resetAllianceGuildPlayersRank(guilds.get(i));
MapleCharacter chr = guildMasters.get(i);
Character chr = guildMasters.get(i);
chr.getMGC().setAllianceRank((i == 0) ? 1 : 2);
Server.getInstance().getGuild(chr.getGuildId()).getMGC(chr.getId()).setAllianceRank((i == 0) ? 1 : 2);
chr.saveGuildStatus();
@@ -310,7 +310,7 @@ public class MapleAlliance {
return true;
}
public void updateAlliancePackets(MapleCharacter chr) {
public void updateAlliancePackets(Character chr) {
if (allianceId > 0) {
this.broadcastMessage(GuildPackets.updateAllianceInfo(this, chr.getWorld()));
this.broadcastMessage(GuildPackets.allianceNotice(this.getId(), this.getNotice()));
@@ -443,7 +443,7 @@ public class MapleAlliance {
if (mg.getAllianceId() > 0) {
c.getPlayer().dropMessage(5, "The entered guild is already registered on a guild alliance.");
} else {
MapleCharacter victim = mg.getMGC(mg.getLeaderId()).getCharacter();
Character victim = mg.getMGC(mg.getLeaderId()).getCharacter();
if (victim == null) {
c.getPlayer().dropMessage(5, "The master of the guild that you offered an invitation is currently not online.");
} else {
@@ -461,7 +461,7 @@ public class MapleAlliance {
MapleInviteResult res = MapleInviteCoordinator.answerInvite(InviteType.ALLIANCE, targetId, allianceId, answer);
String msg;
MapleCharacter sender = res.from;
Character sender = res.from;
switch (res.result) {
case ACCEPTED:
return true;

22
src/main/java/net/server/guild/MapleGuild.java
View File

@@ -21,7 +21,7 @@
*/
package net.server.guild;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import config.YamlConfig;
import net.packet.Packet;
@@ -275,7 +275,7 @@ public class MapleGuild {
PlayerStorage ps = Server.getInstance().getWorld(world).getPlayerStorage();
for (MapleGuildCharacter mgc : getMembers()) {
MapleCharacter chr = ps.getCharacterById(mgc.getId());
Character chr = ps.getCharacterById(mgc.getId());
if (chr == null || !chr.isLoggedinWorld()) {
continue;
}
@@ -289,7 +289,7 @@ public class MapleGuild {
PlayerStorage ps = Server.getInstance().getWorld(world).getPlayerStorage();
for (MapleGuildCharacter mgc : getMembers()) {
MapleCharacter chr = ps.getCharacterById(mgc.getId());
Character chr = ps.getCharacterById(mgc.getId());
if (chr == null || !chr.isLoggedinWorld()) {
continue;
}
@@ -303,7 +303,7 @@ public class MapleGuild {
PlayerStorage ps = Server.getInstance().getWorld(world).getPlayerStorage();
for (MapleGuildCharacter mgc : getMembers()) {
MapleCharacter chr = ps.getCharacterById(mgc.getId());
Character chr = ps.getCharacterById(mgc.getId());
if (chr == null || !chr.isLoggedinWorld()) {
continue;
}
@@ -464,7 +464,7 @@ public class MapleGuild {
}
}
public int addGuildMember(MapleGuildCharacter mgc, MapleCharacter chr) {
public int addGuildMember(MapleGuildCharacter mgc, Character chr) {
membersLock.lock();
try {
if (members.size() >= capacity) {
@@ -708,7 +708,7 @@ public class MapleGuild {
}
public static MapleGuildResponse sendInvitation(MapleClient c, String targetName) {
MapleCharacter mc = c.getChannelServer().getPlayerStorage().getCharacterByName(targetName);
Character mc = c.getChannelServer().getPlayerStorage().getCharacterByName(targetName);
if (mc == null) {
return MapleGuildResponse.NOT_IN_CHANNEL;
}
@@ -716,7 +716,7 @@ public class MapleGuild {
return MapleGuildResponse.ALREADY_IN_GUILD;
}
MapleCharacter sender = c.getPlayer();
Character sender = c.getPlayer();
if (MapleInviteCoordinator.createInvite(InviteType.GUILD, sender, sender.getGuildId(), mc.getId())) {
mc.sendPacket(GuildPackets.guildInvite(sender.getGuildId(), sender.getName()));
return null;
@@ -729,7 +729,7 @@ public class MapleGuild {
MapleInviteResult res = MapleInviteCoordinator.answerInvite(InviteType.GUILD, targetId, guildId, answer);
MapleGuildResponse mgr;
MapleCharacter sender = res.from;
Character sender = res.from;
switch (res.result) {
case ACCEPTED:
return true;
@@ -748,12 +748,12 @@ public class MapleGuild {
return false;
}
public static Set<MapleCharacter> getEligiblePlayersForGuild(MapleCharacter guildLeader) {
Set<MapleCharacter> guildMembers = new HashSet<>();
public static Set<Character> getEligiblePlayersForGuild(Character guildLeader) {
Set<Character> guildMembers = new HashSet<>();
guildMembers.add(guildLeader);
MapleMatchCheckerCoordinator mmce = guildLeader.getWorldServer().getMatchCheckerCoordinator();
for (MapleCharacter chr : guildLeader.getMap().getAllPlayers()) {
for (Character chr : guildLeader.getMap().getAllPlayers()) {
if (chr.getParty() == null && chr.getGuild() == null && mmce.getMatchConfirmationLeaderid(chr.getId()) == -1) {
guildMembers.add(chr);
}

12
src/main/java/net/server/guild/MapleGuildCharacter.java
View File

@@ -21,10 +21,10 @@
*/
package net.server.guild;
import client.MapleCharacter;
import client.Character;
public class MapleGuildCharacter {
private MapleCharacter character;
private Character character;
private int level;
private int id;
private int world, channel;
@@ -35,7 +35,7 @@ public class MapleGuildCharacter {
private boolean online;
private String name;
public MapleGuildCharacter(MapleCharacter chr) {
public MapleGuildCharacter(Character chr) {
this.character = chr;
this.name = chr.getName();
this.level = chr.getLevel();
@@ -49,7 +49,7 @@ public class MapleGuildCharacter {
this.allianceRank = chr.getAllianceRank();
}
public MapleGuildCharacter(MapleCharacter chr, int _id, int _lv, String _name, int _channel, int _world, int _job, int _rank, int _gid, boolean _on, int _allianceRank) {
public MapleGuildCharacter(Character chr, int _id, int _lv, String _name, int _channel, int _world, int _job, int _rank, int _gid, boolean _on, int _allianceRank) {
this.character = chr;
this.level = _lv;
this.id = _id;
@@ -65,11 +65,11 @@ public class MapleGuildCharacter {
this.allianceRank = _allianceRank;
}
public void setCharacter(MapleCharacter ch) {
public void setCharacter(Character ch) {
this.character = ch;
}
public MapleCharacter getCharacter() {
public Character getCharacter() {
return character;
}