Skip to content

Commit 4b0b725

Browse files
committed
Add missing return when datafixers fail for chunk conversion
Caused the chunk to be later deserialized, which would result in spamming unrelated errors (possibly) + double chunk completion.
1 parent 5b5f0aa commit 4b0b725

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

patches/server/0258-Asynchronous-chunk-IO-and-loading.patch

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1442,10 +1442,10 @@ index 0000000000000000000000000000000000000000..ee906b594b306906c170180a29a8b619
14421442
+}
14431443
diff --git a/src/main/java/com/destroystokyo/paper/io/chunk/ChunkLoadTask.java b/src/main/java/com/destroystokyo/paper/io/chunk/ChunkLoadTask.java
14441444
new file mode 100644
1445-
index 0000000000000000000000000000000000000000..c5924b64604a678f7efdc0c2ce8070c9239dcf18
1445+
index 0000000000000000000000000000000000000000..79082639d9238c62c896dfc025ede92c88680954
14461446
--- /dev/null
14471447
+++ b/src/main/java/com/destroystokyo/paper/io/chunk/ChunkLoadTask.java
1448-
@@ -0,0 +1,137 @@
1448+
@@ -0,0 +1,138 @@
14491449
+package com.destroystokyo.paper.io.chunk;
14501450
+
14511451
+import co.aikar.timings.Timing;
@@ -1544,6 +1544,7 @@ index 0000000000000000000000000000000000000000..c5924b64604a678f7efdc0c2ce8070c9
15441544
+ } catch (final Throwable ex) {
15451545
+ PaperFileIOThread.LOGGER.error("Could not apply datafixers for chunk task: " + this.toString(), ex);
15461546
+ this.complete(ChunkLoadTask.createEmptyHolder());
1547+
+ return;
15471548
+ }
15481549
+
15491550
+ if (this.checkCancelled()) {

0 commit comments

Comments
 (0)