diff options
Diffstat (limited to 'src/game/Unit.cpp')
| -rw-r--r-- | src/game/Unit.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 0364ead6776..d052b2305b4 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -1653,7 +1653,7 @@ uint32 Unit::CalcArmorReducedDamage(Unit* pVictim, const uint32 damage, SpellEnt if ( GetTypeId() == TYPEID_PLAYER ) { - AuraEffectList const& ResIgnoreAuras = GetAurasByType(SPELL_AURA_MOD_TARGET_ARMOR_PCT); + AuraEffectList const& ResIgnoreAuras = GetAurasByType(SPELL_AURA_MOD_ARMOR_PENETRATION_PCT); for(AuraEffectList::const_iterator itr = ResIgnoreAuras.begin();itr != ResIgnoreAuras.end(); ++itr) { // item neutral spell @@ -1691,11 +1691,9 @@ uint32 Unit::CalcArmorReducedDamage(Unit* pVictim, const uint32 damage, SpellEnt float armorPen = maxArmorPen*((Player*)this)->GetRatingBonusValue(CR_ARMOR_PENETRATION) / 100.0f; // Got the value, apply it armor -= armorPen; + // Ignore enemy armor by SPELL_AURA_MOD_TARGET_ARMOR_PCT } - // Ignore enemy armor by SPELL_AURA_MOD_TARGET_ARMOR_PCT - armor *= 1.0f - ((Player*)this)->GetArmorPenetrationPct() / 100.0f; - if (armor < 0.0f) armor = 0.0f; |