From fb044a57777fbe64dc31d21dd02d814232585514 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Fri, 15 May 2015 16:03:51 +0100 Subject: [PATCH] Baubles no longer call onEquipped when equipped through right click, the functionality is instead delegated to onEquippedOrLoadedIntoWorld. Fixes the Ring of Odin/Ring of the Aesir allowing for infinite health. Closes #971 --- .../vazkii/botania/common/item/equipment/bauble/ItemBauble.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java index 872f849ed..1de307f08 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java @@ -64,8 +64,6 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt par3EntityPlayer.inventory.setInventorySlotContents(par3EntityPlayer.inventory.currentItem, null); } - onEquipped(par1ItemStack, par3EntityPlayer); - if(stackInSlot != null) { ((IBauble) stackInSlot.getItem()).onUnequipped(stackInSlot, par3EntityPlayer); return stackInSlot.copy();