diff --git a/src/main/java/vazkii/botania/common/item/ItemRegenIvy.java b/src/main/java/vazkii/botania/common/item/ItemRegenIvy.java index 05f3705b0..ec1017380 100644 --- a/src/main/java/vazkii/botania/common/item/ItemRegenIvy.java +++ b/src/main/java/vazkii/botania/common/item/ItemRegenIvy.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.item; +import baubles.common.lib.PlayerHandler; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; @@ -37,12 +38,26 @@ public class ItemRegenIvy extends ItemMod { } public void onTick(PlayerTickEvent event) { - if(event.phase == Phase.END && !event.player.worldObj.isRemote) - for(int i = 0; i < event.player.inventory.getSizeInventory(); i++) { - ItemStack stack = event.player.inventory.getStackInSlot(i); - if(stack != null && ItemNBTHelper.detectNBT(stack) && ItemNBTHelper.getBoolean(stack, TAG_REGEN, false) && stack.getItemDamage() > 0 && ManaItemHandler.requestManaExact(stack, event.player, MANA_PER_DAMAGE, true)) - stack.setItemDamage(stack.getItemDamage() - 1); + if (event.phase != Phase.END || event.player.worldObj.isRemote) { + return; + } + + for (int i = 0; i < event.player.inventory.getSizeInventory(); i++) { + ItemStack stack = event.player.inventory.getStackInSlot(i); + if (canBeRepaired(event, stack)) stack.setItemDamage(stack.getItemDamage() - 1); + } + + ItemStack[] baubles = PlayerHandler.getPlayerBaubles(event.player).stackList; + if (baubles != null) { + for (int i = 0; i < baubles.length; i++) { // Basic for loop to avoid iterator in onTick method + ItemStack bauble = baubles[i]; + if (canBeRepaired(event, bauble)) bauble.setItemDamage(bauble.getItemDamage() - 1); } + } + } + + private static boolean canBeRepaired(PlayerTickEvent event, ItemStack stack) { + return stack != null && ItemNBTHelper.detectNBT(stack) && ItemNBTHelper.getBoolean(stack, TAG_REGEN, false) && stack.getItemDamage() > 0 && ManaItemHandler.requestManaExact(stack, event.player, MANA_PER_DAMAGE, true); } public class EventHandler {