1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-02-12 16:43:27 +01:00

Updated Upstream (Bukkit/CraftBukkit/Spigot)

Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
c9b35cdb PR-684: Make PotionEffectType implement Keyed

CraftBukkit Changes:
c86a3f7a PR-959: Fix World#refreshChunk
af8a8b70 PR-962: Make PotionEffectType implement Keyed

Spigot Changes:
7514aa37 SPIGOT-6806: Add setting to disable new chunks generation under existing chunks
This commit is contained in:
Jake Potrebic 2021-11-27 19:24:49 -08:00
parent 08ac01db8f
commit 8aed88b8db
5 changed files with 13 additions and 4 deletions

View file

@ -216,3 +216,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
return chunks.values().stream().map(ChunkHolder::getFullChunk).filter(Objects::nonNull).map(net.minecraft.world.level.chunk.LevelChunk::getBukkitChunk).toArray(Chunk[]::new);
}
@@ -0,0 +0,0 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public boolean refreshChunk(int x, int z) {
- ChunkHolder playerChunk = this.world.getChunkSource().chunkMap.visibleChunkMap.get(ChunkPos.asLong(x, z));
+ ChunkHolder playerChunk = this.world.getChunkSource().chunkMap.updatingChunks.getVisibleMap().get(ChunkPos.asLong(x, z));
if (playerChunk == null) return false;
playerChunk.getTickingChunkFuture().thenAccept(either -> {

View file

@ -21635,7 +21635,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
synchronized (this.persistentDataLock) { // Paper - Async chunk loading
if (this.legacyStructureHandler == null) {
@@ -0,0 +0,0 @@ public class ChunkStorage implements AutoCloseable {
}
// Spigot end
ChunkStorage.injectDatafixingContext(nbttagcompound, resourcekey, optional);
- nbttagcompound = NbtUtils.update(this.fixerUpper, DataFixTypes.CHUNK, nbttagcompound, Math.max(1493, i));

@ -1 +1 @@
Subproject commit 716b4fce8443809ed39119dbffdd21c04fcea04a
Subproject commit c9b35cdb66761dfbda6f0b860bdb3c2edfda8679

@ -1 +1 @@
Subproject commit 806bb02c177d08d9e2687897487f8e9b767a9ecf
Subproject commit c86a3f7a5877acb5406147923ac48d91c2f6e7d4

@ -1 +1 @@
Subproject commit b7a4222eac8fe8634946023cbba965187f568d07
Subproject commit 7514aa374a331a548a45673de71e557a96125eda