From 7b08125c23725b61b5e29df76a1fe8db8e60100e Mon Sep 17 00:00:00 2001
From: Sorikoff <46191832+Sorikoff@users.noreply.github.com>
Date: Sat, 29 Jun 2019 11:35:11 +0000
Subject: Scripts/Spells: Remove Collapsing Cave Aura (#23533)

* Scripts/Spells: Remove Collapsing Cave Aura

* Rename 9999_99_99_99_world.sql to 2019_06_29_00_world.sql

(cherry picked from commit 8d1a5fa1266dc98438cabfb1ced7891791245ff0)
---
 src/server/game/Spells/SpellEffects.cpp           |  5 -----
 src/server/scripts/Northrend/zone_storm_peaks.cpp | 22 ++++++++++++++++++++++
 2 files changed, 22 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp
index 6ada7064844..f8d4783fa6b 100644
--- a/src/server/game/Spells/SpellEffects.cpp
+++ b/src/server/game/Spells/SpellEffects.cpp
@@ -3057,11 +3057,6 @@ void Spell::EffectScriptEffect()
         {
             switch (m_spellInfo->Id)
             {
-                case 55693:                                 // Remove Collapsing Cave Aura
-                    if (!unitTarget)
-                        return;
-                    unitTarget->RemoveAurasDueToSpell(effectInfo->CalcValue());
-                    break;
                 // Brittle Armor - need remove one 24575 Brittle Armor aura
                 case 24590:
                     unitTarget->RemoveAuraFromStack(24575);
diff --git a/src/server/scripts/Northrend/zone_storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp
index 3aa9bdc2149..30b1438b6fd 100644
--- a/src/server/scripts/Northrend/zone_storm_peaks.cpp
+++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp
@@ -1528,6 +1528,27 @@ public:
     }
 };
 
+enum CollapsingCave
+{
+    SPELL_COLLAPSING_CAVE = 55486
+};
+
+// 55693 - Remove Collapsing Cave Aura
+class spell_q12823_remove_collapsing_cave_aura : public SpellScript
+{
+    PrepareSpellScript(spell_q12823_remove_collapsing_cave_aura);
+
+    void HandleScriptEffect(SpellEffIndex /* effIndex */)
+    {
+        GetHitUnit()->RemoveAurasDueToSpell(SPELL_COLLAPSING_CAVE);
+    }
+
+    void Register() override
+    {
+        OnEffectHitTarget += SpellEffectFn(spell_q12823_remove_collapsing_cave_aura::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
+    }
+};
+
 void AddSC_storm_peaks()
 {
     new npc_injured_goblin();
@@ -1554,4 +1575,5 @@ void AddSC_storm_peaks()
     new spell_fatal_strike();
     new spell_falling_dragon_feign_death();
     new spell_player_mount_wyrm();
+    RegisterSpellScript(spell_q12823_remove_collapsing_cave_aura);
 }
-- 
cgit v1.2.3