keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Merge pull request #2723 from mezz/pick-fix 

Fix some plain keybinds not working when a modifier is active
This commit is contained in:
Fry 2016-04-06 10:11:07 +04:00
parent 045e8bf806 e68908e9d5
commit a48fd56fdc
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/net/minecraftforge/client/settings/KeyBindingMap.java
View File

@ -22,11 +22,15 @@ public class KeyBindingMap
public KeyBinding lookupActive(int keyCode) public KeyBinding lookupActive(int keyCode)
{ {
KeyModifier activeModifier = KeyModifier.getActiveModifier(); KeyModifier activeModifier = KeyModifier.getActiveModifier();
if (activeModifier.matches(keyCode)) if (!activeModifier.matches(keyCode))
{ {
activeModifier = KeyModifier.NONE; KeyBinding binding = getBinding(keyCode, activeModifier);
if (binding != null)
{
return binding;
}
} }
return getBinding(keyCode, activeModifier); return getBinding(keyCode, KeyModifier.NONE);
} }
private KeyBinding getBinding(int keyCode, KeyModifier keyModifier) private KeyBinding getBinding(int keyCode, KeyModifier keyModifier)