From a6d89e3d4dd68ab3c7cc6e9f0fc0bce53323d7c3 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 20 Jan 2016 19:08:48 -0600 Subject: [PATCH] Fix thorn chakram impact crash. Closes #59 --- .../botania/common/entity/EntityThornChakram.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java index 80e10d3ee..d4ca7a69e 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java @@ -111,10 +111,12 @@ public class EntityThornChakram extends EntityThrowable { if(noClip) return; - Block block = worldObj.getBlockState(pos.getBlockPos()).getBlock(); - worldObj.getTileEntity(pos.getBlockPos()); - if(block instanceof BlockBush || block instanceof BlockLeaves) - return; + if (pos.getBlockPos() != null) { + Block block = worldObj.getBlockState(pos.getBlockPos()).getBlock(); + worldObj.getTileEntity(pos.getBlockPos()); + if(block instanceof BlockBush || block instanceof BlockLeaves) + return; + } boolean fire = isFire(); EntityLivingBase thrower = getThrower();