Cleaner implementation

2026-05-11 03:51:21 -04:00
parent 258bef5cb3
commit 5f67c043c2
1 changed files with 10 additions and 6 deletions
@@ -820,12 +820,16 @@ public class Guild extends AbstractWorldObject {
        if (!DbManager.GuildQueries.UPDATE_PARENT(subGuild.getObjectUUID(), WorldServer.worldUUID))
            Logger.debug("Failed to set Nation Guild for Guild with UID " + subGuild.getObjectUUID());

-        if (subGuild.getOwnedCity() == null) {
-            subGuild.guildState = GuildState.Errant;
-            subGuild.nation = Guild.getErrantNation();
-        } else {
-            subGuild.nation = subGuild;
-            subGuild.guildState = GuildState.Sovereign;
+        switch (subGuild.guildState) {
+            case Sworn:
+                subGuild.guildState = GuildState.Errant;
+                subGuild.nation = Guild.getErrantNation();
+                break;
+            case Protectorate:
+            case Petitioner:
+                subGuild.nation = subGuild;
+                subGuild.guildState = GuildState.Sovereign;
+                break;
        }

        // Remove from collection