From b5d32cd2b48f2aba3e06914b25fbeb7970236d6f Mon Sep 17 00:00:00 2001 From: ariel- Date: Sat, 28 Jan 2017 01:42:39 -0300 Subject: [PATCH] Core/Scripts: remove GMs from Sindragosa's Fury's targetlist By Keader Ref #18452 --- .../Northrend/IcecrownCitadel/boss_sindragosa.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index 5d3fa9a3396..0c7a60c325c 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -1090,8 +1090,14 @@ class spell_sindragosa_s_fury : public SpellScriptLoader } } - void CountTargets(std::list& targets) + void FilterTargets(std::list& targets) { + targets.remove_if([](WorldObject* obj) -> bool + { + // SPELL_ATTR3_ONLY_TARGET_PLAYERS present on the spell, we can safely cast to Player + return obj->ToPlayer()->IsGameMaster(); + }); + _targetCount = targets.size(); } @@ -1117,7 +1123,7 @@ class spell_sindragosa_s_fury : public SpellScriptLoader void Register() override { BeforeCast += SpellCastFn(spell_sindragosa_s_fury_SpellScript::SelectDest); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sindragosa_s_fury_SpellScript::CountTargets, EFFECT_1, TARGET_UNIT_DEST_AREA_ENTRY); + OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sindragosa_s_fury_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_DEST_AREA_ENTRY); OnEffectHitTarget += SpellEffectFn(spell_sindragosa_s_fury_SpellScript::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY); }