v1.6.19.1 (Unto the Breach Hotfix 1)

2024-10-31 11:27:32 +02:00
parent c015059218
commit 26ffd2104e
28 changed files with 182 additions and 61 deletions
@@ -150,7 +150,7 @@ namespace Barotrauma
                        int maxCount = subElement.GetAttributeInt("maxcount", 10);
                        if (itemsToSpawn.Count(it => it.element == subElement) >= maxCount) { continue; }
                        ItemPrefab itemPrefab = FindItemPrefab(subElement);
-                        while (containers[i].freeSlots > 0 && containers[i].container.Inventory.CanBePut(itemPrefab))
+                        while (containers[i].freeSlots > 0 && containers[i].container.Inventory.CanProbablyBePut(itemPrefab))
                        {
                            containers[i] = (containers[i].container, containers[i].freeSlots - 1);
                            itemsToSpawn.Add((subElement, containers[i].container));
@@ -479,10 +479,7 @@ namespace Barotrauma
            }
 #endif
            enemySub.SetPosition(spawnPos);
-            if (!IsClient)
-            {
-                InitPirateShip();
-            }
+            InitPirateShip();            

            // flipping the sub on the frame it is moved into place must be done after it's been moved, or it breaks item connections in the submarine
            // creating the pirates has to be done after the sub has been flipped, or it seems to break the AI pathing