aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeader <keader.android@gmail.com>2021-08-14 19:34:32 -0300
committerShauren <shauren.trinity@gmail.com>2022-03-12 23:51:32 +0100
commit105e2e33581ebd996ab71e78aa0501a44bc8d50b (patch)
tree160719be378cb3434d8a824935fbf665f930f030
parentd95d56da108d3b769d8e0d077b72f10bcf4c4747 (diff)
Scripts/Ulduar: Moved UNIT_FLAG_NOT_SELECTABLE to inside XT002 Script
Spell is used for some world quests too (cherry picked from commit 8014054ef9d2f611127416cdc1f7e77e8877bb05)
-rw-r--r--src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp9
1 files changed, 3 insertions, 6 deletions
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