(f87bfac85) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-06-12 16:45:24 +03:00
parent dce98349ea
commit adab8589da
14 changed files with 119 additions and 78 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);