From d461d504dc0a4d7efc36edf80a17a05fde8350c4 Mon Sep 17 00:00:00 2001 From: Juan Pablo Arce Date: Fri, 30 Sep 2022 12:08:01 -0300 Subject: [PATCH] v0.19.9.0 --- .../Networking/Primitives/Peers/ClientPeer.cs | 3 +-- Barotrauma/BarotraumaClient/LinuxClient.csproj | 2 +- Barotrauma/BarotraumaClient/MacClient.csproj | 2 +- Barotrauma/BarotraumaClient/WindowsClient.csproj | 2 +- Barotrauma/BarotraumaServer/LinuxServer.csproj | 2 +- Barotrauma/BarotraumaServer/MacServer.csproj | 2 +- Barotrauma/BarotraumaServer/WindowsServer.csproj | 2 +- .../SharedSource/Events/Missions/Mission.cs | 10 +++++++--- Barotrauma/BarotraumaShared/SharedSource/Items/Item.cs | 1 + Barotrauma/BarotraumaShared/changelog.txt | 10 ++++++++++ 10 files changed, 25 insertions(+), 11 deletions(-) diff --git a/Barotrauma/BarotraumaClient/ClientSource/Networking/Primitives/Peers/ClientPeer.cs b/Barotrauma/BarotraumaClient/ClientSource/Networking/Primitives/Peers/ClientPeer.cs index b2cf3a633..2e5976f61 100644 --- a/Barotrauma/BarotraumaClient/ClientSource/Networking/Primitives/Peers/ClientPeer.cs +++ b/Barotrauma/BarotraumaClient/ClientSource/Networking/Primitives/Peers/ClientPeer.cs @@ -127,9 +127,8 @@ namespace Barotrauma.Networking DebugConsole.ThrowError(errorMsg); } ContentPackageOrderReceived = true; - - SendMsgInternal(headers, null); } + SendMsgInternal(headers, null); break; } diff --git a/Barotrauma/BarotraumaClient/LinuxClient.csproj b/Barotrauma/BarotraumaClient/LinuxClient.csproj index 88b2f6e49..e39ff9be7 100644 --- a/Barotrauma/BarotraumaClient/LinuxClient.csproj +++ b/Barotrauma/BarotraumaClient/LinuxClient.csproj @@ -6,7 +6,7 @@ Barotrauma FakeFish, Undertow Games Barotrauma - 0.19.8.0 + 0.19.9.0 Copyright © FakeFish 2018-2022 AnyCPU;x64 Barotrauma diff --git a/Barotrauma/BarotraumaClient/MacClient.csproj b/Barotrauma/BarotraumaClient/MacClient.csproj index 8af641319..88f57064a 100644 --- a/Barotrauma/BarotraumaClient/MacClient.csproj +++ b/Barotrauma/BarotraumaClient/MacClient.csproj @@ -6,7 +6,7 @@ Barotrauma FakeFish, Undertow Games Barotrauma - 0.19.8.0 + 0.19.9.0 Copyright © FakeFish 2018-2022 AnyCPU;x64 Barotrauma diff --git a/Barotrauma/BarotraumaClient/WindowsClient.csproj b/Barotrauma/BarotraumaClient/WindowsClient.csproj index e0cc010d5..25e677227 100644 --- a/Barotrauma/BarotraumaClient/WindowsClient.csproj +++ b/Barotrauma/BarotraumaClient/WindowsClient.csproj @@ -6,7 +6,7 @@ Barotrauma FakeFish, Undertow Games Barotrauma - 0.19.8.0 + 0.19.9.0 Copyright © FakeFish 2018-2022 AnyCPU;x64 Barotrauma diff --git a/Barotrauma/BarotraumaServer/LinuxServer.csproj b/Barotrauma/BarotraumaServer/LinuxServer.csproj index 27981fc58..91354d90f 100644 --- a/Barotrauma/BarotraumaServer/LinuxServer.csproj +++ b/Barotrauma/BarotraumaServer/LinuxServer.csproj @@ -6,7 +6,7 @@ Barotrauma FakeFish, Undertow Games Barotrauma Dedicated Server - 0.19.8.0 + 0.19.9.0 Copyright © FakeFish 2018-2022 AnyCPU;x64 DedicatedServer diff --git a/Barotrauma/BarotraumaServer/MacServer.csproj b/Barotrauma/BarotraumaServer/MacServer.csproj index 8403b2fcd..3402a6e9c 100644 --- a/Barotrauma/BarotraumaServer/MacServer.csproj +++ b/Barotrauma/BarotraumaServer/MacServer.csproj @@ -6,7 +6,7 @@ Barotrauma FakeFish, Undertow Games Barotrauma Dedicated Server - 0.19.8.0 + 0.19.9.0 Copyright © FakeFish 2018-2022 AnyCPU;x64 DedicatedServer diff --git a/Barotrauma/BarotraumaServer/WindowsServer.csproj b/Barotrauma/BarotraumaServer/WindowsServer.csproj index ac8ceabb6..dbf3cb866 100644 --- a/Barotrauma/BarotraumaServer/WindowsServer.csproj +++ b/Barotrauma/BarotraumaServer/WindowsServer.csproj @@ -6,7 +6,7 @@ Barotrauma FakeFish, Undertow Games Barotrauma Dedicated Server - 0.19.8.0 + 0.19.9.0 Copyright © FakeFish 2018-2022 AnyCPU;x64 DedicatedServer diff --git a/Barotrauma/BarotraumaShared/SharedSource/Events/Missions/Mission.cs b/Barotrauma/BarotraumaShared/SharedSource/Events/Missions/Mission.cs index 138b3b9f5..f203441b6 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Events/Missions/Mission.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Events/Missions/Mission.cs @@ -348,11 +348,15 @@ namespace Barotrauma completed = DetermineCompleted() && (completeCheckDataAction == null ||completeCheckDataAction.GetSuccess()); - if (Prefab.LocationTypeChangeOnCompleted != null) + if (completed) { - ChangeLocationType(Prefab.LocationTypeChangeOnCompleted); + if (Prefab.LocationTypeChangeOnCompleted != null) + { + ChangeLocationType(Prefab.LocationTypeChangeOnCompleted); + } + GiveReward(); } - GiveReward(); + EndMissionSpecific(completed); } diff --git a/Barotrauma/BarotraumaShared/SharedSource/Items/Item.cs b/Barotrauma/BarotraumaShared/SharedSource/Items/Item.cs index fdbe12a51..0cf39533b 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Items/Item.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Items/Item.cs @@ -3198,6 +3198,7 @@ namespace Barotrauma } #endif + item.condition = element.GetAttributeFloat("condition", item.condition); foreach (XAttribute attribute in (appliedSwap?.ConfigElement ?? element).Attributes()) { if (!item.SerializableProperties.TryGetValue(attribute.NameAsIdentifier(), out SerializableProperty property)) { continue; } diff --git a/Barotrauma/BarotraumaShared/changelog.txt b/Barotrauma/BarotraumaShared/changelog.txt index 49a90c5db..b511196c8 100644 --- a/Barotrauma/BarotraumaShared/changelog.txt +++ b/Barotrauma/BarotraumaShared/changelog.txt @@ -1,3 +1,13 @@ +--------------------------------------------------------------------------------------------------------- +v0.19.9.0 +--------------------------------------------------------------------------------------------------------- + +Fixes to new issues in the previous build: +- Fixed missions always giving rewards even if you fail them! +- Fixed clients sometimes failing to reconnect to the server if the connection is momentarily lost. +- Fixed item conditions resetting to 100% between rounds. +- Fixed mineral missions always causing a crash. + --------------------------------------------------------------------------------------------------------- v0.19.8.0 ---------------------------------------------------------------------------------------------------------