From 5b497e107a30b0f4e9c1bccc058fe6d0e01b569f Mon Sep 17 00:00:00 2001 From: Electroblob77 <35599699+Electroblob77@users.noreply.github.com> Date: Tue, 17 Dec 2019 16:31:42 +0000 Subject: [PATCH] Reinstate max damage check, fixes #294 --- src/main/java/electroblob/wizardry/item/ItemWizardArmour.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/electroblob/wizardry/item/ItemWizardArmour.java b/src/main/java/electroblob/wizardry/item/ItemWizardArmour.java index bb3af0cd..3d10ac75 100644 --- a/src/main/java/electroblob/wizardry/item/ItemWizardArmour.java +++ b/src/main/java/electroblob/wizardry/item/ItemWizardArmour.java @@ -57,12 +57,12 @@ public class ItemWizardArmour extends ItemArmor implements IWorkbenchItem, IMana } /** Should only be used by vanilla's armour damage calculations; use {@link ItemWizardArmour#setMana(ItemStack, int)} - * to modify wand mana from elsewhere. */ + * to modify armour mana from elsewhere. */ @Override public void setDamage(ItemStack stack, int damage){ // Overridden to stop repair things from 'repairing' the mana in wizard armour // This being armour, it's much easier to let its damage increase normally, but block it from being decreased - if(stack.getItemDamage() < damage) super.setDamage(stack, damage); + if(stack.getItemDamage() < damage) super.setDamage(stack, Math.min(damage, stack.getMaxDamage())); } @Override