From 0085bc2415b379b76a2e264ac797ea35edbea298 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Wed, 19 Oct 2016 20:34:01 +0100 Subject: [PATCH] Fixed a crash when mana pools are broken or removed from the world. Actually has to do with a bug in forge, so this is a bit of a band aid. Closes #1950 --- .../vazkii/botania/common/block/tile/mana/TilePool.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java index facc86b53..f4c951fcf 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java @@ -407,7 +407,13 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt @Override public int getCurrentMana() { - return worldObj != null && worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POOL_VARIANT) == PoolVariant.CREATIVE ? MAX_MANA : mana; + if(worldObj != null) { + IBlockState state = worldObj.getBlockState(getPos()); + if(state.getProperties().containsKey(BotaniaStateProps.POOL_VARIANT)) + return state.getValue(BotaniaStateProps.POOL_VARIANT) == PoolVariant.CREATIVE ? MAX_MANA : mana; + } + + return 0; } @Override