Update to player city filter

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 < 0)
             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

@@ -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
@@ -566,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) {
@@ -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

@@ -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 isDestroyed = new AtomicBoolean(false);
 
     /**
      * ResultSet Constructor
@@ -308,6 +308,21 @@ 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))
@@ -1104,15 +1119,14 @@ public class City extends AbstractWorldObject {
 
     public final void destroy() {
 
-        if (this.isDestroyed.compareAndSet(false, true) == false) {
+        if (this.isDestroyed.compareAndSet(false, true)) {
-            Logger.error("Attempt to destroy tol twice");
-            return;
-        }
 
-        Thread destroyCityThread = new Thread(new DestroyCityThread(this));
+            Thread destroyCityThread = new Thread(new DestroyCityThread(this));
 
-        destroyCityThread.setName("destroyCity: " + this.getParent().zoneName);
+            destroyCityThread.setName("destroyCity:" + this.getParent().zoneName);
-        destroyCityThread.start();
+            destroyCityThread.start();
+        } else
+            Logger.error("Attempt to destroy destroyed city");
     }
 
     public final void transfer(AbstractCharacter newOwner) {

src/engine/objects/Mine.java

@@ -220,8 +220,7 @@ 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

@@ -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,18 +51,45 @@ public class DestroyCityThread implements Runnable {
         Vector3fImmutable localCoords;
         ArrayList<Guild> subGuildList;
 
-        Logger.info("Destroy city routine started");
+        // Member variable assignment
 
         try {
-
-            // Member variable assignment
-
             cityZone = city.getParent();
             newParent = cityZone.parent;
             formerGuild = city.getTOL().getGuild();
 
+            Logger.info("Destroy city thread started for: " + cityZone.zoneName);
+
+            // Former guild loses 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);
+                }
+            }
+
             // Build list of buildings within this parent zone
 
+            ArrayList<Building> destroySet = new ArrayList<>();
+
             for (Building cityBuilding : cityZone.zoneBuildingSet) {
 
                 // Sanity Check in case player deletes the building
@@ -97,67 +123,40 @@ public class DestroyCityThread implements Runnable {
 
                 // Remove warehouse entry if one exists.
 
-                if (cityBuilding.getBlueprint().getBuildingGroup().equals(mbEnums.BuildingGroup.WAREHOUSE)) {
+                if (cityBuilding.getBlueprint().getBuildingGroup() == mbEnums.BuildingGroup.WAREHOUSE) {
                     DbManager.WarehouseQueries.DELETE_WAREHOUSE(city.warehouse);
                     city.warehouse = null;
                 }
 
-                // Destroy all remaining auto-protected city assets
+                // Mark all auto protected buildings for destruction
 
-                EnumSet<mbEnums.BuildingGroup> autoProtectFilter = EnumSet.of(mbEnums.BuildingGroup.TOL, mbEnums.BuildingGroup.BARRACK,
+                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))
-                        mbEnums.BuildingGroup.SPIRE, mbEnums.BuildingGroup.SHRINE, mbEnums.BuildingGroup.WAREHOUSE);
+                    destroySet.add(cityBuilding);
+            }
 
-                if (autoProtectFilter.contains(cityBuilding.getBlueprint().getBuildingGroup())) {
+            // Destroy set of auto-protected buildings
 
-                    if (cityBuilding.getRank() > -1)
+            for (Building building : destroySet)
-                        BuildingManager.setRank(cityBuilding, -1);
+                if (building.getRank() != -1)
-                }
+                    BuildingManager.setRank(building, -1);
 
-                // Former guild loses tree!
+            if (city.realm != null) {
-
+                city.realm.removeCity(city.getObjectUUID());
-                if (city.realm != null)
+                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) {
+            if (!DbManager.ZoneQueries.DELETE_ZONE(cityZone)) {
-                Logger.error("DestroyCityThread", "Error when deleting city zone: " + cityZone.getObjectUUID());
+                Logger.error("DestroyCityThread", "Database error when deleting city zone: " + cityZone.getObjectUUID());
                 return;
             }
 
             // Refresh the city for map requests
 
             City.lastCityUpdate = System.currentTimeMillis();
+
         } catch (Exception e) {
             Logger.error(e);
         }
@@ -165,6 +164,6 @@ public class DestroyCityThread implements Runnable {
         // 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!");
     }
 }