From c35faabfd88ef4b3291ee7f46c1d5594589ae0e5 Mon Sep 17 00:00:00 2001 From: AlgorithmX2 Date: Sun, 18 May 2014 14:44:58 -0500 Subject: [PATCH] Fixed Bug: #0436 - Fluid Tunnels don't require Power Fixed bug where fluid tunnels would not function properly. --- parts/p2p/PartP2PLiquids.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/parts/p2p/PartP2PLiquids.java b/parts/p2p/PartP2PLiquids.java index afc476822..b7deb04a0 100644 --- a/parts/p2p/PartP2PLiquids.java +++ b/parts/p2p/PartP2PLiquids.java @@ -24,7 +24,7 @@ public class PartP2PLiquids extends PartP2PTunnel implements IFl private final static FluidTankInfo[] activeTank = new FluidTankInfo[] { new FluidTankInfo( null, 10000 ) }; private final static FluidTankInfo[] inactiveTank = new FluidTankInfo[] { new FluidTankInfo( null, 0 ) }; - + public TunnelType getTunnelType() { return TunnelType.FLUID; @@ -92,7 +92,7 @@ public class PartP2PLiquids extends PartP2PTunnel implements IFl { for (PartP2PLiquids l : getOutputs()) { - IFluidHandler targ = getTarget(); + IFluidHandler targ = l.getTarget(); if ( targ != null ) { if ( targ.canFill( side.getOpposite(), input ) ) @@ -128,6 +128,9 @@ public class PartP2PLiquids extends PartP2PTunnel implements IFl IFluidHandler getTarget() { + if ( !proxy.isActive() ) + return null; + if ( cachedTank != null ) return cachedTank;