Added debug code

src/engine/db/handlers/dbBuildingLocationHandler.java

@@ -32,14 +32,10 @@ public class dbBuildingLocationHandler extends dbHandlerBase {
         ArrayList<BuildingLocation> buildingLocations = new ArrayList<>();
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement(
-                     "SELECT MIN(ID), BuildingID, slot, MIN(type), MIN(unknown), MIN(locX), MIN(locY), MIN(locZ), " +
-                             "MIN(w), MIN(rotX), MIN(rotY), MIN(rotZ) " +
-                             "FROM static_building_location " +
-                             "WHERE type IN (6, 8) " +
-                             "GROUP BY BuildingID, slot " +
-                             "ORDER BY BuildingID, slot ASC;"
-             )) {
+             PreparedStatement preparedStatement = connection.prepareStatement("select `ID`, `BuildingID`, `type`, `slot`, `unknown`, `locX`, `locY`, `locZ`, `w`,  `rotX`, `rotY`, `rotZ` from static_building_location " +
+                     "where type = 6 or type = 8 " +
+                     "GROUP BY buildingID, slot " +
+                     "ORDER BY buildingID, slot ASC;")) {
 
             ResultSet rs = preparedStatement.executeQuery();
             buildingLocations = getObjectsFromRs(rs, 20);

src/engine/db/handlers/dbCityHandler.java

@@ -210,7 +210,7 @@ public class dbCityHandler extends dbHandlerBase {
     public boolean updateSiegesWithstood(City city, int value) {
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_city` SET `siegesWithstood`=?"
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_city` SET `name`=?"
                      + " WHERE `UID` = ?")) {
 
             preparedStatement.setInt(1, value);

src/engine/db/handlers/dbHandlerBase.java

@@ -58,9 +58,6 @@ public abstract class dbHandlerBase {
 
                 int id = rs.getInt(1);
 
-                if (id == 883640)
-                    Logger.info("hit");
-
                 if (DbManager.inCache(localObjectType, id)) {
                     objectList.add((T) DbManager.getFromCache(localObjectType, id));
                 } else {

src/engine/gameManager/BuildingManager.java

@@ -777,7 +777,7 @@ public enum BuildingManager {
         int newMeshUUID;
         boolean success;
 
-        // If this building has no blueprint then set rank and exit immediatly.
+        // If this building has no blueprint then set rank and exit immediately.
 
         if (building.blueprintUUID == 0 || building.getBlueprint() != null && building.getBlueprint().getBuildingGroup().equals(BuildingGroup.MINE)) {
             building.rank = rank;

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

@@ -17,8 +17,9 @@ import engine.mbEnums.BuildingGroup;
 import engine.net.client.ClientConnection;
 import engine.net.client.msg.ClaimAssetMsg;
 import engine.net.client.msg.ClientNetMsg;
-import engine.net.client.msg.ErrorPopupMsg;
-import engine.objects.*;
+import engine.objects.Blueprint;
+import engine.objects.Building;
+import engine.objects.PlayerCharacter;
 import org.pmw.tinylog.Logger;
 
 import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -110,9 +111,9 @@ public class ClaimAssetMsgHandler extends AbstractClientMsgHandler {
             // Can't claim a tree if your guild already owns one
             // *** Refactor : Send error to player here
 
-            if(blueprint.getBuildingGroup() == BuildingGroup.TOL && !validateTreeClaim(sourcePlayer)){
+            if ((sourcePlayer.getGuild().isNation()) &&
+                    (blueprint.getBuildingGroup() == BuildingGroup.TOL))
                 return true;
-            }
 
             // Process the transfer of the building(s)
 
@@ -134,24 +135,4 @@ public class ClaimAssetMsgHandler extends AbstractClientMsgHandler {
         return true;
     }
 
-    private boolean validateTreeClaim(PlayerCharacter sourcePlayer) {
-
-        if(sourcePlayer.guild.equals(Guild.getErrantGuild())) {
-            ErrorPopupMsg.sendErrorMsg(sourcePlayer, "Errant Players Cannot Claim Cities!");
-            return false;
-        }
-
-        if(sourcePlayer.guild.getOwnedCity() != null) {
-            ErrorPopupMsg.sendErrorMsg(sourcePlayer, "Your Guild Already Owns A City!");
-            return false;
-        }
-
-        if(!GuildStatusController.isGuildLeader(sourcePlayer.getGuildStatus())) {
-            ErrorPopupMsg.sendErrorMsg(sourcePlayer, "Only A Guild Leader Can Claim A Tree Of Life!");
-            return false;
-        }
-
-        return true;
-    }
-
 }

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

@@ -528,15 +528,8 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
             return false;
 
         if (cityObject.warehouse != null) {
-            if(cityObject.warehouse.building != null) {
-                //warehosue has a building already, warehouse still should exist
-                PlaceAssetMsg.sendPlaceAssetError(origin, 50, "");  //"You can only have one warehouse"
-                return false;
-            }else{
-                //warehouse has no building and needs a cleanup
-                DbManager.WarehouseQueries.DELETE_WAREHOUSE(cityObject.warehouse);
-                cityObject.warehouse = null;
-            }
+            PlaceAssetMsg.sendPlaceAssetError(origin, 50, "");  //"You can only have one warehouse"
+            return false;
         }
 
         // Create the warehouse object and it's entry in the database

src/engine/objects/Building.java

@@ -505,6 +505,11 @@ public class Building extends AbstractWorldObject {
             return;
         }
 
+        if (city.destroyed.get() == true) {
+            Logger.error(city.getName() + "derankk called on destroyed city");
+            return;
+        }
+
         bane = city.getBane();
 
         // We need to collect the spires and shrines on the citygrid in case
@@ -592,6 +597,13 @@ public class Building extends AbstractWorldObject {
             return;
         }
 
+        if (city.destroyed.get() == true) {
+            Logger.error(city.getName() + "attempt to destroy a destroyed city");
+            return;
+        }
+
+        city.destroyed.set(true);
+
         // Must remove a bane before considering destruction of a TOL
 
         if (bane != null) {

src/engine/objects/City.java

@@ -41,6 +41,7 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ThreadLocalRandom;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 public class City extends AbstractWorldObject {
@@ -80,6 +81,7 @@ public class City extends AbstractWorldObject {
     private String hash;
     public Warehouse warehouse;
     public Realm realm;
+    public AtomicBoolean destroyed = new AtomicBoolean(false);
 
     /**
      * ResultSet Constructor
@@ -1104,7 +1106,7 @@ public class City extends AbstractWorldObject {
 
         Thread destroyCityThread = new Thread(new DestroyCityThread(this));
 
-        destroyCityThread.setName("destroyCity:" + this.getName());
+        destroyCityThread.setName("destroyCity: " + this.getName());
         destroyCityThread.start();
     }
 
@@ -1112,7 +1114,7 @@ public class City extends AbstractWorldObject {
 
         Thread transferCityThread = new Thread(new TransferCityThread(this, newOwner));
 
-        transferCityThread.setName("TransferCity:" + this.getName());
+        transferCityThread.setName("TransferCity: " + this.getName());
         transferCityThread.start();
     }
 

src/engine/workthreads/DestroyCityThread.java

@@ -83,8 +83,6 @@ public class DestroyCityThread implements Runnable {
             }
         }
 
-        Building tol = null;
-
         // Build list of buildings within this parent zone
 
         for (Building cityBuilding : cityZone.zoneBuildingSet) {
@@ -100,13 +98,6 @@ public class DestroyCityThread implements Runnable {
             if (cityBuilding.getBlueprint().getBuildingGroup().equals(mbEnums.BuildingGroup.BANESTONE))
                 continue;
 
-            // TOL is processed after all other structures in the city zone
-
-            if (cityBuilding.getBlueprint().getBuildingGroup().equals(mbEnums.BuildingGroup.TOL)) {
-                tol = cityBuilding;
-                continue;
-            }
-
             // All buildings are moved to a location relative
             // to their new parent zone
 
@@ -146,11 +137,6 @@ public class DestroyCityThread implements Runnable {
             }
         }
 
-        // Destroy the tol
-
-        if (tol != null)
-            BuildingManager.setRank(tol, -1);
-
         if (city.realm != null)
             city.realm.removeCity(city.getObjectUUID());