From b9ec83b0060ab2b4a2fc50a3a694f7fb6c20780c Mon Sep 17 00:00:00 2001 From: johni0702 Date: Sat, 15 Aug 2015 14:47:04 +0200 Subject: [PATCH] Fix IOBE when using special keys and replay is paused Fix mouse buttons not working when replay is paused --- .../handlers/keyboard/KeyInputHandler.java | 73 ++++++++----------- 1 file changed, 31 insertions(+), 42 deletions(-) diff --git a/src/main/java/eu/crushedpixel/replaymod/events/handlers/keyboard/KeyInputHandler.java b/src/main/java/eu/crushedpixel/replaymod/events/handlers/keyboard/KeyInputHandler.java index fffcc84e..27b9757b 100755 --- a/src/main/java/eu/crushedpixel/replaymod/events/handlers/keyboard/KeyInputHandler.java +++ b/src/main/java/eu/crushedpixel/replaymod/events/handlers/keyboard/KeyInputHandler.java @@ -39,52 +39,41 @@ public class KeyInputHandler { boolean forward = false, backward = false, left = false, right = false, up = false, down = false; for(KeyBinding kb : keyBindings) { - //don't act on Mouse inputs - if(kb.getKeyCode() < 0) continue; + if(!kb.isKeyDown()) continue; + if(ReplayHandler.isCamera()) { + if(kb.getKeyDescription().equals("key.forward")) { + forward = true; + speedup = true; + } - if(!ReplayMod.replaySender.paused() && !kb.isKeyDown()) continue; + if(kb.getKeyDescription().equals("key.back")) { + backward = true; + speedup = true; + } - if(ReplayMod.replaySender.paused() && !Keyboard.isKeyDown(kb.getKeyCode())) - continue; - try { + if(kb.getKeyDescription().equals("key.jump")) { + up = true; + speedup = true; + } + + if(kb.getKeyDescription().equals("key.left")) { + left = true; + speedup = true; + } + + if(kb.getKeyDescription().equals("key.right")) { + right = true; + speedup = true; + } + } + + if(kb.getKeyDescription().equals("key.sneak")) { if(ReplayHandler.isCamera()) { - if(kb.getKeyDescription().equals("key.forward")) { - forward = true; - speedup = true; - } - - if(kb.getKeyDescription().equals("key.back")) { - backward = true; - speedup = true; - } - - if(kb.getKeyDescription().equals("key.jump")) { - up = true; - speedup = true; - } - - if(kb.getKeyDescription().equals("key.left")) { - left = true; - speedup = true; - } - - if(kb.getKeyDescription().equals("key.right")) { - right = true; - speedup = true; - } + down = true; + speedup = true; + } else { + ReplayHandler.spectateCamera(); } - - if(kb.getKeyDescription().equals("key.sneak")) { - if(ReplayHandler.isCamera()) { - down = true; - speedup = true; - } else { - ReplayHandler.spectateCamera(); - } - } - - } catch(Exception e) { - e.printStackTrace(); } }