Merge https://github.com/Regalis11/Barotrauma into develop

evilfactory · Aug 28, 2024 · d71ced9 · d71ced9
2 parents a823eab + 912f5db
commit d71ced9
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 12 deletions.
diff --git a/.github/DISCUSSION_TEMPLATE/bug-reports.yml b/.github/DISCUSSION_TEMPLATE/bug-reports.yml
@@ -73,7 +73,8 @@ 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.5.9.1 (Summer Update Hotfix 2)
+        - v1.5.9.2 (Summer Update Hotfix 2)
+        - v1.6.101.0 (unstable)
         - Other
     validations:
       required: true

diff --git a/...trauma/BarotraumaClient/ClientSource/Networking/Primitives/P2PSocket/SteamListenSocket.cs b/...trauma/BarotraumaClient/ClientSource/Networking/Primitives/P2PSocket/SteamListenSocket.cs
@@ -68,7 +68,7 @@ public override void OnDisconnected(Steamworks.Data.Connection connection, Steam
 
         public override void OnMessage(Steamworks.Data.Connection connection, Steamworks.Data.NetIdentity identity, IntPtr data, int size, long messageNum, long recvTime, int channel)
         {
-            if (!identity.IsSteamId) { return; }
+            if (!identity.IsSteamId || data == IntPtr.Zero) { return; }
             var endpoint = new SteamP2PEndpoint(new SteamId((Steamworks.SteamId)identity));
 
             var dataArray = new byte[size];

diff --git a/Barotrauma/BarotraumaClient/LinuxClient.csproj b/Barotrauma/BarotraumaClient/LinuxClient.csproj
@@ -6,7 +6,7 @@
     <RootNamespace>Barotrauma</RootNamespace>
     <Authors>FakeFish, Undertow Games</Authors>
     <Product>Barotrauma</Product>
-    <Version>1.5.9.1</Version>
+    <Version>1.5.9.2</Version>
     <Copyright>Copyright © FakeFish 2018-2024</Copyright>
     <Platforms>AnyCPU;x64</Platforms>
     <AssemblyName>Barotrauma</AssemblyName>

diff --git a/Barotrauma/BarotraumaClient/MacClient.csproj b/Barotrauma/BarotraumaClient/MacClient.csproj
@@ -6,7 +6,7 @@
     <RootNamespace>Barotrauma</RootNamespace>
     <Authors>FakeFish, Undertow Games</Authors>
     <Product>Barotrauma</Product>
-    <Version>1.5.9.1</Version>
+    <Version>1.5.9.2</Version>
     <Copyright>Copyright © FakeFish 2018-2024</Copyright>
     <Platforms>AnyCPU;x64</Platforms>
     <AssemblyName>Barotrauma</AssemblyName>

diff --git a/Barotrauma/BarotraumaClient/WindowsClient.csproj b/Barotrauma/BarotraumaClient/WindowsClient.csproj
@@ -6,7 +6,7 @@
     <RootNamespace>Barotrauma</RootNamespace>
     <Authors>FakeFish, Undertow Games</Authors>
     <Product>Barotrauma</Product>
-    <Version>1.5.9.1</Version>
+    <Version>1.5.9.2</Version>
     <Copyright>Copyright © FakeFish 2018-2024</Copyright>
     <Platforms>AnyCPU;x64</Platforms>
     <AssemblyName>Barotrauma</AssemblyName>

diff --git a/Barotrauma/BarotraumaServer/LinuxServer.csproj b/Barotrauma/BarotraumaServer/LinuxServer.csproj
@@ -6,7 +6,7 @@
     <RootNamespace>Barotrauma</RootNamespace>
     <Authors>FakeFish, Undertow Games</Authors>
     <Product>Barotrauma Dedicated Server</Product>
-    <Version>1.5.9.1</Version>
+    <Version>1.5.9.2</Version>
     <Copyright>Copyright © FakeFish 2018-2023</Copyright>
     <Platforms>AnyCPU;x64</Platforms>
     <AssemblyName>DedicatedServer</AssemblyName>

diff --git a/Barotrauma/BarotraumaServer/MacServer.csproj b/Barotrauma/BarotraumaServer/MacServer.csproj
@@ -6,7 +6,7 @@
     <RootNamespace>Barotrauma</RootNamespace>
     <Authors>FakeFish, Undertow Games</Authors>
     <Product>Barotrauma Dedicated Server</Product>
-    <Version>1.5.9.1</Version>
+    <Version>1.5.9.2</Version>
     <Copyright>Copyright © FakeFish 2018-2023</Copyright>
     <Platforms>AnyCPU;x64</Platforms>
     <AssemblyName>DedicatedServer</AssemblyName>

diff --git a/Barotrauma/BarotraumaServer/WindowsServer.csproj b/Barotrauma/BarotraumaServer/WindowsServer.csproj
@@ -6,7 +6,7 @@
     <RootNamespace>Barotrauma</RootNamespace>
     <Authors>FakeFish, Undertow Games</Authors>
     <Product>Barotrauma Dedicated Server</Product>
-    <Version>1.5.9.1</Version>
+    <Version>1.5.9.2</Version>
     <Copyright>Copyright © FakeFish 2018-2023</Copyright>
     <Platforms>AnyCPU;x64</Platforms>
     <AssemblyName>DedicatedServer</AssemblyName>

diff --git a/Barotrauma/BarotraumaShared/README.txt b/Barotrauma/BarotraumaShared/README.txt
@@ -2,8 +2,8 @@
 
 http://www.barotraumagame.com
 
-© 2018-2022 FakeFish Ltd. All rights reserved.
-© 2019-2022 Daedalic Entertainment GmbH. The Daedalic logo is a trademark of Daedalic Entertainment GmbH, Germany. All rights reserved.
+© 2017-2024 FakeFish Ltd. All rights reserved.
+© 2019-2024 Daedalic Entertainment GmbH. The Daedalic logo is a trademark of Daedalic Entertainment GmbH, Germany. All rights reserved.
 Privacy policy: http://privacypolicy.daedalic.com
 
 See the wiki for more detailed info and instructions:

diff --git a/...uma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveDeconstructItems.cs b/...uma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveDeconstructItems.cs
@@ -65,7 +65,7 @@ protected override bool IsValidTarget(Item target)
             { 
                 return Objectives.ContainsKey(target) && AIObjectiveCleanupItems.IsItemInsideValidSubmarine(target, character); 
             }
-            if (target.CurrentHull.FireSources.Count > 0) { return false; }
+            if (target.CurrentHull != null && target.CurrentHull.FireSources.Count > 0) { return false; }
 
             foreach (Character c in Character.CharacterList)
             {

diff --git a/Barotrauma/BarotraumaShared/changelog.txt b/Barotrauma/BarotraumaShared/changelog.txt
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------------------------------------------------------------------------------------
+v1.5.9.2
+-------------------------------------------------------------------------------------------------------------------------------------------------
+
+- Fixed an exploit that allowed clients to crash servers when hosting through SteamP2P.
+- Fixed crashing when loading a save in which a character has a deconstruct order and an item marked for deconstruction is outside hulls.
+
+-------------------------------------------------------------------------------------------------------------------------------------------------
 v1.5.9.1
 -------------------------------------------------------------------------------------------------------------------------------------------------
 

diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ This is a Barotrauma modification that adds Lua and Cs modding support.
 
 # Barotrauma
 
-Copyright © FakeFish Ltd 2017-2022
+Copyright © FakeFish Ltd 2017-2024
 
 Before downloading the source code, please read the [EULA](EULA.txt).