Faction Test 100.6.0.0

2022-11-25 19:55:45 +02:00
parent c44fb0ad3a
commit 0057f5bfce
130 changed files with 2771 additions and 1509 deletions
@@ -539,7 +539,7 @@ namespace Barotrauma.Items.Components
                var prevUser = user;
                CancelFabricating();

-                amountRemaining--;
+                amountRemaining--; 
                if (amountRemaining > 0 && CanBeFabricated(prevFabricatedItem, availableIngredients, prevUser))
                {
                    //keep fabricating if we can fabricate more
@@ -745,7 +745,7 @@ namespace Barotrauma.Items.Components
                    itemList.AddRange(container.Inventory.AllItems);
                }
            }
-            if (user?.Inventory != null)
+            if (user?.Inventory != null && user.SelectedItem == item)
            {
                itemList.AddRange(user.Inventory.AllItems);
                linkedInventories.Add(user.Inventory);