From cc01c88dbd4eddcf7c34afd8148b71c3ce73b7a6 Mon Sep 17 00:00:00 2001
From: Leijurv <leijurv@gmail.com>
Date: Sun, 23 Sep 2018 08:54:26 -0700
Subject: [PATCH] begone betterblockpos

---
 src/main/java/baritone/behavior/PathingBehavior.java     | 6 +++++-
 src/main/java/baritone/pathing/calc/AStarPathFinder.java | 7 ++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/baritone/behavior/PathingBehavior.java b/src/main/java/baritone/behavior/PathingBehavior.java
index 4a36ce73..d9bb92ba 100644
--- a/src/main/java/baritone/behavior/PathingBehavior.java
+++ b/src/main/java/baritone/behavior/PathingBehavior.java
@@ -41,8 +41,11 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.chunk.EmptyChunk;
 
 import java.awt.*;
+import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 public final class PathingBehavior extends Behavior implements Helper {
 
@@ -329,8 +332,9 @@ public final class PathingBehavior extends Behavior implements Helper {
         } else {
             timeout = Baritone.settings().planAheadTimeoutMS.<Long>get();
         }
+        Optional<HashSet<Long>> favoredPositions = previous.map(IPath::positions).map(Collection::stream).map(x -> x.map(y -> y.hashCode)).map(x -> x.collect(Collectors.toList())).map(HashSet::new); // <-- okay this is EPIC
         try {
-            IPathFinder pf = new AStarPathFinder(start, goal, previous.map(IPath::positions));
+            IPathFinder pf = new AStarPathFinder(start, goal, favoredPositions);
             return pf.calculate(timeout);
         } catch (Exception e) {
             logDebug("Pathing exception: " + e);
diff --git a/src/main/java/baritone/pathing/calc/AStarPathFinder.java b/src/main/java/baritone/pathing/calc/AStarPathFinder.java
index ef44793d..37378397 100644
--- a/src/main/java/baritone/pathing/calc/AStarPathFinder.java
+++ b/src/main/java/baritone/pathing/calc/AStarPathFinder.java
@@ -27,15 +27,12 @@ import baritone.pathing.movement.CalculationContext;
 import baritone.pathing.path.IPath;
 import baritone.utils.BlockStateInterface;
 import baritone.utils.Helper;
-import baritone.utils.pathing.BetterBlockPos;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.ChunkProviderClient;
 import net.minecraft.util.math.BlockPos;
 
-import java.util.Collection;
 import java.util.HashSet;
 import java.util.Optional;
-import java.util.stream.Collectors;
 
 /**
  * The actual A* pathfinding
@@ -46,9 +43,9 @@ public final class AStarPathFinder extends AbstractNodeCostSearch implements Hel
 
     private final Optional<HashSet<Long>> favoredPositions;
 
-    public AStarPathFinder(BlockPos start, Goal goal, Optional<Collection<BetterBlockPos>> favoredPositions) {
+    public AStarPathFinder(BlockPos start, Goal goal, Optional<HashSet<Long>> favoredPositions) {
         super(start, goal);
-        this.favoredPositions = favoredPositions.map(Collection::stream).map(x -> x.map(y -> y.hashCode)).map(x -> x.collect(Collectors.toList())).map(HashSet::new); // <-- okay this is EPIC
+        this.favoredPositions = favoredPositions;
     }
 
     @Override