diff --git a/UnitMethods.h b/UnitMethods.h index ed69c68..694e6e1 100644 --- a/UnitMethods.h +++ b/UnitMethods.h @@ -2681,22 +2681,22 @@ namespace LuaUnit } if (!spell) - return false; + return 0; SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(spell); if (!spellInfo) - return false; + return 0; SpellNonMeleeDamage dmgInfo(unit, target, spell, spellInfo->GetSchoolMask()); #ifdef TRINITY - damage = unit->SpellDamageBonusDone(target, spellInfo, damage, SPELL_DIRECT_DAMAGE, {}); + Unit::DealDamageMods(dmgInfo.target, dmgInfo.damage, &dmgInfo.absorb); #else damage = unit->SpellDamageBonusDone(target, spellInfo, damage, SPELL_DIRECT_DAMAGE; -#endif damage = target->SpellDamageBonusTaken(unit, spellInfo, damage, SPELL_DIRECT_DAMAGE); - unit->CalculateSpellDamageTaken(&dmgInfo, damage, spellInfo); unit->DealDamageMods(dmgInfo.target, dmgInfo.damage, &dmgInfo.absorb); +#endif + unit->SendSpellNonMeleeDamageLog(&dmgInfo); unit->DealSpellDamage(&dmgInfo, true); return 0;