Fix ItemSlotButton and HandsGui handling all input.

Fixes #904
This commit is contained in:
Pieter-Jan Briers
2020-05-11 11:19:41 +02:00
parent 033a6a82b5
commit 63b0df5ba2
2 changed files with 7 additions and 4 deletions

View File

@@ -119,14 +119,13 @@ namespace Content.Client.UserInterface
private void HandKeyBindDown(GUIBoundKeyEventArgs args, string handIndex) private void HandKeyBindDown(GUIBoundKeyEventArgs args, string handIndex)
{ {
args.Handle();
if (!TryGetHands(out var hands)) if (!TryGetHands(out var hands))
return; return;
if (args.Function == ContentKeyFunctions.MouseMiddle) if (args.Function == ContentKeyFunctions.MouseMiddle)
{ {
hands.SendChangeHand(handIndex); hands.SendChangeHand(handIndex);
args.Handle();
return; return;
} }
@@ -136,12 +135,16 @@ namespace Content.Client.UserInterface
if (args.Function == EngineKeyFunctions.UIClick && hands.ActiveIndex != handIndex) if (args.Function == EngineKeyFunctions.UIClick && hands.ActiveIndex != handIndex)
{ {
hands.SendChangeHand(handIndex); hands.SendChangeHand(handIndex);
args.Handle();
} }
return; return;
} }
if (_itemSlotManager.OnButtonPressed(args, entity)) if (_itemSlotManager.OnButtonPressed(args, entity))
{
args.Handle();
return; return;
}
if (args.Function == EngineKeyFunctions.UIClick) if (args.Function == EngineKeyFunctions.UIClick)
{ {
@@ -153,6 +156,7 @@ namespace Content.Client.UserInterface
{ {
hands.AttackByInHand(handIndex); hands.AttackByInHand(handIndex);
} }
args.Handle();
return; return;
} }
} }

View File

@@ -65,8 +65,6 @@ namespace Content.Client.UserInterface
public bool OnButtonPressed(GUIBoundKeyEventArgs args, IEntity item) public bool OnButtonPressed(GUIBoundKeyEventArgs args, IEntity item)
{ {
args.Handle();
if (item == null) if (item == null)
return false; return false;
@@ -99,6 +97,7 @@ namespace Content.Client.UserInterface
{ {
return false; return false;
} }
args.Handle();
return true; return true;
} }