From 129cda3b3fcf3608cd2cec4a3bcd8644453fa16a Mon Sep 17 00:00:00 2001
From: hondacrx <prelude_20032002@yahoo.com>
Date: Mon, 12 Mar 2018 12:55:53 -0400
Subject: [PATCH] Core/Spells: fix a pretty edge case of creatures being put in
 combat by evaded spells

---
 Source/Game/Spells/Spell.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Source/Game/Spells/Spell.cs b/Source/Game/Spells/Spell.cs
index 2caca26ae..e8eefc763 100644
--- a/Source/Game/Spells/Spell.cs
+++ b/Source/Game/Spells/Spell.cs
@@ -2062,7 +2062,8 @@ namespace Game.Spells
                 }
             }
 
-            if (missInfo != SpellMissInfo.Evade && !m_caster.IsFriendlyTo(unit) && (!m_spellInfo.IsPositive() || m_spellInfo.HasEffect(SpellEffectName.Dispel)))
+            // spellHitTarget can be null if spell is missed in DoSpellHitOnUnit
+            if (missInfo != SpellMissInfo.Evade && spellHitTarget && !m_caster.IsFriendlyTo(unit) && (!m_spellInfo.IsPositive() || m_spellInfo.HasEffect(SpellEffectName.Dispel)))
             {
                 m_caster.CombatStart(unit, m_spellInfo.HasInitialAggro());