(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
@@ -620,6 +620,7 @@ namespace Barotrauma
                {
                    if (DraggingItemToWorld &&
                        Character.Controlled.FocusedItem?.OwnInventory != null &&
+                        Character.Controlled.FocusedItem.OwnInventory.CanBePut(draggingItem) &&
                        Character.Controlled.FocusedItem.OwnInventory.TryPutItem(draggingItem, Character.Controlled))
                    {
                        GUI.PlayUISound(GUISoundType.PickItem);