extra sanity checks for claiming an abandoned tree

src/engine/ConfigParsing/EffectEntry/Condition.java

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

src/engine/ConfigParsing/EffectEntry/EffectEntry.java

@@ -1,12 +0,0 @@
-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

@@ -1,12 +0,0 @@
-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

@@ -1,80 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      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/db/handlers/dbBuildingLocationHandler.java

@@ -32,10 +32,14 @@ public class dbBuildingLocationHandler extends dbHandlerBase {
         ArrayList<BuildingLocation> buildingLocations = new ArrayList<>();
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("select `ID`, `BuildingID`, `type`, `slot`, `unknown`, `locX`, `locY`, `locZ`, `w`,  `rotX`, `rotY`, `rotZ` from static_building_location " +
-                     "where type = 6 or type = 8 " +
-                     "GROUP BY buildingID, slot " +
-                     "ORDER BY buildingID, slot ASC;")) {
+             PreparedStatement preparedStatement = connection.prepareStatement(
+                     "SELECT MIN(ID), BuildingID, slot, MIN(type), MIN(unknown), MIN(locX), MIN(locY), MIN(locZ), " +
+                             "MIN(w), MIN(rotX), MIN(rotY), MIN(rotZ) " +
+                             "FROM static_building_location " +
+                             "WHERE type IN (6, 8) " +
+                             "GROUP BY BuildingID, slot " +
+                             "ORDER BY BuildingID, slot ASC;"
+             )) {
 
             ResultSet rs = preparedStatement.executeQuery();
             buildingLocations = getObjectsFromRs(rs, 20);

src/engine/db/handlers/dbCityHandler.java

@@ -210,7 +210,7 @@ public class dbCityHandler extends dbHandlerBase {
     public boolean updateSiegesWithstood(City city, int value) {
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_city` SET `name`=?"
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_city` SET `siegesWithstood`=?"
                      + " WHERE `UID` = ?")) {
 
             preparedStatement.setInt(1, value);

src/engine/db/handlers/dbHandlerBase.java

@@ -58,6 +58,9 @@ public abstract class dbHandlerBase {
 
                 int id = rs.getInt(1);
 
+                if (id == 883640)
+                    Logger.info("hit");
+
                 if (DbManager.inCache(localObjectType, id)) {
                     objectList.add((T) DbManager.getFromCache(localObjectType, id));
                 } else {

src/engine/net/client/handlers/ClaimAssetMsgHandler.java

@@ -17,9 +17,8 @@ import engine.mbEnums.BuildingGroup;
 import engine.net.client.ClientConnection;
 import engine.net.client.msg.ClaimAssetMsg;
 import engine.net.client.msg.ClientNetMsg;
-import engine.objects.Blueprint;
-import engine.objects.Building;
-import engine.objects.PlayerCharacter;
+import engine.net.client.msg.ErrorPopupMsg;
+import engine.objects.*;
 import org.pmw.tinylog.Logger;
 
 import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -111,9 +110,9 @@ public class ClaimAssetMsgHandler extends AbstractClientMsgHandler {
             // Can't claim a tree if your guild already owns one
             // *** Refactor : Send error to player here
 
-            if ((sourcePlayer.getGuild().isNation()) &&
-                    (blueprint.getBuildingGroup() == BuildingGroup.TOL))
+            if(blueprint.getBuildingGroup() == BuildingGroup.TOL && !validateTreeClaim(sourcePlayer)){
                 return true;
+            }
 
             // Process the transfer of the building(s)
 
@@ -135,4 +134,24 @@ public class ClaimAssetMsgHandler extends AbstractClientMsgHandler {
         return true;
     }
 
+    private boolean validateTreeClaim(PlayerCharacter sourcePlayer) {
+
+        if(sourcePlayer.guild.equals(Guild.getErrantGuild())) {
+            ErrorPopupMsg.sendErrorMsg(sourcePlayer, "Errant Players Cannot Claim Cities!");
+            return false;
+        }
+
+        if(sourcePlayer.guild.getOwnedCity() != null) {
+            ErrorPopupMsg.sendErrorMsg(sourcePlayer, "Your Guild Already Owns A City!");
+            return false;
+        }
+
+        if(!GuildStatusController.isGuildLeader(sourcePlayer.getGuildStatus())) {
+            ErrorPopupMsg.sendErrorMsg(sourcePlayer, "Only A Guild Leader Can Claim A Tree Of Life!");
+            return false;
+        }
+
+        return true;
+    }
+
 }

src/engine/net/client/handlers/PlaceAssetMsgHandler.java

@@ -528,8 +528,15 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
             return false;
 
         if (cityObject.warehouse != null) {
-            PlaceAssetMsg.sendPlaceAssetError(origin, 50, "");  //"You can only have one warehouse"
-            return false;
+            if(cityObject.warehouse.building != null) {
+                //warehosue has a building already, warehouse still should exist
+                PlaceAssetMsg.sendPlaceAssetError(origin, 50, "");  //"You can only have one warehouse"
+                return false;
+            }else{
+                //warehouse has no building and needs a cleanup
+                DbManager.WarehouseQueries.DELETE_WAREHOUSE(cityObject.warehouse);
+                cityObject.warehouse = null;
+            }
         }
 
         // Create the warehouse object and it's entry in the database

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();