From a290e3659e9941e6eb6144a4c389024053971698 Mon Sep 17 00:00:00 2001 From: FatBoy-DOTC Date: Tue, 18 Mar 2025 10:21:52 -0500 Subject: [PATCH] fix for mele zerg multiplier values --- src/engine/gameManager/CombatManager.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/engine/gameManager/CombatManager.java b/src/engine/gameManager/CombatManager.java index 3a8161e5..66700ecd 100644 --- a/src/engine/gameManager/CombatManager.java +++ b/src/engine/gameManager/CombatManager.java @@ -951,6 +951,7 @@ public enum CombatManager { float d = 0f; + int originalDamage = (int)damage; if(ac != null && ac.getObjectType().equals(GameObjectType.PlayerCharacter)){ damage *= ((PlayerCharacter)ac).ZergMultiplier; } // Health modifications are modified by the ZergMechanic @@ -968,9 +969,13 @@ public enum CombatManager { ac.setHateValue(damage * MBServerStatics.PLAYER_COMBAT_HATE_MODIFIER); ((Mob) tarAc).handleDirectAggro(ac); } - - if (tarAc.getHealth() > 0) + if (tarAc.getHealth() > 0) { d = tarAc.modifyHealth(-damage, ac, false); + if(tarAc != null && tarAc.getObjectType().equals(GameObjectType.PlayerCharacter) && ((PlayerCharacter)ac).ZergMultiplier != 1.0f){ + PlayerCharacter debugged = (PlayerCharacter)tarAc; + ChatManager.chatSystemInfo(debugged, "ZERG DEBUG: " + ac.getName() + " Hits You For: " + (int)damage + " instead of " + originalDamage); + } + } tarAc.cancelOnTakeDamage();