Increase to handle larger banks.

src/engine/db/handlers/dbWarehouseHandler.java

@@ -136,6 +136,12 @@ public class dbWarehouseHandler extends dbHandlerBase {
                 int cityUID = rs.getInt("cityUUID");
                 JSONObject jsonObject = new JSONObject(rs.getString("warehouse"));
                 City city = City.getCity(cityUID);
+
+                if (city == null) {
+                    Logger.error("No city " + cityUID + " for warehouse");
+                    continue;
+                }
+
                 city.warehouse = new Warehouse(jsonObject);
                 city.warehouse.city = city;
 

src/engine/gameManager/CombatManager.java

@@ -168,12 +168,12 @@ public enum CombatManager {
         switch (target.getObjectType()) {
             case PlayerCharacter:
                 attackRange += ((PlayerCharacter) target).getCharacterHeight() * 0.5f;
-                if (distanceSquared < attackRange * attackRange)
+                if (distanceSquared <= attackRange * attackRange)
                     inRange = true;
                 break;
             case Mob:
                 attackRange += ((AbstractCharacter) target).calcHitBox();
-                if (distanceSquared < attackRange * attackRange)
+                if (distanceSquared <= attackRange * attackRange)
                     inRange = true;
                 break;
             case Building:
@@ -201,7 +201,7 @@ public enum CombatManager {
 
         if (weapon != null) {
 
-            int wepSpeed = (int) (weapon.template.item_weapon_wepspeed);
+            float wepSpeed = (int) (weapon.template.item_weapon_wepspeed);
 
             if (weapon.getBonusPercent(mbEnums.ModType.WeaponSpeed, mbEnums.SourceType.None) != 0f) //add weapon speed bonus
                 wepSpeed *= (1 + weapon.getBonus(mbEnums.ModType.WeaponSpeed, mbEnums.SourceType.None));
@@ -212,7 +212,7 @@ public enum CombatManager {
             if (wepSpeed < 10)
                 wepSpeed = 10; //Old was 10, but it can be reached lower with legit buffs,effects.
 
-            delay = wepSpeed * 100L;
+            delay = (long)wepSpeed * 100L;
         }
 
         if (attacker.getObjectType().equals(mbEnums.GameObjectType.Mob))

src/engine/gameManager/PowersManager.java

@@ -176,12 +176,29 @@ public enum PowersManager {
             PowersBase pb = PowersManager.powersBaseByToken.get(msg.getPowerUsedID());
             PlayerCharacter caster = origin.getPlayerCharacter();
             PlayerCharacter target = PlayerCharacter.getFromCache(msg.getTargetID());
-            if (pb != null && pb.isHarmful == false) {
+            if (pb != null && pb.enforceLore()) {
                 //if (caster.guild.equals(Guild.getErrantGuild()))
                 //    return;
 
-                if (target != null && caster.guild.getGuildType().equals(target.guild.getGuildType()) == false && target.getObjectType().equals(GameObjectType.Building) == false)
+                if (target != null && caster.guild.getGuildType().equals(target.guild.getGuildType()) == false && target.getObjectType().equals(GameObjectType.Building) == false) {
+                    RecyclePowerMsg recyclePowerMsg = new RecyclePowerMsg(msg.getPowerUsedID());
+                    Dispatch dispatch = Dispatch.borrow(origin.getPlayerCharacter(), recyclePowerMsg);
+                    DispatchManager.dispatchMsgDispatch(dispatch, DispatchChannel.PRIMARY);
+
+                    // Send Fail to cast message
+                    PlayerCharacter pc = SessionManager
+                            .getPlayerCharacter(origin);
+
+                    if (pc != null) {
+                        sendPowerMsg(pc, 2, msg);
+                        if (pc.isCasting()) {
+                            pc.update();
+                        }
+
+                        pc.setIsCasting(false);
+                    }
                     return;
+                }
             }
         }
 
@@ -908,9 +925,20 @@ public enum PowersManager {
                 if (pb.isHarmful())
                     mobTarget.handleDirectAggro(playerCharacter);
             }
-            //Power is aiding a target, handle aggro if combat target is a Mob.
-            if (!pb.isHarmful() && target.getObjectType() == GameObjectType.PlayerCharacter) {
+
+            //Check for immunities
+            if (target.getObjectType() == GameObjectType.PlayerCharacter) {
                 PlayerCharacter pcTarget = (PlayerCharacter) target;
+                PlayerBonuses tarBonus = pcTarget.getBonuses();
+                SourceType source = SourceType.GetSourceType(pb.category);
+                boolean immune = tarBonus.getBool(ModType.ImmuneTo, source);
+                if(!immune){
+                    DamageType damageType = DamageType.getDamageType(pb.category);
+                    immune = pcTarget.getResists().immuneTo(damageType);
+                }
+                if(immune){
+                    return;
+                }
             }
 
             // update target of used power timer

src/engine/net/client/msg/SendOwnPlayerMsg.java

@@ -59,7 +59,7 @@ public class SendOwnPlayerMsg extends ClientNetMsg {
     @Override
     protected int getPowerOfTwoBufferSize() {
         //Larger size for historically larger opcodes
-        return (17); // 2^17 == 131,072
+        return (18); // 2^17 == 131,072
     }
 
     /**

src/engine/objects/AbstractCharacter.java

@@ -656,13 +656,13 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
         AssignDamageAtrForPlayers(abstractCharacter, equipped.get(EquipSlotType.LHELD), false, equipped.get(EquipSlotType.LHELD));
         if (abstractCharacter.getObjectType().equals(GameObjectType.Mob)) {
             Mob mob = (Mob) abstractCharacter;
-            abstractCharacter.minDamageHandOne += (int) mob.mobBase.getDamageMin();
-            abstractCharacter.minDamageHandTwo += (int) mob.mobBase.getDamageMin();
-            abstractCharacter.maxDamageHandOne += (int) mob.mobBase.getDamageMax();
-            abstractCharacter.maxDamageHandTwo += (int) mob.mobBase.getDamageMax();
-            abstractCharacter.atrHandOne += mob.mobBase.getAttackRating();
-            abstractCharacter.atrHandTwo += mob.mobBase.getAttackRating();
-            abstractCharacter.defenseRating += mob.mobBase.getDefenseRating();
+            abstractCharacter.minDamageHandOne = (int) mob.mobBase.getDamageMin();
+            abstractCharacter.minDamageHandTwo = (int) mob.mobBase.getDamageMin();
+            abstractCharacter.maxDamageHandOne = (int) mob.mobBase.getDamageMax();
+            abstractCharacter.maxDamageHandTwo = (int) mob.mobBase.getDamageMax();
+            abstractCharacter.atrHandOne = mob.mobBase.getAttackRating();
+            abstractCharacter.atrHandTwo = mob.mobBase.getAttackRating();
+            abstractCharacter.defenseRating = mob.mobBase.getDefenseRating();
         }
     }
 

src/engine/objects/Warehouse.java

@@ -429,7 +429,7 @@ public class Warehouse {
             return false;
 
         if (addToInventory)
-            if (!itemMan.hasRoomInventory(template.item_wt * amount)) {
+            if (!itemMan.hasRoomInventory(template.item_wt)) {
                 ChatManager.chatSystemInfo(playerCharacter, "You can not carry any more of that item.");
                 return false;
             }

src/engine/powers/PowersBase.java

@@ -633,4 +633,8 @@ public class PowersBase {
         return description;
     }
 
+    public boolean enforceLore(){
+        return this.powerCategory.equals(PowerCategoryType.SUMMON) || this.powerCategory.equals(PowerCategoryType.HEAL)|| this.powerCategory.equals(PowerCategoryType.BUFF);
+    }
+
 }

src/engine/workthreads/DestroyCityThread.java

@@ -125,6 +125,13 @@ public class DestroyCityThread implements Runnable {
 
             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
 
             if ((cityBuilding.getBlueprint().getBuildingGroup() == mbEnums.BuildingGroup.BARRACK)