(869ac975f) Merge branch 'master' into dev

2019-06-12 16:43:56 +03:00
parent eaf4f6afb8
commit e3ca616fff
28 changed files with 372 additions and 162 deletions
@@ -442,7 +442,8 @@ namespace Barotrauma
                if (draggingItemToWorld)
                {
                    if (item.OwnInventory == null || 
-                        !item.OwnInventory.CanBePut(CharacterInventory.draggingItem))
+                        !item.OwnInventory.CanBePut(CharacterInventory.draggingItem) ||
+                        !CanAccessInventory(item.OwnInventory))
                    {
                        continue;
                    }