From b6b0eced74676816ae41d46ddb0ae7fa74068d3f Mon Sep 17 00:00:00 2001
From: Traesh <Traesh@users.noreply.github.com>
Date: Sat, 6 Sep 2025 23:05:02 +0200
Subject: Core/Spells: Implemented setting spell to cast on arrival from
 SPELL_EFFECT_JUMP_CHARGE in database (#30210)

---
 src/server/game/Spells/SpellEffects.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/server/game/Spells/SpellEffects.cpp')

diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp
index da0fd7be46c..01cf68b89c2 100644
--- a/src/server/game/Spells/SpellEffects.cpp
+++ b/src/server/game/Spells/SpellEffects.cpp
@@ -5865,10 +5865,11 @@ void Spell::EffectJumpCharge()
     }
 
     Optional<JumpArrivalCastArgs> arrivalCast;
-    if (effectInfo->TriggerSpell)
+    if (effectInfo->TriggerSpell || params->TriggerSpellId)
     {
         arrivalCast.emplace();
-        arrivalCast->SpellId = effectInfo->TriggerSpell;
+        arrivalCast->SpellId = params->TriggerSpellId ? *params->TriggerSpellId : effectInfo->TriggerSpell;
+        arrivalCast->Target = unitTarget ? unitTarget->GetGUID() : ObjectGuid::Empty;
     }
 
     Optional<Movement::SpellEffectExtraData> effectExtra;
-- 
cgit v1.2.3