diff options
| author | Martin Robertz <dream-master@gmx.net> | 2018-06-30 17:24:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-30 17:24:49 +0200 |
| commit | 6debde75fece4ea626883ea2486efda7fe2dcede (patch) | |
| tree | 9316d64a686e4f06c9e3d82c51d53519cb7f5695 /src | |
| parent | 5d09316f9aa2d6a633fc8518207a44e3a7662fd4 (diff) | |
| parent | 69cf09eceac1e7ad7f90804463ea45b203f42315 (diff) | |
| download | GT5-Unofficial-6debde75fece4ea626883ea2486efda7fe2dcede.tar.gz GT5-Unofficial-6debde75fece4ea626883ea2486efda7fe2dcede.tar.bz2 GT5-Unofficial-6debde75fece4ea626883ea2486efda7fe2dcede.zip | |
Merge pull request #132 from GTNewHorizons/largeboiler_ciruit
fixes https://github.com/GTNewHorizons/NewHorizons/issues/3226
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java index 1dfeb925b1..35692b367f 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java @@ -164,7 +164,7 @@ public abstract class GT_MetaTileEntity_LargeBoiler public boolean onRunningTick(ItemStack aStack) {
if (this.mEUt > 0) {
if (this.mSuperEfficencyIncrease > 0)
- this.mEfficiency = Math.min(10000, this.mEfficiency + this.mSuperEfficencyIncrease);
+ mEfficiency = Math.max(0, Math.min(mEfficiency + mSuperEfficencyIncrease, getMaxEfficiency(mInventory[1]) - ((getIdealStatus() - getRepairStatus()) * 1000)));
int tGeneratedEU = (int) (this.mEUt * 2L * this.mEfficiency / 10000L);
if (tGeneratedEU > 0) {
long amount = (tGeneratedEU + 160) / 160;
@@ -271,7 +271,7 @@ public abstract class GT_MetaTileEntity_LargeBoiler }
private int adjustBurnTimeForConfig(int rawBurnTime) {
- if (mEfficiency < 10000) {
+ if (mEfficiency < getMaxEfficiency(mInventory[1]) - ((getIdealStatus() - getRepairStatus()) * 1000)) {
return rawBurnTime;
}
int adjustedEUt = Math.max(25, getEUt() - 25 * integratedCircuitConfig);
|