aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/GT_UndergroundOil.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gregtech/common/GT_UndergroundOil.java')
-rw-r--r--src/main/java/gregtech/common/GT_UndergroundOil.java13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/main/java/gregtech/common/GT_UndergroundOil.java b/src/main/java/gregtech/common/GT_UndergroundOil.java
index cc6771dc90..11bbd6431b 100644
--- a/src/main/java/gregtech/common/GT_UndergroundOil.java
+++ b/src/main/java/gregtech/common/GT_UndergroundOil.java
@@ -66,12 +66,11 @@ public class GT_UndergroundOil {
// if XSTR_INSTANCE is < chance then subtract 1
chunkData.changeAmount(-decrease);//diminish amount, "randomly" adjusted to double value (averageDecrease)
}
- }else{//just get info
- if(fluidInChunk.amount<=DIVIDER){
- fluidInChunk.amount=0;//return informative stack
+ } else {//just get info
+ if (chunkData.amount <= DIVIDER) {
chunkData.setAmount(0);
- }else{
- fluidInChunk.amount=fluidInChunk.amount/DIVIDER;//give moderate extraction speed
+ } else {
+ fluidInChunk.amount = chunkData.amount / DIVIDER;//give moderate extraction speed
}
}
return fluidInChunk;
@@ -81,8 +80,8 @@ public class GT_UndergroundOil {
if (e.getData().hasKey("GTOIL") && e.getData().hasKey("GTOILFLUID")) {
ChunkData chunkData = STORAGE.get(e.getChunk());
Fluid fluid = chunkData.getFluid();
- if (fluid != null && fluid.getID() == e.getData().getInteger("GTOIL"))
- chunkData.setAmount(Math.min(chunkData.getAmount(), e.getData().getInteger("GTOILFLUID")));
+ if (fluid != null && fluid.getID() == e.getData().getInteger("GTOILFLUID"))
+ chunkData.setAmount(Math.min(0, Math.min(chunkData.getAmount(), e.getData().getInteger("GTOIL"))));
}
}