twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-01 20:52:12 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix #2511 (#2519)

Browse Source 
Did not double-flush the file io thread if async = false
This commit is contained in:
Spottedleaf
2019-09-01 14:18:40 -07:00
parent b0a7c129c4
commit 45ed30b235
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Spigot-Server-Patches/Asynchronous-chunk-IO-and-loading.patch
View File

@@ -1886,7 +1886,7 @@ index 000000000..1dfa8abfd
+} +}
diff --git a/src/main/java/com/destroystokyo/paper/io/chunk/ChunkTaskManager.java b/src/main/java/com/destroystokyo/paper/io/chunk/ChunkTaskManager.java diff --git a/src/main/java/com/destroystokyo/paper/io/chunk/ChunkTaskManager.java b/src/main/java/com/destroystokyo/paper/io/chunk/ChunkTaskManager.java
new file mode 100644 new file mode 100644
index 000000000..98a9744a0 index 000000000..695e9909f
--- /dev/null --- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/io/chunk/ChunkTaskManager.java +++ b/src/main/java/com/destroystokyo/paper/io/chunk/ChunkTaskManager.java
@@ -0,0 +0,0 @@ @@ -0,0 +0,0 @@
@@ -2239,12 +2239,11 @@ index 000000000..98a9744a0
+ }); + });
+ wait.join(); + wait.join();
+ } + }
+ return; + } else {
+ }
+
+ for (final QueueExecutorThread<ChunkTask> worker : this.workers) { + for (final QueueExecutorThread<ChunkTask> worker : this.workers) {
+ worker.flush(); + worker.flush();
+ } + }
+ }
+ +
+ // flush again since tasks we execute async saves + // flush again since tasks we execute async saves
+ drainChunkWaitQueue(); + drainChunkWaitQueue();