2022-02-18 18:44:46 +01:00
|
|
|
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
|
2024-01-19 17:54:05 +01:00
|
|
|
index e6ad7c2b8eac76bcc2083b3921d45b83ecf2f875..d621320097f38d2339624852c59d47598b01603b 100644
|
2022-02-18 18:44:46 +01:00
|
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
2024-01-14 10:46:04 +01:00
|
|
|
@@ -1416,6 +1416,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
2023-09-23 00:33:14 +02:00
|
|
|
this.executeMidTickTasks(); // Paper - execute chunk tasks mid tick
|
2022-02-18 18:44:46 +01:00
|
|
|
return true;
|
|
|
|
} else {
|
|
|
|
+ boolean ret = false; // Paper - force execution of all worlds, do not just bias the first
|
2023-12-06 17:00:26 +01:00
|
|
|
if (this.tickRateManager.isSprinting() || this.haveTime()) {
|
2022-02-18 18:44:46 +01:00
|
|
|
Iterator iterator = this.getAllLevels().iterator();
|
|
|
|
|
2024-01-14 10:46:04 +01:00
|
|
|
@@ -1423,12 +1424,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
2023-12-06 19:07:47 +01:00
|
|
|
ServerLevel worldserver = (ServerLevel) iterator.next();
|
2022-02-18 18:44:46 +01:00
|
|
|
|
|
|
|
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
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|