(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
@@ -226,8 +226,15 @@ namespace Barotrauma

                if (SelectedConstruction != null && SelectedConstruction.ActiveHUDs.Any(ic => ic.GuiFrame != null && HUD.CloseHUD(ic.GuiFrame.Rect)))
                {
-                    //emulate a Select input to get the character to deselect the item server-side
-                    keys[(int)InputType.Select].Hit = true;
+                    if (GameMain.Client != null)
+                    {
+                        //emulate a Select input to get the character to deselect the item server-side
+                        keys[(int)InputType.Select].Hit = true;
+                    }
+                    //reset focus to prevent us from accidentally interacting with another entity
+                    focusedItem = null;
+                    focusedCharacter = null;
+                    findFocusedTimer = 0.2f;
                    SelectedConstruction = null;
                }