diff options
| author | Blood-Asp <bloodasphendrik@gmail.com> | 2017-02-05 17:35:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-05 17:35:40 +0100 |
| commit | 5e19e7310f550f226bfbc04c792264e9f58c7217 (patch) | |
| tree | 9bd013a553486bcd7264966c5327d7dbcff699c3 /src | |
| parent | f00ccaa279e2a865616646bbb881434bb01d8d9f (diff) | |
| parent | 2c82f057aa0a01862d487d73aacebc13fbdebf93 (diff) | |
| download | GT5-Unofficial-5e19e7310f550f226bfbc04c792264e9f58c7217.tar.gz GT5-Unofficial-5e19e7310f550f226bfbc04c792264e9f58c7217.tar.bz2 GT5-Unofficial-5e19e7310f550f226bfbc04c792264e9f58c7217.zip | |
Merge pull request #889 from maixgame/unstable
Fix respawn oil amount if amount down to 0
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_Utility.java | 7 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill.java | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java index b652696d16..b3fffa5b47 100644 --- a/src/main/java/gregtech/api/util/GT_Utility.java +++ b/src/main/java/gregtech/api/util/GT_Utility.java @@ -1519,6 +1519,10 @@ public class GT_Utility { } public static FluidStack getUndergroundOil(World aWorld, int aX, int aZ) { + return getUndergroundOil(aWorld, aX, aZ, false); + } + + public static FluidStack getUndergroundOil(World aWorld, int aX, int aZ, boolean needConsumeOil) { Random tRandom = new Random((aWorld.getSeed() + (aX / 96) + (7 * (aZ / 96)))); @@ -1554,7 +1558,8 @@ public class GT_Utility { } GT_Proxy.chunkData.remove(tPos); } - tAmount = tAmount - 5; + if (needConsumeOil && tAmount >= 5000) + tAmount = tAmount - 5; tInts[0] = tAmount; GT_Proxy.chunkData.put(tPos, tInts); diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill.java index d90093fcd6..eef57f9059 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill.java @@ -73,7 +73,7 @@ public class GT_MetaTileEntity_OilDrill extends GT_MetaTileEntity_MultiBlockBase } } } - FluidStack tFluid = GT_Utility.getUndergroundOil(getBaseMetaTileEntity().getWorld(), getBaseMetaTileEntity().getXCoord(), getBaseMetaTileEntity().getZCoord()); + FluidStack tFluid = GT_Utility.getUndergroundOil(getBaseMetaTileEntity().getWorld(), getBaseMetaTileEntity().getXCoord(), getBaseMetaTileEntity().getZCoord(), true); if (tFluid == null) { return false; } |