Core/Spells: Move draenor spell to generic spell (#28356)

2 files changed, 1 insertions, 21 deletions

diff --git a/src/server/scripts/Draenor/zone_draenor_shadowmoon_valley.cpp b/src/server/scripts/Draenor/zone_draenor_shadowmoon_valley.cpp
index e372731f3ca..6be13594502 100644
--- a/src/server/scripts/Draenor/zone_draenor_shadowmoon_valley.cpp
+++ b/src/server/scripts/Draenor/zone_draenor_shadowmoon_valley.cpp
@@ -70,28 +70,7 @@ struct npc_baros_alexston : public ScriptedAI
     }
 };
 
-// 160938 - Despawn All Summons (Garrison Intro Only)
-class spell_despawn_all_summons_garrison_intro_only : public SpellScript
-{
-    PrepareSpellScript(spell_despawn_all_summons_garrison_intro_only);
-
-    void HandleScript(SpellEffIndex /*effIndex*/)
-    {
-        if (Creature* hitCreature = GetHitCreature())
-        {
-            if (hitCreature->GetOwner() == GetCaster())
-                hitCreature->DespawnOrUnsummon();
-        }
-    }
-
-    void Register() override
-    {
-        OnEffectHitTarget += SpellEffectFn(spell_despawn_all_summons_garrison_intro_only::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
-    }
-};
-
 void AddSC_draenor_shadowmoon_valley()
 {
     RegisterCreatureAI(npc_baros_alexston);
-    RegisterSpellScript(spell_despawn_all_summons_garrison_intro_only);
 };
diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp
index 1acc02ae655..70b90d9c831 100644
--- a/src/server/scripts/Spells/spell_generic.cpp
+++ b/src/server/scripts/Spells/spell_generic.cpp
@@ -5160,6 +5160,7 @@ class spell_gen_reverse_cast_target_to_caster_triggered: public SpellScript
 // Note: this spell unsummons any creature owned by the caster. Set appropriate target conditions on the DB.
 // 84065 - Despawn All Summons
 // 83935 - Despawn All Summons
+// 160938 - Despawn All Summons (Garrison Intro Only)
 class spell_gen_despawn_all_summons_owned_by_caster : public SpellScript
 {
     PrepareSpellScript(spell_gen_despawn_all_summons_owned_by_caster);