From 12f6d7574d93756b1e222e3a3481a9bb42d4d169 Mon Sep 17 00:00:00 2001
From: MagicBot <MagicBot@magicbane.com>
Date: Sun, 10 May 2026 11:40:06 -0400
Subject: [PATCH] Refactored out method

---
 .../client/handlers/SwearInGuildHandler.java    |  9 +--------
 src/engine/objects/Guild.java                   | 17 -----------------
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/src/engine/net/client/handlers/SwearInGuildHandler.java b/src/engine/net/client/handlers/SwearInGuildHandler.java
index 61c71abb..2d14e1ef 100644
--- a/src/engine/net/client/handlers/SwearInGuildHandler.java
+++ b/src/engine/net/client/handlers/SwearInGuildHandler.java
@@ -72,15 +72,8 @@ public class SwearInGuildHandler extends AbstractClientMsgHandler {
                 return true;
             }
 
-            if (protectorate.guildState.equals(GuildState.Petitioner) == false) {
-                ErrorPopupMsg.sendErrorMsg(player, "This guild has already sworn fealty!");
+            if (protectorate.guildState.equals(GuildState.Petitioner) == false)
                 return true;
-            }
-
-            if (!Guild.canSwearIn(protectorate)) {
-                ErrorPopupMsg.sendErrorMsg(player, protectorate.guildState.name() + "cannot be sworn in");
-                return true;
-            }
 
             if (GuildStatusController.isGuildLeader(player.getGuildStatus()) == false) {
                 ErrorPopupMsg.sendErrorMsg(player, "Your do not have such authority!");
diff --git a/src/engine/objects/Guild.java b/src/engine/objects/Guild.java
index d698ebf3..836c59a5 100644
--- a/src/engine/objects/Guild.java
+++ b/src/engine/objects/Guild.java
@@ -206,23 +206,6 @@ public class Guild extends AbstractWorldObject {
         return a.nation.getObjectUUID() == b.nation.getObjectUUID() && !a.nation.isEmptyGuild();
     }
 
-    public static boolean canSwearIn(Guild toSub) {
-
-        boolean canSwear = false;
-
-        switch (toSub.guildState) {
-
-            case Protectorate:
-            case Petitioner:
-                canSwear = true;
-                break;
-            default:
-                canSwear = false;
-        }
-
-        return canSwear;
-    }
-
     public static void _serializeForClientMsg(Guild guild, ByteBufferWriter writer) {
         Guild.serializeForClientMsg(guild, writer, null, false);
     }