SPIGOT-3324: Improve tameable damage handling

By: md_5 <git@md-5.net>
2017-06-24 10:01:46 +10:00
parent d71a1a4036
commit 622d0477c5
4 changed files with 29 additions and 28 deletions
--- a/paper-server/nms-patches/EntityParrot.patch
+++ b/paper-server/nms-patches/EntityParrot.patch
@@ -27,7 +27,17 @@
                     this.c(entityhuman);
                     this.p(true);
                     this.world.broadcastEntityEffect(this, (byte) 7);
-@@ -316,33 +316,35 @@
+@@ -276,7 +276,8 @@
+             return false;
+         } else {
+             if (this.goalSit != null) {
+-                this.goalSit.setSitting(false);
+                // CraftBukkit - moved into EntityLiving.d(DamageSource, float)
+                // this.goalSit.setSitting(false);
+             }
+ 
+             return super.damageEntity(damagesource, f);
+@@ -316,33 +317,35 @@
     }
 
     static {