From 105e2e33581ebd996ab71e78aa0501a44bc8d50b Mon Sep 17 00:00:00 2001 From: Keader Date: Sat, 14 Aug 2021 19:34:32 -0300 Subject: Scripts/Ulduar: Moved UNIT_FLAG_NOT_SELECTABLE to inside XT002 Script Spell is used for some world quests too (cherry picked from commit 8014054ef9d2f611127416cdc1f7e77e8877bb05) --- src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp index b05ceeb4ff6..ea5c6b3a038 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp @@ -347,6 +347,7 @@ struct boss_xt002 : public BossAI break; case EVENT_SUBMERGE: DoCastSelf(SPELL_SUBMERGE); + me->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE); Talk(EMOTE_HEART_OPENED); if (Creature* heart = instance->GetCreature(DATA_XT002_HEART)) heart->AI()->DoAction(ACTION_START_PHASE_HEART); @@ -875,12 +876,8 @@ class spell_xt002_submerged : public SpellScript void HandleScript(SpellEffIndex /*eff*/) { - Creature* target = GetHitCreature(); - if (!target) - return; - - target->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE); - target->SetStandState(UNIT_STAND_STATE_SUBMERGED); + if (Creature* target = GetHitCreature()) + target->SetStandState(UNIT_STAND_STATE_SUBMERGED); } void Register() override -- cgit v1.2.3