Fix thorn chakram impact crash. Closes #59

This commit is contained in:
Vincent Lee committed 2016-01-20 19:08:48 -06:00
1 parent ab3bc85f20
commit a6d89e3d4d
1 file changed
+6 -4
@@ -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();