From a19c9660b4be0e7d1bf75e98f93d1bffe5c1566b Mon Sep 17 00:00:00 2001
From: offl <11556157+offl@users.noreply.github.com>
Date: Thu, 17 Feb 2022 22:40:28 +0200
Subject: Scripts/SL: Update Grandmaster Vorpil (#27765)

Closes #23801
---
 src/server/scripts/Spells/spell_generic.cpp | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'src/server/scripts/Spells')

diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp
index 20723bfdff3..7b7b1121bbd 100644
--- a/src/server/scripts/Spells/spell_generic.cpp
+++ b/src/server/scripts/Spells/spell_generic.cpp
@@ -1405,6 +1405,7 @@ class spell_gen_despawn_aura : public AuraScript
     }
 };
 
+/// @todo: migrate spells to spell_gen_despawn_target, then remove this
 class spell_gen_despawn_self : public SpellScript
 {
     PrepareSpellScript(spell_gen_despawn_self);
@@ -1426,6 +1427,23 @@ class spell_gen_despawn_self : public SpellScript
     }
 };
 
+class spell_gen_despawn_target : public SpellScript
+{
+    PrepareSpellScript(spell_gen_despawn_target);
+
+    void HandleDespawn(SpellEffIndex /*effIndex*/)
+    {
+        if (GetEffectInfo().IsEffect(SPELL_EFFECT_DUMMY) || GetEffectInfo().IsEffect(SPELL_EFFECT_SCRIPT_EFFECT))
+            if (Creature* target = GetHitCreature())
+                target->DespawnOrUnsummon();
+    }
+
+    void Register() override
+    {
+        OnEffectHitTarget += SpellEffectFn(spell_gen_despawn_target::HandleDespawn, EFFECT_ALL, SPELL_EFFECT_ANY);
+    }
+};
+
 enum DivineStormSpell
 {
     SPELL_DIVINE_STORM      = 53385,
@@ -4568,6 +4586,7 @@ void AddSC_generic_spell_scripts()
     RegisterSpellScript(spell_gen_defend);
     RegisterSpellScript(spell_gen_despawn_aura);
     RegisterSpellScript(spell_gen_despawn_self);
+    RegisterSpellScript(spell_gen_despawn_target);
     RegisterSpellScript(spell_gen_divine_storm_cd_reset);
     RegisterSpellScript(spell_gen_ds_flush_knockback);
     RegisterSpellScript(spell_gen_dungeon_credit);
-- 
cgit v1.2.3