Bronzewood mine_production updated.

src/engine/db/handlers/dbBuildingLocationHandler.java

@@ -32,14 +32,10 @@ public class dbBuildingLocationHandler extends dbHandlerBase {
         ArrayList<BuildingLocation> buildingLocations = new ArrayList<>();
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement(
+             PreparedStatement preparedStatement = connection.prepareStatement("select `ID`, `BuildingID`, `type`, `slot`, `unknown`, `locX`, `locY`, `locZ`, `w`,  `rotX`, `rotY`, `rotZ` from static_building_location " +
-                     "SELECT MIN(ID), BuildingID, slot, MIN(type), MIN(unknown), MIN(locX), MIN(locY), MIN(locZ), " +
+                     "where type = 6 or type = 8 " +
-                             "MIN(w), MIN(rotX), MIN(rotY), MIN(rotZ) " +
+                     "GROUP BY buildingID, slot " +
-                             "FROM static_building_location " +
+                     "ORDER BY buildingID, slot ASC;")) {
-                             "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 `siegesWithstood`=?"
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_city` SET `name`=?"
                      + " WHERE `UID` = ?")) {
 
             preparedStatement.setInt(1, value);

src/engine/db/handlers/dbHandlerBase.java

@@ -58,9 +58,6 @@ 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/BuildingManager.java

@@ -104,67 +104,67 @@ public enum BuildingManager {
         if (building == null)
             return false;
 
-        //cannot access destroyed buildings
         if (building.getRank() == -1)
             return false;
 
-        //admin characters can always access buildings
-        if (player.isCSR())
-            return true;
-
-        //owner can always access their own building
         if (IsOwner(building, player))
             return true;
 
-        //check for default IC access if building belongs to same guild
+        //individual friend.
-        if(player.guild.equals(building.getGuild())) {
-            if (building.getBlueprint() != null && building.getBlueprint().getBuildingGroup() != null) {
-                switch (building.getBlueprint().getBuildingGroup()) {
-                    case TOL:
-                    case BARRACK:
-                    case SPIRE:
-                    case SHRINE:
-                    case BANESTONE:
-                    case MINE:
-                    case WAREHOUSE:
-                    case BULWARK:
-                    case SIEGETENT:
-                        if (GuildStatusController.isInnerCouncil(player.getGuildStatus()))
-                            return true;
-                        if (GuildStatusController.isGuildLeader(player.getGuildStatus()))
-                            return true;
-                        break;
-                }
-            }
-        }
 
-        //check against friends list entries if any present
+        if (building.getFriends() != null && building.getFriends().get(player.getObjectUUID()) != null)
-        if (building.getFriends() != null) {
+            return true;
 
-            //check individuals
+        //Admins can access stuff
-            if (building.getFriends().get(player.getObjectUUID()) != null)
-                return true;
 
-            if (building.getFriends().get(player.guild.objectUUID) != null) {
+        if (player.isCSR())
+            return true;
 
-                //check friend type for guild related access
+        //Guild stuff
-                switch (building.getFriends().get(player.guild.objectUUID).friendType) {
+
-                    case 8: //full member
+        if (building.getGuild().isGuildLeader(player.getObjectUUID()))
-                        if (GuildStatusController.isFullMember(player.getGuildStatus()))
+            return true;
-                            return true;
+
-                        break;
+        if (building.getFriends().get(player.getGuild().getObjectUUID()) != null && building.getFriends().get(player.getGuild().getObjectUUID()).friendType == 8)
-                    case 9: //Inner Council
+            return true;
-                        if (GuildStatusController.isInnerCouncil(player.getGuildStatus()))
+
-                            return true;
+        if (building.getFriends().get(player.getGuild().getObjectUUID()) != null && building.getFriends().get(player.getGuild().getObjectUUID()).friendType == 9 && GuildStatusController.isInnerCouncil(player.getGuildStatus()))
-                        if (GuildStatusController.isGuildLeader(player.getGuildStatus()))
+            return true;
-                            return true;
+
-                        break;
+        if (Guild.sameGuild(building.getGuild(), player.getGuild()) && GuildStatusController.isInnerCouncil(player.getGuildStatus()))
+            return true;
+
+        return Guild.sameGuild(building.getGuild(), player.getGuild()) && GuildStatusController.isGuildLeader(player.getGuildStatus());
+
+        //TODO test friends list once added
+        //does not meet above criteria. Cannot access.
+    }
+
+    public static boolean playerCanManageNotFriends(PlayerCharacter player, Building building) {
+
+        //Player Can only Control Building if player is in Same Guild as Building and is higher rank than IC.
+
+        if (player == null)
+            return false;
+
+        if (building == null)
+            return false;
+
+        if (building.getRank() == -1)
+            return false;
+
+        if (IsOwner(building, player))
+            return true;
+
+        //Somehow guild leader check fails? lets check if Player is true Guild GL.
+        if (building.getGuild() != null && building.getGuild().isGuildLeader(player.getObjectUUID()))
+            return true;
+
+        if (!GuildStatusController.isGuildLeader(player.getGuildStatus()) && !GuildStatusController.isInnerCouncil(player.getGuildStatus()))
+            return false;
 
-                }
-            }
-        }
-        //did not meet access grant criteria, deny access
         return false;
+
     }
 
     public static synchronized boolean lootBuilding(PlayerCharacter player, Building building) {
@@ -468,14 +468,6 @@ public enum BuildingManager {
         if (Guild.sameNationExcludeErrant(building.getGuild(), player.getGuild()))
             return false;
 
-        if(building.enforceKOS) {
-            if (building.getCity() != null) {
-                Building TOL = building.getCity().getTOL();
-                if (TOL != null) {
-                    building = TOL;
-                }
-            }
-        }
         if (!building.reverseKOS) {
 
             Condemned condemn = building.getCondemned().get(player.getObjectUUID());

src/engine/gameManager/CombatManager.java

@@ -197,6 +197,8 @@ public enum CombatManager {
                 }
         }
 
+        checkForProc(attacker,target,weapon);
+
         //get delay for the auto attack job
         long delay = 5000;
 
@@ -221,16 +223,6 @@ 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()) {
@@ -367,9 +359,6 @@ 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 && workOrder.vendor.getItemModTable().contains((template.modTable)))
+        if (workOrder.prefixToken == 0)
             forgedItem.prefixToken = calcRandomMod(workOrder.vendor, mbEnums.ItemModType.PREFIX, template.modTable);
         else
             forgedItem.prefixToken = workOrder.prefixToken;
 
-        if (workOrder.suffixToken == 0 && workOrder.vendor.getItemModTable().contains((template.modTable)))
+        if (workOrder.suffixToken == 0)
             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/gameManager/PowersManager.java

@@ -926,6 +926,21 @@ public enum PowersManager {
                     mobTarget.handleDirectAggro(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
 
             if (pb.isHarmful())
@@ -946,7 +961,8 @@ public enum PowersManager {
                     continue;
                 // If something blocks the action, then stop
 
-                if (ab.blocked(target,pb.vampDrain)) {
+                if (ab.blocked(target, pb, trains)) {
+
                     PowersManager.sendEffectMsg(playerCharacter, 5, ab, pb);
                     continue;
                 }
@@ -1121,7 +1137,7 @@ public enum PowersManager {
                     continue;
                 // If something blocks the action, then stop
 
-                if (ab.blocked(target,pb.vampDrain))
+                if (ab.blocked(target, pb, trains))
                     continue;
                 // TODO handle overwrite stack order here
                 String stackType = ab.getStackType();
@@ -1435,7 +1451,7 @@ public enum PowersManager {
             if (trains < ab.getMinTrains() || trains > ab.getMaxTrains())
                 continue;
             // If something blocks the action, then stop
-            if (ab.blocked(target,pb.vampDrain))
+            if (ab.blocked(target, pb, trains))
                 // sendPowerMsg(pc, 5, msg);
                 continue;
             // TODO handle overwrite stack order here

src/engine/loot/WorkOrder.java

@@ -135,8 +135,7 @@ public class WorkOrder implements Delayed {
         if (!workOrder.vendor.charItemManager.hasRoomInventory(template.item_wt))
             return 30;  //30: That person cannot carry that item
 
-        if ((workOrder.prefixToken != 0 || workOrder.suffixToken != 0) &&
+        if (!workOrder.vendor.getItemModTable().contains((template.modTable)))
-                !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

@@ -831,22 +831,16 @@ public class mbEnums {
         SPIRES,
         SNARE,
         STUN,
-        BLINDNESS,
+        BLIND,
         ROOT,
         FEAR,
         CHARM,
-        POWERINHIBITOR,
+        POWERBLOCK,
         DEBUFF,
         STEAL,
         DRAIN;
 
         public static DamageType getDamageType(String modName) {
-            if(modName.toLowerCase().equals("blind"))
-                modName = "BLINDNESS";
-
-            if(modName.toLowerCase().equals("powerblock"))
-                modName = "POWERINHIBITOR";
-
             DamageType damageType;
             if (modName.isEmpty())
                 return DamageType.NONE;
@@ -2747,7 +2741,6 @@ public class mbEnums {
 
         public static HashMap<Integer, ResourceType> templateLookup = new HashMap<>();
         public static HashMap<Integer, ResourceType> templateHashLookup = new HashMap<>();
-        public static HashMap<Integer, ResourceType> resourceHashLookup = new HashMap<>();
         public int templateID;
         public ItemTemplate template;
         public int resourceHash;
@@ -2769,7 +2762,6 @@ public class mbEnums {
             for (ResourceType resourceType : ResourceType.values()) {
                 templateLookup.put(resourceType.templateID, resourceType);
                 templateHashLookup.put(resourceType.templateHash, resourceType);
-                resourceHashLookup.put(resourceType.resourceHash, resourceType);
             }
 
         }

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

@@ -50,7 +50,7 @@ public class ArcMineChangeProductionMsgHandler extends AbstractClientMsgHandler
 
         //make sure valid resource
 
-        mbEnums.ResourceType resource = mbEnums.ResourceType.resourceHashLookup.get(changeProductionMsg.getResourceHash());
+        mbEnums.ResourceType resource = mbEnums.ResourceType.templateHashLookup.get(changeProductionMsg.getResourceHash());
 
         if (resource == null)
             return true;

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

@@ -17,8 +17,9 @@ import engine.mbEnums.BuildingGroup;
 import engine.net.client.ClientConnection;
 import engine.net.client.msg.ClaimAssetMsg;
 import engine.net.client.msg.ClientNetMsg;
-import engine.net.client.msg.ErrorPopupMsg;
+import engine.objects.Blueprint;
-import engine.objects.*;
+import engine.objects.Building;
+import engine.objects.PlayerCharacter;
 import org.pmw.tinylog.Logger;
 
 import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -110,9 +111,9 @@ public class ClaimAssetMsgHandler extends AbstractClientMsgHandler {
             // Can't claim a tree if your guild already owns one
             // *** Refactor : Send error to player here
 
-            if(blueprint.getBuildingGroup() == BuildingGroup.TOL && !validateTreeClaim(sourcePlayer)){
+            if ((sourcePlayer.getGuild().isNation()) &&
+                    (blueprint.getBuildingGroup() == BuildingGroup.TOL))
                 return true;
-            }
 
             // Process the transfer of the building(s)
 
@@ -134,24 +135,4 @@ 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/ClaimGuildTreeMsgHandler.java

@@ -102,7 +102,7 @@ public class ClaimGuildTreeMsgHandler extends AbstractClientMsgHandler {
                     if (building.getGuild().isEmptyGuild())
                         return true;
 
-                    if (!BuildingManager.playerCanManage(sourcePlayer, building))
+                    if (!ManageCityAssetMsgHandler.playerCanManageNotFriends(sourcePlayer, building))
                         return true;
 
 
@@ -159,7 +159,7 @@ public class ClaimGuildTreeMsgHandler extends AbstractClientMsgHandler {
                             (building == null) || playerZone == null || playerCity == null)
                         return true;
 
-                    if (!BuildingManager.playerCanManage(sourcePlayer, building))
+                    if (!ManageCityAssetMsgHandler.playerCanManageNotFriends(sourcePlayer, building))
                         return true;
 
                     boolean open = (msg.getMessageType() == OPEN_CITY);

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

@@ -102,9 +102,6 @@ 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/ManageCityAssetMsgHandler.java

@@ -28,6 +28,30 @@ public class ManageCityAssetMsgHandler extends AbstractClientMsgHandler {
         super();
     }
 
+    public static boolean playerCanManageNotFriends(PlayerCharacter player, Building building) {
+
+        //Player Can only Control Building if player is in Same Guild as Building and is higher rank than IC.
+
+        if (player == null)
+            return false;
+
+        if (building.getRank() == -1)
+            return false;
+
+        if (BuildingManager.IsOwner(building, player))
+            return true;
+
+        if (GuildStatusController.isGuildLeader(player.getGuildStatus()) == false && GuildStatusController.isInnerCouncil(player.getGuildStatus()) == false)
+            return false;
+
+        //Somehow guild leader check fails above? lets check if Player is true Guild GL.
+        if (building.getGuild() != null && building.getGuild().isGuildLeader(player.getObjectUUID()))
+            return true;
+
+        return Guild.sameGuild(building.getGuild(), player.getGuild());
+
+    }
+
     @Override
     protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
 

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

@@ -183,7 +183,7 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
         if (building == null)
             return;
 
-        if (BuildingManager.playerCanManage(player, building) == false)
+        if (ManageCityAssetMsgHandler.playerCanManageNotFriends(player, building) == false)
             return;
 
         if (orderNpcMsg.getPatrolSize() >= 20)
@@ -411,7 +411,7 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
                 case 2:
                     player = SessionManager.getPlayerCharacter(origin);
 
-                    if (BuildingManager.playerCanManage(player, building) == false)
+                    if (ManageCityAssetMsgHandler.playerCanManageNotFriends(player, building) == false)
                         return true;
 
                     if (building.getHirelings().containsKey(npc) == false)

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 52: //player character
+            case 53: //player character
                 pet.setCombatTarget(PlayerCharacter.getPlayerCharacter(msg.getTargetID()));
                 break;
             case 37://mob

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

@@ -528,15 +528,8 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
             return false;
 
         if (cityObject.warehouse != null) {
-            if(cityObject.warehouse.building != null) {
+            PlaceAssetMsg.sendPlaceAssetError(origin, 50, "");  //"You can only have one warehouse"
-                //warehosue has a building already, warehouse still should exist
+            return false;
-                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/net/client/handlers/TransferGoldToFromBuildingMsgHandler.java

@@ -53,7 +53,7 @@ public class TransferGoldToFromBuildingMsgHandler extends AbstractClientMsgHandl
 
         if (msg.getDirection() == 2) {
 
-            if (!BuildingManager.playerCanManage(player, building))
+            if (!ManageCityAssetMsgHandler.playerCanManageNotFriends(player, building))
                 return true;
             if (building.setReserve(msg.getUnknown01(), player)) {
                 dispatch = Dispatch.borrow(player, msg);

src/engine/objects/Building.java

@@ -163,11 +163,6 @@ public class Building extends AbstractWorldObject {
             if (upgradeTimeStamp != null)
                 this.upgradeDateTime = LocalDateTime.ofInstant(upgradeTimeStamp.toInstant(), ZoneId.systemDefault());
 
-            if(rs.getInt("enforceKOS") == 0)
-                this.enforceKOS = false;
-            else
-                this.enforceKOS = true;
-
         } catch (Exception e) {
             Logger.error("Failed for object " + this.blueprintUUID + ' ' + this.getObjectUUID() + e);
         }
@@ -1452,7 +1447,7 @@ public class Building extends AbstractWorldObject {
 
     public synchronized boolean setReserve(int amount, PlayerCharacter player) {
 
-        if (!BuildingManager.playerCanManage(player, this))
+        if (!BuildingManager.playerCanManageNotFriends(player, this))
             return false;
 
         if (amount < 0)

src/engine/objects/CharacterItemManager.java

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

src/engine/objects/City.java

@@ -1197,18 +1197,14 @@ public class City extends AbstractWorldObject {
             // these assets are autoprotected.
 
             if ((cityBuilding.getBlueprint().getBuildingGroup() == BuildingGroup.TOL) || (cityBuilding.getBlueprint().getBuildingGroup() == BuildingGroup.SPIRE) || (cityBuilding.getBlueprint().getBuildingGroup() == BuildingGroup.BARRACK) || (cityBuilding.getBlueprint().isWallPiece()) || (cityBuilding.getBlueprint().getBuildingGroup() == BuildingGroup.SHRINE)) {
-                PlayerCharacter guildLeader = PlayerCharacter.getPlayerCharacter(sourcePlayer.guild.getGuildLeaderUUID());
+
-                if(guildLeader != null)
+                cityBuilding.claim(sourcePlayer);
-                    cityBuilding.claim(guildLeader);
-                else
-                    cityBuilding.claim(sourcePlayer);
                 cityBuilding.setProtectionState(ProtectionState.PROTECTED);
             }
         }
 
         this.setForceRename(true);
 
-
         // Reset city timer for map update
 
         City.lastCityUpdate = System.currentTimeMillis();

src/engine/objects/Resists.java

@@ -349,13 +349,13 @@ public class Resists {
             if (rb.getBool(ModType.ImmuneTo, SourceType.Stun))
                 this.immuneTo.put(mbEnums.DamageType.STUN, true);
             if (rb.getBool(ModType.ImmuneTo, SourceType.Blind))
-                this.immuneTo.put(mbEnums.DamageType.BLINDNESS, true);
+                this.immuneTo.put(mbEnums.DamageType.BLIND, true);
             if (rb.getBool(ModType.ImmuneToAttack, SourceType.None))
                 this.immuneTo.put(mbEnums.DamageType.ATTACK, true);
             if (rb.getBool(ModType.ImmuneToPowers, SourceType.None))
                 this.immuneTo.put(mbEnums.DamageType.POWERS, true);
             if (rb.getBool(ModType.ImmuneTo, SourceType.Powerblock))
-                this.immuneTo.put(mbEnums.DamageType.POWERINHIBITOR, true);
+                this.immuneTo.put(mbEnums.DamageType.POWERBLOCK, true);
             if (rb.getBool(ModType.ImmuneTo, SourceType.DeBuff))
                 this.immuneTo.put(mbEnums.DamageType.DEBUFF, true);
             if (rb.getBool(ModType.ImmuneTo, SourceType.Fear))

src/engine/powers/ActionsBase.java

@@ -11,11 +11,13 @@ package engine.powers;
 
 import engine.gameManager.DbManager;
 import engine.gameManager.PowersManager;
-import engine.mbEnums;
 import engine.mbEnums.ModType;
 import engine.mbEnums.SourceType;
 import engine.mbEnums.StackType;
-import engine.objects.*;
+import engine.objects.AbstractCharacter;
+import engine.objects.AbstractWorldObject;
+import engine.objects.PlayerBonuses;
+import engine.objects.Runegate;
 import engine.powers.poweractions.AbstractPowerAction;
 import org.pmw.tinylog.Logger;
 
@@ -242,23 +244,32 @@ public class ActionsBase {
     }
 
     //Add blocked types here
-    public boolean blocked(AbstractWorldObject awo, boolean vampDrain) {
+    public boolean blocked(AbstractWorldObject awo, PowersBase pb, int trains) {
-        //Check for immunities
+        if (AbstractWorldObject.IsAbstractCharacter(awo)) {
-        if (AbstractCharacter.IsAbstractCharacter(awo)){
+            AbstractCharacter ac = (AbstractCharacter) awo;
-            AbstractCharacter pcTarget = (AbstractCharacter) awo;
+            PlayerBonuses bonus = ac.getBonuses();
-            PlayerBonuses bonus = pcTarget.getBonuses();
+            if (bonus == null)
+                return false;
 
-            if(vampDrain)
+            //TODO make this more efficient then testing strings
-                return bonus.getBool(ModType.BlockedPowerType, SourceType.VAMPDRAIN);
+            if (this.stackType.equals("Stun") && bonus.getBool(ModType.ImmuneTo, SourceType.STUN))
-
+                return true; //Currently stun immune. Skip stun
-            if ((this.stackType.equals("Flight") && bonus.getBool(ModType.NoMod, SourceType.Fly)) ||
+            else if (this.stackType.equals("Snare") && bonus.getBool(ModType.ImmuneTo, SourceType.Snare))
-                    (this.stackType.equals("Track") && bonus.getBool(ModType.CannotTrack, SourceType.None))) {
+                return true; //Currently snare immune. Skip snare
+            else if (this.stackType.equals("Blindness") && bonus.getBool(ModType.ImmuneTo, SourceType.Blind))
+                return true; //Currently blind immune. Skip blind
+            else if (this.stackType.equals("PowerInhibitor") && bonus.getBool(ModType.ImmuneTo, SourceType.Powerblock))
+                return true; //Currently power block immune. Skip power block
+            else if (this.stackType.equals("Root") && bonus.getBool(ModType.ImmuneTo, SourceType.Root))
                 return true;
-            }
+                //			else if (pb.isHeal() && (bonus.getByte("immuneTo.Heal")) >= trains)
-
+                //				return true; //Currently shadowmantled. Skip heals
-            mbEnums.DamageType damageType = mbEnums.DamageType.getDamageType(this.stackType.toUpperCase());
+            else if (this.stackType.equals("Flight") && bonus.getBool(ModType.NoMod, SourceType.Fly))
-            return pcTarget.getResists().immuneTo(damageType);
+                return true;
-
+            else if (this.stackType.equals("Track") && bonus.getBool(ModType.CannotTrack, SourceType.None))
+                return true;
+            else
+                return pb.vampDrain() && bonus.getBool(ModType.BlockedPowerType, SourceType.VAMPDRAIN);
         }
         return false;
     }