From 05b5b13256c420568d1f07ed634dfd47509d53f2 Mon Sep 17 00:00:00 2001 From: OnyxDarkKnight Date: Mon, 3 Mar 2014 20:58:11 +0200 Subject: Things --- common/darkknight/jewelrycraft/item/ItemRing.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'common/darkknight/jewelrycraft/item/ItemRing.java') diff --git a/common/darkknight/jewelrycraft/item/ItemRing.java b/common/darkknight/jewelrycraft/item/ItemRing.java index 70462f3..184d3f3 100644 --- a/common/darkknight/jewelrycraft/item/ItemRing.java +++ b/common/darkknight/jewelrycraft/item/ItemRing.java @@ -311,7 +311,19 @@ public class ItemRing extends Item else if (JewelryNBT.isModifierX(stack, new ItemStack(Item.feather)) && entityplayer != null) { entityplayer.addPotionEffect(new PotionEffect(Potion.jump.id, 4, amplifier, true)); - entityplayer.fallDistance=0; + if(entityplayer.inventory.armorInventory[0] != null) + { + int damage = entityplayer.inventory.armorInventory[0].getMaxDamage() - entityplayer.inventory.armorInventory[0].getItemDamage(); + if(damage - entityplayer.fallDistance > 0){ + entityplayer.inventory.armorInventory[0].damageItem((int)entityplayer.fallDistance, entityplayer); + entityplayer.fallDistance = 0; + } + else + { + --entityplayer.inventory.armorInventory[0].stackSize; + entityplayer.fallDistance -= damage; + } + } } else if (JewelryNBT.isModifierX(stack, new ItemStack(Item.potion, 1, 8270)) && entityplayer != null) entityplayer.addPotionEffect(new PotionEffect(Potion.invisibility.id, 4, amplifier, true)); } -- cgit v1.2.3