Core/Spells,DB/Conditions: Fix startup errors associated with bf0d001cd3bc5347fecd92d8fbec2a196d6dcda9 and 13b68af78dbc51f44656ecfddb1bfb27dc44a21a Closes #6346

1 files changed, 3 insertions, 4 deletions

diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp
index 3f75c7d41a9..13ea2740abb 100644
--- a/src/server/scripts/Spells/spell_generic.cpp
+++ b/src/server/scripts/Spells/spell_generic.cpp
@@ -2672,14 +2672,13 @@ public:
 
         void HandleDummy(SpellEffIndex effIndex)
         {
-            GetCaster()->ToCreature()->DespawnOrUnsummon();
+            if (GetSpellInfo()->Effects[effIndex].Effect == SPELL_EFFECT_DUMMY || GetSpellInfo()->Effects[effIndex].Effect = SPELL_EFFECT_SCRIPT_EFFECT)
+                GetCaster()->ToCreature()->DespawnOrUnsummon();
         }
 
         void Register()
         {
-            OnEffectHitTarget += SpellEffectFn(spell_gen_despawn_self_SpellScript::HandleDummy, EFFECT_FIRST_FOUND, SPELL_EFFECT_DUMMY);
-            OnEffectHitTarget += SpellEffectFn(spell_gen_despawn_self_SpellScript::HandleDummy, EFFECT_FIRST_FOUND, SPELL_EFFECT_SCRIPT_EFFECT);
-
+            OnEffectHitTarget += SpellEffectFn(spell_gen_despawn_self_SpellScript::HandleDummy, EFFECT_ALL, SPELL_EFFECT_ANY);
         }
     };