From bb8068febb6d4b6d8354cca449572bf55a1e22ec Mon Sep 17 00:00:00 2001 From: ariel- Date: Thu, 1 Dec 2016 02:14:29 -0300 Subject: [PATCH] Core/Spells: fix a pretty edge case of creatures being put in combat by evaded spells Closes #18369 --- src/server/game/Spells/Spell.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 835b11096c0..d358d75fef7 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -2488,7 +2488,8 @@ void Spell::DoAllEffectOnTarget(TargetInfo* target) } } - if (missInfo != SPELL_MISS_EVADE && !m_caster->IsFriendlyTo(unit) && (!m_spellInfo->IsPositive() || m_spellInfo->HasEffect(SPELL_EFFECT_DISPEL))) + // spellHitTarget can be null if spell is missed in DoSpellHitOnUnit + if (missInfo != SPELL_MISS_EVADE && spellHitTarget && !m_caster->IsFriendlyTo(unit) && (!m_spellInfo->IsPositive() || m_spellInfo->HasEffect(SPELL_EFFECT_DISPEL))) { m_caster->CombatStart(unit, m_spellInfo->HasInitialAggro());