diff --git a/client/src/main/java/rt4/JavaMouseWheel.java b/client/src/main/java/rt4/JavaMouseWheel.java index 4fb1f925..54483cc3 100644 --- a/client/src/main/java/rt4/JavaMouseWheel.java +++ b/client/src/main/java/rt4/JavaMouseWheel.java @@ -37,7 +37,7 @@ public final class JavaMouseWheel extends MouseWheel implements MouseWheelListen this.anInt4233 += arg0.getWheelRotation(); int diff = this.anInt4233 - previous; - if (((GlobalJsonConfig.instance != null && GlobalJsonConfig.instance.mouseWheelZoom) || (GlobalJsonConfig.instance == null && GlobalConfig.MOUSEWHEEL_ZOOM)) && Keyboard.instance.isShiftPressed()) { + if (((GlobalJsonConfig.instance != null && GlobalJsonConfig.instance.mouseWheelZoom) || (GlobalJsonConfig.instance == null && GlobalConfig.MOUSEWHEEL_ZOOM)) && Keyboard.pressedKeys[Keyboard.KEY_SHIFT]) { Camera.ZOOM = clamp(200, 1200, Camera.ZOOM + (diff >= 0 ? 50: -50)); } } diff --git a/client/src/main/java/rt4/Keyboard.java b/client/src/main/java/rt4/Keyboard.java index 3c1e0542..5c4e5c44 100644 --- a/client/src/main/java/rt4/Keyboard.java +++ b/client/src/main/java/rt4/Keyboard.java @@ -337,19 +337,6 @@ public final class Keyboard implements KeyListener, FocusListener { } } - public boolean isShiftPressed() { - //I did this the Jagex(TM) way just for you Pazaz xoxo - boolean isPressed = false; - for (int keyCode : eventQueue) { - if (keyCode == 81) - isPressed = true; - else if (keyCode == ~(81 & 0xFFFFFF7F)) - isPressed = false; - } - - return isPressed; - } - @OriginalMember(owner = "client!uf", name = "keyTyped", descriptor = "(Ljava/awt/event/KeyEvent;)V") @Override public final void keyTyped(@OriginalArg(0) KeyEvent event) {