From 41b7bb0b9019c6990dec222c91f1591e4586339f Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Thu, 9 Jun 2016 20:42:49 +1000 Subject: [PATCH] SPIGOT-2365: Missed hanging diff By: md_5 --- paper-server/nms-patches/EntityHanging.patch | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/paper-server/nms-patches/EntityHanging.patch b/paper-server/nms-patches/EntityHanging.patch index 96f9f6ffb7..0f778848ea 100644 --- a/paper-server/nms-patches/EntityHanging.patch +++ b/paper-server/nms-patches/EntityHanging.patch @@ -12,7 +12,7 @@ public abstract class EntityHanging extends Entity { private static final Predicate c = new Predicate() { -@@ -41,39 +46,48 @@ +@@ -41,43 +46,52 @@ this.updateBoundingBox(); } @@ -35,8 +35,8 @@ + double d1 = (double) blockPosition.getY() + 0.5D; + double d2 = (double) blockPosition.getZ() + 0.5D; + double d3 = 0.46875D; -+ double d4 = width; -+ double d5 = height; ++ double d4 = a(width); ++ double d5 = a(height); + + d0 -= (double) direction.getAdjacentX() * 0.46875D; + d2 -= (double) direction.getAdjacentZ() * 0.46875D; @@ -92,6 +92,11 @@ } } +- private double a(int i) { ++ private static double a(int i) { // CraftBukkit - static + return i % 32 == 0 ? 0.5D : 0.0D; + } + @@ -88,6 +102,24 @@ if (this.d++ == 100 && !this.world.isClientSide) { this.d = 0;