SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SPIGOT-2936: Simplify WorldBorder diff

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2016-12-19 23:05:39 +11:00
parent 595c69ab7b
commit 74902a47aa
2 changed files with 7 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
paper-server/nms-patches/WorldBorder.patch
View File

@@ -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) {