From 31012923c10df51e8ead11d7fbbb40b09ab2bad0 Mon Sep 17 00:00:00 2001
From: Andrew <47818697+Nyeriah@users.noreply.github.com>
Date: Sun, 29 Jun 2025 16:11:11 -0300
Subject: [PATCH] =?UTF-8?q?fix(Core/Spells):=20Fix=20SPELL=5FEFFECT=5FLEAP?=
 =?UTF-8?q?=5FBACK=20not=20working=20on=20targeted=20=E2=80=A6=20(#22389)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rev_1751221090793496700.sql                |  2 ++
 src/server/game/Spells/SpellEffects.cpp        |  2 +-
 .../ScarletEnclave/chapter5.cpp                | 18 ------------------
 3 files changed, 3 insertions(+), 19 deletions(-)
 create mode 100644 data/sql/updates/pending_db_world/rev_1751221090793496700.sql

diff --git a/data/sql/updates/pending_db_world/rev_1751221090793496700.sql b/data/sql/updates/pending_db_world/rev_1751221090793496700.sql
new file mode 100644
index 000000000..67869a9b6
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1751221090793496700.sql
@@ -0,0 +1,2 @@
+--
+DELETE FROM `spell_script_names` WHERE `ScriptName` = 'spell_chapter5_rebuke' AND `spell_id` = 53680;
diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp
index afe452a76..d176f869b 100644
--- a/src/server/game/Spells/SpellEffects.cpp
+++ b/src/server/game/Spells/SpellEffects.cpp
@@ -5037,7 +5037,7 @@ void Spell::EffectLeapBack(SpellEffIndex effIndex)
     float speedxy = m_spellInfo->Effects[effIndex].MiscValue / 10.0f;
     float speedz = damage / 10.0f;
     //1891: Disengage
-    m_caster->JumpTo(speedxy, speedz, m_spellInfo->SpellFamilyName != SPELLFAMILY_HUNTER);
+    unitTarget->JumpTo(speedxy, speedz, m_spellInfo->SpellFamilyName != SPELLFAMILY_HUNTER);
 
     if (m_caster->IsPlayer())
     {
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
index 22c76c4d5..30ffb72b4 100644
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
@@ -1200,23 +1200,6 @@ class spell_chapter5_light_of_dawn_aura : public AuraScript
     }
 };
 
-class spell_chapter5_rebuke : public SpellScript
-{
-    PrepareSpellScript(spell_chapter5_rebuke);
-
-    void HandleLeapBack(SpellEffIndex effIndex)
-    {
-        PreventHitEffect(effIndex);
-        if (Unit* unitTarget = GetHitUnit())
-            unitTarget->KnockbackFrom(2282.86f, -5263.45f, 40.0f, 8.0f);
-    }
-
-    void Register() override
-    {
-        OnEffectLaunchTarget += SpellEffectFn(spell_chapter5_rebuke::HandleLeapBack, EFFECT_0, SPELL_EFFECT_LEAP_BACK);
-    }
-};
-
 // 58552 - Return to Orgrimmar
 // 58533 - Return to Stormwind
 enum ReturnToCapital
@@ -1317,6 +1300,5 @@ void AddSC_the_scarlet_enclave_c5()
 {
     new npc_highlord_darion_mograine();
     RegisterSpellScript(spell_chapter5_light_of_dawn_aura);
-    RegisterSpellScript(spell_chapter5_rebuke);
     RegisterSpellScript(spell_chapter5_return_to_capital);
 }