Azimkin/CraftBukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SPIGOT-2427: Fix missed diff in armor damage handling

Browse Source
This commit is contained in:
md_5 2016-07-10 12:02:18 +10:00
parent 54902261c1
commit a625e4567d
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nms-patches/EntityLiving.patch
View File

@ -345,17 +345,15 @@
int j = MathHelper.floor(this.locX); int j = MathHelper.floor(this.locX);
int k = MathHelper.floor(this.locY - 0.20000000298023224D); int k = MathHelper.floor(this.locY - 0.20000000298023224D);
int l = MathHelper.floor(this.locZ); int l = MathHelper.floor(this.locZ);
@@ -972,8 +1122,8 @@ @@ -972,7 +1122,7 @@
protected float applyArmorModifier(DamageSource damagesource, float f) { protected float applyArmorModifier(DamageSource damagesource, float f) {
if (!damagesource.ignoresArmor()) { if (!damagesource.ignoresArmor()) {
- this.damageArmor(f); - this.damageArmor(f);
- f = CombatMath.a(f, (float) this.getArmorStrength(), (float) this.getAttributeInstance(GenericAttributes.h).getValue());
+ // this.damageArmor(f); // CraftBukkit - Moved into damageEntity0(DamageSource, float) + // this.damageArmor(f); // CraftBukkit - Moved into damageEntity0(DamageSource, float)
+ f = CombatMath.a(f, (float) this.getArmorStrength()); f = CombatMath.a(f, (float) this.getArmorStrength(), (float) this.getAttributeInstance(GenericAttributes.h).getValue());
} }
return f;
@@ -985,7 +1135,8 @@ @@ -985,7 +1135,8 @@
} else { } else {
int i; int i;