Scripts/Spells: Void Zone's Consumption (#27265)

(cherry picked from commit 44a6d393d7969adf3357ea74c61561c60c6c5a31)

2 files changed, 4 insertions, 31 deletions

diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
index e3e14e4dc21..821f497c2c8 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
@@ -699,23 +699,6 @@ class spell_four_horsemen_mark : public AuraScript
     }
 };
 
-// 28865 - Consumption
-class spell_four_horsemen_consumption : public SpellScript
-{
-    PrepareSpellScript(spell_four_horsemen_consumption);
-
-    void HandleDamageCalc(SpellEffIndex /*effIndex*/)
-    {
-        uint32 damage = GetCaster()->GetMap()->IsHeroic() ? 4250 : 2750;
-        SetEffectValue(damage);
-    }
-
-    void Register() override
-    {
-        OnEffectLaunchTarget += SpellEffectFn(spell_four_horsemen_consumption::HandleDamageCalc, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
-    }
-};
-
 void AddSC_boss_four_horsemen()
 {
     RegisterNaxxramasCreatureAI(boss_four_horsemen_baron);
@@ -723,5 +706,4 @@ void AddSC_boss_four_horsemen()
     RegisterNaxxramasCreatureAI(boss_four_horsemen_lady);
     RegisterNaxxramasCreatureAI(boss_four_horsemen_sir);
     RegisterSpellScript(spell_four_horsemen_mark);
-    RegisterSpellScript(spell_four_horsemen_consumption);
 }
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
index bab377ba90e..c52bc7c6f8f 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
@@ -57,7 +57,7 @@ enum Spells
     SPELL_HEART_LIGHTNING_TETHER            = 64799,
 
     // Void Zone
-    SPELL_CONSUMPTION                       = 64208,
+    SPELL_CONSUMPTION                       = 64209,
 
     // Life Spark
     SPELL_ARCANE_POWER_STATE                = 49411,
@@ -649,20 +649,11 @@ struct npc_xt_void_zone : public PassiveAI
 {
     npc_xt_void_zone(Creature* creature) : PassiveAI(creature) { }
 
-    void Reset() override
+    void JustAppeared() override
     {
-        int32 bp = 0;
-        if (SpellInfo const* createdBySpell = sSpellMgr->GetSpellInfo(me->m_unitData->CreatedBySpell, me->GetMap()->GetDifficultyID()))
-            if (createdBySpell->GetEffects().size() > EFFECT_1)
-                bp = createdBySpell->GetEffect(EFFECT_1).CalcValue();
-
-        _scheduler.Schedule(1s, [this, bp](TaskContext consumption)
+        _scheduler.Schedule(2500ms, [this](TaskContext /*task*/)
         {
-            CastSpellExtraArgs args(false);
-            if (bp)
-                args.AddSpellBP0(bp);
-            DoCastSelf(SPELL_CONSUMPTION, args);
-            consumption.Repeat();
+            DoCastSelf(SPELL_CONSUMPTION);
         });
     }