From 58f8fe6426d3c9465359599fac11af094c1fc980 Mon Sep 17 00:00:00 2001 From: Ludwig Date: Sat, 23 Sep 2023 23:55:45 +0200 Subject: [PATCH] refactor(Scripts/Midsummer): Remove old unused code for spell 45644 (#17324) - spell 45644 used to be linked to spell_midsummer_juggling_torch - spell 45644 was later linked to new implementation spell_midsummer_torch_catch in e1e4c6cddc44971054c61df1a884ac7c795c8b73 - old implementation of spell 45644 was never removed from spell_midsummer_juggling_torch --- src/server/scripts/Events/midsummer.cpp | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/src/server/scripts/Events/midsummer.cpp b/src/server/scripts/Events/midsummer.cpp index a7b7d5ad7..b24d7ed6b 100644 --- a/src/server/scripts/Events/midsummer.cpp +++ b/src/server/scripts/Events/midsummer.cpp @@ -424,8 +424,6 @@ class spell_midsummer_juggling_torch : public SpellScript { PrepareSpellScript(spell_midsummer_juggling_torch); - bool handled; - bool Load() override { handled = false; return true; } void HandleFinish() { Unit* caster = GetCaster(); @@ -447,27 +445,9 @@ class spell_midsummer_juggling_torch : public SpellScript caster->CastSpell(caster, SPELL_JUGGLE_SELF, true); } - void HandleDummy(SpellEffIndex effIndex) - { - PreventHitDefaultEffect(effIndex); - Unit* caster = GetCaster(); - if (!caster || caster->GetTypeId() != TYPEID_PLAYER) - return; - - if (Player* target = GetHitPlayer()) - if (!handled && target->GetQuestRewardStatus(target->GetTeamId() == TEAM_ALLIANCE ? 11657 : 11923)) - { - handled = true; - caster->CastSpell(target, SPELL_GIVE_TORCH, true); - } - } - void Register() override { - if (m_scriptSpellId == SPELL_TORCH_CHECK) - OnEffectHitTarget += SpellEffectFn(spell_midsummer_juggling_torch::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); - else - AfterCast += SpellCastFn(spell_midsummer_juggling_torch::HandleFinish); + AfterCast += SpellCastFn(spell_midsummer_juggling_torch::HandleFinish); } };