From 7a7c64714ece2614f4f50805193aeead2ba18c23 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Wed, 8 Mar 2017 14:51:48 +1100
Subject: [PATCH] SPIGOT-3107: Try and improve shield knockback further

---
 nms-patches/EntityLiving.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nms-patches/EntityLiving.patch b/nms-patches/EntityLiving.patch
index 74cbc33fa0..2b01344738 100644
--- a/nms-patches/EntityLiving.patch
+++ b/nms-patches/EntityLiving.patch
@@ -529,7 +529,7 @@
 +
 +                return true;
 +            } else {
-+                return originalDamage > 0;
++                return (event.getDamage(DamageModifier.BLOCKING) < 0) ? false : originalDamage > 0;
 +                // CraftBukkit end
              }
          }