Paper/patches/server/0989-Allow-Saving-of-Oversized-Chunks.patch

212 lines
10 KiB
Diff
Raw Normal View History

2021-06-11 14:02:28 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 15 Feb 2019 01:08:19 -0500
Subject: [PATCH] Allow Saving of Oversized Chunks
2021-06-13 11:41:07 +02:00
Note 1.17 update: With 1.17, Entities are no longer stored in chunk slices, so this needs updating!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
2021-06-11 14:02:28 +02:00
The Minecraft World Region File format has a hard cap of 1MB per chunk.
This is due to the fact that the header of the file format only allocates
a single byte for sector count, meaning a maximum of 256 sectors, at 4k per sector.
This limit can be reached fairly easily with books, resulting in the chunk being unable
to save to the world. Worse off, is that nothing printed when this occured, and silently
performed a chunk rollback on next load.
This leads to security risk with duplication and is being actively exploited.
This patch catches the too large scenario, falls back and moves any large Entity
or Tile Entity into a new compound, and this compound is saved into a different file.
On Chunk Load, we check for oversized status, and if so, we load the extra file and
merge the Entities and Tile Entities from the oversized chunk back into the level to
then be loaded as normal.
Once a chunk is returned back to normal size, the oversized flag will clear, and no
extra data file will exist.
This fix maintains compatability with all existing Anvil Region Format tools as it
does not alter the save format. They will just not know about the extra entities.
This fix also maintains compatability if someone switches server jars to one without
this fix, as the data will remain in the oversized file. Once the server returns
to a jar with this fix, the data will be restored.
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
index bc8038da65f834249c61a262fc1a5abb7cc91a63..6c89b92cac521808873e9e1eccc363695275cd7a 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
+++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
2023-09-22 22:13:57 +02:00
@@ -18,8 +18,11 @@ import java.nio.file.LinkOption;
2021-06-11 14:02:28 +02:00
import java.nio.file.Path;
import java.nio.file.StandardCopyOption;
import java.nio.file.StandardOpenOption;
+import java.util.zip.InflaterInputStream; // Paper
import javax.annotation.Nullable;
import net.minecraft.Util;
2023-09-22 22:13:57 +02:00
+import net.minecraft.nbt.CompoundTag; // Paper
+import net.minecraft.nbt.NbtIo; // Paper
2021-06-11 14:02:28 +02:00
import net.minecraft.world.level.ChunkPos;
2022-03-01 06:43:03 +01:00
import org.slf4j.Logger;
2023-09-22 22:13:57 +02:00
@@ -45,6 +48,7 @@ public class RegionFile implements AutoCloseable {
2021-06-11 14:02:28 +02:00
@VisibleForTesting
protected final RegionBitmap usedSectors;
2023-09-23 00:33:14 +02:00
public final java.util.concurrent.locks.ReentrantLock fileLock = new java.util.concurrent.locks.ReentrantLock(); // Paper
2021-11-24 05:25:34 +01:00
+ public final Path regionFile; // Paper
2021-06-11 14:02:28 +02:00
public RegionFile(Path file, Path directory, boolean dsync) throws IOException {
this(file, directory, RegionFileVersion.getCompressionFormat(), dsync); // Paper - Configurable region compression format
2023-09-22 22:13:57 +02:00
@@ -52,6 +56,8 @@ public class RegionFile implements AutoCloseable {
2021-06-11 14:02:28 +02:00
public RegionFile(Path file, Path directory, RegionFileVersion outputChunkStreamVersion, boolean dsync) throws IOException {
this.header = ByteBuffer.allocateDirect(8192);
2021-11-24 05:25:34 +01:00
+ this.regionFile = file; // Paper
2021-06-11 14:02:28 +02:00
+ initOversizedState(); // Paper
this.usedSectors = new RegionBitmap();
this.version = outputChunkStreamVersion;
if (!Files.isDirectory(directory, new LinkOption[0])) {
@@ -431,6 +437,74 @@ public class RegionFile implements AutoCloseable {
2021-06-11 14:02:28 +02:00
}
public static final int MAX_CHUNK_SIZE = 500 * 1024 * 1024; // Paper - don't write garbage data to disk if writing serialization fails
2021-06-11 14:02:28 +02:00
+ // Paper start
+ private final byte[] oversized = new byte[1024];
+ private int oversizedCount;
2021-06-11 14:02:28 +02:00
+
+ private synchronized void initOversizedState() throws IOException {
2021-11-24 05:25:34 +01:00
+ Path metaFile = getOversizedMetaFile();
+ if (Files.exists(metaFile)) {
+ final byte[] read = java.nio.file.Files.readAllBytes(metaFile);
2021-06-11 14:02:28 +02:00
+ System.arraycopy(read, 0, oversized, 0, oversized.length);
+ for (byte temp : oversized) {
+ oversizedCount += temp;
+ }
+ }
+ }
+
+ private static int getChunkIndex(int x, int z) {
+ return (x & 31) + (z & 31) * 32;
+ }
+ synchronized boolean isOversized(int x, int z) {
+ return this.oversized[getChunkIndex(x, z)] == 1;
+ }
+ synchronized void setOversized(int x, int z, boolean oversized) throws IOException {
+ final int offset = getChunkIndex(x, z);
+ boolean previous = this.oversized[offset] == 1;
+ this.oversized[offset] = (byte) (oversized ? 1 : 0);
+ if (!previous && oversized) {
+ oversizedCount++;
+ } else if (!oversized && previous) {
+ oversizedCount--;
+ }
+ if (previous && !oversized) {
2021-11-24 05:25:34 +01:00
+ Path oversizedFile = getOversizedFile(x, z);
+ if (Files.exists(oversizedFile)) {
+ Files.delete(oversizedFile);
2021-06-11 14:02:28 +02:00
+ }
+ }
+ if (oversizedCount > 0) {
+ if (previous != oversized) {
+ writeOversizedMeta();
+ }
+ } else if (previous) {
2021-11-24 05:25:34 +01:00
+ Path oversizedMetaFile = getOversizedMetaFile();
+ if (Files.exists(oversizedMetaFile)) {
+ Files.delete(oversizedMetaFile);
2021-06-11 14:02:28 +02:00
+ }
+ }
+ }
+
+ private void writeOversizedMeta() throws IOException {
2021-11-24 05:25:34 +01:00
+ java.nio.file.Files.write(getOversizedMetaFile(), oversized);
2021-06-11 14:02:28 +02:00
+ }
+
2021-11-24 05:25:34 +01:00
+ private Path getOversizedMetaFile() {
+ return this.regionFile.getParent().resolve(this.regionFile.getFileName().toString().replaceAll("\\.mca$", "") + ".oversized.nbt");
2021-06-11 14:02:28 +02:00
+ }
+
2021-11-24 05:25:34 +01:00
+ private Path getOversizedFile(int x, int z) {
+ return this.regionFile.getParent().resolve(this.regionFile.getFileName().toString().replaceAll("\\.mca$", "") + "_oversized_" + x + "_" + z + ".nbt");
2021-06-11 14:02:28 +02:00
+ }
+
+ synchronized CompoundTag getOversizedData(int x, int z) throws IOException {
2021-11-24 05:25:34 +01:00
+ Path file = getOversizedFile(x, z);
+ try (DataInputStream out = new DataInputStream(new java.io.BufferedInputStream(new InflaterInputStream(Files.newInputStream(file))))) {
2021-06-16 08:25:38 +02:00
+ return NbtIo.read((java.io.DataInput) out);
2021-06-11 14:02:28 +02:00
+ }
+
+ }
+ // Paper end
2021-06-16 08:25:38 +02:00
private class ChunkBuffer extends ByteArrayOutputStream {
2021-06-11 14:02:28 +02:00
private final ChunkPos pos;
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
index f1ecc3832da094400ed9d45bfc60af10da682b4a..f27cf743bbc379520263909541d653dd38d1be58 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
+++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
@@ -121,6 +121,43 @@ public class RegionFileStorage implements AutoCloseable {
2021-06-11 14:02:28 +02:00
}
}
+ // Paper start
2021-11-24 05:25:34 +01:00
+ private static void printOversizedLog(String msg, Path file, int x, int z) {
2021-06-11 14:02:28 +02:00
+ org.apache.logging.log4j.LogManager.getLogger().fatal(msg + " (" + file.toString().replaceAll(".+[\\\\/]", "") + " - " + x + "," + z + ") Go clean it up to remove this message. /minecraft:tp " + (x<<4)+" 128 "+(z<<4) + " - DO NOT REPORT THIS TO PAPER - You may ask for help on Discord, but do not file an issue. These error messages can not be removed.");
+ }
+
+ private static CompoundTag readOversizedChunk(RegionFile regionfile, ChunkPos chunkCoordinate) throws IOException {
+ synchronized (regionfile) {
2021-06-17 23:39:36 +02:00
+ try (DataInputStream datainputstream = regionfile.getChunkDataInputStream(chunkCoordinate)) {
2021-06-11 14:02:28 +02:00
+ CompoundTag oversizedData = regionfile.getOversizedData(chunkCoordinate.x, chunkCoordinate.z);
2021-06-16 08:25:38 +02:00
+ CompoundTag chunk = NbtIo.read((DataInput) datainputstream);
2021-06-11 14:02:28 +02:00
+ if (oversizedData == null) {
+ return chunk;
+ }
+ CompoundTag oversizedLevel = oversizedData.getCompound("Level");
+
+ mergeChunkList(chunk.getCompound("Level"), oversizedLevel, "Entities", "Entities");
+ mergeChunkList(chunk.getCompound("Level"), oversizedLevel, "TileEntities", "TileEntities");
2021-06-11 14:02:28 +02:00
+
+ return chunk;
+ } catch (Throwable throwable) {
+ throwable.printStackTrace();
+ throw throwable;
+ }
+ }
+ }
+
2021-11-27 16:07:45 +01:00
+ private static void mergeChunkList(CompoundTag level, CompoundTag oversizedLevel, String key, String oversizedKey) {
+ net.minecraft.nbt.ListTag levelList = level.getList(key, net.minecraft.nbt.Tag.TAG_COMPOUND);
+ net.minecraft.nbt.ListTag oversizedList = oversizedLevel.getList(oversizedKey, net.minecraft.nbt.Tag.TAG_COMPOUND);
2021-06-11 14:02:28 +02:00
+
+ if (!oversizedList.isEmpty()) {
+ levelList.addAll(oversizedList);
+ level.put(key, levelList);
+ }
+ }
+ // Paper end
2021-06-11 14:02:28 +02:00
+
@Nullable
public CompoundTag read(ChunkPos pos) throws IOException {
// CraftBukkit start - SPIGOT-5680: There's no good reason to preemptively create files on read, save that for writing
@@ -132,6 +169,12 @@ public class RegionFileStorage implements AutoCloseable {
2023-09-22 22:13:57 +02:00
try { // Paper
2021-06-11 14:02:28 +02:00
DataInputStream datainputstream = regionfile.getChunkDataInputStream(pos);
2021-06-16 08:25:38 +02:00
2021-06-11 14:02:28 +02:00
+ // Paper start
+ if (regionfile.isOversized(pos.x, pos.z)) {
2021-06-16 08:25:38 +02:00
+ printOversizedLog("Loading Oversized Chunk!", regionfile.regionFile, pos.x, pos.z);
2021-06-11 14:02:28 +02:00
+ return readOversizedChunk(regionfile, pos);
+ }
+ // Paper end
CompoundTag nbttagcompound;
2021-06-16 08:25:38 +02:00
label43:
{
@@ -223,6 +266,7 @@ public class RegionFileStorage implements AutoCloseable {
2021-06-11 14:02:28 +02:00
2021-06-16 08:25:38 +02:00
try {
NbtIo.write(nbt, (DataOutput) dataoutputstream);
+ 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
// Paper start - don't write garbage data to disk if writing serialization fails
dataoutputstream.close(); // Only write if successful
} catch (final RegionFileSizeException e) {