2020-05-06 09:48:49 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2020-04-09 01:36:10 +00: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-11-12 01:48:12 +00:00
|
|
|
index 7b35cbbf11d1b5ad746d184a4bd1eb74b1bdd245..0dba910bbe6bd9f46b255a60070fd2a6668108bf 100644
|
2020-04-09 01:36:10 +00:00
|
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2020-11-12 01:48:12 +00:00
|
|
|
@@ -618,4 +618,9 @@ public class PaperWorldConfig {
|
2020-05-06 07:44:47 +00:00
|
|
|
private void zombieVillagerInfectionChance() {
|
|
|
|
zombieVillagerInfectionChance = getDouble("zombie-villager-infection-chance", zombieVillagerInfectionChance);
|
2020-04-09 01:36:10 +00: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-12-01 13:23:44 +00:00
|
|
|
index f5120de89959d6f4df94bfd37657f390e9892f55..1647c36c2b8f81be59ed48eb329977331aa709b1 100644
|
2020-04-09 01:36:10 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
2020-12-01 13:23:44 +00:00
|
|
|
@@ -655,7 +655,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
2020-04-09 01:36:10 +00:00
|
|
|
this.executeModerately();
|
|
|
|
// CraftBukkit end
|
|
|
|
worldloadlistener.b();
|
|
|
|
- chunkproviderserver.getLightEngine().a(5);
|
|
|
|
+ chunkproviderserver.getLightEngine().a(worldserver.paperConfig.lightQueueSize); // Paper - increase light queue size
|
|
|
|
// CraftBukkit start
|
2020-11-07 00:19:04 +00:00
|
|
|
// this.bc();
|
|
|
|
worldserver.setSpawnFlags(this.getSpawnMonsters(), this.getSpawnAnimals());
|