From 372941c32f04e472366c2c39aa1f028bd9766091 Mon Sep 17 00:00:00 2001 From: taelnia Date: Sat, 16 Nov 2013 11:23:37 -0500 Subject: [PATCH] simplify code for iron pipe facing check --- common/buildcraft/transport/pipes/PipeLogicIron.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/common/buildcraft/transport/pipes/PipeLogicIron.java b/common/buildcraft/transport/pipes/PipeLogicIron.java index f7b67750..c076c62a 100644 --- a/common/buildcraft/transport/pipes/PipeLogicIron.java +++ b/common/buildcraft/transport/pipes/PipeLogicIron.java @@ -47,6 +47,9 @@ public abstract class PipeLogicIron { private boolean isValidFacing(ForgeDirection side) { + if (!pipe.container.isPipeConnected(side)) + return false; + TileBuffer[] tileBuffer = pipe.container.getTileCache(); if (tileBuffer == null) return true; @@ -55,8 +58,6 @@ public abstract class PipeLogicIron { return true; TileEntity tile = tileBuffer[side.ordinal()].getTile(); - if ((pipe.container.hasPlug(side)) || (tile != null && tile instanceof TileGenericPipe && ((TileGenericPipe)tile).pipe.container.hasPlug(side.getOpposite()))) - return false; return isValidConnectingTile(tile); }