twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-21 15:23:50 -07:00
Code Issues Packages Projects Releases Wiki Activity

Mappings Update

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2018-12-26 08:00:00 +11:00
parent 239b2828db
commit d7e312278d
120 changed files with 878 additions and 1619 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
paper-server/nms-patches/PlayerChunkMap.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/server/PlayerChunkMap.java
+++ b/net/minecraft/server/PlayerChunkMap.java
@@ -15,6 +15,10 @@
@@ -13,6 +13,10 @@
import java.util.function.Predicate;
import javax.annotation.Nullable;
@@ -11,7 +11,7 @@
public class PlayerChunkMap {
private static final Predicate<EntityPlayer> a = (entityplayer) -> {
@@ -34,6 +38,7 @@
@@ -32,6 +36,7 @@
private long k;
private boolean l = true;
private boolean m = true;
@@ -19,30 +19,7 @@
public PlayerChunkMap(WorldServer worldserver) {
this.world = worldserver;
@@ -103,16 +108,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()) {
@@ -137,7 +144,11 @@
@@ -135,7 +140,11 @@
break;
}
}
@@ -54,7 +31,7 @@
}
}
@@ -199,6 +210,16 @@
@@ -197,6 +206,16 @@
return playerchunk;
}
@@ -71,7 +48,7 @@
public void flagDirty(BlockPosition blockposition) {
int i = blockposition.getX() >> 4;
int j = blockposition.getZ() >> 4;
@@ -217,12 +238,22 @@
@@ -215,12 +234,22 @@
entityplayer.d = entityplayer.locX;
entityplayer.e = entityplayer.locZ;
@@ -95,7 +72,7 @@
this.managedPlayers.add(entityplayer);
this.e();
}
@@ -266,11 +297,14 @@
@@ -264,11 +293,14 @@
int j1 = i - k;
int k1 = j - l;
@@ -111,7 +88,7 @@
}
if (!this.a(l1 - j1, i2 - k1, i, j, i1)) {
@@ -286,6 +320,13 @@
@@ -284,6 +316,13 @@
entityplayer.d = entityplayer.locX;
entityplayer.e = entityplayer.locZ;
this.e();
@@ -125,7 +102,7 @@
}
}
}
@@ -370,4 +411,47 @@
@@ -368,4 +407,47 @@
}
}