From f4842aa512af76dcfbff6098d5006ce8d860f305 Mon Sep 17 00:00:00 2001 From: Leijurv Date: Sat, 14 Mar 2020 11:50:16 -0700 Subject: [PATCH] fix actual underlying sneak issue --- src/main/java/baritone/command/defaults/BuildCommand.java | 6 +++--- src/main/java/baritone/utils/InputOverrideHandler.java | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/baritone/command/defaults/BuildCommand.java b/src/main/java/baritone/command/defaults/BuildCommand.java index 3d549587..273c5bc3 100644 --- a/src/main/java/baritone/command/defaults/BuildCommand.java +++ b/src/main/java/baritone/command/defaults/BuildCommand.java @@ -19,13 +19,13 @@ package baritone.command.defaults; import baritone.Baritone; import baritone.api.IBaritone; -import baritone.api.utils.BetterBlockPos; import baritone.api.command.Command; +import baritone.api.command.argument.IArgConsumer; import baritone.api.command.datatypes.RelativeBlockPos; import baritone.api.command.datatypes.RelativeFile; import baritone.api.command.exception.CommandException; import baritone.api.command.exception.CommandInvalidStateException; -import baritone.api.command.argument.IArgConsumer; +import baritone.api.utils.BetterBlockPos; import net.minecraft.client.Minecraft; import org.apache.commons.io.FilenameUtils; @@ -59,7 +59,7 @@ public class BuildCommand extends Command { } boolean success = baritone.getBuilderProcess().build(file.getName(), file, buildOrigin); if (!success) { - throw new CommandInvalidStateException("Couldn't load the schematic"); + throw new CommandInvalidStateException("Couldn't load the schematic. Make sure to use the FULL file name, including the extension (e.g. blah.schematic)."); } logDirect(String.format("Successfully loaded schematic for building\nOrigin: %s", buildOrigin)); } diff --git a/src/main/java/baritone/utils/InputOverrideHandler.java b/src/main/java/baritone/utils/InputOverrideHandler.java index 47a06854..d1c4689a 100755 --- a/src/main/java/baritone/utils/InputOverrideHandler.java +++ b/src/main/java/baritone/utils/InputOverrideHandler.java @@ -108,6 +108,11 @@ public final class InputOverrideHandler extends Behavior implements IInputOverri } private boolean inControl() { + for (Input input : new Input[]{Input.MOVE_FORWARD, Input.MOVE_BACK, Input.MOVE_LEFT, Input.MOVE_RIGHT, Input.SNEAK}) { + if (isInputForcedDown(input)) { + return true; + } + } // if we are not primary (a bot) we should set the movementinput even when idle (not pathing) return baritone.getPathingBehavior().isPathing() || baritone != BaritoneAPI.getProvider().getPrimaryBaritone(); }