Spell: Immediately interrupt cast if target dies mid cast

cmangos · Dec 25, 2024 · be092be · be092be
1 parent 73e50e0
commit be092be
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/src/game/Spells/Spell.cpp b/src/game/Spells/Spell.cpp
@@ -3707,6 +3707,12 @@ void Spell::update(uint32 difftime)
         {
             if (m_timer)
             {
+                if (m_targets.getUnitTarget() && !m_IsTriggeredSpell && !IsAllowingDeadTarget(m_spellInfo) && !m_targets.getUnitTarget()->IsAlive())
+                {
+                    cancel();
+                    return;
+                }
+
                 if (difftime >= m_timer)
                     m_timer = 0;
                 else
@@ -3724,14 +3730,20 @@ void Spell::update(uint32 difftime)
                 {
                     // check if player has jumped before the channeling finished
                     if (m_caster->m_movementInfo.HasMovementFlag(MOVEFLAG_FALLING))
+                    {
                         cancel();
+                        return;
+                    }
 
                     // check for incapacitating player states
                     if (m_caster->IsCrowdControlled())
                     {
                         // certain channel spells are not interrupted
                         if (!m_spellInfo->HasAttribute(SPELL_ATTR_EX_IS_CHANNELED) && !m_spellInfo->HasAttribute(SPELL_ATTR_EX3_IGNORE_CASTER_AND_TARGET_RESTRICTIONS))
+                        {
                             cancel();
+                            return;
+                        }
                     }
 
                     if (m_spellInfo->HasAttribute(SPELL_ATTR_EX2_SPECIAL_TAMING_FLAG)) // these fail on lost target attention (aggro)
@@ -3740,7 +3752,10 @@ void Spell::update(uint32 difftime)
                         {
                             Unit* targetsTarget = target->GetTarget();
                             if (targetsTarget && targetsTarget != m_caster)
+                            {
                                 cancel();
+                                return;
+                            }
                         }
                     }
 
@@ -3789,6 +3804,7 @@ void Spell::update(uint32 difftime)
                             if (!m_caster->IsWithinCombatDistInMap(channelTarget, m_maxRange * 1.5f))
                             {
                                 cancel();
+                                return;
                             }
                         }
                     }