|
|
|
|
@ -462,13 +462,11 @@ public enum CombatManager {
@@ -462,13 +462,11 @@ public enum CombatManager {
|
|
|
|
|
|
|
|
|
|
if (damage > 0) { |
|
|
|
|
|
|
|
|
|
if (AbstractCharacter.IsAbstractCharacter(target)) { |
|
|
|
|
if (AbstractCharacter.IsAbstractCharacter(target)) |
|
|
|
|
((AbstractCharacter) target).modifyHealth(-damage, attacker, true); |
|
|
|
|
//PowersManager.cancelOnTakeDamage((AbstractCharacter) target);
|
|
|
|
|
((AbstractCharacter) target).cancelOnTakeDamage(damageType,damage); |
|
|
|
|
}else { |
|
|
|
|
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)) { |
|
|
|
|
|