Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop-unstable

2022-12-14 12:10:23 -03:00
parent c739ea3952 a4cee74f8b
commit 5f4f0af89c
13 changed files with 104 additions and 63 deletions
@@ -118,7 +118,11 @@ namespace Barotrauma
                Abandon = true;
                return;
            }
-            ItemToContain = item ?? character.Inventory.FindItem(i => CheckItem(i) && i.Container != container.Item, recursive: true);
+            ItemToContain = item ?? character.Inventory.FindItem(it => 
+                CheckItem(it) && 
+                //ignore items already in the container, unless we're trying to place to a specific slot, and the item's not in it
+                (it.Container != container.Item || (TargetSlot.HasValue && it.Container.OwnInventory.FindIndex(it) != TargetSlot)), 
+                recursive: true);
            if (ItemToContain != null)
            {
                if (!character.CanInteractWith(ItemToContain, checkLinked: false))