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

fix #3234

Browse source
This commit is contained in:
asiekierka 2016-03-13 21:07:45 +01:00
parent 0de4f15598
commit dadcd12874
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/buildcraft/core/lib/block/TileBuildCraft.java
View file

@ -186,7 +186,7 @@ public abstract class TileBuildCraft extends TileEntity implements IEnergyHandle
public int receiveEnergy(ForgeDirection from, int maxReceive, public int receiveEnergy(ForgeDirection from, int maxReceive,
boolean simulate) { boolean simulate) {
if (battery != null && this.canConnectEnergy(from)) { if (battery != null && this.canConnectEnergy(from)) {
int received = battery.receiveEnergy(maxReceive - receivedTick, simulate); int received = battery.receiveEnergy(Math.min(maxReceive, battery.getMaxEnergyReceive() - receivedTick), simulate);
if (!simulate) { if (!simulate) {
receivedTick += received; receivedTick += received;
worldTimeEnergyReceive = worldObj.getTotalWorldTime(); worldTimeEnergyReceive = worldObj.getTotalWorldTime();
@ -203,7 +203,7 @@ public abstract class TileBuildCraft extends TileEntity implements IEnergyHandle
public int extractEnergy(ForgeDirection from, int maxExtract, public int extractEnergy(ForgeDirection from, int maxExtract,
boolean simulate) { boolean simulate) {
if (battery != null && this.canConnectEnergy(from)) { if (battery != null && this.canConnectEnergy(from)) {
int extracted = battery.extractEnergy(maxExtract - extractedTick, simulate); int extracted = battery.extractEnergy(Math.min(maxExtract, battery.getMaxEnergyExtract() - extractedTick), simulate);
if (!simulate) { if (!simulate) {
extractedTick += extracted; extractedTick += extracted;
} }