From cdbbd891c43e082a36a32e49420bf87b6edd28e0 Mon Sep 17 00:00:00 2001
From: bculkin2442 <bjculkin@mix.wvu.edu>
Date: Wed, 4 Sep 2019 22:24:39 -0400
Subject: More affix work

---
 src/main/java/darkknight/jewelrycraft/effects/EffectObsidian.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/main/java/darkknight/jewelrycraft/effects/EffectObsidian.java')

diff --git a/src/main/java/darkknight/jewelrycraft/effects/EffectObsidian.java b/src/main/java/darkknight/jewelrycraft/effects/EffectObsidian.java
index 0d561e0..d7fcef8 100755
--- a/src/main/java/darkknight/jewelrycraft/effects/EffectObsidian.java
+++ b/src/main/java/darkknight/jewelrycraft/effects/EffectObsidian.java
@@ -18,6 +18,7 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionEffect;
 import net.minecraft.util.DamageSource;
+import net.minecraftforge.event.entity.living.LivingAttackEvent;
 
 public class EffectObsidian extends ModifierEffect {
 	public EffectObsidian() {
@@ -90,7 +91,9 @@ public class EffectObsidian extends ModifierEffect {
 
 	@Override
 	public boolean onEntityAttackedCancellable(ItemStack item, EntityPlayer player, Entity target, Item jewelry,
-			float amount) {
+			LivingAttackEvent event) {
+		float amount = event.ammount;
+
 		NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID);
 		NBTTagCompound enemyData = target.getEntityData();
 		// Positive ring
-- 
cgit v1.2.3