diff --git a/src/engine/net/client/handlers/BreakFealtyHandler.java b/src/engine/net/client/handlers/BreakFealtyHandler.java index c713d7d6..f265e53e 100644 --- a/src/engine/net/client/handlers/BreakFealtyHandler.java +++ b/src/engine/net/client/handlers/BreakFealtyHandler.java @@ -40,8 +40,8 @@ public class BreakFealtyHandler extends AbstractClientMsgHandler { BreakFealtyMsg bfm; PlayerCharacter player; - Guild toBreak; - Guild guild; + Guild nation; + Guild protectorate; Dispatch dispatch; bfm = (BreakFealtyMsg) baseMsg; @@ -54,46 +54,47 @@ public class BreakFealtyHandler extends AbstractClientMsgHandler { if (player == null) return true; - toBreak = (Guild) DbManager.getObject(GameObjectType.Guild, bfm.getGuildUUID()); + nation = (Guild) DbManager.getObject(GameObjectType.Guild, bfm.getGuildUUID()); - if (toBreak == null) { + if (nation == null) { ErrorPopupMsg.sendErrorMsg(player, "A Serious error has occured. Please post details for to ensure transaction integrity"); return true; } - guild = player.getGuild(); + protectorate = player.getGuild(); - if (guild == null) { + if (protectorate == null) { ErrorPopupMsg.sendErrorMsg(player, "You do not belong to a guild!"); return true; } - if (toBreak.isNPCGuild()) { + if (nation.isNPCGuild()) { if (GuildStatusController.isGuildLeader(player.getGuildStatus()) == false) { ErrorPopupMsg.sendErrorMsg(player, "Only guild leader can break fealty!"); return true; } - if (!DbManager.GuildQueries.UPDATE_PARENT(guild.getObjectUUID(), WorldServer.worldUUID)) { + if (!DbManager.GuildQueries.UPDATE_PARENT(protectorate.getObjectUUID(), WorldServer.worldUUID)) { ErrorPopupMsg.sendErrorMsg(player, "A Serious error has occurred. Please post details for to ensure transaction integrity"); return true; } - switch (guild.getGuildState()) { + switch (protectorate.getGuildState()) { case Sworn: - guild.setNation(null); - GuildManager.updateAllGuildTags(guild); - GuildManager.updateAllGuildBinds(guild, null); + protectorate.setNation(Guild.getErrantGuild()); + GuildManager.updateAllGuildTags(protectorate); + GuildManager.updateAllGuildBinds(protectorate, null); break; case Province: - guild.setNation(guild); - GuildManager.updateAllGuildTags(guild); - GuildManager.updateAllGuildBinds(guild, guild.getOwnedCity()); + case Protectorate: + protectorate.setNation(protectorate); + GuildManager.updateAllGuildTags(protectorate); + GuildManager.updateAllGuildBinds(protectorate, protectorate.getOwnedCity()); break; } - guild.downgradeGuildState(); + protectorate.downgradeGuildState(); SendGuildEntryMsg msg = new SendGuildEntryMsg(player); dispatch = Dispatch.borrow(player, msg); @@ -106,16 +107,16 @@ public class BreakFealtyHandler extends AbstractClientMsgHandler { City.lastCityUpdate = System.currentTimeMillis(); - ArrayList guildMembers = SessionManager.getActivePCsInGuildID(guild.getObjectUUID()); + ArrayList guildMembers = SessionManager.getActivePCsInGuildID(protectorate.getObjectUUID()); for (PlayerCharacter member : guildMembers) { - ChatManager.chatGuildInfo(member, guild.getName() + " has broke fealty from " + toBreak.getName() + '!'); + ChatManager.chatGuildInfo(member, protectorate.getName() + " has broke fealty from " + nation.getName() + '!'); } - ArrayList breakFealtyMembers = SessionManager.getActivePCsInGuildID(toBreak.getObjectUUID()); + ArrayList breakFealtyMembers = SessionManager.getActivePCsInGuildID(nation.getObjectUUID()); for (PlayerCharacter member : breakFealtyMembers) { - ChatManager.chatGuildInfo(member, guild.getName() + " has broken fealty from " + toBreak.getName() + '!'); + ChatManager.chatGuildInfo(member, protectorate.getName() + " has broken fealty from " + nation.getName() + '!'); } return true; @@ -123,7 +124,7 @@ public class BreakFealtyHandler extends AbstractClientMsgHandler { } - if (!toBreak.getSubGuildList().contains(guild)) { + if (!nation.getSubGuildList().contains(protectorate)) { ErrorPopupMsg.sendErrorMsg(player, "Failure to break fealty!"); return true; } @@ -133,34 +134,34 @@ public class BreakFealtyHandler extends AbstractClientMsgHandler { return true; } - if (Bane.getBaneByAttackerGuild(guild) != null) { + if (Bane.getBaneByAttackerGuild(protectorate) != null) { ErrorPopupMsg.sendErrorMsg(player, "You may break fealty with active bane!"); return true; } - if (!DbManager.GuildQueries.UPDATE_PARENT(guild.getObjectUUID(), WorldServer.worldUUID)) { + if (!DbManager.GuildQueries.UPDATE_PARENT(protectorate.getObjectUUID(), WorldServer.worldUUID)) { ErrorPopupMsg.sendErrorMsg(player, "A Serious error has occurred. Please post details for to ensure transaction integrity"); return true; } - switch (guild.getGuildState()) { + switch (protectorate.getGuildState()) { case Sworn: - guild.setNation(null); - GuildManager.updateAllGuildTags(guild); - GuildManager.updateAllGuildBinds(guild, null); + protectorate.setNation(null); + GuildManager.updateAllGuildTags(protectorate); + GuildManager.updateAllGuildBinds(protectorate, null); break; case Province: - guild.setNation(guild); - GuildManager.updateAllGuildTags(guild); - GuildManager.updateAllGuildBinds(guild, guild.getOwnedCity()); + protectorate.setNation(protectorate); + GuildManager.updateAllGuildTags(protectorate); + GuildManager.updateAllGuildBinds(protectorate, protectorate.getOwnedCity()); break; } - guild.downgradeGuildState(); - toBreak.getSubGuildList().remove(guild); + protectorate.downgradeGuildState(); + nation.getSubGuildList().remove(protectorate); - if (toBreak.getSubGuildList().isEmpty()) - toBreak.downgradeGuildState(); + if (nation.getSubGuildList().isEmpty()) + nation.downgradeGuildState(); SendGuildEntryMsg msg = new SendGuildEntryMsg(player); dispatch = Dispatch.borrow(player, msg); @@ -173,16 +174,16 @@ public class BreakFealtyHandler extends AbstractClientMsgHandler { City.lastCityUpdate = System.currentTimeMillis(); - ArrayList guildMembers = SessionManager.getActivePCsInGuildID(guild.getObjectUUID()); + ArrayList guildMembers = SessionManager.getActivePCsInGuildID(protectorate.getObjectUUID()); for (PlayerCharacter member : guildMembers) { - ChatManager.chatGuildInfo(member, guild.getName() + " has broke fealty from " + toBreak.getName() + '!'); + ChatManager.chatGuildInfo(member, protectorate.getName() + " has broke fealty from " + nation.getName() + '!'); } - ArrayList breakFealtyMembers = SessionManager.getActivePCsInGuildID(toBreak.getObjectUUID()); + ArrayList breakFealtyMembers = SessionManager.getActivePCsInGuildID(nation.getObjectUUID()); for (PlayerCharacter member : breakFealtyMembers) { - ChatManager.chatGuildInfo(member, guild.getName() + " has broken fealty from " + toBreak.getName() + '!'); + ChatManager.chatGuildInfo(member, protectorate.getName() + " has broken fealty from " + nation.getName() + '!'); } return true;