extra sanity checks for claiming an abandoned tree

src/engine/db/handlers/dbBuildingLocationHandler.java

@@ -32,10 +32,14 @@ public class dbBuildingLocationHandler extends dbHandlerBase {
         ArrayList<BuildingLocation> buildingLocations = new ArrayList<>();
 
         try (Connection connection = DbManager.getConnection();
-             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;")) {
+             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;"
+             )) {
 
             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 `name`=?"
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_city` SET `siegesWithstood`=?"
                      + " WHERE `UID` = ?")) {
 
             preparedStatement.setInt(1, value);

src/engine/db/handlers/dbHandlerBase.java

@@ -58,6 +58,9 @@ 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

@@ -798,7 +798,7 @@ public enum BuildingManager {
         // Attempt to write to database or delete the building
         // if we are destroying it.
 
-        if (rank <= -1)
+        if (rank == -1)
             success = DbManager.BuildingQueries.DELETE_FROM_DATABASE(building);
         else
             success = DbManager.BuildingQueries.updateBuildingRank(building, rank);

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

@@ -17,9 +17,8 @@ import engine.mbEnums.BuildingGroup;
 import engine.net.client.ClientConnection;
 import engine.net.client.msg.ClaimAssetMsg;
 import engine.net.client.msg.ClientNetMsg;
-import engine.objects.Blueprint;
-import engine.objects.Building;
-import engine.objects.PlayerCharacter;
+import engine.net.client.msg.ErrorPopupMsg;
+import engine.objects.*;
 import org.pmw.tinylog.Logger;
 
 import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -111,9 +110,9 @@ public class ClaimAssetMsgHandler extends AbstractClientMsgHandler {
             // Can't claim a tree if your guild already owns one
             // *** Refactor : Send error to player here
 
-            if ((sourcePlayer.getGuild().isNation()) &&
-                    (blueprint.getBuildingGroup() == BuildingGroup.TOL))
+            if(blueprint.getBuildingGroup() == BuildingGroup.TOL && !validateTreeClaim(sourcePlayer)){
                 return true;
+            }
 
             // Process the transfer of the building(s)
 
@@ -135,4 +134,24 @@ 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,8 +528,15 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
             return false;
 
         if (cityObject.warehouse != null) {
-            PlaceAssetMsg.sendPlaceAssetError(origin, 50, "");  //"You can only have one warehouse"
-            return false;
+            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;
+            }
         }
 
         // Create the warehouse object and it's entry in the database

src/engine/objects/Building.java

@@ -505,11 +505,6 @@ public class Building extends AbstractWorldObject {
             return;
         }
 
-        if (this.isDeranking.compareAndSet(false, true) == false) {
-            Logger.error("Attempt to derank tol twice");
-            return;
-        }
-
         bane = city.getBane();
 
         // We need to collect the spires and shrines on the citygrid in case
@@ -605,6 +600,8 @@ public class Building extends AbstractWorldObject {
 
             newOwner = Guild.GetGL(bane.getOwner().getGuild());
 
+            this.isDeranking.compareAndSet(false, true);
+
             if ((bane.getOwner().getGuild().getGuildState() == GuildState.Sovereign) ||
                     (bane.getOwner().getGuild().getGuildState() == GuildState.Protectorate) ||
                     (bane.getOwner().getGuild().getGuildState() == GuildState.Province) ||

src/engine/objects/City.java

@@ -41,7 +41,6 @@ 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 {
@@ -81,7 +80,6 @@ public class City extends AbstractWorldObject {
     private String hash;
     public Warehouse warehouse;
     public Realm realm;
-    public AtomicBoolean isDestroyed = new AtomicBoolean();
 
     /**
      * ResultSet Constructor
@@ -1104,14 +1102,9 @@ public class City extends AbstractWorldObject {
 
     public final void destroy() {
 
-        if (this.isDestroyed.compareAndSet(false, true) == false) {
-            Logger.error("Attempt to destroy tol twice");
-            return;
-        }
-
         Thread destroyCityThread = new Thread(new DestroyCityThread(this));
 
-        destroyCityThread.setName("destroyCity: " + this.getParent().zoneName);
+        destroyCityThread.setName("destroyCity:" + this.getName());
         destroyCityThread.start();
     }
 
@@ -1119,7 +1112,7 @@ public class City extends AbstractWorldObject {
 
         Thread transferCityThread = new Thread(new TransferCityThread(this, newOwner));
 
-        transferCityThread.setName("TransferCity:" + this.getParent().zoneName);
+        transferCityThread.setName("TransferCity:" + this.getName());
         transferCityThread.start();
     }
 

src/engine/workthreads/DestroyCityThread.java

@@ -31,7 +31,6 @@ import engine.objects.Zone;
 import org.pmw.tinylog.Logger;
 
 import java.util.ArrayList;
-import java.util.EnumSet;
 
 public class DestroyCityThread implements Runnable {
 
@@ -52,116 +51,122 @@ public class DestroyCityThread implements Runnable {
         Vector3fImmutable localCoords;
         ArrayList<Guild> subGuildList;
 
-        Logger.info("Destroy city routine started");
+        // Member variable assignment
 
-        try {
+        cityZone = city.getParent();
+        newParent = cityZone.parent;
+        formerGuild = city.getTOL().getGuild();
 
-            // Member variable assignment
+        // Former guild loses it's tree!
 
-            cityZone = city.getParent();
-            newParent = cityZone.parent;
-            formerGuild = city.getTOL().getGuild();
+        if (DbManager.GuildQueries.SET_GUILD_OWNED_CITY(formerGuild.getObjectUUID(), 0)) {
 
-            // Build list of buildings within this parent zone
+            //Successful Update of guild
 
-            for (Building cityBuilding : cityZone.zoneBuildingSet) {
-
-                // Sanity Check in case player deletes the building
-                // before this thread can get to it
-
-                if (cityBuilding == null)
-                    continue;
-
-                // Do nothing with the banestone.  It will be removed elsewhere
-
-                if (cityBuilding.getBlueprint().getBuildingGroup().equals(mbEnums.BuildingGroup.BANESTONE))
-                    continue;
-
-                // All buildings are moved to a location relative
-                // to their new parent zone
-
-                localCoords = ZoneManager.worldToLocal(cityBuilding.getLoc(), newParent);
-
-                DbManager.BuildingQueries.MOVE_BUILDING(cityBuilding.getObjectUUID(), newParent.getObjectUUID(), localCoords.x, localCoords.y, localCoords.z);
-
-                // All buildings are re-parented to a zone one node
-                // higher in the tree (continent) as we will be
-                // deleting the city zone very shortly.
-
-                if (cityBuilding.getParentZoneID() != newParent.getParentZoneID())
-                    cityBuilding.setParentZone(newParent);
-
-                // No longer a tree, no longer any protection contract!
-
-                cityBuilding.setProtectionState(mbEnums.ProtectionState.NONE);
-
-                // Remove warehouse entry if one exists.
-
-                if (cityBuilding.getBlueprint().getBuildingGroup().equals(mbEnums.BuildingGroup.WAREHOUSE)) {
-                    DbManager.WarehouseQueries.DELETE_WAREHOUSE(city.warehouse);
-                    city.warehouse = null;
-                }
-
-                // Destroy all remaining auto-protected city assets
-
-                EnumSet<mbEnums.BuildingGroup> autoProtectFilter = EnumSet.of(mbEnums.BuildingGroup.TOL, mbEnums.BuildingGroup.BARRACK,
-                        mbEnums.BuildingGroup.SPIRE, mbEnums.BuildingGroup.SHRINE, mbEnums.BuildingGroup.WAREHOUSE);
-
-                if (autoProtectFilter.contains(cityBuilding.getBlueprint().getBuildingGroup())) {
-
-                    if (cityBuilding.getRank() > -1)
-                        BuildingManager.setRank(cityBuilding, -1);
-                }
-
-                // Former guild loses tree!
-
-                if (city.realm != null)
-                    city.realm.removeCity(city.getObjectUUID());
-
-                city.getTOL().setOwner(null);
-
-                if (DbManager.GuildQueries.SET_GUILD_OWNED_CITY(formerGuild.getObjectUUID(), 0)) {
-
-                    //Successful Update of guild
-
-                    formerGuild.setGuildState(mbEnums.GuildState.Errant);
-                    formerGuild.setNation(null);
-                    formerGuild.setCityUUID(0);
-                    GuildManager.updateAllGuildTags(formerGuild);
-                    GuildManager.updateAllGuildBinds(formerGuild, null);
-                }
-
-                // And all of it's sub guilds
-
-                if (formerGuild.getSubGuildList().isEmpty() == false) {
-
-                    subGuildList = new ArrayList<>();
-
-                    for (Guild subGuild : formerGuild.getSubGuildList()) {
-                        subGuildList.add(subGuild);
-                    }
-
-                    for (Guild subGuild : subGuildList) {
-                        formerGuild.removeSubGuild(subGuild);
-                    }
-                }
-            }
-
-            // It's now safe to delete the city zone from the database
-            // which will cause a cascade delete of everything else
-
-            if (DbManager.ZoneQueries.DELETE_ZONE(cityZone) == false) {
-                Logger.error("DestroyCityThread", "Error when deleting city zone: " + cityZone.getObjectUUID());
-                return;
-            }
-
-            // Refresh the city for map requests
-
-            City.lastCityUpdate = System.currentTimeMillis();
-        } catch (Exception e) {
-            Logger.error(e);
+            formerGuild.setGuildState(mbEnums.GuildState.Errant);
+            formerGuild.setNation(null);
+            formerGuild.setCityUUID(0);
+            GuildManager.updateAllGuildTags(formerGuild);
+            GuildManager.updateAllGuildBinds(formerGuild, null);
         }
 
+        // By losing the tree, the former owners lose all of their subguilds.
+
+        if (!formerGuild.getSubGuildList().isEmpty()) {
+
+            subGuildList = new ArrayList<>();
+
+            subGuildList.addAll(formerGuild.getSubGuildList());
+
+            for (Guild subGuild : subGuildList) {
+                formerGuild.removeSubGuild(subGuild);
+            }
+        }
+
+        Building tol = null;
+
+        // Build list of buildings within this parent zone
+
+        for (Building cityBuilding : cityZone.zoneBuildingSet) {
+
+            // Sanity Check in case player deletes the building
+            // before this thread can get to it
+
+            if (cityBuilding == null)
+                continue;
+
+            // Do nothing with the banestone.  It will be removed elsewhere
+
+            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
+
+            localCoords = ZoneManager.worldToLocal(cityBuilding.getLoc(), newParent);
+
+            DbManager.BuildingQueries.MOVE_BUILDING(cityBuilding.getObjectUUID(), newParent.getObjectUUID(), localCoords.x, localCoords.y, localCoords.z);
+
+            // All buildings are re-parented to a zone one node
+            // higher in the tree (continent) as we will be
+            // deleting the city zone very shortly.
+
+            if (cityBuilding.getParentZoneID() != newParent.getParentZoneID())
+                cityBuilding.setParentZone(newParent);
+
+            // No longer a tree, no longer any protection contract!
+
+            cityBuilding.setProtectionState(mbEnums.ProtectionState.NONE);
+
+            // Remove warehouse entry if one exists.
+
+            if (cityBuilding.getBlueprint().getBuildingGroup() == mbEnums.BuildingGroup.WAREHOUSE) {
+                DbManager.WarehouseQueries.DELETE_WAREHOUSE(city.warehouse);
+                city.warehouse = null;
+            }
+
+            // Destroy all remaining city assets
+
+            if ((cityBuilding.getBlueprint().getBuildingGroup() == mbEnums.BuildingGroup.BARRACK)
+                    || (cityBuilding.getBlueprint().isWallPiece())
+                    || (cityBuilding.getBlueprint().getBuildingGroup() == mbEnums.BuildingGroup.SHRINE)
+                    || (cityBuilding.getBlueprint().getBuildingGroup() == mbEnums.BuildingGroup.TOL)
+                    || (cityBuilding.getBlueprint().getBuildingGroup() == mbEnums.BuildingGroup.SPIRE)
+                    || (cityBuilding.getBlueprint().getBuildingGroup() == mbEnums.BuildingGroup.WAREHOUSE)) {
+
+                if (cityBuilding.getRank() != -1)
+                    BuildingManager.setRank(cityBuilding, -1);
+            }
+        }
+
+        // Destroy the tol
+
+        if (tol != null)
+            BuildingManager.setRank(tol, -1);
+
+        if (city.realm != null)
+            city.realm.removeCity(city.getObjectUUID());
+
+        // It's now safe to delete the city zone from the database
+        // which will cause a cascade delete of everything else
+
+
+        if (DbManager.ZoneQueries.DELETE_ZONE(cityZone) == false) {
+            Logger.error("DestroyCityThread", "Database error when deleting city zone: " + cityZone.getObjectUUID());
+            return;
+        }
+
+        // Refresh the city for map requests
+
+        City.lastCityUpdate = System.currentTimeMillis();
+
         // Zone and city should vanish upon next reboot
         // if the codebase reaches here.