From 2e98e7c42aa406cde4bd7012d4660d82f814d256 Mon Sep 17 00:00:00 2001 From: Skjalf <47818697+Nyeriah@users.noreply.github.com> Date: Fri, 28 Apr 2023 22:56:00 -0300 Subject: [PATCH] =?UTF-8?q?fix(Scripts/ShadowLabyrinth):=20Fix=20Murmur=20?= =?UTF-8?q?combat=20bug=20caused=20by=20Suppres=E2=80=A6=20(#16122)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix(Scripts/ShadowLabyrinth): Fix Murmur combat bug caused by Suppression Blasts hitting npcs in combat with players --- .../Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp index e689df387..eb153fb78 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp @@ -74,6 +74,8 @@ struct boss_murmur : public BossAI void CastSupressionOOC() { + me->m_Events.CancelEventGroup(GROUP_OOC_CAST); + me->m_Events.AddEventAtOffset([this] { if (me->FindNearestCreature(NPC_CABAL_SPELLBINDER, 35.0f)) { @@ -125,8 +127,13 @@ struct boss_murmur : public BossAI } } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { + if (!who->IsInCombatWith(me)) + { + return; + } + _JustEngagedWith(); scheduler.Schedule(28s, [this](TaskContext context)