evilight/magicbane
1
0 Fork 0
forked from MagicBane/Server
Code Pull Requests Activity

cancel on take damage for mele

Browse Source
This commit is contained in:
FatBoy committed 2026-02-03 11:31:42 -06:00
1 parent cb561c3b6b
commit ec6825d651
1 file changed
+5 -3
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/gameManager/CombatManager.java
+5 -3
View File
@@ -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)) {