diff --git a/src/main/java/baritone/bot/behavior/PathExecution.java b/src/main/java/baritone/bot/behavior/PathExecution.java index c205d562..204f4aa7 100644 --- a/src/main/java/baritone/bot/behavior/PathExecution.java +++ b/src/main/java/baritone/bot/behavior/PathExecution.java @@ -9,7 +9,7 @@ import net.minecraft.util.math.BlockPos; * @author Brady * @since 8/1/2018 5:38 PM */ -public class PathExecution extends Behavior implements Helper { +public class PathExecution extends Behavior { private static final double MAX_DIST_FROM_PATH = 2; private final IPath path; @@ -25,7 +25,7 @@ public class PathExecution extends Behavior implements Helper { // and only increment it when the movement said it was done, not when it detected that the player feet had // moved into the next position } else { - Tuple closest = path.closestPathPos(player.posX, player.posY, player.posZ); + Tuple closest = path.closestPathPos(mc.player.posX, mc.player.posY, mc.player.posZ); if (closest.getFirst() > MAX_DIST_FROM_PATH) { // TODO how to indicate failure? Exception? } diff --git a/src/main/java/baritone/bot/pathing/action/Action.java b/src/main/java/baritone/bot/pathing/action/Action.java index 4a6c9309..3d309730 100644 --- a/src/main/java/baritone/bot/pathing/action/Action.java +++ b/src/main/java/baritone/bot/pathing/action/Action.java @@ -43,7 +43,7 @@ public abstract class Action implements AbstractGameEventListener, Helper, Actio ActionState latestState = calcState(); Tuple rotation = Utils.calcRotationFromVec3d(mc.player.getPositionEyes(1.0F), latestState.getGoal().rotation); - player.setPositionAndRotation(mc.player.posX, mc.player.posY, mc.player.posZ, + mc.player.setPositionAndRotation(mc.player.posX, mc.player.posY, mc.player.posZ, rotation.getFirst(), rotation.getSecond()); latestState.inputState.forEach((input, forced) -> { Baritone.INSTANCE.getInputOverrideHandler().setInputForceState(input, forced); diff --git a/src/main/java/baritone/bot/utils/Helper.java b/src/main/java/baritone/bot/utils/Helper.java index 8e3e82ae..542e11af 100755 --- a/src/main/java/baritone/bot/utils/Helper.java +++ b/src/main/java/baritone/bot/utils/Helper.java @@ -12,11 +12,9 @@ import net.minecraft.util.math.BlockPos; public interface Helper { Minecraft mc = Minecraft.getMinecraft(); - EntityPlayerSP player = mc.player; - WorldClient world = mc.world; default BlockPos playerFeet() { - return new BlockPos(player.posX, player.posY, player.posZ); + return new BlockPos(mc.player.posX, mc.player.posY, mc.player.posZ); } }