Update to Minecraft 1.14.3-pre4

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-06-21 20:00:00 +10:00
parent 0297d9de8a
commit a8155d2399
109 changed files with 660 additions and 622 deletions

View File

@@ -25,7 +25,7 @@
public CompletableFuture<Either<IChunkAccess, PlayerChunk.Failure>> getStatusFutureUnchecked(ChunkStatus chunkstatus) {
CompletableFuture<Either<IChunkAccess, PlayerChunk.Failure>> completablefuture = (CompletableFuture) this.statusFutures.get(chunkstatus.c());
@@ -72,9 +81,9 @@
@@ -76,9 +85,9 @@
@Nullable
public Chunk getChunk() {
CompletableFuture<Either<Chunk, PlayerChunk.Failure>> completablefuture = this.a();
@@ -37,7 +37,7 @@
}
public CompletableFuture<IChunkAccess> getChunkSave() {
@@ -197,7 +206,7 @@
@@ -201,7 +210,7 @@
CompletableFuture<Either<IChunkAccess, PlayerChunk.Failure>> completablefuture = (CompletableFuture) this.statusFutures.get(i);
if (completablefuture != null) {
@@ -46,7 +46,7 @@
if (either == null || either.left().isPresent()) {
return completablefuture;
@@ -252,6 +261,21 @@
@@ -256,6 +265,21 @@
boolean flag1 = this.ticketLevel <= PlayerChunkMap.GOLDEN_TICKET;
PlayerChunk.State playerchunk_state = getChunkState(this.oldTicketLevel);
PlayerChunk.State playerchunk_state1 = getChunkState(this.ticketLevel);
@@ -68,7 +68,7 @@
CompletableFuture completablefuture;
if (flag) {
@@ -283,7 +307,7 @@
@@ -287,7 +311,7 @@
if (flag2 && !flag3) {
completablefuture = this.fullChunkFuture;
this.fullChunkFuture = PlayerChunk.UNLOADED_CHUNK_FUTURE;
@@ -77,9 +77,9 @@
playerchunkmap.getClass();
return either1.ifLeft(playerchunkmap::a);
}));
@@ -321,6 +345,17 @@
@@ -325,6 +349,17 @@
this.w.a(this.location, this::j, this.ticketLevel, this::d);
this.w.a(this.location, this::k, this.ticketLevel, this::d);
this.oldTicketLevel = this.ticketLevel;
+ // CraftBukkit start
+ // ChunkLoadEvent: Called after the chunk is loaded: isChunkLoaded returns true and chunk is ready to be modified by plugins.