diff options
| author | Blood-Asp <bloodasphendrik@gmail.com> | 2017-09-12 21:20:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-12 21:20:13 +0200 |
| commit | 9ece29b94eafe48d5f9ed6e9b19454ea7cc831c8 (patch) | |
| tree | 4b25637f462ea3a152f038901859ffe74de74df7 /src/main/java/gregtech/common/tileentities/machines/basic | |
| parent | 2127e4950d720386c4169e166ffd24530de1b93d (diff) | |
| parent | 88364a5ba174f44b0aacdb807ccc083c0abc0716 (diff) | |
| download | GT5-Unofficial-9ece29b94eafe48d5f9ed6e9b19454ea7cc831c8.tar.gz GT5-Unofficial-9ece29b94eafe48d5f9ed6e9b19454ea7cc831c8.tar.bz2 GT5-Unofficial-9ece29b94eafe48d5f9ed6e9b19454ea7cc831c8.zip | |
Merge branch 'unstable' into odp_speed_improving
Diffstat (limited to 'src/main/java/gregtech/common/tileentities/machines/basic')
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java index 0885628d45..78ac4f0312 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java @@ -138,7 +138,7 @@ public class GT_MetaTileEntity_MicrowaveEnergyTransmitter extends GT_MetaTileEnt } public boolean hasDimensionalTeleportCapability() { - return (this.mDebug) || (this.hasEgg) || (mFluid.isFluidEqual(Materials.Nitrogen.getPlasma(1)) && mFluid.amount >= 1000); + return (this.mDebug) || (this.hasEgg) || (mFluid != null && mFluid.isFluidEqual(Materials.Nitrogen.getPlasma(1)) && mFluid.amount >= 1000); } public boolean isDimensionalTeleportAvailable() { 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() { |