Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop

2023-01-31 13:17:15 -03:00
parent ba543aef2c cf9ecd35b3
commit d60efb17cd
232 changed files with 4481 additions and 2283 deletions
@@ -1401,7 +1401,7 @@ namespace Barotrauma
                        MultiPlayerCampaign.StartCampaignSetup();
                        return;
                    }
-                    if (!GameMain.Server.StartGame()) { NewMessage("Failed to start a new round", Color.Yellow); }
+                    if (!GameMain.Server.TryStartGame()) { NewMessage("Failed to start a new round", Color.Yellow); }
                }
            }));