combat null fix

src/engine/gameManager/CombatManager.java

@@ -809,9 +809,6 @@ public enum CombatManager {
 
                 float damage;
 
-                if (wb != null)
-                    damage = calculateDamage(ac, tarAc, minDamage, maxDamage, damageType, resists);
-                else
                 damage = calculateDamage(ac, tarAc, minDamage, maxDamage, damageType, resists);
 
                 if(ac.getObjectType().equals(GameObjectType.PlayerCharacter)){
@@ -830,7 +827,7 @@ public enum CombatManager {
 
                     if (tarAc.getObjectType() == GameObjectType.Mob) {
                         if(ac.getObjectType().equals(GameObjectType.PlayerCharacter)) {
-                            if(((Mob) tarAc).playerAgroMap.contains(ac.getObjectUUID())) {
+                            if(((Mob) tarAc).playerAgroMap.containsKey(ac.getObjectUUID())) {
                                 ((Mob) tarAc).playerAgroMap.put(ac.getObjectUUID(), ((Mob) tarAc).playerAgroMap.get(ac.getObjectUUID()) + damage);
                             } else{
                                 ((Mob) tarAc).playerAgroMap.put(ac.getObjectUUID(), damage);