From cdbbd891c43e082a36a32e49420bf87b6edd28e0 Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Wed, 4 Sep 2019 22:24:39 -0400 Subject: More affix work --- .../java/darkknight/jewelrycraft/effects/EffectEnderPearl.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/main/java/darkknight/jewelrycraft/effects/EffectEnderPearl.java') diff --git a/src/main/java/darkknight/jewelrycraft/effects/EffectEnderPearl.java b/src/main/java/darkknight/jewelrycraft/effects/EffectEnderPearl.java index fca9fe0..bff370b 100755 --- a/src/main/java/darkknight/jewelrycraft/effects/EffectEnderPearl.java +++ b/src/main/java/darkknight/jewelrycraft/effects/EffectEnderPearl.java @@ -20,6 +20,7 @@ import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.DamageSource; +import net.minecraftforge.event.entity.living.LivingAttackEvent; public class EffectEnderPearl extends ModifierEffect { public EffectEnderPearl() { @@ -77,7 +78,8 @@ public class EffectEnderPearl extends ModifierEffect { } @Override - public void onEntityAttacked(ItemStack item, EntityPlayer player, Entity target, Item jewelry, float amount) { + public void onEntityAttacked(ItemStack item, EntityPlayer player, Entity target, Item jewelry, + LivingAttackEvent event) { if (jewelry instanceof ItemRing) { // Negative ring if (target instanceof EntityEnderman) @@ -88,10 +90,4 @@ public class EffectEnderPearl extends ModifierEffect { target.posZ + rand.nextInt(16) - rand.nextInt(16)); } } - - @Override - public boolean onEntityAttackedCancellable(ItemStack item, EntityPlayer player, Entity target, Item jewelry, - float amount) { - return false; - } } -- cgit v1.2.3