aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjoshwhedon <ludovic.barbier03@gmail.com>2020-05-16 05:54:33 +1000
committerShauren <shauren.trinity@gmail.com>2022-01-04 15:33:04 +0100
commite95215e9ae160ef896add877793a9d6aa7dc133b (patch)
treed6d8740f41f785d001b9786ece14ad0da38a1b9f /src
parent89afeed41b4f040e4852b35183f30291588662d7 (diff)
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)
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Spells/Spell.cpp4
1 files changed, 0 insertions, 4 deletions
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>(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);
}
}