Browse Source

calculate damage BEFORE modifyHealth is called in CombatManager

lakebane
FatBoy-DOTC 2 weeks ago
parent
commit
676f0e7023
  1. 8
      src/engine/gameManager/CombatManager.java

8
src/engine/gameManager/CombatManager.java

@ -951,6 +951,10 @@ public enum CombatManager { @@ -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 { @@ -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);
}

Loading…
Cancel
Save