Nation dislodged if abandoned

2026-07-26 18:03:16 -04:00
parent 6f54df62c4
commit a67bd0d90b
1 changed files with 7 additions and 2 deletions
@@ -165,15 +165,20 @@ public class AbandonAssetMsgHandler extends AbstractClientMsgHandler {
            return;
        }

-        // Dislodge any realm
+        // Dislodge any realm and nations

        if (sourceGuild.getOwnedCity().realm != null) {
            sourceGuild.getOwnedCity().realm.abandonRealm();
            BuildingManager.setRank(targetBuilding, 7);
        }

-        sourceGuild.guildState = mbEnums.GuildState.Errant;
        sourceGuild.getNation().getSubGuildList().remove(sourceGuild);
+
+        if (!sourceGuild.getNation().equals(sourceGuild))
+            sourceGuild.guildState = mbEnums.GuildState.Errant;
+        else
+            sourceGuild.guildState = mbEnums.GuildState.Sworn;
+
        sourceGuild.setNation(Guild.getErrantNation());
        sourceGuild.setCityUUID(0);
        GuildManager.updateAllGuildTags(sourceGuild);