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 11d281dce..f18081fb3 100644 --- a/Barotrauma/BarotraumaClient/LinuxClient.csproj +++ b/Barotrauma/BarotraumaClient/LinuxClient.csproj @@ -11,7 +11,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 3040617a3..52406f321 100644 --- a/Barotrauma/BarotraumaClient/MacClient.csproj +++ b/Barotrauma/BarotraumaClient/MacClient.csproj @@ -11,7 +11,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 c44c559d3..e35d90a60 100644 --- a/Barotrauma/BarotraumaClient/WindowsClient.csproj +++ b/Barotrauma/BarotraumaClient/WindowsClient.csproj @@ -11,7 +11,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 3698ceabd..1a67bea32 100644 --- a/Barotrauma/BarotraumaServer/LinuxServer.csproj +++ b/Barotrauma/BarotraumaServer/LinuxServer.csproj @@ -11,7 +11,7 @@ Barotrauma FakeFish, Undertow Games Barotrauma Dedicated Server - 0.19.8.0 + 0.19.9.0 Copyright © FakeFish 2018-2022 AnyCPU;x64 DedicatedServer @@ -150,4 +150,4 @@ - \ No newline at end of file + diff --git a/Barotrauma/BarotraumaServer/MacServer.csproj b/Barotrauma/BarotraumaServer/MacServer.csproj index b8ec90d01..137d75576 100644 --- a/Barotrauma/BarotraumaServer/MacServer.csproj +++ b/Barotrauma/BarotraumaServer/MacServer.csproj @@ -11,7 +11,7 @@ Barotrauma FakeFish, Undertow Games Barotrauma Dedicated Server - 0.19.8.0 + 0.19.9.0 Copyright © FakeFish 2018-2022 AnyCPU;x64 DedicatedServer @@ -162,4 +162,4 @@ - \ No newline at end of file + diff --git a/Barotrauma/BarotraumaServer/WindowsServer.csproj b/Barotrauma/BarotraumaServer/WindowsServer.csproj index 7fa61287a..b771e36c3 100644 --- a/Barotrauma/BarotraumaServer/WindowsServer.csproj +++ b/Barotrauma/BarotraumaServer/WindowsServer.csproj @@ -11,7 +11,7 @@ Barotrauma FakeFish, Undertow Games Barotrauma Dedicated Server - 0.19.8.0 + 0.19.9.0 Copyright © FakeFish 2018-2022 AnyCPU;x64 DedicatedServer @@ -158,4 +158,4 @@ - \ No newline at end of file + 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 c8c51358c..edd29380c 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Items/Item.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Items/Item.cs @@ -3216,6 +3216,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 ---------------------------------------------------------------------------------------------------------