From fb8ee44447dbd02eab59a48eb37dbdb37c862a08 Mon Sep 17 00:00:00 2001
From: Brady <zeromemesdev@gmail.com>
Date: Wed, 12 Sep 2018 17:25:01 -0500
Subject: [PATCH] Remove hacky "softCancel" thing

---
 .../java/baritone/behavior/impl/PathingBehavior.java   | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/main/java/baritone/behavior/impl/PathingBehavior.java b/src/main/java/baritone/behavior/impl/PathingBehavior.java
index 8ce34ecc..531741fe 100644
--- a/src/main/java/baritone/behavior/impl/PathingBehavior.java
+++ b/src/main/java/baritone/behavior/impl/PathingBehavior.java
@@ -66,9 +66,10 @@ public final class PathingBehavior extends Behavior {
     @Override
     public void onTick(TickEvent event) {
         if (event.getType() == TickEvent.Type.OUT) {
-            softCancel(); // no player, so can't fix capabilities
+            this.cancel();
             return;
         }
+        mc.playerController.setPlayerCapabilities(mc.player);
         if (current == null) {
             return;
         }
@@ -191,18 +192,13 @@ public final class PathingBehavior extends Behavior {
         return Optional.ofNullable(current).map(PathExecutor::getPath);
     }
 
-    private void softCancel() {
+    public void cancel() {
         current = null;
         next = null;
         Baritone.INSTANCE.getInputOverrideHandler().clearAllKeys();
         AbstractNodeCostSearch.getCurrentlyRunning().ifPresent(AbstractNodeCostSearch::cancel);
     }
 
-    public void cancel() {
-        softCancel();
-        mc.playerController.setPlayerCapabilities(mc.player);
-    }
-
     /**
      * Start calculating a path if we aren't already
      *