tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

A few more fixes

Browse source
This commit is contained in:
Aidan C. Brady 2014-08-07 23:48:22 -04:00
parent 13f279eaa5
commit 4a07fd7491
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/main/java/mekanism/common/EnergyNetwork.java
View file

@ -141,11 +141,11 @@ public class EnergyNetwork extends DynamicNetwork<TileEntity, EnergyNetwork>
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<TileEntity, EnergyNetwork>
/**
* @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<TileEntity, EnergyNetwork>
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;
}
}
}