summaryrefslogtreecommitdiffstats
path: root/nms-patches
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2017-03-08 14:51:48 +1100
committermd_5 <git@md-5.net>2017-03-08 14:51:48 +1100
commit7a7c64714ece2614f4f50805193aeead2ba18c23 (patch)
tree87676baf3494227046c8d4e13517c77c7d8edf4d /nms-patches
parent7fce67144dd1b610d4c250939f194b04b0f64a9e (diff)
downloadcraftbukkit-7a7c64714ece2614f4f50805193aeead2ba18c23.tar
craftbukkit-7a7c64714ece2614f4f50805193aeead2ba18c23.tar.gz
craftbukkit-7a7c64714ece2614f4f50805193aeead2ba18c23.tar.lz
craftbukkit-7a7c64714ece2614f4f50805193aeead2ba18c23.tar.xz
craftbukkit-7a7c64714ece2614f4f50805193aeead2ba18c23.zip
SPIGOT-3107: Try and improve shield knockback further
Diffstat (limited to 'nms-patches')
-rw-r--r--nms-patches/EntityLiving.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/nms-patches/EntityLiving.patch b/nms-patches/EntityLiving.patch
index 74cbc33f..2b013447 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
}
}