vlad.os/LuaCsForBarotraumaEP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
EvilFactory
2024-04-02 12:28:51 -03:00
parent 7dc75c6dd2 332be4c9d2
commit 077cd0bec3
3 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/DISCUSSION_TEMPLATE/bug-reports.yml vendored
View File

@@ -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:

20
Barotrauma/BarotraumaClient/ClientSource/Steam/BulkDownloader.cs
View File

@@ -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);

6
Barotrauma/BarotraumaShared/changelog.txt
View File

@@ -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
-------------------------------------------------------------------------------------------------------------------------------------------------