diff options
| author | md_5 <git@md-5.net> | 2016-12-19 23:05:39 +1100 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2016-12-19 23:05:39 +1100 |
| commit | c8ff65136f23a3c2770b8d9ca508f61927f8acba (patch) | |
| tree | 3aec004e9a5fe6b7309d56031dca456a71f09b4a /nms-patches/WorldBorder.patch | |
| parent | 4602331b1dfe3699e054bcde8b8bd5670eb1046b (diff) | |
| download | craftbukkit-c8ff65136f23a3c2770b8d9ca508f61927f8acba.tar craftbukkit-c8ff65136f23a3c2770b8d9ca508f61927f8acba.tar.gz craftbukkit-c8ff65136f23a3c2770b8d9ca508f61927f8acba.tar.lz craftbukkit-c8ff65136f23a3c2770b8d9ca508f61927f8acba.tar.xz craftbukkit-c8ff65136f23a3c2770b8d9ca508f61927f8acba.zip | |
SPIGOT-2936: Simplify WorldBorder diff
Diffstat (limited to 'nms-patches/WorldBorder.patch')
| -rw-r--r-- | nms-patches/WorldBorder.patch | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/nms-patches/WorldBorder.patch b/nms-patches/WorldBorder.patch index d40f879b..8577053c 100644 --- a/nms-patches/WorldBorder.patch +++ b/nms-patches/WorldBorder.patch @@ -8,28 +8,7 @@ public WorldBorder() { this.e = this.d; -@@ -32,8 +33,19 @@ - return (double) (blockposition.getX() + 1) > this.b() && (double) blockposition.getX() < this.d() && (double) (blockposition.getZ() + 1) > this.c() && (double) blockposition.getZ() < this.e(); - } - -+ // CraftBukkit start - split method - public boolean isInBounds(ChunkCoordIntPair chunkcoordintpair) { -- return (double) chunkcoordintpair.e() > this.b() && (double) chunkcoordintpair.c() < this.d() && (double) chunkcoordintpair.f() > this.c() && (double) chunkcoordintpair.d() < this.e(); -+ return isInBounds(chunkcoordintpair.x, chunkcoordintpair.z); -+ } -+ -+ // Inlined the getters from ChunkCoordIntPair -+ public boolean isInBounds(long chunkcoords) { -+ return isInBounds(org.bukkit.craftbukkit.util.LongHash.msw(chunkcoords), org.bukkit.craftbukkit.util.LongHash.lsw(chunkcoords)); -+ } -+ -+ // Inlined the getters from ChunkCoordIntPair -+ public boolean isInBounds(int x, int z) { -+ return (double) ((x << 4) + 15) > this.b() && (double) (x << 4) < this.d() && (double) ((z << 4) + 15) > this.c() && (double) (x << 4) < this.e(); - } - - public boolean a(AxisAlignedBB axisalignedbb) { -@@ -177,6 +189,7 @@ +@@ -177,6 +178,7 @@ } public void a(IWorldBorderListener iworldborderlistener) { |