aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjoshwhedon <ludovic.barbier03@gmail.com>2020-05-16 05:54:33 +1000
committerGitHub <noreply@github.com>2020-05-15 21:54:33 +0200
commit4db77bc913a24ce7a14428a2936c836728ba4100 (patch)
tree6ef62f5116471b9ac4d242cb2b361ca4bbed717c /src
parentc0b75bf40da8b447a2f3533dabbfad9eba7c6ea1 (diff)
Removing a duplicate item combat spell handling causing poisons (and others) to proc twice. (#24627)
https://github.com/TrinityCore/TrinityCore/issues/24608
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 60e09ef0753..fb8904d9e14 100644
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -2468,10 +2468,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_CANT_TRIGGER_ITEM_SPELLS) &&
- (spell->m_spellInfo->DmgClass == SPELL_DAMAGE_CLASS_MELEE || spell->m_spellInfo->DmgClass == SPELL_DAMAGE_CLASS_RANGED))
- caster->ToPlayer()->CastItemCombatSpell(*spellDamageInfo);
}
}