State set properly upon dismissal

This commit is contained in:
2026-05-10 11:58:50 -04:00
parent 631989e626
commit 950523ddcc
@@ -85,8 +85,8 @@ public class DismissGuildHandler extends AbstractClientMsgHandler {
return true;
}
nation.getSubGuildList().remove(toDismiss);
toDismiss.downgradeGuildState();
toDismiss.setNation(null);
toDismiss.guildState = mbEnums.GuildState.Errant;
toDismiss.setNation(Guild.getErrantNation());
GuildManager.updateAllGuildBinds(toDismiss, null);
break;
@@ -96,24 +96,32 @@ public class DismissGuildHandler extends AbstractClientMsgHandler {
return true;
}
nation.getSubGuildList().remove(toDismiss);
toDismiss.downgradeGuildState();
toDismiss.guildState = mbEnums.GuildState.Sovereign;
toDismiss.setNation(toDismiss);
break;
case Petitioner:
nation.getSubGuildList().remove(toDismiss);
toDismiss.downgradeGuildState();
if (toDismiss.getNation().isEmptyGuild()) {
toDismiss.guildState = mbEnums.GuildState.Errant;
toDismiss.setNation(Guild.getErrantNation());
} else {
toDismiss.guildState = mbEnums.GuildState.Sovereign;
toDismiss.setNation(toDismiss);
}
break;
case Protectorate:
nation.getSubGuildList().remove(toDismiss);
toDismiss.downgradeGuildState();
toDismiss.guildState = mbEnums.GuildState.Sovereign;
;
toDismiss.setNation(toDismiss);
break;
}
GuildManager.updateAllGuildTags(toDismiss);
if (nation.getSubGuildList().isEmpty())
nation.downgradeGuildState();
nation.guildState = mbEnums.GuildState.Sovereign;
SendGuildEntryMsg msg = new SendGuildEntryMsg(player);
dispatch = Dispatch.borrow(player, msg);