Bug fix

Auto Pest Exchange: - Fixed the macro getting stuck by baritone
JellyLabScripts · Mar 21, 2024 · 135922b · 135922b
1 parent ecf32fd
commit 135922b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -4,5 +4,5 @@ baseGroup=com.jelly.farmhelperv2
 mcVersion=1.8.9
 modid=farmhelperv2
 modName=FarmHelper
-version=2.5.4
+version=2.5.5-pre1
 shouldRelease=true
diff --git a/src/main/java/com/jelly/farmhelperv2/feature/impl/AutoPestExchange.java b/src/main/java/com/jelly/farmhelperv2/feature/impl/AutoPestExchange.java
@@ -342,9 +342,9 @@ public void onTickExecution(TickEvent.ClientTickEvent event) {
                     FlyPathFinderExecutor.getInstance().findPath(new Vec3(deskPos()).addVector(0.5, 0.5, 0.5), false, true);
                     break;
                 }
-                phillip = getPhillip();
-                if (BaritoneHandler.isPathing())
+                if (BaritoneHandler.isWalkingToGoalBlock())
                     break;
+                phillip = getPhillip();
                 if (FlyPathFinderExecutor.getInstance().isRunning()) {
                     if (phillip == null) {
                         break;

diff --git a/src/main/java/com/jelly/farmhelperv2/handler/BaritoneHandler.java b/src/main/java/com/jelly/farmhelperv2/handler/BaritoneHandler.java
@@ -18,7 +18,7 @@ public class BaritoneHandler {
     public static boolean pathing = false;
 
     public static boolean isWalkingToGoalBlock() {
-        return pathing && BaritoneEventListener.pathEvent != PathEvent.CANCELED && BaritoneEventListener.pathEvent != PathEvent.AT_GOAL;
+        return isWalkingToGoalBlock(0.75);
     }
 
     public static boolean isWalkingToGoalBlock(double nearGoalDistance) {
@@ -35,9 +35,9 @@ public static boolean isWalkingToGoalBlock(double nearGoalDistance) {
             } else {
                 distance = goal.isInGoal(mc.thePlayer.getPosition()) ? 0 : goal.heuristic();
             }
-            System.out.println("Pathing result: " + BaritoneEventListener.pathEvent);
-            System.out.println("Distance: " + distance);
-            System.out.println("Goal: " + goal);
+//            System.out.println("Pathing result: " + BaritoneEventListener.pathEvent);
+//            System.out.println("Distance: " + distance);
+//            System.out.println("Goal: " + goal);
             if (distance <= nearGoalDistance || BaritoneEventListener.pathEvent == PathEvent.AT_GOAL) {
                 BaritoneAPI.getProvider().getPrimaryBaritone().getPathingBehavior().cancelEverything();
                 pathing = false;