From 3c84c34bd94a81fc5db45c14b7b78f75c8cb2c20 Mon Sep 17 00:00:00 2001 From: CovertJaguar Date: Tue, 24 Sep 2013 10:17:21 -0700 Subject: [PATCH] Wooden Pipes shouldn't orient to pipes Closes #1218 --- common/buildcraft/transport/pipes/PipeFluidsWood.java | 4 +++- common/buildcraft/transport/pipes/PipeItemsWood.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/common/buildcraft/transport/pipes/PipeFluidsWood.java b/common/buildcraft/transport/pipes/PipeFluidsWood.java index 7896d110..22792a15 100644 --- a/common/buildcraft/transport/pipes/PipeFluidsWood.java +++ b/common/buildcraft/transport/pipes/PipeFluidsWood.java @@ -13,8 +13,8 @@ import buildcraft.api.power.IPowerReceptor; import buildcraft.api.power.PowerHandler; import buildcraft.api.power.PowerHandler.PowerReceiver; import buildcraft.api.power.PowerHandler.Type; +import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.PipeManager; -import buildcraft.core.TileBuffer; import buildcraft.core.network.TileNetworkData; import buildcraft.transport.Pipe; import buildcraft.transport.PipeIconProvider; @@ -41,6 +41,8 @@ public class PipeFluidsWood extends Pipe implements IPowerR private PipeLogicWood logic = new PipeLogicWood(this) { @Override protected boolean isValidConnectingTile(TileEntity tile) { + if(tile instanceof IPipeTile) + return false; if (!(tile instanceof IFluidHandler)) return false; if (!PipeManager.canExtractFluids(pipe, tile.worldObj, tile.xCoord, tile.yCoord, tile.zCoord)) diff --git a/common/buildcraft/transport/pipes/PipeItemsWood.java b/common/buildcraft/transport/pipes/PipeItemsWood.java index 70c850e0..e548eec6 100644 --- a/common/buildcraft/transport/pipes/PipeItemsWood.java +++ b/common/buildcraft/transport/pipes/PipeItemsWood.java @@ -15,8 +15,8 @@ import buildcraft.api.power.IPowerReceptor; import buildcraft.api.power.PowerHandler; import buildcraft.api.power.PowerHandler.PowerReceiver; import buildcraft.api.power.PowerHandler.Type; +import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.PipeManager; -import buildcraft.core.TileBuffer; import buildcraft.transport.TravelingItem; import buildcraft.core.inventory.InventoryWrapper; import buildcraft.core.utils.Utils; @@ -40,6 +40,8 @@ public class PipeItemsWood extends Pipe implements IPowerRec private PipeLogicWood logic = new PipeLogicWood(this) { @Override protected boolean isValidConnectingTile(TileEntity tile) { + if (tile instanceof IPipeTile) + return false; if (!(tile instanceof IInventory)) return false; if (!PipeManager.canExtractItems(pipe, tile.worldObj, tile.xCoord, tile.yCoord, tile.zCoord))