From 95a8b89e2bb84a0f928ca63efc7adcc087373128 Mon Sep 17 00:00:00 2001 From: Regalis11 Date: Tue, 2 Apr 2024 18:15:50 +0300 Subject: [PATCH 1/2] 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[]? itemOptions)) { return; } - var items = itemsNullable - .Where(it => it.HasValue) - .Select(it => it ?? default) - .ToArray(); - - items.ForEach(it => it.Subscribe()); - InitiateDownloads(items, onComplete: () => + List itemsToDownload = new List(); + foreach (Option 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.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 ------------------------------------------------------------------------------------------------------------------------------------------------- From 332be4c9d2c1dd6e728826505b1220c3a9047941 Mon Sep 17 00:00:00 2001 From: Regalis11 Date: Tue, 2 Apr 2024 18:16:17 +0300 Subject: [PATCH 2/2] Updated bug report template --- .github/DISCUSSION_TEMPLATE/bug-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/DISCUSSION_TEMPLATE/bug-reports.yml b/.github/DISCUSSION_TEMPLATE/bug-reports.yml index 8a3433f8e..45472fffd 100644 --- 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: