Logic cleanup pass for protectorate logic

This commit is contained in:
2026-05-10 18:36:43 -04:00
parent e4096bebbd
commit 24eb9608c3
4 changed files with 8 additions and 41 deletions
@@ -89,16 +89,6 @@ public class DismissGuildHandler extends AbstractClientMsgHandler {
toDismiss.setNation(Guild.getErrantNation());
GuildManager.updateAllGuildBinds(toDismiss, null);
break;
case Province:
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;
case Petitioner:
@@ -111,6 +101,7 @@ public class DismissGuildHandler extends AbstractClientMsgHandler {
break;
case Protectorate:
case Province:
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;