mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-21 18:15:54 +01:00
8c5b837e05
Firstly, the old methods all routed to the CompletableFuture method. However, the CF method could not guarantee that if the caller was off-main that the future would be "completed" on-main. Since the callback methods used the CF one, this meant that the callback methods did not guarantee that the callbacks were to be called on the main thread. Now, all methods route to getChunkAtAsync(x, z, gen, urgent, cb) so that the methods with the callback are guaranteed to invoke the callback on the main thread. The CF behavior remains unchanged; it may still appear to complete on main if invoked off-main. Secondly, remove the scheduleOnMain invocation in the async chunk completion. This unnecessarily delays the callback by 1 tick. Thirdly, add getChunksAtAsync(minX, minZ, maxX, maxZ, ...) which will load chunks within an area. This method is provided as a helper as keeping all chunks loaded within an area can be complicated to implement for plugins (due to the lacking ticket API), and is already implemented internally anyways. Fourthly, remove the ticket addition that occured with getChunkAt and getChunkAtAsync. The ticket addition may delay the unloading of the chunk unnecessarily. It also fixes a very rare timing bug where the future/callback would be completed after the chunk unloads.
44 lines
2.9 KiB
Diff
44 lines
2.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
|
Date: Sun, 18 Jun 2023 23:04:46 -0700
|
|
Subject: [PATCH] Do not read tile entities in chunks that are positioned
|
|
outside of the chunk
|
|
|
|
The tile entities are not accessible and so should not be loaded.
|
|
This can happen as a result of users moving regionfiles around,
|
|
which would cause a crash on Folia but would appear to function
|
|
fine on Paper.
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/SerializableChunkData.java b/src/main/java/net/minecraft/world/level/chunk/storage/SerializableChunkData.java
|
|
index d7a204216332ccbd6bece23bd507be0366ea4d61..b86b3bf713668999a21c4120b1d16c295531b2ad 100644
|
|
--- a/src/main/java/net/minecraft/world/level/chunk/storage/SerializableChunkData.java
|
|
+++ b/src/main/java/net/minecraft/world/level/chunk/storage/SerializableChunkData.java
|
|
@@ -363,6 +363,13 @@ public record SerializableChunkData(Registry<Biome> biomeRegistry, ChunkPos chun
|
|
|
|
while (iterator2.hasNext()) {
|
|
nbttagcompound = (CompoundTag) iterator2.next();
|
|
+ // Paper start - do not read tile entities positioned outside the chunk
|
|
+ final BlockPos blockposition = BlockEntity.getPosFromTag(nbttagcompound);
|
|
+ if ((blockposition.getX() >> 4) != chunkPos.x || (blockposition.getZ() >> 4) != chunkPos.z) {
|
|
+ LOGGER.warn("Tile entity serialized in chunk {} in world '{}' positioned at {} is located outside of the chunk", chunkPos, world.getWorld().getName(), blockposition);
|
|
+ continue;
|
|
+ }
|
|
+ // Paper end - do not read tile entities positioned outside the chunk
|
|
protochunk1.setBlockEntityNbt(nbttagcompound);
|
|
}
|
|
|
|
@@ -616,6 +623,13 @@ public record SerializableChunkData(Registry<Biome> biomeRegistry, ChunkPos chun
|
|
chunk.setBlockEntityNbt(nbttagcompound);
|
|
} else {
|
|
BlockPos blockposition = BlockEntity.getPosFromTag(nbttagcompound);
|
|
+ // Paper start - do not read tile entities positioned outside the chunk
|
|
+ ChunkPos chunkPos = chunk.getPos();
|
|
+ if ((blockposition.getX() >> 4) != chunkPos.x || (blockposition.getZ() >> 4) != chunkPos.z) {
|
|
+ LOGGER.warn("Tile entity serialized in chunk " + chunkPos + " in world '" + world.getWorld().getName() + "' positioned at " + blockposition + " is located outside of the chunk");
|
|
+ continue;
|
|
+ }
|
|
+ // Paper end - do not read tile entities positioned outside the chunk
|
|
BlockEntity tileentity = BlockEntity.loadStatic(blockposition, chunk.getBlockState(blockposition), nbttagcompound, world.registryAccess());
|
|
|
|
if (tileentity != null) {
|