Bane logic tweaking

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 it's
+        // If the tree is R8 and deranking, we need to update the
         // mesh along with buildings losing their health bonus
 
         if (this.rank == 8) {

src/engine/workthreads/DestroyCityThread.java

@@ -53,11 +53,12 @@ public class DestroyCityThread implements Runnable {
 
         // Member variable assignment
 
+        try {
             cityZone = city.getParent();
             newParent = cityZone.parent;
             formerGuild = city.getTOL().getGuild();
 
-        // Former guild loses it's tree!
+            // Former guild loses tree!
 
             if (DbManager.GuildQueries.SET_GUILD_OWNED_CITY(formerGuild.getObjectUUID(), 0)) {
 
@@ -83,8 +84,6 @@ public class DestroyCityThread implements Runnable {
                 }
             }
 
-        Building tol = null;
-
             // Build list of buildings within this parent zone
 
             for (Building cityBuilding : cityZone.zoneBuildingSet) {
@@ -100,13 +99,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
 
@@ -132,8 +124,6 @@ public class DestroyCityThread implements Runnable {
                     city.warehouse = null;
                 }
 
-            // Destroy all remaining city assets
-
                 if ((cityBuilding.getBlueprint().getBuildingGroup() == mbEnums.BuildingGroup.BARRACK)
                         || (cityBuilding.getBlueprint().isWallPiece())
                         || (cityBuilding.getBlueprint().getBuildingGroup() == mbEnums.BuildingGroup.SHRINE)
@@ -146,18 +136,14 @@ public class DestroyCityThread implements Runnable {
                 }
             }
 
-        // Destroy the tol
-
-        if (tol != null)
-            BuildingManager.setRank(tol, -1);
-
-        if (city.realm != null)
+            if (city.realm != null) {
                 city.realm.removeCity(city.getObjectUUID());
+                city.realm = null;
+            }
 
             // 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;
@@ -167,6 +153,10 @@ public class DestroyCityThread implements Runnable {
 
             City.lastCityUpdate = System.currentTimeMillis();
 
+        } catch (Exception e) {
+            Logger.error(e);
+        }
+
         // Zone and city should vanish upon next reboot
         // if the codebase reaches here.