fixed null exception in aggro

2023-03-02 19:11:51 -06:00
parent 6da0df7eb7
commit 93a91f9d41
2 changed files with 8 additions and 5 deletions
@@ -1652,12 +1652,15 @@ public class MobileFSM {
        PlayerCharacter target = (PlayerCharacter) mob.getCombatTarget();
        HashMap<Integer,Integer> eligiblePowers = mob.mobPowers;
        for(Map.Entry<Integer,Integer> power : mob.mobPowers.entrySet()) {
-            ConcurrentHashMap<String, Effect> effects = target.getEffects();
            PowersBase pwr= PowersManager.getPowerByToken(power.getKey());
            for(ActionsBase act : pwr.getActions()){
                String des = act.stackType;
-                if(target.getEffects().containsKey(des)){
-                    eligiblePowers.remove(power.getKey());
+                try {
+                    if (target.getEffects() != null && target.getEffects().containsKey(des) == true) {
+                        eligiblePowers.remove(power.getKey());
+                    }
+                }catch(Exception ex){
+
                }
            }

@@ -449,8 +449,8 @@ public class CombatUtilities {
 			weapon = agent.getEquip().get(2).getItemBase();
 		}
 		if(weapon != null){
-			minDmg = weapon.getMinDamage();
-			maxDmg = weapon.getMaxDamage();
+			minDmg = getMinDmg(weapon.getMinDamage(),agent,weapon);
+			maxDmg = getMaxDmg(weapon.getMaxDamage(),agent, weapon);
 			dt = weapon.getDamageType();
 		}else{
 			minDmg = agent.getMobBase().getDamageMin();