Added debug code

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;
@@ -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/objects/Building.java

@@ -505,8 +505,8 @@ public class Building extends AbstractWorldObject {
             return;
         }
 
-        if (this.isDeranking.compareAndSet(false, true) == false) {
-            Logger.error("Attempt to derank tol twice");
+        if (city.destroyed.get() == true) {
+            Logger.error(city.getName() + "derankk called on destroyed city");
             return;
         }
 
@@ -597,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) {
@@ -605,6 +612,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

@@ -81,7 +81,7 @@ public class City extends AbstractWorldObject {
     private String hash;
     public Warehouse warehouse;
     public Realm realm;
-    public AtomicBoolean isDestroyed = new AtomicBoolean();
+    public AtomicBoolean destroyed = new AtomicBoolean(false);
 
     /**
      * ResultSet Constructor
@@ -1104,14 +1104,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 +1114,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,108 @@ 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);
+            }
+        }
+
+        // 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;
+
+            // 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);
+            }
+        }
+
+        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.