From e95215e9ae160ef896add877793a9d6aa7dc133b Mon Sep 17 00:00:00 2001 From: joshwhedon Date: Sat, 16 May 2020 05:54:33 +1000 Subject: Removing a duplicate item combat spell handling causing poisons (and others) to proc twice. (#24627) https://github.com/TrinityCore/TrinityCore/issues/24608 (cherry picked from commit 4db77bc913a24ce7a14428a2936c836728ba4100) --- src/server/game/Spells/Spell.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/server/game/Spells/Spell.cpp') diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 7632a0c6993..af14b186ce2 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -2628,10 +2628,6 @@ void Spell::TargetInfo::DoDamageAndTriggers(Spell* spell) { spellDamageInfo = std::make_unique(damageInfo, SPELL_DIRECT_DAMAGE, spell->m_attackType, hitMask); procSpellType |= PROC_SPELL_TYPE_DAMAGE; - - if (caster->GetTypeId() == TYPEID_PLAYER && !spell->m_spellInfo->HasAttribute(SPELL_ATTR0_STOP_ATTACK_TARGET) && !spell->m_spellInfo->HasAttribute(SPELL_ATTR4_SUPPRESS_WEAPON_PROCS) && - (spell->m_spellInfo->DmgClass == SPELL_DAMAGE_CLASS_MELEE || spell->m_spellInfo->DmgClass == SPELL_DAMAGE_CLASS_RANGED)) - caster->ToPlayer()->CastItemCombatSpell(*spellDamageInfo); } } -- cgit v1.2.3