diff options
author | md_5 <git@md-5.net> | 2016-06-09 20:42:49 +1000 |
---|---|---|
committer | md_5 <git@md-5.net> | 2016-06-09 20:42:49 +1000 |
commit | 5a55e13868b90c44214542471a7ea9368be371e7 (patch) | |
tree | 828505c0e5aa0a8d48dfe24d040fc66459eee406 | |
parent | b2f31b74d0b455977493e058c2c217bd166aa3cd (diff) | |
download | craftbukkit-5a55e13868b90c44214542471a7ea9368be371e7.tar craftbukkit-5a55e13868b90c44214542471a7ea9368be371e7.tar.gz craftbukkit-5a55e13868b90c44214542471a7ea9368be371e7.tar.lz craftbukkit-5a55e13868b90c44214542471a7ea9368be371e7.tar.xz craftbukkit-5a55e13868b90c44214542471a7ea9368be371e7.zip |
SPIGOT-2365: Missed hanging diff
-rw-r--r-- | nms-patches/EntityHanging.patch | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/nms-patches/EntityHanging.patch b/nms-patches/EntityHanging.patch index 96f9f6ff..0f778848 100644 --- a/nms-patches/EntityHanging.patch +++ b/nms-patches/EntityHanging.patch @@ -12,7 +12,7 @@ public abstract class EntityHanging extends Entity { private static final Predicate<Entity> 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; |