From 87443b40030ec4aef44e8a3442692a8dd06f87b0 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Fri, 10 Apr 2015 12:29:39 +0100 Subject: [PATCH] Add a inEffect NBT tag to the cloaks to prevent stack overflows with mods that deal damange when damaged. See #732 --- .../item/equipment/bauble/ItemHolyCloak.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java index 19fe4ee1b..8602dcf2b 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java @@ -41,6 +41,7 @@ public class ItemHolyCloak extends ItemBauble implements IBaubleRender { private static ModelBiped model; private static final String TAG_COOLDOWN = "cooldown"; + private static final String TAG_IN_EFFECT = "inEffect"; public ItemHolyCloak() { this(LibItemNames.HOLY_CLOAK); @@ -57,11 +58,15 @@ public class ItemHolyCloak extends ItemBauble implements IBaubleRender { EntityPlayer player = (EntityPlayer) event.entityLiving; InventoryBaubles baubles = PlayerHandler.getPlayerBaubles(player); ItemStack belt = baubles.getStackInSlot(3); - if(belt != null && belt.getItem() instanceof ItemHolyCloak) { + if(belt != null && belt.getItem() instanceof ItemHolyCloak && !isInEffect(belt)) { ItemHolyCloak cloak = (ItemHolyCloak) belt.getItem(); int cooldown = getCooldown(belt); + + // Used to prevent StackOverflows with mobs that deal damage when damaged + setInEffect(belt, true); if(cooldown == 0 && cloak.effectOnDamage(event, player, belt)) setCooldown(belt, cloak.getCooldownTime(belt)); + setInEffect(belt, false); } } } @@ -106,6 +111,14 @@ public class ItemHolyCloak extends ItemBauble implements IBaubleRender { public static void setCooldown(ItemStack stack, int cooldown) { ItemNBTHelper.setInt(stack, TAG_COOLDOWN, cooldown); } + + public static boolean isInEffect(ItemStack stack) { + return ItemNBTHelper.getBoolean(stack, TAG_IN_EFFECT, false); + } + + public static void setInEffect(ItemStack stack, boolean effect) { + ItemNBTHelper.setBoolean(stack, TAG_IN_EFFECT, effect); + } @SideOnly(Side.CLIENT) ResourceLocation getRenderTexture() {