From 34afbd45ab1f5c69fb98aeac1bbcf2a9b541162b Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 9 Apr 2018 10:28:29 -0500 Subject: [PATCH] Fix #2590 baubles disappearing --- .../botania/common/item/equipment/bauble/ItemBauble.java | 4 ++++ 1 file changed, 4 insertions(+) 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 6dccb43e0..15553cdc0 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 @@ -103,6 +103,10 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt if(baubles.isItemValidForSlot(i, toEquip, player)) { ItemStack stackInSlot = baubles.getStackInSlot(i); if(stackInSlot.isEmpty() || ((IBauble) stackInSlot.getItem()).canUnequip(stackInSlot, player)) { + // If toEquip and stackInSlot are stacks with equal value but not identity, ItemStackHandler.setStackInSlot actually does nothing >.> + // Prevent it from trying to be overly smart by going through empty first + baubles.setStackInSlot(i, ItemStack.EMPTY); + baubles.setStackInSlot(i, toEquip); ((IBauble) toEquip.getItem()).onEquipped(toEquip, player);