From 1174e446e0f6beb7672aa9ae369cacb368326489 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Fri, 30 Oct 2020 23:35:14 +0100 Subject: [PATCH] Scripts/BWD: Maloriak's Magma Jets will now only target his victim --- .../BlackwingDescent/boss_maloriak.cpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_maloriak.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_maloriak.cpp index 21dace0d84..5256961b76 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_maloriak.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_maloriak.cpp @@ -1094,18 +1094,15 @@ class spell_maloriak_magma_jets_script : public SpellScript return ValidateSpellInfo({ SPELL_MAGMA_JETS_SUMMON }); } - void FilterTargets(std::list& targets) - { - if (targets.empty()) - return; - - Trinity::Containers::RandomResize(targets, 1); - } - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { + Unit* caster = GetCaster(); + if (!caster) + return; + Unit* target = GetHitUnit(); - if (Unit* caster = GetCaster()) + + if (target == caster->GetVictim()) { caster->SetOrientation(caster->GetAngle(target)); caster->SetFacingToObject(target); // update orientation immediately @@ -1115,7 +1112,6 @@ class spell_maloriak_magma_jets_script : public SpellScript void Register() override { - OnObjectAreaTargetSelect.Register(&spell_maloriak_magma_jets_script::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); OnEffectHitTarget.Register(&spell_maloriak_magma_jets_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } };