geforkt von Mirrors/Paper
18f0f8d1ca
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 312281ea PR-742: Make World implement Keyed CraftBukkit Changes: 2ac7fa7a SPIGOT-7014: getLootTable API should not persistently update loot table 7fdd7941 PR-1046: Make World implement Keyed 7bc728a6 PR-1045: Revert changes to persistence required checks Spigot Changes: b6d12d17 Rebuild patches
38 Zeilen
1.7 KiB
Diff
38 Zeilen
1.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
|
Date: Tue, 28 Dec 2021 07:19:01 -0800
|
|
Subject: [PATCH] Execute chunk tasks fairly for worlds while waiting for next
|
|
tick
|
|
|
|
Currently, only the first world would have had tasks executed.
|
|
This might result in chunks loading far slower in the nether,
|
|
for example.
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
index 01aefce226ae82d707b38b0d56d2580d411a3c9a..c2c1242bcf26c73b3520c797e77c3c2d430dfac7 100644
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
@@ -1354,6 +1354,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
|
this.executeMidTickTasks(); // Paper - execute chunk tasks mid tick
|
|
return true;
|
|
} else {
|
|
+ boolean ret = false; // Paper - force execution of all worlds, do not just bias the first
|
|
if (this.haveTime()) {
|
|
Iterator iterator = this.getAllLevels().iterator();
|
|
|
|
@@ -1361,12 +1362,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
|
ServerLevel worldserver = (ServerLevel) iterator.next();
|
|
|
|
if (worldserver.getChunkSource().pollTask()) {
|
|
- return true;
|
|
+ ret = true; // Paper - force execution of all worlds, do not just bias the first
|
|
}
|
|
}
|
|
}
|
|
|
|
- return false;
|
|
+ return ret; // Paper - force execution of all worlds, do not just bias the first
|
|
}
|
|
}
|
|
|