From 64b9c40cd7916ed13718ac6f0a220b9d87dc6aad Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Thu, 22 Dec 2016 15:29:23 -0600 Subject: [PATCH] MC-88491: Fix projectile colliding with shooter In some situations, a projectile made collide with the entity that shot it. This occurs because the game sets the ignored entity incorrectly. Our fix is to ensure that the shooter is the only entity that gets ignored by the projectile. By: Zach Brown --- paper-server/nms-patches/EntityProjectile.patch | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/paper-server/nms-patches/EntityProjectile.patch b/paper-server/nms-patches/EntityProjectile.patch index 17b70ac121..f2c9c7f370 100644 --- a/paper-server/nms-patches/EntityProjectile.patch +++ b/paper-server/nms-patches/EntityProjectile.patch @@ -8,6 +8,15 @@ } protected void i() {} +@@ -127,7 +128,7 @@ + if (entity1.isInteractable()) { + if (entity1 == this.c) { + flag = true; +- } else if (this.shooter != null && this.ticksLived < 2 && this.c == null) { ++ } else if (this.shooter != null && this.ticksLived < 2 && this.c == null && this.shooter == entity1) { // CraftBukkit - MC-88491 + this.c = entity1; + flag = true; + } else { @@ -164,6 +165,11 @@ this.e(movingobjectposition.a()); } else {