From 23b028a34f2c1230b7c0e3bfc8187e93f0530aed Mon Sep 17 00:00:00 2001 From: sulu5890 <sulu@sulu.me> Date: Thu, 22 Apr 2021 11:54:11 -0500 Subject: [PATCH] Don't print spawn load time when not loading spawn (#5467) --- .../Configurable-Keep-Spawn-Loaded-range-per-world.patch | 9 +++++++++ Spigot-Server-Patches/Increase-Light-Queue-Size.patch | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Spigot-Server-Patches/Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/Configurable-Keep-Spawn-Loaded-range-per-world.patch index 6ff1aeda9c..dc8beb6d5b 100644 --- a/Spigot-Server-Patches/Configurable-Keep-Spawn-Loaded-range-per-world.patch +++ b/Spigot-Server-Patches/Configurable-Keep-Spawn-Loaded-range-per-world.patch @@ -74,6 +74,15 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 if (true) { WorldServer worldserver1 = worldserver; +@@ -0,0 +0,0 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas + // this.nextTick = SystemUtils.getMonotonicMillis() + 10L; + this.executeModerately(); + // CraftBukkit end +- worldloadlistener.b(); ++ if (worldserver.getWorld().getKeepSpawnInMemory()) worldloadlistener.b(); // Paper + chunkproviderserver.getLightEngine().a(5); + // CraftBukkit start + // this.updateSpawnFlags(); diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/server/level/WorldServer.java diff --git a/Spigot-Server-Patches/Increase-Light-Queue-Size.patch b/Spigot-Server-Patches/Increase-Light-Queue-Size.patch index 97bc361448..837ab8176c 100644 --- a/Spigot-Server-Patches/Increase-Light-Queue-Size.patch +++ b/Spigot-Server-Patches/Increase-Light-Queue-Size.patch @@ -34,7 +34,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @@ -0,0 +0,0 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas this.executeModerately(); // CraftBukkit end - worldloadlistener.b(); + if (worldserver.getWorld().getKeepSpawnInMemory()) worldloadlistener.b(); // Paper - chunkproviderserver.getLightEngine().a(5); + chunkproviderserver.getLightEngine().a(worldserver.paperConfig.lightQueueSize); // Paper - increase light queue size // CraftBukkit start