From f9cfc202e90ded24fe0dcf5d06035d2aab2cf6af Mon Sep 17 00:00:00 2001 From: jackpoz Date: Thu, 8 Jun 2017 19:07:13 +0200 Subject: Core/Scripts: Simplify code Partially revert 753e7074d84b5a2e8d3c3e92d25c54bb25ba477e and 12c680f9b1f1068099c3b19443d93d456690ac56 to simplify the code and to only remove GMs from the target list. --- src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index 0a1ffa55007..7012845d22c 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -1087,8 +1087,11 @@ class spell_sindragosa_s_fury : public SpellScriptLoader { targets.remove_if([](WorldObject* obj) -> bool { - // SPELL_ATTR3_ONLY_TARGET_PLAYERS present on the spell, we can safely cast to Player if not corpse - return obj->GetTypeId() == TYPEID_CORPSE || ASSERT_NOTNULL(obj->ToPlayer())->IsGameMaster(); + // remove GMs + if (Player* player = obj->ToPlayer()) + return player->IsGameMaster(); + + return false; }); _targetCount = targets.size(); -- cgit v1.2.3