extra sanity checks for claiming an abandoned tree

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/gameManager/CombatManager.java

@@ -197,8 +197,6 @@ public enum CombatManager {
                 }
         }
 
-        checkForProc(attacker,target,weapon);
-
         //get delay for the auto attack job
         long delay = 5000;
 
@@ -223,6 +221,16 @@ public enum CombatManager {
 
         if (inRange) {
 
+            if(attacker.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter)){
+                if(!attacker.getTimestamps().contains(slot.name()+"Attack")){
+                    attacker.getTimestamps().put(slot.name()+"Attack", System.currentTimeMillis() - 1000);
+                } else if(System.currentTimeMillis() < attacker.getTimestamps().get(slot.name()+"Attack") + delay){
+                    setAutoAttackJob(attacker,slot,delay);
+                    return;
+                }
+            }
+
+
             //handle retaliate
             if (AbstractCharacter.IsAbstractCharacter(target)) {
                 if (((AbstractCharacter) target).combatTarget == null || !((AbstractCharacter) target).combatTarget.isAlive()) {
@@ -359,6 +367,9 @@ public enum CombatManager {
                 }
             }
 
+            //check for proccing
+            checkForProc(attacker,target,weapon);
+
             //calculate the base damage
             int damage = ThreadLocalRandom.current().nextInt(min, max + 1);
             if (damage == 0) {

src/engine/gameManager/ForgeManager.java

@@ -265,12 +265,12 @@ public enum ForgeManager implements Runnable {
 
         // Assign a prefix and suffix to this item if random rolled
 
-        if (workOrder.prefixToken == 0)
+        if (workOrder.prefixToken == 0 && workOrder.vendor.getItemModTable().contains((template.modTable)))
             forgedItem.prefixToken = calcRandomMod(workOrder.vendor, mbEnums.ItemModType.PREFIX, template.modTable);
         else
             forgedItem.prefixToken = workOrder.prefixToken;
 
-        if (workOrder.suffixToken == 0)
+        if (workOrder.suffixToken == 0 && workOrder.vendor.getItemModTable().contains((template.modTable)))
             forgedItem.suffixToken = calcRandomMod(workOrder.vendor, mbEnums.ItemModType.SUFFIX, template.modTable);
         else
             forgedItem.suffixToken = workOrder.suffixToken;

src/engine/gameManager/ItemManager.java

@@ -102,7 +102,7 @@ public enum ItemManager {
             if (characterSkill == null)
                 return false;
 
-            if (characterSkill.getModifiedAmountBeforeMods() > required_value)
+            if (characterSkill.getModifiedAmountBeforeMods() >= required_value)
                 return true;
 
         }

src/engine/loot/WorkOrder.java

@@ -135,7 +135,8 @@ public class WorkOrder implements Delayed {
         if (!workOrder.vendor.charItemManager.hasRoomInventory(template.item_wt))
             return 30;  //30: That person cannot carry that item
 
-        if (!workOrder.vendor.getItemModTable().contains((template.modTable)))
+        if ((workOrder.prefixToken != 0 || workOrder.suffixToken != 0) &&
+                !workOrder.vendor.getItemModTable().contains((template.modTable)))
             return 59;   //59: This hireling does not have this formula
 
         if (!Warehouse.calcCostOverrun(workOrder).isEmpty())

src/engine/mbEnums.java

@@ -2727,7 +2727,7 @@ public class mbEnums {
         ANTIMONY(1580014, 1256147265, 452320058, 1000, 10),
         AZOTH(1580012, -1205326951, 78329697, 2000, 20),
         BLOODSTONE(1580020, -1912381716, -1569826353, 500, 5),
-        BRONZEWOOD(1580006, -519681813, 1334770447, 500, 10),
+        BRONZEWOOD(1580006, -519681813, 1334770447, 1000, 30),
         COAL(1580008, -1672872311, 2559427, 3000, 30),
         DIAMOND(1580010, 1540225085, -1730704107, 2000, 20),
         GALVOR(1580017, -1683992404, -1596311545, 2000, 5),

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/InviteToSubHandler.java

@@ -102,6 +102,9 @@ public class InviteToSubHandler extends AbstractClientMsgHandler {
         //source guild is limited to 7 subs
         //TODO this should be based on TOL rank
 
+        //cannot be subbed into a nation if you already have your own sub guilds
+        if(targetGuild.getSubGuildList() != null && targetGuild.getSubGuildList().size() > 0)
+            return true;
 
         if (!sourceGuild.canSubAGuild(targetGuild)) {
             sendChat(source, "This Guild can't be subbed.");

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

@@ -54,7 +54,7 @@ public class PetAttackMsgHandler extends AbstractClientMsgHandler {
             pet.setCombatTarget(PlayerCharacter.getPlayerCharacter(msg.getTargetID()));
 
         switch (msg.getTargetType()) {
-            case 53: //player character
+            case 52: //player character
                 pet.setCombatTarget(PlayerCharacter.getPlayerCharacter(msg.getTargetID()));
                 break;
             case 37://mob

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

@@ -528,8 +528,15 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
             return false;
 
         if (cityObject.warehouse != null) {
+            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/objects/CharacterItemManager.java

@@ -1400,6 +1400,7 @@ public class CharacterItemManager {
 
             if (!ItemManager.validForSkills(item, pc.getSkills())) {
                 this.forceToInventory(slot, item, pc, initialized);
+                this.equipped.remove(slot);
                 pc.applyBonuses();
             }
         }