mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-11 09:23:42 +01:00
d3dc24999e
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 85b16b8a Update to Minecraft 1.16.5 CraftBukkit Changes: f3f30947 Update to Minecraft 1.16.5 Spigot Changes: 018b9a0d Update to Minecraft 1.16.5
42 lines
2.2 KiB
Diff
42 lines
2.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
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
|
|
index 6c8e9d498c9a30a1aa88494ba09c3cae012a8fa1..cd248eb6be663e8be33f2c3c6b06b77b6d5753a4 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
@@ -620,4 +620,9 @@ public class PaperWorldConfig {
|
|
private void zombieVillagerInfectionChance() {
|
|
zombieVillagerInfectionChance = getDouble("zombie-villager-infection-chance", zombieVillagerInfectionChance);
|
|
}
|
|
+
|
|
+ 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
|
|
index 272f05ac46f9fc2d430f70535a7a44cebea2dbda..96a784744110e7dd4939eb2c1b57346a2d60f983 100644
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
@@ -655,7 +655,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
|
this.executeModerately();
|
|
// CraftBukkit end
|
|
worldloadlistener.b();
|
|
- chunkproviderserver.getLightEngine().a(5);
|
|
+ chunkproviderserver.getLightEngine().a(worldserver.paperConfig.lightQueueSize); // Paper - increase light queue size
|
|
// CraftBukkit start
|
|
// this.updateSpawnFlags();
|
|
worldserver.setSpawnFlags(this.getSpawnMonsters(), this.getSpawnAnimals());
|