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

Update to Minecraft 1.8.3

Browse Source 
By: Thinkofdeath <thinkofdeath@spigotmc.org>
This commit is contained in:
CraftBukkit/Spigot
2015-02-26 22:41:06 +00:00
parent d789ce91d4
commit 85be409b13
347 changed files with 5027 additions and 5465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
--- ../work/decompile-8eb82bde/net/minecraft/server/WorldBorder.java 2014-12-10 19:16:20.872465385 +0000
+++ src/main/java/net/minecraft/server/WorldBorder.java 2014-12-10 19:11:46.664468361 +0000
--- /home/matt/mc-dev-private//net/minecraft/server/WorldBorder.java 2015-02-26 22:40:23.179608133 +0000
+++ src/main/java/net/minecraft/server/WorldBorder.java 2015-02-26 22:40:23.183608133 +0000
@@ -18,6 +18,7 @@
private double j;
private int k;
@@ -8,7 +8,7 @@
public WorldBorder() {
this.e = this.d;
@@ -32,9 +33,21 @@
@@ -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();
}
@@ -16,22 +16,20 @@
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();
+ }
+ // CraftBukkit end
}
public boolean a(AxisAlignedBB axisalignedbb) {
return axisalignedbb.d > this.b() && axisalignedbb.a < this.d() && axisalignedbb.f > this.c() && axisalignedbb.c < this.e();
@@ -177,6 +190,7 @@
@@ -177,6 +189,7 @@
}
public void a(IWorldBorderListener iworldborderlistener) {