From 77e0acc16b9a6b59622d9ec62d264aea0b4714a1 Mon Sep 17 00:00:00 2001 From: WinDanesz <31292708+WinDanesz@users.noreply.github.com> Date: Sat, 31 Dec 2022 20:21:19 +0100 Subject: [PATCH] fix: Fixed Curse of Undeath breaking wizard headgear. It no longer breaks hats, and the curse sets the player on fire if the hat has no mana. Fixes #820 --- .../java/electroblob/wizardry/potion/CurseUndeath.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/electroblob/wizardry/potion/CurseUndeath.java b/src/main/java/electroblob/wizardry/potion/CurseUndeath.java index e0388c75..052eb3e6 100644 --- a/src/main/java/electroblob/wizardry/potion/CurseUndeath.java +++ b/src/main/java/electroblob/wizardry/potion/CurseUndeath.java @@ -1,6 +1,7 @@ package electroblob.wizardry.potion; import electroblob.wizardry.Wizardry; +import electroblob.wizardry.item.ItemWizardArmour; import net.minecraft.entity.EntityLivingBase; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; @@ -45,8 +46,12 @@ public class CurseUndeath extends Curse { } else { itemstack.setItemDamage(itemstack.getItemDamage() + entitylivingbase.world.rand.nextInt(2)); if (itemstack.getItemDamage() >= itemstack.getMaxDamage()) { - entitylivingbase.renderBrokenItemStack(itemstack); - entitylivingbase.setItemStackToSlot(EntityEquipmentSlot.HEAD, ItemStack.EMPTY); + if (itemstack.getItem() instanceof ItemWizardArmour) { + entitylivingbase.setFire(8); + } else { + entitylivingbase.renderBrokenItemStack(itemstack); + entitylivingbase.setItemStackToSlot(EntityEquipmentSlot.HEAD, ItemStack.EMPTY); + } } } }