diff options
| author | Martin Robertz <dream-master@gmx.net> | 2021-12-07 14:21:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-07 14:21:46 +0100 |
| commit | 782ea12d66f043a8d5c7569645382049d4066d27 (patch) | |
| tree | db4c8f58482c0e3f17086d73f926d2ed5abbeb25 | |
| parent | 418e5b5e6e5d20191fd1cc34cd1b2016f5207b4c (diff) | |
| parent | 00f9ea7095fe3c744fd0998ea45171296defb01f (diff) | |
| download | GT5-Unofficial-782ea12d66f043a8d5c7569645382049d4066d27.tar.gz GT5-Unofficial-782ea12d66f043a8d5c7569645382049d4066d27.tar.bz2 GT5-Unofficial-782ea12d66f043a8d5c7569645382049d4066d27.zip | |
Merge pull request #61 from iouter/master
fix Volcanus can lossless overclock forever.
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java index 5715db32ac..098642978d 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java @@ -332,7 +332,7 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase aSpeedBonusPercent = Math.max(-99, aSpeedBonusPercent); float tTimeFactor = 100.0f / (100.0f + aSpeedBonusPercent); this.mMaxProgresstime = (int) (tRecipe.mDuration * tTimeFactor); - int rInt = 2; + int tHalfHeatCapacityDivTiers = tHeatCapacityDivTiers / 2; this.mEUt = (int) Math.ceil(tTotalEUt); @@ -346,7 +346,15 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase } else { while (this.mEUt <= gregtech.api.enums.GT_Values.V[(tTier - 1)]) { this.mEUt *= 4; - this.mMaxProgresstime /= (tHeatCapacityDivTiers >= rInt ? 4 : 2); + if (tHalfHeatCapacityDivTiers > 0) { + this.mMaxProgresstime = mMaxProgresstime / 4; + tHalfHeatCapacityDivTiers--; + } else { + this.mMaxProgresstime = mMaxProgresstime / 2; + } + if (this.mMaxProgresstime <= 1) { + break; + } } } if (this.mEUt > 0) { |