diff --git a/EpinelPS/Database/JsonDb.cs b/EpinelPS/Database/JsonDb.cs index 9f252d6..1a356b7 100644 --- a/EpinelPS/Database/JsonDb.cs +++ b/EpinelPS/Database/JsonDb.cs @@ -601,14 +601,14 @@ namespace EpinelPS.Database private bool ShouldResetUser() { - var nowLocal = DateTime.Now; + var nowLocal = DateTime.UtcNow; // Compute the last reset threshold (most recent 2 PM before or at nowLocal) DateTime todayResetTime = new( nowLocal.Year, nowLocal.Month, nowLocal.Day, - JsonDb.Instance.ResetHourLocalTime, 0, 0 + JsonDb.Instance.ResetHourUtcTime, 0, 0 ); if (nowLocal < todayResetTime) @@ -626,7 +626,7 @@ namespace EpinelPS.Database Logging.WriteLine("Resetting user...", LogType.Warning); - LastReset = DateTime.Now; + LastReset = DateTime.UtcNow; ResetableData = new(); JsonDb.Save(); } @@ -644,7 +644,7 @@ namespace EpinelPS.Database public LogType LogLevel = LogType.Debug; public int MaxInterceptionCount = 3; - public int ResetHourLocalTime = 14; + public int ResetHourUtcTime = 20; } internal class JsonDb { diff --git a/EpinelPS/LobbyServer/GetCurrentTime.cs b/EpinelPS/LobbyServer/GetCurrentTime.cs index fb9002c..555e1cb 100644 --- a/EpinelPS/LobbyServer/GetCurrentTime.cs +++ b/EpinelPS/LobbyServer/GetCurrentTime.cs @@ -13,7 +13,7 @@ namespace EpinelPS.LobbyServer ResGetNow response = new() { Tick = DateTimeOffset.UtcNow.ToUnixTimeSeconds(), - ResetHour = 1, + ResetHour = JsonDb.Instance.ResetHourUtcTime, CheatShiftDuration = Duration.FromTimeSpan(TimeSpan.FromSeconds(0)) }; // todo: validate response with actual server diff --git a/EpinelPS/LobbyServer/LobbyUser/EnterLobbyServer.cs b/EpinelPS/LobbyServer/LobbyUser/EnterLobbyServer.cs index 5dde673..b36d364 100644 --- a/EpinelPS/LobbyServer/LobbyUser/EnterLobbyServer.cs +++ b/EpinelPS/LobbyServer/LobbyUser/EnterLobbyServer.cs @@ -20,7 +20,7 @@ namespace EpinelPS.LobbyServer.LobbyUser ResEnterLobbyServer response = new() { User = LobbyHandler.CreateNetUserDataFromUser(user), - ResetHour = 20, + ResetHour = JsonDb.Instance.ResetHourUtcTime, Nickname = user.Nickname, SynchroLv = 1, OutpostBattleLevel = user.OutpostBattleLevel, diff --git a/EpinelPS/LobbyServer/LobbyUser/GetUser.cs b/EpinelPS/LobbyServer/LobbyUser/GetUser.cs index 3e03240..198d295 100644 --- a/EpinelPS/LobbyServer/LobbyUser/GetUser.cs +++ b/EpinelPS/LobbyServer/LobbyUser/GetUser.cs @@ -18,7 +18,7 @@ namespace EpinelPS.LobbyServer.LobbyUser response.User = LobbyHandler.CreateNetUserDataFromUser(user); - response.ResetHour = 20; + response.ResetHour = JsonDb.Instance.ResetHourUtcTime; response.OutpostBattleTime = new NetOutpostBattleTime() { MaxBattleTime = 864000000000, MaxOverBattleTime = 12096000000000, BattleTime = battleTimeMs }; response.OutpostBattleLevel = user.OutpostBattleLevel; response.IsSimple = req.IsSimple;