From 3a36c1ca8df8bbbe9360a0cc7847cdc3544466aa Mon Sep 17 00:00:00 2001 From: Andrew <47818697+Nyeriah@users.noreply.github.com> Date: Sat, 2 May 2026 20:52:47 -0300 Subject: [PATCH] fix(Scripts/HoR): keep leader intro events across double Reset (#25689) --- .../FrozenHalls/HallsOfReflection/halls_of_reflection.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp index c6fbed94b..e99b6cbc7 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -215,12 +215,10 @@ public: instance = me->GetInstanceScript(); if (!instance) me->IsAIEnabled = false; - first = (instance && !instance->GetPersistentData(PERSISTENT_DATA_INTRO)); } InstanceScript* instance; EventMap events; - bool first; bool shortver; void Reset() override @@ -228,9 +226,8 @@ public: shortver = false; events.Reset(); me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE); - if (first) + if (instance && !instance->GetPersistentData(PERSISTENT_DATA_INTRO)) { - first = false; events.ScheduleEvent(EVENT_PRE_INTRO_1, 10s); events.ScheduleEvent(EVENT_PRE_INTRO_2, 11s); events.ScheduleEvent(EVENT_EMOTE_LEADER_1, 16s);