From 4a07fd7491d8d2779551dfe2c692c11ea1e403f8 Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Thu, 7 Aug 2014 23:48:22 -0400 Subject: [PATCH] A few more fixes --- .../java/mekanism/common/EnergyNetwork.java | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/main/java/mekanism/common/EnergyNetwork.java b/src/main/java/mekanism/common/EnergyNetwork.java index 6d6a6ba2d..fe5a06e8c 100644 --- a/src/main/java/mekanism/common/EnergyNetwork.java +++ b/src/main/java/mekanism/common/EnergyNetwork.java @@ -141,11 +141,11 @@ public class EnergyNetwork extends DynamicNetwork boolean tryAgain = false; do { - double prev = sent; - sent += doEmit(energyToSend-sent, tryAgain); - tryAgain = false; + double prev = sent; + sent += doEmit(energyToSend-sent); + if(energyToSend-sent > 0 && sent-prev > 0) { tryAgain = true; @@ -166,7 +166,7 @@ public class EnergyNetwork extends DynamicNetwork /** * @return sent */ - public synchronized double doEmit(double energyToSend, boolean retrying) + public synchronized double doEmit(double energyToSend) { double sent = 0; @@ -211,15 +211,11 @@ public class EnergyNetwork extends DynamicNetwork toSend = Math.min(toSend, ((IEnergySink)acceptor).getDemandedEnergy()*general.FROM_IC2); sent += (toSend - (((IEnergySink)acceptor).injectEnergy(side.getOpposite(), toSend*general.TO_IC2, 0)*general.FROM_IC2)); } - else if(MekanismUtils.useBuildCraft() && !retrying) + else if(MekanismUtils.useBuildCraft() && MjAPI.getMjBattery(acceptor, MjAPI.DEFAULT_POWER_FRAMEWORK, side.getOpposite()) != null) { IBatteryObject battery = MjAPI.getMjBattery(acceptor, MjAPI.DEFAULT_POWER_FRAMEWORK, side.getOpposite()); - - if(battery != null) - { - double toSend = battery.addEnergy(Math.min(battery.getEnergyRequested(), currentSending*general.TO_BC)); - sent += toSend*general.FROM_BC; - } + double toSend = battery.addEnergy(Math.min(battery.getEnergyRequested(), currentSending*general.TO_BC)); + sent += toSend*general.FROM_BC; } } }