From e0291590d79b2e5aa529ab74194e3c50641b23c6 Mon Sep 17 00:00:00 2001
From: MagicBot <MagicBot@magicbane.com>
Date: Mon, 20 Jul 2026 06:35:00 -0400
Subject: [PATCH] Update to guild state handling

---
 src/engine/gameManager/GuildManager.java | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/engine/gameManager/GuildManager.java b/src/engine/gameManager/GuildManager.java
index e805fdb0..499450ad 100644
--- a/src/engine/gameManager/GuildManager.java
+++ b/src/engine/gameManager/GuildManager.java
@@ -183,15 +183,19 @@ public enum GuildManager {
 
     public static mbEnums.GuildState calcuateGuildState(Guild guild) {
 
+        if (guild.getNation() == null)
+            return mbEnums.GuildState.Errant;
+
         if (guild.getNation() == guild)
             return guild.getSubGuildList().isEmpty() ? mbEnums.GuildState.Sovereign : mbEnums.GuildState.Nation;
 
         if (guild.getOwnedCity() == null)
-            return guild.getNation().isEmptyGuild() ? mbEnums.GuildState.Errant : mbEnums.GuildState.Sworn;
+            return mbEnums.GuildState.Sworn;
+        else
+            return (guild.getOwnedCity().getTOL().getRank() == 8)
+                    ? mbEnums.GuildState.Province
+                    : mbEnums.GuildState.Protectorate;
 
-        return (guild.getOwnedCity().getTOL().getRank() == 8)
-                ? mbEnums.GuildState.Province
-                : mbEnums.GuildState.Protectorate;
     }
 
     //This updates tags for all online players in a guild.