summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2016-11-19 14:53:19 +1100
committermd_5 <git@md-5.net>2016-11-19 14:53:19 +1100
commitead445ec995e66378957ed400f1b4c698febfb9f (patch)
tree96dd24a26e52187b07e536f946c355b15a7e6909
parent7564d602419f10af5c1b5b1758eb0455250ea169 (diff)
downloadcraftbukkit-ead445ec995e66378957ed400f1b4c698febfb9f.tar
craftbukkit-ead445ec995e66378957ed400f1b4c698febfb9f.tar.gz
craftbukkit-ead445ec995e66378957ed400f1b4c698febfb9f.tar.lz
craftbukkit-ead445ec995e66378957ed400f1b4c698febfb9f.tar.xz
craftbukkit-ead445ec995e66378957ed400f1b4c698febfb9f.zip
Attempt to sync damage up again - golden apples this time
-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 de88d637..1d219271 100644
--- a/nms-patches/EntityLiving.patch
+++ b/nms-patches/EntityLiving.patch
@@ -513,7 +513,7 @@
+
+ return true;
+ } else {
-+ return event.getDamage(DamageModifier.BLOCKING) < 0;
++ return originalDamage > 0;
+ // CraftBukkit end
}
}