diff options
| author | Blood-Asp <bloodasphendrik@gmail.com> | 2017-07-01 17:08:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-01 17:08:51 +0200 |
| commit | 37869e5c6cdb028cd0db705a43d264b3737430e3 (patch) | |
| tree | 3a42bc5b7f8277c05e5b7f1f2dc5ea148b877a0f /src | |
| parent | 618a65659132ac5239acb2d85895678fdbd87a78 (diff) | |
| parent | 4d471edc8ff724602ac72fbf3f9418d7d7334850 (diff) | |
| download | GT5-Unofficial-37869e5c6cdb028cd0db705a43d264b3737430e3.tar.gz GT5-Unofficial-37869e5c6cdb028cd0db705a43d264b3737430e3.tar.bz2 GT5-Unofficial-37869e5c6cdb028cd0db705a43d264b3737430e3.zip | |
Merge pull request #1128 from Dimach/oil-fix
Removed divider that already applied in Gt_UndergroundOil.
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_Utility.java | 2 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill.java | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java index 323cce3a12..0df458b21f 100644 --- a/src/main/java/gregtech/api/util/GT_Utility.java +++ b/src/main/java/gregtech/api/util/GT_Utility.java @@ -2050,7 +2050,7 @@ public class GT_Utility { NBTTagCompound tNBT = getNBT(aStack); String tData = aX + "," + aY + "," + aZ + "," + aDim + ","; if (aFluid!=null) - tData += (aFluid.amount / 5000) + "," + aFluid.getLocalizedName() + ","; + tData += (aFluid.amount) + "," + aFluid.getLocalizedName() + ","; for (String tString : aOres) { tData += tString + ","; } 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 7d6fe5935c..56d1d8875a 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 @@ -81,18 +81,12 @@ public class GT_MetaTileEntity_OilDrill extends GT_MetaTileEntity_MultiBlockBase return false; } if (getYOfPumpHead() > 0 && getBaseMetaTileEntity().getBlockOffset(ForgeDirection.getOrientation(getBaseMetaTileEntity().getBackFacing()).offsetX, getYOfPumpHead() - 1 - getBaseMetaTileEntity().getYCoord(), ForgeDirection.getOrientation(getBaseMetaTileEntity().getBackFacing()).offsetZ) != Blocks.bedrock) { - if (completedCycle) { moveOneDown(); } tFluid = null; if (mEnergyHatches.size() > 0 && mEnergyHatches.get(0).getEUVar() > (512 + getMaxInputVoltage() * 4)) completedCycle = true; - } else if (tFluid.amount < 5000) { - stopMachine(); - return false; - } else { - tFluid.amount = tFluid.amount / 5000; } long tVoltage = getMaxInputVoltage(); byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage)); |