cancel on take damage for mele
This commit is contained in:
@@ -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)) {
|
||||
|
||||
Reference in New Issue
Block a user