summaryrefslogtreecommitdiffstats
path: root/nms-patches
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2016-03-22 14:54:21 +1100
committermd_5 <git@md-5.net>2016-03-22 14:54:21 +1100
commitd4e50bef9d5a2b3258e36162280d3d228048b98c (patch)
treec35334581746054305c62b8ca02fb8083cce9c19 /nms-patches
parent52c7fc0a1ab20d9fdb91dbad0285ab6a6b511079 (diff)
downloadcraftbukkit-d4e50bef9d5a2b3258e36162280d3d228048b98c.tar
craftbukkit-d4e50bef9d5a2b3258e36162280d3d228048b98c.tar.gz
craftbukkit-d4e50bef9d5a2b3258e36162280d3d228048b98c.tar.lz
craftbukkit-d4e50bef9d5a2b3258e36162280d3d228048b98c.tar.xz
craftbukkit-d4e50bef9d5a2b3258e36162280d3d228048b98c.zip
Improve shield damage
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 c9a3e9d5..974563a1 100644
--- a/nms-patches/EntityLiving.patch
+++ b/nms-patches/EntityLiving.patch
@@ -466,8 +466,8 @@
+
+ // Apply blocking code
+ if (event.getDamage(DamageModifier.BLOCKING) < 0) {
++ this.k((float) event.getDamage()); // PAIL: rename
+ if (damagesource.i() instanceof EntityLiving) {// PAIL: rename
-+ this.k(f); // PAIL: rename
+ ((EntityLiving) damagesource.i()).a(EntityLiving.this, 0.5F, EntityLiving.this.locX - damagesource.i().locX, EntityLiving.this.locZ - damagesource.i().locZ);
+ }
+ }