From 1c14dcf8ff0bb1e1466f85e2d935dc1d6242b698 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 9 Jan 2016 18:37:12 -0600 Subject: [PATCH] Fix pylon crash --- .../vazkii/botania/common/block/tile/TilePylon.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java index 4f89ca9f8..e431c1a01 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java @@ -19,6 +19,7 @@ import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.AlfPortalState; import vazkii.botania.api.state.enums.PylonVariant; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; @@ -36,10 +37,14 @@ public class TilePylon extends TileEntity implements ITickable { @Override public void update() { ++ticks; + + if (worldObj.getBlockState(getPos()) != ModBlocks.pylon) + return; + PylonVariant variant = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.PYLON_VARIANT); if(activated && worldObj.isRemote) { - if(worldObj.getBlockState(centerPos).getBlock() != getBlockForMeta() || variant != PylonVariant.MANA && worldObj.getBlockState(centerPos).getBlock().getMetaFromState(worldObj.getBlockState(centerPos)) == 0) { // todo 1.8 clarify + if(worldObj.getBlockState(centerPos).getBlock() != getBlockForMeta() || variant != PylonVariant.MANA && portalOff()) { // todo 1.8 clarify activated = false; return; } @@ -93,4 +98,9 @@ public class TilePylon extends TileEntity implements ITickable { return worldObj.getBlockState(pos).getValue(BotaniaStateProps.PYLON_VARIANT) == PylonVariant.MANA ? ModBlocks.enchanter : ModBlocks.alfPortal; } + private boolean portalOff() { + return worldObj.getBlockState(centerPos).getBlock() != ModBlocks.alfPortal + || worldObj.getBlockState(centerPos).getValue(BotaniaStateProps.ALFPORTAL_STATE) == AlfPortalState.OFF; + } + } \ No newline at end of file