From 22e886ded2b9fd22cadc17f4595fd0fead4f6b63 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Tue, 7 Jun 2016 23:22:26 +0200 Subject: [PATCH] Fixed a crash when having phantom liquifaces connected to non-tileentities Closes #111 --- .../mod/tile/TileEntityPhantomLiquiface.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomLiquiface.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomLiquiface.java index 1685db6da..f5d968757 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomLiquiface.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomLiquiface.java @@ -12,6 +12,7 @@ package de.ellpeck.actuallyadditions.mod.tile; import de.ellpeck.actuallyadditions.mod.blocks.BlockPhantom; import de.ellpeck.actuallyadditions.mod.util.WorldUtil; +import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; @@ -37,6 +38,12 @@ public class TileEntityPhantomLiquiface extends TileEntityPhantomface{ @Override public boolean isBoundThingInRange(){ - return super.isBoundThingInRange() && this.worldObj.getTileEntity(this.boundPosition).hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, null); + if(super.isBoundThingInRange()){ + TileEntity tile = this.worldObj.getTileEntity(this.boundPosition); + if(tile != null){ + return tile.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, null); + } + } + return false; } }