From 676f0e7023090ce8cd4c043a53ad4765adceeb54 Mon Sep 17 00:00:00 2001
From: FatBoy-DOTC <justin.chucksinsulating@gmail.com>
Date: Tue, 18 Mar 2025 09:59:53 -0500
Subject: [PATCH] calculate damage BEFORE modifyHealth is called in
CombatManager
---
src/engine/gameManager/CombatManager.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/engine/gameManager/CombatManager.java b/src/engine/gameManager/CombatManager.java
index bb045c28..3a8161e5 100644
--- a/src/engine/gameManager/CombatManager.java
+++ b/src/engine/gameManager/CombatManager.java
@@ -951,6 +951,10 @@ public enum CombatManager {
float d = 0f;
+ if(ac != null && ac.getObjectType().equals(GameObjectType.PlayerCharacter)){
+ damage *= ((PlayerCharacter)ac).ZergMultiplier;
+ } // Health modifications are modified by the ZergMechanic
+
errorTrack = 12;
//Subtract Damage from target's health
@@ -1235,10 +1239,6 @@ public enum CombatManager {
if (eff.getPower() != null && (eff.getPower().getToken() == 429506943 || eff.getPower().getToken() == 429408639 || eff.getPower().getToken() == 429513599 || eff.getPower().getToken() == 429415295))
swingAnimation = 0;
- if(source != null && source.getObjectType().equals(GameObjectType.PlayerCharacter)){
- damage *= ((PlayerCharacter)source).ZergMultiplier;
- } // Health modifications are modified by the ZergMechanic
-
TargetedActionMsg cmm = new TargetedActionMsg(source, target, damage, swingAnimation);
DispatchMessage.sendToAllInRange(target, cmm);
}