Bane logic tweaking

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

@@ -505,6 +505,11 @@ 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
@@ -600,8 +605,6 @@ 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,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 isDestroyed = new AtomicBoolean();
 
     /**
      * ResultSet Constructor
@@ -1102,9 +1104,14 @@ 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.getName());
+        destroyCityThread.setName("destroyCity: " + this.getParent().zoneName);
         destroyCityThread.start();
     }
 
@@ -1112,7 +1119,7 @@ public class City extends AbstractWorldObject {
 
         Thread transferCityThread = new Thread(new TransferCityThread(this, newOwner));
 
-        transferCityThread.setName("TransferCity:" + this.getName());
+        transferCityThread.setName("TransferCity:" + this.getParent().zoneName);
         transferCityThread.start();
     }
 

src/engine/workthreads/DestroyCityThread.java

@@ -31,6 +31,7 @@ import engine.objects.Zone;
 import org.pmw.tinylog.Logger;
 
 import java.util.ArrayList;
+import java.util.EnumSet;
 
 public class DestroyCityThread implements Runnable {
 
@@ -51,40 +52,16 @@ public class DestroyCityThread implements Runnable {
         Vector3fImmutable localCoords;
         ArrayList<Guild> subGuildList;
 
+        Logger.info("Destroy city routine started");
+
+        try {
+
             // Member variable assignment
 
             cityZone = city.getParent();
             newParent = cityZone.parent;
             formerGuild = city.getTOL().getGuild();
 
-        // Former guild loses it's tree!
-
-        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);
-        }
-
-        // 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) {
@@ -100,13 +77,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
 
@@ -127,45 +97,70 @@ public class DestroyCityThread implements Runnable {
 
                 // Remove warehouse entry if one exists.
 
-            if (cityBuilding.getBlueprint().getBuildingGroup() == mbEnums.BuildingGroup.WAREHOUSE) {
+                if (cityBuilding.getBlueprint().getBuildingGroup().equals(mbEnums.BuildingGroup.WAREHOUSE)) {
                     DbManager.WarehouseQueries.DELETE_WAREHOUSE(city.warehouse);
                     city.warehouse = null;
                 }
 
-            // Destroy all remaining city assets
+                // Destroy all remaining auto-protected city assets
 
-            if ((cityBuilding.getBlueprint().getBuildingGroup() == mbEnums.BuildingGroup.BARRACK)
+                EnumSet<mbEnums.BuildingGroup> autoProtectFilter = EnumSet.of(mbEnums.BuildingGroup.TOL, mbEnums.BuildingGroup.BARRACK,
-                    || (cityBuilding.getBlueprint().isWallPiece())
+                        mbEnums.BuildingGroup.SPIRE, mbEnums.BuildingGroup.SHRINE, mbEnums.BuildingGroup.WAREHOUSE);
-                    || (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)
+                if (autoProtectFilter.contains(cityBuilding.getBlueprint().getBuildingGroup())) {
+
+                    if (cityBuilding.getRank() > -1)
                         BuildingManager.setRank(cityBuilding, -1);
                 }
-        }
 
-        // Destroy the tol
+                // Former guild loses tree!
-
-        if (tol != null)
-            BuildingManager.setRank(tol, -1);
 
                 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", "Database error when deleting city zone: " + cityZone.getObjectUUID());
+                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);
+        }
 
         // Zone and city should vanish upon next reboot
         // if the codebase reaches here.