From ec5d778e10dfab98a493b1c134d7782ca47d40cf Mon Sep 17 00:00:00 2001 From: ariel- Date: Thu, 1 Dec 2016 02:14:29 -0300 Subject: Core/Spells: fix a pretty edge case of creatures being put in combat by evaded spells (cherry picked from commit 343419ab992ca3b8dd93e87e8a16a1ee097447bf) --- src/server/game/Spells/Spell.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 47f43ad532c..e831ac843ea 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -2572,7 +2572,8 @@ void Spell::DoAllEffectOnTarget(TargetInfo* target) } } - if (missInfo != SPELL_MISS_EVADE && !m_caster->IsFriendlyTo(unit) && (!m_spellInfo->IsPositive() || 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()); -- cgit v1.2.3