From 10645ac54d73ae26cb16147147f68f6040f768e8 Mon Sep 17 00:00:00 2001
From: Ellpeck <megamaximal@gmail.com>
Date: Fri, 17 Apr 2020 17:35:41 +0200
Subject: [PATCH] fixed pipe items not going around corners nicely when
 directly connected to an inventory

---
 .../ellpeck/prettypipes/network/PipeItem.java | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/main/java/de/ellpeck/prettypipes/network/PipeItem.java b/src/main/java/de/ellpeck/prettypipes/network/PipeItem.java
index b2b4dc2..a7e534d 100644
--- a/src/main/java/de/ellpeck/prettypipes/network/PipeItem.java
+++ b/src/main/java/de/ellpeck/prettypipes/network/PipeItem.java
@@ -106,10 +106,11 @@ public class PipeItem implements INBTSerializable<CompoundNBT> {
             double dist = new Vec3d(this.currGoalPos).squareDistanceTo(this.x - 0.5F, this.y - 0.5F, this.z - 0.5F);
             if (dist < this.speed * this.speed) {
                 // we're past the start of the pipe, so move to the center of the next pipe
+                BlockPos nextPos;
                 PipeTileEntity next = this.getNextTile(currPipe, false);
                 if (next == null) {
                     if (this.reachedDestination()) {
-                        this.currGoalPos = this.destInventory;
+                        nextPos = this.destInventory;
                     } else {
                         currPipe.items.remove(this);
                         if (!currPipe.getWorld().isRemote)
@@ -117,19 +118,22 @@ public class PipeItem implements INBTSerializable<CompoundNBT> {
                         return;
                     }
                 } else {
-                    BlockPos nextPos = next.getPos();
-                    if (dist >= 0.001F) {
-                        // when going around corners, we want to move right up to the corner
-                        Vec3d motion = new Vec3d(this.x - this.lastX, this.y - this.lastY, this.z - this.lastZ);
-                        Vec3d diff = new Vec3d(nextPos.getX() + 0.5F - this.x, nextPos.getY() + 0.5F - this.y, nextPos.getZ() + 0.5F - this.z);
-                        if (motion.crossProduct(diff).length() >= 0.001F) {
-                            currSpeed = (float) Math.sqrt(dist);
-                        } else {
-                            this.currGoalPos = nextPos;
-                        }
+                    nextPos = next.getPos();
+                }
+                float tolerance = 0.001F;
+                if (dist >= tolerance * tolerance) {
+                    // when going around corners, we want to move right up to the corner
+                    Vec3d motion = new Vec3d(this.x - this.lastX, this.y - this.lastY, this.z - this.lastZ);
+                    Vec3d diff = new Vec3d(nextPos.getX() + 0.5F - this.x, nextPos.getY() + 0.5F - this.y, nextPos.getZ() + 0.5F - this.z);
+                    if (motion.crossProduct(diff).length() >= tolerance) {
+                        currSpeed = (float) Math.sqrt(dist);
                     } else {
+                        // we're not going around a corner, so continue
                         this.currGoalPos = nextPos;
                     }
+                } else {
+                    // distance is very small, so continue
+                    this.currGoalPos = nextPos;
                 }
             }
         }