twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-05 22:52:13 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update to Minecraft 1.13-pre7

Browse Source
This commit is contained in:
md_5
2018-07-15 10:00:00 +10:00
parent 57ab4cfc6f
commit 421c1728c8
608 changed files with 17788 additions and 9378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
nms-patches/PlayerChunkMap.patch
View File

@@ -1,7 +1,7 @@
--- a/net/minecraft/server/PlayerChunkMap.java
+++ b/net/minecraft/server/PlayerChunkMap.java
@@ -15,6 +15,10 @@
import java.util.Set;
import java.util.function.Predicate;
import javax.annotation.Nullable;
+// CraftBukkit start
@@ -10,8 +10,8 @@
+
public class PlayerChunkMap {
private static final Predicate<EntityPlayer> a = new Predicate() {
@@ -46,6 +50,7 @@
private static final Predicate<EntityPlayer> a = (entityplayer) -> {
@@ -34,6 +38,7 @@
private long k;
private boolean l = true;
private boolean m = true;
@@ -19,7 +19,30 @@
public PlayerChunkMap(WorldServer worldserver) {
this.world = worldserver;
@@ -169,7 +174,11 @@
@@ -107,16 +112,18 @@
if (this.l && i % 4L == 0L) {
this.l = false;
- Collections.sort(this.h, (playerchunk, playerchunk1) -> {
- return ComparisonChain.start().compare(playerchunk.g(), playerchunk1.g()).result();
+ // CraftBukkit start
+ Collections.sort(this.h, (playerchunkx, playerchunk1x) -> {
+ return ComparisonChain.start().compare(playerchunkx.g(), playerchunk1x.g()).result();
});
}
if (this.m && i % 4L == 2L) {
this.m = false;
- Collections.sort(this.g, (playerchunk, playerchunk1) -> {
- return ComparisonChain.start().compare(playerchunk.g(), playerchunk1.g()).result();
+ Collections.sort(this.g, (playerchunkx, playerchunk1x) -> {
+ return ComparisonChain.start().compare(playerchunkx.g(), playerchunk1x.g()).result();
});
+ // CraftBukkit end
}
if (!this.h.isEmpty()) {
@@ -141,7 +148,11 @@
break;
}
}
@@ -31,7 +54,7 @@
}
}
@@ -231,6 +240,16 @@
@@ -203,6 +214,16 @@
return playerchunk;
}
@@ -48,7 +71,7 @@
public void flagDirty(BlockPosition blockposition) {
int i = blockposition.getX() >> 4;
int j = blockposition.getZ() >> 4;
@@ -249,12 +268,22 @@
@@ -221,12 +242,22 @@
entityplayer.d = entityplayer.locX;
entityplayer.e = entityplayer.locZ;
@@ -72,7 +95,7 @@
this.managedPlayers.add(entityplayer);
this.e();
}
@@ -298,11 +327,14 @@
@@ -270,11 +301,14 @@
int j1 = i - k;
int k1 = j - l;
@@ -88,7 +111,7 @@
}
if (!this.a(l1 - j1, i2 - k1, i, j, i1)) {
@@ -318,6 +350,13 @@
@@ -290,6 +324,13 @@
entityplayer.d = entityplayer.locX;
entityplayer.e = entityplayer.locZ;
this.e();
@@ -102,7 +125,7 @@
}
}
}
@@ -402,4 +441,47 @@
@@ -374,4 +415,47 @@
}
}