Unstable 0.15.12.0

Barotrauma/BarotraumaClient/LinuxClient.csproj

@@ -6,7 +6,7 @@
     <RootNamespace>Barotrauma</RootNamespace>
     <Authors>FakeFish, Undertow Games</Authors>
     <Product>Barotrauma</Product>
-    <Version>0.15.11.0</Version>
+    <Version>0.15.12.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.11.0</Version>
+    <Version>0.15.12.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.11.0</Version>
+    <Version>0.15.12.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.11.0</Version>
+    <Version>0.15.12.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.11.0</Version>
+    <Version>0.15.12.0</Version>
     <Copyright>Copyright © FakeFish 2018-2020</Copyright>
     <Platforms>AnyCPU;x64</Platforms>
     <AssemblyName>DedicatedServer</AssemblyName>

Barotrauma/BarotraumaServer/WindowsServer.csproj

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

Barotrauma/BarotraumaShared/SharedSource/Characters/AI/EnemyAIController.cs

@@ -2343,7 +2343,7 @@ namespace Barotrauma
             }
             if (steeringManager is IndoorsSteeringManager pathSteering)
             {
-                if (!pathSteering.IsPathDirty && pathSteering.CurrentPath.Unreachable)
+                if (!pathSteering.IsPathDirty && pathSteering.CurrentPath != null && pathSteering.CurrentPath.Unreachable)
                 {
                     // Can't reach
                     State = AIState.Idle;

Barotrauma/BarotraumaShared/SharedSource/Characters/CharacterInfo.cs

@@ -1261,7 +1261,7 @@ namespace Barotrauma
         }
 
         const int BaseExperienceRequired = -50;
-        const int AddedExperienceRequiredPerLevel = 550;
+        const int AddedExperienceRequiredPerLevel = 500;
 
         public int GetTotalTalentPoints()
         {

Barotrauma/BarotraumaShared/SharedSource/Characters/Health/Afflictions/AfflictionHusk.cs

@@ -151,6 +151,7 @@ namespace Barotrauma
 
         private void DeactivateHusk()
         {
+            if (character?.AnimController == null || character.Removed) { return; }
             if (Prefab is AfflictionPrefabHusk { NeedsAir: false })
             {
                 character.NeedsAir = character.Params.MainElement.GetAttributeBool("needsair", false);
@@ -218,9 +219,12 @@ namespace Barotrauma
             XElement infoElement = character.Info?.Save(parentElement);
             CharacterInfo huskCharacterInfo = infoElement == null ? null : new CharacterInfo(infoElement);
 
-            var bodyTint = GetBodyTint();
+            if (huskCharacterInfo != null)
-            huskCharacterInfo.SkinColor =
+            {
-                    Color.Lerp(huskCharacterInfo.SkinColor, bodyTint.Opaque(), bodyTint.A / 255.0f);
+                var bodyTint = GetBodyTint();
+                huskCharacterInfo.SkinColor =
+                        Color.Lerp(huskCharacterInfo.SkinColor, bodyTint.Opaque(), bodyTint.A / 255.0f);
+            }
 
             var husk = Character.Create(huskedSpeciesName, character.WorldPosition, ToolBox.RandomSeed(8), huskCharacterInfo, isRemotePlayer: false, hasAi: true);
             if (husk.Info != null)

Barotrauma/BarotraumaShared/SharedSource/Items/Components/ElectricalDischarger.cs

@@ -184,6 +184,7 @@ namespace Barotrauma.Items.Components
             {
                 foreach ((Character character, Node node) in charactersInRange)
                 {
+                    if (character == null || character.Removed) { continue; }
                     character.ApplyAttack(null, node.WorldPosition, attack, 1.0f);
                 }
             }

Barotrauma/BarotraumaShared/changelog.txt

@@ -1,3 +1,13 @@
+---------------------------------------------------------------------------------------------------------
+v0.15.12.0
+---------------------------------------------------------------------------------------------------------
+
+- Slightly increased the amount of experience given by missions.
+- Fixed crashing when a monster gets huskified.
+- Fixed crashing when a client tries to deactivate the husk infection of a character that's been removed.
+- Fixed crashing in EnemyAIController.UpdateFollow.
+- Fixed console errors when an electrical discharge coil damages a monster that gets instakilled and disappears on death (e.g. swarm feeder).
+
 ---------------------------------------------------------------------------------------------------------
 v0.15.11.0
 ---------------------------------------------------------------------------------------------------------