From a65be25fb94644af573c3fd6811f872674ad8b48 Mon Sep 17 00:00:00 2001 From: Andrew <47818697+Nyeriah@users.noreply.github.com> Date: Wed, 25 Sep 2024 05:33:42 -0300 Subject: [PATCH] =?UTF-8?q?fix(Scripts/BlackTemple):=20Correct=20the=20doo?= =?UTF-8?q?r=20announcement=20to=20only=20annou=E2=80=A6=20(#20036)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix(Scripts/BlackTemple): Correct the door announcement to only announce on the first bosses --- .../Outland/BlackTemple/instance_black_temple.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp index 7a60d7a37..ed520d5c3 100644 --- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp +++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp @@ -178,6 +178,13 @@ public: for (ObjectGuid const& guid : ashtongueGUIDs) if (Creature* ashtongue = instance->GetCreature(guid)) ashtongue->SetFaction(FACTION_ASHTONGUE_DEATHSWORN); + [[fallthrough]]; + case DATA_TERON_GOREFIEND: + case DATA_GURTOGG_BLOODBOIL: + case DATA_RELIQUARY_OF_SOULS: + if (AllBossesDone({ DATA_SHADE_OF_AKAMA, DATA_TERON_GOREFIEND, DATA_GURTOGG_BLOODBOIL, DATA_RELIQUARY_OF_SOULS })) + if (Creature* trigger = GetCreature(DATA_BLACK_TEMPLE_TRIGGER)) + trigger->AI()->Talk(EMOTE_LOWER_TEMPLE_DEFEATED); break; case DATA_ILLIDARI_COUNCIL: if (Creature* akama = GetCreature(DATA_AKAMA_ILLIDAN)) @@ -186,10 +193,6 @@ public: default: break; } - - if (AllBossesDone({ DATA_SHADE_OF_AKAMA, DATA_TERON_GOREFIEND, DATA_GURTOGG_BLOODBOIL, DATA_RELIQUARY_OF_SOULS })) - if (Creature* trigger = GetCreature(DATA_BLACK_TEMPLE_TRIGGER)) - trigger->AI()->Talk(EMOTE_LOWER_TEMPLE_DEFEATED); } return true; }