2020-05-06 11:48:49 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2020-04-09 03:36:10 +02:00
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Wed, 8 Apr 2020 21:24:05 -0400
|
|
|
|
Subject: [PATCH] Increase Light Queue Size
|
|
|
|
|
|
|
|
Wiz mentioned that large WorldEdit operations cause light to run on
|
|
|
|
main thread. The queue was small, set to 5.. this bumps it to 20
|
|
|
|
but makes it configurable per-world.
|
|
|
|
|
|
|
|
The main risk of increasing this higher is during shutdown, some
|
|
|
|
queued light updates may be lost because mojang did not flush the
|
|
|
|
light engine on shutdown...
|
|
|
|
|
|
|
|
The queue size only puts a cap on max loss, doesn't solve that problem.
|
|
|
|
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2021-01-11 02:44:06 +01:00
|
|
|
index 6c8e9d498c9a30a1aa88494ba09c3cae012a8fa1..cd248eb6be663e8be33f2c3c6b06b77b6d5753a4 100644
|
2020-04-09 03:36:10 +02:00
|
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2021-01-11 02:44:06 +01:00
|
|
|
@@ -620,4 +620,9 @@ public class PaperWorldConfig {
|
2020-05-06 09:44:47 +02:00
|
|
|
private void zombieVillagerInfectionChance() {
|
|
|
|
zombieVillagerInfectionChance = getDouble("zombie-villager-infection-chance", zombieVillagerInfectionChance);
|
2020-04-09 03:36:10 +02:00
|
|
|
}
|
|
|
|
+
|
|
|
|
+ public int lightQueueSize = 20;
|
|
|
|
+ private void lightQueueSize() {
|
|
|
|
+ lightQueueSize = getInt("light-queue-size", lightQueueSize);
|
|
|
|
+ }
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
2021-05-02 21:37:24 +02:00
|
|
|
index dc817d7c7187de2b37485bef126fb0765a5caf63..4218dcb90c36bbac35ef292be32972e0fc22e6d2 100644
|
2020-04-09 03:36:10 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
2021-04-16 02:47:34 +02:00
|
|
|
@@ -776,7 +776,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
2020-04-09 03:36:10 +02:00
|
|
|
this.executeModerately();
|
|
|
|
// CraftBukkit end
|
2021-04-22 18:54:11 +02:00
|
|
|
if (worldserver.getWorld().getKeepSpawnInMemory()) worldloadlistener.b(); // Paper
|
2020-04-09 03:36:10 +02:00
|
|
|
- chunkproviderserver.getLightEngine().a(5);
|
|
|
|
+ chunkproviderserver.getLightEngine().a(worldserver.paperConfig.lightQueueSize); // Paper - increase light queue size
|
|
|
|
// CraftBukkit start
|
2021-01-16 03:18:08 +01:00
|
|
|
// this.updateSpawnFlags();
|
2020-11-07 01:19:04 +01:00
|
|
|
worldserver.setSpawnFlags(this.getSpawnMonsters(), this.getSpawnAnimals());
|