2020-05-06 10:35:20 +02:00
|
|
|
From a6e7765b2ccf8621cbef028703c1a20ad6a03a0f 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
|
2020-05-06 10:35:20 +02:00
|
|
|
index 3f44be577e3..a4815f5e69c 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
|
2020-05-06 10:35:20 +02:00
|
|
|
@@ -667,4 +667,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
|
2020-05-06 10:35:20 +02:00
|
|
|
index d1f82eff218..77adc64e30c 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
|
2020-04-19 12:01:07 +02:00
|
|
|
@@ -637,7 +637,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
2020-04-09 03:36:10 +02:00
|
|
|
this.executeModerately();
|
|
|
|
// CraftBukkit end
|
|
|
|
worldloadlistener.b();
|
|
|
|
- chunkproviderserver.getLightEngine().a(5);
|
|
|
|
+ chunkproviderserver.getLightEngine().a(worldserver.paperConfig.lightQueueSize); // Paper - increase light queue size
|
|
|
|
|
|
|
|
// CraftBukkit start
|
|
|
|
this.forceTicks = false;
|
|
|
|
--
|
2020-05-06 10:35:20 +02:00
|
|
|
2.26.2
|
2020-04-09 03:36:10 +02:00
|
|
|
|