(1762f02b3) Merge branch 'dev' into human-ai

2019-05-16 05:08:22 +03:00
parent 4797f6b0d3
commit 454dda56c7
91 changed files with 1138 additions and 744 deletions
@@ -276,14 +276,6 @@ namespace Barotrauma.Items.Components
            if (highlighted != null)
            {
                highlighted.item.IsHighlighted = true;
-
-                if (Character.Controlled != null)
-                {
-                    Character.Controlled.FocusedItem = null;
-                    Character.Controlled.ResetInteract = true;
-                    Character.Controlled.ClearInputs();
-                }
-
                if (PlayerInput.LeftButtonClicked())
                {
                    MapEntity.DisableSelect = true;