diff options
| author | megamage <none@none> | 2009-02-02 17:34:49 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-02-02 17:34:49 -0600 |
| commit | 4e13ff356ffa9a9ec2ca58ebdc3cfe7cea0dcca8 (patch) | |
| tree | f2cf75445c95ef12d7fb8abda3e1c591626c651b /src/game/SpellAuras.cpp | |
| parent | f25a150566c7b1b5301b33367dfa1f58f4a1458d (diff) | |
| parent | cccfd132dd4388f42da8087a9ad5ff54b7ec4808 (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/SpellAuras.cpp')
| -rw-r--r-- | src/game/SpellAuras.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index d49ee7ace40..f831dc2d045 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -5453,7 +5453,7 @@ void Aura::PeriodicTick() if ( GetSpellSchoolMask(GetSpellProto()) & SPELL_SCHOOL_MASK_NORMAL && GetEffectMechanic(GetSpellProto(), m_effIndex) != MECHANIC_BLEED) { - uint32 pdamageReductedArmor = pCaster->CalcArmorReducedDamage(m_target, pdamage); + uint32 pdamageReductedArmor = pCaster->CalcArmorReducedDamage(m_target, pdamage, GetSpellProto()); cleanDamage.damage += pdamage - pdamageReductedArmor; pdamage = pdamageReductedArmor; } @@ -5539,7 +5539,7 @@ void Aura::PeriodicTick() //Calculate armor mitigation if it is a physical spell if (GetSpellSchoolMask(GetSpellProto()) & SPELL_SCHOOL_MASK_NORMAL) { - uint32 pdamageReductedArmor = pCaster->CalcArmorReducedDamage(m_target, pdamage); + uint32 pdamageReductedArmor = pCaster->CalcArmorReducedDamage(m_target, pdamage, GetSpellProto()); cleanDamage.damage += pdamage - pdamageReductedArmor; pdamage = pdamageReductedArmor; } |