From b2bd3b7a922e75a106e7833ef02d0d387cc4d641 Mon Sep 17 00:00:00 2001
From: FatBoy-DOTC <justin.chucksinsulating@gmail.com>
Date: Tue, 3 Feb 2026 11:51:29 -0600
Subject: [PATCH] cancel on take mele damage

---
 src/engine/gameManager/CombatManager.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/engine/gameManager/CombatManager.java b/src/engine/gameManager/CombatManager.java
index 9b1aa48d..5326ad44 100644
--- a/src/engine/gameManager/CombatManager.java
+++ b/src/engine/gameManager/CombatManager.java
@@ -462,11 +462,12 @@ public enum CombatManager {
 
             if (damage > 0) {
 
-                if (AbstractCharacter.IsAbstractCharacter(target))
+                if (AbstractCharacter.IsAbstractCharacter(target)) {
                     ((AbstractCharacter) target).modifyHealth(-damage, attacker, true);
-                else
+                    ((AbstractCharacter) target).cancelOnTakeDamage();
+                }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)) {