Fix player.pathTo for moving paths

Earthcomputer · Earthcomputer · commit f8c36ab77109 · 2020-09-01T09:17:48.000+01:00
diff --git a/src/main/java/net/earthcomputer/clientcommands/script/ScriptPlayer.java b/src/main/java/net/earthcomputer/clientcommands/script/ScriptPlayer.java
@@ -255,9 +255,9 @@ public void onBlockChange(BlockPos pos, BlockState oldState, BlockState newState
                     return false;
                 path[0].setCurrentNodeIndex(path[0].getCurrentNodeIndex() + 1);
                 if (movingTarget || needsRecalc[0]) {
-                    BlockPos lastTargetPos = target.get();
-                    targetPos[0] = target.get();
-                    if (!lastTargetPos.equals(targetPos[0]) || needsRecalc[0]) {
+                    BlockPos newTargetPos = target.get();
+                    if (!newTargetPos.equals(targetPos[0]) || needsRecalc[0]) {
+                        targetPos[0] = newTargetPos;
                         needsRecalc[0] = false;
                         path[0] = PlayerPathfinder.findPathToAny(ImmutableSet.of(targetPos[0]), javaHints);
                     }
@@ -267,7 +267,7 @@ public void onBlockChange(BlockPos pos, BlockState oldState, BlockState newState
             IBlockChangeListener.LISTENERS.remove(blockChangeListener);
         }
 
-        return path[0] != null;
+        return path[0] != null && path[0].getEnd() != null && path[0].getEnd().getPos().equals(targetPos[0]);
     }
 
     public void setYaw(float yaw) {

Original file line number	Diff line number	Diff line change
`@@ -255,9 +255,9 @@ public void onBlockChange(BlockPos pos, BlockState oldState, BlockState newState`
`255`	`255`	`return false;`
`256`	`256`	`path[0].setCurrentNodeIndex(path[0].getCurrentNodeIndex() + 1);`
`257`	`257`	`if (movingTarget \|\| needsRecalc[0]) {`
`258`		`- BlockPos lastTargetPos = target.get();`
`259`		`- targetPos[0] = target.get();`
`260`		`- if (!lastTargetPos.equals(targetPos[0]) \|\| needsRecalc[0]) {`
	`258`	`+ BlockPos newTargetPos = target.get();`
	`259`	`+ if (!newTargetPos.equals(targetPos[0]) \|\| needsRecalc[0]) {`
	`260`	`+ targetPos[0] = newTargetPos;`
`261`	`261`	`needsRecalc[0] = false;`
`262`	`262`	`path[0] = PlayerPathfinder.findPathToAny(ImmutableSet.of(targetPos[0]), javaHints);`
`263`	`263`	`}`
`@@ -267,7 +267,7 @@ public void onBlockChange(BlockPos pos, BlockState oldState, BlockState newState`
`267`	`267`	`IBlockChangeListener.LISTENERS.remove(blockChangeListener);`
`268`	`268`	`}`
`269`	`269`
`270`		`- return path[0] != null;`
	`270`	`+ return path[0] != null && path[0].getEnd() != null && path[0].getEnd().getPos().equals(targetPos[0]);`
`271`	`271`	`}`
`272`	`272`
`273`	`273`	`public void setYaw(float yaw) {`