Merge remote branch 'origin/master' into 330

This commit is contained in:
tomrus88 2010-04-05 12:34:03 +04:00
commit 018e31e5be
3 changed files with 11 additions and 6 deletions

View file

@ -7145,6 +7145,11 @@ void Aura::PeriodicTick()
pdamage -= m_target->GetSpellCritDamageReduction(pdamage);
}
// only from players
// FIXME: need use SpellDamageBonus instead?
if (IS_PLAYER_GUID(m_caster_guid))
pdamage -= m_target->GetSpellDamageReduction(pdamage);
pCaster->CalcAbsorbResist(m_target, GetSpellSchoolMask(GetSpellProto()), DOT, pdamage, &absorb, &resist, !(GetSpellProto()->AttributesEx2 & SPELL_ATTR_EX2_CANT_REFLECTED));
if(m_target->GetHealth() < pdamage)