diff options
| author | Technus <daniel112092@gmail.com> | 2017-09-13 07:02:42 +0200 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2017-09-13 07:02:42 +0200 |
| commit | f8988f5e60a2af77a74bd65bb4ecdd7dfd3fae35 (patch) | |
| tree | dd7e4001a76b39d2515d29643749523e08ce5572 /src/main/java/gregtech/common/tileentities/machines/basic | |
| parent | 025e525441a11acf66504f406571ea1697ec9c6b (diff) | |
| parent | 09013db3ddb09aa908980a5d6324b126c3aab05f (diff) | |
| download | GT5-Unofficial-f8988f5e60a2af77a74bd65bb4ecdd7dfd3fae35.tar.gz GT5-Unofficial-f8988f5e60a2af77a74bd65bb4ecdd7dfd3fae35.tar.bz2 GT5-Unofficial-f8988f5e60a2af77a74bd65bb4ecdd7dfd3fae35.zip | |
Merge branch 'experimental' of https://github.com/GTNewHorizons/GT5-Unofficial into experimental
Diffstat (limited to 'src/main/java/gregtech/common/tileentities/machines/basic')
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java | 3 |
1 files changed, 2 insertions, 1 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 934be4c389..abdc569da9 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 @@ -153,7 +153,8 @@ public class GT_MetaTileEntity_MicrowaveEnergyTransmitter extends GT_MetaTileEnt sInterDimensionalTeleportAllowed && ( this.hasBlock || - mFluid.isFluidEqual(Materials.Nitrogen.getPlasma(1)) && mFluid.amount >= 1000 + mFluid != null && mFluid.isFluidEqual(Materials.Nitrogen.getPlasma(1)) && mFluid.amount >= 1000 + ) ) ; |