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());