38 lines
1.7 KiB
Diff
38 lines
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 eab93e1e3712c0a01cac187bf5944818c813d665..1674deebbeab0995ed7acacf8052e1daf4d2a7bc 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||
|
|
@@ -1392,6 +1392,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();
|
||
|
|
|
||
|
|
@@ -1399,12 +1400,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
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|