Core/Spells: fix delayed hit aura crash

Closes #21664

2 files changed, 6 insertions, 2 deletions

diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index d4c42db9563..99d05a50b63 100644
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -2556,9 +2556,9 @@ void Spell::TargetInfo::DoDamageAndTriggers(Spell* spell)
         else if (spell->m_caster->GetTypeId() == TYPEID_GAMEOBJECT && spell->m_caster->ToGameObject()->AI())
             spell->m_caster->ToGameObject()->AI()->SpellHitTarget(_spellHitTarget, spell->m_spellInfo);
 
-        if (spell->_spellAura)
+        if (HitAura)
         {
-            if (AuraApplication* aurApp = spell->_spellAura->GetApplicationOfTarget(_spellHitTarget->GetGUID()))
+            if (AuraApplication* aurApp = HitAura->GetApplicationOfTarget(_spellHitTarget->GetGUID()))
             {
                 // only apply unapplied effects (for reapply case)
                 uint8 effMask = EffectMask & aurApp->GetEffectsToApply();
@@ -2820,7 +2820,10 @@ void Spell::DoSpellEffectHit(Unit* unit, uint8 effIndex, TargetInfo& hitInfo)
                 }
             }
             else
+            {
+                hitInfo.HitAura = _spellAura;
                 _spellAura->AddStaticApplication(unit, aura_effmask);
+            }
         }
     }
 
diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h
index 62137799156..691bddf43f7 100644
--- a/src/server/game/Spells/Spell.h
+++ b/src/server/game/Spells/Spell.h
@@ -676,6 +676,7 @@ class TC_GAME_API Spell
             SpellInfo const* AuraSpellInfo = nullptr;
             int32 AuraBasePoints[MAX_SPELL_EFFECTS] = { };
             bool Positive = true;
+            UnitAura* HitAura = nullptr;
 
         private:
             Unit* _spellHitTarget = nullptr; // changed for example by reflect