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

Fix bug in async load order priority 

accidently had priority inverted!

This will greatly improve visual chunk load speeds
This commit is contained in:
Aikar 2018-09-28 23:12:16 -04:00
parent 0c9bb9b7ae
commit 590c2f96eb
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Spigot-Server-Patches/0377-Async-Chunk-Loading-and-Generation.patch
View File

@ -1,4 +1,4 @@
From bce7593da2a2876e500cc9404bb898fe2fd276a2 Mon Sep 17 00:00:00 2001 From b75c9e7ccdb0bd7cedb1938ca328089e9bee5c51 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sat, 21 Jul 2018 16:55:04 -0400 Date: Sat, 21 Jul 2018 16:55:04 -0400
Subject: [PATCH] Async Chunk Loading and Generation 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 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 new file mode 100644
index 0000000000..8dfed1a8cf index 0000000000..0a9fd5d662
--- /dev/null --- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/util/PriorityQueuedExecutor.java +++ b/src/main/java/com/destroystokyo/paper/util/PriorityQueuedExecutor.java
@@ -0,0 +1,277 @@ @@ -0,0 +1,277 @@
@ -258,7 +258,7 @@ index 0000000000..8dfed1a8cf
+ } + }
+ +
+ public enum Priority { + public enum Priority {
+ HIGH, NORMAL + NORMAL, HIGH
+ } + }
+ +
+ public class PendingTask <T> implements Runnable { + public class PendingTask <T> implements Runnable {
@ -316,7 +316,7 @@ index 0000000000..8dfed1a8cf
+ return; + return;
+ } + }
+ if (this.submitted.compareAndSet(submitted, priority)) { + if (this.submitted.compareAndSet(submitted, priority)) {
+ if (priority == 1) { + if (priority == Priority.HIGH.ordinal()) {
+ high.add(this); + high.add(this);
+ } else { + } else {
+ normal.add(this); + 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 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 --- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/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 { @@ -732,7 +732,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {