diff options
author | DreamMasterXXL <dream-master@gmx.net> | 2020-09-19 19:40:57 +0200 |
---|---|---|
committer | DreamMasterXXL <dream-master@gmx.net> | 2020-09-19 19:40:57 +0200 |
commit | ce56bfde0fd9d9e032fbbd5b431923dbf0d679a4 (patch) | |
tree | e9e02c1ac51f68b7f9a4e8671330fc9729bacf6a /src/main/java/gregtech/api | |
parent | da01146e5673a6626dfc1c7744cb28eb7d2dce94 (diff) | |
download | GT5-Unofficial-ce56bfde0fd9d9e032fbbd5b431923dbf0d679a4.tar.gz GT5-Unofficial-ce56bfde0fd9d9e032fbbd5b431923dbf0d679a4.tar.bz2 GT5-Unofficial-ce56bfde0fd9d9e032fbbd5b431923dbf0d679a4.zip |
Revert "fix energy consumption on OC past tick limit"
This reverts commit efbaa3fcb94da0aea4a4d51519b58df4641e68d9.
Diffstat (limited to 'src/main/java/gregtech/api')
-rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java index c41d2ca316..c6828c707e 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java @@ -617,17 +617,8 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity { while (tempEUt <= V[mTier - 1] * mAmperage) { tempEUt <<= 2;//this actually controls overclocking //xEUt *= 4;//this is effect of everclocking - int oldTime = mMaxProgresstime; mMaxProgresstime >>= ocTimeShift;//this is effect of overclocking - if (mMaxProgresstime <1) - { - xEUt *= oldTime * (perfectOC ? 1:2); - break; - } - else - { - xEUt <<= ocTimeShift; - } + xEUt = mMaxProgresstime==0 ? xEUt >> ocTimeShift : xEUt << 2;//U know, if the time is less than 1 tick make the machine use less power } if(xEUt > Integer.MAX_VALUE - 1) { mEUt = Integer.MAX_VALUE - 1; |