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

2024-10-22 12:42:35 -03:00
parent 3e4b649162 a29662c074
commit 30a8f0c561
417 changed files with 17171 additions and 5895 deletions
@@ -40,7 +40,7 @@ namespace Barotrauma
                    {
                        matchingData.ApplyPermadeath();
                        
-                        if (GameMain.Server is { ServerSettings.IronmanMode: true })
+                        if (GameMain.Server?.ServerSettings is { IronmanModeActive: true })
                        {
                            mpCampaign.SaveSingleCharacter(matchingData);
                        }