From 9db7411ee6e0bf74a78031bc8aae4e587da4f45b Mon Sep 17 00:00:00 2001 From: FatBoy-DOTC Date: Thu, 20 Feb 2025 10:06:06 -0600 Subject: [PATCH] calc OnTakeDamage in combat loop --- src/engine/gameManager/CombatManager.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/engine/gameManager/CombatManager.java b/src/engine/gameManager/CombatManager.java index ec9c4932..b2625c4d 100644 --- a/src/engine/gameManager/CombatManager.java +++ b/src/engine/gameManager/CombatManager.java @@ -898,6 +898,8 @@ public enum CombatManager { if (tarAc.getHealth() > 0) d = tarAc.modifyHealth(-damage, ac, false); + tarAc.cancelOnTakeDamage(); + } else if (target.getObjectType().equals(GameObjectType.Building)) { if (BuildingManager.getBuildingFromCache(target.getObjectUUID()) == null) {