From 6c25009b20747a0cf65e14bacab0c90128502417 Mon Sep 17 00:00:00 2001 From: sudlud Date: Wed, 16 Sep 2026 20:21:23 +0200 Subject: [PATCH] fix(Core/Events): match a holiday to its own event, not its building stage (#27655) Co-authored-by: Claude Opus 5 (1M context) --- src/server/game/Events/GameEventMgr.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp index 962c3a93e1..de185926bc 100644 --- a/src/server/game/Events/GameEventMgr.cpp +++ b/src/server/game/Events/GameEventMgr.cpp @@ -2032,10 +2032,11 @@ void GameEventMgr::SetHolidayEventTime(GameEventData& event) uint32 GameEventMgr::GetHolidayEventId(uint32 holidayId) const { auto const& events = GetEventMap(); + uint8 mainStage = GetHolidayMainStage(holidayId); for (auto const& eventEntry : events) { - if (eventEntry.HolidayId == holidayId) + if (eventEntry.HolidayId == holidayId && eventEntry.HolidayStage == mainStage) { return eventEntry.EventId; }