From 8c29f6c6a368b43910905fd73396d9cede77e850 Mon Sep 17 00:00:00 2001 From: isXander Date: Tue, 25 Jul 2023 20:59:26 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20some=20issue=20when=20hotp?= =?UTF-8?q?lugging=20controllers=20in-game?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/dev/isxander/controlify/Controlify.java | 7 +++---- .../controlify/ingame/ControllerPlayerMovement.java | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/dev/isxander/controlify/Controlify.java b/src/main/java/dev/isxander/controlify/Controlify.java index e815739..b7e29d8 100644 --- a/src/main/java/dev/isxander/controlify/Controlify.java +++ b/src/main/java/dev/isxander/controlify/Controlify.java @@ -480,11 +480,8 @@ public class Controlify implements ControlifyApi { } this.inGameInputHandler = new InGameInputHandler(controller); - if (minecraft.player != null) { - this.inGameButtonGuide = new InGameButtonGuide(controller, minecraft.player); - } - ControllerPlayerMovement.updatePlayerInput(minecraft.player); + setInputMode(controller.config().mixedInput ? InputMode.MIXED : InputMode.CONTROLLER); if (!controller.config().deadzonesCalibrated) calibrationQueue.add(controller); @@ -537,6 +534,8 @@ public class Controlify implements ControlifyApi { if (this.currentInputMode.isController()) getCurrentController().ifPresent(Controller::clearState); + ControllerPlayerMovement.updatePlayerInput(minecraft.player); + ControlifyEvents.INPUT_MODE_CHANGED.invoker().onInputModeChanged(currentInputMode); return true; diff --git a/src/main/java/dev/isxander/controlify/ingame/ControllerPlayerMovement.java b/src/main/java/dev/isxander/controlify/ingame/ControllerPlayerMovement.java index 1141c95..75e8aa3 100644 --- a/src/main/java/dev/isxander/controlify/ingame/ControllerPlayerMovement.java +++ b/src/main/java/dev/isxander/controlify/ingame/ControllerPlayerMovement.java @@ -75,7 +75,7 @@ public class ControllerPlayerMovement extends Input { if (player == null) return; - if (Controlify.instance().getCurrentController().isPresent()) { + if (Controlify.instance().getCurrentController().isPresent() && Controlify.instance().currentInputMode().isController()) { player.input = new DualInput( new KeyboardInput(Minecraft.getInstance().options), new ControllerPlayerMovement(Controlify.instance().getCurrentController().get(), player)