Regex used for strsplit

src/engine/ConfigParsing/EffectEntry/Condition.java

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

src/engine/ConfigParsing/EffectEntry/EffectEntry.java

@@ -0,0 +1,12 @@
+package engine.ConfigParsing.EffectEntry;
+
+import java.util.HashSet;
+
+public class EffectEntry {
+    public String id;
+    public String name;
+    public int icon;
+    public HashSet<String> sources = new HashSet<>();
+    public HashSet<String> mods;
+    public HashSet<String> conditions;
+}

src/engine/ConfigParsing/EffectEntry/Mod.java

@@ -0,0 +1,12 @@
+package engine.ConfigParsing.EffectEntry;
+
+import engine.mbEnums;
+
+public class Mod {
+    public mbEnums.ModType type;
+    public int min;
+    public int max;
+    public float scale;
+    public String slopeType;
+    public String target;
+}

src/engine/ConfigParsing/EffectsParser.java

@@ -0,0 +1,80 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2024
+//                www.magicbane.com
+
+package engine.ConfigParsing;
+
+import engine.ConfigParsing.EffectEntry.EffectEntry;
+import engine.gameManager.ConfigManager;
+
+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.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class EffectsParser {
+
+    public static String EffectsPath = ConfigManager.DEFAULT_DATA_DIR + "wpak/Effects.cfg";
+    public static HashMap<String, EffectEntry> effect_data = new HashMap<>();
+    private static final Pattern EFFECT_REGEX = Pattern.compile("(?<=EFFECTBEGIN)(.+?)(?=EFFECTEND)", Pattern.DOTALL);
+    private static final Pattern SOURCE_REGEX = Pattern.compile("(?<=SOURCEBEGIN)(.+?)(?=SOURCEEND)", Pattern.DOTALL);
+    private static final Pattern MODS_REGEX = Pattern.compile("(?<=MODSBEGIN)(.+?)(?=MODSEEND)", Pattern.DOTALL);
+    private static final Pattern STRSPLIT_REGEX = Pattern.compile("([^\"]\\S*|\".+?\")\\s*");
+    public static void init() throws IOException {
+
+        byte[] fileData = Files.readAllBytes(Paths.get(EffectsPath));
+        String fileContents = new String(fileData);
+        Matcher matcher = EFFECT_REGEX.matcher(fileContents);
+
+        // Iterate effect entries from .wpak config data
+
+        while (matcher.find()) {
+            EffectEntry effectEntry = parseEffectEntry(matcher.group());
+
+            if (effectEntry != null)
+                effect_data.put(effectEntry.id, effectEntry);
+        }
+    }
+
+    private static EffectEntry parseEffectEntry(String effectData) {
+        EffectEntry effectEntry = new EffectEntry();
+
+        // Remove all lines that contain a # and leading/trailing blanks
+
+        effectData = effectData.replaceAll("(?m)^.*#.*\r?\n?", "");
+        effectData = effectData.trim();
+
+        // Parse effect entry description
+
+        String firstLine = effectData.substring(0, effectData.indexOf('\n'));
+        ArrayList<String> effectDescription = new ArrayList<>();
+
+        Matcher matcher = STRSPLIT_REGEX.matcher(firstLine);
+
+        while (matcher.find())
+            effectDescription.add(matcher.group(1));
+
+        effectEntry.id = effectDescription.get(0);
+        effectEntry.name = effectDescription.get(1);
+        effectEntry.icon = Integer.parseInt(effectDescription.get(2));
+
+        // Parse source entries
+
+        matcher = SOURCE_REGEX.matcher(effectData);
+
+        while (matcher.find())
+            effectEntry.sources.add(matcher.group().trim());
+
+        // Parse modifier entries
+
+        return effectEntry;
+
+    }
+}

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,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
@@ -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

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

src/engine/server/world/WorldServer.java

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

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,16 +51,40 @@ 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) {
@@ -77,6 +100,13 @@ 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
 
@@ -97,70 +127,45 @@ 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
+            // Destroy all remaining city assets
 
-                EnumSet<mbEnums.BuildingGroup> autoProtectFilter = EnumSet.of(mbEnums.BuildingGroup.TOL, mbEnums.BuildingGroup.BARRACK,
-                        mbEnums.BuildingGroup.SPIRE, mbEnums.BuildingGroup.SHRINE, mbEnums.BuildingGroup.WAREHOUSE);
+            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 (autoProtectFilter.contains(cityBuilding.getBlueprint().getBuildingGroup())) {
-
-                    if (cityBuilding.getRank() > -1)
+                if (cityBuilding.getRank() != -1)
                     BuildingManager.setRank(cityBuilding, -1);
             }
+        }
 
-                // Former guild loses tree!
+        // Destroy the tol
+
+        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", "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);
-        }
 
         // Zone and city should vanish upon next reboot
         // if the codebase reaches here.