Hotfix v0.18.12.0

Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectivePumpWater.cs

@@ -31,8 +31,9 @@ namespace Barotrauma
             if (!pump.Item.IsInteractable(character)) { return false; }
             if (pump.IsAutoControlled) { return false; }
             if (pump.Item.ConditionPercentage <= 0) { return false; }
+            if (pump.Item.CurrentHull == null) { return false; }
             if (pump.Item.CurrentHull.FireSources.Count > 0) { return false; }
-            if (character.Submarine != null)
+            if (character.Submarine != null && pump.Item.Submarine != null)
             {
                 if (!character.Submarine.IsConnectedTo(pump.Item.Submarine)) { return false; }
             }

Barotrauma/BarotraumaShared/SharedSource/Characters/Character.cs

@@ -1030,21 +1030,30 @@ namespace Barotrauma
         /// <param name="hasAi">Is the character controlled by AI.</param>
         /// <param name="createNetworkEvent">Should clients receive a network event about the creation of this character?</param>
         /// <param name="ragdoll">Ragdoll configuration file. If null, will select the default.</param>
-        public static Character Create(string speciesName, Vector2 position, string seed, CharacterInfo characterInfo = null, ushort id = Entity.NullEntityID, bool isRemotePlayer = false, bool hasAi = true, bool createNetworkEvent = true, RagdollParams ragdoll = null)
+        public static Character Create(string speciesName, Vector2 position, string seed, CharacterInfo characterInfo = null, ushort id = Entity.NullEntityID, bool isRemotePlayer = false, bool hasAi = true, bool createNetworkEvent = true, RagdollParams ragdoll = null, bool throwErrorIfNotFound = true)
         {
             if (speciesName.EndsWith(".xml", StringComparison.OrdinalIgnoreCase))
             {
                 speciesName = Path.GetFileNameWithoutExtension(speciesName);
             }
-            return Create(speciesName.ToIdentifier(), position, seed, characterInfo, id, isRemotePlayer, hasAi, createNetworkEvent, ragdoll);
+            return Create(speciesName.ToIdentifier(), position, seed, characterInfo, id, isRemotePlayer, hasAi, createNetworkEvent, ragdoll, throwErrorIfNotFound);
         }
 
-        public static Character Create(Identifier speciesName, Vector2 position, string seed, CharacterInfo characterInfo = null, ushort id = Entity.NullEntityID, bool isRemotePlayer = false, bool hasAi = true, bool createNetworkEvent = true, RagdollParams ragdoll = null)
+        public static Character Create(Identifier speciesName, Vector2 position, string seed, CharacterInfo characterInfo = null, ushort id = Entity.NullEntityID, bool isRemotePlayer = false, bool hasAi = true, bool createNetworkEvent = true, RagdollParams ragdoll = null, bool throwErrorIfNotFound = true)
         {
             var prefab = CharacterPrefab.FindBySpeciesName(speciesName);
             if (prefab == null)
             {
-                DebugConsole.ThrowError($"Failed to create character \"{speciesName}\". Matching prefab not found.\n" + Environment.StackTrace);
+                string errorMsg = $"Failed to create character \"{speciesName}\". Matching prefab not found.\n" + Environment.StackTrace;
+                if (throwErrorIfNotFound)
+                {
+                    DebugConsole.ThrowError(errorMsg);
+                }
+                else
+                {
+                    DebugConsole.AddWarning(errorMsg);
+                }
+
                 return null;
             }
             return Create(prefab, position, seed, characterInfo, id, isRemotePlayer, hasAi, createNetworkEvent, ragdoll);

Barotrauma/BarotraumaShared/SharedSource/Events/MonsterEvent.cs

@@ -532,7 +532,13 @@ namespace Barotrauma
                             }
                         }
 
-                        Character createdCharacter = Character.Create(SpeciesName, pos, seed, characterInfo: null, isRemotePlayer: false, hasAi: true, createNetworkEvent: true);
+                        Character createdCharacter = Character.Create(SpeciesName, pos, seed, characterInfo: null, isRemotePlayer: false, hasAi: true, createNetworkEvent: true, throwErrorIfNotFound: false);
+                        if (createdCharacter == null)
+                        {
+                            disallowed = true;
+                            return;
+                        }
+                        
                         var eventManager = GameMain.GameSession.EventManager;
                         if (eventManager != null)
                         {

Barotrauma/BarotraumaShared/SharedSource/Text/LocalizedString/FormattedLString.cs

@@ -1,4 +1,5 @@
 #nullable enable
+using System;
 using System.Collections.Immutable;
 using System.Linq;
 
@@ -18,7 +19,14 @@ namespace Barotrauma
         public override void RetrieveValue()
         {
             //TODO: possibly broken!
-            cachedValue = string.Format(str.Value, subStrs.Select(s => s.Value as object).ToArray());
+            try
+            {
+                cachedValue = string.Format(str.Value, subStrs.Select(s => s.Value as object).ToArray());
+            }
+            catch (FormatException)
+            {
+                cachedValue = str.Value;
+            }
             UpdateLanguage();
         }
     }