Mirrors/Paper
3
0
Fork 1
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-17 03:50:08 +01:00
Code Issues Projekte Releases Wiki Aktivität

Fix bug in async load order priority

Quellcode durchsuchen 
accidently had priority inverted!

This will greatly improve visual chunk load speeds
Dieser Commit ist enthalten in:
Aikar 2018-09-28 23:12:16 -04:00
Ursprung 0c9bb9b7ae
Commit 590c2f96eb
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 401ADFC9891FAAFE
1 geänderte Dateien mit 5 neuen und 5 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

10
Spigot-Server-Patches/0377-Async-Chunk-Loading-and-Generation.patch
Datei anzeigen

@ -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 {