aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/tileentities/machines/basic
diff options
context:
space:
mode:
authorMaxime Legkiy <maix@yandex.ru>2017-02-06 17:53:03 +0300
committerMaxime Legkiy <maix@yandex.ru>2017-02-06 17:53:03 +0300
commit811644f90a7850febcb0679ba8c5a35e80027650 (patch)
tree8dc9d0b0d0906e5c75c4268087d876c1c06769aa /src/main/java/gregtech/common/tileentities/machines/basic
parent2c82f057aa0a01862d487d73aacebc13fbdebf93 (diff)
downloadGT5-Unofficial-811644f90a7850febcb0679ba8c5a35e80027650.tar.gz
GT5-Unofficial-811644f90a7850febcb0679ba8c5a35e80027650.tar.bz2
GT5-Unofficial-811644f90a7850febcb0679ba8c5a35e80027650.zip
Fix bug > Oil Teleportation to GC Planets #837
Diffstat (limited to 'src/main/java/gregtech/common/tileentities/machines/basic')
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java
index bf58418246..e975242cc3 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java
@@ -149,8 +149,9 @@ public class GT_MetaTileEntity_AdvSeismicProspector extends GT_MetaTileEntity_Ba
private void putOil(int x, int z, HashMap<String, Integer> aOils) {
FluidStack tFluid = GT_Utility.getUndergroundOil(getBaseMetaTileEntity().getWorld(), x, z);
- if (tFluid.amount / 5000 > 0)
- aOils.put(x + "," + z + "," + (tFluid.amount / 5000) + "," + tFluid.getLocalizedName(), tFluid.amount / 5000);
+ if (tFluid != null)
+ if (tFluid.amount / 5000 > 0)
+ aOils.put(x + "," + z + "," + (tFluid.amount / 5000) + "," + tFluid.getLocalizedName(), tFluid.amount / 5000);
}
private void prospectOres(Map<String, Integer> aNearOres, Map<String, Integer> aMiddleOres, Map<String, Integer> aFarOres) {