v0.19.0.0 (unstable)

2022-07-20 18:47:07 +03:00
parent 2e2663a175
commit 6b55adcdd9
170 changed files with 2769 additions and 1634 deletions
@@ -125,7 +125,7 @@ namespace Barotrauma.Networking
            return characterToRespawnCount >= GetMinCharactersToRespawn();
        }

-        partial void UpdateWaiting(float deltaTime)
+        partial void UpdateWaiting(float _)
        {
            if (RespawnShuttle != null)
            {
@@ -487,6 +487,20 @@ namespace Barotrauma.Networking
                    {
                        AutoItemPlacer.RegenerateLoot(RespawnShuttle, respawnContainer);
                    }
+
+                    //try to put the items in containers in the shuttle
+                    foreach (var respawnItem in respawnItems)
+                    {
+                        foreach (Item shuttleItem in RespawnShuttle.GetItems(alsoFromConnectedSubs: false))
+                        {
+                            if (shuttleItem.NonInteractable || shuttleItem.NonPlayerTeamInteractable) { continue; }
+                            var container = shuttleItem.GetComponent<ItemContainer>();
+                            if (container != null && container.Inventory.TryPutItem(respawnItem, user: null))
+                            {
+                                break;
+                            }
+                        }
+                    }
                }

                var characterData = campaign?.GetClientCharacterData(clients[i]);