diff options
| author | Zach Brown <zach.brown@destroystokyo.com> | 2016-12-22 15:29:23 -0600 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2016-12-23 16:41:54 +1100 |
| commit | 622add8458dd64352005fdf067bbef18e0bd0f99 (patch) | |
| tree | 4d73a8e4438b61310636e7341fcb75dc1ab825e6 /nms-patches | |
| parent | e232e1519ef096a2a3e28f312f7f27f6216386a1 (diff) | |
| download | craftbukkit-622add8458dd64352005fdf067bbef18e0bd0f99.tar craftbukkit-622add8458dd64352005fdf067bbef18e0bd0f99.tar.gz craftbukkit-622add8458dd64352005fdf067bbef18e0bd0f99.tar.lz craftbukkit-622add8458dd64352005fdf067bbef18e0bd0f99.tar.xz craftbukkit-622add8458dd64352005fdf067bbef18e0bd0f99.zip | |
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.
Diffstat (limited to 'nms-patches')
| -rw-r--r-- | nms-patches/EntityProjectile.patch | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/nms-patches/EntityProjectile.patch b/nms-patches/EntityProjectile.patch index 17b70ac1..f2c9c7f3 100644 --- a/nms-patches/EntityProjectile.patch +++ b/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 { |