xjboss/KCauldronX
3
0
Fork 1
Code Releases Activity

Fix armor double damage, fix #79

Browse Source
This commit is contained in:
Prototik 2015-06-30 01:00:00 +07:00
parent 499c680b58
commit 896e45556a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
patches/net/minecraft/entity/EntityLivingBase.java.patch
View File

@ -467,7 +467,7 @@
+ if (human) + if (human)
+ { + {
+ return -(f - ArmorProperties.ApplyArmor(EntityLivingBase.this, ((EntityPlayer) EntityLivingBase.this).inventory.armorInventory, + return -(f - ArmorProperties.ApplyArmor(EntityLivingBase.this, ((EntityPlayer) EntityLivingBase.this).inventory.armorInventory,
+ damagesource, f.floatValue())); + damagesource, f.floatValue(), false));
+ } + }
+ // Cauldron end + // Cauldron end
+ return -(f - EntityLivingBase.this.applyArmorCalculations(damagesource, f.floatValue())); + return -(f - EntityLivingBase.this.applyArmorCalculations(damagesource, f.floatValue()));
@ -531,7 +531,7 @@
+ if (!damagesource.isUnblockable()) + if (!damagesource.isUnblockable())
+ { + {
+ float armorDamage = (float) (event.getDamage() + event.getDamage(DamageModifier.BLOCKING) + event.getDamage(DamageModifier.HARD_HAT)); + float armorDamage = (float) (event.getDamage() + event.getDamage(DamageModifier.BLOCKING) + event.getDamage(DamageModifier.HARD_HAT));
+ if (this instanceof EntityPlayer) { + if (human) {
+ EntityPlayer player = (EntityPlayer) this; + EntityPlayer player = (EntityPlayer) this;
+ armorDamage = ArmorProperties.ApplyArmor(player, player.inventory.armorInventory, damagesource, armorDamage, true); + armorDamage = ArmorProperties.ApplyArmor(player, player.inventory.armorInventory, damagesource, armorDamage, true);
+ } else { + } else {