Cleanup of cityChoice handler

src/engine/objects/Guild.java

@@ -193,12 +193,16 @@ public class Guild extends AbstractWorldObject {
     }
 
     public static boolean sameNationExcludeErrant(Guild a, Guild b) {
+
         if (a == null || b == null)
             return false;
+
         if (a.getObjectUUID() == b.getObjectUUID())
             return true;
+
         if (a.nation == null || b.nation == null)
             return false;
+
         return a.nation.getObjectUUID() == b.nation.getObjectUUID() && !a.nation.isEmptyGuild();
     }