diff --git a/src/main/java/baritone/Elytra.java b/src/main/java/baritone/Elytra.java index 082344f6c..f2d28b0f2 100644 --- a/src/main/java/baritone/Elytra.java +++ b/src/main/java/baritone/Elytra.java @@ -54,6 +54,14 @@ public class Elytra extends Behavior implements Helper { public int sinceFirework; public BlockPos goal; + public void cancel() { + this.path.clear(); + this.goal = null; + this.playerNear = 0; + this.goingTo = 0; + this.sinceFirework = 0; + } + private void pathfindAroundObstacles() { outer: while (true) { diff --git a/src/main/java/baritone/command/defaults/ExecutionControlCommands.java b/src/main/java/baritone/command/defaults/ExecutionControlCommands.java index 6f6293ccd..66b2d156d 100644 --- a/src/main/java/baritone/command/defaults/ExecutionControlCommands.java +++ b/src/main/java/baritone/command/defaults/ExecutionControlCommands.java @@ -17,6 +17,7 @@ package baritone.command.defaults; +import baritone.Baritone; import baritone.api.IBaritone; import baritone.api.command.Command; import baritone.api.command.argument.IArgConsumer; @@ -180,6 +181,7 @@ public class ExecutionControlCommands { paused[0] = false; } baritone.getPathingBehavior().cancelEverything(); + ((Baritone) baritone).elytra.cancel(); logDirect("ok canceled"); } diff --git a/src/main/java/baritone/command/defaults/ForceCancelCommand.java b/src/main/java/baritone/command/defaults/ForceCancelCommand.java index 513d61bcb..3a54ce69e 100644 --- a/src/main/java/baritone/command/defaults/ForceCancelCommand.java +++ b/src/main/java/baritone/command/defaults/ForceCancelCommand.java @@ -17,6 +17,7 @@ package baritone.command.defaults; +import baritone.Baritone; import baritone.api.IBaritone; import baritone.api.behavior.IPathingBehavior; import baritone.api.command.Command; @@ -39,6 +40,7 @@ public class ForceCancelCommand extends Command { IPathingBehavior pathingBehavior = baritone.getPathingBehavior(); pathingBehavior.cancelEverything(); pathingBehavior.forceCancel(); + ((Baritone) baritone).elytra.cancel(); logDirect("ok force canceled"); }