From c77e7a6190d8e94581cf1e561ce04e7fea2b003b Mon Sep 17 00:00:00 2001 From: MagicBot Date: Sun, 26 Apr 2026 14:26:18 -0400 Subject: [PATCH] Check removed --- .../client/handlers/SwearInGuildHandler.java | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/src/engine/net/client/handlers/SwearInGuildHandler.java b/src/engine/net/client/handlers/SwearInGuildHandler.java index f32c9842..8a4c239b 100644 --- a/src/engine/net/client/handlers/SwearInGuildHandler.java +++ b/src/engine/net/client/handlers/SwearInGuildHandler.java @@ -67,11 +67,6 @@ public class SwearInGuildHandler extends AbstractClientMsgHandler { return true; } - if (!Guild.canSwearIn(targetGuild)) { - ErrorPopupMsg.sendErrorMsg(player, targetGuild.getGuildState().name() + "cannot be sworn in"); - return true; - } - if (GuildStatusController.isGuildLeader(player.getGuildStatus()) == false) { ErrorPopupMsg.sendErrorMsg(player, "Your do not have such authority!"); return true; @@ -82,16 +77,8 @@ public class SwearInGuildHandler extends AbstractClientMsgHandler { return true; } - switch (targetGuild.getGuildState()) { - case Petitioner: - GuildManager.updateAllGuildBinds(targetGuild, nation.getOwnedCity()); - break; - case Protectorate: - break; - default: - //shouldn't get here. - break; - } + if (targetGuild.getGuildState().equals(GuildState.Errant)) + GuildManager.updateAllGuildBinds(targetGuild, nation.getOwnedCity()); //update Guild state. targetGuild.setNation(nation);