Browse Source

cancel on take damage for mele

magicbox-1.5.2.1
FatBoy-DOTC 2 days ago
parent
commit
ec6825d651
  1. 8
      src/engine/gameManager/CombatManager.java

8
src/engine/gameManager/CombatManager.java

@ -462,11 +462,13 @@ public enum CombatManager {
if (damage > 0) { if (damage > 0) {
if (AbstractCharacter.IsAbstractCharacter(target)) if (AbstractCharacter.IsAbstractCharacter(target)) {
((AbstractCharacter) target).modifyHealth(-damage, attacker, true); ((AbstractCharacter) target).modifyHealth(-damage, attacker, true);
else //PowersManager.cancelOnTakeDamage((AbstractCharacter) target);
((AbstractCharacter) target).cancelOnTakeDamage(damageType,-damage);
}else {
((Building) target).modifyHealth(-damage, attacker); ((Building) target).modifyHealth(-damage, attacker);
}
int attackAnim = getSwingAnimation(null, null, slot); int attackAnim = getSwingAnimation(null, null, slot);
if (attacker.charItemManager.getEquipped().get(slot) != null) { if (attacker.charItemManager.getEquipped().get(slot) != null) {
if (attacker.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter)) { if (attacker.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter)) {

Loading…
Cancel
Save