aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2018-01-07 21:24:45 +0100
committerDream-Master <dream-master@gmx.net>2018-01-07 21:24:45 +0100
commit45dedbff1e6f563aa312bf8d72a2edd42cd31a12 (patch)
tree15ca7077fe9cd9f6987ec94e5753eb0a884f3851 /src
parent8d69ebedc7a6d8bc84b2a90d31bb76b1de4d733b (diff)
downloadGT5-Unofficial-45dedbff1e6f563aa312bf8d72a2edd42cd31a12.tar.gz
GT5-Unofficial-45dedbff1e6f563aa312bf8d72a2edd42cd31a12.tar.bz2
GT5-Unofficial-45dedbff1e6f563aa312bf8d72a2edd42cd31a12.zip
Revert "reduce pump speed on large oil fields"
This reverts commit d3e5a7245821681cc18c84fd21d73a9d8d9b5bf2.
Diffstat (limited to 'src')
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java7
1 files changed, 1 insertions, 6 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 ec5962c793..f0ac31b344 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
@@ -128,19 +128,14 @@ public abstract class GT_MetaTileEntity_OilDrillBase extends GT_MetaTileEntity_D
return true;
}
- private float csig(float input) {
- return (float) ((float) 1 + Math.tanh((-1.0)*input/1100.0));
- }
-
private FluidStack pumpOil(float speed){
if (mOilId <= 0) return null;
FluidStack tFluid, tOil;
tOil = new FluidStack(FluidRegistry.getFluid(mOilId), 0);
for (Chunk tChunk : mOilFieldChunks) {
- tFluid = undergroundOil(getBaseMetaTileEntity(),speed*csig(undergroundOilReadInformation(getBaseMetaTileEntity()).amount));
+ tFluid = undergroundOil(getBaseMetaTileEntity(),speed);
if (tFluid == null) mOilFieldChunks.remove(tChunk);
if (tOil.isFluidEqual(tFluid)) tOil.amount += tFluid.amount;
-
}
return tOil.amount == 0 ? null : tOil;
}