From a625e4567d990a3d48fbce41ddd575f09ecb4d58 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 10 Jul 2016 12:02:18 +1000
Subject: [PATCH] SPIGOT-2427: Fix missed diff in armor damage handling

---
 nms-patches/EntityLiving.patch | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/nms-patches/EntityLiving.patch b/nms-patches/EntityLiving.patch
index c86e5b26be..a6e18d34e7 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;