diff options
| author | md_5 <git@md-5.net> | 2016-07-10 12:02:18 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2016-07-10 12:02:18 +1000 |
| commit | a625e4567d990a3d48fbce41ddd575f09ecb4d58 (patch) | |
| tree | 4e7296b6e4b76cd3d1cf203c1fd822326b000350 /nms-patches | |
| parent | 54902261c188b6f2715967d957b27a6ebe77b68e (diff) | |
| download | craftbukkit-a625e4567d990a3d48fbce41ddd575f09ecb4d58.tar craftbukkit-a625e4567d990a3d48fbce41ddd575f09ecb4d58.tar.gz craftbukkit-a625e4567d990a3d48fbce41ddd575f09ecb4d58.tar.lz craftbukkit-a625e4567d990a3d48fbce41ddd575f09ecb4d58.tar.xz craftbukkit-a625e4567d990a3d48fbce41ddd575f09ecb4d58.zip | |
SPIGOT-2427: Fix missed diff in armor damage handling
Diffstat (limited to 'nms-patches')
| -rw-r--r-- | nms-patches/EntityLiving.patch | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/nms-patches/EntityLiving.patch b/nms-patches/EntityLiving.patch index c86e5b26..a6e18d34 100644 --- a/nms-patches/EntityLiving.patch +++ b/nms-patches/EntityLiving.patch @@ -345,17 +345,15 @@ int j = MathHelper.floor(this.locX); int k = MathHelper.floor(this.locY - 0.20000000298023224D); int l = MathHelper.floor(this.locZ); -@@ -972,8 +1122,8 @@ +@@ -972,7 +1122,7 @@ protected float applyArmorModifier(DamageSource damagesource, float f) { if (!damagesource.ignoresArmor()) { - 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) -+ 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 @@ } else { int i; |