From d736863b9603640bc0f168dc70876252fb7b28e0 Mon Sep 17 00:00:00 2001 From: CrushedPixel Date: Wed, 9 Sep 2015 18:21:00 +0200 Subject: [PATCH] Disallow leaving spectating while in Camera Path --- .../handlers/keyboard/KeyInputHandler.java | 76 ++++++++++--------- 1 file changed, 39 insertions(+), 37 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 3c5d97f8..c0635528 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 @@ -34,45 +34,47 @@ public class KeyInputHandler { if(mc.currentScreen == null) { boolean forward = false, backward = false, left = false, right = false, up = false, down = false; - for(KeyBinding kb : keyBindings) { - if(!kb.isKeyDown()) continue; - 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; - } - } - - if(kb.getKeyDescription().equals("key.sneak")) { + if(!ReplayHandler.isInPath()) { + for(KeyBinding kb : keyBindings) { + if(!kb.isKeyDown()) continue; if(ReplayHandler.isCamera()) { - down = true; - speedup = true; - } - ReplayHandler.spectateCamera(); - } - } + if(kb.getKeyDescription().equals("key.forward")) { + forward = true; + speedup = true; + } - forwardCameraMovement(forward, backward, left, right, up, down); + 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; + } + } + + if(kb.getKeyDescription().equals("key.sneak")) { + if(ReplayHandler.isCamera()) { + down = true; + speedup = true; + } + ReplayHandler.spectateCamera(); + } + } + + forwardCameraMovement(forward, backward, left, right, up, down); + } } if(ReplayHandler.getCameraEntity() != null) {