From 40b39d3b206a93565c1f4163eaa5faf8681c8c3e Mon Sep 17 00:00:00 2001 From: luisc Date: Sat, 13 Nov 2021 12:52:21 -0600 Subject: [PATCH] Player key and mouse scripts now execute even when the player has a GUI open. --- src/main/java/noppes/npcs/client/ClientTickHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/noppes/npcs/client/ClientTickHandler.java b/src/main/java/noppes/npcs/client/ClientTickHandler.java index f12b44967..fe050dde1 100644 --- a/src/main/java/noppes/npcs/client/ClientTickHandler.java +++ b/src/main/java/noppes/npcs/client/ClientTickHandler.java @@ -48,7 +48,7 @@ public class ClientTickHandler{ @SubscribeEvent public void onMouse(InputEvent.MouseInputEvent event){ Minecraft mc = Minecraft.getMinecraft(); - if(mc.currentScreen != null || (Mouse.getEventButton() == -1 && Mouse.getDWheel() == 0)) + if(Mouse.getEventButton() == -1 && Mouse.getDWheel() == 0) return; NoppesUtilPlayer.sendData(EnumPlayerPacket.MouseClicked, new Object[]{Mouse.getEventButton(),Mouse.getEventDWheel()}); @@ -73,7 +73,7 @@ public class ClientTickHandler{ } } else { Minecraft mc = Minecraft.getMinecraft(); - if(key == this.buttonPressed && time - this.buttonTime < 500000000L && mc.currentScreen == null) { + if(key == this.buttonPressed && time - this.buttonTime < 500000000L) { boolean isCtrlPressed = Keyboard.isKeyDown(157) || Keyboard.isKeyDown(29); boolean isShiftPressed = Keyboard.isKeyDown(54) || Keyboard.isKeyDown(42); boolean isAltPressed = Keyboard.isKeyDown(184) || Keyboard.isKeyDown(56);