aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorAntifluxfield <lyj_299792458@163.com>2017-09-11 10:49:47 +0800
committerGitHub <noreply@github.com>2017-09-11 10:49:47 +0800
commitbab71c5349799ba77ac42f80c54725a999fab40c (patch)
tree57dd477b97bf6016176717ffa336d39de03c825a /src/main
parent61d058201244d9dd6f19ed72c863722b7da0ad14 (diff)
downloadGT5-Unofficial-bab71c5349799ba77ac42f80c54725a999fab40c.tar.gz
GT5-Unofficial-bab71c5349799ba77ac42f80c54725a999fab40c.tar.bz2
GT5-Unofficial-bab71c5349799ba77ac42f80c54725a999fab40c.zip
Fix NPE of fluid check
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java
index a7312d5a6e..399e798cd0 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java
@@ -232,7 +232,7 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank {
}
public boolean hasDimensionalTeleportCapability() {
- return (this.mDebug) || (this.hasEgg) || (mFluid.isFluidEqual(Materials.Nitrogen.getPlasma(1)) && mFluid.amount >= 10);
+ return (this.mDebug) || (this.hasEgg) || (mFluid != null && mFluid.isFluidEqual(Materials.Nitrogen.getPlasma(1)) && mFluid.amount >= 10);
}
public boolean isDimensionalTeleportAvailable() {