Skip to content

Commit 0cc2503

Browse files
kennytvjpenilla
kennytv
and
jpenilla
authored
Implement World#regenerateChunk (#7425)
Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
1 parent 6df4641 commit 0cc2503

File tree

3 files changed

+170
-3
lines changed

3 files changed

+170
-3
lines changed

‎patches/api/0365-Implement-regenerateChunk.patch‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Nassim Jahnke <jahnke.nassim@gmail.com>
3+
Date: Sat, 5 Feb 2022 20:25:28 +0100
4+
Subject: [PATCH] Implement regenerateChunk
5+
6+
7+
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
8+
index c808cc8dc96e325c543391048414880ed18a3ed3..7d2873a924ee81411a2a00bace0f58403fec43ea 100644
9+
--- a/src/main/java/org/bukkit/World.java
10+
+++ b/src/main/java/org/bukkit/World.java
11+
@@ -505,8 +505,8 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
12+
* @return Whether the chunk was actually regenerated
13+
*
14+
* @deprecated regenerating a single chunk is not likely to produce the same
15+
- * chunk as before as terrain decoration may be spread across chunks. Use of
16+
- * this method should be avoided as it is known to produce buggy results.
17+
+ * chunk as before as terrain decoration may be spread across chunks. It may
18+
+ * or may not change blocks in the adjacent chunks as well.
19+
*/
20+
@Deprecated
21+
public boolean regenerateChunk(int x, int z);

‎patches/server/0825-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch‎

Lines changed: 52 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,50 @@ Subject: [PATCH] Only write chunk data to disk if it serializes without
77
This ensures at least a valid version of the chunk exists
88
on disk, even if outdated
99

10+
diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
11+
index 950efcc80455f73ec8ca4e991fcf9a5b2b7fa22e..012909055f4def2330e2fa839a98ff8bb41ea604 100644
12+
--- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
13+
+++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
14+
@@ -1020,6 +1020,24 @@ public class RegionFile implements AutoCloseable {
15+
this.pos = chunkcoordintpair;
16+
}
17+
18+
+ // Paper start - don't write garbage data to disk if writing serialization fails
19+
+ @Override
20+
+ public void write(final int b) {
21+
+ if (this.count > 500_000_000) {
22+
+ throw new RegionFileStorage.RegionFileSizeException("Region file too large: " + this.count);
23+
+ }
24+
+ super.write(b);
25+
+ }
26+
+
27+
+ @Override
28+
+ public void write(final byte[] b, final int off, final int len) {
29+
+ if (this.count + len > 500_000_000) {
30+
+ throw new RegionFileStorage.RegionFileSizeException("Region file too large: " + (this.count + len));
31+
+ }
32+
+ super.write(b, off, len);
33+
+ }
34+
+ // Paper end
35+
+
36+
public void close() throws IOException {
37+
ByteBuffer bytebuffer = ByteBuffer.wrap(this.buf, 0, this.count);
38+
1039
diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
11-
index 2dde10324e515bd58fc6ba7e93156ae783492cc2..c7216cf3317cbd49b032c44feb370c50928dd21e 100644
40+
index 9f6c1de59ca011bd1203499f325fdfa305e215ce..4502362ff3c43eac489125deee59c66d76204e98 100644
1241
--- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
1342
+++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
14-
@@ -298,10 +298,11 @@ public class RegionFileStorage implements AutoCloseable {
43+
@@ -298,10 +298,17 @@ public class RegionFileStorage implements AutoCloseable {
1544
NbtIo.write(nbt, (DataOutput) dataoutputstream);
1645
regionfile.setStatus(pos.x, pos.z, ChunkSerializer.getStatus(nbt)); // Paper - cache status on disk
1746
regionfile.setOversized(pos.x, pos.z, false); // Paper - We don't do this anymore, mojang stores differently, but clear old meta flag if it exists to get rid of our own meta file once last oversized is gone
1847
+ dataoutputstream.close(); // Paper - only write if successful
48+
+ // Paper start - don't write garbage data to disk if writing serialization fails
49+
+ } catch (RegionFileSizeException e) {
50+
+ attempts = 5; // Don't retry
51+
+ regionfile.clear(pos);
52+
+ throw e;
53+
+ // Paper end - don't write garbage data to disk if writing serialization fails
1954
} catch (Throwable throwable) {
2055
if (dataoutputstream != null) {
2156
try {
@@ -24,7 +59,7 @@ index 2dde10324e515bd58fc6ba7e93156ae783492cc2..c7216cf3317cbd49b032c44feb370c50
2459
} catch (Throwable throwable1) {
2560
throwable.addSuppressed(throwable1);
2661
}
27-
@@ -309,10 +310,7 @@ public class RegionFileStorage implements AutoCloseable {
62+
@@ -309,10 +316,7 @@ public class RegionFileStorage implements AutoCloseable {
2863

2964
throw throwable;
3065
}
@@ -36,3 +71,17 @@ index 2dde10324e515bd58fc6ba7e93156ae783492cc2..c7216cf3317cbd49b032c44feb370c50
3671
}
3772

3873
// Paper start
74+
@@ -359,4 +363,13 @@ public class RegionFileStorage implements AutoCloseable {
75+
}
76+
77+
}
78+
+
79+
+ // Paper start
80+
+ public static final class RegionFileSizeException extends RuntimeException {
81+
+
82+
+ public RegionFileSizeException(String message) {
83+
+ super(message);
84+
+ }
85+
+ }
86+
+ // Paper end
87+
}

‎patches/server/0862-Implement-regenerateChunk.patch‎

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Nassim Jahnke <jahnke.nassim@gmail.com>
3+
Date: Mon, 31 Jan 2022 11:21:50 +0100
4+
Subject: [PATCH] Implement regenerateChunk
5+
6+
Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
7+
8+
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
9+
index 5fb475b3ccaa98861e2c817b37cd1740e5bfed8d..f2deb875992ad2d5c9dbcfe9ee7071a773fed684 100644
10+
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
11+
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
12+
@@ -121,6 +121,7 @@ import org.bukkit.util.Vector;
13+
14+
public class CraftWorld extends CraftRegionAccessor implements World {
15+
public static final int CUSTOM_DIMENSION_OFFSET = 10;
16+
+ 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
17+
18+
private final ServerLevel world;
19+
private WorldBorder worldBorder;
20+
@@ -435,27 +436,61 @@ public class CraftWorld extends CraftRegionAccessor implements World {
21+
@Override
22+
public boolean regenerateChunk(int x, int z) {
23+
org.spigotmc.AsyncCatcher.catchOp("chunk regenerate"); // Spigot
24+
- throw new UnsupportedOperationException("Not supported in this Minecraft version! Unless you can fix it, this is not a bug :)");
25+
- /*
26+
- if (!unloadChunk0(x, z, false)) {
27+
- return false;
28+
- }
29+
-
30+
- final long chunkKey = ChunkCoordIntPair.pair(x, z);
31+
- world.getChunkProvider().unloadQueue.remove(chunkKey);
32+
+ // Paper start - implement regenerateChunk method
33+
+ final ServerLevel serverLevel = this.world;
34+
+ final net.minecraft.server.level.ServerChunkCache serverChunkCache = serverLevel.getChunkSource();
35+
+ final ChunkPos chunkPos = new ChunkPos(x, z);
36+
+ final net.minecraft.world.level.chunk.LevelChunk levelChunk = serverChunkCache.getChunk(chunkPos.x, chunkPos.z, true);
37+
+ for (final BlockPos blockPos : BlockPos.betweenClosed(chunkPos.getMinBlockX(), serverLevel.getMinBuildHeight(), chunkPos.getMinBlockZ(), chunkPos.getMaxBlockX(), serverLevel.getMaxBuildHeight() - 1, chunkPos.getMaxBlockZ())) {
38+
+ levelChunk.removeBlockEntity(blockPos);
39+
+ serverLevel.setBlock(blockPos, Blocks.AIR.defaultBlockState(), 16);
40+
+ }
41+
+
42+
+ for (final ChunkStatus chunkStatus : REGEN_CHUNK_STATUSES) {
43+
+ final List<ChunkAccess> list = new ArrayList<>();
44+
+ final int range = Math.max(1, chunkStatus.getRange());
45+
+ for (int chunkX = chunkPos.z - range; chunkX <= chunkPos.z + range; chunkX++) {
46+
+ for (int chunkZ = chunkPos.x - range; chunkZ <= chunkPos.x + range; chunkZ++) {
47+
+ ChunkAccess chunkAccess = serverChunkCache.getChunk(chunkZ, chunkX, chunkStatus.getParent(), true);
48+
+ if (chunkAccess instanceof ImposterProtoChunk accessProtoChunk) {
49+
+ chunkAccess = new ImposterProtoChunk(accessProtoChunk.getWrapped(), true);
50+
+ } else if (chunkAccess instanceof net.minecraft.world.level.chunk.LevelChunk accessLevelChunk) {
51+
+ chunkAccess = new ImposterProtoChunk(accessLevelChunk, true);
52+
+ }
53+
+ list.add(chunkAccess);
54+
+ }
55+
+ }
56+
57+
- net.minecraft.server.Chunk chunk = world.getChunkProvider().generateChunk(x, z);
58+
- PlayerChunk playerChunk = world.getPlayerChunkMap().getChunk(x, z);
59+
- if (playerChunk != null) {
60+
- playerChunk.chunk = chunk;
61+
+ final com.mojang.datafixers.util.Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure> either = chunkStatus.generate(
62+
+ Runnable::run,
63+
+ serverLevel,
64+
+ serverChunkCache.getGenerator(),
65+
+ serverLevel.getStructureManager(),
66+
+ serverChunkCache.getLightEngine(),
67+
+ chunk -> {
68+
+ throw new UnsupportedOperationException("Not creating full chunks here");
69+
+ },
70+
+ list,
71+
+ true
72+
+ ).join();
73+
+ if (chunkStatus == ChunkStatus.NOISE) {
74+
+ either.left().ifPresent(chunk -> net.minecraft.world.level.levelgen.Heightmap.primeHeightmaps(chunk, ChunkStatus.POST_FEATURES));
75+
+ }
76+
}
77+
78+
- if (chunk != null) {
79+
- refreshChunk(x, z);
80+
+ for (final BlockPos blockPos : BlockPos.betweenClosed(chunkPos.getMinBlockX(), serverLevel.getMinBuildHeight(), chunkPos.getMinBlockZ(), chunkPos.getMaxBlockX(), serverLevel.getMaxBuildHeight() - 1, chunkPos.getMaxBlockZ())) {
81+
+ serverChunkCache.blockChanged(blockPos);
82+
}
83+
84+
- return chunk != null;
85+
- */
86+
+ final Set<ChunkPos> chunksToRelight = new HashSet<>(9);
87+
+ for (int chunkX = chunkPos.x - 1; chunkX <= chunkPos.x + 1 ; chunkX++) {
88+
+ for (int chunkZ = chunkPos.z - 1; chunkZ <= chunkPos.z + 1 ; chunkZ++) {
89+
+ chunksToRelight.add(new ChunkPos(chunkX, chunkZ));
90+
+ }
91+
+ }
92+
+ serverChunkCache.getLightEngine().relight(chunksToRelight, pos -> {}, relit -> {});
93+
+ return true;
94+
+ // Paper end
95+
}
96+
97+
@Override

0 commit comments

Comments
 (0)