From 357ad64fd747c4959206256698d8c7424d6e341f Mon Sep 17 00:00:00 2001 From: Rseifert Date: Tue, 10 Jul 2012 05:24:41 -0400 Subject: [PATCH] Corrected add connections with old code readded code from old steam pipes to pipe code too use a clean and better pipe connection code. A lot easier to read and should check if it can connect on weither or not that side does anything. --- .../src/eui/pipes/TileEntityPipe.java | 23 +++++++------------ 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/minecraft/net/minecraft/src/eui/pipes/TileEntityPipe.java b/minecraft/net/minecraft/src/eui/pipes/TileEntityPipe.java index 2d34e14f..6e93003f 100644 --- a/minecraft/net/minecraft/src/eui/pipes/TileEntityPipe.java +++ b/minecraft/net/minecraft/src/eui/pipes/TileEntityPipe.java @@ -34,27 +34,20 @@ public class TileEntityPipe extends TileEntity implements ILiquidConsumer */ public void addConnection(TileEntity tileEntity, byte side) { - if(tileEntity instanceof TileEntityPipe) + this.connectedBlocks[side] = null; + if(tileEntity instanceof ILiquidConsumer) { - if(((TileEntityPipe)tileEntity).getType() == this.getType()) + if(((ILiquidConsumer)tileEntity).canRecieveLiquid(this.type, side)) { this.connectedBlocks[side] = tileEntity; } - else + } + if(tileEntity instanceof ILiquidProducer) + { + if(((ILiquidProducer)tileEntity).canProduceLiquid(this.type, side)) { - this.connectedBlocks[side] = null; - } - } - else - { - if(tileEntity instanceof ILiquidConsumer || tileEntity instanceof ILiquidProducer) - { this.connectedBlocks[side] = tileEntity; - } - else - { - this.connectedBlocks[side] = null; - } + } } }