[fix] Freecam moves player when running Baritone and not pathing

kami-blue · Jan 8, 2021 · 3b7b5bf · 3b7b5bf
1 parent f5beed8
commit 3b7b5bf
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/player/Freecam.kt b/src/main/java/me/zeroeightsix/kami/module/modules/player/Freecam.kt
@@ -86,7 +86,6 @@ object Freecam : Module(
         }
 
         safeListener<InputEvent.KeyInputEvent> {
-            if (mc.world == null || mc.player == null) return@safeListener
             // Force it to stay in first person lol
             if (mc.gameSettings.keyBindTogglePerspective.isKeyDown) mc.gameSettings.thirdPersonView = 2
         }
@@ -103,9 +102,12 @@ object Freecam : Module(
         }
 
         safeListener<InputUpdateEvent>(9999) {
-            if (it.movementInput !is MovementInputFromOptions || BaritoneUtils.isPathing || BaritoneUtils.isActive) return@safeListener
+            if (it.movementInput !is MovementInputFromOptions || BaritoneUtils.isPathing) return@safeListener
 
             resetMovementInput(it.movementInput)
+
+            if (BaritoneUtils.isActive) return@safeListener
+
             if (autoRotate.value) updatePlayerRotation()
             if (arrowKeyMove.value) updatePlayerMovement()
         }