From a67bd0d90bb567f4ef33a444bf001b550ef124c7 Mon Sep 17 00:00:00 2001
From: MagicBot <MagicBot@magicbane.com>
Date: Sun, 26 Jul 2026 18:03:16 -0400
Subject: [PATCH] Nation dislodged if abandoned

---
 .../net/client/handlers/AbandonAssetMsgHandler.java      | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/engine/net/client/handlers/AbandonAssetMsgHandler.java b/src/engine/net/client/handlers/AbandonAssetMsgHandler.java
index a1a9f829..cbe3df6c 100644
--- a/src/engine/net/client/handlers/AbandonAssetMsgHandler.java
+++ b/src/engine/net/client/handlers/AbandonAssetMsgHandler.java
@@ -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);