From afc846b36969bda81dd6007e251da22fc81caad0 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sun, 6 Dec 2015 14:29:24 +0000 Subject: [PATCH] Fixed using a Rod of the Unstable Reservoir with a Livingwood Avatar crashing the game if it kills a named mob while CoFHCore's "alert named mob kills" config is enabled. Closes #1617 --- .../vazkii/botania/common/entity/EntityMagicMissile.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java index e1ba272aa..88fda7c89 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java +++ b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java @@ -126,8 +126,11 @@ public class EntityMagicMissile extends EntityThrowable { List targetList = worldObj.getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(posX - 0.5, posY - 0.5, posZ - 0.5, posX + 0.5, posY + 0.5, posZ + 0.5)); if(targetList.contains(target) && target != null) { EntityLivingBase thrower = getThrower(); - EntityPlayer player = thrower instanceof EntityPlayer ? (EntityPlayer) thrower : null; - target.attackEntityFrom(player == null ? DamageSource.causeMobDamage(thrower) : DamageSource.causePlayerDamage(player), evil ? 12 : 7); + if(thrower != null) { + EntityPlayer player = thrower instanceof EntityPlayer ? (EntityPlayer) thrower : null; + target.attackEntityFrom(player == null ? DamageSource.causeMobDamage(thrower) : DamageSource.causePlayerDamage(player), evil ? 12 : 7); + } else target.attackEntityFrom(DamageSource.generic, evil ? 12 : 7); + setDead(); }