From ab3bc85f206a2cbc06f5a3863b6f30643a6affcc Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 20 Jan 2016 19:07:29 -0600 Subject: [PATCH] Fix magic missile crash. closes #54 --- .../common/entity/EntityMagicMissile.java | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java index ee0b741c0..eafed541a 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java +++ b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java @@ -181,10 +181,23 @@ public class EntityMagicMissile extends EntityThrowable { @Override protected void onImpact(MovingObjectPosition pos) { - Block block = worldObj.getBlockState(pos.getBlockPos()).getBlock(); - - if(!(block instanceof BlockBush) && !(block instanceof BlockLeaves) && (pos.entityHit == null || getTargetEntity() == pos.entityHit)) - setDead(); + switch (pos.typeOfHit) { + case BLOCK: { + Block block = worldObj.getBlockState(pos.getBlockPos()).getBlock(); + if(!(block instanceof BlockBush) && !(block instanceof BlockLeaves)) + setDead(); + break; + } + case ENTITY: { + if (pos.entityHit == getTargetEntity()) + setDead(); + break; + } + default: { + setDead(); + break; + } + } } }