From d26afd77039649170223d746441bed08e3c82722 Mon Sep 17 00:00:00 2001 From: Shauren Date: Mon, 29 Jul 2013 19:00:34 +0200 Subject: Core/Spells: Fixed crashes happening with spells that had their dbc targets overriden Closes #10395 --- src/server/game/Spells/Spell.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (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 c6227639608..24a9ab76377 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -820,7 +820,8 @@ void Spell::SelectEffectImplicitTargets(SpellEffIndex effIndex, SpellImplicitTar for (uint32 j = effIndex + 1; j < MAX_SPELL_EFFECTS; ++j) { SpellEffectInfo const* effects = GetSpellInfo()->Effects; - if (effects[effIndex].TargetA.GetTarget() == effects[j].TargetA.GetTarget() && + if (effects[j].IsEffect() && + effects[effIndex].TargetA.GetTarget() == effects[j].TargetA.GetTarget() && effects[effIndex].TargetB.GetTarget() == effects[j].TargetB.GetTarget() && effects[effIndex].ImplicitTargetConditions == effects[j].ImplicitTargetConditions && effects[effIndex].CalcRadius(m_caster) == effects[j].CalcRadius(m_caster) && -- cgit v1.2.3