A few more fixes
This commit is contained in:
parent
13f279eaa5
commit
4a07fd7491
1 changed files with 7 additions and 11 deletions
|
@ -141,11 +141,11 @@ public class EnergyNetwork extends DynamicNetwork<TileEntity, EnergyNetwork>
|
||||||
boolean tryAgain = false;
|
boolean tryAgain = false;
|
||||||
|
|
||||||
do {
|
do {
|
||||||
double prev = sent;
|
|
||||||
sent += doEmit(energyToSend-sent, tryAgain);
|
|
||||||
|
|
||||||
tryAgain = false;
|
tryAgain = false;
|
||||||
|
|
||||||
|
double prev = sent;
|
||||||
|
sent += doEmit(energyToSend-sent);
|
||||||
|
|
||||||
if(energyToSend-sent > 0 && sent-prev > 0)
|
if(energyToSend-sent > 0 && sent-prev > 0)
|
||||||
{
|
{
|
||||||
tryAgain = true;
|
tryAgain = true;
|
||||||
|
@ -166,7 +166,7 @@ public class EnergyNetwork extends DynamicNetwork<TileEntity, EnergyNetwork>
|
||||||
/**
|
/**
|
||||||
* @return sent
|
* @return sent
|
||||||
*/
|
*/
|
||||||
public synchronized double doEmit(double energyToSend, boolean retrying)
|
public synchronized double doEmit(double energyToSend)
|
||||||
{
|
{
|
||||||
double sent = 0;
|
double sent = 0;
|
||||||
|
|
||||||
|
@ -211,15 +211,11 @@ public class EnergyNetwork extends DynamicNetwork<TileEntity, EnergyNetwork>
|
||||||
toSend = Math.min(toSend, ((IEnergySink)acceptor).getDemandedEnergy()*general.FROM_IC2);
|
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));
|
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());
|
IBatteryObject battery = MjAPI.getMjBattery(acceptor, MjAPI.DEFAULT_POWER_FRAMEWORK, side.getOpposite());
|
||||||
|
double toSend = battery.addEnergy(Math.min(battery.getEnergyRequested(), currentSending*general.TO_BC));
|
||||||
if(battery != null)
|
sent += toSend*general.FROM_BC;
|
||||||
{
|
|
||||||
double toSend = battery.addEnergy(Math.min(battery.getEnergyRequested(), currentSending*general.TO_BC));
|
|
||||||
sent += toSend*general.FROM_BC;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue