From ffc256ab87f905fa21bdb7102212cafa54c9f6bd Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Tue, 12 Sep 2017 22:41:17 +0200 Subject: cherry pick 61d058201244d9dd6f19ed72c863722b7da0ad14 bab71c5349799ba77ac42f80c54725a999fab40c Fix #1206 #1210 Fix NPE of fluid check. https://github.com/Blood-Asp/GT5-Unofficial/pull/1210 --- .../machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/main/java/gregtech/common') 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 + ) ) ; -- cgit