fix(Core/Events): match a holiday to its own event, not its building stage (#27655)

Co-authored-by: Claude Opus 5 (1M context) <[email protected]>
This commit is contained in:
sudlud
2026-09-16 20:21:23 +02:00
committed by GitHub
co-authored by Claude Opus 5
parent 7883cb5d1c
commit 6c25009b20
+2 -1
View File
@@ -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;
}