Core/Spells: fix a pretty edge case of creatures being put in combat by evaded spells

2018-03-12 12:55:53 -04:00
parent 54520c3c18
commit 129cda3b3f
1 changed files with 2 additions and 1 deletions
@@ -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());