*Merge with Trinity 783.

--HG-- branch : trunk
2009-01-04 16:17:46 -06:00
parent 820e0214fa 15d25f45ae
commit eb5a7b02ee
38 changed files with 3090 additions and 415 deletions
@@ -6033,7 +6033,8 @@ void Aura::PeriodicTick()
            SpellEntry const* spellProto = GetSpellProto();
            //maybe has to be sent different to client, but not by SMSG_PERIODICAURALOG
            SpellNonMeleeDamage damageInfo(pCaster, m_target, spellProto->Id, spellProto->SchoolMask);
-            pCaster->CalculateSpellDamage(&damageInfo, gain, spellProto);
+            //no SpellDamageBonus for burn mana
+            pCaster->CalculateSpellDamageTaken(&damageInfo, gain, spellProto);
            pCaster->SendSpellNonMeleeDamageLog(&damageInfo);

            // Set trigger flag