Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2073 from adudney/EnergyDisplayHelper

Browse source 
Energy display helper
This commit is contained in:
Adrian Siekierka 2014-10-22 05:28:26 +02:00
commit bc142a1c6e
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
common/buildcraft/transport/pipes/PipePowerWood.java
View file

@ -109,7 +109,7 @@ public class PipePowerWood extends Pipe<PipeTransportPower> implements IPowerRec
return; return;
} }
int energyToRemove = requestedEnergy; int energyToRemove = Math.min(battery.getEnergyStored(), requestedEnergy);
// TODO: Have energyToRemove be precalculated // TODO: Have energyToRemove be precalculated
// and used in receiveEnergy and extractEnergy. // and used in receiveEnergy and extractEnergy.
@ -133,12 +133,8 @@ public class PipePowerWood extends Pipe<PipeTransportPower> implements IPowerRec
} }
System.out.println("Sent " + energyToRemove + " energy to " + o.name()); System.out.println("Sent " + energyToRemove + " energy to " + o.name());
int energyUsable = Math.min(battery.getEnergyStored(), energyToRemove); battery.setEnergy(battery.getEnergyStored() - transport.receiveEnergy(o, energyToRemove));
if (energyUsable > 0) {
battery.setEnergy(battery.getEnergyStored() - transport.receiveEnergy(o, energyUsable));
}
} }
} }