Check removed

src/engine/net/Protocol.java

@@ -128,7 +128,7 @@ public enum Protocol {
     ITEMPRODUCTION(0x3CCE8E30, ItemProductionMsg.class, ItemProductionMsgHandler.class),
     ITEMTOVAULT(0x3ABE4927, ItemToVaultMsg.class, ItemToVaultMsgHandler.class), // Transfer Item to Vault
     ITEMFROMVAULT(0x0119A64D, ItemFromVaultMsg.class, ItemFromVaultMsgHandler.class), // Transfer Item from Vault to Inventory
-    JOINFORPROVINCE(0x1FB369CD, AcceptSubInviteMsg.class, AcceptSubInviteHandler.class), //Response to invite to swear?
+    JOINFORPROVINCE(0x1FB369CD, AcceptSubInviteMsg.class, SwearInGuildHandler.class), //Response to invite to swear?
     JOINFORSWORN(0xF6A4170F, null, null),
     JOINGROUP(0x7EC5E636, GroupInviteResponseMsg.class, GroupInviteResponseHandler.class), // Accept Group Invite
     JOINGUILD(0xF0C5F2FF, AcceptInviteToGuildMsg.class, AcceptInviteToGuildHandler.class), // Accept guild invite

src/engine/net/client/handlers/SwearInGuildHandler.java

@@ -17,8 +17,8 @@ import engine.net.Dispatch;
 import engine.net.client.ClientConnection;
 import engine.net.client.msg.ClientNetMsg;
 import engine.net.client.msg.ErrorPopupMsg;
+import engine.net.client.msg.guild.AcceptSubInviteMsg;
 import engine.net.client.msg.guild.SendGuildEntryMsg;
-import engine.net.client.msg.guild.SwearInGuildMsg;
 import engine.objects.City;
 import engine.objects.Guild;
 import engine.objects.GuildStatusController;
@@ -36,18 +36,18 @@ public class SwearInGuildHandler extends AbstractClientMsgHandler {
     @Override
     protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
         PlayerCharacter player;
-        SwearInGuildMsg swearInMsg;
+        AcceptSubInviteMsg swearInMsg;
         Guild targetGuild;
         Guild nation;
         Dispatch dispatch;
 
-        swearInMsg = (SwearInGuildMsg) baseMsg;
+        swearInMsg = (AcceptSubInviteMsg) baseMsg;
         player = SessionManager.getPlayerCharacter(origin);
 
         if (player == null)
             return true;
 
-        targetGuild = (Guild) DbManager.getObject(GameObjectType.Guild, swearInMsg.getGuildUUID());
+        targetGuild = (Guild) DbManager.getObject(GameObjectType.Guild, swearInMsg.guildUUID());
 
         if (targetGuild == null) {
             ErrorPopupMsg.sendErrorMsg(player, "A Serious error has occured. Please post details for to ensure transaction integrity");
@@ -66,15 +66,6 @@ public class SwearInGuildHandler extends AbstractClientMsgHandler {
                 ErrorPopupMsg.sendErrorMsg(player, "Your guild is not a nation!");
                 return true;
             }
-            if (!nation.getSubGuildList().contains(targetGuild)) {
-                ErrorPopupMsg.sendErrorMsg(player, "Your do not have such authority!");
-                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!");
@@ -86,16 +77,8 @@ public class SwearInGuildHandler extends AbstractClientMsgHandler {
                 return true;
             }
 
-            switch (targetGuild.getGuildState()) {
-                case Petitioner:
+            if (targetGuild.getGuildState().equals(GuildState.Errant))
                 GuildManager.updateAllGuildBinds(targetGuild, nation.getOwnedCity());
-                    break;
-                case Protectorate:
-                    break;
-                default:
-                    //shouldn't get here.
-                    break;
-            }
 
             //update Guild state.
             targetGuild.setNation(nation);