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

2019-03-29 21:50:58 +02:00
parent 6f919a4de0
commit 0b098efbf6
7 changed files with 117 additions and 20 deletions
@@ -162,6 +162,7 @@ namespace Barotrauma.Items.Components
                    if (contained == null) continue;
                    if (contained.TryInteract(character))
                    {
+                        character.FocusedItem = contained;
                        return false;
                    }
                }
@@ -178,6 +179,7 @@ namespace Barotrauma.Items.Components
                    if (contained == null) continue;
                    if (contained.TryInteract(picker))
                    {
+                        picker.FocusedItem = contained;
                        return true;
                    }
                }