diff --git a/src/engine/net/client/handlers/DismissGuildHandler.java b/src/engine/net/client/handlers/DismissGuildHandler.java index 10dd32e3..bd94bb7d 100644 --- a/src/engine/net/client/handlers/DismissGuildHandler.java +++ b/src/engine/net/client/handlers/DismissGuildHandler.java @@ -101,19 +101,22 @@ public class DismissGuildHandler extends AbstractClientMsgHandler { break; case Petitioner: + nation.getSubGuildList().remove(toDismiss); - if (toDismiss.getNation().isEmptyGuild()) { + + if (toDismiss.getNation().isEmptyGuild()) toDismiss.guildState = mbEnums.GuildState.Errant; - toDismiss.setNation(Guild.getErrantNation()); - } else { + else toDismiss.guildState = mbEnums.GuildState.Sovereign; - toDismiss.setNation(toDismiss); - } + break; case Protectorate: + if (!DbManager.GuildQueries.UPDATE_PARENT(toDismiss.getObjectUUID(), WorldServer.worldUUID)) { + ErrorPopupMsg.sendErrorMsg(player, "A Serious error has occured. Please post details for to ensure transaction integrity"); + return true; + } nation.getSubGuildList().remove(toDismiss); toDismiss.guildState = mbEnums.GuildState.Sovereign; - ; toDismiss.setNation(toDismiss); break; }