Update Paper

build.gradle.kts

@@ -2,7 +2,7 @@ plugins {
     java
     `maven-publish`
     id("com.github.johnrengelman.shadow") version "8.1.1" apply false
-    id("io.papermc.paperweight.patcher") version "1.5.5"
+    id("io.papermc.paperweight.patcher") version "1.5.7-SNAPSHOT"
 }
 
 repositories {

gradle.properties

@@ -4,5 +4,5 @@ version=1.20.1-R0.1-SNAPSHOT
 mcVersion=1.20.1
 packageVersion=1_20_R1
 org.gradle.jvmargs=-Xmx2G
-paperRef=517f8fbbac2467fb24fa87d6bd56ce5c1b9bc972
+paperRef=773dd724469bae89d0c2075edc3d1ddc8d5b0b18
 preVersion=false

patches/api/0005-Hide-irrelevant-compilation-warnings.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Hide irrelevant compilation warnings
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 149f9088fe806467656e8b1c4157df60fda69ba7..e47519560705d8d7c784934ab9bae5cb07fb97f7 100644
+index aed834334385ff3038ae69f3f34d129ad2507960..5ff778a10d46a75687da1c4705669416c8fdb456 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -89,6 +89,15 @@ val generateApiVersioningFile by tasks.registering {
@@ -24,7 +24,7 @@ index 149f9088fe806467656e8b1c4157df60fda69ba7..e47519560705d8d7c784934ab9bae5cb
  tasks.jar {
      from(generateApiVersioningFile.map { it.outputs.files.singleFile }) {
          into("META-INF/maven/${project.group}/${project.name}")
-@@ -141,6 +150,8 @@ tasks.withType<Javadoc> {
+@@ -146,6 +155,8 @@ tasks.withType<Javadoc> {
              into("build/docs/javadoc")
          }
      }

patches/api/0006-SIMD-support.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] SIMD support
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index e47519560705d8d7c784934ab9bae5cb07fb97f7..a6a92386374f49e877c0fdf322235d02fb490795 100644
+index 5ff778a10d46a75687da1c4705669416c8fdb456..ea64daa8af9630433ea3a1053d3246f0b16aceb6 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -95,6 +95,7 @@ tasks.withType<JavaCompile> {
@@ -16,7 +16,7 @@ index e47519560705d8d7c784934ab9bae5cb07fb97f7..a6a92386374f49e877c0fdf322235d02
  }
  // Leaves end - hide irrelevant compilation warnings
  
-@@ -152,6 +153,7 @@ tasks.withType<Javadoc> {
+@@ -157,6 +158,7 @@ tasks.withType<Javadoc> {
      }
  
      options.addStringOption("Xdoclint:none", "-quiet") // Leaves - hide irrelevant compilation warnings

patches/api/0007-Leaves-API-publish.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Leaves API publish
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index a6a92386374f49e877c0fdf322235d02fb490795..63a7601ee316bd3dbb18b10adaddcf0936390234 100644
+index ea64daa8af9630433ea3a1053d3246f0b16aceb6..e4fd455f0019c24fa78ae1c9bf48f2ca0c5594e5 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -166,3 +166,14 @@ tasks.check {
+@@ -171,3 +171,14 @@ tasks.check {
      dependsOn(scanJar)
  }
  // Paper end

patches/api/0008-Force-peaceful-mode-switch.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Force peaceful mode switch
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 6917931966377c51db88a3364997a110dd987970..5a8669e794870d8d470a8a0a99b9e9629d2cc1bd 100644
+index b8b97df069b28fa3cf32f1ad1f01f586a0cfbc78..ba45d4eed9f7663da54ce2f702853941d6c24184 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -4000,6 +4000,12 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -4016,6 +4016,12 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
      @NotNull
      public Set<FeatureFlag> getFeatureFlags();
  

patches/server/0001-Build-changes.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Build changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index fb98936bb8a5488db75d676c5bcb4060597fbbf8..955362ab4155718807859978d840d9f4d68a8ef4 100644
+index 7e0580bbd0a557c7bb269507a99d25db07bf31f1..8833737c364f53b18e74c86ceb21899d5da6c70d 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -13,8 +13,12 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
@@ -184,7 +184,7 @@ index c49802c936ae8e3f4dc1badd98414d96714ecd60..b0e3ac5b92f0f45a47e2972d3baa8dd8
          this.setFlightAllowed(dedicatedserverproperties.allowFlight);
          this.setMotd(dedicatedserverproperties.motd);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ec4b73321205b472f19fa5bd4ad95893020d1340..51d2c974af4610784e91ca04412bdff80f99dc01 100644
+index 74d06790de674cbd230a0b14ac9a6b614c9f84ef..6358daff1af6c0094f469966bc94b8b5583c4f15 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -265,7 +265,7 @@ import javax.annotation.Nullable; // Paper
@@ -197,10 +197,10 @@ index ec4b73321205b472f19fa5bd4ad95893020d1340..51d2c974af4610784e91ca04412bdff8
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 776b7fc26fe96b69be260bbd36efae147d988640..e1c99d941c7bb954bf3ac83d5002dbf58fd833b0 100644
+index 7c29d92362a82330440dff151bcf421f15c68f71..dc13164f498eeb1d52c08f9180c44e96c0478b2e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -292,7 +292,7 @@ public class Main {
+@@ -300,7 +300,7 @@ public class Main {
                      if (buildDate.before(deadline.getTime())) {
                          // Paper start - This is some stupid bullshit
                          System.err.println("*** Warning, you've not updated in a while! ***");
@@ -223,7 +223,7 @@ index 774556a62eb240da42e84db4502e2ed43495be17..ca166161ef919c559de9cc02bdf435cb
  
          if (stream != null) {
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index 98fba0288be9ed2cb18ffba5cf81148157dd4fcf..a803b08d7d1995c263d05eda23dfe4552acae08d 100644
+index 50c72e5db369a180f425eaaa0411cb8871bc3463..db608f17a7a8e360b0854533d6d2434da688aded 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -155,14 +155,14 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa

patches/server/0004-Leaves-Server-Config-And-Command.patch

@@ -46,7 +46,7 @@ index b0e3ac5b92f0f45a47e2972d3baa8dd86d77de30..56ae779a44bc361f78188ec3d2bfe88d
          com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Leaves - down
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 773bfdd3ed457a352b5329f280c0d10297d579ba..c20e4157daec6803dce3ad2e36c38b6808496128 100644
+index 7d54c79f46f99f5500e9cb1f486037cafb27ee3a..b52df2e8aa1f3ff748589ccc121192e19cd4b947 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -176,6 +176,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -66,10 +66,10 @@ index 773bfdd3ed457a352b5329f280c0d10297d579ba..c20e4157daec6803dce3ad2e36c38b68
          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 51d2c974af4610784e91ca04412bdff80f99dc01..92361a187454a7e62a35cff657dcf748b6d34613 100644
+index 6358daff1af6c0094f469966bc94b8b5583c4f15..df3df232bd15794ced84946dc0e95da02d579fe1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1057,6 +1057,7 @@ public final class CraftServer implements Server {
+@@ -1037,6 +1037,7 @@ public final class CraftServer implements Server {
  
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
          this.console.paperConfigurations.reloadConfigs(this.console);
@@ -77,7 +77,7 @@ index 51d2c974af4610784e91ca04412bdff80f99dc01..92361a187454a7e62a35cff657dcf748
          for (ServerLevel world : this.console.getAllLevels()) {
              // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
              world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
-@@ -1072,6 +1073,7 @@ public final class CraftServer implements Server {
+@@ -1052,6 +1053,7 @@ public final class CraftServer implements Server {
                  }
              }
              world.spigotConfig.init(); // Spigot
@@ -85,7 +85,7 @@ index 51d2c974af4610784e91ca04412bdff80f99dc01..92361a187454a7e62a35cff657dcf748
          }
  
          Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
-@@ -1087,6 +1089,7 @@ public final class CraftServer implements Server {
+@@ -1067,6 +1069,7 @@ public final class CraftServer implements Server {
          this.reloadData();
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
          io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
@@ -93,7 +93,7 @@ index 51d2c974af4610784e91ca04412bdff80f99dc01..92361a187454a7e62a35cff657dcf748
          this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -2931,6 +2934,14 @@ public final class CraftServer implements Server {
+@@ -2911,6 +2914,14 @@ public final class CraftServer implements Server {
          {
              return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
          }
@@ -109,7 +109,7 @@ index 51d2c974af4610784e91ca04412bdff80f99dc01..92361a187454a7e62a35cff657dcf748
          @Override
          public void restart() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index e1c99d941c7bb954bf3ac83d5002dbf58fd833b0..4760b943da08771a42fcb22eba4d586df414e388 100644
+index dc13164f498eeb1d52c08f9180c44e96c0478b2e..6f69686d07e92ee4c82c54ccf4a93f01fc5769cf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -165,6 +165,14 @@ public class Main {

patches/server/0008-Fakeplayer-support.patch

@@ -58,10 +58,10 @@ index acc49f66bf34e2507d0ee6fec0a56b11bfc68f46..7fc87841fd72fc9b5bca4fbdffd378c7
          AdvancementProgress advancementprogress = this.getOrStartProgress(advancement);
          boolean flag1 = advancementprogress.isDone();
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 65d947df910d60f478e7a449eb161e5105e2c0c9..56be0c66374b6cb200d43212582fd1280442a6a3 100644
+index fb6cbcc4839aef7dc4bd4a49613f892b07aab353..d9a4e3c12ba4e371c99461c7e522d896f9c89aab 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1584,6 +1584,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1587,6 +1587,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
                      }
                      // Paper end
                      this.serverEntity.removePairing(player);
@@ -281,7 +281,7 @@ index b8c238287e0639b578170c6fec0d4db5a1a59fe7..d57e6c88524482b4d37930d0fd2e9f79
      private int timeUntilHooked;
      private float fishAngle;
 diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-index 71b7a091e56dd68da280d13318a393170967b042..0f18fff8f0b06aa427b13768f8b673d396e6afb3 100644
+index 7bba845462813615224f48322c51c7b480adcaa7..e25a5c2b7731b85303de93b8480f924cef6fe3f4 100644
 --- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 @@ -406,6 +406,8 @@ public abstract class AbstractContainerMenu {
@@ -334,7 +334,7 @@ index dfeb3e336e06ef01f5401a362755030db942bb07..c51413bf02b3572a05f09d2f0d02493d
                                      if (randomsource.nextInt(j) >= world.paperConfig().entities.behavior.playerInsomniaStartTicks) { // Paper
                                          BlockPos blockposition1 = blockposition.above(20 + randomsource.nextInt(15)).east(-10 + randomsource.nextInt(21)).south(-10 + randomsource.nextInt(21));
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 92361a187454a7e62a35cff657dcf748b6d34613..82194109e10772eafb905c6d3b6c3cc2032331b9 100644
+index df3df232bd15794ced84946dc0e95da02d579fe1..347a13b818d55de6ab9502aac61fd807d16fc094 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -260,6 +260,7 @@ import org.yaml.snakeyaml.constructor.SafeConstructor;
@@ -353,7 +353,7 @@ index 92361a187454a7e62a35cff657dcf748b6d34613..82194109e10772eafb905c6d3b6c3cc2
  
      // Paper start - Folia region threading API
      private final io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler regionizedScheduler = new io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler();
-@@ -3156,4 +3158,11 @@ public final class CraftServer implements Server {
+@@ -3136,4 +3138,11 @@ public final class CraftServer implements Server {
      }
  
      // Paper end
@@ -393,7 +393,7 @@ index 2dbe8b870fd39b4d22e9725912f443757ae70761..8388c2a56cbe531cf5f60a18866c85fa
              }
              // Water Animals
 diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
-index 2b970df3db3bc9ab4c9c82807b2adbdb54cd6d9b..6bab938c724fc10149a4008ab8c2142023310d6e 100644
+index 385d8556ac9a657098be35197034ce9d518439df..fc2c965c15e20fcfec962330d3b3f7231db97b56 100644
 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 @@ -8,6 +8,9 @@ import org.bukkit.command.Command;

patches/server/0016-No-chat-sign.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] No chat sign
 
 
 diff --git a/src/main/java/io/papermc/paper/adventure/ChatProcessor.java b/src/main/java/io/papermc/paper/adventure/ChatProcessor.java
-index 774fb97912f766589f3548f659618ad554e0503f..c5678071366c39ae642c8c1a638e3d4de297c26f 100644
+index e4fd372a1d585887287253a02531cd192929377b..fddef26ab6a771c61a5e63c7635bfa051ab8426a 100644
 --- a/src/main/java/io/papermc/paper/adventure/ChatProcessor.java
 +++ b/src/main/java/io/papermc/paper/adventure/ChatProcessor.java
-@@ -353,7 +353,7 @@ public final class ChatProcessor {
+@@ -355,7 +355,7 @@ public final class ChatProcessor {
  
          private void sendToServer(final ChatType.Bound chatType, final @Nullable Function<Audience, net.minecraft.network.chat.Component> msgFunction) {
              final PlayerChatMessage toConsoleMessage = msgFunction == null ? ChatProcessor.this.message : ChatProcessor.this.message.withUnsignedContent(msgFunction.apply(ChatProcessor.this.server.console));
@@ -123,7 +123,7 @@ index 56ae779a44bc361f78188ec3d2bfe88daa0869aa..4e2c9525767136bc29366b2224a5adc5
  
      protected boolean convertOldUsers() {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3c0651fa5a5db880202c9a3805a6455269c5f16d..434e5e1fd280dc5b1bd29fc2a196ce0b803279f7 100644
+index ab58827001b3b42e44d7f701c390480fed1fa1f1..f728382ac721d2204d2cac18f21a43212a08ab7c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2200,10 +2200,27 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic

patches/server/0034-Remove-streams-and-iterators-from-range-check.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Remove streams and iterators from range check
 This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 38962cc5b5e92fca4f9bef002b17d87582faf5a9..1c8d6a00608f0c234af41330ca587d63e767dccd 100644
+index d80d784e2b3fa47c2d264f1a030bddb97f97dc01..b5af9f923cd722792b9597603518594281357ef6 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1600,19 +1600,45 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1603,19 +1603,45 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
              return ChunkMap.this.level.getServer().getScaledTrackingDistance(initialDistance);
          }
  

patches/server/0040-PCA-sync-protocol.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] PCA sync protocol
 This patch is Powered by plusls-carpet-addition(https://github.com/plusls/plusls-carpet-addition)
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 434e5e1fd280dc5b1bd29fc2a196ce0b803279f7..2ed3fba5de71bb36187b8a65f65673a4f426cfd0 100644
+index f728382ac721d2204d2cac18f21a43212a08ab7c..b4d49eb6b01a660777afe2e5bcd259dfb02866f4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -247,6 +247,7 @@ import org.bukkit.inventory.CraftingInventory;
@@ -17,7 +17,7 @@ index 434e5e1fd280dc5b1bd29fc2a196ce0b803279f7..2ed3fba5de71bb36187b8a65f65673a4
  // CraftBukkit end
  
  public class ServerGamePacketListenerImpl implements ServerPlayerConnection, TickablePacketListener, ServerGamePacketListener {
-@@ -3635,6 +3636,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3614,6 +3615,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                  this.disconnect("Invalid payload UNREGISTER!", org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PAYLOAD); // Paper - kick event cause
              }
          } else {
@@ -343,10 +343,10 @@ index b7686fd63b7c5d88c3a12ec4ee9bc01a17f997e0..25a9c38c60d183bb65b14f4d7550ab98
      public int[] getSlotsForFace(Direction side) {
          return ShulkerBoxBlockEntity.SLOTS;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 82194109e10772eafb905c6d3b6c3cc2032331b9..601ceba710e9230fabe1846926025fb1c87c351b 100644
+index 347a13b818d55de6ab9502aac61fd807d16fc094..85de3ff6eedf6b87189ba64de56b3b8b42915a35 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -468,6 +468,7 @@ public final class CraftServer implements Server {
+@@ -470,6 +470,7 @@ public final class CraftServer implements Server {
              MapPalette.setMapColorCache(new CraftMapColorCache(this.logger));
          }
          datapackManager = new io.papermc.paper.datapack.PaperDatapackManager(console.getPackRepository()); // Paper
@@ -354,7 +354,7 @@ index 82194109e10772eafb905c6d3b6c3cc2032331b9..601ceba710e9230fabe1846926025fb1
      }
  
      public boolean getCommandBlockOverride(String command) {
-@@ -1060,6 +1061,13 @@ public final class CraftServer implements Server {
+@@ -1040,6 +1041,13 @@ public final class CraftServer implements Server {
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
          this.console.paperConfigurations.reloadConfigs(this.console);
  		top.leavesmc.leaves.LeavesConfig.init((File) console.options.valueOf("leaves-settings")); // Leaves - Server Config

patches/server/0041-BBOR-Protocol.patch

@@ -18,10 +18,10 @@ index 745ab8b97e6bf3e9a1621558883711eab25f8725..8150ac9c98a30afff5fc04fdec8af6d3
          for (int i = 0; i < this.tickables.size(); ++i) {
              ((Runnable) this.tickables.get(i)).run();
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2ed3fba5de71bb36187b8a65f65673a4f426cfd0..4004b3d068b97efa835798b05aa424d08b8e3229 100644
+index b4d49eb6b01a660777afe2e5bcd259dfb02866f4..cc736da1897c082efcc58dc006c720b9b1ebb70a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3641,6 +3641,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3620,6 +3620,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                  if (top.leavesmc.leaves.LeavesConfig.pcaSyncProtocol && ProtocolUtils.isNamespacePacket(packet, top.leavesmc.leaves.protocol.PcaSyncProtocol.PROTOCOL_ID)) {
                      top.leavesmc.leaves.protocol.PcaSyncProtocol.handlePacket(server, player, packet);
                  }
@@ -77,10 +77,10 @@ index cc224af0139a6e3adefd22cbfa0cd519735b7191..2c3ca05644bc97d505e8ca92e7a5f486
  
      public Level getLevel() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 601ceba710e9230fabe1846926025fb1c87c351b..8160fc590eeb6b13ef73f928dea2f5de20e16798 100644
+index 85de3ff6eedf6b87189ba64de56b3b8b42915a35..569ffe34b169902aa9bc52b5238376ee04959c11 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1068,6 +1068,13 @@ public final class CraftServer implements Server {
+@@ -1048,6 +1048,13 @@ public final class CraftServer implements Server {
              top.leavesmc.leaves.protocol.PcaSyncProtocol.disablePcaSyncProtocolGlobal();
          }
          // Leaves end - pca

patches/server/0044-Jade-Protocol.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Jade Protocol
 This patch is Powered by Jade(https://github.com/Snownee/Jade)
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 4004b3d068b97efa835798b05aa424d08b8e3229..bb0e97bd0f4332a2da1b9f077d61b6f81fbeaaad 100644
+index cc736da1897c082efcc58dc006c720b9b1ebb70a..7b0e956b11817c08b42ee3a7db87d42a090f5b15 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3644,6 +3644,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3623,6 +3623,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                  if (top.leavesmc.leaves.LeavesConfig.bborProtocol && packet.identifier.equals(top.leavesmc.leaves.protocol.BBORProtocol.SUBSCRIBE)) {
                      top.leavesmc.leaves.protocol.BBORProtocol.onPlayerSubscribed(player);
                  }
@@ -45,10 +45,10 @@ index 4aeab90e778629c355189dfe79c39c4b21f5f5ac..fe8c9b7e7956837829b4fe3eb449b2c0
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8160fc590eeb6b13ef73f928dea2f5de20e16798..3417c4184f7a9516c3910d4ccf8f139ba96e3224 100644
+index 569ffe34b169902aa9bc52b5238376ee04959c11..ac22b1e5a6cecc74a0608a6856821a8771acc42b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -469,6 +469,7 @@ public final class CraftServer implements Server {
+@@ -471,6 +471,7 @@ public final class CraftServer implements Server {
          }
          datapackManager = new io.papermc.paper.datapack.PaperDatapackManager(console.getPackRepository()); // Paper
          top.leavesmc.leaves.protocol.PcaSyncProtocol.init(); // Leaves - pca
@@ -56,7 +56,7 @@ index 8160fc590eeb6b13ef73f928dea2f5de20e16798..3417c4184f7a9516c3910d4ccf8f139b
      }
  
      public boolean getCommandBlockOverride(String command) {
-@@ -1075,6 +1076,11 @@ public final class CraftServer implements Server {
+@@ -1055,6 +1056,11 @@ public final class CraftServer implements Server {
              top.leavesmc.leaves.protocol.BBORProtocol.loggedOutAllPlayer();
          }
          // Leaves end - bbor

patches/server/0050-MC-Technical-Survival-Mode.patch

@@ -19,10 +19,10 @@ index abd0217cf0bff183c8e262edc173a53403797c1a..f2659e1973e7ef5c5b64ba0bf3b27e5d
                  final long timeout;
                  if (type == RegionizedPlayerChunkLoader.REGION_PLAYER_TICKET && delayTimeout > 0) {
 diff --git a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
-index e471960e0443392f6f54732b052a4debf2a8fd97..08f61d48f3484cb04a94955b0b4b2981bf169358 100644
+index 2d3068b7748032342edd81e6ea4a7c08988fb28d..e4cca02e5578d5884cf31d52796021d9fae31715 100644
 --- a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
 +++ b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
-@@ -295,6 +295,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
+@@ -298,6 +298,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
              for (ServerLevel level : server.getAllLevels()) {
                  this.createWorldConfig(createWorldContextMap(level), reloader(this.worldConfigClass, level.paperConfig()));
              }
@@ -83,10 +83,10 @@ index e30d5ae3e2900f43d7cafde71b8196f26e872841..79bfd7b5da13197c2d3f7dbf9c3154dd
                  if (playerReputation != null) {
                      playerReputation.remove(GossipType.MAJOR_POSITIVE);
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-index 1b7cf6d06bdf36f146656727511a461f2520762e..0eb8c5dc84c3ca346dcaf6fd50c13d3b060f87d1 100644
+index a90317100d32974e481e14476843f66997a2cf3a..34029cdf229ef8f78ddb0c8a2e5e0542628848d8 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-@@ -115,7 +115,7 @@ public abstract class Projectile extends Entity implements TraceableEntity {
+@@ -122,7 +122,7 @@ public abstract class Projectile extends Entity implements TraceableEntity {
          if (nbt.hasUUID("Owner")) {
              this.ownerUUID = nbt.getUUID("Owner");
              this.cachedOwner = null;
@@ -109,7 +109,7 @@ index 9af07ebff3a510a4e3fc71ab4d08897db02b7299..81eaa7ead4821929f20e4c5fcb822504
                          entity.spawnReason == org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.CHUNK_GEN)) {
                      continue;
 diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
-index 75a423cb695bb807e38b17fcc999b4114a8c3579..36d878c5bd82ff8773f9f27024f2ff8ce67dd9f6 100644
+index 0665edaed2b578b87723ca637fc54c7bd871ecc9..da71e9ba7d341c7a66199e927a46e842fdab065e 100644
 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 @@ -2,6 +2,7 @@ package top.leavesmc.leaves;

patches/server/0052-Appleskin-Protocol.patch

@@ -37,10 +37,10 @@ index 00fa187c70c6c0f7eea03fbd320fb938addcb410..d29db001f12c072fbba1f981ca02880c
          ServerLevel worldserver = entityplayer.serverLevel();
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3417c4184f7a9516c3910d4ccf8f139ba96e3224..47b27712c6ed11fc5c2cd7de04482870207545e7 100644
+index ac22b1e5a6cecc74a0608a6856821a8771acc42b..5f50169af0dcbd7931f0118815005607a2d3ba0c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1081,6 +1081,13 @@ public final class CraftServer implements Server {
+@@ -1061,6 +1061,13 @@ public final class CraftServer implements Server {
              top.leavesmc.leaves.protocol.JadeProtocol.enableAllPlayer();
          }
          // Leaves end - Jade

patches/server/0054-Leaves-Extra-Yggdrasil-Service.patch

@@ -18,10 +18,10 @@ index 1459a1f99fe614d072a087cda18788cf13102645..73bfda834fa704b208a5dd9271bb397a
          super(proxy);
          this.environment = EnvironmentParser.getEnvironmentFromProperties().orElse(YggdrasilEnvironment.PROD.getEnvironment());
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index dae36c6452ccd57a436dd918547b64d59957ab0a..973ecf723e4239307600b42f2d12c264f44d1827 100644
+index a7ebf851a65231074c89a24f30de4ac2fb5b63e4..686c9d7e71c1ffba2d63198afaeecc0c679dd3ea 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
-@@ -193,7 +193,7 @@ public class Main {
+@@ -204,7 +204,7 @@ public class Main {
                  file = new File(bukkitConfiguration.getString("settings.world-container", "."));
              }
              // Paper end - fix SPIGOT-5824
@@ -44,7 +44,7 @@ index c748b29bf2d4382215bffd41854f70fd15f9411e..43638595413bbcc5dcaf04daa8c1df05
      public final Thread serverThread;
      private long nextTickTime;
 diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
-index 36d878c5bd82ff8773f9f27024f2ff8ce67dd9f6..3baae7c57985582608e9cab9137c35938e953088 100644
+index da71e9ba7d341c7a66199e927a46e842fdab065e..f0e28ad726fd9de56df7fcf78f18309e744a626f 100644
 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 @@ -11,6 +11,7 @@ import org.bukkit.configuration.file.YamlConfiguration;

patches/server/0058-Syncmatica-Protocol.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Syncmatica Protocol
 This patch is Powered by Syncmatica(https://github.com/End-Tech/syncmatica)
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index bb0e97bd0f4332a2da1b9f077d61b6f81fbeaaad..b2be14056502a902f8fd2caaacaffc5d01776051 100644
+index 7b0e956b11817c08b42ee3a7db87d42a090f5b15..6775fbfe4051ae639f753d618fc6d5a17db2326b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -324,6 +324,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -43,7 +43,7 @@ index bb0e97bd0f4332a2da1b9f077d61b6f81fbeaaad..b2be14056502a902f8fd2caaacaffc5d
          this.chatMessageChain.close();
          ServerGamePacketListenerImpl.LOGGER.info("{} lost connection: {}", this.player.getName().getString(), reason.getString());
          // CraftBukkit start - Replace vanilla quit message handling with our own.
-@@ -3647,6 +3660,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3626,6 +3639,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                  if (top.leavesmc.leaves.LeavesConfig.jadeProtocol && ProtocolUtils.isNamespacePacket(packet, top.leavesmc.leaves.protocol.JadeProtocol.PROTOCOL_ID)) {
                      top.leavesmc.leaves.protocol.JadeProtocol.handlePacket(server, player, packet);
                  }
@@ -54,7 +54,7 @@ index bb0e97bd0f4332a2da1b9f077d61b6f81fbeaaad..b2be14056502a902f8fd2caaacaffc5d
                  ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex);
                  this.disconnect("Invalid custom payload!", org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PAYLOAD);
 diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
-index 3baae7c57985582608e9cab9137c35938e953088..01b542a393d81bf1df61fcfa78dab8ea66ae77ab 100644
+index f0e28ad726fd9de56df7fcf78f18309e744a626f..a60c13ddbc4e9147324e8442ff48974f6dd35dbf 100644
 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 @@ -12,6 +12,7 @@ import top.leavesmc.leaves.command.LeavesCommand;

patches/server/0065-Disable-check-out-of-order-command.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Disable check out-of-order command
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 0b5bea46ed8695cd50d37cecf0d37417661e7121..6d527cdb75e767182dce5b338322a9c27b21d5b8 100644
+index 3c9bb5ca6ff709acff498f49d5ae4e31414751b9..e3bbf4f1889688a8306a48b4f4abd3e4d8510816 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2416,7 +2416,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -16,4 +16,4 @@ index 0b5bea46ed8695cd50d37cecf0d37417661e7121..6d527cdb75e767182dce5b338322a9c2
 +        if (!top.leavesmc.leaves.LeavesConfig.disableCheckOutOfOrderCommand && !this.updateChatOrder(timestamp)) { // Leaves - disable check to support Velocity
              ServerGamePacketListenerImpl.LOGGER.warn("{} sent out-of-order chat: '{}': {} > {}", this.player.getName().getString(), message, this.lastChatTimeStamp.get().getEpochSecond(), timestamp.getEpochSecond()); // Paper
              this.server.scheduleOnMain(() -> { // Paper - push to main
-             this.disconnect(Component.translatable("multiplayer.disconnect.out_of_order_chat"), org.bukkit.event.player.PlayerKickEvent.Cause.OUT_OF_ORDER_CHAT); // Paper - kick event ca
+             this.disconnect(Component.translatable("multiplayer.disconnect.out_of_order_chat"), org.bukkit.event.player.PlayerKickEvent.Cause.OUT_OF_ORDER_CHAT); // Paper - kick event causes

patches/server/0067-Leaves-carpet-support.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Leaves carpet support
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6d527cdb75e767182dce5b338322a9c27b21d5b8..7634fc05f7e1bd12c9c6aa9204af613364ec5e7f 100644
+index e3bbf4f1889688a8306a48b4f4abd3e4d8510816..4a12e0a1aed4db5453b7fb1e14ae03bc9e1e2b4e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3663,6 +3663,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3642,6 +3642,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                  if (top.leavesmc.leaves.LeavesConfig.syncmaticaProtocol && ProtocolUtils.isNamespacePacket(packet, top.leavesmc.leaves.protocol.syncmatica.SyncmaticaProtocol.PROTOCOL_ID)) {
                      top.leavesmc.leaves.protocol.syncmatica.SyncmaticaProtocol.getCommunicationManager().onPacketGet(packet, this);
                  }
@@ -31,7 +31,7 @@ index 7bb6b4da0495b2ad5a95e858f01577afe157d470..a137b9bff6595594ebe149ff766abd9e
          final net.kyori.adventure.text.Component jm = playerJoinEvent.joinMessage();
  
 diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
-index 01b542a393d81bf1df61fcfa78dab8ea66ae77ab..944a4bac0042d43dd5da809ce9feef56b9f6c0ed 100644
+index a60c13ddbc4e9147324e8442ff48974f6dd35dbf..296aa94bb0bf21d1c6c1bed7aa791bc611cd8b2a 100644
 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 @@ -14,6 +14,8 @@ import top.leavesmc.leaves.bot.agent.Actions;

patches/server/0073-Elytra-aeronautics-no-chunk-load.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Elytra aeronautics no chunk load
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 1c8d6a00608f0c234af41330ca587d63e767dccd..ce4388a1464bb6c90ca4b6757159085dea844e87 100644
+index b5af9f923cd722792b9597603518594281357ef6..65e4682a756ad698fefcf3e1be204cedfa3d78f7 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -195,7 +195,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -26,7 +26,7 @@ index 1c8d6a00608f0c234af41330ca587d63e767dccd..ce4388a1464bb6c90ca4b6757159085d
          this.level.playerChunkLoader.removePlayer(player); // Paper - replace chunk loader
  
          // Paper start - optimise ChunkMap#anyPlayerCloseEnoughForSpawning
-@@ -1100,7 +1100,8 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1103,7 +1103,8 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
      }
  
      private boolean skipPlayer(ServerPlayer player) {
@@ -36,7 +36,7 @@ index 1c8d6a00608f0c234af41330ca587d63e767dccd..ce4388a1464bb6c90ca4b6757159085d
      }
  
      void updatePlayerStatus(ServerPlayer player, boolean added) {
-@@ -1141,6 +1142,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1144,6 +1145,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
      public void move(ServerPlayer player) {
          // Paper - delay this logic for the entity tracker tick, no need to duplicate it
  
@@ -45,7 +45,7 @@ index 1c8d6a00608f0c234af41330ca587d63e767dccd..ce4388a1464bb6c90ca4b6757159085d
          int j = SectionPos.blockToSectionCoord(player.getBlockZ());
          SectionPos sectionposition = player.getLastSectionPos();
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 7634fc05f7e1bd12c9c6aa9204af613364ec5e7f..3d7e2654d67b9b61cf783e234e33576a03351413 100644
+index 4a12e0a1aed4db5453b7fb1e14ae03bc9e1e2b4e..dcfd2f0bf4ed51c6a74d9e4ec619b8b0da571ba3 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -655,7 +655,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic

patches/server/0074-Disable-timings-default.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Disable timings default
 
 
 diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index 019d3bbd78fb0b06861979d223915fedb6c99442..269936bb2a631a8a4452d9c62760c2aa7aeaf014 100644
+index 3bc7230ca62ebe3426da293e436a962bb0134f85..8ea4317e9d5a74943345c6669c99e53ad3030999 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-@@ -89,8 +89,8 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -90,8 +90,8 @@ public class GlobalConfiguration extends ConfigurationPart {
      public Timings timings;
  
      public class Timings extends ConfigurationPart.Post {

patches/server/0075-Bladeren-mspt-sync-protocol.patch

@@ -29,10 +29,10 @@ index a137b9bff6595594ebe149ff766abd9edea04294..7ee3840b1e44f3b9596ca839e252cdee
          ServerLevel worldserver = entityplayer.serverLevel();
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 47b27712c6ed11fc5c2cd7de04482870207545e7..93054a59f14fee933a908944e93b462b5dae2ce6 100644
+index 5f50169af0dcbd7931f0118815005607a2d3ba0c..c04aa86e53633e4def6f6a9c4b5e667e82756672 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -470,6 +470,7 @@ public final class CraftServer implements Server {
+@@ -472,6 +472,7 @@ public final class CraftServer implements Server {
          datapackManager = new io.papermc.paper.datapack.PaperDatapackManager(console.getPackRepository()); // Paper
          top.leavesmc.leaves.protocol.PcaSyncProtocol.init(); // Leaves - pca
          top.leavesmc.leaves.protocol.JadeProtocol.init(); // Leaves - Jade

patches/server/0078-Leaves-protocol.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Leaves protocol
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3d7e2654d67b9b61cf783e234e33576a03351413..f5e16e9f144824a78ccd4a9fa0a5c0f3364fdf5d 100644
+index dcfd2f0bf4ed51c6a74d9e4ec619b8b0da571ba3..1faea96ca133e4280f90aff86efbfbace370b273 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3666,6 +3666,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3645,6 +3645,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                  if (top.leavesmc.leaves.LeavesConfig.leavesCarpetSupport && ProtocolUtils.isNamespacePacket(packet, top.leavesmc.leaves.protocol.CarpetServerProtocol.PROTOCOL_ID)) {
                      top.leavesmc.leaves.protocol.CarpetServerProtocol.handlePacket(player, packet);
                  }
@@ -31,7 +31,7 @@ index 7ee3840b1e44f3b9596ca839e252cdee3d41eda6..c9b5184baefae815e94e041a9ce41557
          final net.kyori.adventure.text.Component jm = playerJoinEvent.joinMessage();
  
 diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
-index 944a4bac0042d43dd5da809ce9feef56b9f6c0ed..ee079956d675a51a18b1ad3382d0b70ad19a4b8e 100644
+index 296aa94bb0bf21d1c6c1bed7aa791bc611cd8b2a..481c9b2755a923a31e1af10a374d4973035ef785 100644
 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 @@ -16,6 +16,8 @@ import top.leavesmc.leaves.protocol.syncmatica.SyncmaticaProtocol;

patches/server/0080-No-block-update-command.patch

@@ -17,10 +17,10 @@ index 4453664ac91eb727e340ace3b6bdb083541f816c..55ef6d5ffebe04e678dc89ec2740f031
              // CraftBukkit start
              if (populating) {
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 879cc823d56625867eb73bb621db6a13f40ad81c..fac8de87a096e2f3ba71fc4043acf66491c5b62b 100644
+index d138660e459b2d09ba9dd7ae2bf3da499d9ae25c..846ee484d48db1f80b95b526b5321826a00a6507 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -453,7 +453,7 @@ public final class ItemStack {
+@@ -454,7 +454,7 @@ public final class ItemStack {
                          net.minecraft.world.level.block.state.BlockState block = world.getBlockState(newblockposition);
  
                          if (!(block.getBlock() instanceof BaseEntityBlock)) { // Containers get placed automatically
@@ -92,7 +92,7 @@ index 2708251ebc1995e71fb0e5dca9e158a3005f8a8a..e28351b379677fec356b6efec2d882ee
      }
  }
 diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
-index ee079956d675a51a18b1ad3382d0b70ad19a4b8e..d3844b3cd255333b1a65aff34e4ccd23e4abfaaa 100644
+index 481c9b2755a923a31e1af10a374d4973035ef785..e64992dfa61d9009f326659dbaf7b5c8601555fd 100644
 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 @@ -11,6 +11,7 @@ import org.bukkit.configuration.file.YamlConfiguration;

patches/server/0093-Disable-packet-limit.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Disable packet limit
 
 
 diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index 269936bb2a631a8a4452d9c62760c2aa7aeaf014..7d5a6ec1995a3f9483209836746a552d9c005669 100644
+index 8ea4317e9d5a74943345c6669c99e53ad3030999..b58bb019dd0fc2c5e19fc5122219e689456f6373 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-@@ -251,7 +251,7 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -252,7 +252,7 @@ public class GlobalConfiguration extends ConfigurationPart {
              }
  
              public boolean isEnabled() {

patches/server/0094-Reduce-array-allocations.patch

@@ -202,7 +202,7 @@ index 25ad2c6ff968f4a6b16b4dea3f67341a4261f2a4..478bc2428e133414d13e9a44ad7c2c56
  
      @Override
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index cf20f0983fc25b26cf92b9d3a28746b1909fc56b..c8d62a76bfa1a54b6ecb23f0d53ba2db15fcb1f7 100644
+index 52cb6476604c98465f81ff9e8d8344d7536a8868..ed41259f7fdf1f23b2cf00a29957d45ae8b61cc1 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -47,6 +47,7 @@ import org.apache.commons.lang3.Validate;
@@ -266,7 +266,7 @@ index 55ef6d5ffebe04e678dc89ec2740f031af361cb8..4c86d1836c8b4ac9c535cf5bccd71dec
          return ret;
      }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f5e16e9f144824a78ccd4a9fa0a5c0f3364fdf5d..43dc38afc03323ebf4192f58a7703402f9379ade 100644
+index 1faea96ca133e4280f90aff86efbfbace370b273..172d8c9d8c46e242f467fd8a6c89b40e3419a8e5 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -249,6 +249,7 @@ import org.bukkit.inventory.InventoryView;
@@ -302,7 +302,7 @@ index f5e16e9f144824a78ccd4a9fa0a5c0f3364fdf5d..43dc38afc03323ebf4192f58a7703402
              return;
          }
          // Paper end
-@@ -3380,7 +3381,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3359,7 +3360,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          // Paper start
          if (!org.bukkit.Bukkit.isPrimaryThread()) {
              if (this.recipeSpamPackets.addAndGet(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamIncrement) > io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamLimit) {
@@ -429,10 +429,10 @@ index d56f683a5d043f3be624a94d889acc1df0e95554..7e3265028cce8cafd7da9d1aaa41856f
  
          for (int j = 0; j < i; ++j) {
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index e65ce75e2d44843afa6c4a033885a55dcb43c635..a54d43e5172afdb7850b2a52436c9a3d93cccef7 100644
+index 9938f9f5cecb11401d0fa73d34c638fd39dc0759..bd2d37d9a64765083ca296e9b113e2ff3172be59 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -1073,7 +1073,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -1080,7 +1080,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
      @Override
      protected void dropCustomDeathLoot(DamageSource source, int lootingMultiplier, boolean allowDrops) {
          super.dropCustomDeathLoot(source, lootingMultiplier, allowDrops);
@@ -441,7 +441,7 @@ index e65ce75e2d44843afa6c4a033885a55dcb43c635..a54d43e5172afdb7850b2a52436c9a3d
          int j = aenumitemslot.length;
  
          for (int k = 0; k < j; ++k) {
-@@ -1135,7 +1135,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -1142,7 +1142,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
              }
  
              boolean flag = true;
@@ -450,7 +450,7 @@ index e65ce75e2d44843afa6c4a033885a55dcb43c635..a54d43e5172afdb7850b2a52436c9a3d
              int j = aenumitemslot.length;
  
              for (int k = 0; k < j; ++k) {
-@@ -1222,7 +1222,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -1229,7 +1229,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
          float f = localDifficulty.getSpecialMultiplier();
  
          this.enchantSpawnedWeapon(random, f);
@@ -459,7 +459,7 @@ index e65ce75e2d44843afa6c4a033885a55dcb43c635..a54d43e5172afdb7850b2a52436c9a3d
          int i = aenumitemslot.length;
  
          for (int j = 0; j < i; ++j) {
-@@ -1441,7 +1441,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -1448,7 +1448,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
                  t0.setInvulnerable(this.isInvulnerable());
                  if (flag) {
                      t0.setCanPickUpLoot(this.canPickUpLoot());
@@ -482,10 +482,10 @@ index 25ed5571b24e590bc95056020d84496492b53298..89d7364bc645a8b9217e87780cdc0ced
  
          for (int j = 0; j < i; ++j) {
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index fac8de87a096e2f3ba71fc4043acf66491c5b62b..eaa5d29c3e4c32db21cc72295551d81b65e274b7 100644
+index 846ee484d48db1f80b95b526b5321826a00a6507..a7e29846aea91b31a3b0c31b7917d3fbd8b33624 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -1019,7 +1019,7 @@ public final class ItemStack {
+@@ -1020,7 +1020,7 @@ public final class ItemStack {
          int k;
  
          if (ItemStack.shouldShowInTooltip(i, ItemStack.TooltipPart.MODIFIERS)) {
@@ -533,7 +533,7 @@ index 2bfbdaeb2b0d99dfd956cd5936403fe8b0eeae64..7ad1545631604aa55f6d4fbdcbaefe6d
      public Enchantments() {}
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index fdb171a28f73f6a0fae5aba669014edd4fee83b8..47ccf2ef6fb6fd05d6be5457a7ecde0faa99aeb7 100644
+index 79d3a24d9bb9bf5da84283bcbb70fec101082199..e126c62ecb9ca29c97a6b3ff4264adb177d352ea 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -104,6 +104,7 @@ import org.bukkit.entity.SpawnCategory;

patches/server/0095-Optimize-sun-burn-tick.patch

@@ -34,10 +34,10 @@ index 2a3baba3e0318f67bb65dbd5adac0675102bc771..ab9f64289bf4628f9087e0530f66b354
      public void absMoveTo(double x, double y, double z, float yaw, float pitch) {
          this.absMoveTo(x, y, z);
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index a54d43e5172afdb7850b2a52436c9a3d93cccef7..11abe44b4df0e5bf838ad3a888d3d110bf576c3d 100644
+index bd2d37d9a64765083ca296e9b113e2ff3172be59..f4dc005b89ba840bf032ea3e98bb5a7d08e0b8ea 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -1697,15 +1697,41 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -1704,15 +1704,41 @@ public abstract class Mob extends LivingEntity implements Targeting {
  
      }
  

patches/server/0113-Replay-Mod-API.patch

@@ -319,7 +319,7 @@ index 63149cfdfbc129fa02070e06d44a9417dbde7c5f..6f609ec7a9814a44afc82aa504010519
          this.server.getCustomBossEvents().onPlayerDisconnect(entityplayer);
          UUID uuid = entityplayer.getUUID();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 93054a59f14fee933a908944e93b462b5dae2ce6..9f8981989d9f650ccdbd8b2f2a76eeedfa9e0008 100644
+index c04aa86e53633e4def6f6a9c4b5e667e82756672..1106be0a96e65618db47c52d9d13b0a0ee673a27 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -261,6 +261,7 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
@@ -347,7 +347,7 @@ index 93054a59f14fee933a908944e93b462b5dae2ce6..9f8981989d9f650ccdbd8b2f2a76eeed
              @Override
              public CraftPlayer apply(ServerPlayer player) {
                  return player.getBukkitEntity();
-@@ -3194,4 +3196,11 @@ public final class CraftServer implements Server {
+@@ -3174,4 +3176,11 @@ public final class CraftServer implements Server {
          return botManager;
      }
      // Leaves end - Bot API

patches/server/0118-Delete-Timings.patch

@@ -784,7 +784,7 @@ index 51304c5cf4b0ac7646693ef97ef4a3847d3342b5..546a3a551f8b6e786e6644bb91e49905
          }
  
 diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index 7d5a6ec1995a3f9483209836746a552d9c005669..fd848fa0237344d8134ce6905603f4c413745028 100644
+index b58bb019dd0fc2c5e19fc5122219e689456f6373..ba7cb3d9a059f80ba746705e68b17b3021ad0cd5 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 @@ -1,6 +1,5 @@
@@ -793,8 +793,8 @@ index 7d5a6ec1995a3f9483209836746a552d9c005669..fd848fa0237344d8134ce6905603f4c4
 -import co.aikar.timings.MinecraftTimings;
  import io.papermc.paper.configuration.constraint.Constraint;
  import io.papermc.paper.configuration.constraint.Constraints;
- import net.kyori.adventure.text.Component;
+ import io.papermc.paper.configuration.type.IntOr;
-@@ -103,7 +102,6 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -104,7 +103,6 @@ public class GlobalConfiguration extends ConfigurationPart {
  
          @Override
          public void postProcess() {
@@ -1178,7 +1178,7 @@ index f8edbc95ffe7de0341e5724ad3efe69c74e95a07..2390788d6a472d900e1cf014e4c4a683
          // Paper start
          if (waitableArray[0] != null) {
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index a1bf598332fafe372b98e331a92c48b948ac29f7..ed7154afa61d8e555346f17543280f106ab97e37 100644
+index 625e23b098fe65ffed839953550c0465d07fb1f8..e4571ebeb757ae7c0d2bd42821d5e7434ab05c90 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1,13 +1,10 @@
@@ -1280,7 +1280,7 @@ index a1bf598332fafe372b98e331a92c48b948ac29f7..ed7154afa61d8e555346f17543280f10
  // CraftBukkit end
  
  import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet; // Paper
-@@ -639,15 +616,11 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -642,15 +619,11 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
      protected void tick(BooleanSupplier shouldKeepTicking) {
          ProfilerFiller gameprofilerfiller = this.level.getProfiler();
  
@@ -1296,7 +1296,7 @@ index a1bf598332fafe372b98e331a92c48b948ac29f7..ed7154afa61d8e555346f17543280f10
          }
  
          gameprofilerfiller.pop();
-@@ -1271,24 +1244,14 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1274,24 +1247,14 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
  
      // Paper start - optimised tracker
      private final void processTrackQueue() {
@@ -1326,7 +1326,7 @@ index a1bf598332fafe372b98e331a92c48b948ac29f7..ed7154afa61d8e555346f17543280f10
          }
      }
      // Paper end - optimised tracker
-@@ -1303,7 +1266,6 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1306,7 +1269,6 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          List<ServerPlayer> list = Lists.newArrayList();
          List<ServerPlayer> list1 = this.level.players();
          ObjectIterator objectiterator = this.entityMap.values().iterator();
@@ -1334,7 +1334,7 @@ index a1bf598332fafe372b98e331a92c48b948ac29f7..ed7154afa61d8e555346f17543280f10
  
          ChunkMap.TrackedEntity playerchunkmap_entitytracker;
  
-@@ -1328,17 +1290,14 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1331,17 +1293,14 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
                  playerchunkmap_entitytracker.serverEntity.sendChanges();
              }
          }
@@ -1683,18 +1683,18 @@ index 4c86d1836c8b4ac9c535cf5bccd71decf996278b..9c90318d1b0dca4d58ceb705a6a377fd
  
          } else if (close) { chunkproviderserver.close(false); } // Paper - rewrite chunk system
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 43dc38afc03323ebf4192f58a7703402f9379ade..e22cf5ed3c905d0536cad7ac23b7d94f755aa518 100644
+index 172d8c9d8c46e242f467fd8a6c89b40e3419a8e5..9b4bdbd98ed4d2a39d5908b0ba29f85ec6d45799 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2588,7 +2588,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2567,7 +2567,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
-             }
+ 
-         }
+     public void handleCommand(String s) { // Paper - private -> public
-         // Paper End
+         org.spigotmc.AsyncCatcher.catchOp("Command Dispatched Async: " + s); // Paper - Add async catcher
 -        co.aikar.timings.MinecraftTimings.playerCommandTimer.startTiming(); // Paper
          if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot
          this.LOGGER.info(this.player.getScoreboardName() + " issued server command: " + s);
  
-@@ -2598,7 +2597,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2577,20 +2576,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          this.cserver.getPluginManager().callEvent(event);
  
          if (event.isCancelled()) {
@@ -1702,10 +1702,15 @@ index 43dc38afc03323ebf4192f58a7703402f9379ade..e22cf5ed3c905d0536cad7ac23b7d94f
              return;
          }
  
-@@ -2610,8 +2608,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+         try {
+-            if (this.cserver.dispatchCommand(event.getPlayer(), event.getMessage().substring(1))) {
+-                return;
+-            }
++            this.cserver.dispatchCommand(event.getPlayer(), event.getMessage().substring(1));
+         } catch (org.bukkit.command.CommandException ex) {
              player.sendMessage(org.bukkit.ChatColor.RED + "An internal error occurred while attempting to perform this command");
              java.util.logging.Logger.getLogger(ServerGamePacketListenerImpl.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
-             return;
+-            return;
 -        } finally {
 -            co.aikar.timings.MinecraftTimings.playerCommandTimer.stopTiming(); // Paper
          }
@@ -1854,7 +1859,7 @@ index fcdb9bde8e1605e30dde3e580491522d4b62cdc0..b68c69a7ab71926ecf478d8daa5ec5ac
  
      }
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 47ccf2ef6fb6fd05d6be5457a7ecde0faa99aeb7..f1f0bcaf552bce80fcb793f1e2bb6dec71a0ede8 100644
+index e126c62ecb9ca29c97a6b3ff4264adb177d352ea..04891bbab0259060af2c0ac87550b77a76ee71e4 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -1,10 +1,7 @@
@@ -2048,6 +2053,30 @@ index 767ea67271b618d28aa77af683a1889917847e65..e34e6fa60cedb925e2cb6f3a031d4157
                      }
                  }
              }
+diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
+index 6f69686d07e92ee4c82c54ccf4a93f01fc5769cf..0ff5f39589c33a885f18fdd5d04016b02100b9c3 100644
+--- a/src/main/java/org/bukkit/craftbukkit/Main.java
++++ b/src/main/java/org/bukkit/craftbukkit/Main.java
+@@ -350,8 +350,8 @@ public class Main {
+             tryPreloadClass("org.jline.terminal.impl.MouseSupport");
+             tryPreloadClass("org.jline.terminal.impl.MouseSupport$1");
+             tryPreloadClass("org.jline.terminal.Terminal$MouseTracking");
+-            tryPreloadClass("co.aikar.timings.TimingHistory");
+-            tryPreloadClass("co.aikar.timings.TimingHistory$MinuteReport");
++            // tryPreloadClass("co.aikar.timings.TimingHistory"); Leaves - remove timings
++            // tryPreloadClass("co.aikar.timings.TimingHistory$MinuteReport"); Leaves - remove timings
+             tryPreloadClass("io.netty.channel.AbstractChannelHandlerContext");
+             tryPreloadClass("io.netty.channel.AbstractChannelHandlerContext$11");
+             tryPreloadClass("io.netty.channel.AbstractChannelHandlerContext$12");
+@@ -364,7 +364,7 @@ public class Main {
+             tryPreloadClass("org.bukkit.craftbukkit.scheduler.CraftScheduler$1");
+             tryPreloadClass("org.bukkit.craftbukkit.scheduler.CraftScheduler$2");
+             tryPreloadClass("org.bukkit.craftbukkit.scheduler.CraftScheduler$3");
+-            tryPreloadClass("org.bukkit.craftbukkit.scheduler.CraftScheduler$4");
++            // tryPreloadClass("org.bukkit.craftbukkit.scheduler.CraftScheduler$4"); Leaves - remove timings
+             tryPreloadClass("org.slf4j.helpers.MessageFormatter");
+             tryPreloadClass("org.slf4j.helpers.FormattingTuple");
+             tryPreloadClass("org.slf4j.helpers.BasicMarker");
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 index d7ce4971d9271dbeff4adb9d852e4e7bdf60bf03..c993fde1c026a270f370c437edba9e679aefb44f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java

patches/server/0123-Servux-Protocol.patch

@@ -17,10 +17,10 @@ index fba016014ffc628887dc873cfa54f8c76a72c7ef..3201913bd2fba0038ab4853931a641e3
          for (int i = 0; i < this.tickables.size(); ++i) {
              ((Runnable) this.tickables.get(i)).run();
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e22cf5ed3c905d0536cad7ac23b7d94f755aa518..5f3b0cd7cbe6ca840b8a9c2072bf54ef12eb11b9 100644
+index 9b4bdbd98ed4d2a39d5908b0ba29f85ec6d45799..52d400b81ed45fc40983b7a238b5f8f679380471 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3629,6 +3629,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3605,6 +3605,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
              try {
                  String channels = packet.data.toString(com.google.common.base.Charsets.UTF_8);
                  for (String channel : channels.split("\0")) {