core/testserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add missing return when datafixers fail for chunk conversion

Browse source 
Caused the chunk to be later deserialized, which would
result in spamming unrelated errors (possibly) +
double chunk completion.
This commit is contained in:
Spottedleaf 2021-12-17 06:55:16 -08:00
parent 5b5f0aa6c8
commit 4b0b72554f
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1442,10 +1442,10 @@ index 0000000000000000000000000000000000000000..ee906b594b306906c170180a29a8b619
+} +}
diff --git a/src/main/java/com/destroystokyo/paper/io/chunk/ChunkLoadTask.java b/src/main/java/com/destroystokyo/paper/io/chunk/ChunkLoadTask.java diff --git a/src/main/java/com/destroystokyo/paper/io/chunk/ChunkLoadTask.java b/src/main/java/com/destroystokyo/paper/io/chunk/ChunkLoadTask.java
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..c5924b64604a678f7efdc0c2ce8070c9239dcf18 index 0000000000000000000000000000000000000000..79082639d9238c62c896dfc025ede92c88680954
--- /dev/null --- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/io/chunk/ChunkLoadTask.java +++ b/src/main/java/com/destroystokyo/paper/io/chunk/ChunkLoadTask.java
@@ -0,0 +1,137 @@ @@ -0,0 +1,138 @@
+package com.destroystokyo.paper.io.chunk; +package com.destroystokyo.paper.io.chunk;
+ +
+import co.aikar.timings.Timing; +import co.aikar.timings.Timing;
@ -1544,6 +1544,7 @@ index 0000000000000000000000000000000000000000..c5924b64604a678f7efdc0c2ce8070c9
+ } catch (final Throwable ex) { + } catch (final Throwable ex) {
+ PaperFileIOThread.LOGGER.error("Could not apply datafixers for chunk task: " + this.toString(), ex); + PaperFileIOThread.LOGGER.error("Could not apply datafixers for chunk task: " + this.toString(), ex);
+ this.complete(ChunkLoadTask.createEmptyHolder()); + this.complete(ChunkLoadTask.createEmptyHolder());
+ return;
+ } + }
+ +
+ if (this.checkCancelled()) { + if (this.checkCancelled()) {