Build 0.21.6.0 (1.0 pre-patch)

2023-01-31 18:08:26 +02:00
parent e1c04bc31d
commit cf9ecd35b3
231 changed files with 4479 additions and 2276 deletions
@@ -98,7 +98,7 @@ namespace Barotrauma
            int containedItemCount = 0;
            foreach (Item it in container.Inventory.AllItems)
            {
-                if (CheckItem(it))
+                if (CheckItem(it) && IsInTargetSlot(it))
                {
                    containedItemCount++;
                }
@@ -244,7 +244,8 @@ namespace Barotrauma

        public bool IsInTargetSlot(Item item)
        {
-            if (container?.Inventory is ItemInventory inventory && TargetSlot is not null)
+            if (TargetSlot == null) { return true; }
+            if (container?.Inventory is ItemInventory inventory)
            {
                return inventory.IsInSlot(item, (int)TargetSlot);
            }