Refactored out method

This commit is contained in:
2026-05-10 11:40:06 -04:00
parent 85dcad1c2a
commit 12f6d7574d
2 changed files with 1 additions and 25 deletions
@@ -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!");
-17
View File
@@ -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);
}