2022-02-05 20:47:11 +01:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2022-08-01 16:01:20 +02:00
|
|
|
From: Nassim Jahnke <nassim@njahnke.dev>
|
2022-02-05 20:47:11 +01:00
|
|
|
Date: Mon, 31 Jan 2022 11:21:50 +0100
|
|
|
|
Subject: [PATCH] Implement regenerateChunk
|
|
|
|
|
|
|
|
Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
|
|
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
2022-12-15 04:37:16 +01:00
|
|
|
index 2cee0f5a746d37fa5b3fbe0ca3af2632af6f5735..498d8e2782d28db0fd35b737d548c1ffba238177 100644
|
2022-02-05 20:47:11 +01:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
2022-12-07 22:35:34 +01:00
|
|
|
@@ -138,6 +138,7 @@ import org.bukkit.util.Vector;
|
2022-02-05 20:47:11 +01:00
|
|
|
public class CraftWorld extends CraftRegionAccessor implements World {
|
|
|
|
public static final int CUSTOM_DIMENSION_OFFSET = 10;
|
2022-02-15 11:30:58 +01:00
|
|
|
private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry();
|
2022-02-05 20:47:11 +01:00
|
|
|
+ private static final ChunkStatus[] REGEN_CHUNK_STATUSES = {ChunkStatus.BIOMES, ChunkStatus.NOISE, ChunkStatus.SURFACE, ChunkStatus.CARVERS, ChunkStatus.LIQUID_CARVERS, ChunkStatus.FEATURES}; // Paper - implement regenerate chunk method
|
|
|
|
|
|
|
|
private final ServerLevel world;
|
|
|
|
private WorldBorder worldBorder;
|
2022-12-07 22:35:34 +01:00
|
|
|
@@ -418,27 +419,62 @@ public class CraftWorld extends CraftRegionAccessor implements World {
|
2022-02-05 20:47:11 +01:00
|
|
|
@Override
|
|
|
|
public boolean regenerateChunk(int x, int z) {
|
|
|
|
org.spigotmc.AsyncCatcher.catchOp("chunk regenerate"); // Spigot
|
|
|
|
- throw new UnsupportedOperationException("Not supported in this Minecraft version! Unless you can fix it, this is not a bug :)");
|
|
|
|
- /*
|
|
|
|
- if (!unloadChunk0(x, z, false)) {
|
|
|
|
- return false;
|
2022-07-04 16:38:06 +02:00
|
|
|
- }
|
|
|
|
-
|
|
|
|
- final long chunkKey = ChunkCoordIntPair.pair(x, z);
|
|
|
|
- world.getChunkProvider().unloadQueue.remove(chunkKey);
|
2022-02-05 20:47:11 +01:00
|
|
|
+ // Paper start - implement regenerateChunk method
|
|
|
|
+ final ServerLevel serverLevel = this.world;
|
|
|
|
+ final net.minecraft.server.level.ServerChunkCache serverChunkCache = serverLevel.getChunkSource();
|
|
|
|
+ final ChunkPos chunkPos = new ChunkPos(x, z);
|
|
|
|
+ final net.minecraft.world.level.chunk.LevelChunk levelChunk = serverChunkCache.getChunk(chunkPos.x, chunkPos.z, true);
|
|
|
|
+ for (final BlockPos blockPos : BlockPos.betweenClosed(chunkPos.getMinBlockX(), serverLevel.getMinBuildHeight(), chunkPos.getMinBlockZ(), chunkPos.getMaxBlockX(), serverLevel.getMaxBuildHeight() - 1, chunkPos.getMaxBlockZ())) {
|
|
|
|
+ levelChunk.removeBlockEntity(blockPos);
|
2022-02-12 14:20:33 +01:00
|
|
|
+ serverLevel.setBlock(blockPos, net.minecraft.world.level.block.Blocks.AIR.defaultBlockState(), 16);
|
2022-07-04 16:38:06 +02:00
|
|
|
+ }
|
|
|
|
+
|
2022-02-05 20:47:11 +01:00
|
|
|
+ for (final ChunkStatus chunkStatus : REGEN_CHUNK_STATUSES) {
|
|
|
|
+ final List<ChunkAccess> list = new ArrayList<>();
|
|
|
|
+ final int range = Math.max(1, chunkStatus.getRange());
|
|
|
|
+ for (int chunkX = chunkPos.z - range; chunkX <= chunkPos.z + range; chunkX++) {
|
|
|
|
+ for (int chunkZ = chunkPos.x - range; chunkZ <= chunkPos.x + range; chunkZ++) {
|
|
|
|
+ ChunkAccess chunkAccess = serverChunkCache.getChunk(chunkZ, chunkX, chunkStatus.getParent(), true);
|
|
|
|
+ if (chunkAccess instanceof ImposterProtoChunk accessProtoChunk) {
|
|
|
|
+ chunkAccess = new ImposterProtoChunk(accessProtoChunk.getWrapped(), true);
|
|
|
|
+ } else if (chunkAccess instanceof net.minecraft.world.level.chunk.LevelChunk accessLevelChunk) {
|
|
|
|
+ chunkAccess = new ImposterProtoChunk(accessLevelChunk, true);
|
|
|
|
+ }
|
|
|
|
+ list.add(chunkAccess);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
|
|
|
|
- net.minecraft.server.Chunk chunk = world.getChunkProvider().generateChunk(x, z);
|
|
|
|
- PlayerChunk playerChunk = world.getPlayerChunkMap().getChunk(x, z);
|
|
|
|
- if (playerChunk != null) {
|
|
|
|
- playerChunk.chunk = chunk;
|
2022-07-24 22:11:35 +02:00
|
|
|
+ final java.util.concurrent.CompletableFuture<com.mojang.datafixers.util.Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>> future = chunkStatus.generate(
|
2022-02-05 20:47:11 +01:00
|
|
|
+ Runnable::run,
|
|
|
|
+ serverLevel,
|
|
|
|
+ serverChunkCache.getGenerator(),
|
|
|
|
+ serverLevel.getStructureManager(),
|
|
|
|
+ serverChunkCache.getLightEngine(),
|
|
|
|
+ chunk -> {
|
|
|
|
+ throw new UnsupportedOperationException("Not creating full chunks here");
|
|
|
|
+ },
|
|
|
|
+ list,
|
|
|
|
+ true
|
2022-07-24 22:11:35 +02:00
|
|
|
+ );
|
|
|
|
+ serverChunkCache.mainThreadProcessor.managedBlock(future::isDone);
|
2022-02-05 20:47:11 +01:00
|
|
|
+ if (chunkStatus == ChunkStatus.NOISE) {
|
2022-07-24 22:11:35 +02:00
|
|
|
+ future.join().left().ifPresent(chunk -> net.minecraft.world.level.levelgen.Heightmap.primeHeightmaps(chunk, ChunkStatus.POST_FEATURES));
|
2022-02-05 20:47:11 +01:00
|
|
|
+ }
|
|
|
|
}
|
|
|
|
|
|
|
|
- if (chunk != null) {
|
|
|
|
- refreshChunk(x, z);
|
|
|
|
+ for (final BlockPos blockPos : BlockPos.betweenClosed(chunkPos.getMinBlockX(), serverLevel.getMinBuildHeight(), chunkPos.getMinBlockZ(), chunkPos.getMaxBlockX(), serverLevel.getMaxBuildHeight() - 1, chunkPos.getMaxBlockZ())) {
|
|
|
|
+ serverChunkCache.blockChanged(blockPos);
|
|
|
|
}
|
|
|
|
|
|
|
|
- return chunk != null;
|
|
|
|
- */
|
|
|
|
+ final Set<ChunkPos> chunksToRelight = new HashSet<>(9);
|
|
|
|
+ for (int chunkX = chunkPos.x - 1; chunkX <= chunkPos.x + 1 ; chunkX++) {
|
|
|
|
+ for (int chunkZ = chunkPos.z - 1; chunkZ <= chunkPos.z + 1 ; chunkZ++) {
|
|
|
|
+ chunksToRelight.add(new ChunkPos(chunkX, chunkZ));
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ serverChunkCache.getLightEngine().relight(chunksToRelight, pos -> {}, relit -> {});
|
|
|
|
+ return true;
|
|
|
|
+ // Paper end
|
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|