From fa9c0e5a8421bc5ca172ad18907208942cae9642 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Tue, 26 Jan 2021 20:12:50 -0500 Subject: [PATCH] Core/Gameevent: Fix loading server. --- Source/Game/Events/GameEventManager.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Source/Game/Events/GameEventManager.cs b/Source/Game/Events/GameEventManager.cs index 5e8b0e5f8..f5040a231 100644 --- a/Source/Game/Events/GameEventManager.cs +++ b/Source/Game/Events/GameEventManager.cs @@ -260,6 +260,7 @@ namespace Game { Log.outError(LogFilter.Sql, $"`game_event` game event id ({event_id}) contains nonexisting holiday id {pGameEvent.holiday_id}."); pGameEvent.holiday_id = HolidayIds.None; + continue; } if (pGameEvent.holidayStage > SharedConst.MaxHolidayDurations) { @@ -267,10 +268,11 @@ namespace Game pGameEvent.holidayStage = 0; continue; } + + SetHolidayEventTime(pGameEvent); } mGameEvent[event_id] = pGameEvent; - SetHolidayEventTime(pGameEvent); } while (result.NextRow()); @@ -1576,10 +1578,9 @@ namespace Game return; var holiday = CliDB.HolidaysStorage.LookupByKey(gameEvent.holiday_id); - if (holiday.Date[0] == 0 || holiday.Duration[0] == 0) // Invalid definitions { - Log.outError(LogFilter.Sql, "Missing date or duration for holiday {gameEvent.holiday_id}."); + Log.outError(LogFilter.Sql, $"Missing date or duration for holiday {gameEvent.holiday_id}."); return; } @@ -1644,7 +1645,7 @@ namespace Game return; } } - Log.outError(LogFilter.Sql, "No suitable start date found for holiday {gameEvent.holiday_id}."); + Log.outError(LogFilter.Sql, $"No suitable start date found for holiday {gameEvent.holiday_id}."); } public bool IsHolidayActive(HolidayIds id)