Logic cleanup pass for protectorate logic

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

@@ -87,17 +87,7 @@ public class BreakFealtyHandler extends AbstractClientMsgHandler {
                     protectorate.setNation(protectorate);
                     GuildManager.updateAllGuildTags(protectorate);
                     GuildManager.updateAllGuildBinds(protectorate, protectorate.getOwnedCity());
-
-                    boolean isNation = false;
-
-                    for (Guild subGuild : protectorate.getSubGuildList())
-                        if (subGuild.getOwnedCity() != null)
-                            isNation = true;
-
-                    if (isNation)
-                        protectorate.guildState = mbEnums.GuildState.Nation;
-                    else
-                        protectorate.guildState = mbEnums.GuildState.Sovereign;
+                    protectorate.guildState = mbEnums.GuildState.Sovereign;
                     break;
             }
 
@@ -105,28 +95,18 @@ public class BreakFealtyHandler extends AbstractClientMsgHandler {
             dispatch = Dispatch.borrow(player, msg);
             DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
 
-            //Update Map.
-
-            final Session s = SessionManager.getSession(player);
-
             City.lastCityUpdate = System.currentTimeMillis();
-
-
             ArrayList<PlayerCharacter> guildMembers = SessionManager.getActivePCsInGuildID(protectorate.getObjectUUID());
 
-            for (PlayerCharacter member : guildMembers) {
+            for (PlayerCharacter member : guildMembers)
                 ChatManager.chatGuildInfo(member, protectorate.getName() + " has broke fealty from " + nation.getName() + '!');
-            }
 
             ArrayList<PlayerCharacter> breakFealtyMembers = SessionManager.getActivePCsInGuildID(nation.getObjectUUID());
 
-            for (PlayerCharacter member : breakFealtyMembers) {
+            for (PlayerCharacter member : breakFealtyMembers)
                 ChatManager.chatGuildInfo(member, protectorate.getName() + " has broken fealty from " + nation.getName() + '!');
-            }
 
             return true;
-
-
         }
 
         if (!nation.getSubGuildList().contains(protectorate)) {

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

@@ -89,16 +89,6 @@ public class DismissGuildHandler extends AbstractClientMsgHandler {
                 toDismiss.setNation(Guild.getErrantNation());
                 GuildManager.updateAllGuildBinds(toDismiss, null);
 
-                break;
-            case Province:
-                if (!DbManager.GuildQueries.UPDATE_PARENT(toDismiss.getObjectUUID(), WorldServer.worldUUID)) {
-                    ErrorPopupMsg.sendErrorMsg(player, "A Serious error has occured. Please post details for to ensure transaction integrity");
-                    return true;
-                }
-                nation.getSubGuildList().remove(toDismiss);
-                toDismiss.guildState = mbEnums.GuildState.Sovereign;
-                toDismiss.setNation(toDismiss);
-
                 break;
             case Petitioner:
 
@@ -111,6 +101,7 @@ public class DismissGuildHandler extends AbstractClientMsgHandler {
 
                 break;
             case Protectorate:
+            case Province:
                 if (!DbManager.GuildQueries.UPDATE_PARENT(toDismiss.getObjectUUID(), WorldServer.worldUUID)) {
                     ErrorPopupMsg.sendErrorMsg(player, "A Serious error has occured. Please post details for to ensure transaction integrity");
                     return true;

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

@@ -99,10 +99,9 @@ public class SwearInGuildHandler extends AbstractClientMsgHandler {
             protectorate.setNation(nation);
             GuildManager.updateAllGuildTags(protectorate);
 
-            if (nation.guildState == GuildState.Sovereign) {
+            if (nation.guildState == GuildState.Sovereign)
                 if (protectorate.guildState.equals(GuildState.Protectorate))
                     nation.guildState = GuildState.Nation;
-            }
 
             SendGuildEntryMsg msg = new SendGuildEntryMsg(player);
             dispatch = Dispatch.borrow(player, msg);

src/engine/objects/Building.java

@@ -602,13 +602,10 @@ public class Building extends AbstractWorldObject {
 
             this.isDeranking.compareAndSet(false, true);
 
-            if ((bane.getOwner().getGuild().guildState == GuildState.Sovereign) ||
-                    (bane.getOwner().getGuild().guildState == GuildState.Protectorate) ||
-                    (bane.getOwner().getGuild().guildState == GuildState.Province) ||
-                    (bane.getOwner().getGuild().guildState == GuildState.Nation))
-                siegeResult = SiegeResult.DESTROY;
-            else
+            if (bane.getOwner().getGuild().guildState == GuildState.Sworn)
                 siegeResult = SiegeResult.CAPTURE;
+            else
+                siegeResult = SiegeResult.DESTROY;
 
             // Remove realm if city had one