Update pathfinder to use distance rather than distanceSquared

CitizensDev · Jul 20, 2013 · c3b07a5 · c3b07a5
1 parent f64971b
commit c3b07a5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/main/java/net/citizensnpcs/api/astar/pathfinder/VectorNode.java b/src/main/java/net/citizensnpcs/api/astar/pathfinder/VectorNode.java
@@ -86,7 +86,7 @@ public Vector getVector() {
     }
 
     public float heuristicDistance(Vector goal) {
-        return (float) (location.distanceSquared(goal) + getBlockCost()) * TIEBREAKER;
+        return (float) (location.distance(goal) + getBlockCost()) * TIEBREAKER;
     }
 
     private boolean isPassable(PathPoint mod) {
@@ -99,5 +99,5 @@ private boolean isPassable(PathPoint mod) {
         return true;
     }
 
-    private static final float TIEBREAKER = 1.00001f;
+    private static final float TIEBREAKER = 1.001f;
 }
diff --git a/src/main/java/net/citizensnpcs/api/npc/AbstractNPC.java b/src/main/java/net/citizensnpcs/api/npc/AbstractNPC.java
@@ -57,8 +57,9 @@ public void addTrait(Trait trait) {
             return;
         }
 
-        if (trait.getNPC() == null)
+        if (trait.getNPC() == null) {
             trait.linkToNPC(this);
+        }
 
         // if an existing trait is being replaced, we need to remove the
         // currently registered runnable to avoid conflicts