From 0fb492828510291228f46c06a5194a250bcf33d7 Mon Sep 17 00:00:00 2001 From: Skjalf <47818697+Nyeriah@users.noreply.github.com> Date: Fri, 9 Jun 2023 18:44:53 -0300 Subject: [PATCH] fix(Scripts/ShadowLabirynth): Fix Murmur not using abilities (#16505) --- .../Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp index 5bdf88224..36b10f43f 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp @@ -125,11 +125,12 @@ struct boss_murmur : public BossAI void JustEngagedWith(Unit* who) override { - if (!who->IsInCombatWith(me)) + // Boss engages mobs during roleplay, this checks prevents it from setting the zone in combat before players engage it. + if (who->IsPlayer() || who->IsPet() || who->IsGuardian()) { - return; + _JustEngagedWith(); } - _JustEngagedWith(); + scheduler.Schedule(28s, [this](TaskContext context) { Talk(EMOTE_SONIC_BOOM); @@ -186,6 +187,7 @@ struct boss_murmur : public BossAI context.Repeat(3650ms, 9150ms); }); } + me->m_Events.CancelEventGroup(GROUP_OOC_CAST); } };