Bane logic tweaking

src/engine/ConfigParsing/EffectsData/Condition.java

@@ -1,6 +0,0 @@
-package engine.ConfigParsing.EffectsData;
-
-public class Condition {
-    public String type;
-    public String value;
-}

src/engine/ConfigParsing/EffectsData/EffectData.java

@@ -1,14 +0,0 @@
-package engine.ConfigParsing.EffectsData;
-
-import engine.mbEnums;
-
-import java.util.ArrayList;
-
-public class EffectData {
-    public String id;
-    public String name;
-    public int icon;
-    public ArrayList<mbEnums.EffectSourceType> sources;
-    public ArrayList<Mod> mods;
-    public ArrayList<String> conditions;
-}

src/engine/ConfigParsing/EffectsData/Mod.java

@@ -1,10 +0,0 @@
-package engine.ConfigParsing.EffectsData;
-
-import engine.mbEnums;
-
-import java.util.ArrayList;
-
-public class Mod {
-    public mbEnums.ModType type;
-    public ArrayList<String> values;
-}

src/engine/ConfigParsing/EffectsParser.java

@@ -1,200 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      Magicbane Emulator Project © 2013 - 2024
-//                www.magicbane.com
-
-
-package engine.ConfigParsing;
-
-import engine.ConfigParsing.EffectsData.Condition;
-import engine.ConfigParsing.EffectsData.EffectData;
-import engine.ConfigParsing.EffectsData.Mod;
-import engine.gameManager.ConfigManager;
-import engine.mbEnums;
-import org.pmw.tinylog.Logger;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-public class EffectsParser {
-
-    public static String EffectsPath = ConfigManager.DEFAULT_DATA_DIR + "wpak/Effects.cfg";
-    public static HashMap<String, EffectData> effect_data = new HashMap<>();
-
-    public static void init() throws IOException {
-
-        ArrayList<ArrayList<String>> compiledData = new ArrayList<>();
-        List<String> fileData = Files.readAllLines(Paths.get(EffectsPath));
-        ArrayList<String> modData = new ArrayList<>();
-
-        for (String line : fileData) {
-
-            if (line.contains("EFFECTBEGIN")) {
-                modData = new ArrayList<>();
-                continue;
-            }
-
-            if (line.contains("EFFECTEND"))
-                compiledData.add(modData);
-            else
-                modData.add(line);
-        }
-
-        CreateBlocks(compiledData);
-    }
-
-    public static void CreateBlocks(ArrayList<ArrayList<String>> compiledData) {
-
-        for (ArrayList<String> compiledLines : compiledData) {
-
-            EffectData effectData = new EffectData();
-            effectData.id = compiledLines.get(1).replace("     ", "").split(" ")[0];
-            effectData.sources = new ArrayList<>();
-            effectData.mods = new ArrayList<>();
-            effectData.conditions = new ArrayList<>();
-
-            try {
-                String rawData = compiledLines.get(1).replace("     ", "");
-                if(rawData.contains("\"")){
-                    int startIndex = rawData.indexOf('"') + 1;
-                    int endIndex = rawData.lastIndexOf('"');
-                    char[] nameValue = rawData.toCharArray();
-                    String name = "";
-                    for(int i = startIndex; i < endIndex; i++){
-                        name += nameValue[i];
-                    }
-                    effectData.name = name;
-                }
-                int iconID;
-                try {
-                    iconID = Integer.parseInt(compiledLines.get(1).replace("     ", "").split(" ")[2]);
-                } catch(Exception e){
-                    iconID = 0;
-                }
-                effectData.icon = iconID;
-            } catch (Exception e) {
-                Logger.error(e);
-            }
-
-            int index = 0;
-
-            //log all sources
-
-            for (String line : compiledLines) {
-                String rawValue;
-                if (line.contains("SOURCEBEGIN")) {
-                    rawValue = compiledLines.get(index + 1).replace("          ", "");
-                    switch (rawValue) {
-                        case "Crush":
-                            rawValue = "Crushing";
-                            break;
-                        case "Slash":
-                            rawValue = "Slashing";
-                            break;
-                        case "Pierce":
-                            rawValue = "Piercing";
-                            break;
-
-                    }
-                    effectData.sources.add(mbEnums.EffectSourceType.valueOf(rawValue));
-                }
-                index++;
-            }
-
-            //log all mods
-
-            index = 0;
-
-            for (String line : compiledLines) {
-
-                if (line.contains("MODSBEGIN")) {
-
-                    int extra = 1;
-                    Mod mod = new Mod();
-
-                    while (!compiledLines.get(index + extra).contains("MODSEND")) {
-                        //data.mods.add(lines[index + extra].Replace("          ", ""));
-                        String rawValue = compiledLines.get(index + extra).replace("          ", "").split(" ")[0];
-                        try {
-                            mod.type = mbEnums.ModType.valueOf(rawValue);
-                        }catch(Exception e){
-                            mod.type = mbEnums.ModType.None;
-                        }
-                        GenerateModValues(mod, compiledLines.get(index + extra).replace("          ", "").replace("    ", "").split(" "));
-                        extra++;
-                    }
-                    effectData.mods.add(mod);
-                }
-                index++;
-            }
-
-            //log all conditions
-
-            index = 0;
-            for (String line : compiledLines) {
-
-                if (line.contains("CONDITIONBEGIN")) {
-
-                    int extra = 1;
-
-                    while (!compiledLines.get(index + extra).contains("CONDITIONEND")) {
-
-                        if (!compiledLines.get(index + extra).contains("#")) {
-                            //data.conditions.add(lines[index + extra].Replace("          ", ""));
-                            Condition condition = new Condition();
-                            condition.type = compiledLines.get(index + extra).replace("          ", "").split(" ")[0];
-                            condition.value = compiledLines.get(index + extra).replace("          ", "").split(" ")[1];
-                        }
-                        extra++;
-                    }
-                }
-                index++;
-            }
-            effect_data.put(effectData.id, effectData);
-        }
-        Logger.info("Effects.cfg Parsing Completed");
-    }
-
-    public static void GenerateModValues(Mod inMod, String[] data) {
-
-
-
-        int maxValue = 5;
-
-        if(inMod.type != null && inMod.type.name().equals("Health")){
-            maxValue = 7;
-        }
-
-        if(data.length < maxValue)
-            maxValue = data.length;
-
-        inMod.values = new ArrayList<>();
-
-        for (int i = 1; i < data.length; i++)
-            if (!data[i].isEmpty()) {
-                if (i >= maxValue)
-                    continue;
-
-                if (i == maxValue - 1)
-                    try {
-                        String entry = "";
-                        for (int j = i; j < data.length; j ++){
-                           entry += data[j] + " ";
-                        }
-                        entry = entry.trim();
-                        inMod.values.add(entry.trim());
-                    } catch (Exception e) {
-                        inMod.values.add(data[i]);
-                    }
-                else
-                    inMod.values.add(data[i]);
-            }
-    }
-}

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/server/world/WorldServer.java

@@ -9,7 +9,6 @@
 
 package engine.server.world;
 
-import engine.ConfigParsing.EffectsParser;
 import engine.InterestManagement.RealmMap;
 import engine.InterestManagement.WorldGrid;
 import engine.db.archive.DataWarehouse;
@@ -77,7 +76,7 @@ public class WorldServer {
         super();
     }
 
-    public static void main(String[] args) throws IOException {
+    public static void main(String[] args) {
 
         WorldServer worldServer;
 
@@ -94,8 +93,6 @@ public class WorldServer {
             return;
         }
 
-        EffectsParser.init();
-
         try {
 
             worldServer = new WorldServer();

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