diff options
| author | Dream-Master <dream-master@gmx.net> | 2018-01-07 21:51:56 +0100 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2018-01-07 21:51:56 +0100 |
| commit | 0cb8d5edfb29ad6a9db7568f485f1f0826182a72 (patch) | |
| tree | 3b3a65c7d8f0e2ca5218aeb2e2db4e9ec994d2be | |
| parent | cdca66410c190335670c0e630341c64ad08e2ba3 (diff) | |
| parent | 0cba66a1c7b7137c75590bf708dc1ecf5293e308 (diff) | |
| download | GT5-Unofficial-0cb8d5edfb29ad6a9db7568f485f1f0826182a72.tar.gz GT5-Unofficial-0cb8d5edfb29ad6a9db7568f485f1f0826182a72.tar.bz2 GT5-Unofficial-0cb8d5edfb29ad6a9db7568f485f1f0826182a72.zip | |
Merge branch 'experimental' into Dream-Master_Test-Branch
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java index 0fb8db7890..5d97ffe457 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java @@ -76,10 +76,10 @@ public abstract class GT_MetaTileEntity_OilDrillBase extends GT_MetaTileEntity_D this.mEfficiency = getCurrentEfficiency(null); this.mEfficiencyIncrease = 10000; int tier = Math.max(0, GT_Utility.getTier(getMaxInputVoltage())); - this.mEUt = (workState==STATE_AT_BOTTOM?-1:-7) << (tier << 1);//(1/4) A of current tier when at bottom (7/8) A of current tier while mining + this.mEUt = -7 << (tier << 1);//(1/4) A of current tier when at bottom (7/8) A of current tier while mining this.mMaxProgresstime = Math.max(1, (workState == STATE_AT_BOTTOM ? - (240 * (getRangeInChunks() * getRangeInChunks()))>>(getMinTier()-1) : + (120 * (getRangeInChunks() * getRangeInChunks()))>>(getMinTier()-1) : 120 ) >> tier); } |