From f3eec7bb39863d78a80523768912ba34eceafe8a Mon Sep 17 00:00:00 2001 From: FN Date: Mon, 29 Apr 2024 19:42:59 +0700 Subject: [PATCH 1/3] Possible fix --- Content.Server/Database/UserDbDataManager.cs | 3 ++- Content.Server/GameTicking/GameTicker.Player.cs | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Content.Server/Database/UserDbDataManager.cs b/Content.Server/Database/UserDbDataManager.cs index f8b1611fd57..d3de7555def 100644 --- a/Content.Server/Database/UserDbDataManager.cs +++ b/Content.Server/Database/UserDbDataManager.cs @@ -27,7 +27,8 @@ public sealed class UserDbDataManager // but this runs into ordering issues with game ticker. public void ClientConnected(ICommonSession session) { - DebugTools.Assert(!_users.ContainsKey(session.UserId), "We should not have any cached data on client connect."); + if (_users.ContainsKey(session.UserId)) + return; var cts = new CancellationTokenSource(); var task = Load(session, cts.Token); diff --git a/Content.Server/GameTicking/GameTicker.Player.cs b/Content.Server/GameTicking/GameTicker.Player.cs index 9c068ebfce9..898cb22d437 100644 --- a/Content.Server/GameTicking/GameTicker.Player.cs +++ b/Content.Server/GameTicking/GameTicker.Player.cs @@ -89,6 +89,8 @@ private async void PlayerStatusChanged(object? sender, SessionStatusEventArgs ar _roundStartCountdownHasNotStartedYetDueToNoPlayers = false; _roundStartTime = _gameTiming.CurTime + LobbyDuration; } + + _userDb.ClientConnected(session); break; } From e6a4d4438a0ccdd3a033c66f553c125a4e8ac740 Mon Sep 17 00:00:00 2001 From: FN Date: Mon, 29 Apr 2024 19:44:18 +0700 Subject: [PATCH 2/3] Commit for git magic --- RobustToolbox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RobustToolbox b/RobustToolbox index a6e72246724..35b36d194ac 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit a6e7224672402c36f0b61d7c082427b4ff31250e +Subproject commit 35b36d194acbc41385facdaf845f6357520a9b30 From f3bc39045b0b9f017ce65f3c2e284848130425aa Mon Sep 17 00:00:00 2001 From: FN Date: Mon, 29 Apr 2024 20:12:38 +0700 Subject: [PATCH 3/3] Fix Robust commit --- RobustToolbox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RobustToolbox b/RobustToolbox index 35b36d194ac..a6e72246724 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 35b36d194acbc41385facdaf845f6357520a9b30 +Subproject commit a6e7224672402c36f0b61d7c082427b4ff31250e