From 95a8b89e2bb84a0f928ca63efc7adcc087373128 Mon Sep 17 00:00:00 2001
From: Regalis11 <poe.regalis@gmail.com>
Date: Tue, 2 Apr 2024 18:15:50 +0300
Subject: [PATCH] v1.3.0.2

---
 .../ClientSource/Steam/BulkDownloader.cs      | 20 +++++++++++--------
 Barotrauma/BarotraumaShared/changelog.txt     |  6 ++++++
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/Barotrauma/BarotraumaClient/ClientSource/Steam/BulkDownloader.cs b/Barotrauma/BarotraumaClient/ClientSource/Steam/BulkDownloader.cs
index 5d8783855..ae973d560 100644
--- a/Barotrauma/BarotraumaClient/ClientSource/Steam/BulkDownloader.cs
+++ b/Barotrauma/BarotraumaClient/ClientSource/Steam/BulkDownloader.cs
@@ -48,15 +48,19 @@ namespace Barotrauma.Steam
                 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
index 6c6ee9198..2768565a0 100644
--- 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
 -------------------------------------------------------------------------------------------------------------------------------------------------