Merge remote-tracking branch 'upstream/master' into develop

2024-10-28 10:10:02 -03:00
parent 0daaaf9fca 7eac44ea7d
commit d906066425
47 changed files with 246 additions and 125 deletions
@@ -765,6 +765,11 @@ namespace Barotrauma.Networking
                case ServerPacketHeader.CANCEL_STARTGAME:
                    DebugConsole.Log("Received CANCEL_STARTGAME packet.");
                    GameMain.NetLobbyScreen?.CloseStartRoundWarning();
+                    if (GameMain.NetLobbyScreen?.ReadyToStartBox is { } readyToStartBox)
+                    {
+                        readyToStartBox.Selected = false;
+                        SetReadyToStart(readyToStartBox);
+                    }
                    break;
                case ServerPacketHeader.STARTGAME:
                    DebugConsole.Log("Received STARTGAME packet.");