mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update to Minecraft 1.14.3-pre4

Browse source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot 2019-06-21 20:00:00 +10:00
commit a8155d2399
109 changed files with 660 additions and 622 deletions
Download patch file Download diff file Expand all files Collapse all files

40
paper-server/nms-patches/PlayerChunkMap.patch
View file

@ -1,6 +1,6 @@
--- a/net/minecraft/server/PlayerChunkMap.java
+++ b/net/minecraft/server/PlayerChunkMap.java
@@ -38,6 +38,7 @@
@@ -37,6 +37,7 @@
import org.apache.commons.lang3.mutable.MutableBoolean;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@ -8,7 +8,7 @@
public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -186,9 +187,12 @@
@@ -184,9 +185,12 @@
return completablefuture1.thenApply((list1) -> {
List<IChunkAccess> list2 = Lists.newArrayList();
@ -23,7 +23,7 @@
final Either<IChunkAccess, PlayerChunk.Failure> either = (Either) iterator.next();
Optional<IChunkAccess> optional = either.left();
@@ -286,7 +290,7 @@
@@ -284,7 +288,7 @@
PlayerChunkMap.LOGGER.info("ThreadedAnvilChunkStorage ({}): All chunks are saved", this.x.getName());
} else {
this.visibleChunks.values().stream().filter(PlayerChunk::hasBeenLoaded).forEach((playerchunk) -> {
@ -32,7 +32,7 @@
if (ichunkaccess instanceof ProtoChunkExtension || ichunkaccess instanceof Chunk) {
this.saveChunk(ichunkaccess);
@@ -297,7 +301,6 @@
@@ -295,7 +299,6 @@
}
}
@ -40,7 +40,7 @@
protected void unloadChunks(BooleanSupplier booleansupplier) {
GameProfilerFiller gameprofilerfiller = this.world.getMethodProfiler();
@@ -336,7 +339,7 @@
@@ -334,7 +337,7 @@
private void a(long i, PlayerChunk playerchunk) {
CompletableFuture<IChunkAccess> completablefuture = playerchunk.getChunkSave();
@ -49,7 +49,7 @@
CompletableFuture<IChunkAccess> completablefuture1 = playerchunk.getChunkSave();
if (completablefuture1 != completablefuture) {
@@ -485,7 +488,7 @@
@@ -483,7 +486,7 @@
return CompletableFuture.completedFuture(Either.right(playerchunk_failure));
});
}, (runnable) -> {
@ -58,8 +58,8 @@
});
}
@@ -566,7 +569,7 @@
long i = playerchunk.h().pair();
@@ -564,7 +567,7 @@
long i = playerchunk.i().pair();
playerchunk.getClass();
- mailbox.a((Object) ChunkTaskQueueSorter.a(runnable, i, playerchunk::getTicketLevel));
@ -67,7 +67,7 @@
});
}
@@ -583,7 +586,7 @@
@@ -581,7 +584,7 @@
return Either.left(chunk);
});
}, (runnable) -> {
@ -76,7 +76,7 @@
});
completablefuture1.thenAcceptAsync((either) -> {
@@ -597,7 +600,7 @@
@@ -595,7 +598,7 @@
return Either.left(chunk);
});
}, (runnable) -> {
@ -85,7 +85,7 @@
});
return completablefuture1;
}
@@ -611,7 +614,7 @@
@@ -609,7 +612,7 @@
return chunk;
});
}, (runnable) -> {
@ -94,19 +94,7 @@
});
}
@@ -675,9 +678,10 @@
ChunkCoordIntPair chunkcoordintpair = playerchunk.h();
Packet<?>[] apacket = new Packet[2];
+ int finall = l; // CraftBukkit - decompile error
this.a(chunkcoordintpair, false).forEach((entityplayer) -> {
int i1 = b(chunkcoordintpair, entityplayer, true);
- boolean flag = i1 <= l;
+ boolean flag = i1 <= finall; // CraftBukkit - decompile error
boolean flag1 = i1 <= this.viewDistance;
this.sendChunk(entityplayer, chunkcoordintpair, apacket, flag, flag1);
@@ -732,7 +736,7 @@
@@ -724,7 +727,7 @@
private NBTTagCompound readChunkData(ChunkCoordIntPair chunkcoordintpair) throws IOException {
NBTTagCompound nbttagcompound = this.read(chunkcoordintpair);
@ -115,7 +103,7 @@
}
boolean isOutsideOfRange(ChunkCoordIntPair chunkcoordintpair) {
@@ -1052,7 +1056,7 @@
@@ -1056,7 +1059,7 @@
public final Set<EntityPlayer> trackedPlayers = Sets.newHashSet();
public EntityTracker(Entity entity, int i, int j, boolean flag) {
@ -124,7 +112,7 @@
this.tracker = entity;
this.trackingDistance = i;
this.e = SectionPosition.a(entity);
@@ -1121,6 +1125,17 @@
@@ -1125,6 +1128,17 @@
}
}