From 7c4036dfb146a3ad566f0a3609c8c00a766d98b9 Mon Sep 17 00:00:00 2001
From: ZacSharp <68165024+ZacSharp@users.noreply.github.com>
Date: Fri, 18 Apr 2025 23:28:39 +0200
Subject: [PATCH] Don't leak coordinates in exceptions

---
 .../pathing/calc/AStarPathFinder.java         | 25 +++++++++++++++----
 .../java/baritone/pathing/calc/PathNode.java  |  8 +++++-
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/main/java/baritone/pathing/calc/AStarPathFinder.java b/src/main/java/baritone/pathing/calc/AStarPathFinder.java
index b22456584..41bc1ac0a 100644
--- a/src/main/java/baritone/pathing/calc/AStarPathFinder.java
+++ b/src/main/java/baritone/pathing/calc/AStarPathFinder.java
@@ -22,6 +22,7 @@ import baritone.api.pathing.calc.IPath;
 import baritone.api.pathing.goals.Goal;
 import baritone.api.pathing.movement.ActionCosts;
 import baritone.api.utils.BetterBlockPos;
+import baritone.api.utils.SettingsUtil;
 import baritone.pathing.calc.openset.BinaryHeapOpenSet;
 import baritone.pathing.movement.CalculationContext;
 import baritone.pathing.movement.Moves;
@@ -124,7 +125,11 @@ public final class AStarPathFinder extends AbstractNodeCostSearch {
                 if (actionCost <= 0 || Double.isNaN(actionCost)) {
                     throw new IllegalStateException(String.format(
                             "%s from %s %s %s calculated implausible cost %s",
-                            moves, currentNode.x, currentNode.y, currentNode.z, actionCost));
+                            moves,
+                            SettingsUtil.maybeCensor(currentNode.x),
+                            SettingsUtil.maybeCensor(currentNode.y),
+                            SettingsUtil.maybeCensor(currentNode.z),
+                            actionCost));
                 }
                 // check destination after verifying it's not COST_INF -- some movements return a static IMPOSSIBLE object with COST_INF and destination being 0,0,0 to avoid allocating a new result for every failed calculation
                 if (moves.dynamicXZ && !worldBorder.entirelyContains(res.x, res.z)) { // see issue #218
@@ -133,14 +138,24 @@ public final class AStarPathFinder extends AbstractNodeCostSearch {
                 if (!moves.dynamicXZ && (res.x != newX || res.z != newZ)) {
                     throw new IllegalStateException(String.format(
                             "%s from %s %s %s ended at x z %s %s instead of %s %s",
-                            moves, currentNode.x, currentNode.y, currentNode.z,
-                            res.x, res.z, newX, newZ));
+                            moves,
+                            SettingsUtil.maybeCensor(currentNode.x),
+                            SettingsUtil.maybeCensor(currentNode.y),
+                            SettingsUtil.maybeCensor(currentNode.z),
+                            SettingsUtil.maybeCensor(res.x),
+                            SettingsUtil.maybeCensor(res.z),
+                            SettingsUtil.maybeCensor(newX),
+                            SettingsUtil.maybeCensor(newZ)));
                 }
                 if (!moves.dynamicY && res.y != currentNode.y + moves.yOffset) {
                     throw new IllegalStateException(String.format(
                             "%s from %s %s %s ended at y %s instead of %s",
-                            moves, currentNode.x, currentNode.y, currentNode.z,
-                            res.y, (currentNode.y + moves.yOffset)));
+                            moves,
+                            SettingsUtil.maybeCensor(currentNode.x),
+                            SettingsUtil.maybeCensor(currentNode.y),
+                            SettingsUtil.maybeCensor(currentNode.z),
+                            SettingsUtil.maybeCensor(res.y),
+                            SettingsUtil.maybeCensor(currentNode.y + moves.yOffset)));
                 }
                 long hashCode = BetterBlockPos.longHash(res.x, res.y, res.z);
                 if (isFavoring) {
diff --git a/src/main/java/baritone/pathing/calc/PathNode.java b/src/main/java/baritone/pathing/calc/PathNode.java
index 7db8f3f17..0911c6c04 100644
--- a/src/main/java/baritone/pathing/calc/PathNode.java
+++ b/src/main/java/baritone/pathing/calc/PathNode.java
@@ -20,6 +20,7 @@ package baritone.pathing.calc;
 import baritone.api.pathing.goals.Goal;
 import baritone.api.pathing.movement.ActionCosts;
 import baritone.api.utils.BetterBlockPos;
+import baritone.api.utils.SettingsUtil;
 
 /**
  * A node in the path, containing the cost and steps to get to it.
@@ -68,7 +69,12 @@ public final class PathNode {
         this.cost = ActionCosts.COST_INF;
         this.estimatedCostToGoal = goal.heuristic(x, y, z);
         if (Double.isNaN(estimatedCostToGoal)) {
-            throw new IllegalStateException(goal + " calculated implausible heuristic NaN at " + x + " " + y + " " + z);
+            throw new IllegalStateException(String.format(
+                    "%s calculated implausible heuristic NaN at %s %s %s",
+                    goal,
+                    SettingsUtil.maybeCensor(x),
+                    SettingsUtil.maybeCensor(y),
+                    SettingsUtil.maybeCensor(z)));
         }
         this.heapPosition = -1;
         this.x = x;