(f2e516dfe) v0.9.3.2

2019-09-20 20:11:18 +03:00
parent 80698b58b0
commit 9aa12bcac2
144 changed files with 1653 additions and 1559 deletions
@@ -1484,6 +1484,9 @@ namespace Barotrauma
            return (wall == null || !wall.CastShadow) && (door == null || door.IsOpen);
        }

+        public bool HasItem(Item item, bool requireEquipped = false) => 
+            requireEquipped ? HasEquippedItem(item) : item.FindParentInventory(i => i.Owner == this) != null;
+
        public bool HasEquippedItem(Item item)
        {
            for (int i = 0; i < Inventory.Capacity; i++)
@@ -1595,7 +1598,7 @@ namespace Barotrauma
 #if CLIENT
            if (Screen.Selected == GameMain.SubEditorScreen) { hidden = false; }
 #endif  
-            if (!CanInteract || hidden) return false;
+            if (!CanInteract || hidden || item.NonInteractable) return false;

            if (item.ParentInventory != null)
            {