From 461e4e1c3d21e89f6bfbbf455b430662b042c83f Mon Sep 17 00:00:00 2001 From: FatBoy-DOTC Date: Tue, 3 Feb 2026 11:45:47 -0600 Subject: [PATCH] roollback extra effect cancel on damage --- src/engine/gameManager/CombatManager.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/engine/gameManager/CombatManager.java b/src/engine/gameManager/CombatManager.java index a05988f9..9b1aa48d 100644 --- a/src/engine/gameManager/CombatManager.java +++ b/src/engine/gameManager/CombatManager.java @@ -462,13 +462,11 @@ public enum CombatManager { if (damage > 0) { - if (AbstractCharacter.IsAbstractCharacter(target)) { + if (AbstractCharacter.IsAbstractCharacter(target)) ((AbstractCharacter) target).modifyHealth(-damage, attacker, true); - //PowersManager.cancelOnTakeDamage((AbstractCharacter) target); - ((AbstractCharacter) target).cancelOnTakeDamage(damageType,damage); - }else { + 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)) {