From 3f0ddb27d1d4fc581697c09f5c7e8a61a9f71f6b Mon Sep 17 00:00:00 2001 From: StylexTV <56502218+StylexTV@users.noreply.github.com> Date: Thu, 9 Sep 2021 18:10:59 +0200 Subject: [PATCH 1/2] Update GoalAxis.java --- src/api/java/baritone/api/pathing/goals/GoalAxis.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/api/java/baritone/api/pathing/goals/GoalAxis.java b/src/api/java/baritone/api/pathing/goals/GoalAxis.java index 7c9b26705..24a4e78ee 100644 --- a/src/api/java/baritone/api/pathing/goals/GoalAxis.java +++ b/src/api/java/baritone/api/pathing/goals/GoalAxis.java @@ -33,11 +33,10 @@ public class GoalAxis implements Goal { int x = Math.abs(x0); int z = Math.abs(z0); - int shrt = Math.min(x, z); - int lng = Math.max(x, z); - int diff = lng - shrt; + double major = Math.min(x, z); + double minor = Math.abs(x - z) * SQRT_2_OVER_2; - double flatAxisDistance = Math.min(x, Math.min(z, diff * SQRT_2_OVER_2)); + double flatAxisDistance = Math.min(major, minor); return flatAxisDistance * BaritoneAPI.getSettings().costHeuristic.value + GoalYLevel.calculate(BaritoneAPI.getSettings().axisHeight.value, y); } From f77ab752a7abeab998d97fd4654d7c5ec34909a0 Mon Sep 17 00:00:00 2001 From: StylexTV <56502218+StylexTV@users.noreply.github.com> Date: Thu, 9 Sep 2021 18:34:43 +0200 Subject: [PATCH 2/2] Update GoalAxis.java --- src/api/java/baritone/api/pathing/goals/GoalAxis.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/api/java/baritone/api/pathing/goals/GoalAxis.java b/src/api/java/baritone/api/pathing/goals/GoalAxis.java index 24a4e78ee..075b1bd21 100644 --- a/src/api/java/baritone/api/pathing/goals/GoalAxis.java +++ b/src/api/java/baritone/api/pathing/goals/GoalAxis.java @@ -33,10 +33,10 @@ public class GoalAxis implements Goal { int x = Math.abs(x0); int z = Math.abs(z0); - double major = Math.min(x, z); - double minor = Math.abs(x - z) * SQRT_2_OVER_2; + int major = Math.min(x, z); + int minor = Math.abs(x - z); - double flatAxisDistance = Math.min(major, minor); + double flatAxisDistance = Math.min(major, minor * SQRT_2_OVER_2); return flatAxisDistance * BaritoneAPI.getSettings().costHeuristic.value + GoalYLevel.calculate(BaritoneAPI.getSettings().axisHeight.value, y); }