diff --git a/src/main/java/net/server/channel/handlers/AcceptFamilyHandler.java b/src/main/java/net/server/channel/handlers/AcceptFamilyHandler.java index fa76504e89..ee67d1d76e 100644 --- a/src/main/java/net/server/channel/handlers/AcceptFamilyHandler.java +++ b/src/main/java/net/server/channel/handlers/AcceptFamilyHandler.java @@ -30,8 +30,8 @@ import net.AbstractPacketHandler; import net.packet.InPacket; import net.server.coordinator.world.InviteCoordinator; import net.server.coordinator.world.InviteCoordinator.InviteResult; +import net.server.coordinator.world.InviteCoordinator.InviteResultType; import net.server.coordinator.world.InviteCoordinator.InviteType; -import net.server.coordinator.world.InviteCoordinator.MapleInviteResult; import tools.DatabaseConnection; import tools.FilePrinter; import tools.PacketCreator; @@ -59,8 +59,8 @@ public final class AcceptFamilyHandler extends AbstractPacketHandler { // String inviterName = slea.readMapleAsciiString(); Character inviter = c.getWorldServer().getPlayerStorage().getCharacterById(inviterId); if(inviter != null) { - MapleInviteResult inviteResult = InviteCoordinator.answerInvite(InviteType.FAMILY, c.getPlayer().getId(), c.getPlayer(), accept); - if(inviteResult.result == InviteResult.NOT_FOUND) return; //was never invited. (or expired on server only somehow?) + InviteResult inviteResult = InviteCoordinator.answerInvite(InviteType.FAMILY, c.getPlayer().getId(), c.getPlayer(), accept); + if(inviteResult.result == InviteResultType.NOT_FOUND) return; //was never invited. (or expired on server only somehow?) if(accept) { if(inviter.getFamily() != null) { if(chr.getFamily() == null) { diff --git a/src/main/java/net/server/channel/handlers/DenyPartyRequestHandler.java b/src/main/java/net/server/channel/handlers/DenyPartyRequestHandler.java index 7214b724b4..dfceba6e05 100644 --- a/src/main/java/net/server/channel/handlers/DenyPartyRequestHandler.java +++ b/src/main/java/net/server/channel/handlers/DenyPartyRequestHandler.java @@ -26,7 +26,7 @@ import client.Client; import net.AbstractPacketHandler; import net.packet.InPacket; import net.server.coordinator.world.InviteCoordinator; -import net.server.coordinator.world.InviteCoordinator.InviteResult; +import net.server.coordinator.world.InviteCoordinator.InviteResultType; import net.server.coordinator.world.InviteCoordinator.InviteType; import tools.PacketCreator; @@ -41,7 +41,7 @@ public final class DenyPartyRequestHandler extends AbstractPacketHandler { if (cfrom != null) { Character chr = c.getPlayer(); - if (InviteCoordinator.answerInvite(InviteType.PARTY, chr.getId(), cfrom.getPartyId(), false).result == InviteResult.DENIED) { + if (InviteCoordinator.answerInvite(InviteType.PARTY, chr.getId(), cfrom.getPartyId(), false).result == InviteResultType.DENIED) { chr.updatePartySearchAvailability(chr.getParty() == null); cfrom.sendPacket(PacketCreator.partyStatusMessage(23, chr.getName())); } diff --git a/src/main/java/net/server/channel/handlers/FamilySummonResponseHandler.java b/src/main/java/net/server/channel/handlers/FamilySummonResponseHandler.java index e0d4f738d9..d9a14d91e1 100644 --- a/src/main/java/net/server/channel/handlers/FamilySummonResponseHandler.java +++ b/src/main/java/net/server/channel/handlers/FamilySummonResponseHandler.java @@ -9,8 +9,8 @@ import net.AbstractPacketHandler; import net.packet.InPacket; import net.server.coordinator.world.InviteCoordinator; import net.server.coordinator.world.InviteCoordinator.InviteResult; +import net.server.coordinator.world.InviteCoordinator.InviteResultType; import net.server.coordinator.world.InviteCoordinator.InviteType; -import net.server.coordinator.world.InviteCoordinator.MapleInviteResult; import server.maps.MapleMap; import tools.PacketCreator; @@ -21,8 +21,8 @@ public class FamilySummonResponseHandler extends AbstractPacketHandler { if(!YamlConfig.config.server.USE_FAMILY_SYSTEM) return; p.readString(); //family name boolean accept = p.readByte() != 0; - MapleInviteResult inviteResult = InviteCoordinator.answerInvite(InviteType.FAMILY_SUMMON, c.getPlayer().getId(), c.getPlayer(), accept); - if(inviteResult.result == InviteResult.NOT_FOUND) return; + InviteResult inviteResult = InviteCoordinator.answerInvite(InviteType.FAMILY_SUMMON, c.getPlayer().getId(), c.getPlayer(), accept); + if(inviteResult.result == InviteResultType.NOT_FOUND) return; Character inviter = inviteResult.from; FamilyEntry inviterEntry = inviter.getFamilyEntry(); if(inviterEntry == null) return; diff --git a/src/main/java/net/server/channel/handlers/MessengerHandler.java b/src/main/java/net/server/channel/handlers/MessengerHandler.java index 9d2f940130..241ad3ced9 100644 --- a/src/main/java/net/server/channel/handlers/MessengerHandler.java +++ b/src/main/java/net/server/channel/handlers/MessengerHandler.java @@ -27,8 +27,8 @@ import net.AbstractPacketHandler; import net.packet.InPacket; import net.server.coordinator.world.InviteCoordinator; import net.server.coordinator.world.InviteCoordinator.InviteResult; +import net.server.coordinator.world.InviteCoordinator.InviteResultType; import net.server.coordinator.world.InviteCoordinator.InviteType; -import net.server.coordinator.world.InviteCoordinator.MapleInviteResult; import net.server.world.Messenger; import net.server.world.MessengerCharacter; import net.server.world.World; @@ -58,9 +58,9 @@ public final class MessengerHandler extends AbstractPacketHandler { } else { messenger = world.getMessenger(messengerid); if (messenger != null) { - MapleInviteResult inviteRes = InviteCoordinator.answerInvite(InviteType.MESSENGER, player.getId(), messengerid, true); - InviteResult res = inviteRes.result; - if (res == InviteResult.ACCEPTED) { + InviteResult inviteRes = InviteCoordinator.answerInvite(InviteType.MESSENGER, player.getId(), messengerid, true); + InviteResultType res = inviteRes.result; + if (res == InviteResultType.ACCEPTED) { int position = messenger.getLowestPosition(); MessengerCharacter messengerplayer = new MessengerCharacter(player, position); if (messenger.getMembers().size() < 3) { diff --git a/src/main/java/net/server/channel/handlers/PartyOperationHandler.java b/src/main/java/net/server/channel/handlers/PartyOperationHandler.java index a2690d2801..6923ea3949 100644 --- a/src/main/java/net/server/channel/handlers/PartyOperationHandler.java +++ b/src/main/java/net/server/channel/handlers/PartyOperationHandler.java @@ -28,8 +28,8 @@ import net.AbstractPacketHandler; import net.packet.InPacket; import net.server.coordinator.world.InviteCoordinator; import net.server.coordinator.world.InviteCoordinator.InviteResult; +import net.server.coordinator.world.InviteCoordinator.InviteResultType; import net.server.coordinator.world.InviteCoordinator.InviteType; -import net.server.coordinator.world.InviteCoordinator.MapleInviteResult; import net.server.world.Party; import net.server.world.PartyCharacter; import net.server.world.PartyOperation; @@ -64,9 +64,9 @@ public final class PartyOperationHandler extends AbstractPacketHandler { case 3: { // join int partyid = p.readInt(); - MapleInviteResult inviteRes = InviteCoordinator.answerInvite(InviteType.PARTY, player.getId(), partyid, true); - InviteResult res = inviteRes.result; - if (res == InviteResult.ACCEPTED) { + InviteResult inviteRes = InviteCoordinator.answerInvite(InviteType.PARTY, player.getId(), partyid, true); + InviteResultType res = inviteRes.result; + if (res == InviteResultType.ACCEPTED) { Party.joinParty(player, partyid, false); } else { c.sendPacket(PacketCreator.serverNotice(5, "You couldn't join the party due to an expired invitation request.")); diff --git a/src/main/java/net/server/coordinator/world/InviteCoordinator.java b/src/main/java/net/server/coordinator/world/InviteCoordinator.java index 7803b98e10..b682e1e294 100644 --- a/src/main/java/net/server/coordinator/world/InviteCoordinator.java +++ b/src/main/java/net/server/coordinator/world/InviteCoordinator.java @@ -33,7 +33,7 @@ import java.util.concurrent.ConcurrentHashMap; */ public class InviteCoordinator { - public enum InviteResult { + public enum InviteResultType { ACCEPTED, DENIED, NOT_FOUND @@ -103,11 +103,11 @@ public class InviteCoordinator { return type.hasRequest(targetCid); } - public static MapleInviteResult answerInvite(InviteType type, int targetCid, Object referenceFrom, boolean answer) { + public static InviteResult answerInvite(InviteType type, int targetCid, Object referenceFrom, boolean answer) { Map table = type.getRequestsTable(); Character from = null; - InviteResult result = InviteResult.NOT_FOUND; + InviteResultType result = InviteResultType.NOT_FOUND; Pair inviteInfo = null; Object reference = table.get(targetCid); @@ -118,10 +118,10 @@ public class InviteCoordinator { from = null; } - result = answer ? InviteResult.ACCEPTED : InviteResult.DENIED; + result = answer ? InviteResultType.ACCEPTED : InviteResultType.DENIED; } - return new MapleInviteResult(result, from, inviteInfo != null ? inviteInfo.getRight() : new Object[0]); + return new InviteResult(result, from, inviteInfo != null ? inviteInfo.getRight() : new Object[0]); } public static void removeInvite(InviteType type, int targetCid) { @@ -153,13 +153,13 @@ public class InviteCoordinator { } } - public static class MapleInviteResult { + public static class InviteResult { - public final InviteResult result; + public final InviteResultType result; public final Character from; public final Object[] params; - private MapleInviteResult(InviteResult result, Character from, Object[] params) { + private InviteResult(InviteResultType result, Character from, Object[] params) { this.result = result; this.from = from; this.params = params; diff --git a/src/main/java/net/server/guild/Alliance.java b/src/main/java/net/server/guild/Alliance.java index 9286d1b9d8..e56b58fcb8 100644 --- a/src/main/java/net/server/guild/Alliance.java +++ b/src/main/java/net/server/guild/Alliance.java @@ -26,8 +26,8 @@ import client.Client; import net.packet.Packet; import net.server.Server; import net.server.coordinator.world.InviteCoordinator; +import net.server.coordinator.world.InviteCoordinator.InviteResult; import net.server.coordinator.world.InviteCoordinator.InviteType; -import net.server.coordinator.world.InviteCoordinator.MapleInviteResult; import net.server.world.Party; import net.server.world.PartyCharacter; import tools.DatabaseConnection; @@ -458,7 +458,7 @@ public class Alliance { } public static boolean answerInvitation(int targetId, String targetGuildName, int allianceId, boolean answer) { - MapleInviteResult res = InviteCoordinator.answerInvite(InviteType.ALLIANCE, targetId, allianceId, answer); + InviteResult res = InviteCoordinator.answerInvite(InviteType.ALLIANCE, targetId, allianceId, answer); String msg; Character sender = res.from; diff --git a/src/main/java/net/server/guild/Guild.java b/src/main/java/net/server/guild/Guild.java index 06d0adab7a..703b7674ed 100644 --- a/src/main/java/net/server/guild/Guild.java +++ b/src/main/java/net/server/guild/Guild.java @@ -32,8 +32,8 @@ import net.server.audit.locks.factory.MonitoredReentrantLockFactory; import net.server.channel.Channel; import net.server.coordinator.matchchecker.MatchCheckerCoordinator; import net.server.coordinator.world.InviteCoordinator; +import net.server.coordinator.world.InviteCoordinator.InviteResult; import net.server.coordinator.world.InviteCoordinator.InviteType; -import net.server.coordinator.world.InviteCoordinator.MapleInviteResult; import tools.DatabaseConnection; import tools.PacketCreator; @@ -726,7 +726,7 @@ public class Guild { } public static boolean answerInvitation(int targetId, String targetName, int guildId, boolean answer) { - MapleInviteResult res = InviteCoordinator.answerInvite(InviteType.GUILD, targetId, guildId, answer); + InviteResult res = InviteCoordinator.answerInvite(InviteType.GUILD, targetId, guildId, answer); GuildResponse mgr; Character sender = res.from; diff --git a/src/main/java/net/server/world/World.java b/src/main/java/net/server/world/World.java index 47a9ce6af5..bc547bceea 100644 --- a/src/main/java/net/server/world/World.java +++ b/src/main/java/net/server/world/World.java @@ -42,7 +42,7 @@ import net.server.channel.CharacterIdChannelPair; import net.server.coordinator.matchchecker.MatchCheckerCoordinator; import net.server.coordinator.partysearch.PartySearchCoordinator; import net.server.coordinator.world.InviteCoordinator; -import net.server.coordinator.world.InviteCoordinator.InviteResult; +import net.server.coordinator.world.InviteCoordinator.InviteResultType; import net.server.coordinator.world.InviteCoordinator.InviteType; import net.server.guild.Guild; import net.server.guild.GuildCharacter; @@ -1131,7 +1131,7 @@ public class World { if (isConnected(sender)) { Character senderChr = getPlayerStorage().getCharacterByName(sender); if (senderChr != null && senderChr.getMessenger() != null) { - if (InviteCoordinator.answerInvite(InviteType.MESSENGER, player.getId(), senderChr.getMessenger().getId(), false).result == InviteResult.DENIED) { + if (InviteCoordinator.answerInvite(InviteType.MESSENGER, player.getId(), senderChr.getMessenger().getId(), false).result == InviteResultType.DENIED) { senderChr.sendPacket(PacketCreator.messengerNote(player.getName(), 5, 0)); } } diff --git a/src/main/java/server/Trade.java b/src/main/java/server/Trade.java index b917116c0a..c5d3a227dd 100644 --- a/src/main/java/server/Trade.java +++ b/src/main/java/server/Trade.java @@ -31,8 +31,8 @@ import config.YamlConfig; import constants.game.GameConstants; import net.server.coordinator.world.InviteCoordinator; import net.server.coordinator.world.InviteCoordinator.InviteResult; +import net.server.coordinator.world.InviteCoordinator.InviteResultType; import net.server.coordinator.world.InviteCoordinator.InviteType; -import net.server.coordinator.world.InviteCoordinator.MapleInviteResult; import tools.LogHelper; import tools.PacketCreator; import tools.Pair; @@ -478,10 +478,10 @@ public class Trade { } public static void visitTrade(Character c1, Character c2) { - MapleInviteResult inviteRes = InviteCoordinator.answerInvite(InviteType.TRADE, c1.getId(), c2.getId(), true); + InviteResult inviteRes = InviteCoordinator.answerInvite(InviteType.TRADE, c1.getId(), c2.getId(), true); - InviteResult res = inviteRes.result; - if (res == InviteResult.ACCEPTED) { + InviteResultType res = inviteRes.result; + if (res == InviteResultType.ACCEPTED) { if (c1.getTrade() != null && c1.getTrade().getPartner() == c2.getTrade() && c2.getTrade() != null && c2.getTrade().getPartner() == c1.getTrade()) { c2.sendPacket(PacketCreator.getTradePartnerAdd(c1)); c1.sendPacket(PacketCreator.getTradeStart(c1.getClient(), c1.getTrade(), (byte) 1)); @@ -501,7 +501,7 @@ public class Trade { if (trade != null) { if (trade.getPartner() != null) { Character other = trade.getPartner().getChr(); - if (InviteCoordinator.answerInvite(InviteType.TRADE, chr.getId(), other.getId(), false).result == InviteResult.DENIED) { + if (InviteCoordinator.answerInvite(InviteType.TRADE, chr.getId(), other.getId(), false).result == InviteResultType.DENIED) { other.message(chr.getName() + " has declined your trade request."); }