State set properly upon dismissal

2026-05-10 12:01:09 -04:00
parent 950523ddcc
commit aea6869ca0
1 changed files with 9 additions and 6 deletions
@@ -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;
        }