diff --git a/src/engine/gameManager/CombatManager.java b/src/engine/gameManager/CombatManager.java index 9b1aa48d..5f0d6f88 100644 --- a/src/engine/gameManager/CombatManager.java +++ b/src/engine/gameManager/CombatManager.java @@ -462,11 +462,13 @@ public enum CombatManager { if (damage > 0) { - if (AbstractCharacter.IsAbstractCharacter(target)) + if (AbstractCharacter.IsAbstractCharacter(target)) { ((AbstractCharacter) target).modifyHealth(-damage, attacker, true); - else + //PowersManager.cancelOnTakeDamage((AbstractCharacter) target); + ((AbstractCharacter) target).cancelOnTakeDamage(damageType,-damage); + }else { ((Building) target).modifyHealth(-damage, attacker); - + } int attackAnim = getSwingAnimation(null, null, slot); if (attacker.charItemManager.getEquipped().get(slot) != null) { if (attacker.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter)) {