From 04ee947c8dd401bc3e41c787c4e1331cabd4cc16 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Fri, 15 Aug 2014 22:22:14 +0800 Subject: [PATCH] #852 Basic Fluid Conduit causes performance issues with small fluid volumes. --- .../conduit/liquid/LiquidConduitNetwork.java | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitNetwork.java index b3af4519..2f5805ed 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitNetwork.java @@ -24,6 +24,8 @@ public class LiquidConduitNetwork extends AbstractTankConduitNetwork 0 && curTime != timeAtLastApply) { timeAtLastApply = curTime; ConduitNetworkTickHandler.instance.addListener(tickHandler); - //doTick(curTime); } } @@ -76,10 +77,22 @@ public class LiquidConduitNetwork extends AbstractTankConduitNetwork 40) { + setFluidType(null); + ticksEmpty = 0; + } + } + return; + } + + ticksEmpty = 0; long curTime = cons.get(0).getBundle().getEntity().getWorldObj().getTotalWorldTime(); // 1000 water, 6000 lava - if(liquidType != null && liquidType.getFluid() != null) { + if(liquidType != null && liquidType.getFluid() != null && !isEmpty()) { int visc = Math.max(1000, liquidType.getFluid().getViscosity()); if(curTime % (visc / 500) == 0) { long start = System.nanoTime(); @@ -90,9 +103,6 @@ public class LiquidConduitNetwork extends AbstractTankConduitNetwork