diff --git a/src/main/java/noppes/npcs/client/key/KeyPreset.java b/src/main/java/noppes/npcs/client/key/KeyPreset.java index 27ed9485b..8c21d86c5 100644 --- a/src/main/java/noppes/npcs/client/key/KeyPreset.java +++ b/src/main/java/noppes/npcs/client/key/KeyPreset.java @@ -153,7 +153,7 @@ public class KeyPreset implements Comparable { int mySpecialCount = getSpecialKeyCount(this); int otherSpecialCount = getSpecialKeyCount(o); - return mySpecialCount - otherSpecialCount; + return otherSpecialCount - mySpecialCount; } private static int getSpecialKeyCount(KeyPreset preset) { diff --git a/src/main/java/noppes/npcs/client/key/KeyPresetManager.java b/src/main/java/noppes/npcs/client/key/KeyPresetManager.java index 355c07b54..96cf63731 100644 --- a/src/main/java/noppes/npcs/client/key/KeyPresetManager.java +++ b/src/main/java/noppes/npcs/client/key/KeyPresetManager.java @@ -34,7 +34,7 @@ public class KeyPresetManager { for (KeyPreset key : keys) { key.tick(); - if (key.isDown) + if (key.isDown && key.shouldConflict) return; } }