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

… develop
evilfactory · Apr 2, 2024 · 077cd0b · 077cd0b
2 parents 7dc75c6 + 332be4c
commit 077cd0b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/.github/DISCUSSION_TEMPLATE/bug-reports.yml b/.github/DISCUSSION_TEMPLATE/bug-reports.yml
@@ -73,7 +73,7 @@ body:
       label: Version
       description: Which version of the game did the bug happen in? You can see the current version number in the bottom left corner of your screen in the main menu.
       options:      
-        - v1.3.0.0/v1.3.0.1
+        - v1.3.0.2
         - v1.4.0.0 (unstable)
         - Other
     validations:

diff --git a/Barotrauma/BarotraumaClient/ClientSource/Steam/BulkDownloader.cs b/Barotrauma/BarotraumaClient/ClientSource/Steam/BulkDownloader.cs
@@ -48,15 +48,19 @@ internal static void SubscribeToServerMods(IEnumerable<UInt64> missingIds, Conne
                 t =>
                 {
                     msgBox.Close();
-                    if (!t.TryGetResult(out Steamworks.Ugc.Item?[]? itemsNullable)) { return; }
+                    if (!t.TryGetResult(out Option<Steamworks.Ugc.Item>[]? itemOptions)) { return; }
 
-                    var items = itemsNullable
-                        .Where(it => it.HasValue)
-                        .Select(it => it ?? default)
-                        .ToArray();
-                    
-                    items.ForEach(it => it.Subscribe());
-                    InitiateDownloads(items, onComplete: () =>
+                    List<Steamworks.Ugc.Item> itemsToDownload = new List<Steamworks.Ugc.Item>();
+                    foreach (Option<Steamworks.Ugc.Item> itemOption in itemOptions)
+                    {
+                        if (itemOption.TryUnwrap(out var item))
+                        {
+                            itemsToDownload.Add(item);
+                        }
+                    }
+
+                    itemsToDownload.ForEach(it => it.Subscribe());
+                    InitiateDownloads(itemsToDownload, onComplete: () =>
                     {
                         ContentPackageManager.UpdateContentPackageList();
                         GameMain.Instance.ConnectCommand = Option<ConnectCommand>.Some(rejoinCommand);

diff --git a/Barotrauma/BarotraumaShared/changelog.txt b/Barotrauma/BarotraumaShared/changelog.txt
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------------------------------------------------------------------------------------
+v1.3.0.2
+-------------------------------------------------------------------------------------------------------------------------------------------------
+
+- Fixed inability to download missing mods from the Steam Workshop when you're joining a server.
+
 -------------------------------------------------------------------------------------------------------------------------------------------------
 v1.3.0.1
 -------------------------------------------------------------------------------------------------------------------------------------------------