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)) {