vlad.os/LuaCsForBarotraumaEP
0
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
.github/DISCUSSION_TEMPLATE/bug-reports.yml
+1 -1
View File
@@ -73,7 +73,7 @@ body:
label: Version 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. 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: options:
- v1.3.0.0/v1.3.0.1 - v1.3.0.2
- v1.4.0.0 (unstable) - v1.4.0.0 (unstable)
- Other - Other
validations: validations:
Barotrauma/BarotraumaClient/ClientSource/Steam/BulkDownloader.cs
+12 -8
View File
@@ -48,15 +48,19 @@ namespace Barotrauma.Steam
t => t =>
{ {
msgBox.Close(); msgBox.Close();
if (!t.TryGetResult(out Steamworks.Ugc.Item?[]? itemsNullable)) { return; } if (!t.TryGetResult(out Option<Steamworks.Ugc.Item>[]? itemOptions)) { return; }
var items = itemsNullable List<Steamworks.Ugc.Item> itemsToDownload = new List<Steamworks.Ugc.Item>();
.Where(it => it.HasValue) foreach (Option<Steamworks.Ugc.Item> itemOption in itemOptions)
.Select(it => it ?? default) {
.ToArray(); if (itemOption.TryUnwrap(out var item))
{
items.ForEach(it => it.Subscribe()); itemsToDownload.Add(item);
InitiateDownloads(items, onComplete: () => }
}
itemsToDownload.ForEach(it => it.Subscribe());
InitiateDownloads(itemsToDownload, onComplete: () =>
{ {
ContentPackageManager.UpdateContentPackageList(); ContentPackageManager.UpdateContentPackageList();
GameMain.Instance.ConnectCommand = Option<ConnectCommand>.Some(rejoinCommand); GameMain.Instance.ConnectCommand = Option<ConnectCommand>.Some(rejoinCommand);
Barotrauma/BarotraumaShared/changelog.txt
+6
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 v1.3.0.1
------------------------------------------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------