From 590c2f96eb566a1c110b46845653c4284b3189a0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 28 Sep 2018 23:12:16 -0400 Subject: [PATCH] Fix bug in async load order priority accidently had priority inverted! This will greatly improve visual chunk load speeds --- .../0377-Async-Chunk-Loading-and-Generation.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Spigot-Server-Patches/0377-Async-Chunk-Loading-and-Generation.patch b/Spigot-Server-Patches/0377-Async-Chunk-Loading-and-Generation.patch index 71b7d1471..4fe541e0e 100644 --- a/Spigot-Server-Patches/0377-Async-Chunk-Loading-and-Generation.patch +++ b/Spigot-Server-Patches/0377-Async-Chunk-Loading-and-Generation.patch @@ -1,4 +1,4 @@ -From bce7593da2a2876e500cc9404bb898fe2fd276a2 Mon Sep 17 00:00:00 2001 +From b75c9e7ccdb0bd7cedb1938ca328089e9bee5c51 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 21 Jul 2018 16:55:04 -0400 Subject: [PATCH] Async Chunk Loading and Generation @@ -64,7 +64,7 @@ index da710cc6fe..6b65364e22 100644 } diff --git a/src/main/java/com/destroystokyo/paper/util/PriorityQueuedExecutor.java b/src/main/java/com/destroystokyo/paper/util/PriorityQueuedExecutor.java new file mode 100644 -index 0000000000..8dfed1a8cf +index 0000000000..0a9fd5d662 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/util/PriorityQueuedExecutor.java @@ -0,0 +1,277 @@ @@ -258,7 +258,7 @@ index 0000000000..8dfed1a8cf + } + + public enum Priority { -+ HIGH, NORMAL ++ NORMAL, HIGH + } + + public class PendingTask implements Runnable { @@ -316,7 +316,7 @@ index 0000000000..8dfed1a8cf + return; + } + if (this.submitted.compareAndSet(submitted, priority)) { -+ if (priority == 1) { ++ if (priority == Priority.HIGH.ordinal()) { + high.add(this); + } else { + normal.add(this); @@ -1718,7 +1718,7 @@ index fa99fe0146..4f49786aa3 100644 } } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index f837e6c36c..409c7d6ee6 100644 +index 14905fceb0..c0aeccffbf 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -732,7 +732,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {