diff --git a/build.gradle.kts b/build.gradle.kts
index 41b99091..6e101cd6 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
     java
     `maven-publish`
     id("com.github.johnrengelman.shadow") version "8.1.1" apply false
-    id("io.papermc.paperweight.patcher") version "1.5.11"
+    id("io.papermc.paperweight.patcher") version "1.5.13"
 }
 
 repositories {
diff --git a/gradle.properties b/gradle.properties
index fe1b1156..d9ca8839 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,6 +4,6 @@ version=1.20.4-R0.1-SNAPSHOT
 mcVersion=1.20.4
 packageVersion=1_20_R3
 org.gradle.jvmargs=-Xmx2G
-paperRef=710dced8b70c995656a24479f9453676cf6164fc
+paperRef=5436d44bf2509ff89129f8790ee4643f09c72871
 preVersion=false
 updatingMinecraft=false
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 744c64d1..20db9ad5 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 547ba0c2..31042a67 100755
--- a/gradlew
+++ b/gradlew
@@ -145,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -153,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -202,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
diff --git a/gradlew.bat b/gradlew.bat
index 2578005b..0faad1ae 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
diff --git a/patches/api/0001-Leaves-Server-Config.patch b/patches/api/0001-Leaves-Server-Config.patch
index a815ac48..0268ce06 100644
--- a/patches/api/0001-Leaves-Server-Config.patch
+++ b/patches/api/0001-Leaves-Server-Config.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Leaves Server Config
 
 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 0eb61b090d6f8fa6d99735ff3680dac774c52c1f..73e2c2b0bc646eabd050b6cbfc34f0688930b6b1 100644
+index 4ff1b38eb65f97344257204cf018f176f247ed36..cc119de8e5912eae124be1d6c94f73b77682de41 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2228,6 +2228,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2234,6 +2234,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
              throw new UnsupportedOperationException("Not supported yet.");
          }
          // Paper end
diff --git a/patches/api/0003-Add-fakeplayer-api.patch b/patches/api/0003-Add-fakeplayer-api.patch
index a7fcadf9..13445bca 100644
--- a/patches/api/0003-Add-fakeplayer-api.patch
+++ b/patches/api/0003-Add-fakeplayer-api.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add fakeplayer api
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index db46e3233edf18bd91a6da8612ccc9f0080d5c17..ec89e0b3f1a9d304fb5e02f4cc90777dc63d86a8 100644
+index 9a428153f34291bdc026a71f7e60e285b7794b0c..824982037eb064d536ac09c303d3bdd225355a6a 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -59,6 +59,7 @@ import org.jetbrains.annotations.Contract;
@@ -16,7 +16,7 @@ index db46e3233edf18bd91a6da8612ccc9f0080d5c17..ec89e0b3f1a9d304fb5e02f4cc90777d
  
  /**
   * Represents the Bukkit core, for version and Server singleton handling
-@@ -2874,6 +2875,17 @@ public final class Bukkit {
+@@ -2880,6 +2881,17 @@ public final class Bukkit {
      }
      // Paper end - Folia region threading API
  
@@ -35,7 +35,7 @@ index db46e3233edf18bd91a6da8612ccc9f0080d5c17..ec89e0b3f1a9d304fb5e02f4cc90777d
      public static Server.Spigot spigot() {
          return server.spigot();
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 73e2c2b0bc646eabd050b6cbfc34f0688930b6b1..f0355ec2791772ca20118dda0df82eb2c167e51a 100644
+index cc119de8e5912eae124be1d6c94f73b77682de41..34196590f64f1c65c691b305b402b888b524c1d7 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -59,6 +59,7 @@ import org.bukkit.util.CachedServerIcon;
@@ -46,7 +46,7 @@ index 73e2c2b0bc646eabd050b6cbfc34f0688930b6b1..f0355ec2791772ca20118dda0df82eb2
  
  /**
   * Represents a server implementation.
-@@ -2520,4 +2521,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2526,4 +2527,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      boolean isOwnedByCurrentRegion(@NotNull Entity entity);
      // Paper end - Folia region threading API
diff --git a/patches/api/0009-Force-peaceful-mode-switch.patch b/patches/api/0009-Force-peaceful-mode-switch.patch
index b6620b55..62720ef4 100644
--- a/patches/api/0009-Force-peaceful-mode-switch.patch
+++ b/patches/api/0009-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 c5fe36050eeaff80cfb989fe2f38370215af6fe5..37b96ba07ecd03fafd5c42ce8ab4a764390ae9ee 100644
+index 35fb5047dd8a8521586a9ca9f8d70881355fb7f5..30a3d28ef0a3393799401a243bd80289e35f8f96 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -4281,6 +4281,12 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -4290,6 +4290,12 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
      void setSendViewDistance(int viewDistance);
      // Paper end - view distance api
  
diff --git a/patches/api/0010-Replay-Mod-API.patch b/patches/api/0010-Replay-Mod-API.patch
index 946ca836..0515cb47 100644
--- a/patches/api/0010-Replay-Mod-API.patch
+++ b/patches/api/0010-Replay-Mod-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Replay Mod API
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index ec89e0b3f1a9d304fb5e02f4cc90777dc63d86a8..464c078afb95179027d143ca14d754a002ce9c59 100644
+index 824982037eb064d536ac09c303d3bdd225355a6a..7e92a652d47042dec050e4be08b57e2121ccd0bb 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -60,6 +60,7 @@ import org.jetbrains.annotations.NotNull;
@@ -16,7 +16,7 @@ index ec89e0b3f1a9d304fb5e02f4cc90777dc63d86a8..464c078afb95179027d143ca14d754a0
  
  /**
   * Represents the Bukkit core, for version and Server singleton handling
-@@ -2885,6 +2886,11 @@ public final class Bukkit {
+@@ -2891,6 +2892,11 @@ public final class Bukkit {
          return server.getBotManager();
      }
      // Leaves end - Bot API
@@ -29,7 +29,7 @@ index ec89e0b3f1a9d304fb5e02f4cc90777dc63d86a8..464c078afb95179027d143ca14d754a0
      @NotNull
      public static Server.Spigot spigot() {
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index f0355ec2791772ca20118dda0df82eb2c167e51a..6487dbde351c6f584ca274e5130c2c6e89d32545 100644
+index 34196590f64f1c65c691b305b402b888b524c1d7..d465633aab75def37a2b4a9f2a034071970c1dfa 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -60,6 +60,7 @@ import org.jetbrains.annotations.Contract;
@@ -40,7 +40,7 @@ index f0355ec2791772ca20118dda0df82eb2c167e51a..6487dbde351c6f584ca274e5130c2c6e
  
  /**
   * Represents a server implementation.
-@@ -2530,4 +2531,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2536,4 +2537,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull BotManager getBotManager();
      // Leaves end - Bot API
diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch
index 84fb075b..1eeaa546 100644
--- a/patches/server/0001-Build-changes.patch
+++ b/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 241808d8619e17c0681f79acbbc98af5bf52dd89..3848a4803f8df5bbf4933edfb0eaca38c567b751 100644
+index bcfe59b6efb628ee1e7f9d60667360d4d885fb6a..dc25ca9011a4fa0fcb642aa7371b0693c294dc9b 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -13,8 +13,12 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
@@ -55,7 +55,7 @@ index 241808d8619e17c0681f79acbbc98af5bf52dd89..3848a4803f8df5bbf4933edfb0eaca38
              "Implementation-Vendor" to date, // Paper
              "Specification-Title" to "Bukkit",
              "Specification-Version" to project.version,
-@@ -155,7 +169,7 @@ fun TaskContainer.registerRunTask(
+@@ -150,7 +164,7 @@ fun TaskContainer.registerRunTask(
      name: String,
      block: JavaExec.() -> Unit
  ): TaskProvider<JavaExec> = register<JavaExec>(name) {
@@ -153,7 +153,7 @@ index 4b002e8b75d117b726b0de274a76d3596fce015b..9ce4d3d96d2d5fbde1f0af599209c6c5
      }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 93b661e9cb7743aeff7da3972942cb73049a5e4c..ef44b6dcff8bd67ccadeaae70af163d159a1c562 100644
+index c8772c773f9933ed1d1debfe707af4373c458152..f9e5f9f309133ea5b540530dc7da96d085b89ac0 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1865,7 +1865,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0002-Delete-Timings.patch b/patches/server/0002-Delete-Timings.patch
index 5cb394ac..3f290729 100644
--- a/patches/server/0002-Delete-Timings.patch
+++ b/patches/server/0002-Delete-Timings.patch
@@ -5,9 +5,10 @@ Subject: [PATCH] Delete Timings
 
 
 diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
-index 4b467f1af93452d13829f756d55dee18b8889d40..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
+deleted file mode 100644
+index 4b467f1af93452d13829f756d55dee18b8889d40..0000000000000000000000000000000000000000
 --- a/src/main/java/co/aikar/timings/MinecraftTimings.java
-+++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
++++ /dev/null
 @@ -1,181 +0,0 @@
 -package co.aikar.timings;
 -
@@ -191,9 +192,10 @@ index 4b467f1af93452d13829f756d55dee18b8889d40..e69de29bb2d1d6434b8b29ae775ad8c2
 -    }
 -}
 diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
-index 7620c72a4c243cbeea245203ce03a97cbfa7d922..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
+deleted file mode 100644
+index 7620c72a4c243cbeea245203ce03a97cbfa7d922..0000000000000000000000000000000000000000
 --- a/src/main/java/co/aikar/timings/TimingsExport.java
-+++ b/src/main/java/co/aikar/timings/TimingsExport.java
++++ /dev/null
 @@ -1,388 +0,0 @@
 -/*
 - * This file is licensed under the MIT License (MIT).
@@ -779,7 +781,7 @@ index b66a7d4aab887309579154815a0d4abf9de506b0..e4d3f280b35d977f28233b1db1dc855c
          }
  
 diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index f2e30d8743a97c0541808dc5c03300c0d881b843..77b76c56ceac9ee797e74ffa2eec07a9d987e7bc 100644
+index 0cc2307636279915c1f8529e62174cc696e185ee..dd402f077922ea3946a18cdf04285c67fd093538 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 @@
@@ -838,16 +840,13 @@ index dab211c458311869c61779305580a1c7da830f71..193a527c8ebd3b8772820883046de7e9
      }
  
      @Override
-diff --git a/src/main/java/net/minecraft/commands/CommandFunction.java b/src/main/java/net/minecraft/commands/CommandFunction.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
 diff --git a/src/main/java/net/minecraft/network/protocol/PacketUtils.java b/src/main/java/net/minecraft/network/protocol/PacketUtils.java
-index 3e2d5dcd62775b6ed7c0ce0ba51a71b635b1d644..d0a487f0d563181818c5670749e8dd3a9d939265 100644
+index 32838f87978c0694bdb573236b7cdf72b2e363cd..866cf2b81359fe03d0d8b1a5001340aa5b51c749 100644
 --- a/src/main/java/net/minecraft/network/protocol/PacketUtils.java
 +++ b/src/main/java/net/minecraft/network/protocol/PacketUtils.java
 @@ -49,8 +49,7 @@ public class PacketUtils {
                  try { // Paper - detailed watchdog information
-                 if (MinecraftServer.getServer().hasStopped() || (listener instanceof ServerCommonPacketListenerImpl && ((ServerCommonPacketListenerImpl) listener).processedDisconnect)) return; // CraftBukkit, MC-142590
+                 if (listener instanceof ServerCommonPacketListenerImpl serverCommonPacketListener && serverCommonPacketListener.processedDisconnect) return; // CraftBukkit - Don't handle sync packets for kicked players
                  if (listener.shouldHandleMessage(packet)) {
 -                    co.aikar.timings.Timing timing = co.aikar.timings.MinecraftTimings.getPacketTiming(packet); // Paper - timings
 -                    try (co.aikar.timings.Timing ignored = timing.startTiming()) { // Paper - timings
@@ -856,7 +855,7 @@ index 3e2d5dcd62775b6ed7c0ce0ba51a71b635b1d644..d0a487f0d563181818c5670749e8dd3a
                      } catch (Exception exception) {
                          label25:
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ef44b6dcff8bd67ccadeaae70af163d159a1c562..218cceb9f8f56a2e48718ca8db2101caad803ffb 100644
+index f9e5f9f309133ea5b540530dc7da96d085b89ac0..5db905f820a13c876fd9c9003610e1b3c42f0364 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -3,9 +3,6 @@ package net.minecraft.server;
@@ -1377,7 +1376,7 @@ index 366c0c9b45a819f7f94ebe3e49b8ab7f9edf9ce7..2a19a45e9c7ac4646ce89c566b5fec21
              gameprofilerfiller.pop();
          }
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index bf5e47e8c3706590fdc0731bd9a5858b56d06136..546f977c0136999060ecad6bf1eeb448148c7014 100644
+index 502bdc726b7890b00ee36871d905dea44e8719e3..ccc645f225bb0cf898dbc2ee7abb21b53ff8660b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1,7 +1,6 @@
@@ -1575,7 +1574,7 @@ index bf5e47e8c3706590fdc0731bd9a5858b56d06136..546f977c0136999060ecad6bf1eeb448
  
          } 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 87e5ee042ab2c052d25ab4c2521a68cf2e2d67b6..beb1946f5e21ba8f15c908ff0da592d48089263d 100644
+index 860d33ac56680babd87358b1d7d2216dac3f7865..e0a819d33540488c7561f3b63e439e59aefa0721 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2394,7 +2394,6 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -1664,7 +1663,7 @@ index 09e8445a3f8c6b3ebc852a75a9a25b41a51ba659..22d19f1ca47a79be2c41775c5564535b
          return this != EntityType.PLAYER && this != EntityType.LLAMA_SPIT && this != EntityType.WITHER && this != EntityType.BAT && this != EntityType.ITEM_FRAME && this != EntityType.GLOW_ITEM_FRAME && this != EntityType.LEASH_KNOT && this != EntityType.PAINTING && this != EntityType.END_CRYSTAL && this != EntityType.EVOKER_FANGS;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 23570a0b1227a840b9c1e6ae326827ea655bb5f7..ac3d31b0ed54fd07f07a0768017cc34f7ae9709f 100644
+index e9bb7feb591032904516d1b9374f486d8a7d066c..04771be6128491bc7b9e6a0a400dfd3253659cce 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -143,7 +143,6 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -1751,7 +1750,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 bc89f9e90af3d69872a58c47a4c2545ba91b6ba5..998f37b01ae67807757a96eb512a695ed5e94700 100644
+index ca89d1593bf1b46c79a882db528cbca1359dc9d4..74b446d9d39642c315d2e62f11a63278bb95e266 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -12,7 +12,6 @@ import java.util.function.Supplier;
@@ -1897,7 +1896,7 @@ index 9ea74d37cd951e0dc76d20ed8234b5871035566c..fc55527c36c33f12760e1cf4cde7cfd3
      private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry();
      public CraftPersistentDataContainer persistentDataContainer;
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 6ec3fc801453fd54c25b642e6fa71c19b463311d..44b9aaa534a4683b2924a2aa61a92218f9c846b3 100644
+index 465458e8a7dbaf9afb32709a71c7b2620d1e1fd2..8ea72a149d89ab05bf97ac0f36f50d94ff917184 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -785,7 +785,6 @@ public class LevelChunk extends ChunkAccess {
@@ -1924,7 +1923,7 @@ index 6ec3fc801453fd54c25b642e6fa71c19b463311d..44b9aaa534a4683b2924a2aa61a92218
                          BlockState iblockdata = LevelChunk.this.getBlockState(blockposition);
  
                          if (this.blockEntity.getType().isValid(iblockdata)) {
-@@ -1184,9 +1181,6 @@ public class LevelChunk extends ChunkAccess {
+@@ -1189,9 +1186,6 @@ public class LevelChunk extends ChunkAccess {
                          LevelChunk.this.removeBlockEntity(this.getPos());
                          // Paper end - Prevent block entity and entity crashes
                          // Spigot start
@@ -1935,7 +1934,7 @@ index 6ec3fc801453fd54c25b642e6fa71c19b463311d..44b9aaa534a4683b2924a2aa61a92218
                  }
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index ea26b89c056b0329d3f0925b023e4bd526ee8efa..d993969b4e9920f7db2fec990d7d6568e68745ef 100644
+index 1068ed383232a71f6ada6677f4872267cc565325..a30365e430fe492075398af90351e692b1ef671c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -344,8 +344,8 @@ public class Main {
@@ -2093,7 +2092,7 @@ index b3e1adeb932da9b3bed16acd94e2f16da48a7c72..e9798517b9211c50a20ea5c69603aab3
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 1324f05de8106032ce290e928cf106fb4f450517..3fb07dae586c5511cb048b20264072bf6db54df8 100644
+index 3c7a771c48cc2732cc038ca11bb93ec5f8c2d667..aa3a2fd9c8bea586ab7108ff0eef894f8b593b5e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -217,7 +217,6 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -2105,7 +2104,7 @@ index 1324f05de8106032ce290e928cf106fb4f450517..3fb07dae586c5511cb048b20264072bf
      // Paper end
  
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index c39894e824334f1dc52e0466cf9d84f7e219be70..efb7f957c72088e40946a2eeb8d955f156163c24 100644
+index 3283ed99c35ffed6805567705e0518d9f84feedc..e32e4ffa222fe72c3d3152a91057113c99d3b122 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -34,7 +34,6 @@ import net.minecraft.world.entity.projectile.FireworkRocketEntity;
@@ -2116,7 +2115,7 @@ index c39894e824334f1dc52e0466cf9d84f7e219be70..efb7f957c72088e40946a2eeb8d955f1
  import net.minecraft.world.entity.schedule.Activity;
  import net.minecraft.world.level.Level;
  import net.minecraft.world.phys.AABB;
-@@ -165,7 +164,6 @@ public class ActivationRange
+@@ -167,7 +166,6 @@ public class ActivationRange
       */
      public static void activateEntities(Level world)
      {
@@ -2124,7 +2123,7 @@ index c39894e824334f1dc52e0466cf9d84f7e219be70..efb7f957c72088e40946a2eeb8d955f1
          final int miscActivationRange = world.spigotConfig.miscActivationRange;
          final int raiderActivationRange = world.spigotConfig.raiderActivationRange;
          final int animalActivationRange = world.spigotConfig.animalActivationRange;
-@@ -224,7 +222,6 @@ public class ActivationRange
+@@ -226,7 +224,6 @@ public class ActivationRange
              }
              // Paper end
          }
diff --git a/patches/server/0004-Update-version-fetcher-repo.patch b/patches/server/0004-Update-version-fetcher-repo.patch
index 592dfc6f..cad7967b 100644
--- a/patches/server/0004-Update-version-fetcher-repo.patch
+++ b/patches/server/0004-Update-version-fetcher-repo.patch
@@ -36,10 +36,10 @@ index 9d687da5bdf398bb3f6c84cdf1249a7213d09f2e..fa446ff1b7284b58ee88566cbbe39d81
          if (data == null) {
              return null;
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 3fb07dae586c5511cb048b20264072bf6db54df8..008a3da71071128c6302d881ed51d1d837e17e6f 100644
+index aa3a2fd9c8bea586ab7108ff0eef894f8b593b5e..b0115c38f6fd0edc13eb87c657ce541cdc8aa3af 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -496,7 +496,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -501,7 +501,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
  
      @Override
      public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
diff --git a/patches/server/0005-Leaves-Server-Config-And-Command.patch b/patches/server/0005-Leaves-Server-Config-And-Command.patch
index b8b62d9c..4a202e37 100644
--- a/patches/server/0005-Leaves-Server-Config-And-Command.patch
+++ b/patches/server/0005-Leaves-Server-Config-And-Command.patch
@@ -5,24 +5,24 @@ Subject: [PATCH] Leaves Server Config And Command
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 3848a4803f8df5bbf4933edfb0eaca38c567b751..411c1929e78e5706eae040c209d9727e17e553b8 100644
+index dc25ca9011a4fa0fcb642aa7371b0693c294dc9b..a2441f300345c3936bce69d6d3f21fdd6626136d 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -229,3 +229,12 @@ tasks.registerRunTask("runDev") {
-     classpath(runtimeClasspathForRunDev)
-     jvmArgs("-DPaper.isRunDev=true")
+@@ -218,3 +218,11 @@ tasks.registerRunTask("runDev") {
+     classpath(sourceSets.main.map { it.runtimeClasspath })
+     jvmArgs("-DPaper.pushPaperAssetsRoot=true")
  }
 +
 +// Leaves start - create config file
 +tasks.registerRunTask("createLeavesConfig") {
 +    description = "Create a new leaves.yml"
 +    mainClass = "top.leavesmc.leaves.config.GlobalConfigCreator"
-+    classpath(tasks.filterProjectDir.flatMap { it.outputJar })
-+    classpath(runtimeClasspathForRunDev)
++    classpath(sourceSets.main.map { it.runtimeClasspath })
 +}
 +// Leaves end - create config file
+\ No newline at end of file
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 61e0e14b74c6585a9d157cae3db9c5c3a69b393f..2cf51683978e72d552f9148a610704202d207df5 100644
+index 5db905f820a13c876fd9c9003610e1b3c42f0364..6538dfd5a0d62912ee67de8e414c4443538c32c2 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1142,6 +1142,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -75,7 +75,7 @@ index 367975d5e0c9846e5ce6d9cbdc3a977c8ab26b97..a50a52b53f66366b3c810bdc2cad22af
          @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 7a266257b1220098a6c829ccf1c597b7e510205a..e85a4aaab6fb6d1784494aad0189539c2852de0f 100644
+index a30365e430fe492075398af90351e692b1ef671c..416dbfe96d06769778cd45e9bd4e53b514eb2225 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -166,6 +166,14 @@ public class Main {
diff --git a/patches/server/0008-Fix-trading-with-the-void.patch b/patches/server/0008-Fix-trading-with-the-void.patch
index 6d4e11b0..431940ad 100644
--- a/patches/server/0008-Fix-trading-with-the-void.patch
+++ b/patches/server/0008-Fix-trading-with-the-void.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix trading with the void
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index cc50dd6b75f0d2ed2202c39598c5c9b1c3090d0f..384327f4a77e0fd92a5de35c4beba767143bbc36 100644
+index ccc645f225bb0cf898dbc2ee7abb21b53ff8660b..a15e1d95da33bf543df96e9b97b79d84583332bd 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2789,11 +2789,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2800,11 +2800,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              // Spigot end
              // Spigot Start
              if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message
diff --git a/patches/server/0017-Fix-tripwire-update.patch b/patches/server/0017-Fix-tripwire-update.patch
index 2fe608c6..bbcc7f45 100644
--- a/patches/server/0017-Fix-tripwire-update.patch
+++ b/patches/server/0017-Fix-tripwire-update.patch
@@ -5,14 +5,14 @@ Subject: [PATCH] Fix tripwire update
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java b/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java
-index 8bf94fcf5c46ffe6d90f8431338b768ef1a2dd61..d9b3877257b31ca1b5acc4a47fbf5b993de69ae0 100644
+index efd8d77a441fd334ea4c09c5e31c6d946c1ae0b7..d9b3877257b31ca1b5acc4a47fbf5b993de69ae0 100644
 --- a/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java
 @@ -201,8 +201,9 @@ public class TripWireHookBlock extends Block {
                      BlockState iblockdata4 = aiblockdata[l];
  
                      if (iblockdata4 != null) {
--                        if (world.getBlockState(blockposition2).is(Blocks.TRIPWIRE)) { // Paper - Fix tripwire disarming not working as intended
+-                        if (world.getBlockState(blockposition2).is(Blocks.TRIPWIRE) || io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.allowTripwireDisarmingExploits) { // Paper - Fix tripwire disarming not working as intended
                          world.setBlock(blockposition2, (BlockState) iblockdata4.trySetValue(TripWireHookBlock.ATTACHED, flag4), 3);
 +                        if (!world.getBlockState(blockposition2).isAir()) {
 +                            ;
diff --git a/patches/server/0033-Cache-climbing-check-for-activation.patch b/patches/server/0033-Cache-climbing-check-for-activation.patch
index 0481e976..104ce9e0 100644
--- a/patches/server/0033-Cache-climbing-check-for-activation.patch
+++ b/patches/server/0033-Cache-climbing-check-for-activation.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Cache climbing check for activation
 This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index e598a29f7285d961262ff2a86142e004f34520ef..d94dea3ec79780e6a49a72d2ab5028e47ae7acc9 100644
+index d5c676c629be25c4400c60a22125715827e9cf81..15c8e9214b7df1cf1e9252a17b7acfc080e547a3 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2032,6 +2032,22 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -33,10 +33,10 @@ index e598a29f7285d961262ff2a86142e004f34520ef..d94dea3ec79780e6a49a72d2ab5028e4
          if (this.isSpectator()) {
              return false;
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index efb7f957c72088e40946a2eeb8d955f156163c24..28a7afa9bc4d7fecfafcd8a45fc9aa1ed9ae76f8 100644
+index e32e4ffa222fe72c3d3152a91057113c99d3b122..43d49801823c1221d27e89e66422e8748cdc383b 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
-@@ -293,7 +293,7 @@ public class ActivationRange
+@@ -295,7 +295,7 @@ public class ActivationRange
          if ( entity instanceof LivingEntity )
          {
              LivingEntity living = (LivingEntity) entity;
diff --git a/patches/server/0047-MC-Technical-Survival-Mode.patch b/patches/server/0047-MC-Technical-Survival-Mode.patch
index fe940db1..72594a6a 100644
--- a/patches/server/0047-MC-Technical-Survival-Mode.patch
+++ b/patches/server/0047-MC-Technical-Survival-Mode.patch
@@ -52,10 +52,10 @@ index fa1c0aee8c3a4d0868482cf5c703bbfd08e09874..c24148d8486420434922864df6f1ffa0
              throw new RuntimeException("Could not reload paper configuration files", ex);
          }
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index f8bfa232e0e9d979a96c0ae088a809609925ea66..8f895fd573a39e4cff4c0ac42505ad7f488ddea2 100644
+index 47864d5c04496ab18a3ad82781df5a06e8b9ea9b..9488fbbf0442d38c18632f0ed50c23fd27078f71 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2728,7 +2728,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2739,7 +2739,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          public void onTickingEnd(Entity entity) {
              ServerLevel.this.entityTickList.remove(entity);
              // Paper start - Reset pearls when they stop being ticked
@@ -65,7 +65,7 @@ index f8bfa232e0e9d979a96c0ae088a809609925ea66..8f895fd573a39e4cff4c0ac42505ad7f
                  pearl.ownerUUID = null;
              }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 98d7c30e396db54ec8a1b24acab37f7967d90606..a2b1999a00dc22cf8cc743651bbbf47eea8dcabb 100644
+index 362eb965a12f14c4381c98bf7b7ec172c581642a..362ec0d4de4f77511651b28d47b8bdac626f935b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1533,7 +1533,7 @@ public class ServerPlayer extends Player {
@@ -130,7 +130,7 @@ index 93fbf20c6e5ded31570415c30b837f5dc0dd5d42..667a480b7c546bb130bbd32a8ae7ce85
                          entity.spawnReason == org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.CHUNK_GEN)) {
                      continue;
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
-index 90cf24e81d43c7473a99b12484a15c3103208385..bc130649e30928bae2d7764b616cd2b02e0f2204 100644
+index 21a64f3a704fb362ed3aade559d55c0804ae5023..006e990d57c7ad1081f63402ef85a3ba856fe329 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
 @@ -292,7 +292,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
diff --git a/patches/server/0048-Return-nether-portal-fix.patch b/patches/server/0048-Return-nether-portal-fix.patch
index fb5c169f..1fcb1251 100644
--- a/patches/server/0048-Return-nether-portal-fix.patch
+++ b/patches/server/0048-Return-nether-portal-fix.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Return nether portal fix
 This patch is powered by NetherPortalFix(https://github.com/TwelveIterationMods/NetherPortalFix)
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index a2b1999a00dc22cf8cc743651bbbf47eea8dcabb..f5cf2fb1751433cbede512a622cbf3b654b7d16e 100644
+index 362ec0d4de4f77511651b28d47b8bdac626f935b..6e084edb04d5bbcd5b25ccd820b3950ea89408d4 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -187,6 +187,7 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
@@ -111,12 +111,12 @@ index 82751434c31fe8825f32921f498fd0156da15454..03c278836208a65b77030b629f2b7678
  
          // Save player file again if they were disconnected
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index d94dea3ec79780e6a49a72d2ab5028e47ae7acc9..d934a51781615d92561ab558022040ee5eb91592 100644
+index 15c8e9214b7df1cf1e9252a17b7acfc080e547a3..ffa9ada2e803bc77f8cae4be81ac4b5c2eee0b7f 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -241,7 +241,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
      protected ItemStack useItem;
-     protected int useItemRemaining;
+     public int useItemRemaining;
      protected int fallFlyTicks;
 -    private BlockPos lastPos;
 +    public BlockPos lastPos; // Leaves - private -> public
diff --git a/patches/server/0051-Leaves-Extra-Yggdrasil-Service.patch b/patches/server/0051-Leaves-Extra-Yggdrasil-Service.patch
index 397e9dc4..9299846c 100644
--- a/patches/server/0051-Leaves-Extra-Yggdrasil-Service.patch
+++ b/patches/server/0051-Leaves-Extra-Yggdrasil-Service.patch
@@ -31,10 +31,10 @@ index bfc1e27c37689c1fbb927404a7176780a439a057..bc8ab50ef1390a2c51110a89dc43db58
      private final String baseUrl;
      private final URL joinUrl;
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index 61840cfd64caba6595dfc99c91c76a195638d4ee..46d6db53dbf44228574164cc458c94b936613623 100644
+index bc391d27399d8c22e78735ca39aa8ab45efb6413..89e1e1ee0fce2cc6b3a305dfca937ab777edbb5e 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
-@@ -198,7 +198,7 @@ public class Main {
+@@ -187,7 +187,7 @@ public class Main {
                  file = new File(bukkitConfiguration.getString("settings.world-container", "."));
              }
              // Paper end - fix SPIGOT-5824
@@ -44,7 +44,7 @@ index 61840cfd64caba6595dfc99c91c76a195638d4ee..46d6db53dbf44228574164cc458c94b9
              String s = (String) Optional.ofNullable((String) optionset.valueOf("world")).orElse(dedicatedserversettings.getProperties().levelName);
              LevelStorageSource convertable = LevelStorageSource.createDefault(file.toPath());
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e1ef234f54bc3335c11add788d41db10f2eb1e2d..0e241a87f625b9cf952c59f9b0670d60563bdf06 100644
+index 690ae3e77d753af8351eb17bb5c35fbd2657f258..d615062782fa13e5df1d029b15967fd7f258c998 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -259,7 +259,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0071-Lava-riptide.patch b/patches/server/0071-Lava-riptide.patch
index 3ceb7e2e..1f0d9485 100644
--- a/patches/server/0071-Lava-riptide.patch
+++ b/patches/server/0071-Lava-riptide.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Lava riptide
 
 
 diff --git a/src/main/java/net/minecraft/world/item/TridentItem.java b/src/main/java/net/minecraft/world/item/TridentItem.java
-index fa876ddf54780728e7f3ecfe02aa8a16b8ef6f8d..2dad3b64673186c8776f414d68ae392818a2d749 100644
+index a792c7b7a6179aa88fc473b27ef0ca13bd91a395..95318fe882bc65d1483c7547b41e6f660c0c0012 100644
 --- a/src/main/java/net/minecraft/world/item/TridentItem.java
 +++ b/src/main/java/net/minecraft/world/item/TridentItem.java
 @@ -66,7 +66,7 @@ public class TridentItem extends Item implements Vanishable {
@@ -17,7 +17,7 @@ index fa876ddf54780728e7f3ecfe02aa8a16b8ef6f8d..2dad3b64673186c8776f414d68ae3928
                      if (!world.isClientSide) {
                          // CraftBukkit - moved down
                          /*
-@@ -163,7 +163,7 @@ public class TridentItem extends Item implements Vanishable {
+@@ -160,7 +160,7 @@ public class TridentItem extends Item implements Vanishable {
  
          if (itemstack.getDamageValue() >= itemstack.getMaxDamage() - 1) {
              return InteractionResultHolder.fail(itemstack);
diff --git a/patches/server/0072-No-block-update-command.patch b/patches/server/0072-No-block-update-command.patch
index f3c05ef4..3c1eb718 100644
--- a/patches/server/0072-No-block-update-command.patch
+++ b/patches/server/0072-No-block-update-command.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] No block update command
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 2211887522f4ee9e069e8d42d797906343864f75..678410cd734cd7e3e3b999b7908f2e3f25f23a13 100644
+index 9488fbbf0442d38c18632f0ed50c23fd27078f71..9e95045f10904744f7cbf6e4203f8cbe762a9afc 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2506,6 +2506,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2517,6 +2517,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
      @Override
      public void blockUpdated(BlockPos pos, Block block) {
@@ -30,7 +30,7 @@ index 1ad126d992d95062a3db08374db7a927f23a0cac..418a7c9217e6e06bff6866deffff3e78
  
                          world.notifyAndUpdatePhysics(newblockposition, null, oldBlock, block, world.getBlockState(newblockposition), updateFlag, 512); // send null chunk as chunk.k() returns false by this point
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 344ebb91a1cd4c74d398ded5edd8ef68047d19b2..8d1b9391eb01ebf85d096e9c211629aef1034482 100644
+index 6c611afce3ca26e5b08f3341563a986d2a21142f..46230b09fc176665ba1d29ab3233c3b956a07710 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -481,7 +481,7 @@ public class LevelChunk extends ChunkAccess {
diff --git a/patches/server/0077-SIMD-support.patch b/patches/server/0077-SIMD-support.patch
index e68a0093..631bb6cf 100644
--- a/patches/server/0077-SIMD-support.patch
+++ b/patches/server/0077-SIMD-support.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] SIMD support
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 411c1929e78e5706eae040c209d9727e17e553b8..a3b803b43c6a6c45f378fe7bc74ded6f09b97766 100644
+index a2441f300345c3936bce69d6d3f21fdd6626136d..77d6f5eeeb9918a70e0003e97671778303c33ce9 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -70,6 +70,7 @@ tasks.withType<JavaCompile> {
@@ -16,7 +16,7 @@ index 411c1929e78e5706eae040c209d9727e17e553b8..a3b803b43c6a6c45f378fe7bc74ded6f
  }
  // Leaves end - hide irrelevant compilation warnings
  
-@@ -194,6 +195,8 @@ fun TaskContainer.registerRunTask(
+@@ -189,6 +190,8 @@ fun TaskContainer.registerRunTask(
      minHeapSize = "${memoryGb}G"
      maxHeapSize = "${memoryGb}G"
  
diff --git a/patches/server/0087-Disable-packet-limit.patch b/patches/server/0087-Disable-packet-limit.patch
index 711d2156..c89849ea 100644
--- a/patches/server/0087-Disable-packet-limit.patch
+++ b/patches/server/0087-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 77b76c56ceac9ee797e74ffa2eec07a9d987e7bc..7d78454e890543de7c7ce0ef2c49aef84bd791c6 100644
+index dd402f077922ea3946a18cdf04285c67fd093538..41372edb33ac41f92bd1b0351cd2cf2e89d888df 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-@@ -265,7 +265,7 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -267,7 +267,7 @@ public class GlobalConfiguration extends ConfigurationPart {
              }
  
              public boolean isEnabled() {
diff --git a/patches/server/0104-Force-peaceful-mode-switch.patch b/patches/server/0104-Force-peaceful-mode-switch.patch
index 1b34b61c..4e29e9b5 100644
--- a/patches/server/0104-Force-peaceful-mode-switch.patch
+++ b/patches/server/0104-Force-peaceful-mode-switch.patch
@@ -107,10 +107,10 @@ index 3e10668ca548472238bb4bb0a80a89f169a71496..aaea6e5701e23c5023bb990712bde7af
              boolean spawnThisTick = true;
              int limit = enumcreaturetype.getMaxInstancesPerChunk();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index bfb178c69026e9759e9afaebb9da141b62d1f144..171162e99da711f6887adcc6c2bad32035488318 100644
+index 01797d9791f19dfda4b168218eadeaae97f11eab..88ab671678da7617d8e22176d64b69101e7f4a33 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2422,6 +2422,18 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2442,6 +2442,18 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          return CraftFeatureFlag.getFromNMS(this.getHandle().enabledFeatures()).stream().map(FeatureFlag.class::cast).collect(Collectors.toUnmodifiableSet());
      }
  
diff --git a/patches/server/0124-Linear-region-file-format.patch b/patches/server/0124-Linear-region-file-format.patch
index 6605b199..b85dfe3e 100644
--- a/patches/server/0124-Linear-region-file-format.patch
+++ b/patches/server/0124-Linear-region-file-format.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Linear region file format
 This patch is Powered by LinearPurpur(https://github.com/StupidCraft/LinearPurpur)
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 9a0b18e534a2fde5ecd7477838e26ed1f0141631..bda3880bbd1406d88a6d32f89f302d9eb2eea988 100644
+index 77d6f5eeeb9918a70e0003e97671778303c33ce9..f3f70a48d758ccbbf1210681c24f0b3a838fb66b 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -36,6 +36,10 @@ dependencies {
@@ -18,7 +18,7 @@ index 9a0b18e534a2fde5ecd7477838e26ed1f0141631..bda3880bbd1406d88a6d32f89f302d9e
 +    implementation("org.lz4:lz4-java:1.8.0")
 +    // Leaves end - Linear format
      implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") // Paper - remove exclusion
-     implementation("org.ow2.asm:asm-commons:9.5")
+     implementation("org.ow2.asm:asm-commons:9.7")
      implementation("org.spongepowered:configurate-yaml:4.2.0-SNAPSHOT") // Paper - config files
 diff --git a/src/main/java/com/destroystokyo/paper/io/PaperFileIOThread.java b/src/main/java/com/destroystokyo/paper/io/PaperFileIOThread.java
 new file mode 100644
@@ -91,7 +91,7 @@ index 2934f0cf0ef09c84739312b00186c2ef0019a165..ad909f888c8eb6fa8d4ebeeebdc538ae
              }
          }
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 3d682670ae0ae6da7492633d2688dc31086e3665..246dc8c02e096c385931edc4ff0765d61ced7877 100644
+index 86207dd0f1f666588535d03f5576fbe4e2267eeb..3b58923acdf8f2b3663c9cd321f1638d448c5da0 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -854,13 +854,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -505,10 +505,10 @@ index fe312b1aef579cb4bf81bdd967cf72ff880d7505..756c69066ad5336c8faffd22dd48f2ec
              regionfile.flush();
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 171162e99da711f6887adcc6c2bad32035488318..ebbf27a1d4ec91b6c9ffa0f60e187cb8a17037a7 100644
+index 88ab671678da7617d8e22176d64b69101e7f4a33..946d1c4457337b98a8d8cb865c7474cf7874ac36 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -573,7 +573,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -574,7 +574,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
                  world.getChunk(x, z); // make sure we're at ticket level 32 or lower
                  return true;
              }