diff options
author | Blood-Asp <bloodasphendrik@gmail.com> | 2016-12-13 19:17:47 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-13 19:17:47 +0100 |
commit | 8e31958980db32e755bfd6c0428c97ec1e2e08d3 (patch) | |
tree | 2d45df2dbbae55ca08660467c07a3c0f0772cb8d /src/main/java/gregtech/api/metatileentity/implementations | |
parent | 423b3ad8efa2de64d24d4bca2d0c1be438a69d8c (diff) | |
parent | b1c2cbe93528fe38ac6ded6eb181fd776a015823 (diff) | |
download | GT5-Unofficial-8e31958980db32e755bfd6c0428c97ec1e2e08d3.tar.gz GT5-Unofficial-8e31958980db32e755bfd6c0428c97ec1e2e08d3.tar.bz2 GT5-Unofficial-8e31958980db32e755bfd6c0428c97ec1e2e08d3.zip |
Merge pull request #777 from Dimach/unstable
Fixed #767
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity/implementations')
-rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java index 8acd6fd575..0017cbeace 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java @@ -192,9 +192,10 @@ public abstract class GT_MetaTileEntity_BasicGenerator extends GT_MetaTileEntity int tFuelValue = getFuelValue(mFluid), tConsumed = consumedFluidPerOperation(mFluid); if (tFuelValue > 0 && tConsumed > 0 && mFluid.amount > tConsumed) { long tFluidAmountToUse = Math.min(mFluid.amount / tConsumed, (maxEUOutput() * 20 + getMinimumStoredEU() - aBaseMetaTileEntity.getUniversalEnergyStored()) / tFuelValue); - if (tFluidAmountToUse > 0 && aBaseMetaTileEntity.increaseStoredEnergyUnits(tFluidAmountToUse * tFuelValue, true)) - tProducedEU = tFluidAmountToUse * tFuelValue; + if (tFluidAmountToUse > 0 && aBaseMetaTileEntity.increaseStoredEnergyUnits(tFluidAmountToUse * tFuelValue, true)) { + tProducedEU = tFluidAmountToUse * tFuelValue; mFluid.amount -= tFluidAmountToUse * tConsumed; + } } } if (mInventory[getInputSlot()] != null && aBaseMetaTileEntity.getUniversalEnergyStored() < (maxEUOutput() * 20 + getMinimumStoredEU()) && GT_Utility.getFluidForFilledItem(mInventory[getInputSlot()], true) == null) { |