From 248ba175af2e1e472aff4eb6bcaa7ea0f7741dd5 Mon Sep 17 00:00:00 2001
From: granny <granny@purpurmc.org>
Date: Wed, 22 May 2024 02:59:07 -0700
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@66cb880 Remove ThreadedWorldUpgrader patch
PaperMC/Paper@980cff9 Fix compile
---
 gradle.properties                             |  2 +-
 patches/server/0001-Rebrand.patch             |  4 +-
 patches/server/0002-Purpur-config-files.patch |  8 +--
 patches/server/0006-Ridables.patch            |  4 +-
 .../server/0011-Bring-back-server-name.patch  |  4 +-
 .../0012-Configurable-server-mod-name.patch   |  4 +-
 patches/server/0013-Lagging-threshold.patch   |  8 +--
 .../0043-Configurable-TPS-Catchup.patch       |  4 +-
 ...0056-Add-5-second-tps-average-in-tps.patch | 10 ++--
 ...-Add-allow-water-in-end-world-option.patch |  6 +--
 .../0093-Configurable-daylight-cycle.patch    |  4 +-
 ...justable-breeding-cooldown-to-config.patch | 10 ++--
 patches/server/0114-Implement-TPSBar.patch    |  4 +-
 ...the-ability-to-add-combustible-items.patch |  4 +-
 .../server/0212-UPnP-Port-Forwarding.patch    |  4 +-
 ...counts-in-beehives-to-Purpur-clients.patch |  4 +-
 patches/server/0254-Remove-Timings.patch      | 28 +++++-----
 .../server/0255-Remove-Mojang-Profiler.patch  | 54 +++++++++----------
 patches/server/0258-Debug-Marker-API.patch    |  6 +--
 .../0295-config-for-startup-commands.patch    |  4 +-
 20 files changed, 88 insertions(+), 88 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 6cc5f0b64..2b3d8a953 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
 version = 1.20.6-R0.1-SNAPSHOT
 
 mcVersion = 1.20.6
-paperCommit = 9bf48555241dc03246c67258fe66eaf6c7a4a044
+paperCommit = 980cff9f298032f8670b20368851b8a7316a44d7
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/server/0001-Rebrand.patch b/patches/server/0001-Rebrand.patch
index 4725b813b..423e26f1f 100644
--- a/patches/server/0001-Rebrand.patch
+++ b/patches/server/0001-Rebrand.patch
@@ -199,10 +199,10 @@ index 4f3cc14d48690bb183d09bb7a5ba1e23e8a0c08a..c366d84518979e842a6f10f969a59515
          stringbuilder.append(CrashReport.getErrorComment());
          stringbuilder.append("\n\n");
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index dbc86b8d4d2af6e5f7e678f2bb77fd39b85c04c5..989de328a8dd26486d65245d2737d9789d936e8a 100644
+index 0ed42fa899721f83b598db05be1b5f321af3614a..d42cd000684f6bed26a188bfcf2c633e49b51370 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -959,7 +959,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -956,7 +956,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          shutdownThread = Thread.currentThread();
          org.spigotmc.WatchdogThread.doStop(); // Paper
          if (!isSameThread()) {
diff --git a/patches/server/0002-Purpur-config-files.patch b/patches/server/0002-Purpur-config-files.patch
index 5f301ba79..9cc31d432 100644
--- a/patches/server/0002-Purpur-config-files.patch
+++ b/patches/server/0002-Purpur-config-files.patch
@@ -92,7 +92,7 @@ index 2eb9c584cc77237f1c82d880a51a3f8b51008d73..6dc0101193c5a1a8850f849d4459462f
  
          this.setPvpAllowed(dedicatedserverproperties.pvp);
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index b4ef3ad2c17168085372f1fe46809f02d9dfe74a..04f7f6743aabdca54892b2b155386f86032cf807 100644
+index 0a8eeebb2d702ebcefd9f26cc0f41d1eab497902..a876fc3a23d716265c615949e2f1fa653c2f903c 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -170,6 +170,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -103,7 +103,7 @@ index b4ef3ad2c17168085372f1fe46809f02d9dfe74a..04f7f6743aabdca54892b2b155386f86
      public final co.aikar.timings.WorldTimingsHandler timings; // Paper
      public static BlockPos lastPhysicsProblem; // Spigot
      private org.spigotmc.TickLimiter entityLimiter;
-@@ -216,6 +217,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -207,6 +208,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, RegistryAccess iregistrycustom, Holder<DimensionType> holder, Supplier<ProfilerFiller> supplier, boolean flag, boolean flag1, long i, int j, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.function.Function<org.spigotmc.SpigotWorldConfig, io.papermc.paper.configuration.WorldConfiguration> paperWorldConfigCreator, java.util.concurrent.Executor executor) { // Paper - create paper world config; Async-Anti-Xray: Pass executor
          this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
          this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper - create paper world config
@@ -112,7 +112,7 @@ index b4ef3ad2c17168085372f1fe46809f02d9dfe74a..04f7f6743aabdca54892b2b155386f86
          this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2fa5507aa2153a05208077f9547c165a1099b5bb..97e7f9d08dd41630e8ebf610f23d5b37b820db1b 100644
+index af015237214cebc4d1c4bb9e9c5f939d433e365c..68902ec8122314d75d70ebdd3e7392cca8a6c53c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1033,6 +1033,7 @@ public final class CraftServer implements Server {
@@ -139,7 +139,7 @@ index 2fa5507aa2153a05208077f9547c165a1099b5bb..97e7f9d08dd41630e8ebf610f23d5b37
          this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -3034,6 +3037,18 @@ public final class CraftServer implements Server {
+@@ -3029,6 +3032,18 @@ public final class CraftServer implements Server {
              return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
          }
  
diff --git a/patches/server/0006-Ridables.patch b/patches/server/0006-Ridables.patch
index 11e0c7030..202fac4a2 100644
--- a/patches/server/0006-Ridables.patch
+++ b/patches/server/0006-Ridables.patch
@@ -22,10 +22,10 @@ index 665e88b2dedf9d5bb50914d5f3d377f2d19f40b0..f70a80b496bd1498778e82fc221c3b1b
          super(x, y, z);
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 989de328a8dd26486d65245d2737d9789d936e8a..71f1f9a9a395b17398941a4bb35e2d143a62a1f5 100644
+index d42cd000684f6bed26a188bfcf2c633e49b51370..8a264034d2b0552587b64fb82409f1aa3f5b6808 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1761,6 +1761,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1758,6 +1758,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              worldserver.hasEntityMoveEvent = io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper - Add EntityMoveEvent
              net.minecraft.world.level.block.entity.HopperBlockEntity.skipHopperEvents = worldserver.paperConfig().hopper.disableMoveEvent || org.bukkit.event.inventory.InventoryMoveItemEvent.getHandlerList().getRegisteredListeners().length == 0; // Paper - Perf: Optimize Hoppers
              worldserver.updateLagCompensationTick(); // Paper - lag compensation
diff --git a/patches/server/0011-Bring-back-server-name.patch b/patches/server/0011-Bring-back-server-name.patch
index f78802dbb..2f79b0d78 100644
--- a/patches/server/0011-Bring-back-server-name.patch
+++ b/patches/server/0011-Bring-back-server-name.patch
@@ -17,10 +17,10 @@ index 9d10cdacb3aed2c00dc60aeb6f2cbeb48905e21f..842f382de43df5d5c321422372ec30cc
      public final boolean spawnNpcs = this.get("spawn-npcs", true);
      public final boolean pvp = this.get("pvp", true);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 76c2c7d104cef8527641883e094a5c09a4f56092..5609a6588c0f4271f1b1416604ba88e24deb7e3d 100644
+index 68902ec8122314d75d70ebdd3e7392cca8a6c53c..cfa894a74ce616306fcc55664b29166e36c74ee1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -3276,4 +3276,11 @@ public final class CraftServer implements Server {
+@@ -3271,4 +3271,11 @@ public final class CraftServer implements Server {
          return this.potionBrewer;
      }
      // Paper end
diff --git a/patches/server/0012-Configurable-server-mod-name.patch b/patches/server/0012-Configurable-server-mod-name.patch
index cbe9427aa..a0429989f 100644
--- a/patches/server/0012-Configurable-server-mod-name.patch
+++ b/patches/server/0012-Configurable-server-mod-name.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable server mod name
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 71f1f9a9a395b17398941a4bb35e2d143a62a1f5..537726b345038e045172a42464ea166353515868 100644
+index 8a264034d2b0552587b64fb82409f1aa3f5b6808..6464cf3cf027d894d18d1a24495952d304151648 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1924,7 +1924,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1921,7 +1921,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @DontObfuscate
      public String getServerModName() {
diff --git a/patches/server/0013-Lagging-threshold.patch b/patches/server/0013-Lagging-threshold.patch
index c1b79a5a3..72321f996 100644
--- a/patches/server/0013-Lagging-threshold.patch
+++ b/patches/server/0013-Lagging-threshold.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Lagging threshold
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 537726b345038e045172a42464ea166353515868..5aabb74e0fd49a7ab97d324f9fa7bfc26527af00 100644
+index 6464cf3cf027d894d18d1a24495952d304151648..87957873de7f8cea2ae84abf04c99a42c8c3a815 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -312,6 +312,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -16,7 +16,7 @@ index 537726b345038e045172a42464ea166353515868..5aabb74e0fd49a7ab97d324f9fa7bfc2
  
      public volatile Thread shutdownThread; // Paper
      public volatile boolean abnormalExit = false; // Paper
-@@ -1214,6 +1215,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1211,6 +1212,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                      this.recentTps[0] = tps1.getAverage();
                      this.recentTps[1] = tps5.getAverage();
                      this.recentTps[2] = tps15.getAverage();
@@ -25,10 +25,10 @@ index 537726b345038e045172a42464ea166353515868..5aabb74e0fd49a7ab97d324f9fa7bfc2
                  }
                  // Paper end - further improve server tick loop
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5609a6588c0f4271f1b1416604ba88e24deb7e3d..1318db17fc43183b19afccc911657b24ff5f2e9a 100644
+index cfa894a74ce616306fcc55664b29166e36c74ee1..19dd84902702d3c2fcff624b81c4b23fee9e9948 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -3282,5 +3282,10 @@ public final class CraftServer implements Server {
+@@ -3277,5 +3277,10 @@ public final class CraftServer implements Server {
      public String getServerName() {
          return this.getProperties().serverName;
      }
diff --git a/patches/server/0043-Configurable-TPS-Catchup.patch b/patches/server/0043-Configurable-TPS-Catchup.patch
index 97f6a2adb..ed3578771 100644
--- a/patches/server/0043-Configurable-TPS-Catchup.patch
+++ b/patches/server/0043-Configurable-TPS-Catchup.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable TPS Catchup
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5aabb74e0fd49a7ab97d324f9fa7bfc26527af00..709d594d35848d248a195e20f73972d26dcac7c1 100644
+index 87957873de7f8cea2ae84abf04c99a42c8c3a815..843169bf1600d2edcaad8eb6c8036be20ffc3d37 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1239,6 +1239,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1236,6 +1236,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  this.profiler.popPush("nextTickWait");
                  this.mayHaveDelayedTasks = true;
                  this.delayedTasksMaxNextTickTimeNanos = Math.max(Util.getNanos() + i, this.nextTickTimeNanos);
diff --git a/patches/server/0056-Add-5-second-tps-average-in-tps.patch b/patches/server/0056-Add-5-second-tps-average-in-tps.patch
index 9ef5cf61a..9ad42041d 100644
--- a/patches/server/0056-Add-5-second-tps-average-in-tps.patch
+++ b/patches/server/0056-Add-5-second-tps-average-in-tps.patch
@@ -18,7 +18,7 @@ index 039a86034928a5eb7aaa2d7ca76a7bddcca346bd..308f67d0616e2d6bb135258f1fda53cc
      }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 709d594d35848d248a195e20f73972d26dcac7c1..e3eac8832644a2b104fd21d226332726e2c85faa 100644
+index 843169bf1600d2edcaad8eb6c8036be20ffc3d37..e8ebbbaa43dc8e3b63b2a90c0934207441e595f5 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -307,7 +307,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -30,7 +30,7 @@ index 709d594d35848d248a195e20f73972d26dcac7c1..e3eac8832644a2b104fd21d226332726
      // Spigot end
      public final io.papermc.paper.configuration.PaperConfigurations paperConfigurations; // Paper - add paper configuration files
      public static long currentTickLong = 0L; // Paper - track current tick as a long
-@@ -1085,6 +1085,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1082,6 +1082,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      private static final long MAX_CATCHUP_BUFFER = TICK_TIME * TPS * 60L;
      private long lastTick = 0;
      private long catchupTime = 0;
@@ -38,7 +38,7 @@ index 709d594d35848d248a195e20f73972d26dcac7c1..e3eac8832644a2b104fd21d226332726
      public final RollingAverage tps1 = new RollingAverage(60);
      public final RollingAverage tps5 = new RollingAverage(60 * 5);
      public final RollingAverage tps15 = new RollingAverage(60 * 15);
-@@ -1207,14 +1208,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1204,14 +1205,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  if (++MinecraftServer.currentTick % MinecraftServer.SAMPLE_INTERVAL == 0) {
                      final long diff = currentTime - tickSection;
                      final java.math.BigDecimal currentTps = TPS_BASE.divide(new java.math.BigDecimal(diff), 30, java.math.RoundingMode.HALF_UP);
@@ -74,10 +74,10 @@ index 096c89bd01cec2abd151bf6fffc4847d1bcd548f..cd0a8a6a1be75cab8bbb8ee3ac17bb73
          this.values[this.vp++ & 0xFF] = (int)(l * 100L / Runtime.getRuntime().maxMemory());
          this.repaint();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8e8f6e8f867b9dd63b91a91342629ba40e8e7374..a3ab5eaf8f9b999bfc6b3674a68450a0efeec7e8 100644
+index 19dd84902702d3c2fcff624b81c4b23fee9e9948..8bfb9c9445200b142af3bf9118c0f7c2d1b11501 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -3078,6 +3078,7 @@ public final class CraftServer implements Server {
+@@ -3073,6 +3073,7 @@ public final class CraftServer implements Server {
      @Override
      public double[] getTPS() {
          return new double[] {
diff --git a/patches/server/0067-Add-allow-water-in-end-world-option.patch b/patches/server/0067-Add-allow-water-in-end-world-option.patch
index 6cc34bdc5..a07fc793c 100644
--- a/patches/server/0067-Add-allow-water-in-end-world-option.patch
+++ b/patches/server/0067-Add-allow-water-in-end-world-option.patch
@@ -27,10 +27,10 @@ index 49557d6f22c5725c663a231deab019d4f6fe95fa..046652e8f9c5dcdf7c90acb9391214ca
  
                  return true;
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 04f7f6743aabdca54892b2b155386f86032cf807..2e44e9ea9558ebc1456d9bbf53561988e33ce845 100644
+index a876fc3a23d716265c615949e2f1fa653c2f903c..b90802d8132cd2979a202a0fe76b1a948eb90fc4 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -1902,4 +1902,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1893,4 +1893,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          return null;
      }
      // Paper end - optimize redstone (Alternate Current)
@@ -67,7 +67,7 @@ index 013302623d3ca3ff88f242d740af935dcf4844a6..13dd8bc7d2f6b71a5f1779dde53c5c84
          } else {
              world.setBlockAndUpdate(pos, IceBlock.meltsInto());
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 2e78d67201e66c1f3fd1f45ed625e682ea074848..de202a20cdc133d68fb44c56ee017cca153e1cf8 100644
+index 7ed1b8048c6f1f198c45337ae5f9ddd2de5c02ab..b15769f1e5b6cb2afc63402e540683253b7e3284 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -244,6 +244,11 @@ public class PurpurConfig {
diff --git a/patches/server/0093-Configurable-daylight-cycle.patch b/patches/server/0093-Configurable-daylight-cycle.patch
index 731663cda..713f5e8ef 100644
--- a/patches/server/0093-Configurable-daylight-cycle.patch
+++ b/patches/server/0093-Configurable-daylight-cycle.patch
@@ -18,10 +18,10 @@ index 76ef195a5074006b009acd9cc1744667c6aecbb9..659577549e132754281df76a7a1bfd88
      public ClientboundSetTimePacket(long time, long timeOfDay, boolean doDaylightCycle) {
          this.gameTime = time;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e3eac8832644a2b104fd21d226332726e2c85faa..f9f089360640a46fa4c71839185ea6523925a763 100644
+index e8ebbbaa43dc8e3b63b2a90c0934207441e595f5..6ebc9327f74344245886144a4075836205cc1533 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1753,7 +1753,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1750,7 +1750,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              long worldTime = level.getGameTime();
              final ClientboundSetTimePacket worldPacket = new ClientboundSetTimePacket(worldTime, dayTime, doDaylight);
              for (Player entityhuman : level.players()) {
diff --git a/patches/server/0098-Add-adjustable-breeding-cooldown-to-config.patch b/patches/server/0098-Add-adjustable-breeding-cooldown-to-config.patch
index 50177cb6b..f23bd0126 100644
--- a/patches/server/0098-Add-adjustable-breeding-cooldown-to-config.patch
+++ b/patches/server/0098-Add-adjustable-breeding-cooldown-to-config.patch
@@ -42,12 +42,12 @@ index 5193cf1d3c922d750a11e492b7636215e23ad0d6..b1f0fda942559b6d12c12a77088da6ce
              EntityBreedEvent entityBreedEvent = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityBreedEvent(entityageable, this, other, breeder, this.breedItem, experience);
              if (entityBreedEvent.isCancelled()) {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 2e44e9ea9558ebc1456d9bbf53561988e33ce845..edd9762e2475aa8828930ada59eb331a8e8d3970 100644
+index b90802d8132cd2979a202a0fe76b1a948eb90fc4..6e25a2ea1694a681c0b648b45c7b8be1458f2ea9 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -188,6 +188,49 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-     }
-     // Paper end - fix and optimise world upgrading
+@@ -179,6 +179,49 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+     public final Map<Explosion.CacheKey, Float> explosionDensityCache = new HashMap<>(); // Paper - Optimize explosions
+     public java.util.ArrayDeque<net.minecraft.world.level.block.RedstoneTorchBlock.Toggle> redstoneUpdateInfos; // Paper - Faster redstone torch rapid clock removal; Move from Map in BlockRedstoneTorch to here
  
 +    // Purpur start
 +    private com.google.common.cache.Cache<BreedingCooldownPair, Object> playerBreedingCooldowns;
@@ -95,7 +95,7 @@ index 2e44e9ea9558ebc1456d9bbf53561988e33ce845..edd9762e2475aa8828930ada59eb331a
      public CraftWorld getWorld() {
          return this.world;
      }
-@@ -218,6 +261,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -209,6 +252,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
          this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper - create paper world config
          this.purpurConfig = new org.purpurmc.purpur.PurpurWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName(), env); // Purpur
diff --git a/patches/server/0114-Implement-TPSBar.patch b/patches/server/0114-Implement-TPSBar.patch
index 3d9d8fa77..5f9d0fa61 100644
--- a/patches/server/0114-Implement-TPSBar.patch
+++ b/patches/server/0114-Implement-TPSBar.patch
@@ -17,10 +17,10 @@ index 1b701beeac0cf2a3fe01a09601318e59316131d7..6e4274ac868e744c63e6faece2bbf371
  
          if (environment.includeIntegrated) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f9f089360640a46fa4c71839185ea6523925a763..9481d4d4b839dca720e1ce2a2feadc7e4a03cc56 100644
+index 6ebc9327f74344245886144a4075836205cc1533..8df97c81a610d937758ba0459b91041db7db645d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1059,6 +1059,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1056,6 +1056,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.safeShutdown(waitForShutdown, false);
      }
      public void safeShutdown(boolean waitForShutdown, boolean isRestarting) {
diff --git a/patches/server/0203-Added-the-ability-to-add-combustible-items.patch b/patches/server/0203-Added-the-ability-to-add-combustible-items.patch
index 89567312a..30dba06a7 100644
--- a/patches/server/0203-Added-the-ability-to-add-combustible-items.patch
+++ b/patches/server/0203-Added-the-ability-to-add-combustible-items.patch
@@ -51,10 +51,10 @@ index ce2c424068001eec16032361baa206f6a5aa5332..c02d638b8f117156c815821207a91c55
      private int maxStack = MAX_STACK;
      public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a3ab5eaf8f9b999bfc6b3674a68450a0efeec7e8..9b707ac3a5516f1590afeee73566d0e57ff3050c 100644
+index 8bfb9c9445200b142af3bf9118c0f7c2d1b11501..5e538df03bdbad95227acee2c96d5e03f6b153f8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1575,6 +1575,19 @@ public final class CraftServer implements Server {
+@@ -1570,6 +1570,19 @@ public final class CraftServer implements Server {
          return true;
      }
  
diff --git a/patches/server/0212-UPnP-Port-Forwarding.patch b/patches/server/0212-UPnP-Port-Forwarding.patch
index 6ed0861a5..f42ce5f41 100644
--- a/patches/server/0212-UPnP-Port-Forwarding.patch
+++ b/patches/server/0212-UPnP-Port-Forwarding.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] UPnP Port Forwarding
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index bac978e042a1049cc66048a951b068793b855427..b08c508c0577adcea88a433211108a11edb72473 100644
+index 813b3a6c6de4f05e885ab864e8429818d8103acb..a8efb833d9efbc3367ddda1623ee1a0742cf3ea4 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -314,6 +314,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -16,7 +16,7 @@ index bac978e042a1049cc66048a951b068793b855427..b08c508c0577adcea88a433211108a11
  
      public volatile Thread shutdownThread; // Paper
      public volatile boolean abnormalExit = false; // Paper
-@@ -978,6 +979,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -975,6 +976,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          MinecraftServer.LOGGER.info("Stopping server");
          Commands.COMMAND_SENDING_POOL.shutdownNow(); // Paper - Perf: Async command map building; Shutdown and don't bother finishing
          MinecraftTimings.stopServer(); // Paper
diff --git a/patches/server/0227-Give-bee-counts-in-beehives-to-Purpur-clients.patch b/patches/server/0227-Give-bee-counts-in-beehives-to-Purpur-clients.patch
index fde777f3f..41ceac540 100644
--- a/patches/server/0227-Give-bee-counts-in-beehives-to-Purpur-clients.patch
+++ b/patches/server/0227-Give-bee-counts-in-beehives-to-Purpur-clients.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Give bee counts in beehives to Purpur clients
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b08c508c0577adcea88a433211108a11edb72473..57be38313992369f3fa39ab54c9c80a6e4f393eb 100644
+index a8efb833d9efbc3367ddda1623ee1a0742cf3ea4..5b0c0ddd60d133d52b0405ad86cabc1c94ea998c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1070,6 +1070,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1067,6 +1067,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
      public void safeShutdown(boolean waitForShutdown, boolean isRestarting) {
          org.purpurmc.purpur.task.BossBarTask.stopAll(); // Purpur
diff --git a/patches/server/0254-Remove-Timings.patch b/patches/server/0254-Remove-Timings.patch
index 1651d0634..8c8fe6db4 100644
--- a/patches/server/0254-Remove-Timings.patch
+++ b/patches/server/0254-Remove-Timings.patch
@@ -80,10 +80,10 @@ index 57e76b53e5e314c3e6b8856010f7a84188121582..8c134a642ccaf3530022f2e675a858d7
                      } catch (Exception exception) {
                          if (exception instanceof ReportedException) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 57be38313992369f3fa39ab54c9c80a6e4f393eb..834428ee526db305c70cf0ec4015204b03348b43 100644
+index 5b0c0ddd60d133d52b0405ad86cabc1c94ea998c..f91739d3de41c20b352e159c7f4e12e6fdcab794 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1480,7 +1480,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1477,7 +1477,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              return;
          }
  
@@ -92,7 +92,7 @@ index 57be38313992369f3fa39ab54c9c80a6e4f393eb..834428ee526db305c70cf0ec4015204b
          try {
              for (;;) {
                  boolean moreTasks = this.tickMidTickTasks();
-@@ -1507,7 +1507,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1504,7 +1504,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  }
              }
          } finally {
@@ -101,7 +101,7 @@ index 57be38313992369f3fa39ab54c9c80a6e4f393eb..834428ee526db305c70cf0ec4015204b
          }
      }
      // Paper end - execute chunk tasks mid tick
-@@ -1582,15 +1582,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1579,15 +1579,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public void tickServer(BooleanSupplier shouldKeepTicking) {
@@ -120,7 +120,7 @@ index 57be38313992369f3fa39ab54c9c80a6e4f393eb..834428ee526db305c70cf0ec4015204b
          // Paper end
          new com.destroystokyo.paper.event.server.ServerTickStartEvent(this.tickCount+1).callEvent(); // Paper - Server Tick Events
  
-@@ -1627,9 +1627,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1624,9 +1624,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          // Paper end - Incremental chunk and player saving
          io.papermc.paper.util.CachedLists.reset(); // Paper
          // Paper start - move executeAll() into full server tick timing
@@ -132,7 +132,7 @@ index 57be38313992369f3fa39ab54c9c80a6e4f393eb..834428ee526db305c70cf0ec4015204b
          // Paper end
          // Paper start - Server Tick Events
          long endTime = System.nanoTime();
-@@ -1652,7 +1652,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1649,7 +1649,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.logTickMethodTime(i);
          this.profiler.pop();
          org.spigotmc.WatchdogThread.tick(); // Spigot
@@ -141,7 +141,7 @@ index 57be38313992369f3fa39ab54c9c80a6e4f393eb..834428ee526db305c70cf0ec4015204b
      }
  
      private void logTickMethodTime(long tickStartTime) {
-@@ -1723,9 +1723,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1720,9 +1720,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.getPlayerList().getPlayers().forEach((entityplayer) -> {
              entityplayer.connection.suspendFlushing();
          });
@@ -153,7 +153,7 @@ index 57be38313992369f3fa39ab54c9c80a6e4f393eb..834428ee526db305c70cf0ec4015204b
          // Paper start - Folia scheduler API
          ((io.papermc.paper.threadedregions.scheduler.FoliaGlobalRegionScheduler) Bukkit.getGlobalRegionScheduler()).tick();
          getAllLevels().forEach(level -> {
-@@ -1742,21 +1742,21 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1739,21 +1739,21 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          // Paper end - Folia scheduler API
          io.papermc.paper.adventure.providers.ClickCallbackProviderImpl.CALLBACK_MANAGER.handleQueue(this.tickCount); // Paper
          this.profiler.push("commandFunctions");
@@ -180,7 +180,7 @@ index 57be38313992369f3fa39ab54c9c80a6e4f393eb..834428ee526db305c70cf0ec4015204b
          // Send time updates to everyone, it will get the right time from the world the player is in.
          // Paper start - Perf: Optimize time updates
          for (final ServerLevel level : this.getAllLevels()) {
-@@ -1776,7 +1776,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1773,7 +1773,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              }
          }
          // Paper end - Perf: Optimize time updates
@@ -189,7 +189,7 @@ index 57be38313992369f3fa39ab54c9c80a6e4f393eb..834428ee526db305c70cf0ec4015204b
  
          this.isIteratingOverLevels = true; // Paper - Throw exception on world create while being ticked
          Iterator iterator = this.getAllLevels().iterator(); // Paper - Throw exception on world create while being ticked; move down
-@@ -1804,14 +1804,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1801,14 +1801,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.profiler.push("tick");
  
              try {
@@ -206,7 +206,7 @@ index 57be38313992369f3fa39ab54c9c80a6e4f393eb..834428ee526db305c70cf0ec4015204b
              } catch (Throwable throwable) {
                  CrashReport crashreport = CrashReport.forThrowable(throwable, "Exception ticking world");
  
-@@ -1826,24 +1826,24 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1823,24 +1823,24 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.isIteratingOverLevels = false; // Paper - Throw exception on world create while being ticked
  
          this.profiler.popPush("connection");
@@ -727,10 +727,10 @@ index 85b4b24361e785acf75571ff98f924c00ae80748..09a7b418ddf564c0be13297f7c216db2
      }
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index edd9762e2475aa8828930ada59eb331a8e8d3970..4d00d72d66adfb282d354e22703552b333138694 100644
+index 6e25a2ea1694a681c0b648b45c7b8be1458f2ea9..90313f228944cc37f6af5ff5fcc679f423a26d14 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -1306,15 +1306,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1297,15 +1297,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          ProfilerFiller gameprofilerfiller = this.getProfiler();
  
          gameprofilerfiller.push("blockEntities");
@@ -749,7 +749,7 @@ index edd9762e2475aa8828930ada59eb331a8e8d3970..4d00d72d66adfb282d354e22703552b3
          // Spigot start
          // Iterator<TickingBlockEntity> iterator = this.blockEntityTickers.iterator();
          boolean flag = this.tickRateManager().runsNormally();
-@@ -1343,7 +1343,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1334,7 +1334,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          }
          this.blockEntityTickers.removeAll(toRemove); // Paper - Fix MC-117075
  
diff --git a/patches/server/0255-Remove-Mojang-Profiler.patch b/patches/server/0255-Remove-Mojang-Profiler.patch
index 3cab52d30..ff6b7e73d 100644
--- a/patches/server/0255-Remove-Mojang-Profiler.patch
+++ b/patches/server/0255-Remove-Mojang-Profiler.patch
@@ -83,7 +83,7 @@ index e9775b4506909bee65a74964f0d5391a0513de1d..684f7f202305c09b1037c5d38a52a5ea
      }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 834428ee526db305c70cf0ec4015204b03348b43..72eee1f7f29578a1d20245e0e4d90e11046ffe39 100644
+index f91739d3de41c20b352e159c7f4e12e6fdcab794..9e9537007a156dfbd41e53a93312ccb8be061a08 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -344,13 +344,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -106,7 +106,7 @@ index 834428ee526db305c70cf0ec4015204b03348b43..72eee1f7f29578a1d20245e0e4d90e11
          this.random = RandomSource.create();
          this.port = -1;
          this.levels = Maps.newLinkedHashMap();
-@@ -972,9 +972,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -969,9 +969,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
          // Paper end
          // CraftBukkit end
@@ -118,7 +118,7 @@ index 834428ee526db305c70cf0ec4015204b03348b43..72eee1f7f29578a1d20245e0e4d90e11
  
          MinecraftServer.LOGGER.info("Stopping server");
          Commands.COMMAND_SENDING_POOL.shutdownNow(); // Paper - Perf: Async command map building; Shutdown and don't bother finishing
-@@ -1240,20 +1240,20 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1237,20 +1237,20 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
                  boolean flag = i == 0L;
  
@@ -144,7 +144,7 @@ index 834428ee526db305c70cf0ec4015204b03348b43..72eee1f7f29578a1d20245e0e4d90e11
                  this.mayHaveDelayedTasks = true;
                  this.delayedTasksMaxNextTickTimeNanos = Math.max(Util.getNanos() + i, this.nextTickTimeNanos);
                  // Purpur start
-@@ -1269,9 +1269,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1266,9 +1266,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                      this.tickRateManager.endTickWork();
                  }
  
@@ -157,7 +157,7 @@ index 834428ee526db305c70cf0ec4015204b03348b43..72eee1f7f29578a1d20245e0e4d90e11
                  this.isReady = true;
                  JvmProfiler.INSTANCE.onServerTick(this.smoothedTickTimeMillis);
              }
-@@ -1535,7 +1535,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1532,7 +1532,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public void doRunTask(TickTask ticktask) { // CraftBukkit - decompile error
@@ -166,7 +166,7 @@ index 834428ee526db305c70cf0ec4015204b03348b43..72eee1f7f29578a1d20245e0e4d90e11
          super.doRunTask(ticktask);
      }
  
-@@ -1608,7 +1608,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1605,7 +1605,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          if (playerSaveInterval < 0) {
              playerSaveInterval = autosavePeriod;
          }
@@ -175,7 +175,7 @@ index 834428ee526db305c70cf0ec4015204b03348b43..72eee1f7f29578a1d20245e0e4d90e11
          final boolean fullSave = autosavePeriod > 0 && this.tickCount % autosavePeriod == 0;
          try {
              this.isSaving = true;
-@@ -1623,7 +1623,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1620,7 +1620,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          } finally {
              this.isSaving = false;
          }
@@ -184,7 +184,7 @@ index 834428ee526db305c70cf0ec4015204b03348b43..72eee1f7f29578a1d20245e0e4d90e11
          // Paper end - Incremental chunk and player saving
          io.papermc.paper.util.CachedLists.reset(); // Paper
          // Paper start - move executeAll() into full server tick timing
-@@ -1636,7 +1636,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1633,7 +1633,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          long remaining = (TICK_TIME - (endTime - lastTick)) - catchupTime;
          new com.destroystokyo.paper.event.server.ServerTickEndEvent(this.tickCount, ((double)(endTime - lastTick) / 1000000D), remaining).callEvent();
          // Paper end - Server Tick Events
@@ -193,7 +193,7 @@ index 834428ee526db305c70cf0ec4015204b03348b43..72eee1f7f29578a1d20245e0e4d90e11
          long j = Util.getNanos() - i;
          int k = this.tickCount % 100;
  
-@@ -1650,7 +1650,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1647,7 +1647,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.tickTimes60s.add(this.tickCount, j);
          // Paper end - Add tick times API and /mspt command
          this.logTickMethodTime(i);
@@ -202,7 +202,7 @@ index 834428ee526db305c70cf0ec4015204b03348b43..72eee1f7f29578a1d20245e0e4d90e11
          org.spigotmc.WatchdogThread.tick(); // Spigot
          //co.aikar.timings.TimingsManager.FULL_SERVER_TICK.stopTiming(); // Paper // Purpur
      }
-@@ -1741,11 +1741,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1738,11 +1738,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          });
          // Paper end - Folia scheduler API
          io.papermc.paper.adventure.providers.ClickCallbackProviderImpl.CALLBACK_MANAGER.handleQueue(this.tickCount); // Paper
@@ -216,7 +216,7 @@ index 834428ee526db305c70cf0ec4015204b03348b43..72eee1f7f29578a1d20245e0e4d90e11
          //Iterator iterator = this.getAllLevels().iterator(); // Paper - Throw exception on world create while being ticked; moved down
  
          // CraftBukkit start
-@@ -1788,20 +1788,20 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1785,20 +1785,20 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              worldserver.updateLagCompensationTick(); // Paper - lag compensation
              worldserver.hasRidableMoveEvent = org.purpurmc.purpur.event.entity.RidableMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Purpur
  
@@ -242,7 +242,7 @@ index 834428ee526db305c70cf0ec4015204b03348b43..72eee1f7f29578a1d20245e0e4d90e11
  
              try {
                  //worldserver.timings.doTick.startTiming(); // Spigot // Purpur
-@@ -1819,17 +1819,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1816,17 +1816,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  throw new ReportedException(crashreport);
              }
  
@@ -264,7 +264,7 @@ index 834428ee526db305c70cf0ec4015204b03348b43..72eee1f7f29578a1d20245e0e4d90e11
          //MinecraftTimings.playerListTimer.startTiming(); // Spigot // Paper // Purpur
          this.playerList.tick();
          //MinecraftTimings.playerListTimer.stopTiming(); // Spigot // Paper // Purpur
-@@ -1837,7 +1837,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1834,7 +1834,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              GameTestTicker.SINGLETON.tick();
          }
  
@@ -273,7 +273,7 @@ index 834428ee526db305c70cf0ec4015204b03348b43..72eee1f7f29578a1d20245e0e4d90e11
  
          //MinecraftTimings.tickablesTimer.startTiming(); // Spigot // Paper // Purpur
          for (int i = 0; i < this.tickables.size(); ++i) {
-@@ -1845,7 +1845,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1842,7 +1842,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
          //MinecraftTimings.tickablesTimer.stopTiming(); // Spigot // Paper // Purpur
  
@@ -282,7 +282,7 @@ index 834428ee526db305c70cf0ec4015204b03348b43..72eee1f7f29578a1d20245e0e4d90e11
          iterator = this.playerList.getPlayers().iterator();
  
          while (iterator.hasNext()) {
-@@ -1855,7 +1855,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1852,7 +1852,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              entityplayer.connection.resumeFlushing();
          }
  
@@ -291,7 +291,7 @@ index 834428ee526db305c70cf0ec4015204b03348b43..72eee1f7f29578a1d20245e0e4d90e11
      }
  
      private void synchronizeTime(ServerLevel world) {
-@@ -1863,7 +1863,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1860,7 +1860,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public void forceTimeSynchronization() {
@@ -300,7 +300,7 @@ index 834428ee526db305c70cf0ec4015204b03348b43..72eee1f7f29578a1d20245e0e4d90e11
          Iterator iterator = this.getAllLevels().iterator();
  
          while (iterator.hasNext()) {
-@@ -1872,7 +1872,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1869,7 +1869,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.synchronizeTime(worldserver);
          }
  
@@ -309,7 +309,7 @@ index 834428ee526db305c70cf0ec4015204b03348b43..72eee1f7f29578a1d20245e0e4d90e11
      }
  
      public boolean isNetherEnabled() {
-@@ -2584,6 +2584,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2581,6 +2581,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public ProfilerFiller getProfiler() {
@@ -317,7 +317,7 @@ index 834428ee526db305c70cf0ec4015204b03348b43..72eee1f7f29578a1d20245e0e4d90e11
          return this.profiler;
      }
  
-@@ -2830,7 +2831,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2827,7 +2828,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      // CraftBukkit end
  
      private void startMetricsRecordingTick() {
@@ -326,7 +326,7 @@ index 834428ee526db305c70cf0ec4015204b03348b43..72eee1f7f29578a1d20245e0e4d90e11
              this.metricsRecorder = ActiveMetricsRecorder.createStarted(new ServerMetricsSamplersProvider(Util.timeSource, this.isDedicatedServer()), Util.timeSource, Util.ioPool(), new MetricsPersister("server"), this.onMetricsRecordingStopped, (path) -> {
                  this.executeBlocking(() -> {
                      this.saveDebugReport(path.resolve("server"));
-@@ -2840,40 +2841,40 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2837,40 +2838,40 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.willStartRecordingMetrics = false;
          }
  
@@ -379,7 +379,7 @@ index 834428ee526db305c70cf0ec4015204b03348b43..72eee1f7f29578a1d20245e0e4d90e11
      }
  
      public Path getWorldPath(LevelResource worldSavePath) {
-@@ -2926,15 +2927,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2923,15 +2924,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public boolean isTimeProfilerRunning() {
@@ -1834,10 +1834,10 @@ index 082b804f4793f72e76361f5427f0358273454b3d..bd5fcb028d41b60de183b4d849f1ba10
  
          if (this.fire) {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 4d00d72d66adfb282d354e22703552b333138694..eda2f8cc034cf46293be1be117a60cf8b663c303 100644
+index 90313f228944cc37f6af5ff5fcc679f423a26d14..487bb3e75afc5871a79506a54f0f4af806460b14 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -1303,9 +1303,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1294,9 +1294,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      }
  
      protected void tickBlockEntities() {
@@ -1849,7 +1849,7 @@ index 4d00d72d66adfb282d354e22703552b333138694..eda2f8cc034cf46293be1be117a60cf8
          //this.timings.tileEntityPending.startTiming(); // Spigot // Purpur
          this.tickingBlockEntities = true;
          if (!this.pendingBlockEntityTickers.isEmpty()) {
-@@ -1346,7 +1346,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1337,7 +1337,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          //this.timings.tileEntityTick.stopTiming(); // Spigot // Purpur
          this.tickingBlockEntities = false;
          co.aikar.timings.TimingHistory.tileEntityTicks += this.blockEntityTickers.size(); // Paper
@@ -1858,7 +1858,7 @@ index 4d00d72d66adfb282d354e22703552b333138694..eda2f8cc034cf46293be1be117a60cf8
          this.spigotConfig.currentPrimedTnt = 0; // Spigot
      }
  
-@@ -1561,7 +1561,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1552,7 +1552,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
  
      @Override
      public List<Entity> getEntities(@Nullable Entity except, AABB box, Predicate<? super Entity> predicate) {
@@ -1867,7 +1867,7 @@ index 4d00d72d66adfb282d354e22703552b333138694..eda2f8cc034cf46293be1be117a60cf8
          List<Entity> list = Lists.newArrayList();
          ((ServerLevel)this).getEntityLookup().getEntities(except, box, list, predicate); // Paper - optimise this call
          return list;
-@@ -1580,7 +1580,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1571,7 +1571,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      }
  
      public <T extends Entity> void getEntities(EntityTypeTest<Entity, T> filter, AABB box, Predicate<? super T> predicate, List<? super T> result, int limit) {
@@ -1876,7 +1876,7 @@ index 4d00d72d66adfb282d354e22703552b333138694..eda2f8cc034cf46293be1be117a60cf8
          // Paper start - optimise this call
          //TODO use limit
          if (filter instanceof net.minecraft.world.entity.EntityType entityTypeTest) {
-@@ -1835,6 +1835,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1826,6 +1826,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      }
  
      public ProfilerFiller getProfiler() {
diff --git a/patches/server/0258-Debug-Marker-API.patch b/patches/server/0258-Debug-Marker-API.patch
index 6bd532fbe..1812ad4e4 100644
--- a/patches/server/0258-Debug-Marker-API.patch
+++ b/patches/server/0258-Debug-Marker-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Debug Marker API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9b707ac3a5516f1590afeee73566d0e57ff3050c..02d3be715acb113a1776450b54eeca17684d238e 100644
+index 5e538df03bdbad95227acee2c96d5e03f6b153f8..3542dde0942a0354e77dacf25811ee46c0eace21 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1586,6 +1586,42 @@ public final class CraftServer implements Server {
+@@ -1581,6 +1581,42 @@ public final class CraftServer implements Server {
      public void removeFuel(org.bukkit.Material material) {
          net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity.removeFuel(net.minecraft.world.item.ItemStack.fromBukkitCopy(new ItemStack(material)));
      }
@@ -99,7 +99,7 @@ index b7a02ae4eda06cab8ffd1220259a061558981dec..226ff7c6048b510be2e71ecc5d5ff358
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 20543386332d782327229e570c18425dcb98fba4..839c5794183882a875f68fc6b1a61aa543421681 100644
+index 5ea638493fc9330acb194c806a7add8525eab3ee..7dbd2c06ee8777f5100e9545c9666abc83dae21e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -3571,5 +3571,43 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0295-config-for-startup-commands.patch b/patches/server/0295-config-for-startup-commands.patch
index 888e14319..ed6aa7165 100644
--- a/patches/server/0295-config-for-startup-commands.patch
+++ b/patches/server/0295-config-for-startup-commands.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] config for startup commands
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 72eee1f7f29578a1d20245e0e4d90e11046ffe39..71705ccbc0cce88382b1fb536271773a332ad3a2 100644
+index 9e9537007a156dfbd41e53a93312ccb8be061a08..330bae815c0a332e3dc9fa7b224c9f92098199b9 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1187,6 +1187,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1184,6 +1184,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              }
              // Paper end - Add onboarding message for initial server start