From f0e7ef1f9f79fcf6b25b886a932f066c84459f8c Mon Sep 17 00:00:00 2001 From: Shauren Date: Mon, 10 Aug 2015 17:46:31 +0200 Subject: Core/PacketIO: Exclude DamageDealt/DamageTaken script hook results from damage sent in SMSG_SPELL_NON_MELEE_DAMAGE_LOG --- src/server/scripts/Commands/cs_misc.cpp | 2 +- src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp | 2 +- src/server/scripts/Spells/spell_warlock.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/server/scripts') diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index a16d4324b87..1be4b3c51a8 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -2308,7 +2308,7 @@ public: SpellNonMeleeDamage damageInfo(handler->GetSession()->GetPlayer(), target, spellid, sSpellMgr->GetSpellInfo(spellid)->SchoolMask); damageInfo.damage = damage; handler->GetSession()->GetPlayer()->DealDamageMods(damageInfo.target, damageInfo.damage, &damageInfo.absorb); - damageInfo.damage = target->DealSpellDamage(&damageInfo, true); + target->DealSpellDamage(&damageInfo, true); target->SendSpellNonMeleeDamageLog(&damageInfo); return true; } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index c53906b5b38..ddcbef77b4e 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -1093,7 +1093,7 @@ class spell_sindragosa_s_fury : public SpellScriptLoader SpellNonMeleeDamage damageInfo(GetCaster(), GetHitUnit(), GetSpellInfo()->Id, GetSpellInfo()->SchoolMask); damageInfo.damage = damage; - damageInfo.damage = GetCaster()->DealSpellDamage(&damageInfo, false); + GetCaster()->DealSpellDamage(&damageInfo, false); GetCaster()->SendSpellNonMeleeDamageLog(&damageInfo); } diff --git a/src/server/scripts/Spells/spell_warlock.cpp b/src/server/scripts/Spells/spell_warlock.cpp index ce3153f48ab..981411e74b0 100644 --- a/src/server/scripts/Spells/spell_warlock.cpp +++ b/src/server/scripts/Spells/spell_warlock.cpp @@ -796,7 +796,7 @@ class spell_warl_health_funnel : public SpellScriptLoader SpellNonMeleeDamage damageInfo(caster, caster, GetSpellInfo()->Id, GetSpellInfo()->SchoolMask); damageInfo.periodicLog = true; damageInfo.damage = damage; - damageInfo.damage = caster->DealSpellDamage(&damageInfo, false); + caster->DealSpellDamage(&damageInfo, false); caster->SendSpellNonMeleeDamageLog(&damageInfo); } -- cgit v1.2.3