mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-22 18:45:54 +01:00
44 lines
2.3 KiB
Diff
44 lines
2.3 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 d01f5df4ec18a35fbf6222d76a2617a07f20a87b..27de7cdc4f3bb5604162f2cc114fcd27a6ed4a14 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
@@ -484,5 +484,10 @@ public class PaperWorldConfig {
|
|
disableHopperMoveEvents = getBoolean("hopper.disable-move-event", disableHopperMoveEvents);
|
|
log("Hopper Move Item Events: " + (disableHopperMoveEvents ? "disabled" : "enabled"));
|
|
}
|
|
+
|
|
+ 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 8284c8690295cf9e57c47f198058c3e4ad39191b..026397cbedd2d1cd08ec8a82a3468f35cd8e4765 100644
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
@@ -844,7 +844,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
|
this.executeModerately();
|
|
// CraftBukkit end
|
|
if (worldserver.getWorld().getKeepSpawnInMemory()) worldloadlistener.stop(); // Paper
|
|
- chunkproviderserver.getLightEngine().setTaskPerBatch(5);
|
|
+ chunkproviderserver.getLightEngine().setTaskPerBatch(worldserver.paperConfig.lightQueueSize); // Paper - increase light queue size
|
|
// CraftBukkit start
|
|
// this.updateSpawnFlags();
|
|
worldserver.setSpawnSettings(this.isSpawningMonsters(), this.isSpawningAnimals());
|