diff options
| author | Dream-Master <dream-master@gmx.net> | 2017-09-12 22:41:17 +0200 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2017-09-12 22:41:17 +0200 |
| commit | ffc256ab87f905fa21bdb7102212cafa54c9f6bd (patch) | |
| tree | 8eecda6a193f883b9b709173e4345be8f8be99c8 /src/main/java/gregtech/common | |
| parent | 639789b6f58c4d76db41a8847fa0931b8465de7f (diff) | |
| download | GT5-Unofficial-ffc256ab87f905fa21bdb7102212cafa54c9f6bd.tar.gz GT5-Unofficial-ffc256ab87f905fa21bdb7102212cafa54c9f6bd.tar.bz2 GT5-Unofficial-ffc256ab87f905fa21bdb7102212cafa54c9f6bd.zip | |
cherry pick
61d058201244d9dd6f19ed72c863722b7da0ad14
bab71c5349799ba77ac42f80c54725a999fab40c
Fix #1206 #1210 Fix NPE of fluid check.
https://github.com/Blood-Asp/GT5-Unofficial/pull/1210
Diffstat (limited to 'src/main/java/gregtech/common')
| -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 + ) ) ; |