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