Fixed cable functionality

This commit is contained in:
Aidan C. Brady committed 2014-08-09 13:28:40 -04:00
1 parent ed919fa19a
commit a3c6b9dac2
2 files changed
+23 -25

No files matched your search

@@ -143,7 +143,7 @@ public class EnergyNetwork extends DynamicNetwork<TileEntity, EnergyNetwork>
tryAgain = false;
double prev = sent;
sent += doEmit(energyToSend-sent);
sent += doEmit(energyToSend-sent, tryAgain);
if(energyToSend-sent > 0 && sent-prev > 0)
{
@@ -165,7 +165,7 @@ public class EnergyNetwork extends DynamicNetwork<TileEntity, EnergyNetwork>
/**
* @return sent
*/
public synchronized double doEmit(double energyToSend)
public synchronized double doEmit(double energyToSend, boolean tryAgain)
{
double sent = 0;
@@ -210,7 +210,7 @@ public class EnergyNetwork extends DynamicNetwork<TileEntity, EnergyNetwork>
toSend = Math.min(toSend, ((IEnergySink)acceptor).getDemandedEnergy()*Mekanism.FROM_IC2);
sent += (toSend - (((IEnergySink)acceptor).injectEnergy(side.getOpposite(), toSend*Mekanism.TO_IC2, 0)*Mekanism.FROM_IC2));
}
else if(MekanismUtils.useBuildCraft() && MjAPI.getMjBattery(acceptor, MjAPI.DEFAULT_POWER_FRAMEWORK, side.getOpposite()) != null)
else if(MekanismUtils.useBuildCraft() && MjAPI.getMjBattery(acceptor, MjAPI.DEFAULT_POWER_FRAMEWORK, side.getOpposite()) != null && !tryAgain)
{
IBatteryObject battery = MjAPI.getMjBattery(acceptor, MjAPI.DEFAULT_POWER_FRAMEWORK, side.getOpposite());
double toSend = battery.addEnergy(Math.min(battery.getEnergyRequested(), currentSending*Mekanism.TO_BC));