diff options
| author | Martin Robertz <dream-master@gmx.net> | 2020-12-29 17:55:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-29 17:55:36 +0100 |
| commit | c8adb93578e701d1443376ce103ce62a50aaecb0 (patch) | |
| tree | 69eb98d3b95f8e678a92c3c0147a3eefdacf4c86 /src/main/java/gregtech/api | |
| parent | 8b66a49b81771115e91c691dc8d7fd5bab94e069 (diff) | |
| parent | b3dee829ce94149719485a5ea045ffa88582936b (diff) | |
| download | GT5-Unofficial-c8adb93578e701d1443376ce103ce62a50aaecb0.tar.gz GT5-Unofficial-c8adb93578e701d1443376ce103ce62a50aaecb0.tar.bz2 GT5-Unofficial-c8adb93578e701d1443376ce103ce62a50aaecb0.zip | |
Merge pull request #386 from GTNewHorizons/OilCrackerSync
Added wrong boni to Oil Cracker
Diffstat (limited to 'src/main/java/gregtech/api')
| -rw-r--r-- | src/main/java/gregtech/api/enums/HeatingCoilLevel.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/enums/HeatingCoilLevel.java b/src/main/java/gregtech/api/enums/HeatingCoilLevel.java index db94a3fe62..f4b28ede2b 100644 --- a/src/main/java/gregtech/api/enums/HeatingCoilLevel.java +++ b/src/main/java/gregtech/api/enums/HeatingCoilLevel.java @@ -50,14 +50,14 @@ public enum HeatingCoilLevel { * @return the coil Level, used for Parallels in the Multi Furnace for example */ public byte getLevel() { - return (byte) Math.max(16, 2 << (this.ordinal() - 2)); + return (byte) Math.min(16, 2 << (this.ordinal() - 2)); } /** * @return the coil Discount, used for discount in the Multi Furnace for example */ public byte getCostDiscount() { - return (byte) Math.min(1, 2 << (this.ordinal() - 1 - 6)); //-1 bcs. of none, -4 = offset + return (byte) Math.max(1, 2 << (this.ordinal() - 1 - 6)); //-1 bcs. of none, -4 = offset } public static HeatingCoilLevel getFromTier(byte tier){ |