From 4ba87831db6ea0c5fb206a812ab88bf939ff1fc4 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Fri, 15 May 2015 13:17:57 +0100 Subject: [PATCH] Fixed Excaliber only homing on players when it should home on anything but players. Also made it only home on mobs. Closes #958 --- .../java/vazkii/botania/common/item/relic/ItemExcaliber.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java b/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java index 31f66e636..061a9255d 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java @@ -16,6 +16,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; +import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.item.EnumRarity; @@ -162,7 +163,7 @@ public class ItemExcaliber extends ItemManasteelSword implements IRelic, ILensEf AxisAlignedBB axis1 = AxisAlignedBB.getBoundingBox(entity.posX, entity.posY, entity.posZ, entity.lastTickPosX, entity.lastTickPosY, entity.lastTickPosZ).expand(5, 5, 5); List entities = entity.worldObj.getEntitiesWithinAABB(EntityLivingBase.class, axis1); for(EntityLivingBase living : entities) { - if(!(living instanceof EntityPlayer) && living.hurtTime != 0) + if(living instanceof EntityPlayer || !(living instanceof IMob) || living.hurtTime != 0) continue; homeID = living.getEntityId();