From af1e878fcc9920b42684f2c308516fcfd673a115 Mon Sep 17 00:00:00 2001 From: Skjalf <47818697+Nyeriah@users.noreply.github.com> Date: Mon, 17 Apr 2023 20:38:13 -0300 Subject: [PATCH] fix(Scripts/ShadowLabirynth): Fix OOC Murmur Supperssion Barrage (#15992) Co-authored-by: Gultask <100873791+Gultask@users.noreply.github.com> --- .../updates/pending_db_world/rev_1681770837660007300.sql | 6 ++++++ .../Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 data/sql/updates/pending_db_world/rev_1681770837660007300.sql diff --git a/data/sql/updates/pending_db_world/rev_1681770837660007300.sql b/data/sql/updates/pending_db_world/rev_1681770837660007300.sql new file mode 100644 index 000000000..f186f2a7a --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1681770837660007300.sql @@ -0,0 +1,6 @@ +-- +DELETE FROM `conditions` WHERE (`SourceTypeOrReferenceId` = 13) AND (`SourceGroup` = 1) AND (`SourceEntry` = 33332); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(13, 1, 33332, 0, 1, 31, 0, 3, 18639, 0, 0, 0, 0, '', 'Suppression Blast (33332) can only target a set of Entries'), +(13, 1, 33332, 0, 2, 31, 0, 3, 18634, 0, 0, 0, 0, '', 'Suppression Blast (33332) can only target a set of Entries'), +(13, 1, 33332, 0, 3, 31, 0, 3, 18632, 0, 0, 0, 0, '', 'Suppression Blast (33332) can only target a set of Entries'); diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp index 665c174eb..e69580e3c 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp @@ -77,8 +77,7 @@ struct boss_murmur : public BossAI me->m_Events.AddEventAtOffset([this] { if (me->FindNearestCreature(NPC_CABAL_SPELLBINDER, 35.0f)) { - me->CastCustomSpell(SPELL_SUPPRESSION, SPELLVALUE_MAX_TARGETS, 5); - DoCastAOE(SPELL_SUPPRESSION); + me->CastCustomSpell(SPELL_SUPPRESSION, SPELLVALUE_MAX_TARGETS, 5, (Unit*)nullptr, false); CastSupressionOOC(); } }, 3600ms, 10900ms, GROUP_OOC_CAST);