Hotfix 0.15.23.0

Barotrauma/BarotraumaClient/ClientSource/Characters/CharacterNetworking.cs

@@ -323,9 +323,10 @@ namespace Barotrauma
                             }
                             break;
                         case 1: //NetEntityEvent.Type.Control
+                            bool myCharacter = msg.ReadBoolean();
                             byte ownerID = msg.ReadByte();
                             ResetNetState();
-                            if (ownerID == GameMain.Client.ID)
+                            if (myCharacter)
                             {
                                 if (controlled != null)
                                 {

Barotrauma/BarotraumaClient/LinuxClient.csproj

@@ -6,7 +6,7 @@
     <RootNamespace>Barotrauma</RootNamespace>
     <Authors>FakeFish, Undertow Games</Authors>
     <Product>Barotrauma</Product>
-    <Version>0.15.22.1</Version>
+    <Version>0.15.23.0</Version>
     <Copyright>Copyright © FakeFish 2018-2020</Copyright>
     <Platforms>AnyCPU;x64</Platforms>
     <AssemblyName>Barotrauma</AssemblyName>

Barotrauma/BarotraumaClient/MacClient.csproj

@@ -6,7 +6,7 @@
     <RootNamespace>Barotrauma</RootNamespace>
     <Authors>FakeFish, Undertow Games</Authors>
     <Product>Barotrauma</Product>
-    <Version>0.15.22.1</Version>
+    <Version>0.15.23.0</Version>
     <Copyright>Copyright © FakeFish 2018-2020</Copyright>
     <Platforms>AnyCPU;x64</Platforms>
     <AssemblyName>Barotrauma</AssemblyName>

Barotrauma/BarotraumaClient/WindowsClient.csproj

@@ -6,7 +6,7 @@
     <RootNamespace>Barotrauma</RootNamespace>
     <Authors>FakeFish, Undertow Games</Authors>
     <Product>Barotrauma</Product>
-    <Version>0.15.22.1</Version>
+    <Version>0.15.23.0</Version>
     <Copyright>Copyright © FakeFish 2018-2020</Copyright>
     <Platforms>AnyCPU;x64</Platforms>
     <AssemblyName>Barotrauma</AssemblyName>

Barotrauma/BarotraumaServer/LinuxServer.csproj

@@ -6,7 +6,7 @@
     <RootNamespace>Barotrauma</RootNamespace>
     <Authors>FakeFish, Undertow Games</Authors>
     <Product>Barotrauma Dedicated Server</Product>
-    <Version>0.15.22.1</Version>
+    <Version>0.15.23.0</Version>
     <Copyright>Copyright © FakeFish 2018-2020</Copyright>
     <Platforms>AnyCPU;x64</Platforms>
     <AssemblyName>DedicatedServer</AssemblyName>

Barotrauma/BarotraumaServer/MacServer.csproj

@@ -6,7 +6,7 @@
     <RootNamespace>Barotrauma</RootNamespace>
     <Authors>FakeFish, Undertow Games</Authors>
     <Product>Barotrauma Dedicated Server</Product>
-    <Version>0.15.22.1</Version>
+    <Version>0.15.23.0</Version>
     <Copyright>Copyright © FakeFish 2018-2020</Copyright>
     <Platforms>AnyCPU;x64</Platforms>
     <AssemblyName>DedicatedServer</AssemblyName>

Barotrauma/BarotraumaServer/ServerSource/Characters/CharacterNetworking.cs

@@ -321,6 +321,7 @@ namespace Barotrauma
                     case NetEntityEvent.Type.Control:
                         msg.WriteRangedInteger(1, min, max);
                         Client owner = (Client)extraData[1];
+                        msg.Write(owner == c && owner.Character == this);
                         msg.Write(owner != null && owner.Character == this && GameMain.Server.ConnectedClients.Contains(owner) ? owner.ID : (byte)0);
                         break;
                     case NetEntityEvent.Type.Status:

Barotrauma/BarotraumaServer/ServerSource/GameSession/GameModes/MultiPlayerCampaign.cs

@@ -220,6 +220,7 @@ namespace Barotrauma
                 {
                     RespawnManager.ReduceCharacterSkills(characterInfo);
                     characterInfo.RemoveSavedStatValuesOnDeath();
+                    characterInfo.CauseOfDeath = null;
                 }
                 c.CharacterInfo = characterInfo;
                 characterData.RemoveAll(cd => cd.MatchesClient(c));

Barotrauma/BarotraumaServer/ServerSource/Networking/GameServer.cs

@@ -1337,9 +1337,9 @@ namespace Barotrauma.Networking
                     break;
                 case ClientPermissions.ManageRound:
                     bool end = inc.ReadBoolean();
-                    bool save = inc.ReadBoolean();
                     if (end)
                     {
+                        bool save = inc.ReadBoolean();
                         if (gameStarted)
                         {
                             Log("Client \"" + GameServer.ClientLogName(sender) + "\" ended the round.", ServerLog.MessageType.ServerMessage);

Barotrauma/BarotraumaServer/ServerSource/Networking/RespawnManager.cs

@@ -399,6 +399,7 @@ namespace Barotrauma.Networking
                         {
                             ReduceCharacterSkills(characterInfos[i]);
                             characterInfos[i].RemoveSavedStatValuesOnDeath();
+                            characterInfos[i].CauseOfDeath = null;
                         }
                     }
                 }

Barotrauma/BarotraumaServer/ServerSource/Networking/Voting.cs

@@ -131,7 +131,7 @@ namespace Barotrauma
                     {
                         string subName = inc.ReadString();
                         SubmarineInfo subInfo = SubmarineInfo.SavedSubmarines.FirstOrDefault(s => s.Name == subName);
-                        if (GameMain.GameSession?.Campaign is MultiPlayerCampaign campaign && campaign.CanPurchaseSub(subInfo))
+                        if (GameMain.GameSession?.Campaign is MultiPlayerCampaign campaign && (campaign.CanPurchaseSub(subInfo) || GameMain.GameSession.IsSubmarineOwned(subInfo)))
                         {
                             StartSubmarineVote(subInfo, voteType, sender);
                         }

Barotrauma/BarotraumaServer/WindowsServer.csproj

@@ -6,7 +6,7 @@
     <RootNamespace>Barotrauma</RootNamespace>
     <Authors>FakeFish, Undertow Games</Authors>
     <Product>Barotrauma Dedicated Server</Product>
-    <Version>0.15.22.1</Version>
+    <Version>0.15.23.0</Version>
     <Copyright>Copyright © FakeFish 2018-2020</Copyright>
     <Platforms>AnyCPU;x64</Platforms>
     <AssemblyName>DedicatedServer</AssemblyName>

Barotrauma/BarotraumaShared/changelog.txt

@@ -1,3 +1,12 @@
+---------------------------------------------------------------------------------------------------------
+v0.15.23.0
+---------------------------------------------------------------------------------------------------------
+
+- Fixed inability to switch subs in multiplayer campaign, unless you opt to switch at the same time as you purchase the new sub.
+- Fixed server not loading the previous save, but continuing from where you left off if you return to the server lobby without saving and try to continue.
+- Fixed characters who've died and respawned during a round getting a penalty to their skills again on the following round.
+- Attempt to fix clients sometimes gaining control of an incorrect character in the multiplayer campaign.
+
 ---------------------------------------------------------------------------------------------------------
 v0.15.22.1
 ---------------------------------------------------------------------------------------------------------