aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0746-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0746-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch')
-rw-r--r--patches/server/0746-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch97
1 files changed, 97 insertions, 0 deletions
diff --git a/patches/server/0746-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0746-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
new file mode 100644
index 0000000000..0246c3f0d5
--- /dev/null
+++ b/patches/server/0746-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
@@ -0,0 +1,97 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Spottedleaf <[email protected]>
+Date: Sun, 19 Dec 2021 09:13:41 -0800
+Subject: [PATCH] Only write chunk data to disk if it serializes without
+ throwing
+
+This ensures at least a valid version of the chunk exists
+on disk, even if outdated
+
+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 9bae47f99336c377beb72c4b50b7f01cb4db15da..dcfe090c269d4cbcc2eb1b6f85392848bb34656c 100644
+--- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
++++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
+@@ -1004,6 +1004,9 @@ public class RegionFile implements AutoCloseable {
+ }
+
+ }
++
++ public static final int MAX_CHUNK_SIZE = 500 * 1024 * 1024; // Paper - don't write garbage data to disk if writing serialization fails
++
+ // Paper end
+ private class ChunkBuffer extends ByteArrayOutputStream {
+
+@@ -1019,6 +1022,24 @@ public class RegionFile implements AutoCloseable {
+ this.pos = chunkcoordintpair;
+ }
+
++ // Paper start - don't write garbage data to disk if writing serialization fails
++ @Override
++ public void write(final int b) {
++ if (this.count > MAX_CHUNK_SIZE) {
++ throw new RegionFileStorage.RegionFileSizeException("Region file too large: " + this.count);
++ }
++ super.write(b);
++ }
++
++ @Override
++ public void write(final byte[] b, final int off, final int len) {
++ if (this.count + len > MAX_CHUNK_SIZE) {
++ throw new RegionFileStorage.RegionFileSizeException("Region file too large: " + (this.count + len));
++ }
++ super.write(b, off, len);
++ }
++ // Paper end
++
+ public void close() throws IOException {
+ ByteBuffer bytebuffer = ByteBuffer.wrap(this.buf, 0, this.count);
+
+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 c2643f61fe5efb62d15f0798db691c76c7674a6e..81554c321a78258ff78da3801f00d0fb90b9e113 100644
+--- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
++++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
+@@ -345,10 +345,17 @@ public class RegionFileStorage implements AutoCloseable {
+ NbtIo.write(nbt, (DataOutput) dataoutputstream);
+ regionfile.setStatus(pos.x, pos.z, ChunkSerializer.getStatus(nbt)); // Paper - cache status on disk
+ 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
++ dataoutputstream.close(); // Paper - only write if successful
++ // Paper start - don't write garbage data to disk if writing serialization fails
++ } catch (RegionFileSizeException e) {
++ attempts = 5; // Don't retry
++ regionfile.clear(pos);
++ throw e;
++ // Paper end - don't write garbage data to disk if writing serialization fails
+ } catch (Throwable throwable) {
+ if (dataoutputstream != null) {
+ try {
+- dataoutputstream.close();
++ //dataoutputstream.close(); // Paper - don't write garbage data to disk if writing serialization fails
+ } catch (Throwable throwable1) {
+ throwable.addSuppressed(throwable1);
+ }
+@@ -356,10 +363,7 @@ public class RegionFileStorage implements AutoCloseable {
+
+ throw throwable;
+ }
+-
+- if (dataoutputstream != null) {
+- dataoutputstream.close();
+- }
++ // Paper - move into try block to only write if successfully serialized
+ }
+ // Paper start
+ return;
+@@ -405,4 +409,13 @@ public class RegionFileStorage implements AutoCloseable {
+ }
+
+ }
++
++ // Paper start
++ public static final class RegionFileSizeException extends RuntimeException {
++
++ public RegionFileSizeException(String message) {
++ super(message);
++ }
++ }
++ // Paper end
+ }