fix pipe item stopping with shifters

CharsetMC · Dec 12, 2015 · 9a55583 · 9a55583
1 parent f705121
commit 9a55583
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/main/java/pl/asie/charset/pipes/PipeItem.java b/src/main/java/pl/asie/charset/pipes/PipeItem.java
@@ -343,6 +343,12 @@ public int compare(EnumFacing o1, EnumFacing o2) {
 		// Step 3: Pick the next path.
 		for (EnumFacing dir : pressureList) {
 			if (canMoveDirection(dir, true)) {
+				// Pressurizer prioritizing valid direction, move.
+				this.output = dir;
+				activeShifterDistance = getInternalShifterStrength(owner.getNearestShifter(dir), dir);
+				return;
+			} else if (owner.getShifterStrength(dir) == owner.getShifterStrength(dir.getOpposite())) {
+				// Pressurizers freezing an item in place.
 				this.output = dir;
 				activeShifterDistance = getInternalShifterStrength(owner.getNearestShifter(dir), dir);
 				return;

diff --git a/src/main/java/pl/asie/charset/pipes/TilePipe.java b/src/main/java/pl/asie/charset/pipes/TilePipe.java
@@ -26,7 +26,6 @@ public class TilePipe extends TileBase implements IConnectable, IPipe, ITickable
 	protected int[] shifterDistance = new int[6];
 	private final Set<PipeItem> itemSet = new HashSet<PipeItem>();
 
-	private byte initClient = 6;
 	private boolean neighborBlockChanged;
 
 	public TilePipe() {