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

2024-03-28 14:26:18 -03:00
parent b3ac01cb22 3791670c42
commit 7a74cd052f
271 changed files with 13174 additions and 3021 deletions
@@ -306,7 +306,7 @@ namespace Barotrauma
                    {
                        onLoadFail?.Invoke(
                            fileListPath,
-                            result.TryUnwrapFailure(out var exception) ? exception : throw new Exception("unreachable"));
+                            result.TryUnwrapFailure(out var exception) ? exception : throw new UnreachableCodeException());
                        continue;
                    }
                    
@@ -497,7 +497,7 @@ namespace Barotrauma
            List<RegularPackage> enabledRegularPackages = new List<RegularPackage>();

 #if CLIENT
-            TaskPool.Add("EnqueueWorkshopUpdates", EnqueueWorkshopUpdates(), t => { });
+            TaskPool.AddWithResult("EnqueueWorkshopUpdates", EnqueueWorkshopUpdates(), t => { });
 #else
            #warning TODO: implement Workshop updates for servers at some point
 #endif