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
@@ -237,11 +237,7 @@ namespace Barotrauma
            coroutine = CoroutineManager.Invoke(() =>
            {
                //round ended before the coroutine finished
-#if CLIENT
-                if (GameMain.GameSession == null || Level.Loaded == null && !(GameMain.GameSession.GameMode is TestGameMode)) { return; }
-#else
-                if (GameMain.GameSession == null || Level.Loaded == null) { return; }
-#endif
+                if (GameMain.GameSession == null || Level.Loaded == null && GameMain.GameSession.GameMode is not TestGameMode) { return; }
                DelayedObjectives.Remove(objective);
                AddObjective(objective);
                callback?.Invoke();