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 < 0)
+        if (rank == -1)
             success = DbManager.BuildingQueries.DELETE_FROM_DATABASE(building);
         else
             success = DbManager.BuildingQueries.updateBuildingRank(building, rank);

src/engine/mbEnums.java

@@ -2732,7 +2732,7 @@ public class mbEnums {
         DIAMOND(1580010, 1540225085, -1730704107, 2000, 20),
         GALVOR(1580017, -1683992404, -1596311545, 2000, 5),
         IRON(1580002, -1673518119, 2504297, 2000, 20),
-        LUMBER(1580004, -1628412684, -1603256692, 10000, 100),
+        LUMBER(1580004, 1628412684, -1603256692, 10000, 100),
         MANDRAKE(1580007, 1519910613, 1191391799, 1000, 10),
         MITHRIL(1580021, 626743397, -1761257186, 500, 5),
         OAK(1580005, -1653034775, 74767, 3000, 30),

src/engine/objects/Building.java

@@ -561,7 +561,7 @@ public class Building extends AbstractWorldObject {
                 BuildingManager.setRank(barracksBuilding, -1);
         }
 
-        // If the tree is R8 and deranking, we need to update the
+        // If the tree is R8 and deranking, we need to update it's
         // mesh along with buildings losing their health bonus
 
         if (this.rank == 8) {

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(false);
 
     /**
      * ResultSet Constructor
@@ -308,21 +306,6 @@ public class City extends AbstractWorldObject {
             if (city.parentZone == null)
                 continue;
 
-            // Can't teleport to something without a tree
-
-            if (city.getTOL() == null)
-                continue;
-
-            // No abandoned cities
-
-            if (city.getTOL().getGuild().isEmptyGuild())
-                continue;
-
-            // No destroyed cities
-
-            if (city.getTOL().getRank() == -1)
-                continue;
-
             //can't repledge to a guild you're already part of
 
             if (repledge && city.getGuild().equals(playerCharacter.guild))
@@ -1119,21 +1102,17 @@ public class City extends AbstractWorldObject {
 
     public final void destroy() {
 
-        if (this.isDestroyed.compareAndSet(false, true)) {
+        Thread destroyCityThread = new Thread(new DestroyCityThread(this));
 
-            Thread destroyCityThread = new Thread(new DestroyCityThread(this));
-
-            destroyCityThread.setName("destroyCity:" + this.getParent().zoneName);
-            destroyCityThread.start();
-        } else
-            Logger.error("Attempt to destroy destroyed city");
+        destroyCityThread.setName("destroyCity:" + this.getName());
+        destroyCityThread.start();
     }
 
     public final void transfer(AbstractCharacter newOwner) {
 
         Thread transferCityThread = new Thread(new TransferCityThread(this, newOwner));
 
-        transferCityThread.setName("TransferCity:" + this.getParent().zoneName);
+        transferCityThread.setName("TransferCity:" + this.getName());
         transferCityThread.start();
     }
 

src/engine/objects/Mine.java

@@ -220,7 +220,8 @@ public class Mine extends AbstractGameObject {
         // Only inactive mines are returned.
 
         for (Mine mine : Mine.mineMap.keySet()) {
-            if (mine.owningGuild.getObjectUUID() == guildID)
+            if (mine.owningGuild.getObjectUUID() == guildID &&
+                    mine.isActive == false)
                 mineList.add(mine);
         }
         return mineList;

src/engine/workthreads/DestroyCityThread.java

@@ -53,117 +53,123 @@ public class DestroyCityThread implements Runnable {
 
         // Member variable assignment
 
-        try {
-            cityZone = city.getParent();
-            newParent = cityZone.parent;
-            formerGuild = city.getTOL().getGuild();
+        cityZone = city.getParent();
+        newParent = cityZone.parent;
+        formerGuild = city.getTOL().getGuild();
 
-            Logger.info("Destroy city thread started for: " + cityZone.zoneName);
+        // Former guild loses it's tree!
 
-            // Former guild loses tree!
+        if (DbManager.GuildQueries.SET_GUILD_OWNED_CITY(formerGuild.getObjectUUID(), 0)) {
 
-            if (DbManager.GuildQueries.SET_GUILD_OWNED_CITY(formerGuild.getObjectUUID(), 0)) {
+            //Successful Update of guild
 
-                //Successful Update of guild
-
-                formerGuild.setGuildState(mbEnums.GuildState.Errant);
-                formerGuild.setNation(null);
-                formerGuild.setCityUUID(0);
-                GuildManager.updateAllGuildTags(formerGuild);
-                GuildManager.updateAllGuildBinds(formerGuild, null);
-            }
+            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.
+        // By losing the tree, the former owners lose all of their subguilds.
 
-            if (!formerGuild.getSubGuildList().isEmpty()) {
+        if (!formerGuild.getSubGuildList().isEmpty()) {
 
-                subGuildList = new ArrayList<>();
+            subGuildList = new ArrayList<>();
 
-                subGuildList.addAll(formerGuild.getSubGuildList());
+            subGuildList.addAll(formerGuild.getSubGuildList());
 
-                for (Guild subGuild : subGuildList) {
-                    formerGuild.removeSubGuild(subGuild);
-                }
+            for (Guild subGuild : subGuildList) {
+                formerGuild.removeSubGuild(subGuild);
             }
+        }
 
-            // Build list of buildings within this parent zone
+        Building tol = null;
 
-            ArrayList<Building> destroySet = new ArrayList<>();
+        // Build list of buildings within this parent zone
 
-            for (Building cityBuilding : cityZone.zoneBuildingSet) {
+        for (Building cityBuilding : cityZone.zoneBuildingSet) {
 
-                // Sanity Check in case player deletes the building
-                // before this thread can get to it
+            // Sanity Check in case player deletes the building
+            // before this thread can get to it
 
-                if (cityBuilding == null)
-                    continue;
+            if (cityBuilding == null)
+                continue;
 
-                // Do nothing with the banestone.  It will be removed elsewhere
+            // Do nothing with the banestone.  It will be removed elsewhere
 
-                if (cityBuilding.getBlueprint().getBuildingGroup().equals(mbEnums.BuildingGroup.BANESTONE))
-                    continue;
+            if (cityBuilding.getBlueprint().getBuildingGroup().equals(mbEnums.BuildingGroup.BANESTONE))
+                continue;
 
-                // All buildings are moved to a location relative
-                // to their new parent zone
+            // TOL is processed after all other structures in the city zone
 
-                localCoords = ZoneManager.worldToLocal(cityBuilding.getLoc(), newParent);
+            if (cityBuilding.getBlueprint().getBuildingGroup().equals(mbEnums.BuildingGroup.TOL)) {
+                tol = cityBuilding;
+                continue;
+            }
 
-                DbManager.BuildingQueries.MOVE_BUILDING(cityBuilding.getObjectUUID(), newParent.getObjectUUID(), localCoords.x, localCoords.y, localCoords.z);
+            // All buildings are moved to a location relative
+            // to their new parent zone
 
-                // 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.
+            localCoords = ZoneManager.worldToLocal(cityBuilding.getLoc(), newParent);
 
-                if (cityBuilding.getParentZoneID() != newParent.getParentZoneID())
-                    cityBuilding.setParentZone(newParent);
+            DbManager.BuildingQueries.MOVE_BUILDING(cityBuilding.getObjectUUID(), newParent.getObjectUUID(), localCoords.x, localCoords.y, localCoords.z);
 
-                // No longer a tree, no longer any protection contract!
+            // 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.
 
-                cityBuilding.setProtectionState(mbEnums.ProtectionState.NONE);
+            if (cityBuilding.getParentZoneID() != newParent.getParentZoneID())
+                cityBuilding.setParentZone(newParent);
 
-                // Remove warehouse entry if one exists.
+            // No longer a tree, no longer any protection contract!
 
-                if (cityBuilding.getBlueprint().getBuildingGroup() == mbEnums.BuildingGroup.WAREHOUSE) {
-                    DbManager.WarehouseQueries.DELETE_WAREHOUSE(city.warehouse);
-                    city.warehouse = null;
-                }
+            cityBuilding.setProtectionState(mbEnums.ProtectionState.NONE);
 
-                // Mark all auto protected buildings for destruction
+            // Remove warehouse entry if one exists.
 
-                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))
-                    destroySet.add(cityBuilding);
+            if (cityBuilding.getBlueprint().getBuildingGroup() == mbEnums.BuildingGroup.WAREHOUSE) {
+                DbManager.WarehouseQueries.DELETE_WAREHOUSE(city.warehouse);
+                city.warehouse = null;
             }
 
-            // Destroy set of auto-protected buildings
+            // Destroy all remaining city assets
 
-            for (Building building : destroySet)
-                if (building.getRank() != -1)
-                    BuildingManager.setRank(building, -1);
+            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 (city.realm != null) {
-                city.realm.removeCity(city.getObjectUUID());
-                city.realm = null;
+                if (cityBuilding.getRank() != -1)
+                    BuildingManager.setRank(cityBuilding, -1);
             }
+        }
 
-            // It's now safe to delete the city zone from the database
-            // which will cause a cascade delete of everything else
+        // Destroy the tol
 
-            if (!DbManager.ZoneQueries.DELETE_ZONE(cityZone)) {
-                Logger.error("DestroyCityThread", "Database error when deleting city zone: " + cityZone.getObjectUUID());
-                return;
-            }
+        if (tol != null)
+            BuildingManager.setRank(tol, -1);
+
+        if (city.realm != null)
+            city.realm.removeCity(city.getObjectUUID());
 
-            // Refresh the city for map requests
+        // It's now safe to delete the city zone from the database
+        // which will cause a cascade delete of everything else
 
-            City.lastCityUpdate = System.currentTimeMillis();
 
-        } catch (Exception e) {
-            Logger.error(e);
+        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.
 
-        Logger.info(city.getParent().zoneName + " uuid: " + city.getObjectUUID() + " has been destroyed!");
+        Logger.info(city.getParent().zoneName + " uuid:" + city.getObjectUUID() + "has been destroyed!");
     }
 }