fujin/Wizardry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wizard armor breaking

Browse Source
This commit is contained in:
Shadows_of_Fire
2018-05-04 07:35:51 -04:00
parent b8e847c6a6
commit ca96112b67
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/item/ItemWizardArmour.java
+8 -9
View File
@@ -189,15 +189,14 @@ public class ItemWizardArmour extends ItemArmor implements ISpecialArmor {
@Override @Override
public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot){ public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot){
if(stack.getItemDamage() < stack.getMaxDamage()){ stack.damageItem(damage, entity);
if(stack.getItemDamage() + damage > stack.getMaxDamage()){ }
// Note for reference: this is the method to use, despite how it sounds attemptDamageItem() is called
// by this one, not the other way round. // Fixes wizard armor breaking by disallowing setting damage above the max, since damageArmor is not always called.
stack.damageItem(stack.getMaxDamage() - stack.getItemDamage(), entity); @Override
}else{ public void setDamage(ItemStack stack, int damage) {
stack.damageItem(damage, entity); if(damage <= stack.getMaxDamage()) super.setDamage(stack, damage);
} else super.setDamage(stack, stack.getMaxDamage());
}
} }
/** /**