1514 files changed, 524 insertions, 526 deletions

diff --git a/README.md b/README.md
index 9448ea2937..96a6d652ef 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ How To (Plugin Developers)
 <dependency>
     <groupId>io.papermc.paper</groupId>
     <artifactId>paper-api</artifactId>
-    <version>1.20.2-R0.1-SNAPSHOT</version>
+    <version>1.20.3-R0.1-SNAPSHOT</version>
     <scope>provided</scope>
 </dependency>
 ```
@@ -53,7 +53,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly("io.papermc.paper:paper-api:1.20.2-R0.1-SNAPSHOT")
+    compileOnly("io.papermc.paper:paper-api:1.20.3-R0.1-SNAPSHOT")
 }
 
 java {
diff --git a/build.gradle.kts b/build.gradle.kts
index ad37285018..cda5021dba 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -61,7 +61,7 @@ repositories {
 }
 
 dependencies {
-    paramMappings("net.fabricmc:yarn:1.20.2+build.1:mergedv2")
+    paramMappings("net.fabricmc:yarn:1.20.3+build.1:mergedv2")
     remapper("net.fabricmc:tiny-remapper:0.8.10:fat")
     decompiler("net.minecraftforge:forgeflower:2.0.627.2")
     spigotDecompiler("io.papermc:patched-spigot-fernflower:0.1+build.6")
@@ -132,14 +132,12 @@ allprojects {
 }
 
 // Uncomment while updating for a new Minecraft version
-/*
 tasks.collectAtsFromPatches {
     extraPatchDir.set(layout.projectDirectory.dir("patches/unapplied/server"))
 }
 tasks.withType<io.papermc.paperweight.tasks.RebuildGitPatches> {
     filterPatches.set(false)
 }
- */
 
 tasks.register("printMinecraftVersion") {
     doLast {
diff --git a/gradle.properties b/gradle.properties
index 0c3832dd51..6508411785 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 group=io.papermc.paper
-version=1.20.2-R0.1-SNAPSHOT
-mcVersion=1.20.2
+version=1.20.3-R0.1-SNAPSHOT
+mcVersion=1.20.3
 
 org.gradle.caching=true
 org.gradle.parallel=true
diff --git a/patches/api/0001-Convert-project-to-Gradle.patch b/patches/api/0001-Convert-project-to-Gradle.patch
index 80839e98fd..540f4d353b 100644
--- a/patches/api/0001-Convert-project-to-Gradle.patch
+++ b/patches/api/0001-Convert-project-to-Gradle.patch
@@ -124,7 +124,7 @@ index 0000000000000000000000000000000000000000..41e77b687df6480adf8f5e21daad105d
 +}
 diff --git a/pom.xml b/pom.xml
 deleted file mode 100644
-index a464312b63bb62d196d6ec2d55ffcdc85ae4da67..0000000000000000000000000000000000000000
+index 061d8bcc258d8f1936462a9f92e9d4f7617e716f..0000000000000000000000000000000000000000
 --- a/pom.xml
 +++ /dev/null
 @@ -1,278 +0,0 @@
@@ -135,7 +135,7 @@ index a464312b63bb62d196d6ec2d55ffcdc85ae4da67..00000000000000000000000000000000
 -
 -    <groupId>org.spigotmc</groupId>
 -    <artifactId>spigot-api</artifactId>
--    <version>1.20.2-R0.1-SNAPSHOT</version>
+-    <version>1.20.3-R0.1-SNAPSHOT</version>
 -    <packaging>jar</packaging>
 -
 -    <name>Spigot-API</name>
diff --git a/patches/api/0003-Test-changes.patch b/patches/unapplied/api/0003-Test-changes.patch
index 5bd26772c4..5bd26772c4 100644
--- a/patches/api/0003-Test-changes.patch
+++ b/patches/unapplied/api/0003-Test-changes.patch
diff --git a/patches/api/0004-Code-Generation.patch b/patches/unapplied/api/0004-Code-Generation.patch
index a34c9218f5..a34c9218f5 100644
--- a/patches/api/0004-Code-Generation.patch
+++ b/patches/unapplied/api/0004-Code-Generation.patch
diff --git a/patches/api/0005-Add-FastUtil-to-Bukkit.patch b/patches/unapplied/api/0005-Add-FastUtil-to-Bukkit.patch
index 5a3f7d83ea..750fc86a9e 100644
--- a/patches/api/0005-Add-FastUtil-to-Bukkit.patch
+++ b/patches/unapplied/api/0005-Add-FastUtil-to-Bukkit.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add FastUtil to Bukkit
 Doesn't expose to plugins, just allows Paper-API to use it for optimization
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 75bfb0ab8049ebbb52240abf661d469de5526767..ecba866b84bc5f86a442bf220ab24ed8706aadf9 100644
+index 87e4ee95a8da287b02c13fac5f24f66902bc84c9..2b91ac7b5bc9fa7fb2ab64a80fd2707cb8d3f01d 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -23,6 +23,7 @@ dependencies {
diff --git a/patches/api/0006-Adventure.patch b/patches/unapplied/api/0006-Adventure.patch
index 605dd63de9..7077f2aa8b 100644
--- a/patches/api/0006-Adventure.patch
+++ b/patches/unapplied/api/0006-Adventure.patch
@@ -7,7 +7,7 @@ Co-authored-by: zml <[email protected]>
 Co-authored-by: Jake Potrebic <[email protected]>
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index ecba866b84bc5f86a442bf220ab24ed8706aadf9..2377d476aee8c88d26ca715fdb756dc97749aac8 100644
+index 2b91ac7b5bc9fa7fb2ab64a80fd2707cb8d3f01d..acb27334da8245657a113a69faee6f6b19dd3110 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -11,12 +11,24 @@ java {
diff --git a/patches/api/0007-Paper-Utils.patch b/patches/unapplied/api/0007-Paper-Utils.patch
index a647b698ad..a647b698ad 100644
--- a/patches/api/0007-Paper-Utils.patch
+++ b/patches/unapplied/api/0007-Paper-Utils.patch
diff --git a/patches/api/0008-Use-ASM-for-event-executors.patch b/patches/unapplied/api/0008-Use-ASM-for-event-executors.patch
index 115007f17e..163d04c3cd 100644
--- a/patches/api/0008-Use-ASM-for-event-executors.patch
+++ b/patches/unapplied/api/0008-Use-ASM-for-event-executors.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Use ASM for event executors.
 Uses method handles for private or static methods.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 2377d476aee8c88d26ca715fdb756dc97749aac8..0c6e0bb90fe5ea29c467323a179a47ec122ba0f6 100644
+index acb27334da8245657a113a69faee6f6b19dd3110..3a4d5cc766095cbb83868ccb99423f10e3a07289 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -43,6 +43,9 @@ dependencies {
diff --git a/patches/api/0009-Paper-Plugins.patch b/patches/unapplied/api/0009-Paper-Plugins.patch
index 223d7015ab..9068059d94 100644
--- a/patches/api/0009-Paper-Plugins.patch
+++ b/patches/unapplied/api/0009-Paper-Plugins.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Paper Plugins
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 0c6e0bb90fe5ea29c467323a179a47ec122ba0f6..145f6209a984e74da2d2de03cf725c06c77ef8da 100644
+index 3a4d5cc766095cbb83868ccb99423f10e3a07289..37d894eaffbf31045b1ed349d70af6408348a1a6 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -48,7 +48,7 @@ dependencies {
diff --git a/patches/api/0010-Add-Position.patch b/patches/unapplied/api/0010-Add-Position.patch
index c56e4e0a0e..c56e4e0a0e 100644
--- a/patches/api/0010-Add-Position.patch
+++ b/patches/unapplied/api/0010-Add-Position.patch
diff --git a/patches/api/0011-Timings-v2.patch b/patches/unapplied/api/0011-Timings-v2.patch
index d04197d735..d04197d735 100644
--- a/patches/api/0011-Timings-v2.patch
+++ b/patches/unapplied/api/0011-Timings-v2.patch
diff --git a/patches/api/0012-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/unapplied/api/0012-Add-command-line-option-to-load-extra-plugin-jars-no.patch
index e404df1b65..a70be17731 100644
--- a/patches/api/0012-Add-command-line-option-to-load-extra-plugin-jars-no.patch
+++ b/patches/unapplied/api/0012-Add-command-line-option-to-load-extra-plugin-jars-no.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Add command line option to load extra plugin jars not in the
 ex: java -jar paperclip.jar nogui -add-plugin=/path/to/plugin.jar -add-plugin=/path/to/another/plugin_jar.jar
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index dd60025dd956dd360ded51e056163c31908b6d5e..6a36a9bfa0574b8bd72fbf7edb9b49e01753406e 100644
+index 7300bba67cfd4d312c59b0f81f597ea0f8a54fcd..3a8b07a870d334296e3865598741dc3e6fcf9b62 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -79,6 +79,20 @@ public final class Bukkit {
@@ -32,7 +32,7 @@ index dd60025dd956dd360ded51e056163c31908b6d5e..6a36a9bfa0574b8bd72fbf7edb9b49e0
       * Attempts to set the {@link Server} singleton.
       * <p>
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 4cb488d68abc80aae733eb6b17e9cfa015c5a229..75c51378095104a0a58babad281ee946a6c9584e 100644
+index 31227e818b624d641bb7562ac3de8a821815d33a..d3917c514f0e1d4343aed0738bea1625f63fcb92 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -64,6 +64,18 @@ import org.jetbrains.annotations.Nullable;
diff --git a/patches/api/0013-Player-affects-spawning-API.patch b/patches/unapplied/api/0013-Player-affects-spawning-API.patch
index 2ccec677be..2ccec677be 100644
--- a/patches/api/0013-Player-affects-spawning-API.patch
+++ b/patches/unapplied/api/0013-Player-affects-spawning-API.patch
diff --git a/patches/api/0014-Add-getTPS-method.patch b/patches/unapplied/api/0014-Add-getTPS-method.patch
index dc188f645e..0630abf659 100644
--- a/patches/api/0014-Add-getTPS-method.patch
+++ b/patches/unapplied/api/0014-Add-getTPS-method.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add getTPS method
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 6a36a9bfa0574b8bd72fbf7edb9b49e01753406e..e4cdd6a68a52d0415d0281d03f50fe75c9924b7e 100644
+index 3a8b07a870d334296e3865598741dc3e6fcf9b62..43f4ec39a610119d6285884aa323d9f46e22f073 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -2040,6 +2040,17 @@ public final class Bukkit {
@@ -27,7 +27,7 @@ index 6a36a9bfa0574b8bd72fbf7edb9b49e01753406e..e4cdd6a68a52d0415d0281d03f50fe75
       * Get the advancement specified by this key.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 75c51378095104a0a58babad281ee946a6c9584e..17927955c481798b3bc40200168875bd319dd578 100644
+index d3917c514f0e1d4343aed0738bea1625f63fcb92..a8a932e308b4d7b1e9cacb53f78b1cdd0c6d4063 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1741,6 +1741,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0015-Version-Command-2.0.patch b/patches/unapplied/api/0015-Version-Command-2.0.patch
index 99c72a7b3d..99c72a7b3d 100644
--- a/patches/api/0015-Version-Command-2.0.patch
+++ b/patches/unapplied/api/0015-Version-Command-2.0.patch
diff --git a/patches/api/0016-Entity-Origin-API.patch b/patches/unapplied/api/0016-Entity-Origin-API.patch
index 33fcdeb93b..33fcdeb93b 100644
--- a/patches/api/0016-Entity-Origin-API.patch
+++ b/patches/unapplied/api/0016-Entity-Origin-API.patch
diff --git a/patches/api/0017-Add-PlayerLocaleChangeEvent.patch b/patches/unapplied/api/0017-Add-PlayerLocaleChangeEvent.patch
index 1dd6084278..1dd6084278 100644
--- a/patches/api/0017-Add-PlayerLocaleChangeEvent.patch
+++ b/patches/unapplied/api/0017-Add-PlayerLocaleChangeEvent.patch
diff --git a/patches/api/0018-Add-view-distance-API.patch b/patches/unapplied/api/0018-Add-view-distance-API.patch
index 773fca475c..773fca475c 100644
--- a/patches/api/0018-Add-view-distance-API.patch
+++ b/patches/unapplied/api/0018-Add-view-distance-API.patch
diff --git a/patches/api/0019-Add-BeaconEffectEvent.patch b/patches/unapplied/api/0019-Add-BeaconEffectEvent.patch
index 43af3c3828..43af3c3828 100644
--- a/patches/api/0019-Add-BeaconEffectEvent.patch
+++ b/patches/unapplied/api/0019-Add-BeaconEffectEvent.patch
diff --git a/patches/api/0020-Add-PlayerInitialSpawnEvent.patch b/patches/unapplied/api/0020-Add-PlayerInitialSpawnEvent.patch
index 122054772a..122054772a 100644
--- a/patches/api/0020-Add-PlayerInitialSpawnEvent.patch
+++ b/patches/unapplied/api/0020-Add-PlayerInitialSpawnEvent.patch
diff --git a/patches/api/0021-Expose-server-CommandMap.patch b/patches/unapplied/api/0021-Expose-server-CommandMap.patch
index 16ac67db3a..1c6a682aa6 100644
--- a/patches/api/0021-Expose-server-CommandMap.patch
+++ b/patches/unapplied/api/0021-Expose-server-CommandMap.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose server CommandMap
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index e4cdd6a68a52d0415d0281d03f50fe75c9924b7e..2a287fc77ef5cc6404dccdab01740e2b8b11ef43 100644
+index 43f4ec39a610119d6285884aa323d9f46e22f073..4c5671cf75143e741d945834a2a8b56cb52f20dd 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -2241,6 +2241,19 @@ public final class Bukkit {
@@ -29,7 +29,7 @@ index e4cdd6a68a52d0415d0281d03f50fe75c9924b7e..2a287fc77ef5cc6404dccdab01740e2b
      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 17927955c481798b3bc40200168875bd319dd578..e0ca9516051bc566da2783f0574e791166d5922c 100644
+index a8a932e308b4d7b1e9cacb53f78b1cdd0c6d4063..7ee7fdc8379078456492da00bb213a0738cc6f08 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1751,6 +1751,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0022-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/patches/unapplied/api/0022-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
index fb316a1b47..fb316a1b47 100644
--- a/patches/api/0022-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
+++ b/patches/unapplied/api/0022-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
diff --git a/patches/api/0023-Add-exception-reporting-event.patch b/patches/unapplied/api/0023-Add-exception-reporting-event.patch
index f4d1eb65f8..f4d1eb65f8 100644
--- a/patches/api/0023-Add-exception-reporting-event.patch
+++ b/patches/unapplied/api/0023-Add-exception-reporting-event.patch
diff --git a/patches/api/0024-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch b/patches/unapplied/api/0024-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
index 02e7138c10..02e7138c10 100644
--- a/patches/api/0024-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
+++ b/patches/unapplied/api/0024-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
diff --git a/patches/api/0025-Fix-ServerListPingEvent-flagging-as-Async.patch b/patches/unapplied/api/0025-Fix-ServerListPingEvent-flagging-as-Async.patch
index 87d3369578..87d3369578 100644
--- a/patches/api/0025-Fix-ServerListPingEvent-flagging-as-Async.patch
+++ b/patches/unapplied/api/0025-Fix-ServerListPingEvent-flagging-as-Async.patch
diff --git a/patches/api/0026-Player-Tab-List-and-Title-APIs.patch b/patches/unapplied/api/0026-Player-Tab-List-and-Title-APIs.patch
index 37a7ed9ff4..37a7ed9ff4 100644
--- a/patches/api/0026-Player-Tab-List-and-Title-APIs.patch
+++ b/patches/unapplied/api/0026-Player-Tab-List-and-Title-APIs.patch
diff --git a/patches/api/0027-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/patches/unapplied/api/0027-Add-methods-for-working-with-arrows-stuck-in-living-.patch
index 5fda7e4691..5fda7e4691 100644
--- a/patches/api/0027-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/patches/unapplied/api/0027-Add-methods-for-working-with-arrows-stuck-in-living-.patch
diff --git a/patches/api/0028-Complete-resource-pack-API.patch b/patches/unapplied/api/0028-Complete-resource-pack-API.patch
index ac99684151..ac99684151 100644
--- a/patches/api/0028-Complete-resource-pack-API.patch
+++ b/patches/unapplied/api/0028-Complete-resource-pack-API.patch
diff --git a/patches/api/0029-Add-a-call-helper-to-Event.patch b/patches/unapplied/api/0029-Add-a-call-helper-to-Event.patch
index 4b287bfa56..4b287bfa56 100644
--- a/patches/api/0029-Add-a-call-helper-to-Event.patch
+++ b/patches/unapplied/api/0029-Add-a-call-helper-to-Event.patch
diff --git a/patches/api/0030-Add-sender-name-to-commands.yml-replacement.patch b/patches/unapplied/api/0030-Add-sender-name-to-commands.yml-replacement.patch
index 7122fed4a2..7122fed4a2 100644
--- a/patches/api/0030-Add-sender-name-to-commands.yml-replacement.patch
+++ b/patches/unapplied/api/0030-Add-sender-name-to-commands.yml-replacement.patch
diff --git a/patches/api/0031-Add-command-to-reload-permissions.yml-and-require-co.patch b/patches/unapplied/api/0031-Add-command-to-reload-permissions.yml-and-require-co.patch
index 5dea7265c0..78fada6408 100644
--- a/patches/api/0031-Add-command-to-reload-permissions.yml-and-require-co.patch
+++ b/patches/unapplied/api/0031-Add-command-to-reload-permissions.yml-and-require-co.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add command to reload permissions.yml and require confirm to
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 9d1f1b97a16524ba1d523dd9130f113f0cf3e779..cb1c05f5844724f8c937fac2d7f2a878631d1936 100644
+index 3118da2ad367b5bd547769214112ea5299c95866..7b467aedbcf3a6174bfb12ded3b27775a7eaf45c 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -2276,6 +2276,13 @@ public final class Bukkit {
@@ -24,7 +24,7 @@ index 9d1f1b97a16524ba1d523dd9130f113f0cf3e779..cb1c05f5844724f8c937fac2d7f2a878
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 38e3bc502e66229a24833ab1eebba6816155fa19..09c8e8376da0eb0590f09d1ac43595c3825daf06 100644
+index d94483d1481f233897faf378e6b34b6b97f02caf..c5591e82e14e299facfc767a20f2eed77354caac 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -2012,4 +2012,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0032-Custom-replacement-for-eaten-items.patch b/patches/unapplied/api/0032-Custom-replacement-for-eaten-items.patch
index f7a9207fb3..f7a9207fb3 100644
--- a/patches/api/0032-Custom-replacement-for-eaten-items.patch
+++ b/patches/unapplied/api/0032-Custom-replacement-for-eaten-items.patch
diff --git a/patches/api/0033-Entity-AddTo-RemoveFrom-World-Events.patch b/patches/unapplied/api/0033-Entity-AddTo-RemoveFrom-World-Events.patch
index 5dc11c88f8..5dc11c88f8 100644
--- a/patches/api/0033-Entity-AddTo-RemoveFrom-World-Events.patch
+++ b/patches/unapplied/api/0033-Entity-AddTo-RemoveFrom-World-Events.patch
diff --git a/patches/api/0034-EntityPathfindEvent.patch b/patches/unapplied/api/0034-EntityPathfindEvent.patch
index 697b76661a..697b76661a 100644
--- a/patches/api/0034-EntityPathfindEvent.patch
+++ b/patches/unapplied/api/0034-EntityPathfindEvent.patch
diff --git a/patches/api/0035-Reduce-thread-synchronization-in-MetadataStoreBase.patch b/patches/unapplied/api/0035-Reduce-thread-synchronization-in-MetadataStoreBase.patch
index 9bc7e49e8d..9bc7e49e8d 100644
--- a/patches/api/0035-Reduce-thread-synchronization-in-MetadataStoreBase.patch
+++ b/patches/unapplied/api/0035-Reduce-thread-synchronization-in-MetadataStoreBase.patch
diff --git a/patches/api/0036-Add-MetadataStoreBase.removeAll-Plugin.patch b/patches/unapplied/api/0036-Add-MetadataStoreBase.removeAll-Plugin.patch
index 2496de7423..2496de7423 100644
--- a/patches/api/0036-Add-MetadataStoreBase.removeAll-Plugin.patch
+++ b/patches/unapplied/api/0036-Add-MetadataStoreBase.removeAll-Plugin.patch
diff --git a/patches/api/0037-Add-PlayerUseUnknownEntityEvent.patch b/patches/unapplied/api/0037-Add-PlayerUseUnknownEntityEvent.patch
index 61dbf320c2..61dbf320c2 100644
--- a/patches/api/0037-Add-PlayerUseUnknownEntityEvent.patch
+++ b/patches/unapplied/api/0037-Add-PlayerUseUnknownEntityEvent.patch
diff --git a/patches/api/0038-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/patches/unapplied/api/0038-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
index e041c954a7..e041c954a7 100644
--- a/patches/api/0038-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
+++ b/patches/unapplied/api/0038-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
diff --git a/patches/api/0039-Arrow-pickup-rule-API.patch b/patches/unapplied/api/0039-Arrow-pickup-rule-API.patch
index fb3753f0e1..fb3753f0e1 100644
--- a/patches/api/0039-Arrow-pickup-rule-API.patch
+++ b/patches/unapplied/api/0039-Arrow-pickup-rule-API.patch
diff --git a/patches/api/0040-EntityRegainHealthEvent-isFastRegen-API.patch b/patches/unapplied/api/0040-EntityRegainHealthEvent-isFastRegen-API.patch
index f06ee13d15..f06ee13d15 100644
--- a/patches/api/0040-EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/patches/unapplied/api/0040-EntityRegainHealthEvent-isFastRegen-API.patch
diff --git a/patches/api/0041-LootTable-API.patch b/patches/unapplied/api/0041-LootTable-API.patch
index 1f8dd8b256..1f8dd8b256 100644
--- a/patches/api/0041-LootTable-API.patch
+++ b/patches/unapplied/api/0041-LootTable-API.patch
diff --git a/patches/api/0042-Add-EntityZapEvent.patch b/patches/unapplied/api/0042-Add-EntityZapEvent.patch
index cb9acafef2..cb9acafef2 100644
--- a/patches/api/0042-Add-EntityZapEvent.patch
+++ b/patches/unapplied/api/0042-Add-EntityZapEvent.patch
diff --git a/patches/api/0043-Misc-Utils.patch b/patches/unapplied/api/0043-Misc-Utils.patch
index fac858b16c..fac858b16c 100644
--- a/patches/api/0043-Misc-Utils.patch
+++ b/patches/unapplied/api/0043-Misc-Utils.patch
diff --git a/patches/api/0044-Allow-Reloading-of-Command-Aliases.patch b/patches/unapplied/api/0044-Allow-Reloading-of-Command-Aliases.patch
index b966a58c4d..5fad0aed7c 100644
--- a/patches/api/0044-Allow-Reloading-of-Command-Aliases.patch
+++ b/patches/unapplied/api/0044-Allow-Reloading-of-Command-Aliases.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Command Aliases
 Reload the aliases stored in commands.yml
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index cb1c05f5844724f8c937fac2d7f2a878631d1936..c58a61b15838b17c40c11edae0a3677ec7bddedb 100644
+index 7b467aedbcf3a6174bfb12ded3b27775a7eaf45c..27f076ed2bb30bc27564db61e165cff4172f9df0 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -2283,6 +2283,15 @@ public final class Bukkit {
@@ -26,7 +26,7 @@ index cb1c05f5844724f8c937fac2d7f2a878631d1936..c58a61b15838b17c40c11edae0a3677e
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 09c8e8376da0eb0590f09d1ac43595c3825daf06..62adb5e4c51bd52e7589071f1316ab93b2fede31 100644
+index c5591e82e14e299facfc767a20f2eed77354caac..d80f41e7f4466eae8101b5ee7136918e6de93324 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -2014,4 +2014,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0045-Add-source-to-PlayerExpChangeEvent.patch b/patches/unapplied/api/0045-Add-source-to-PlayerExpChangeEvent.patch
index 675b2be839..675b2be839 100644
--- a/patches/api/0045-Add-source-to-PlayerExpChangeEvent.patch
+++ b/patches/unapplied/api/0045-Add-source-to-PlayerExpChangeEvent.patch
diff --git a/patches/api/0046-Add-ProjectileCollideEvent.patch b/patches/unapplied/api/0046-Add-ProjectileCollideEvent.patch
index 24d739cb59..24d739cb59 100644
--- a/patches/api/0046-Add-ProjectileCollideEvent.patch
+++ b/patches/unapplied/api/0046-Add-ProjectileCollideEvent.patch
diff --git a/patches/api/0047-Add-String-based-Action-Bar-API.patch b/patches/unapplied/api/0047-Add-String-based-Action-Bar-API.patch
index adc0d82d97..adc0d82d97 100644
--- a/patches/api/0047-Add-String-based-Action-Bar-API.patch
+++ b/patches/unapplied/api/0047-Add-String-based-Action-Bar-API.patch
diff --git a/patches/api/0048-Add-API-methods-to-control-if-armour-stands-can-move.patch b/patches/unapplied/api/0048-Add-API-methods-to-control-if-armour-stands-can-move.patch
index 5253041ed0..5253041ed0 100644
--- a/patches/api/0048-Add-API-methods-to-control-if-armour-stands-can-move.patch
+++ b/patches/unapplied/api/0048-Add-API-methods-to-control-if-armour-stands-can-move.patch
diff --git a/patches/api/0049-IllegalPacketEvent.patch b/patches/unapplied/api/0049-IllegalPacketEvent.patch
index 7eb8d61aaa..7eb8d61aaa 100644
--- a/patches/api/0049-IllegalPacketEvent.patch
+++ b/patches/unapplied/api/0049-IllegalPacketEvent.patch
diff --git a/patches/api/0050-Fireworks-API-s.patch b/patches/unapplied/api/0050-Fireworks-API-s.patch
index 126f0b838d..126f0b838d 100644
--- a/patches/api/0050-Fireworks-API-s.patch
+++ b/patches/unapplied/api/0050-Fireworks-API-s.patch
diff --git a/patches/api/0051-PlayerTeleportEndGatewayEvent.patch b/patches/unapplied/api/0051-PlayerTeleportEndGatewayEvent.patch
index 664edd24cd..664edd24cd 100644
--- a/patches/api/0051-PlayerTeleportEndGatewayEvent.patch
+++ b/patches/unapplied/api/0051-PlayerTeleportEndGatewayEvent.patch
diff --git a/patches/api/0052-Provide-E-TE-Chunk-count-stat-methods.patch b/patches/unapplied/api/0052-Provide-E-TE-Chunk-count-stat-methods.patch
index 4bc411fd8f..85d8b5eb68 100644
--- a/patches/api/0052-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/patches/unapplied/api/0052-Provide-E-TE-Chunk-count-stat-methods.patch
@@ -7,7 +7,7 @@ Provides counts without the ineffeciency of using .getEntities().size()
 which creates copy of the collections.
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 3559115d09b57acf5c2853b811862e5131f2a625..dbb799aed5bbb80edd2428b63d3fce15cf2e2f05 100644
+index 2867faf0acbbbb2e99c5b503f0c6bc83f3bfe80f..f5a398aa5f7a7e6280167fd723f78f4d72e2b1dd 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -47,6 +47,33 @@ import org.jetbrains.annotations.Nullable;
diff --git a/patches/api/0053-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/unapplied/api/0053-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index 5dadaf640f..5dadaf640f 100644
--- a/patches/api/0053-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/patches/unapplied/api/0053-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
diff --git a/patches/api/0054-Expose-WorldBorder-isInBounds-Location-check.patch b/patches/unapplied/api/0054-Expose-WorldBorder-isInBounds-Location-check.patch
index 95db493acf..95db493acf 100644
--- a/patches/api/0054-Expose-WorldBorder-isInBounds-Location-check.patch
+++ b/patches/unapplied/api/0054-Expose-WorldBorder-isInBounds-Location-check.patch
diff --git a/patches/api/0055-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/unapplied/api/0055-Add-configuration-option-to-prevent-player-names-fro.patch
index f46d307145..bf9b28356d 100644
--- a/patches/api/0055-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/patches/unapplied/api/0055-Add-configuration-option-to-prevent-player-names-fro.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add configuration option to prevent player names from being
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index c58a61b15838b17c40c11edae0a3677ec7bddedb..8f9a19b1795ccddb7be268b72038cc236267821a 100644
+index 27f076ed2bb30bc27564db61e165cff4172f9df0..0ec7937572a28964123322f0cd2c060d4d69e42e 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -2292,6 +2292,16 @@ public final class Bukkit {
@@ -27,7 +27,7 @@ index c58a61b15838b17c40c11edae0a3677ec7bddedb..8f9a19b1795ccddb7be268b72038cc23
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 62adb5e4c51bd52e7589071f1316ab93b2fede31..86910935fa823f1e23cf1d89604d042c1c87fbc6 100644
+index d80f41e7f4466eae8101b5ee7136918e6de93324..581955462495d63d07f2f461f45b1353e5b89c5b 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -2016,4 +2016,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0056-Fix-upstream-javadocs.patch b/patches/unapplied/api/0056-Fix-upstream-javadocs.patch
index d8af62b178..d8af62b178 100644
--- a/patches/api/0056-Fix-upstream-javadocs.patch
+++ b/patches/unapplied/api/0056-Fix-upstream-javadocs.patch
diff --git a/patches/api/0057-Item-canEntityPickup.patch b/patches/unapplied/api/0057-Item-canEntityPickup.patch
index 1d18a940a2..1d18a940a2 100644
--- a/patches/api/0057-Item-canEntityPickup.patch
+++ b/patches/unapplied/api/0057-Item-canEntityPickup.patch
diff --git a/patches/api/0058-PlayerAttemptPickupItemEvent.patch b/patches/unapplied/api/0058-PlayerAttemptPickupItemEvent.patch
index 6b504ae688..6b504ae688 100644
--- a/patches/api/0058-PlayerAttemptPickupItemEvent.patch
+++ b/patches/unapplied/api/0058-PlayerAttemptPickupItemEvent.patch
diff --git a/patches/api/0059-Add-UnknownCommandEvent.patch b/patches/unapplied/api/0059-Add-UnknownCommandEvent.patch
index df31d3cf28..df31d3cf28 100644
--- a/patches/api/0059-Add-UnknownCommandEvent.patch
+++ b/patches/unapplied/api/0059-Add-UnknownCommandEvent.patch
diff --git a/patches/api/0060-Basic-PlayerProfile-API.patch b/patches/unapplied/api/0060-Basic-PlayerProfile-API.patch
index ab35d1c971..1fd339cefa 100644
--- a/patches/api/0060-Basic-PlayerProfile-API.patch
+++ b/patches/unapplied/api/0060-Basic-PlayerProfile-API.patch
@@ -321,7 +321,7 @@ index 0000000000000000000000000000000000000000..7b3b6ef533d32169fbeca389bd61cfc6
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 365c2cd4f5a3a382d3b52b50377fbf56731a30ae..87ce6947a1e974c18e84f56ba622bee9fff3570b 100644
+index a1c8cb4d89147311539a70901c74eae4020c022f..8f1f432c9d6c68ac142401626adaf1dc212181f2 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -2304,6 +2304,83 @@ public final class Bukkit {
@@ -409,7 +409,7 @@ index 365c2cd4f5a3a382d3b52b50377fbf56731a30ae..87ce6947a1e974c18e84f56ba622bee9
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 36d07fda939a5e1b4acf77d9092bfc42bbd27d78..bc68d8af8b38232392a12ef5f338e85ca80bccd0 100644
+index 95d1e6c57c3331ce3badfb5269531dce490d4079..aad8b2fbdbb03fbf32f99b3a533716eca9d42219 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -2024,5 +2024,74 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0061-PlayerPickupItemEvent-setFlyAtPlayer.patch b/patches/unapplied/api/0061-PlayerPickupItemEvent-setFlyAtPlayer.patch
index 353d395911..353d395911 100644
--- a/patches/api/0061-PlayerPickupItemEvent-setFlyAtPlayer.patch
+++ b/patches/unapplied/api/0061-PlayerPickupItemEvent-setFlyAtPlayer.patch
diff --git a/patches/api/0062-Shoulder-Entities-Release-API.patch b/patches/unapplied/api/0062-Shoulder-Entities-Release-API.patch
index 5dbabdff87..5dbabdff87 100644
--- a/patches/api/0062-Shoulder-Entities-Release-API.patch
+++ b/patches/unapplied/api/0062-Shoulder-Entities-Release-API.patch
diff --git a/patches/api/0063-Entity-fromMobSpawner.patch b/patches/unapplied/api/0063-Entity-fromMobSpawner.patch
index 7fe0e96d19..7fe0e96d19 100644
--- a/patches/api/0063-Entity-fromMobSpawner.patch
+++ b/patches/unapplied/api/0063-Entity-fromMobSpawner.patch
diff --git a/patches/api/0064-Profile-Lookup-Events.patch b/patches/unapplied/api/0064-Profile-Lookup-Events.patch
index 1cdb35476d..1cdb35476d 100644
--- a/patches/api/0064-Profile-Lookup-Events.patch
+++ b/patches/unapplied/api/0064-Profile-Lookup-Events.patch
diff --git a/patches/api/0065-Improve-the-Saddle-API-for-Horses.patch b/patches/unapplied/api/0065-Improve-the-Saddle-API-for-Horses.patch
index 85814456bf..85814456bf 100644
--- a/patches/api/0065-Improve-the-Saddle-API-for-Horses.patch
+++ b/patches/unapplied/api/0065-Improve-the-Saddle-API-for-Horses.patch
diff --git a/patches/api/0066-Add-getI18NDisplayName-API.patch b/patches/unapplied/api/0066-Add-getI18NDisplayName-API.patch
index ca75771d14..ca75771d14 100644
--- a/patches/api/0066-Add-getI18NDisplayName-API.patch
+++ b/patches/unapplied/api/0066-Add-getI18NDisplayName-API.patch
diff --git a/patches/api/0067-ensureServerConversions-API.patch b/patches/unapplied/api/0067-ensureServerConversions-API.patch
index 75f8c9aded..75f8c9aded 100644
--- a/patches/api/0067-ensureServerConversions-API.patch
+++ b/patches/unapplied/api/0067-ensureServerConversions-API.patch
diff --git a/patches/api/0068-LivingEntity-setKiller.patch b/patches/unapplied/api/0068-LivingEntity-setKiller.patch
index 632b924756..632b924756 100644
--- a/patches/api/0068-LivingEntity-setKiller.patch
+++ b/patches/unapplied/api/0068-LivingEntity-setKiller.patch
diff --git a/patches/api/0069-ProfileWhitelistVerifyEvent.patch b/patches/unapplied/api/0069-ProfileWhitelistVerifyEvent.patch
index 9bf74b4d3e..9bf74b4d3e 100644
--- a/patches/api/0069-ProfileWhitelistVerifyEvent.patch
+++ b/patches/unapplied/api/0069-ProfileWhitelistVerifyEvent.patch
diff --git a/patches/api/0070-Allow-plugins-to-use-SLF4J-for-logging.patch b/patches/unapplied/api/0070-Allow-plugins-to-use-SLF4J-for-logging.patch
index 8d10a87ad3..61f6541b7a 100644
--- a/patches/api/0070-Allow-plugins-to-use-SLF4J-for-logging.patch
+++ b/patches/unapplied/api/0070-Allow-plugins-to-use-SLF4J-for-logging.patch
@@ -14,7 +14,7 @@ it without having to shade it in the plugin and going through
 several layers of logging abstraction.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 145f6209a984e74da2d2de03cf725c06c77ef8da..639651972fddce4dff63a0f0a7e566a15b9e2dd6 100644
+index 37d894eaffbf31045b1ed349d70af6408348a1a6..e827ee211e3c65dc68ac5867fd8476639df63645 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -12,6 +12,8 @@ java {
diff --git a/patches/api/0071-Handle-plugin-prefixes-in-implementation-logging-con.patch b/patches/unapplied/api/0071-Handle-plugin-prefixes-in-implementation-logging-con.patch
index 55b6e4b2f9..55b6e4b2f9 100644
--- a/patches/api/0071-Handle-plugin-prefixes-in-implementation-logging-con.patch
+++ b/patches/unapplied/api/0071-Handle-plugin-prefixes-in-implementation-logging-con.patch
diff --git a/patches/api/0072-Add-PlayerJumpEvent.patch b/patches/unapplied/api/0072-Add-PlayerJumpEvent.patch
index 18f2c35b4d..18f2c35b4d 100644
--- a/patches/api/0072-Add-PlayerJumpEvent.patch
+++ b/patches/unapplied/api/0072-Add-PlayerJumpEvent.patch
diff --git a/patches/api/0073-Add-workaround-for-plugins-modifying-the-parent-of-t.patch b/patches/unapplied/api/0073-Add-workaround-for-plugins-modifying-the-parent-of-t.patch
index 3b10918fc8..3b10918fc8 100644
--- a/patches/api/0073-Add-workaround-for-plugins-modifying-the-parent-of-t.patch
+++ b/patches/unapplied/api/0073-Add-workaround-for-plugins-modifying-the-parent-of-t.patch
diff --git a/patches/api/0074-Add-PlayerArmorChangeEvent.patch b/patches/unapplied/api/0074-Add-PlayerArmorChangeEvent.patch
index fc6dc06ab6..fc6dc06ab6 100644
--- a/patches/api/0074-Add-PlayerArmorChangeEvent.patch
+++ b/patches/unapplied/api/0074-Add-PlayerArmorChangeEvent.patch
diff --git a/patches/api/0075-API-to-get-a-BlockState-without-a-snapshot.patch b/patches/unapplied/api/0075-API-to-get-a-BlockState-without-a-snapshot.patch
index 323b157741..323b157741 100644
--- a/patches/api/0075-API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/patches/unapplied/api/0075-API-to-get-a-BlockState-without-a-snapshot.patch
diff --git a/patches/api/0076-AsyncTabCompleteEvent.patch b/patches/unapplied/api/0076-AsyncTabCompleteEvent.patch
index 453dd2fbc4..453dd2fbc4 100644
--- a/patches/api/0076-AsyncTabCompleteEvent.patch
+++ b/patches/unapplied/api/0076-AsyncTabCompleteEvent.patch
diff --git a/patches/api/0077-Expose-client-protocol-version-and-virtual-host.patch b/patches/unapplied/api/0077-Expose-client-protocol-version-and-virtual-host.patch
index 225a9fa26a..9c0eed5991 100644
--- a/patches/api/0077-Expose-client-protocol-version-and-virtual-host.patch
+++ b/patches/unapplied/api/0077-Expose-client-protocol-version-and-virtual-host.patch
@@ -57,7 +57,7 @@ index 0000000000000000000000000000000000000000..7b2af1bd72dfbcf4e962a982940fc49b
 +
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 264c6bdeb2f1f0d937e4356d761a3264a1c4d58a..f9239eae50b86f54f0cd8c604d2ba9468fc5f33b 100644
+index 74823885b0836db404737199b21c09c1ebcbad3c..0da374b18e0f602e9836cfaefe07c5219a7d9bd1 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -51,7 +51,7 @@ import org.jetbrains.annotations.Nullable;
diff --git a/patches/api/0078-Display-warning-on-deprecated-recipe-API.patch b/patches/unapplied/api/0078-Display-warning-on-deprecated-recipe-API.patch
index 94f1cdd1f2..94f1cdd1f2 100644
--- a/patches/api/0078-Display-warning-on-deprecated-recipe-API.patch
+++ b/patches/unapplied/api/0078-Display-warning-on-deprecated-recipe-API.patch
diff --git a/patches/api/0079-PlayerPickupExperienceEvent.patch b/patches/unapplied/api/0079-PlayerPickupExperienceEvent.patch
index 906a8ec7c3..906a8ec7c3 100644
--- a/patches/api/0079-PlayerPickupExperienceEvent.patch
+++ b/patches/unapplied/api/0079-PlayerPickupExperienceEvent.patch
diff --git a/patches/api/0080-ExperienceOrbMergeEvent.patch b/patches/unapplied/api/0080-ExperienceOrbMergeEvent.patch
index 3a4722a776..3a4722a776 100644
--- a/patches/api/0080-ExperienceOrbMergeEvent.patch
+++ b/patches/unapplied/api/0080-ExperienceOrbMergeEvent.patch
diff --git a/patches/api/0081-Ability-to-apply-mending-to-XP-API.patch b/patches/unapplied/api/0081-Ability-to-apply-mending-to-XP-API.patch
index 77af6fd380..77af6fd380 100644
--- a/patches/api/0081-Ability-to-apply-mending-to-XP-API.patch
+++ b/patches/unapplied/api/0081-Ability-to-apply-mending-to-XP-API.patch
diff --git a/patches/api/0082-PreCreatureSpawnEvent.patch b/patches/unapplied/api/0082-PreCreatureSpawnEvent.patch
index 3213ed0ab2..3213ed0ab2 100644
--- a/patches/api/0082-PreCreatureSpawnEvent.patch
+++ b/patches/unapplied/api/0082-PreCreatureSpawnEvent.patch
diff --git a/patches/api/0083-PlayerNaturallySpawnCreaturesEvent.patch b/patches/unapplied/api/0083-PlayerNaturallySpawnCreaturesEvent.patch
index a6fa8a9b72..a6fa8a9b72 100644
--- a/patches/api/0083-PlayerNaturallySpawnCreaturesEvent.patch
+++ b/patches/unapplied/api/0083-PlayerNaturallySpawnCreaturesEvent.patch
diff --git a/patches/api/0084-Add-setPlayerProfile-API-for-Skulls.patch b/patches/unapplied/api/0084-Add-setPlayerProfile-API-for-Skulls.patch
index 62d576949f..62d576949f 100644
--- a/patches/api/0084-Add-setPlayerProfile-API-for-Skulls.patch
+++ b/patches/unapplied/api/0084-Add-setPlayerProfile-API-for-Skulls.patch
diff --git a/patches/api/0085-Add-PlayerAdvancementCriterionGrantEvent.patch b/patches/unapplied/api/0085-Add-PlayerAdvancementCriterionGrantEvent.patch
index c974eeae83..adcd2dbe76 100644
--- a/patches/api/0085-Add-PlayerAdvancementCriterionGrantEvent.patch
+++ b/patches/unapplied/api/0085-Add-PlayerAdvancementCriterionGrantEvent.patch
@@ -7,7 +7,7 @@ Co-authored-by: The456gamer <[email protected]>
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerAdvancementCriterionGrantEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerAdvancementCriterionGrantEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..9e43739404814781ede832ec5931cd2d963fff19
+index 0000000000000000000000000000000000000000..99dac77befbf7c0c067f50150e62fe6d6ddaec7c
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerAdvancementCriterionGrantEvent.java
 @@ -0,0 +1,78 @@
diff --git a/patches/api/0086-Fill-Profile-Property-Events.patch b/patches/unapplied/api/0086-Fill-Profile-Property-Events.patch
index 5511f6449a..5511f6449a 100644
--- a/patches/api/0086-Fill-Profile-Property-Events.patch
+++ b/patches/unapplied/api/0086-Fill-Profile-Property-Events.patch
diff --git a/patches/api/0087-Add-ArmorStand-Item-Meta.patch b/patches/unapplied/api/0087-Add-ArmorStand-Item-Meta.patch
index 6287ef49e7..6287ef49e7 100644
--- a/patches/api/0087-Add-ArmorStand-Item-Meta.patch
+++ b/patches/unapplied/api/0087-Add-ArmorStand-Item-Meta.patch
diff --git a/patches/api/0088-Optimize-Hoppers.patch b/patches/unapplied/api/0088-Optimize-Hoppers.patch
index 3cf0268664..3cf0268664 100644
--- a/patches/api/0088-Optimize-Hoppers.patch
+++ b/patches/unapplied/api/0088-Optimize-Hoppers.patch
diff --git a/patches/api/0089-Tameable-getOwnerUniqueId-API.patch b/patches/unapplied/api/0089-Tameable-getOwnerUniqueId-API.patch
index b911542a60..b911542a60 100644
--- a/patches/api/0089-Tameable-getOwnerUniqueId-API.patch
+++ b/patches/unapplied/api/0089-Tameable-getOwnerUniqueId-API.patch
diff --git a/patches/api/0090-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/patches/unapplied/api/0090-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
index 178267a089..178267a089 100644
--- a/patches/api/0090-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
+++ b/patches/unapplied/api/0090-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
diff --git a/patches/api/0091-Add-extended-PaperServerListPingEvent.patch b/patches/unapplied/api/0091-Add-extended-PaperServerListPingEvent.patch
index 6fd11cfebc..6fd11cfebc 100644
--- a/patches/api/0091-Add-extended-PaperServerListPingEvent.patch
+++ b/patches/unapplied/api/0091-Add-extended-PaperServerListPingEvent.patch
diff --git a/patches/api/0092-Player.setPlayerProfile-API.patch b/patches/unapplied/api/0092-Player.setPlayerProfile-API.patch
index 9f301f7e9f..9f301f7e9f 100644
--- a/patches/api/0092-Player.setPlayerProfile-API.patch
+++ b/patches/unapplied/api/0092-Player.setPlayerProfile-API.patch
diff --git a/patches/api/0093-getPlayerUniqueId-API.patch b/patches/unapplied/api/0093-getPlayerUniqueId-API.patch
index e47af44398..12a448bd00 100644
--- a/patches/api/0093-getPlayerUniqueId-API.patch
+++ b/patches/unapplied/api/0093-getPlayerUniqueId-API.patch
@@ -9,7 +9,7 @@ In Offline Mode, will return an Offline UUID
 This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 0dfb60e4635cc960b5cb481206b6c02adb36d7f9..251fa656bf17ecdd031c0e16def5eff3f553e9b4 100644
+index 8c430623204d419a93ccc67a0214942952f4a33c..9f52c092d906622e2eade3bc9d8baac6816f9f3a 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -689,6 +689,20 @@ public final class Bukkit {
@@ -34,7 +34,7 @@ index 0dfb60e4635cc960b5cb481206b6c02adb36d7f9..251fa656bf17ecdd031c0e16def5eff3
       * Gets the plugin manager for interfacing with plugins.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index ccc1142e496c33c70104646255bae98d43a6b6c2..f46e5fc53f202741b97d9264d4b24e4654d19bfb 100644
+index 405b6a388c3593a83985f766e79b92951006563e..aace34252f65dd54868b521288f68c641b7ed71e 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -593,6 +593,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0094-Add-legacy-ping-support-to-PaperServerListPingEvent.patch b/patches/unapplied/api/0094-Add-legacy-ping-support-to-PaperServerListPingEvent.patch
index f21c766148..f21c766148 100644
--- a/patches/api/0094-Add-legacy-ping-support-to-PaperServerListPingEvent.patch
+++ b/patches/unapplied/api/0094-Add-legacy-ping-support-to-PaperServerListPingEvent.patch
diff --git a/patches/api/0095-Add-openSign-method-to-HumanEntity.patch b/patches/unapplied/api/0095-Add-openSign-method-to-HumanEntity.patch
index 2be7ae4e63..2be7ae4e63 100644
--- a/patches/api/0095-Add-openSign-method-to-HumanEntity.patch
+++ b/patches/unapplied/api/0095-Add-openSign-method-to-HumanEntity.patch
diff --git a/patches/api/0096-Add-Ban-Methods-to-Player-Objects.patch b/patches/unapplied/api/0096-Add-Ban-Methods-to-Player-Objects.patch
index ad814c47c7..ad814c47c7 100644
--- a/patches/api/0096-Add-Ban-Methods-to-Player-Objects.patch
+++ b/patches/unapplied/api/0096-Add-Ban-Methods-to-Player-Objects.patch
diff --git a/patches/api/0097-EndermanEscapeEvent.patch b/patches/unapplied/api/0097-EndermanEscapeEvent.patch
index 82d22fd0ea..82d22fd0ea 100644
--- a/patches/api/0097-EndermanEscapeEvent.patch
+++ b/patches/unapplied/api/0097-EndermanEscapeEvent.patch
diff --git a/patches/api/0098-Enderman.teleportRandomly.patch b/patches/unapplied/api/0098-Enderman.teleportRandomly.patch
index 907a74cf51..907a74cf51 100644
--- a/patches/api/0098-Enderman.teleportRandomly.patch
+++ b/patches/unapplied/api/0098-Enderman.teleportRandomly.patch
diff --git a/patches/api/0099-Additional-world.getNearbyEntities-API-s.patch b/patches/unapplied/api/0099-Additional-world.getNearbyEntities-API-s.patch
index 22a6b6dc4f..41ef5f3eb3 100644
--- a/patches/api/0099-Additional-world.getNearbyEntities-API-s.patch
+++ b/patches/unapplied/api/0099-Additional-world.getNearbyEntities-API-s.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Additional world.getNearbyEntities API's
 Provides more methods to get nearby entities, and filter by types and predicates
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 609e4908ed21f69b9e813500e702bbe784bff00c..a5be4e073d3406e876e54824aca5449f3262ee75 100644
+index faedd3857023513340b6e9fc67b78c79e3989cbe..58a15d8fd57d55848b37bfc8fffa101692efce87 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -1,6 +1,9 @@
diff --git a/patches/api/0100-Location.isChunkLoaded-API.patch b/patches/unapplied/api/0100-Location.isChunkLoaded-API.patch
index be4937a770..e1a043b2b4 100644
--- a/patches/api/0100-Location.isChunkLoaded-API.patch
+++ b/patches/unapplied/api/0100-Location.isChunkLoaded-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Location.isChunkLoaded() API
 
 
 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index 3b99f359f556e6f2c341d55fa69b7462e69b6546..e71beb48f2e35d97b9d5bf8dbf5ddbc0673565fe 100644
+index 85c342fc50f2fe0ce9a1b3980df9e088c3dea92d..251d26e6870490abd3e915c5e7c06ce1075a24ab 100644
 --- a/src/main/java/org/bukkit/Location.java
 +++ b/src/main/java/org/bukkit/Location.java
 @@ -533,6 +533,7 @@ public class Location implements Cloneable, ConfigurationSerializable, io.paperm
diff --git a/patches/api/0101-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/unapplied/api/0101-Expand-World.spawnParticle-API-and-add-Builder.patch
index 44d6571c95..44d6571c95 100644
--- a/patches/api/0101-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/patches/unapplied/api/0101-Expand-World.spawnParticle-API-and-add-Builder.patch
diff --git a/patches/api/0102-EndermanAttackPlayerEvent.patch b/patches/unapplied/api/0102-EndermanAttackPlayerEvent.patch
index 9f3e105c9d..9f3e105c9d 100644
--- a/patches/api/0102-EndermanAttackPlayerEvent.patch
+++ b/patches/unapplied/api/0102-EndermanAttackPlayerEvent.patch
diff --git a/patches/api/0103-WitchConsumePotionEvent.patch b/patches/unapplied/api/0103-WitchConsumePotionEvent.patch
index fab6106411..fab6106411 100644
--- a/patches/api/0103-WitchConsumePotionEvent.patch
+++ b/patches/unapplied/api/0103-WitchConsumePotionEvent.patch
diff --git a/patches/api/0104-WitchThrowPotionEvent.patch b/patches/unapplied/api/0104-WitchThrowPotionEvent.patch
index a5dfe42f35..a5dfe42f35 100644
--- a/patches/api/0104-WitchThrowPotionEvent.patch
+++ b/patches/unapplied/api/0104-WitchThrowPotionEvent.patch
diff --git a/patches/api/0105-Location.toBlockLocation-toCenterLocation.patch b/patches/unapplied/api/0105-Location.toBlockLocation-toCenterLocation.patch
index c86b874f5f..c86b874f5f 100644
--- a/patches/api/0105-Location.toBlockLocation-toCenterLocation.patch
+++ b/patches/unapplied/api/0105-Location.toBlockLocation-toCenterLocation.patch
diff --git a/patches/api/0106-PotionEffect-clone-methods.patch b/patches/unapplied/api/0106-PotionEffect-clone-methods.patch
index 201a73d2b8..201a73d2b8 100644
--- a/patches/api/0106-PotionEffect-clone-methods.patch
+++ b/patches/unapplied/api/0106-PotionEffect-clone-methods.patch
diff --git a/patches/api/0107-WitchReadyPotionEvent.patch b/patches/unapplied/api/0107-WitchReadyPotionEvent.patch
index 2231308ed2..2231308ed2 100644
--- a/patches/api/0107-WitchReadyPotionEvent.patch
+++ b/patches/unapplied/api/0107-WitchReadyPotionEvent.patch
diff --git a/patches/api/0108-ItemStack-getMaxItemUseDuration.patch b/patches/unapplied/api/0108-ItemStack-getMaxItemUseDuration.patch
index 18991e040f..18991e040f 100644
--- a/patches/api/0108-ItemStack-getMaxItemUseDuration.patch
+++ b/patches/unapplied/api/0108-ItemStack-getMaxItemUseDuration.patch
diff --git a/patches/api/0109-Add-EntityTeleportEndGatewayEvent.patch b/patches/unapplied/api/0109-Add-EntityTeleportEndGatewayEvent.patch
index 0422ec9858..0422ec9858 100644
--- a/patches/api/0109-Add-EntityTeleportEndGatewayEvent.patch
+++ b/patches/unapplied/api/0109-Add-EntityTeleportEndGatewayEvent.patch
diff --git a/patches/api/0110-Make-shield-blocking-delay-configurable.patch b/patches/unapplied/api/0110-Make-shield-blocking-delay-configurable.patch
index e7fe3e1f17..e7fe3e1f17 100644
--- a/patches/api/0110-Make-shield-blocking-delay-configurable.patch
+++ b/patches/unapplied/api/0110-Make-shield-blocking-delay-configurable.patch
diff --git a/patches/api/0111-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/patches/unapplied/api/0111-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
index 71a82a8eae..71a82a8eae 100644
--- a/patches/api/0111-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
+++ b/patches/unapplied/api/0111-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
diff --git a/patches/api/0112-Add-getNearbyXXX-methods-to-Location.patch b/patches/unapplied/api/0112-Add-getNearbyXXX-methods-to-Location.patch
index 1898cc3ed6..1898cc3ed6 100644
--- a/patches/api/0112-Add-getNearbyXXX-methods-to-Location.patch
+++ b/patches/unapplied/api/0112-Add-getNearbyXXX-methods-to-Location.patch
diff --git a/patches/api/0113-PlayerReadyArrowEvent.patch b/patches/unapplied/api/0113-PlayerReadyArrowEvent.patch
index 7ea1740581..7ea1740581 100644
--- a/patches/api/0113-PlayerReadyArrowEvent.patch
+++ b/patches/unapplied/api/0113-PlayerReadyArrowEvent.patch
diff --git a/patches/api/0114-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch b/patches/unapplied/api/0114-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch
index 31a2d09ee8..31a2d09ee8 100644
--- a/patches/api/0114-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch
+++ b/patches/unapplied/api/0114-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch
diff --git a/patches/api/0115-Expand-Explosions-API.patch b/patches/unapplied/api/0115-Expand-Explosions-API.patch
index 3be51b350e..3be51b350e 100644
--- a/patches/api/0115-Expand-Explosions-API.patch
+++ b/patches/unapplied/api/0115-Expand-Explosions-API.patch
diff --git a/patches/api/0116-ItemStack-API-additions-for-quantity-flags-lore.patch b/patches/unapplied/api/0116-ItemStack-API-additions-for-quantity-flags-lore.patch
index 0e4f6385f6..0e4f6385f6 100644
--- a/patches/api/0116-ItemStack-API-additions-for-quantity-flags-lore.patch
+++ b/patches/unapplied/api/0116-ItemStack-API-additions-for-quantity-flags-lore.patch
diff --git a/patches/api/0117-LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/unapplied/api/0117-LivingEntity-Hand-Raised-Item-Use-API.patch
index 7ceb852dcb..7ceb852dcb 100644
--- a/patches/api/0117-LivingEntity-Hand-Raised-Item-Use-API.patch
+++ b/patches/unapplied/api/0117-LivingEntity-Hand-Raised-Item-Use-API.patch
diff --git a/patches/api/0118-RangedEntity-API.patch b/patches/unapplied/api/0118-RangedEntity-API.patch
index 50af709e0a..50af709e0a 100644
--- a/patches/api/0118-RangedEntity-API.patch
+++ b/patches/unapplied/api/0118-RangedEntity-API.patch
diff --git a/patches/api/0119-Add-World.getEntity-UUID-API.patch b/patches/unapplied/api/0119-Add-World.getEntity-UUID-API.patch
index 40debf25c1..fbf6d33245 100644
--- a/patches/api/0119-Add-World.getEntity-UUID-API.patch
+++ b/patches/unapplied/api/0119-Add-World.getEntity-UUID-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add World.getEntity(UUID) API
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index c0e45f4c964ae262a894d92cff8f0750660cd41d..17b9e695a3f2eab94714b2124c657ee4d8b5ef51 100644
+index cd946f2de8a09fdb6ff9b256ca7eba64e6ed9aab..7ebe35096db30854443932add9d1f737f328ec92 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -894,6 +894,17 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0120-InventoryCloseEvent-Reason-API.patch b/patches/unapplied/api/0120-InventoryCloseEvent-Reason-API.patch
index e8d8154e21..e8d8154e21 100644
--- a/patches/api/0120-InventoryCloseEvent-Reason-API.patch
+++ b/patches/unapplied/api/0120-InventoryCloseEvent-Reason-API.patch
diff --git a/patches/api/0121-Allow-setting-the-vex-s-summoner.patch b/patches/unapplied/api/0121-Allow-setting-the-vex-s-summoner.patch
index 1e6b3abb27..1e6b3abb27 100644
--- a/patches/api/0121-Allow-setting-the-vex-s-summoner.patch
+++ b/patches/unapplied/api/0121-Allow-setting-the-vex-s-summoner.patch
diff --git a/patches/api/0122-Entity-getChunk-API.patch b/patches/unapplied/api/0122-Entity-getChunk-API.patch
index 1db2f570f9..1db2f570f9 100644
--- a/patches/api/0122-Entity-getChunk-API.patch
+++ b/patches/unapplied/api/0122-Entity-getChunk-API.patch
diff --git a/patches/api/0123-EnderDragon-Events.patch b/patches/unapplied/api/0123-EnderDragon-Events.patch
index 1a81af508a..1a81af508a 100644
--- a/patches/api/0123-EnderDragon-Events.patch
+++ b/patches/unapplied/api/0123-EnderDragon-Events.patch
diff --git a/patches/api/0124-PlayerElytraBoostEvent.patch b/patches/unapplied/api/0124-PlayerElytraBoostEvent.patch
index c5d8e5ddf3..c5d8e5ddf3 100644
--- a/patches/api/0124-PlayerElytraBoostEvent.patch
+++ b/patches/unapplied/api/0124-PlayerElytraBoostEvent.patch
diff --git a/patches/api/0125-PlayerLaunchProjectileEvent.patch b/patches/unapplied/api/0125-PlayerLaunchProjectileEvent.patch
index d2c69beeea..d2c69beeea 100644
--- a/patches/api/0125-PlayerLaunchProjectileEvent.patch
+++ b/patches/unapplied/api/0125-PlayerLaunchProjectileEvent.patch
diff --git a/patches/api/0126-EntityTransformedEvent.patch b/patches/unapplied/api/0126-EntityTransformedEvent.patch
index 11dfd0e1b7..11dfd0e1b7 100644
--- a/patches/api/0126-EntityTransformedEvent.patch
+++ b/patches/unapplied/api/0126-EntityTransformedEvent.patch
diff --git a/patches/api/0127-Allow-disabling-armour-stand-ticking.patch b/patches/unapplied/api/0127-Allow-disabling-armour-stand-ticking.patch
index 1bb68e268b..1bb68e268b 100644
--- a/patches/api/0127-Allow-disabling-armour-stand-ticking.patch
+++ b/patches/unapplied/api/0127-Allow-disabling-armour-stand-ticking.patch
diff --git a/patches/api/0128-SkeletonHorse-Additions.patch b/patches/unapplied/api/0128-SkeletonHorse-Additions.patch
index d50767241a..d50767241a 100644
--- a/patches/api/0128-SkeletonHorse-Additions.patch
+++ b/patches/unapplied/api/0128-SkeletonHorse-Additions.patch
diff --git a/patches/api/0129-Expand-Location-Manipulation-API.patch b/patches/unapplied/api/0129-Expand-Location-Manipulation-API.patch
index aa3764628e..e345f50d62 100644
--- a/patches/api/0129-Expand-Location-Manipulation-API.patch
+++ b/patches/unapplied/api/0129-Expand-Location-Manipulation-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expand Location Manipulation API
 Adds set(x, y, z), add(base, x, y, z), subtract(base, x, y, z);
 
 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index 14aa275b0fb89d361ee5ec690684053e5e8b4e11..189c2159941712a6f22bb5aaf1e8ca80b4eb54f6 100644
+index af737017ee397f80c44ee02c6cc60cefa07f59c1..41125de49db8eafce4be59cc110ce5be06836a47 100644
 --- a/src/main/java/org/bukkit/Location.java
 +++ b/src/main/java/org/bukkit/Location.java
 @@ -545,6 +545,59 @@ public class Location implements Cloneable, ConfigurationSerializable, io.paperm
diff --git a/patches/api/0130-Expand-ArmorStand-API.patch b/patches/unapplied/api/0130-Expand-ArmorStand-API.patch
index 418a52b6ee..418a52b6ee 100644
--- a/patches/api/0130-Expand-ArmorStand-API.patch
+++ b/patches/unapplied/api/0130-Expand-ArmorStand-API.patch
diff --git a/patches/api/0131-AnvilDamageEvent.patch b/patches/unapplied/api/0131-AnvilDamageEvent.patch
index 66c4996773..66c4996773 100644
--- a/patches/api/0131-AnvilDamageEvent.patch
+++ b/patches/unapplied/api/0131-AnvilDamageEvent.patch
diff --git a/patches/api/0132-Add-TNTPrimeEvent.patch b/patches/unapplied/api/0132-Add-TNTPrimeEvent.patch
index 9282ea8794..9282ea8794 100644
--- a/patches/api/0132-Add-TNTPrimeEvent.patch
+++ b/patches/unapplied/api/0132-Add-TNTPrimeEvent.patch
diff --git a/patches/api/0133-Provide-Chunk-Coordinates-as-a-Long-API.patch b/patches/unapplied/api/0133-Provide-Chunk-Coordinates-as-a-Long-API.patch
index c239c5731e..eb07065fa4 100644
--- a/patches/api/0133-Provide-Chunk-Coordinates-as-a-Long-API.patch
+++ b/patches/unapplied/api/0133-Provide-Chunk-Coordinates-as-a-Long-API.patch
@@ -44,7 +44,7 @@ index efbfed855248cff8b4bdbfc181d3e82058df4749..766d643f0fe79660942fdad25e39e488
       * Gets the world containing this chunk
       *
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index ffe6c8be86fc93d39e256a89e5016e3025afbe5c..315ecb5dc0f33edfef893ead1297c8165d292250 100644
+index 7ebe35096db30854443932add9d1f737f328ec92..be0e1ad34c526f2bd7b80f035c79b07e3b3ef5fb 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -180,6 +180,37 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0134-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/unapplied/api/0134-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
index c6a3048377..c6a3048377 100644
--- a/patches/api/0134-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
+++ b/patches/unapplied/api/0134-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
diff --git a/patches/api/0135-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch b/patches/unapplied/api/0135-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch
index 83897ac115..83897ac115 100644
--- a/patches/api/0135-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch
+++ b/patches/unapplied/api/0135-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch
diff --git a/patches/api/0136-Allow-Blocks-to-be-accessed-via-a-long-key.patch b/patches/unapplied/api/0136-Allow-Blocks-to-be-accessed-via-a-long-key.patch
index cc8ba286d6..f63cb011ce 100644
--- a/patches/api/0136-Allow-Blocks-to-be-accessed-via-a-long-key.patch
+++ b/patches/unapplied/api/0136-Allow-Blocks-to-be-accessed-via-a-long-key.patch
@@ -18,7 +18,7 @@ Y range: [0, 1023]
 X, Z range: [-67 108 864, 67 108 863]
 
 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index 189c2159941712a6f22bb5aaf1e8ca80b4eb54f6..09d1f9f909c971d6a785e9f98278f8c55cd44637 100644
+index 41125de49db8eafce4be59cc110ce5be06836a47..34eeed3ec165bee9d9172ea636b1cc2d7d05f938 100644
 --- a/src/main/java/org/bukkit/Location.java
 +++ b/src/main/java/org/bukkit/Location.java
 @@ -15,7 +15,6 @@ import org.jetbrains.annotations.Nullable;
@@ -50,7 +50,7 @@ index 189c2159941712a6f22bb5aaf1e8ca80b4eb54f6..09d1f9f909c971d6a785e9f98278f8c5
       * @return A new location where X/Y/Z are the center of the block
       */
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index f21d3ab534a64a5445975968b63fc78d7dc2fa72..fef21d398d9c9349e10e59b62cbbe28e9538482d 100644
+index be0e1ad34c526f2bd7b80f035c79b07e3b3ef5fb..55c0ad31ae8f1831c43404abb7e2e62da63885ce 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -97,6 +97,41 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0137-Slime-Pathfinder-Events.patch b/patches/unapplied/api/0137-Slime-Pathfinder-Events.patch
index 5c828a3cab..5c828a3cab 100644
--- a/patches/api/0137-Slime-Pathfinder-Events.patch
+++ b/patches/unapplied/api/0137-Slime-Pathfinder-Events.patch
diff --git a/patches/api/0138-Add-PhantomPreSpawnEvent.patch b/patches/unapplied/api/0138-Add-PhantomPreSpawnEvent.patch
index ebe7d01d9e..ebe7d01d9e 100644
--- a/patches/api/0138-Add-PhantomPreSpawnEvent.patch
+++ b/patches/unapplied/api/0138-Add-PhantomPreSpawnEvent.patch
diff --git a/patches/api/0139-Add-More-Creeper-API.patch b/patches/unapplied/api/0139-Add-More-Creeper-API.patch
index 9054588ca5..9054588ca5 100644
--- a/patches/api/0139-Add-More-Creeper-API.patch
+++ b/patches/unapplied/api/0139-Add-More-Creeper-API.patch
diff --git a/patches/api/0140-Inventory-removeItemAnySlot.patch b/patches/unapplied/api/0140-Inventory-removeItemAnySlot.patch
index 25b79cf6bd..25b79cf6bd 100644
--- a/patches/api/0140-Inventory-removeItemAnySlot.patch
+++ b/patches/unapplied/api/0140-Inventory-removeItemAnySlot.patch
diff --git a/patches/api/0141-isChunkGenerated-API.patch b/patches/unapplied/api/0141-isChunkGenerated-API.patch
index bea676d6ba..c8e246532b 100644
--- a/patches/api/0141-isChunkGenerated-API.patch
+++ b/patches/unapplied/api/0141-isChunkGenerated-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] isChunkGenerated API
 
 
 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index 09d1f9f909c971d6a785e9f98278f8c55cd44637..7fea9af96c97d9f60af6fe30fed1ec05d05a1a25 100644
+index 34eeed3ec165bee9d9172ea636b1cc2d7d05f938..0b202d378d50946f43434e70d9d511cac06749b0 100644
 --- a/src/main/java/org/bukkit/Location.java
 +++ b/src/main/java/org/bukkit/Location.java
 @@ -3,6 +3,7 @@ package org.bukkit;
@@ -37,7 +37,7 @@ index 09d1f9f909c971d6a785e9f98278f8c55cd44637..7fea9af96c97d9f60af6fe30fed1ec05
  
      /**
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index fef21d398d9c9349e10e59b62cbbe28e9538482d..213ec372ab639179da65e67a1326c1e08bfbc943 100644
+index 55c0ad31ae8f1831c43404abb7e2e62da63885ce..07f723d5fb72e2eb776af130dc1d5caea16c5295 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -246,6 +246,19 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0142-Add-source-block-constructor-and-getChangedBlockData.patch b/patches/unapplied/api/0142-Add-source-block-constructor-and-getChangedBlockData.patch
index 9f9e760855..9f9e760855 100644
--- a/patches/api/0142-Add-source-block-constructor-and-getChangedBlockData.patch
+++ b/patches/unapplied/api/0142-Add-source-block-constructor-and-getChangedBlockData.patch
diff --git a/patches/api/0143-Async-Chunks-API.patch b/patches/unapplied/api/0143-Async-Chunks-API.patch
index 251c1669af..6759141f54 100644
--- a/patches/api/0143-Async-Chunks-API.patch
+++ b/patches/unapplied/api/0143-Async-Chunks-API.patch
@@ -8,7 +8,7 @@ Adds API's to load or generate chunks asynchronously.
 Also adds utility methods to Entity to teleport asynchronously.
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 213ec372ab639179da65e67a1326c1e08bfbc943..e4a0d57535fa0fb51765ccdbf0e41d0478a28ee5 100644
+index 07f723d5fb72e2eb776af130dc1d5caea16c5295..99a31572fa393a2482548ec55a96cb8568d07199 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -939,6 +939,472 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0144-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/unapplied/api/0144-Add-ray-tracing-methods-to-LivingEntity.patch
index 53018a8cb6..53018a8cb6 100644
--- a/patches/api/0144-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/patches/unapplied/api/0144-Add-ray-tracing-methods-to-LivingEntity.patch
diff --git a/patches/api/0145-Expose-attack-cooldown-methods-for-Player.patch b/patches/unapplied/api/0145-Expose-attack-cooldown-methods-for-Player.patch
index 64c188ee1c..64c188ee1c 100644
--- a/patches/api/0145-Expose-attack-cooldown-methods-for-Player.patch
+++ b/patches/unapplied/api/0145-Expose-attack-cooldown-methods-for-Player.patch
diff --git a/patches/api/0146-Improve-death-events.patch b/patches/unapplied/api/0146-Improve-death-events.patch
index 8ee8acb362..8ee8acb362 100644
--- a/patches/api/0146-Improve-death-events.patch
+++ b/patches/unapplied/api/0146-Improve-death-events.patch
diff --git a/patches/api/0147-Add-Git-information-to-version-command-on-startup.patch b/patches/unapplied/api/0147-Add-Git-information-to-version-command-on-startup.patch
index 6395f98250..9d6dcb06b4 100644
--- a/patches/api/0147-Add-Git-information-to-version-command-on-startup.patch
+++ b/patches/unapplied/api/0147-Add-Git-information-to-version-command-on-startup.patch
@@ -48,7 +48,7 @@ index 0000000000000000000000000000000000000000..909617079db61b675cc7b60b44ef96b3
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 251fa656bf17ecdd031c0e16def5eff3f553e9b4..e108f8a7376e5f90a1e74c0d5ba40ac6c2818523 100644
+index 9f52c092d906622e2eade3bc9d8baac6816f9f3a..869d57b429fbe2694d1444db56c56619abfae920 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -57,6 +57,7 @@ import org.bukkit.util.CachedServerIcon;
diff --git a/patches/api/0148-Mob-Pathfinding-API.patch b/patches/unapplied/api/0148-Mob-Pathfinding-API.patch
index ebd31df062..ebd31df062 100644
--- a/patches/api/0148-Mob-Pathfinding-API.patch
+++ b/patches/unapplied/api/0148-Mob-Pathfinding-API.patch
diff --git a/patches/api/0149-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/patches/unapplied/api/0149-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
index 4ba25025b1..4ba25025b1 100644
--- a/patches/api/0149-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
+++ b/patches/unapplied/api/0149-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
diff --git a/patches/api/0150-Performance-Concurrency-Improvements-to-Permissions.patch b/patches/unapplied/api/0150-Performance-Concurrency-Improvements-to-Permissions.patch
index 6befcec378..6befcec378 100644
--- a/patches/api/0150-Performance-Concurrency-Improvements-to-Permissions.patch
+++ b/patches/unapplied/api/0150-Performance-Concurrency-Improvements-to-Permissions.patch
diff --git a/patches/api/0151-Add-ItemStackRecipeChoice-Draft-API.patch b/patches/unapplied/api/0151-Add-ItemStackRecipeChoice-Draft-API.patch
index 4cfddc6f59..4cfddc6f59 100644
--- a/patches/api/0151-Add-ItemStackRecipeChoice-Draft-API.patch
+++ b/patches/unapplied/api/0151-Add-ItemStackRecipeChoice-Draft-API.patch
diff --git a/patches/api/0152-Implement-furnace-cook-speed-multiplier-API.patch b/patches/unapplied/api/0152-Implement-furnace-cook-speed-multiplier-API.patch
index 6e836a844d..6e836a844d 100644
--- a/patches/api/0152-Implement-furnace-cook-speed-multiplier-API.patch
+++ b/patches/unapplied/api/0152-Implement-furnace-cook-speed-multiplier-API.patch
diff --git a/patches/api/0153-Material-API-additions.patch b/patches/unapplied/api/0153-Material-API-additions.patch
index 6705f33335..325006b10b 100644
--- a/patches/api/0153-Material-API-additions.patch
+++ b/patches/unapplied/api/0153-Material-API-additions.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Material API additions
 
 
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 7ed67f356cf0ef8b3252256dcd4185f18573c989..d56d899ca7737b537ea55c13a384888a873f5da3 100644
+index f06e06d825ba441ab5887652d5c04202a82707fc..48a42faffc5e117b6d18bc21265caa150117e3ef 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
 @@ -118,6 +118,7 @@ import org.jetbrains.annotations.Nullable;
diff --git a/patches/api/0154-Add-Material-Tags.patch b/patches/unapplied/api/0154-Add-Material-Tags.patch
index 7ffc6ee166..7ffc6ee166 100644
--- a/patches/api/0154-Add-Material-Tags.patch
+++ b/patches/unapplied/api/0154-Add-Material-Tags.patch
diff --git a/patches/api/0155-PreSpawnerSpawnEvent.patch b/patches/unapplied/api/0155-PreSpawnerSpawnEvent.patch
index dcb362d8bc..dcb362d8bc 100644
--- a/patches/api/0155-PreSpawnerSpawnEvent.patch
+++ b/patches/unapplied/api/0155-PreSpawnerSpawnEvent.patch
diff --git a/patches/api/0156-Add-LivingEntity-getTargetEntity.patch b/patches/unapplied/api/0156-Add-LivingEntity-getTargetEntity.patch
index d23917ea2f..d23917ea2f 100644
--- a/patches/api/0156-Add-LivingEntity-getTargetEntity.patch
+++ b/patches/unapplied/api/0156-Add-LivingEntity-getTargetEntity.patch
diff --git a/patches/api/0157-Add-sun-related-API.patch b/patches/unapplied/api/0157-Add-sun-related-API.patch
index 540087547e..540087547e 100644
--- a/patches/api/0157-Add-sun-related-API.patch
+++ b/patches/unapplied/api/0157-Add-sun-related-API.patch
diff --git a/patches/api/0158-Turtle-API.patch b/patches/unapplied/api/0158-Turtle-API.patch
index a8eec937cc..a8eec937cc 100644
--- a/patches/api/0158-Turtle-API.patch
+++ b/patches/unapplied/api/0158-Turtle-API.patch
diff --git a/patches/api/0159-Add-spectator-target-events.patch b/patches/unapplied/api/0159-Add-spectator-target-events.patch
index c5d4b7c4db..c5d4b7c4db 100644
--- a/patches/api/0159-Add-spectator-target-events.patch
+++ b/patches/unapplied/api/0159-Add-spectator-target-events.patch
diff --git a/patches/api/0160-Add-more-Witch-API.patch b/patches/unapplied/api/0160-Add-more-Witch-API.patch
index 0da75bb9b7..0da75bb9b7 100644
--- a/patches/api/0160-Add-more-Witch-API.patch
+++ b/patches/unapplied/api/0160-Add-more-Witch-API.patch
diff --git a/patches/api/0161-Make-the-default-permission-message-configurable.patch b/patches/unapplied/api/0161-Make-the-default-permission-message-configurable.patch
index 2f6f5f4ef1..621961541e 100644
--- a/patches/api/0161-Make-the-default-permission-message-configurable.patch
+++ b/patches/unapplied/api/0161-Make-the-default-permission-message-configurable.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Make the default permission message configurable
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index e108f8a7376e5f90a1e74c0d5ba40ac6c2818523..40b4d6ee5ef1f6b88e0b85131be399526488cd9e 100644
+index 869d57b429fbe2694d1444db56c56619abfae920..5bb11c5ebd02cf4e4c6c9b859cd7987abd2093d6 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -2344,6 +2344,28 @@ public final class Bukkit {
@@ -38,7 +38,7 @@ index e108f8a7376e5f90a1e74c0d5ba40ac6c2818523..40b4d6ee5ef1f6b88e0b85131be39952
       * Creates a PlayerProfile for the specified uuid, with name as null.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index f46e5fc53f202741b97d9264d4b24e4654d19bfb..7223bf91b369822afd355c600d834c30270197f4 100644
+index aace34252f65dd54868b521288f68c641b7ed71e..e1f36d4f35cb53e28f4b64ddd730634b0fa9eb14 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -2043,6 +2043,23 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0162-Support-cancellation-supression-of-EntityDismount-Ve.patch b/patches/unapplied/api/0162-Support-cancellation-supression-of-EntityDismount-Ve.patch
index 6eec419672..6eec419672 100644
--- a/patches/api/0162-Support-cancellation-supression-of-EntityDismount-Ve.patch
+++ b/patches/unapplied/api/0162-Support-cancellation-supression-of-EntityDismount-Ve.patch
diff --git a/patches/api/0163-Add-more-Zombie-API.patch b/patches/unapplied/api/0163-Add-more-Zombie-API.patch
index 38efc859d8..38efc859d8 100644
--- a/patches/api/0163-Add-more-Zombie-API.patch
+++ b/patches/unapplied/api/0163-Add-more-Zombie-API.patch
diff --git a/patches/api/0164-Change-the-reserved-channel-check-to-be-sensible.patch b/patches/unapplied/api/0164-Change-the-reserved-channel-check-to-be-sensible.patch
index 8975ff3c43..8975ff3c43 100644
--- a/patches/api/0164-Change-the-reserved-channel-check-to-be-sensible.patch
+++ b/patches/unapplied/api/0164-Change-the-reserved-channel-check-to-be-sensible.patch
diff --git a/patches/api/0165-Add-PlayerConnectionCloseEvent.patch b/patches/unapplied/api/0165-Add-PlayerConnectionCloseEvent.patch
index f1a017f4fb..f1a017f4fb 100644
--- a/patches/api/0165-Add-PlayerConnectionCloseEvent.patch
+++ b/patches/unapplied/api/0165-Add-PlayerConnectionCloseEvent.patch
diff --git a/patches/api/0166-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/unapplied/api/0166-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index 552d9f92c6..552d9f92c6 100644
--- a/patches/api/0166-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/patches/unapplied/api/0166-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
diff --git a/patches/api/0167-Add-ItemStack-Recipe-API-helper-methods.patch b/patches/unapplied/api/0167-Add-ItemStack-Recipe-API-helper-methods.patch
index d01ff8e6d9..d01ff8e6d9 100644
--- a/patches/api/0167-Add-ItemStack-Recipe-API-helper-methods.patch
+++ b/patches/unapplied/api/0167-Add-ItemStack-Recipe-API-helper-methods.patch
diff --git a/patches/api/0168-BlockDestroyEvent.patch b/patches/unapplied/api/0168-BlockDestroyEvent.patch
index c414a42532..c414a42532 100644
--- a/patches/api/0168-BlockDestroyEvent.patch
+++ b/patches/unapplied/api/0168-BlockDestroyEvent.patch
diff --git a/patches/api/0169-Add-WhitelistToggleEvent.patch b/patches/unapplied/api/0169-Add-WhitelistToggleEvent.patch
index 4bb54b5c92..4bb54b5c92 100644
--- a/patches/api/0169-Add-WhitelistToggleEvent.patch
+++ b/patches/unapplied/api/0169-Add-WhitelistToggleEvent.patch
diff --git a/patches/api/0170-Add-GS4-Query-event.patch b/patches/unapplied/api/0170-Add-GS4-Query-event.patch
index ffab49a92a..ffab49a92a 100644
--- a/patches/api/0170-Add-GS4-Query-event.patch
+++ b/patches/unapplied/api/0170-Add-GS4-Query-event.patch
diff --git a/patches/api/0171-Add-PlayerPostRespawnEvent.patch b/patches/unapplied/api/0171-Add-PlayerPostRespawnEvent.patch
index 01106b663b..01106b663b 100644
--- a/patches/api/0171-Add-PlayerPostRespawnEvent.patch
+++ b/patches/unapplied/api/0171-Add-PlayerPostRespawnEvent.patch
diff --git a/patches/api/0172-Entity-getEntitySpawnReason.patch b/patches/unapplied/api/0172-Entity-getEntitySpawnReason.patch
index 2b37c961ed..2b37c961ed 100644
--- a/patches/api/0172-Entity-getEntitySpawnReason.patch
+++ b/patches/unapplied/api/0172-Entity-getEntitySpawnReason.patch
diff --git a/patches/api/0173-Fix-Spigot-annotation-mistakes.patch b/patches/unapplied/api/0173-Fix-Spigot-annotation-mistakes.patch
index c62cda9a48..c62cda9a48 100644
--- a/patches/api/0173-Fix-Spigot-annotation-mistakes.patch
+++ b/patches/unapplied/api/0173-Fix-Spigot-annotation-mistakes.patch
diff --git a/patches/api/0174-Server-Tick-Events.patch b/patches/unapplied/api/0174-Server-Tick-Events.patch
index 22b552c65a..22b552c65a 100644
--- a/patches/api/0174-Server-Tick-Events.patch
+++ b/patches/unapplied/api/0174-Server-Tick-Events.patch
diff --git a/patches/api/0175-PlayerDeathEvent-getItemsToKeep.patch b/patches/unapplied/api/0175-PlayerDeathEvent-getItemsToKeep.patch
index 999842766c..999842766c 100644
--- a/patches/api/0175-PlayerDeathEvent-getItemsToKeep.patch
+++ b/patches/unapplied/api/0175-PlayerDeathEvent-getItemsToKeep.patch
diff --git a/patches/api/0176-Add-Heightmap-API.patch b/patches/unapplied/api/0176-Add-Heightmap-API.patch
index 159fd3a0b0..bede724445 100644
--- a/patches/api/0176-Add-Heightmap-API.patch
+++ b/patches/unapplied/api/0176-Add-Heightmap-API.patch
@@ -51,7 +51,7 @@ index 0000000000000000000000000000000000000000..1c832d69bb3717dcfccf21e45f6f060a
 +    SOLID_OR_LIQUID_NO_LEAVES;
 +}
 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index dc7e69380e421f64d65b6dcb80909fc770d157fa..5edee59f24ef5f8adf2aa1f2f3c0289cf4bc0ec3 100644
+index cf42f6e57e96aa9cb4465e34a6e3f8709de4ca09..9bbd928f7d513ca317cd27beffa61e5111f5ffb0 100644
 --- a/src/main/java/org/bukkit/Location.java
 +++ b/src/main/java/org/bukkit/Location.java
 @@ -649,6 +649,46 @@ public class Location implements Cloneable, ConfigurationSerializable, io.paperm
@@ -102,7 +102,7 @@ index dc7e69380e421f64d65b6dcb80909fc770d157fa..5edee59f24ef5f8adf2aa1f2f3c0289c
      /**
       * Creates explosion at this location with given power
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index fe5cc7b038516dd61d2d1af97073a60b76874db5..518158d70a8e7ba9a6aa54c22913d8a881adff1f 100644
+index 8a200ffe1851b24110c92bb3a9f7ffc39b8c63f2..dd498e3ba46bd001028f7f9f94e18de42e875ff6 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -151,6 +151,87 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0177-Mob-Spawner-API-Enhancements.patch b/patches/unapplied/api/0177-Mob-Spawner-API-Enhancements.patch
index 4928839428..4928839428 100644
--- a/patches/api/0177-Mob-Spawner-API-Enhancements.patch
+++ b/patches/unapplied/api/0177-Mob-Spawner-API-Enhancements.patch
diff --git a/patches/api/0178-Add-BlockSoundGroup-interface.patch b/patches/unapplied/api/0178-Add-BlockSoundGroup-interface.patch
index dd3fc87e20..dd3fc87e20 100644
--- a/patches/api/0178-Add-BlockSoundGroup-interface.patch
+++ b/patches/unapplied/api/0178-Add-BlockSoundGroup-interface.patch
diff --git a/patches/api/0179-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch b/patches/unapplied/api/0179-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch
index b5148c5574..b5148c5574 100644
--- a/patches/api/0179-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch
+++ b/patches/unapplied/api/0179-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch
diff --git a/patches/api/0180-Increase-custom-payload-channel-message-size.patch b/patches/unapplied/api/0180-Increase-custom-payload-channel-message-size.patch
index 24aacd2b29..24aacd2b29 100644
--- a/patches/api/0180-Increase-custom-payload-channel-message-size.patch
+++ b/patches/unapplied/api/0180-Increase-custom-payload-channel-message-size.patch
diff --git a/patches/api/0181-Expose-the-internal-current-tick.patch b/patches/unapplied/api/0181-Expose-the-internal-current-tick.patch
index e3ba57431c..254a32eb8f 100644
--- a/patches/api/0181-Expose-the-internal-current-tick.patch
+++ b/patches/unapplied/api/0181-Expose-the-internal-current-tick.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose the internal current tick
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 20e8bee8a686f8d37d770d8714c5c55af8491584..9d241ad740e0405bfe2e86e349ec565b20dba14f 100644
+index 87d2348f39e2e43c782c1b7bf73ec38c52e67f95..f11c8e344694610b4a3f5ce945afb5ba876de33d 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -2439,6 +2439,10 @@ public final class Bukkit {
@@ -20,7 +20,7 @@ index 20e8bee8a686f8d37d770d8714c5c55af8491584..9d241ad740e0405bfe2e86e349ec565b
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index ef71d6036d1df19c730b4d525862f11f3ee5ccb4..102d5058e6d2b83aca6504e98012cb4318fdd3e6 100644
+index 3cf66dde58cbe92cf9273c482af378058708b15b..54400edeb6a2245bed7824db2a5c9b7a1ba76eda 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -2125,5 +2125,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0182-Improve-Block-breakNaturally-API.patch b/patches/unapplied/api/0182-Improve-Block-breakNaturally-API.patch
index d4871c1eb0..d4871c1eb0 100644
--- a/patches/api/0182-Improve-Block-breakNaturally-API.patch
+++ b/patches/unapplied/api/0182-Improve-Block-breakNaturally-API.patch
diff --git a/patches/api/0183-PlayerDeathEvent-shouldDropExperience.patch b/patches/unapplied/api/0183-PlayerDeathEvent-shouldDropExperience.patch
index 47dc1d2141..47dc1d2141 100644
--- a/patches/api/0183-PlayerDeathEvent-shouldDropExperience.patch
+++ b/patches/unapplied/api/0183-PlayerDeathEvent-shouldDropExperience.patch
diff --git a/patches/api/0184-Add-ThrownEggHatchEvent.patch b/patches/unapplied/api/0184-Add-ThrownEggHatchEvent.patch
index f605a2a11b..f605a2a11b 100644
--- a/patches/api/0184-Add-ThrownEggHatchEvent.patch
+++ b/patches/unapplied/api/0184-Add-ThrownEggHatchEvent.patch
diff --git a/patches/api/0185-Entity-Jump-API.patch b/patches/unapplied/api/0185-Entity-Jump-API.patch
index 8b32879e2d..8b32879e2d 100644
--- a/patches/api/0185-Entity-Jump-API.patch
+++ b/patches/unapplied/api/0185-Entity-Jump-API.patch
diff --git a/patches/api/0186-add-hand-to-BlockMultiPlaceEvent.patch b/patches/unapplied/api/0186-add-hand-to-BlockMultiPlaceEvent.patch
index f15b482d62..f15b482d62 100644
--- a/patches/api/0186-add-hand-to-BlockMultiPlaceEvent.patch
+++ b/patches/unapplied/api/0186-add-hand-to-BlockMultiPlaceEvent.patch
diff --git a/patches/api/0187-Add-tick-times-API.patch b/patches/unapplied/api/0187-Add-tick-times-API.patch
index fcb596bb9f..a0b2f514c5 100644
--- a/patches/api/0187-Add-tick-times-API.patch
+++ b/patches/unapplied/api/0187-Add-tick-times-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add tick times API
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 9d241ad740e0405bfe2e86e349ec565b20dba14f..06540f4122165c42e1726c9177aba19be1677edf 100644
+index f11c8e344694610b4a3f5ce945afb5ba876de33d..1a66d6314765840f529900a850265ed20173fd9b 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -2111,6 +2111,25 @@ public final class Bukkit {
@@ -35,7 +35,7 @@ index 9d241ad740e0405bfe2e86e349ec565b20dba14f..06540f4122165c42e1726c9177aba19b
  
      /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 102d5058e6d2b83aca6504e98012cb4318fdd3e6..b862ce8dfb979f629436204ca326a30b5ace4574 100644
+index 54400edeb6a2245bed7824db2a5c9b7a1ba76eda..88bb506880fa019881e95a2cc07915841c2028e7 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1787,6 +1787,21 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0188-Expose-MinecraftServer-isRunning.patch b/patches/unapplied/api/0188-Expose-MinecraftServer-isRunning.patch
index 1f925eb607..48d9214f84 100644
--- a/patches/api/0188-Expose-MinecraftServer-isRunning.patch
+++ b/patches/unapplied/api/0188-Expose-MinecraftServer-isRunning.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose MinecraftServer#isRunning
 This allows for plugins to detect if the server is actually turning off in onDisable rather than just plugins reloading.
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 06540f4122165c42e1726c9177aba19be1677edf..cadc844025ac3f58f57932f551a21b90b5698504 100644
+index 1a66d6314765840f529900a850265ed20173fd9b..4e8383432a3a8a07dbc31f77986b0f4790779f7d 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -2462,6 +2462,15 @@ public final class Bukkit {
@@ -26,7 +26,7 @@ index 06540f4122165c42e1726c9177aba19be1677edf..cadc844025ac3f58f57932f551a21b90
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index b862ce8dfb979f629436204ca326a30b5ace4574..655dbcc38e35d3b3fa11cbf863a6ba63cc56b47d 100644
+index 88bb506880fa019881e95a2cc07915841c2028e7..37caeff1416cf0e3c63260ba7ad82a92e95a5399 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -2147,5 +2147,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0189-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/unapplied/api/0189-Add-Raw-Byte-ItemStack-Serialization.patch
index 93f111f781..93f111f781 100644
--- a/patches/api/0189-Add-Raw-Byte-ItemStack-Serialization.patch
+++ b/patches/unapplied/api/0189-Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/patches/api/0190-Add-Player-Client-Options-API.patch b/patches/unapplied/api/0190-Add-Player-Client-Options-API.patch
index b656d3e70c..b656d3e70c 100644
--- a/patches/api/0190-Add-Player-Client-Options-API.patch
+++ b/patches/unapplied/api/0190-Add-Player-Client-Options-API.patch
diff --git a/patches/api/0191-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/unapplied/api/0191-Add-PlayerAttackEntityCooldownResetEvent.patch
index 15fa2db392..15fa2db392 100644
--- a/patches/api/0191-Add-PlayerAttackEntityCooldownResetEvent.patch
+++ b/patches/unapplied/api/0191-Add-PlayerAttackEntityCooldownResetEvent.patch
diff --git a/patches/api/0192-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch b/patches/unapplied/api/0192-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch
index 2fa02a7788..2fa02a7788 100644
--- a/patches/api/0192-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch
+++ b/patches/unapplied/api/0192-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch
diff --git a/patches/api/0193-Add-item-slot-convenience-methods.patch b/patches/unapplied/api/0193-Add-item-slot-convenience-methods.patch
index 3f2480123e..3f2480123e 100644
--- a/patches/api/0193-Add-item-slot-convenience-methods.patch
+++ b/patches/unapplied/api/0193-Add-item-slot-convenience-methods.patch
diff --git a/patches/api/0194-Villager-Restocks-API.patch b/patches/unapplied/api/0194-Villager-Restocks-API.patch
index 5b3898429d..5b3898429d 100644
--- a/patches/api/0194-Villager-Restocks-API.patch
+++ b/patches/unapplied/api/0194-Villager-Restocks-API.patch
diff --git a/patches/api/0195-Expose-game-version.patch b/patches/unapplied/api/0195-Expose-game-version.patch
index 4bebadd38b..9d1750b3aa 100644
--- a/patches/api/0195-Expose-game-version.patch
+++ b/patches/unapplied/api/0195-Expose-game-version.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose game version
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index cadc844025ac3f58f57932f551a21b90b5698504..eae067f9df19a25e3103657c4354864ba6452923 100644
+index 4e8383432a3a8a07dbc31f77986b0f4790779f7d..29cf7359334144d6e718fed560771be35f580b16 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -158,6 +158,18 @@ public final class Bukkit {
@@ -28,7 +28,7 @@ index cadc844025ac3f58f57932f551a21b90b5698504..eae067f9df19a25e3103657c4354864b
       * Gets a view of all currently logged in players. This {@linkplain
       * Collections#unmodifiableCollection(Collection) view} is a reused
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 655dbcc38e35d3b3fa11cbf863a6ba63cc56b47d..f14733e114c104d70d2a1c1b8e708fde06b0cdb0 100644
+index 37caeff1416cf0e3c63260ba7ad82a92e95a5399..d97200a8816dbbbce07734b5547a942f8f3f0fdc 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -116,6 +116,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0196-Add-Mob-Goal-API.patch b/patches/unapplied/api/0196-Add-Mob-Goal-API.patch
index 58bccc5a6f..4075fcbaec 100644
--- a/patches/api/0196-Add-Mob-Goal-API.patch
+++ b/patches/unapplied/api/0196-Add-Mob-Goal-API.patch
@@ -535,7 +535,7 @@ index 0000000000000000000000000000000000000000..39fca3674f32c7bbb2797bf6c3e22270
 +    @Deprecated(forRemoval = true) @ApiStatus.ScheduledForRemoval(inVersion = "1.21") GoalKey<Mob> UNIVERSAL_ANGER_RESET = GoalKey.of(Mob.class, NamespacedKey.minecraft("universal_anger_reset"));
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index eae067f9df19a25e3103657c4354864ba6452923..a4f58baf0006a8c1ea93d42810d325b4538e8cf6 100644
+index 29cf7359334144d6e718fed560771be35f580b16..5c508045a53d9f6efe6358648daa47c0096ad55e 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -2483,6 +2483,16 @@ public final class Bukkit {
@@ -556,7 +556,7 @@ index eae067f9df19a25e3103657c4354864ba6452923..a4f58baf0006a8c1ea93d42810d325b4
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index f14733e114c104d70d2a1c1b8e708fde06b0cdb0..6025ba1676fe9c11f157cea2ca03d0fd2e96dc52 100644
+index d97200a8816dbbbce07734b5547a942f8f3f0fdc..aec7814485efb0b827ccfde92372a436d47ed2f5 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -2164,5 +2164,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0197-Add-villager-reputation-API.patch b/patches/unapplied/api/0197-Add-villager-reputation-API.patch
index 4a2093aab9..4a2093aab9 100644
--- a/patches/api/0197-Add-villager-reputation-API.patch
+++ b/patches/unapplied/api/0197-Add-villager-reputation-API.patch
diff --git a/patches/api/0198-Spawn-Reason-API.patch b/patches/unapplied/api/0198-Spawn-Reason-API.patch
index 4c67aec1bf..4c67aec1bf 100644
--- a/patches/api/0198-Spawn-Reason-API.patch
+++ b/patches/unapplied/api/0198-Spawn-Reason-API.patch
diff --git a/patches/api/0199-Potential-bed-API.patch b/patches/unapplied/api/0199-Potential-bed-API.patch
index cdbbcebbbc..cdbbcebbbc 100644
--- a/patches/api/0199-Potential-bed-API.patch
+++ b/patches/unapplied/api/0199-Potential-bed-API.patch
diff --git a/patches/api/0200-Inventory-getHolder-method-without-block-snapshot.patch b/patches/unapplied/api/0200-Inventory-getHolder-method-without-block-snapshot.patch
index d834d6cdb3..d834d6cdb3 100644
--- a/patches/api/0200-Inventory-getHolder-method-without-block-snapshot.patch
+++ b/patches/unapplied/api/0200-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/api/0201-Improve-Arrow-API.patch b/patches/unapplied/api/0201-Improve-Arrow-API.patch
index 1c70418e98..1c70418e98 100644
--- a/patches/api/0201-Improve-Arrow-API.patch
+++ b/patches/unapplied/api/0201-Improve-Arrow-API.patch
diff --git a/patches/api/0202-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/unapplied/api/0202-Add-and-implement-PlayerRecipeBookClickEvent.patch
index 9bd7c5c12b..9bd7c5c12b 100644
--- a/patches/api/0202-Add-and-implement-PlayerRecipeBookClickEvent.patch
+++ b/patches/unapplied/api/0202-Add-and-implement-PlayerRecipeBookClickEvent.patch
diff --git a/patches/api/0203-Support-components-in-ItemMeta.patch b/patches/unapplied/api/0203-Support-components-in-ItemMeta.patch
index 00f7942262..00f7942262 100644
--- a/patches/api/0203-Support-components-in-ItemMeta.patch
+++ b/patches/unapplied/api/0203-Support-components-in-ItemMeta.patch
diff --git a/patches/api/0204-added-2-new-TargetReasons-for-1.16-mob-behavior.patch b/patches/unapplied/api/0204-added-2-new-TargetReasons-for-1.16-mob-behavior.patch
index 6c725bc833..6c725bc833 100644
--- a/patches/api/0204-added-2-new-TargetReasons-for-1.16-mob-behavior.patch
+++ b/patches/unapplied/api/0204-added-2-new-TargetReasons-for-1.16-mob-behavior.patch
diff --git a/patches/api/0205-Add-entity-liquid-API.patch b/patches/unapplied/api/0205-Add-entity-liquid-API.patch
index 11fa994481..11fa994481 100644
--- a/patches/api/0205-Add-entity-liquid-API.patch
+++ b/patches/unapplied/api/0205-Add-entity-liquid-API.patch
diff --git a/patches/api/0206-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch b/patches/unapplied/api/0206-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch
index 11b76de878..11b76de878 100644
--- a/patches/api/0206-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch
+++ b/patches/unapplied/api/0206-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch
diff --git a/patches/api/0207-Add-BellRingEvent.patch b/patches/unapplied/api/0207-Add-BellRingEvent.patch
index 33c564bdae..33c564bdae 100644
--- a/patches/api/0207-Add-BellRingEvent.patch
+++ b/patches/unapplied/api/0207-Add-BellRingEvent.patch
diff --git a/patches/api/0208-Brand-support.patch b/patches/unapplied/api/0208-Brand-support.patch
index 96ccbb2ba9..96ccbb2ba9 100644
--- a/patches/api/0208-Brand-support.patch
+++ b/patches/unapplied/api/0208-Brand-support.patch
diff --git a/patches/api/0209-Add-moon-phase-API.patch b/patches/unapplied/api/0209-Add-moon-phase-API.patch
index fcac0b75cb..fcac0b75cb 100644
--- a/patches/api/0209-Add-moon-phase-API.patch
+++ b/patches/unapplied/api/0209-Add-moon-phase-API.patch
diff --git a/patches/api/0210-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/unapplied/api/0210-Add-playPickupItemAnimation-to-LivingEntity.patch
index 08b1135ece..08b1135ece 100644
--- a/patches/api/0210-Add-playPickupItemAnimation-to-LivingEntity.patch
+++ b/patches/unapplied/api/0210-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/api/0211-Add-more-Evoker-API.patch b/patches/unapplied/api/0211-Add-more-Evoker-API.patch
index 0d6f0f7328..0d6f0f7328 100644
--- a/patches/api/0211-Add-more-Evoker-API.patch
+++ b/patches/unapplied/api/0211-Add-more-Evoker-API.patch
diff --git a/patches/api/0212-Add-methods-to-get-translation-keys.patch b/patches/unapplied/api/0212-Add-methods-to-get-translation-keys.patch
index e965c3e285..8d9c9940c2 100644
--- a/patches/api/0212-Add-methods-to-get-translation-keys.patch
+++ b/patches/unapplied/api/0212-Add-methods-to-get-translation-keys.patch
@@ -144,7 +144,7 @@ index 3ac563da8c7d2ef70d46fc451a6752f6b1fc1d1e..695a299a3544547bbc24095980221205
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 55fc700d60051bb17469e0768db3c266ba18f17c..5614cf7d28bdc576bbd66fd973030f8560974dae 100644
+index 2d7cd77002c32e88bfa677f86d645ee6b541062c..0e898adaf484aee13430d61be02ac1e72b82da93 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
 @@ -119,7 +119,7 @@ import org.jetbrains.annotations.Nullable;
diff --git a/patches/api/0213-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/unapplied/api/0213-Create-HoverEvent-from-ItemStack-Entity.patch
index 6c5c79f039..6c5c79f039 100644
--- a/patches/api/0213-Create-HoverEvent-from-ItemStack-Entity.patch
+++ b/patches/unapplied/api/0213-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/api/0214-Add-additional-open-container-api-to-HumanEntity.patch b/patches/unapplied/api/0214-Add-additional-open-container-api-to-HumanEntity.patch
index 9512168843..9512168843 100644
--- a/patches/api/0214-Add-additional-open-container-api-to-HumanEntity.patch
+++ b/patches/unapplied/api/0214-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/api/0215-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/unapplied/api/0215-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index 0118683bc2..0118683bc2 100644
--- a/patches/api/0215-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/unapplied/api/0215-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/patches/api/0216-Entity-isTicking.patch b/patches/unapplied/api/0216-Entity-isTicking.patch
index 345c297eaa..345c297eaa 100644
--- a/patches/api/0216-Entity-isTicking.patch
+++ b/patches/unapplied/api/0216-Entity-isTicking.patch
diff --git a/patches/api/0217-Villager-resetOffers.patch b/patches/unapplied/api/0217-Villager-resetOffers.patch
index 60fedfba0f..60fedfba0f 100644
--- a/patches/api/0217-Villager-resetOffers.patch
+++ b/patches/unapplied/api/0217-Villager-resetOffers.patch
diff --git a/patches/api/0218-Player-elytra-boost-API.patch b/patches/unapplied/api/0218-Player-elytra-boost-API.patch
index 17fff34136..17fff34136 100644
--- a/patches/api/0218-Player-elytra-boost-API.patch
+++ b/patches/unapplied/api/0218-Player-elytra-boost-API.patch
diff --git a/patches/api/0219-Add-getOfflinePlayerIfCached-String.patch b/patches/unapplied/api/0219-Add-getOfflinePlayerIfCached-String.patch
index 275ba3d9ee..bd98e0d3f2 100644
--- a/patches/api/0219-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/unapplied/api/0219-Add-getOfflinePlayerIfCached-String.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add getOfflinePlayerIfCached(String)
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index a4f58baf0006a8c1ea93d42810d325b4538e8cf6..102f1ac7c2fde48be4c7e582019b8601dcf361e4 100644
+index 5c508045a53d9f6efe6358648daa47c0096ad55e..c9f4ec3ff1aaca2f75fe0a7f0c85d63f3dfd97f8 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -1325,6 +1325,27 @@ public final class Bukkit {
@@ -37,7 +37,7 @@ index a4f58baf0006a8c1ea93d42810d325b4538e8cf6..102f1ac7c2fde48be4c7e582019b8601
       * Gets the player by the given UUID, regardless if they are offline or
       * online.
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 6025ba1676fe9c11f157cea2ca03d0fd2e96dc52..2864bf08aacedbbfdaa507838d42441b88953786 100644
+index aec7814485efb0b827ccfde92372a436d47ed2f5..578a516d568dcc9fbdd67529bf986817adb480bc 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1117,6 +1117,25 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0220-Add-ignore-discounts-API.patch b/patches/unapplied/api/0220-Add-ignore-discounts-API.patch
index 89655ddef8..89655ddef8 100644
--- a/patches/api/0220-Add-ignore-discounts-API.patch
+++ b/patches/unapplied/api/0220-Add-ignore-discounts-API.patch
diff --git a/patches/api/0221-Item-no-age-no-player-pickup.patch b/patches/unapplied/api/0221-Item-no-age-no-player-pickup.patch
index 5dd7572120..5dd7572120 100644
--- a/patches/api/0221-Item-no-age-no-player-pickup.patch
+++ b/patches/unapplied/api/0221-Item-no-age-no-player-pickup.patch
diff --git a/patches/api/0222-Beacon-API-custom-effect-ranges.patch b/patches/unapplied/api/0222-Beacon-API-custom-effect-ranges.patch
index effd7b3ae9..effd7b3ae9 100644
--- a/patches/api/0222-Beacon-API-custom-effect-ranges.patch
+++ b/patches/unapplied/api/0222-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/api/0223-Add-API-for-quit-reason.patch b/patches/unapplied/api/0223-Add-API-for-quit-reason.patch
index 0350afaf92..0350afaf92 100644
--- a/patches/api/0223-Add-API-for-quit-reason.patch
+++ b/patches/unapplied/api/0223-Add-API-for-quit-reason.patch
diff --git a/patches/api/0224-Add-Destroy-Speed-API.patch b/patches/unapplied/api/0224-Add-Destroy-Speed-API.patch
index 84faaef8ce..84faaef8ce 100644
--- a/patches/api/0224-Add-Destroy-Speed-API.patch
+++ b/patches/unapplied/api/0224-Add-Destroy-Speed-API.patch
diff --git a/patches/api/0225-Add-LivingEntity-clearActiveItem.patch b/patches/unapplied/api/0225-Add-LivingEntity-clearActiveItem.patch
index 7bc93949fb..7bc93949fb 100644
--- a/patches/api/0225-Add-LivingEntity-clearActiveItem.patch
+++ b/patches/unapplied/api/0225-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/api/0226-Add-PlayerItemCooldownEvent.patch b/patches/unapplied/api/0226-Add-PlayerItemCooldownEvent.patch
index 378f88f6e6..378f88f6e6 100644
--- a/patches/api/0226-Add-PlayerItemCooldownEvent.patch
+++ b/patches/unapplied/api/0226-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/api/0227-More-lightning-API.patch b/patches/unapplied/api/0227-More-lightning-API.patch
index 4197f480bf..4197f480bf 100644
--- a/patches/api/0227-More-lightning-API.patch
+++ b/patches/unapplied/api/0227-More-lightning-API.patch
diff --git a/patches/api/0228-Add-PlayerShearBlockEvent.patch b/patches/unapplied/api/0228-Add-PlayerShearBlockEvent.patch
index 051544b4a9..051544b4a9 100644
--- a/patches/api/0228-Add-PlayerShearBlockEvent.patch
+++ b/patches/unapplied/api/0228-Add-PlayerShearBlockEvent.patch
diff --git a/patches/api/0229-Player-Chunk-Load-Unload-Events.patch b/patches/unapplied/api/0229-Player-Chunk-Load-Unload-Events.patch
index e2ce87ec9d..e2ce87ec9d 100644
--- a/patches/api/0229-Player-Chunk-Load-Unload-Events.patch
+++ b/patches/unapplied/api/0229-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/api/0230-Expose-LivingEntity-hurt-direction.patch b/patches/unapplied/api/0230-Expose-LivingEntity-hurt-direction.patch
index 4af40bdf52..4af40bdf52 100644
--- a/patches/api/0230-Expose-LivingEntity-hurt-direction.patch
+++ b/patches/unapplied/api/0230-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/api/0231-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/unapplied/api/0231-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
index 00552e9137..00552e9137 100644
--- a/patches/api/0231-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
+++ b/patches/unapplied/api/0231-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/api/0232-Added-PlayerTradeEvent.patch b/patches/unapplied/api/0232-Added-PlayerTradeEvent.patch
index e09b088160..e09b088160 100644
--- a/patches/api/0232-Added-PlayerTradeEvent.patch
+++ b/patches/unapplied/api/0232-Added-PlayerTradeEvent.patch
diff --git a/patches/api/0233-Add-TargetHitEvent-API.patch b/patches/unapplied/api/0233-Add-TargetHitEvent-API.patch
index 247421fb61..247421fb61 100644
--- a/patches/api/0233-Add-TargetHitEvent-API.patch
+++ b/patches/unapplied/api/0233-Add-TargetHitEvent-API.patch
diff --git a/patches/api/0234-Additional-Block-Material-API-s.patch b/patches/unapplied/api/0234-Additional-Block-Material-API-s.patch
index f20f4d9d39..f20f4d9d39 100644
--- a/patches/api/0234-Additional-Block-Material-API-s.patch
+++ b/patches/unapplied/api/0234-Additional-Block-Material-API-s.patch
diff --git a/patches/api/0235-Add-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/unapplied/api/0235-Add-API-to-get-Material-from-Boats-and-Minecarts.patch
index d297dd5c24..d297dd5c24 100644
--- a/patches/api/0235-Add-API-to-get-Material-from-Boats-and-Minecarts.patch
+++ b/patches/unapplied/api/0235-Add-API-to-get-Material-from-Boats-and-Minecarts.patch
diff --git a/patches/api/0236-Add-PlayerFlowerPotManipulateEvent.patch b/patches/unapplied/api/0236-Add-PlayerFlowerPotManipulateEvent.patch
index d9cd5a9f01..d9cd5a9f01 100644
--- a/patches/api/0236-Add-PlayerFlowerPotManipulateEvent.patch
+++ b/patches/unapplied/api/0236-Add-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/api/0237-Zombie-API-breaking-doors.patch b/patches/unapplied/api/0237-Zombie-API-breaking-doors.patch
index 18f139227e..24118c13ee 100644
--- a/patches/api/0237-Zombie-API-breaking-doors.patch
+++ b/patches/unapplied/api/0237-Zombie-API-breaking-doors.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Zombie API - breaking doors
 
 
 diff --git a/src/main/java/org/bukkit/entity/Zombie.java b/src/main/java/org/bukkit/entity/Zombie.java
-index cb0d979257e6781b82926594472ca46e858dd6b1..453c8526445ba11e6a196b8e66105191b60f58d5 100644
+index c1a5b625ea602d751a8026d989882c60e80756c9..93de95f68af45dba6a1da350a46adc1d1d058899 100644
 --- a/src/main/java/org/bukkit/entity/Zombie.java
 +++ b/src/main/java/org/bukkit/entity/Zombie.java
 @@ -100,8 +100,10 @@ public interface Zombie extends Monster, Ageable {
diff --git a/patches/api/0238-Add-EntityLoadCrossbowEvent.patch b/patches/unapplied/api/0238-Add-EntityLoadCrossbowEvent.patch
index f96d912584..f96d912584 100644
--- a/patches/api/0238-Add-EntityLoadCrossbowEvent.patch
+++ b/patches/unapplied/api/0238-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/api/0239-Added-WorldGameRuleChangeEvent.patch b/patches/unapplied/api/0239-Added-WorldGameRuleChangeEvent.patch
index 8ef5f7efcd..8ef5f7efcd 100644
--- a/patches/api/0239-Added-WorldGameRuleChangeEvent.patch
+++ b/patches/unapplied/api/0239-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/api/0240-Added-ServerResourcesReloadedEvent.patch b/patches/unapplied/api/0240-Added-ServerResourcesReloadedEvent.patch
index de081bbae7..de081bbae7 100644
--- a/patches/api/0240-Added-ServerResourcesReloadedEvent.patch
+++ b/patches/unapplied/api/0240-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/api/0241-Add-BlockFailedDispenseEvent.patch b/patches/unapplied/api/0241-Add-BlockFailedDispenseEvent.patch
index 126714b965..126714b965 100644
--- a/patches/api/0241-Add-BlockFailedDispenseEvent.patch
+++ b/patches/unapplied/api/0241-Add-BlockFailedDispenseEvent.patch
diff --git a/patches/api/0242-Added-PlayerLecternPageChangeEvent.patch b/patches/unapplied/api/0242-Added-PlayerLecternPageChangeEvent.patch
index 2b65c3a245..2b65c3a245 100644
--- a/patches/api/0242-Added-PlayerLecternPageChangeEvent.patch
+++ b/patches/unapplied/api/0242-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/api/0243-Added-PlayerLoomPatternSelectEvent.patch b/patches/unapplied/api/0243-Added-PlayerLoomPatternSelectEvent.patch
index 5677026956..5677026956 100644
--- a/patches/api/0243-Added-PlayerLoomPatternSelectEvent.patch
+++ b/patches/unapplied/api/0243-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/api/0244-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch b/patches/unapplied/api/0244-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch
index c25fbd796f..c25fbd796f 100644
--- a/patches/api/0244-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch
+++ b/patches/unapplied/api/0244-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch
diff --git a/patches/api/0245-Add-sendOpLevel-API.patch b/patches/unapplied/api/0245-Add-sendOpLevel-API.patch
index d8362da637..d8362da637 100644
--- a/patches/api/0245-Add-sendOpLevel-API.patch
+++ b/patches/unapplied/api/0245-Add-sendOpLevel-API.patch
diff --git a/patches/api/0246-Add-PaperRegistry.patch b/patches/unapplied/api/0246-Add-PaperRegistry.patch
index 8cc1e1b931..8cc1e1b931 100644
--- a/patches/api/0246-Add-PaperRegistry.patch
+++ b/patches/unapplied/api/0246-Add-PaperRegistry.patch
diff --git a/patches/api/0247-Add-StructuresLocateEvent.patch b/patches/unapplied/api/0247-Add-StructuresLocateEvent.patch
index 83e069116b..83e069116b 100644
--- a/patches/api/0247-Add-StructuresLocateEvent.patch
+++ b/patches/unapplied/api/0247-Add-StructuresLocateEvent.patch
diff --git a/patches/api/0248-Add-BlockPreDispenseEvent.patch b/patches/unapplied/api/0248-Add-BlockPreDispenseEvent.patch
index fb0b89a4ee..fb0b89a4ee 100644
--- a/patches/api/0248-Add-BlockPreDispenseEvent.patch
+++ b/patches/unapplied/api/0248-Add-BlockPreDispenseEvent.patch
diff --git a/patches/api/0249-Added-missing-vanilla-tags.patch b/patches/unapplied/api/0249-Added-missing-vanilla-tags.patch
index 1b1e570e1a..1b1e570e1a 100644
--- a/patches/api/0249-Added-missing-vanilla-tags.patch
+++ b/patches/unapplied/api/0249-Added-missing-vanilla-tags.patch
diff --git a/patches/api/0250-Added-PlayerChangeBeaconEffectEvent.patch b/patches/unapplied/api/0250-Added-PlayerChangeBeaconEffectEvent.patch
index c0621d7054..c0621d7054 100644
--- a/patches/api/0250-Added-PlayerChangeBeaconEffectEvent.patch
+++ b/patches/unapplied/api/0250-Added-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/api/0251-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/unapplied/api/0251-Added-PlayerStonecutterRecipeSelectEvent.patch
index ce446c46fe..ce446c46fe 100644
--- a/patches/api/0251-Added-PlayerStonecutterRecipeSelectEvent.patch
+++ b/patches/unapplied/api/0251-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/api/0252-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/unapplied/api/0252-Add-dropLeash-variable-to-EntityUnleashEvent.patch
index f85f2a4f26..f85f2a4f26 100644
--- a/patches/api/0252-Add-dropLeash-variable-to-EntityUnleashEvent.patch
+++ b/patches/unapplied/api/0252-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/api/0253-add-DragonEggFormEvent.patch b/patches/unapplied/api/0253-add-DragonEggFormEvent.patch
index c465295e88..c465295e88 100644
--- a/patches/api/0253-add-DragonEggFormEvent.patch
+++ b/patches/unapplied/api/0253-add-DragonEggFormEvent.patch
diff --git a/patches/api/0254-EntityMoveEvent.patch b/patches/unapplied/api/0254-EntityMoveEvent.patch
index 2855c3bdef..2855c3bdef 100644
--- a/patches/api/0254-EntityMoveEvent.patch
+++ b/patches/unapplied/api/0254-EntityMoveEvent.patch
diff --git a/patches/api/0255-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/unapplied/api/0255-Allow-adding-items-to-BlockDropItemEvent.patch
index 984da00f52..984da00f52 100644
--- a/patches/api/0255-Allow-adding-items-to-BlockDropItemEvent.patch
+++ b/patches/unapplied/api/0255-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/api/0256-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/unapplied/api/0256-Add-getMainThreadExecutor-to-BukkitScheduler.patch
index bbb81fdcf6..7cc686da5a 100644
--- a/patches/api/0256-Add-getMainThreadExecutor-to-BukkitScheduler.patch
+++ b/patches/unapplied/api/0256-Add-getMainThreadExecutor-to-BukkitScheduler.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add getMainThreadExecutor to BukkitScheduler
 
 
 diff --git a/src/main/java/org/bukkit/scheduler/BukkitScheduler.java b/src/main/java/org/bukkit/scheduler/BukkitScheduler.java
-index 5aefb7f2de890673aea275e85dbae9a2422b59b1..d2ab2ee1e1e8fbaac4edef5b3ee313ee4ceb6991 100644
+index 0368e9125e6d73449cfa22ec7bdabf274457f4c1..487b5ca23159b531475c3d650894be707b49914e 100644
 --- a/src/main/java/org/bukkit/scheduler/BukkitScheduler.java
 +++ b/src/main/java/org/bukkit/scheduler/BukkitScheduler.java
 @@ -457,4 +457,15 @@ public interface BukkitScheduler {
diff --git a/patches/api/0257-living-entity-allow-attribute-registration.patch b/patches/unapplied/api/0257-living-entity-allow-attribute-registration.patch
index e7ded6dabb..e7ded6dabb 100644
--- a/patches/api/0257-living-entity-allow-attribute-registration.patch
+++ b/patches/unapplied/api/0257-living-entity-allow-attribute-registration.patch
diff --git a/patches/api/0258-Add-missing-effects.patch b/patches/unapplied/api/0258-Add-missing-effects.patch
index e61e36d1e3..1bf1d3fb63 100644
--- a/patches/api/0258-Add-missing-effects.patch
+++ b/patches/unapplied/api/0258-Add-missing-effects.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add missing effects
 
 
 diff --git a/src/main/java/org/bukkit/Effect.java b/src/main/java/org/bukkit/Effect.java
-index 879d637691683ca862045402f74b751a892bf3ff..63034a66bcc10db939c497552b73ba96b0aa4b9d 100644
+index 611b7df0e31de932f15c2f13bd8ed286e0b3b43f..9c18b58d37a2dc677ce7c22c5be833ef95bf7c03 100644
 --- a/src/main/java/org/bukkit/Effect.java
 +++ b/src/main/java/org/bukkit/Effect.java
 @@ -132,12 +132,12 @@ public enum Effect {
diff --git a/patches/api/0259-Expose-Tracked-Players.patch b/patches/unapplied/api/0259-Expose-Tracked-Players.patch
index ef64931c5d..ef64931c5d 100644
--- a/patches/api/0259-Expose-Tracked-Players.patch
+++ b/patches/unapplied/api/0259-Expose-Tracked-Players.patch
diff --git a/patches/api/0260-Cache-the-result-of-Material-isBlock.patch b/patches/unapplied/api/0260-Cache-the-result-of-Material-isBlock.patch
index 514a9409e0..7fd62aa199 100644
--- a/patches/api/0260-Cache-the-result-of-Material-isBlock.patch
+++ b/patches/unapplied/api/0260-Cache-the-result-of-Material-isBlock.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Cache the result of Material#isBlock
 
 
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index fdb36def5f2f4451b810624e0c3c04b4a0534528..74f9626b485aca594cdb9f11c363c6c38c78a661 100644
+index 0e898adaf484aee13430d61be02ac1e72b82da93..c175b12786ce1c864faa898d9948f5dce5776299 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
 @@ -4397,6 +4397,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
diff --git a/patches/api/0261-Add-worldborder-events.patch b/patches/unapplied/api/0261-Add-worldborder-events.patch
index 2a1d4164b2..2a1d4164b2 100644
--- a/patches/api/0261-Add-worldborder-events.patch
+++ b/patches/unapplied/api/0261-Add-worldborder-events.patch
diff --git a/patches/api/0262-added-PlayerNameEntityEvent.patch b/patches/unapplied/api/0262-added-PlayerNameEntityEvent.patch
index a38082f8e8..a38082f8e8 100644
--- a/patches/api/0262-added-PlayerNameEntityEvent.patch
+++ b/patches/unapplied/api/0262-added-PlayerNameEntityEvent.patch
diff --git a/patches/api/0263-Add-recipe-to-cook-events.patch b/patches/unapplied/api/0263-Add-recipe-to-cook-events.patch
index 8c8712541e..8c8712541e 100644
--- a/patches/api/0263-Add-recipe-to-cook-events.patch
+++ b/patches/unapplied/api/0263-Add-recipe-to-cook-events.patch
diff --git a/patches/api/0264-Add-Block-isValidTool.patch b/patches/unapplied/api/0264-Add-Block-isValidTool.patch
index 0a86ea4c67..0a86ea4c67 100644
--- a/patches/api/0264-Add-Block-isValidTool.patch
+++ b/patches/unapplied/api/0264-Add-Block-isValidTool.patch
diff --git a/patches/api/0265-Expand-world-key-API.patch b/patches/unapplied/api/0265-Expand-world-key-API.patch
index 0828581a4d..0828581a4d 100644
--- a/patches/api/0265-Expand-world-key-API.patch
+++ b/patches/unapplied/api/0265-Expand-world-key-API.patch
diff --git a/patches/api/0266-Item-Rarity-API.patch b/patches/unapplied/api/0266-Item-Rarity-API.patch
index bd9fc07cfc..3529ee85d7 100644
--- a/patches/api/0266-Item-Rarity-API.patch
+++ b/patches/unapplied/api/0266-Item-Rarity-API.patch
@@ -39,7 +39,7 @@ index 0000000000000000000000000000000000000000..74ef8395cc040ce488c2acaa416db202
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 74f9626b485aca594cdb9f11c363c6c38c78a661..cfe35b0ca1f502c5c9af0d307bd22dcecc3b0f32 100644
+index c175b12786ce1c864faa898d9948f5dce5776299..b852d1f140def272400469c5edae74a966726ea4 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
 @@ -4463,6 +4463,17 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
diff --git a/patches/api/0267-Expose-protocol-version.patch b/patches/unapplied/api/0267-Expose-protocol-version.patch
index 18c7331272..18c7331272 100644
--- a/patches/api/0267-Expose-protocol-version.patch
+++ b/patches/unapplied/api/0267-Expose-protocol-version.patch
diff --git a/patches/api/0268-add-isDeeplySleeping-to-HumanEntity.patch b/patches/unapplied/api/0268-add-isDeeplySleeping-to-HumanEntity.patch
index fc6f6dcab3..fc6f6dcab3 100644
--- a/patches/api/0268-add-isDeeplySleeping-to-HumanEntity.patch
+++ b/patches/unapplied/api/0268-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/api/0269-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/unapplied/api/0269-add-consumeFuel-to-FurnaceBurnEvent.patch
index 07036efb43..07036efb43 100644
--- a/patches/api/0269-add-consumeFuel-to-FurnaceBurnEvent.patch
+++ b/patches/unapplied/api/0269-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/api/0270-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/unapplied/api/0270-add-get-set-drop-chance-to-EntityEquipment.patch
index 836af12518..836af12518 100644
--- a/patches/api/0270-add-get-set-drop-chance-to-EntityEquipment.patch
+++ b/patches/unapplied/api/0270-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/api/0271-Added-PlayerDeepSleepEvent.patch b/patches/unapplied/api/0271-Added-PlayerDeepSleepEvent.patch
index d8dccca755..d8dccca755 100644
--- a/patches/api/0271-Added-PlayerDeepSleepEvent.patch
+++ b/patches/unapplied/api/0271-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/api/0272-More-World-API.patch b/patches/unapplied/api/0272-More-World-API.patch
index 1c79ad1a4b..1c79ad1a4b 100644
--- a/patches/api/0272-More-World-API.patch
+++ b/patches/unapplied/api/0272-More-World-API.patch
diff --git a/patches/api/0273-Added-PlayerBedFailEnterEvent.patch b/patches/unapplied/api/0273-Added-PlayerBedFailEnterEvent.patch
index a622f2b98f..a622f2b98f 100644
--- a/patches/api/0273-Added-PlayerBedFailEnterEvent.patch
+++ b/patches/unapplied/api/0273-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/api/0274-Introduce-beacon-activation-deactivation-events.patch b/patches/unapplied/api/0274-Introduce-beacon-activation-deactivation-events.patch
index c2f0577191..c2f0577191 100644
--- a/patches/api/0274-Introduce-beacon-activation-deactivation-events.patch
+++ b/patches/unapplied/api/0274-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/api/0275-PlayerMoveEvent-Improvements.patch b/patches/unapplied/api/0275-PlayerMoveEvent-Improvements.patch
index 33cf16e54b..33cf16e54b 100644
--- a/patches/api/0275-PlayerMoveEvent-Improvements.patch
+++ b/patches/unapplied/api/0275-PlayerMoveEvent-Improvements.patch
diff --git a/patches/api/0276-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/unapplied/api/0276-add-RespawnFlags-to-PlayerRespawnEvent.patch
index c596be8b98..c596be8b98 100644
--- a/patches/api/0276-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/unapplied/api/0276-add-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/patches/api/0277-Add-more-WanderingTrader-API.patch b/patches/unapplied/api/0277-Add-more-WanderingTrader-API.patch
index 99045d4949..99045d4949 100644
--- a/patches/api/0277-Add-more-WanderingTrader-API.patch
+++ b/patches/unapplied/api/0277-Add-more-WanderingTrader-API.patch
diff --git a/patches/api/0278-Add-EntityBlockStorage-clearEntities.patch b/patches/unapplied/api/0278-Add-EntityBlockStorage-clearEntities.patch
index 7032ba6155..7032ba6155 100644
--- a/patches/api/0278-Add-EntityBlockStorage-clearEntities.patch
+++ b/patches/unapplied/api/0278-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/api/0279-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/unapplied/api/0279-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
index 16af3a7728..16af3a7728 100644
--- a/patches/api/0279-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
+++ b/patches/unapplied/api/0279-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/api/0280-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/unapplied/api/0280-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
index f42f7eed00..f42f7eed00 100644
--- a/patches/api/0280-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/unapplied/api/0280-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/api/0281-Inventory-close.patch b/patches/unapplied/api/0281-Inventory-close.patch
index 87dfa1a083..87dfa1a083 100644
--- a/patches/api/0281-Inventory-close.patch
+++ b/patches/unapplied/api/0281-Inventory-close.patch
diff --git a/patches/api/0282-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/unapplied/api/0282-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
index 3103f1ce2c..3103f1ce2c 100644
--- a/patches/api/0282-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/unapplied/api/0282-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/api/0283-Add-basic-Datapack-API.patch b/patches/unapplied/api/0283-Add-basic-Datapack-API.patch
index a979142151..2416c29b0e 100644
--- a/patches/api/0283-Add-basic-Datapack-API.patch
+++ b/patches/unapplied/api/0283-Add-basic-Datapack-API.patch
@@ -70,7 +70,7 @@ index 0000000000000000000000000000000000000000..58f78d5e91beacaf710f62461cf869f7
 +
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index def2ea036536d0e15bc3b35bb69e99a9bcba1d60..fa62a3a59cdb60dd91eaa0ca510482b98191e813 100644
+index 1e6307106391056af17add97080cd1f1908114e7..ff5c49c0a3a730ae6cf7a2547f63fcdb0a6e69f8 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -318,9 +318,11 @@ public final class Bukkit {
@@ -101,7 +101,7 @@ index def2ea036536d0e15bc3b35bb69e99a9bcba1d60..fa62a3a59cdb60dd91eaa0ca510482b9
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 11be12a66bbc660221760d857daf78cdb18d77f0..d2103b455c105c3fe2273823b800b8c617492c62 100644
+index 91535f211ba7352c22c8cc30e340ed93b3ace21d..4a461c02b62ce782c69801b1b076e5383a79b7c6 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -256,9 +256,11 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0284-additions-to-PlayerGameModeChangeEvent.patch b/patches/unapplied/api/0284-additions-to-PlayerGameModeChangeEvent.patch
index b2e65ae490..b2e65ae490 100644
--- a/patches/api/0284-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/unapplied/api/0284-additions-to-PlayerGameModeChangeEvent.patch
diff --git a/patches/api/0285-ItemStack-repair-check-API.patch b/patches/unapplied/api/0285-ItemStack-repair-check-API.patch
index 156f084676..156f084676 100644
--- a/patches/api/0285-ItemStack-repair-check-API.patch
+++ b/patches/unapplied/api/0285-ItemStack-repair-check-API.patch
diff --git a/patches/api/0286-More-Enchantment-API.patch b/patches/unapplied/api/0286-More-Enchantment-API.patch
index 88be180baf..88be180baf 100644
--- a/patches/api/0286-More-Enchantment-API.patch
+++ b/patches/unapplied/api/0286-More-Enchantment-API.patch
diff --git a/patches/api/0287-Add-Mob-lookAt-API.patch b/patches/unapplied/api/0287-Add-Mob-lookAt-API.patch
index 0dd5126905..0dd5126905 100644
--- a/patches/api/0287-Add-Mob-lookAt-API.patch
+++ b/patches/unapplied/api/0287-Add-Mob-lookAt-API.patch
diff --git a/patches/api/0288-ItemStack-editMeta.patch b/patches/unapplied/api/0288-ItemStack-editMeta.patch
index 7893a035c9..7893a035c9 100644
--- a/patches/api/0288-ItemStack-editMeta.patch
+++ b/patches/unapplied/api/0288-ItemStack-editMeta.patch
diff --git a/patches/api/0289-Add-EntityInsideBlockEvent.patch b/patches/unapplied/api/0289-Add-EntityInsideBlockEvent.patch
index 91451b592d..91451b592d 100644
--- a/patches/api/0289-Add-EntityInsideBlockEvent.patch
+++ b/patches/unapplied/api/0289-Add-EntityInsideBlockEvent.patch
diff --git a/patches/api/0290-Attributes-API-for-item-defaults.patch b/patches/unapplied/api/0290-Attributes-API-for-item-defaults.patch
index 0e51ebcf1e..4491dba15e 100644
--- a/patches/api/0290-Attributes-API-for-item-defaults.patch
+++ b/patches/unapplied/api/0290-Attributes-API-for-item-defaults.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Attributes API for item defaults
 
 
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index cfe35b0ca1f502c5c9af0d307bd22dcecc3b0f32..9be00bc616b1c6ad9619d9a48d5870f6d7ffb917 100644
+index b852d1f140def272400469c5edae74a966726ea4..85bec2ec7bfd68f3b515f62345d5656ac539f2c0 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
 @@ -4474,6 +4474,21 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
diff --git a/patches/api/0291-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/unapplied/api/0291-Add-cause-to-Weather-ThunderChangeEvents.patch
index 8e5d45d87b..8e5d45d87b 100644
--- a/patches/api/0291-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/unapplied/api/0291-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/api/0292-More-Lidded-Block-API.patch b/patches/unapplied/api/0292-More-Lidded-Block-API.patch
index a89f206f9a..a89f206f9a 100644
--- a/patches/api/0292-More-Lidded-Block-API.patch
+++ b/patches/unapplied/api/0292-More-Lidded-Block-API.patch
diff --git a/patches/api/0293-Add-PlayerKickEvent-causes.patch b/patches/unapplied/api/0293-Add-PlayerKickEvent-causes.patch
index d168614b7b..63e67ca4a2 100644
--- a/patches/api/0293-Add-PlayerKickEvent-causes.patch
+++ b/patches/unapplied/api/0293-Add-PlayerKickEvent-causes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerKickEvent causes
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 8a6cab8df1f1947bbdc4d11ba24b982a8483b2cc..549adf75eeb0d014c5baf7c111f4ec1468339bd5 100644
+index 107edde2e9189f29dde2211cc9e17cbeed3696ae..6d8e4f23095716eeaea16206c3a4bb36f794f29f 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -274,6 +274,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0294-Add-PufferFishStateChangeEvent.patch b/patches/unapplied/api/0294-Add-PufferFishStateChangeEvent.patch
index c3014534d3..c3014534d3 100644
--- a/patches/api/0294-Add-PufferFishStateChangeEvent.patch
+++ b/patches/unapplied/api/0294-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/api/0295-Add-BellRevealRaiderEvent.patch b/patches/unapplied/api/0295-Add-BellRevealRaiderEvent.patch
index b3b35c594f..b3b35c594f 100644
--- a/patches/api/0295-Add-BellRevealRaiderEvent.patch
+++ b/patches/unapplied/api/0295-Add-BellRevealRaiderEvent.patch
diff --git a/patches/api/0296-Add-ElderGuardianAppearanceEvent.patch b/patches/unapplied/api/0296-Add-ElderGuardianAppearanceEvent.patch
index 8d925d10ac..8d925d10ac 100644
--- a/patches/api/0296-Add-ElderGuardianAppearanceEvent.patch
+++ b/patches/unapplied/api/0296-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/api/0297-Add-more-line-of-sight-methods.patch b/patches/unapplied/api/0297-Add-more-line-of-sight-methods.patch
index 1826f238f3..1826f238f3 100644
--- a/patches/api/0297-Add-more-line-of-sight-methods.patch
+++ b/patches/unapplied/api/0297-Add-more-line-of-sight-methods.patch
diff --git a/patches/api/0298-Add-WaterBottleSplashEvent.patch b/patches/unapplied/api/0298-Add-WaterBottleSplashEvent.patch
index 2dbbb04b76..2dbbb04b76 100644
--- a/patches/api/0298-Add-WaterBottleSplashEvent.patch
+++ b/patches/unapplied/api/0298-Add-WaterBottleSplashEvent.patch
diff --git a/patches/api/0299-Add-more-LimitedRegion-API.patch b/patches/unapplied/api/0299-Add-more-LimitedRegion-API.patch
index 292f95c890..292f95c890 100644
--- a/patches/api/0299-Add-more-LimitedRegion-API.patch
+++ b/patches/unapplied/api/0299-Add-more-LimitedRegion-API.patch
diff --git a/patches/api/0300-Missing-Entity-API.patch b/patches/unapplied/api/0300-Missing-Entity-API.patch
index 3081148142..3081148142 100644
--- a/patches/api/0300-Missing-Entity-API.patch
+++ b/patches/unapplied/api/0300-Missing-Entity-API.patch
diff --git a/patches/api/0301-Adds-PlayerArmSwingEvent.patch b/patches/unapplied/api/0301-Adds-PlayerArmSwingEvent.patch
index 0a501495fe..0a501495fe 100644
--- a/patches/api/0301-Adds-PlayerArmSwingEvent.patch
+++ b/patches/unapplied/api/0301-Adds-PlayerArmSwingEvent.patch
diff --git a/patches/api/0302-Add-PlayerSignCommandPreprocessEvent.patch b/patches/unapplied/api/0302-Add-PlayerSignCommandPreprocessEvent.patch
index 8882c35337..8882c35337 100644
--- a/patches/api/0302-Add-PlayerSignCommandPreprocessEvent.patch
+++ b/patches/unapplied/api/0302-Add-PlayerSignCommandPreprocessEvent.patch
diff --git a/patches/api/0303-fix-empty-array-elements-in-command-arguments.patch b/patches/unapplied/api/0303-fix-empty-array-elements-in-command-arguments.patch
index 4b66990211..4b66990211 100644
--- a/patches/api/0303-fix-empty-array-elements-in-command-arguments.patch
+++ b/patches/unapplied/api/0303-fix-empty-array-elements-in-command-arguments.patch
diff --git a/patches/api/0304-Stinger-API.patch b/patches/unapplied/api/0304-Stinger-API.patch
index ae1f19d18d..7e540e5ba4 100644
--- a/patches/api/0304-Stinger-API.patch
+++ b/patches/unapplied/api/0304-Stinger-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Stinger API
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index b665b99ca6de3a35c3296a500db1527a8513a711..26f12a6e4b2aff8ec052342939435f1ae4c02e2d 100644
+index 56a59bfee3138bfb93cbb85c5d8b86e3aa977b05..4c1c87c07735eecc2a1eaef2da77d3fe636adefb 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -399,6 +399,36 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0305-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/unapplied/api/0305-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
index 0f76131486..0f76131486 100644
--- a/patches/api/0305-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
+++ b/patches/unapplied/api/0305-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/api/0306-Add-PlayerSetSpawnEvent.patch b/patches/unapplied/api/0306-Add-PlayerSetSpawnEvent.patch
index 9229c768c6..9229c768c6 100644
--- a/patches/api/0306-Add-PlayerSetSpawnEvent.patch
+++ b/patches/unapplied/api/0306-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/api/0307-Added-EntityDamageItemEvent.patch b/patches/unapplied/api/0307-Added-EntityDamageItemEvent.patch
index 8bbe79f9f3..8bbe79f9f3 100644
--- a/patches/api/0307-Added-EntityDamageItemEvent.patch
+++ b/patches/unapplied/api/0307-Added-EntityDamageItemEvent.patch
diff --git a/patches/api/0308-Make-EntityUnleashEvent-cancellable.patch b/patches/unapplied/api/0308-Make-EntityUnleashEvent-cancellable.patch
index e99584c277..e99584c277 100644
--- a/patches/api/0308-Make-EntityUnleashEvent-cancellable.patch
+++ b/patches/unapplied/api/0308-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/api/0309-Change-EnderEye-target-without-changing-other-things.patch b/patches/unapplied/api/0309-Change-EnderEye-target-without-changing-other-things.patch
index d8e53593ae..d8e53593ae 100644
--- a/patches/api/0309-Change-EnderEye-target-without-changing-other-things.patch
+++ b/patches/unapplied/api/0309-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/api/0310-Add-BlockBreakBlockEvent.patch b/patches/unapplied/api/0310-Add-BlockBreakBlockEvent.patch
index dfd13b1355..dfd13b1355 100644
--- a/patches/api/0310-Add-BlockBreakBlockEvent.patch
+++ b/patches/unapplied/api/0310-Add-BlockBreakBlockEvent.patch
diff --git a/patches/api/0311-Add-helpers-for-left-right-click-to-Action.patch b/patches/unapplied/api/0311-Add-helpers-for-left-right-click-to-Action.patch
index 9dac2fe612..9dac2fe612 100644
--- a/patches/api/0311-Add-helpers-for-left-right-click-to-Action.patch
+++ b/patches/unapplied/api/0311-Add-helpers-for-left-right-click-to-Action.patch
diff --git a/patches/api/0312-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/unapplied/api/0312-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
index 7e61d68783..7e61d68783 100644
--- a/patches/api/0312-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
+++ b/patches/unapplied/api/0312-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/api/0313-More-CommandBlock-API.patch b/patches/unapplied/api/0313-More-CommandBlock-API.patch
index c8c52c7587..c8c52c7587 100644
--- a/patches/api/0313-More-CommandBlock-API.patch
+++ b/patches/unapplied/api/0313-More-CommandBlock-API.patch
diff --git a/patches/api/0314-Add-missing-team-sidebar-display-slots.patch b/patches/unapplied/api/0314-Add-missing-team-sidebar-display-slots.patch
index cdecbd1764..cdecbd1764 100644
--- a/patches/api/0314-Add-missing-team-sidebar-display-slots.patch
+++ b/patches/unapplied/api/0314-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/api/0315-add-back-EntityPortalExitEvent.patch b/patches/unapplied/api/0315-add-back-EntityPortalExitEvent.patch
index 5a153e2345..5a153e2345 100644
--- a/patches/api/0315-add-back-EntityPortalExitEvent.patch
+++ b/patches/unapplied/api/0315-add-back-EntityPortalExitEvent.patch
diff --git a/patches/api/0316-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/unapplied/api/0316-Add-methods-to-find-targets-for-lightning-strikes.patch
index 2dfc41c4cb..1f32990f0d 100644
--- a/patches/api/0316-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/unapplied/api/0316-Add-methods-to-find-targets-for-lightning-strikes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add methods to find targets for lightning strikes
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index e097ac0d62fe9f97762cef4d3a4b740613b8dc34..ec46baeeaed183e3e2565f98d6a3fcafd972e0bc 100644
+index 8735a0a359450a6cbea44c1b01c85a4135ba1f86..48b3df2c12b3f6640e6c54c89763929487f0506d 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -735,6 +735,37 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0317-Get-entity-default-attributes.patch b/patches/unapplied/api/0317-Get-entity-default-attributes.patch
index 07b67050f3..4ac43c22f3 100644
--- a/patches/api/0317-Get-entity-default-attributes.patch
+++ b/patches/unapplied/api/0317-Get-entity-default-attributes.patch
@@ -32,7 +32,7 @@ index 0f09250d536b7405f0dc253afb1f3c4ccbaeb0da..f08e03c71f1e59d31a22822701b4e9ae
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/EntityType.java b/src/main/java/org/bukkit/entity/EntityType.java
-index 6c40a989eff1163c19106c1e6b4c8fc01ace7280..6cf14afd2c1b8018c67c6cac302ae28bb12ab5a5 100644
+index 20e6383543880eca7987500bd041e60297d0b1ff..9d7a63eeaaa332faed901f6b8181b7da40744ab8 100644
 --- a/src/main/java/org/bukkit/entity/EntityType.java
 +++ b/src/main/java/org/bukkit/entity/EntityType.java
 @@ -449,6 +449,25 @@ public enum EntityType implements Keyed, Translatable, net.kyori.adventure.trans
diff --git a/patches/api/0318-Left-handed-API.patch b/patches/unapplied/api/0318-Left-handed-API.patch
index cae17a697b..cae17a697b 100644
--- a/patches/api/0318-Left-handed-API.patch
+++ b/patches/unapplied/api/0318-Left-handed-API.patch
diff --git a/patches/api/0319-Add-critical-damage-API.patch b/patches/unapplied/api/0319-Add-critical-damage-API.patch
index 12f98b0fea..12f98b0fea 100644
--- a/patches/api/0319-Add-critical-damage-API.patch
+++ b/patches/unapplied/api/0319-Add-critical-damage-API.patch
diff --git a/patches/api/0320-Add-more-advancement-API.patch b/patches/unapplied/api/0320-Add-more-advancement-API.patch
index 179dbdc225..179dbdc225 100644
--- a/patches/api/0320-Add-more-advancement-API.patch
+++ b/patches/unapplied/api/0320-Add-more-advancement-API.patch
diff --git a/patches/api/0321-Fix-issues-with-mob-conversion.patch b/patches/unapplied/api/0321-Fix-issues-with-mob-conversion.patch
index f451d967b6..f451d967b6 100644
--- a/patches/api/0321-Fix-issues-with-mob-conversion.patch
+++ b/patches/unapplied/api/0321-Fix-issues-with-mob-conversion.patch
diff --git a/patches/api/0322-Add-isCollidable-methods-to-various-places.patch b/patches/unapplied/api/0322-Add-isCollidable-methods-to-various-places.patch
index b284622701..f1d0954f97 100644
--- a/patches/api/0322-Add-isCollidable-methods-to-various-places.patch
+++ b/patches/unapplied/api/0322-Add-isCollidable-methods-to-various-places.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add isCollidable methods to various places
 
 
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 9be00bc616b1c6ad9619d9a48d5870f6d7ffb917..da6e36a16e609272b60fc41ff69a6fa3c34926c0 100644
+index 85bec2ec7bfd68f3b515f62345d5656ac539f2c0..7ca70b269e15e818e61a9329e2775789abb4bc73 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
 @@ -4489,6 +4489,16 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
diff --git a/patches/api/0323-Goat-ram-API.patch b/patches/unapplied/api/0323-Goat-ram-API.patch
index 06d426a786..06d426a786 100644
--- a/patches/api/0323-Goat-ram-API.patch
+++ b/patches/unapplied/api/0323-Goat-ram-API.patch
diff --git a/patches/api/0324-Add-API-for-resetting-a-single-score.patch b/patches/unapplied/api/0324-Add-API-for-resetting-a-single-score.patch
index 14142e8f6c..14142e8f6c 100644
--- a/patches/api/0324-Add-API-for-resetting-a-single-score.patch
+++ b/patches/unapplied/api/0324-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/api/0325-Add-Raw-Byte-Entity-Serialization.patch b/patches/unapplied/api/0325-Add-Raw-Byte-Entity-Serialization.patch
index ed15969264..ed15969264 100644
--- a/patches/api/0325-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/unapplied/api/0325-Add-Raw-Byte-Entity-Serialization.patch
diff --git a/patches/api/0326-Add-PlayerItemFrameChangeEvent.patch b/patches/unapplied/api/0326-Add-PlayerItemFrameChangeEvent.patch
index a62e452bb4..a62e452bb4 100644
--- a/patches/api/0326-Add-PlayerItemFrameChangeEvent.patch
+++ b/patches/unapplied/api/0326-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/api/0327-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/unapplied/api/0327-Allow-delegation-to-vanilla-chunk-gen.patch
index a701c444dd..d981c912fc 100644
--- a/patches/api/0327-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/unapplied/api/0327-Allow-delegation-to-vanilla-chunk-gen.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow delegation to vanilla chunk gen
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index fa62a3a59cdb60dd91eaa0ca510482b98191e813..4a679c2feb117f3e4e2a3d2217ec492d887381c9 100644
+index ff5c49c0a3a730ae6cf7a2547f63fcdb0a6e69f8..6d09d22a2d488e3fdd0584a4361210f0060114e8 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -2046,6 +2046,24 @@ public final class Bukkit {
@@ -34,7 +34,7 @@ index fa62a3a59cdb60dd91eaa0ca510482b98191e813..4a679c2feb117f3e4e2a3d2217ec492d
       * Creates a boss bar instance to display to players. The progress
       * defaults to 1.0
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index d2103b455c105c3fe2273823b800b8c617492c62..603ec521e202c5cc3a7755c9e7e94657135586c3 100644
+index 4a461c02b62ce782c69801b1b076e5383a79b7c6..cea13dcd6b9e6cbc5af42f38296c9ab8db7e7855 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1730,6 +1730,22 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0328-Add-more-Campfire-API.patch b/patches/unapplied/api/0328-Add-more-Campfire-API.patch
index 80cdc0bb39..80cdc0bb39 100644
--- a/patches/api/0328-Add-more-Campfire-API.patch
+++ b/patches/unapplied/api/0328-Add-more-Campfire-API.patch
diff --git a/patches/api/0329-Move-VehicleCollisionEvent-HandlerList-up.patch b/patches/unapplied/api/0329-Move-VehicleCollisionEvent-HandlerList-up.patch
index 4be8907b49..4be8907b49 100644
--- a/patches/api/0329-Move-VehicleCollisionEvent-HandlerList-up.patch
+++ b/patches/unapplied/api/0329-Move-VehicleCollisionEvent-HandlerList-up.patch
diff --git a/patches/api/0330-Improve-scoreboard-entries.patch b/patches/unapplied/api/0330-Improve-scoreboard-entries.patch
index 0dcc796b4d..0dcc796b4d 100644
--- a/patches/api/0330-Improve-scoreboard-entries.patch
+++ b/patches/unapplied/api/0330-Improve-scoreboard-entries.patch
diff --git a/patches/api/0331-Entity-powdered-snow-API.patch b/patches/unapplied/api/0331-Entity-powdered-snow-API.patch
index 0a4e36dee8..0a4e36dee8 100644
--- a/patches/api/0331-Entity-powdered-snow-API.patch
+++ b/patches/unapplied/api/0331-Entity-powdered-snow-API.patch
diff --git a/patches/api/0332-Add-API-for-item-entity-health.patch b/patches/unapplied/api/0332-Add-API-for-item-entity-health.patch
index 94373dbdf2..94373dbdf2 100644
--- a/patches/api/0332-Add-API-for-item-entity-health.patch
+++ b/patches/unapplied/api/0332-Add-API-for-item-entity-health.patch
diff --git a/patches/api/0333-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/unapplied/api/0333-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
index f094cdc255..f094cdc255 100644
--- a/patches/api/0333-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
+++ b/patches/unapplied/api/0333-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/api/0334-Bucketable-API.patch b/patches/unapplied/api/0334-Bucketable-API.patch
index 26dbdc9f5d..26dbdc9f5d 100644
--- a/patches/api/0334-Bucketable-API.patch
+++ b/patches/unapplied/api/0334-Bucketable-API.patch
diff --git a/patches/api/0335-System-prop-for-default-config-comment-parsing.patch b/patches/unapplied/api/0335-System-prop-for-default-config-comment-parsing.patch
index 632f71e519..632f71e519 100644
--- a/patches/api/0335-System-prop-for-default-config-comment-parsing.patch
+++ b/patches/unapplied/api/0335-System-prop-for-default-config-comment-parsing.patch
diff --git a/patches/api/0336-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/unapplied/api/0336-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index 9b189fc918..9b189fc918 100644
--- a/patches/api/0336-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/unapplied/api/0336-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
diff --git a/patches/api/0337-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/unapplied/api/0337-Add-new-overload-to-PersistentDataContainer-has.patch
index 73c49a2fc8..73c49a2fc8 100644
--- a/patches/api/0337-Add-new-overload-to-PersistentDataContainer-has.patch
+++ b/patches/unapplied/api/0337-Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/api/0338-Multiple-Entries-with-Scoreboards.patch b/patches/unapplied/api/0338-Multiple-Entries-with-Scoreboards.patch
index 920c2f117e..920c2f117e 100644
--- a/patches/api/0338-Multiple-Entries-with-Scoreboards.patch
+++ b/patches/unapplied/api/0338-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/api/0339-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/unapplied/api/0339-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
index 2d133482d3..2d133482d3 100644
--- a/patches/api/0339-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/unapplied/api/0339-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/api/0340-Warn-on-strange-EventHandler-return-types.patch b/patches/unapplied/api/0340-Warn-on-strange-EventHandler-return-types.patch
index c7807b823b..c7807b823b 100644
--- a/patches/api/0340-Warn-on-strange-EventHandler-return-types.patch
+++ b/patches/unapplied/api/0340-Warn-on-strange-EventHandler-return-types.patch
diff --git a/patches/api/0341-Multi-Block-Change-API.patch b/patches/unapplied/api/0341-Multi-Block-Change-API.patch
index 2d87c1c71d..2d87c1c71d 100644
--- a/patches/api/0341-Multi-Block-Change-API.patch
+++ b/patches/unapplied/api/0341-Multi-Block-Change-API.patch
diff --git a/patches/api/0342-Fix-NotePlayEvent.patch b/patches/unapplied/api/0342-Fix-NotePlayEvent.patch
index d3f827bfd8..d3f827bfd8 100644
--- a/patches/api/0342-Fix-NotePlayEvent.patch
+++ b/patches/unapplied/api/0342-Fix-NotePlayEvent.patch
diff --git a/patches/api/0343-Freeze-Tick-Lock-API.patch b/patches/unapplied/api/0343-Freeze-Tick-Lock-API.patch
index f046aa1023..f046aa1023 100644
--- a/patches/api/0343-Freeze-Tick-Lock-API.patch
+++ b/patches/unapplied/api/0343-Freeze-Tick-Lock-API.patch
diff --git a/patches/api/0344-Dolphin-API.patch b/patches/unapplied/api/0344-Dolphin-API.patch
index 73beed437b..73beed437b 100644
--- a/patches/api/0344-Dolphin-API.patch
+++ b/patches/unapplied/api/0344-Dolphin-API.patch
diff --git a/patches/api/0345-More-PotionEffectType-API.patch b/patches/unapplied/api/0345-More-PotionEffectType-API.patch
index 75f518b90d..b9d8d00753 100644
--- a/patches/api/0345-More-PotionEffectType-API.patch
+++ b/patches/unapplied/api/0345-More-PotionEffectType-API.patch
@@ -41,7 +41,7 @@ index 469ef0a9241fddbd869ac2c0662c98b3022cc8aa..ba934feab58da978311c642408227a1f
  
      /**
 diff --git a/src/main/java/org/bukkit/potion/PotionEffectType.java b/src/main/java/org/bukkit/potion/PotionEffectType.java
-index 5f3aa6fd18d57055a6d8494938dff149d51b2803..84fd181ad897f620e450750246d9ea416dcbd48a 100644
+index ceba656b25f74d4bb2eadb9a7eca184b069b4909..e174b395b9915df11ba01ede05825ef212ede700 100644
 --- a/src/main/java/org/bukkit/potion/PotionEffectType.java
 +++ b/src/main/java/org/bukkit/potion/PotionEffectType.java
 @@ -14,7 +14,7 @@ import org.jetbrains.annotations.Nullable;
diff --git a/patches/api/0346-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/unapplied/api/0346-API-for-creating-command-sender-which-forwards-feedb.patch
index 79af94fc3b..3d2b9aaa96 100644
--- a/patches/api/0346-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/unapplied/api/0346-API-for-creating-command-sender-which-forwards-feedb.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] API for creating command sender which forwards feedback
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 4a679c2feb117f3e4e2a3d2217ec492d887381c9..dcd4c6b13e14cb45916e1ce59811e66ee23f745f 100644
+index 6d09d22a2d488e3fdd0584a4361210f0060114e8..5e8518372a30595f5f8f254e31a130645e75772e 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -1535,6 +1535,20 @@ public final class Bukkit {
@@ -30,7 +30,7 @@ index 4a679c2feb117f3e4e2a3d2217ec492d887381c9..dcd4c6b13e14cb45916e1ce59811e66e
       * Gets the folder that contains all of the various {@link World}s.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 603ec521e202c5cc3a7755c9e7e94657135586c3..6dbb7010f2097aaf24be2e81b4a780a508c209b3 100644
+index cea13dcd6b9e6cbc5af42f38296c9ab8db7e7855..204e68a63cf32d3b58a9fadabde5780608f47421 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1294,6 +1294,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0347-Implement-regenerateChunk.patch b/patches/unapplied/api/0347-Implement-regenerateChunk.patch
index b3c78845fe..f431abe466 100644
--- a/patches/api/0347-Implement-regenerateChunk.patch
+++ b/patches/unapplied/api/0347-Implement-regenerateChunk.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement regenerateChunk
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index ec46baeeaed183e3e2565f98d6a3fcafd972e0bc..1825b5f08c2a5bb3fd41ecabf60285400ad78c9c 100644
+index 48b3df2c12b3f6640e6c54c89763929487f0506d..b191d304832fe3475b76fdce131db51e5042ac01 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -484,8 +484,8 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0348-Add-GameEvent-tags.patch b/patches/unapplied/api/0348-Add-GameEvent-tags.patch
index a0481cf89d..a0481cf89d 100644
--- a/patches/api/0348-Add-GameEvent-tags.patch
+++ b/patches/unapplied/api/0348-Add-GameEvent-tags.patch
diff --git a/patches/api/0349-Furnace-RecipesUsed-API.patch b/patches/unapplied/api/0349-Furnace-RecipesUsed-API.patch
index 7fed82db21..7fed82db21 100644
--- a/patches/api/0349-Furnace-RecipesUsed-API.patch
+++ b/patches/unapplied/api/0349-Furnace-RecipesUsed-API.patch
diff --git a/patches/api/0350-Configurable-sculk-sensor-listener-range.patch b/patches/unapplied/api/0350-Configurable-sculk-sensor-listener-range.patch
index b1ad0cdb5b..b1ad0cdb5b 100644
--- a/patches/api/0350-Configurable-sculk-sensor-listener-range.patch
+++ b/patches/unapplied/api/0350-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/api/0351-Add-missing-block-data-mins-and-maxes.patch b/patches/unapplied/api/0351-Add-missing-block-data-mins-and-maxes.patch
index 600497b952..600497b952 100644
--- a/patches/api/0351-Add-missing-block-data-mins-and-maxes.patch
+++ b/patches/unapplied/api/0351-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/api/0352-Custom-Potion-Mixes.patch b/patches/unapplied/api/0352-Custom-Potion-Mixes.patch
index 125a13386a..0562b91cb0 100644
--- a/patches/api/0352-Custom-Potion-Mixes.patch
+++ b/patches/unapplied/api/0352-Custom-Potion-Mixes.patch
@@ -155,7 +155,7 @@ index 0000000000000000000000000000000000000000..3ede1e8f7bf0436fdc5bf395c0f9eaf1
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index dcd4c6b13e14cb45916e1ce59811e66ee23f745f..3722fdcff8f0154d5580bc7c4b0badbf71d3c2c2 100644
+index 5e8518372a30595f5f8f254e31a130645e75772e..011d4e3c6fe3ffb0636506f5447c0097b297a957 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -2568,6 +2568,15 @@ public final class Bukkit {
@@ -175,7 +175,7 @@ index dcd4c6b13e14cb45916e1ce59811e66ee23f745f..3722fdcff8f0154d5580bc7c4b0badbf
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 6dbb7010f2097aaf24be2e81b4a780a508c209b3..759e62bbcccc01513c0781ee989bfdc1ab38698e 100644
+index 204e68a63cf32d3b58a9fadabde5780608f47421..5e5b5aedeaaca24aebe59ec2cfd0adde2ca4a7f5 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -2238,5 +2238,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0353-Expose-furnace-minecart-push-values.patch b/patches/unapplied/api/0353-Expose-furnace-minecart-push-values.patch
index 3d8c2336e7..3d8c2336e7 100644
--- a/patches/api/0353-Expose-furnace-minecart-push-values.patch
+++ b/patches/unapplied/api/0353-Expose-furnace-minecart-push-values.patch
diff --git a/patches/api/0354-More-Projectile-API.patch b/patches/unapplied/api/0354-More-Projectile-API.patch
index 569c337346..569c337346 100644
--- a/patches/api/0354-More-Projectile-API.patch
+++ b/patches/unapplied/api/0354-More-Projectile-API.patch
diff --git a/patches/api/0355-Add-getComputedBiome-API.patch b/patches/unapplied/api/0355-Add-getComputedBiome-API.patch
index 870758d8da..870758d8da 100644
--- a/patches/api/0355-Add-getComputedBiome-API.patch
+++ b/patches/unapplied/api/0355-Add-getComputedBiome-API.patch
diff --git a/patches/api/0356-Add-enchantWithLevels-API.patch b/patches/unapplied/api/0356-Add-enchantWithLevels-API.patch
index af548612d5..af548612d5 100644
--- a/patches/api/0356-Add-enchantWithLevels-API.patch
+++ b/patches/unapplied/api/0356-Add-enchantWithLevels-API.patch
diff --git a/patches/api/0357-Add-TameableDeathMessageEvent.patch b/patches/unapplied/api/0357-Add-TameableDeathMessageEvent.patch
index 6152eacbe6..6152eacbe6 100644
--- a/patches/api/0357-Add-TameableDeathMessageEvent.patch
+++ b/patches/unapplied/api/0357-Add-TameableDeathMessageEvent.patch
diff --git a/patches/api/0358-Allow-to-change-the-podium-of-the-EnderDragon.patch b/patches/unapplied/api/0358-Allow-to-change-the-podium-of-the-EnderDragon.patch
index 08ffa1fdde..08ffa1fdde 100644
--- a/patches/api/0358-Allow-to-change-the-podium-of-the-EnderDragon.patch
+++ b/patches/unapplied/api/0358-Allow-to-change-the-podium-of-the-EnderDragon.patch
diff --git a/patches/api/0359-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch b/patches/unapplied/api/0359-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch
index 21b3f85c0b..21b3f85c0b 100644
--- a/patches/api/0359-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch
+++ b/patches/unapplied/api/0359-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch
diff --git a/patches/api/0360-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/unapplied/api/0360-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
index 5775b6f33c..5775b6f33c 100644
--- a/patches/api/0360-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
+++ b/patches/unapplied/api/0360-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/api/0361-WorldCreator-keepSpawnLoaded.patch b/patches/unapplied/api/0361-WorldCreator-keepSpawnLoaded.patch
index 287c313c58..287c313c58 100644
--- a/patches/api/0361-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/unapplied/api/0361-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/api/0362-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/unapplied/api/0362-Add-EntityDyeEvent-and-CollarColorable-interface.patch
index 032a0872d1..032a0872d1 100644
--- a/patches/api/0362-Add-EntityDyeEvent-and-CollarColorable-interface.patch
+++ b/patches/unapplied/api/0362-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/api/0363-Add-PlayerStopUsingItemEvent.patch b/patches/unapplied/api/0363-Add-PlayerStopUsingItemEvent.patch
index 0743d44ae1..0743d44ae1 100644
--- a/patches/api/0363-Add-PlayerStopUsingItemEvent.patch
+++ b/patches/unapplied/api/0363-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/api/0364-Expand-FallingBlock-API.patch b/patches/unapplied/api/0364-Expand-FallingBlock-API.patch
index d1138539df..d1138539df 100644
--- a/patches/api/0364-Expand-FallingBlock-API.patch
+++ b/patches/unapplied/api/0364-Expand-FallingBlock-API.patch
diff --git a/patches/api/0365-Keyed-Cat-Type.patch b/patches/unapplied/api/0365-Keyed-Cat-Type.patch
index b0797d78b7..b0797d78b7 100644
--- a/patches/api/0365-Keyed-Cat-Type.patch
+++ b/patches/unapplied/api/0365-Keyed-Cat-Type.patch
diff --git a/patches/api/0366-Add-method-isTickingWorlds-to-Bukkit.patch b/patches/unapplied/api/0366-Add-method-isTickingWorlds-to-Bukkit.patch
index 183594a39e..3a69d67dec 100644
--- a/patches/api/0366-Add-method-isTickingWorlds-to-Bukkit.patch
+++ b/patches/unapplied/api/0366-Add-method-isTickingWorlds-to-Bukkit.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add method isTickingWorlds() to Bukkit.
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 3722fdcff8f0154d5580bc7c4b0badbf71d3c2c2..65db3a8b736dc3c9080616517813119ebc722292 100644
+index 011d4e3c6fe3ffb0636506f5447c0097b297a957..458d98cc385718a86e0ef0eb90ff9ce64d77066a 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -776,12 +776,26 @@ public final class Bukkit {
@@ -56,7 +56,7 @@ index 3722fdcff8f0154d5580bc7c4b0badbf71d3c2c2..65db3a8b736dc3c9080616517813119e
       * @param world the world to unload
       * @param save whether to save the chunks before unloading
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 759e62bbcccc01513c0781ee989bfdc1ab38698e..af2bbeff54f0044f51bf0df17727b2f8bec33fe4 100644
+index 5e5b5aedeaaca24aebe59ec2cfd0adde2ca4a7f5..383f1fcddaa50a8c94282c7a828912d73accfb62 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -649,34 +649,55 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0367-Add-WardenAngerChangeEvent.patch b/patches/unapplied/api/0367-Add-WardenAngerChangeEvent.patch
index 136f87fdb0..136f87fdb0 100644
--- a/patches/api/0367-Add-WardenAngerChangeEvent.patch
+++ b/patches/unapplied/api/0367-Add-WardenAngerChangeEvent.patch
diff --git a/patches/api/0368-Nameable-Banner-API.patch b/patches/unapplied/api/0368-Nameable-Banner-API.patch
index eba196daaf..eba196daaf 100644
--- a/patches/api/0368-Nameable-Banner-API.patch
+++ b/patches/unapplied/api/0368-Nameable-Banner-API.patch
diff --git a/patches/api/0369-Add-Player-getFishHook.patch b/patches/unapplied/api/0369-Add-Player-getFishHook.patch
index 291eac5db5..291eac5db5 100644
--- a/patches/api/0369-Add-Player-getFishHook.patch
+++ b/patches/unapplied/api/0369-Add-Player-getFishHook.patch
diff --git a/patches/api/0370-More-Teleport-API.patch b/patches/unapplied/api/0370-More-Teleport-API.patch
index 339033f92e..40cf296d3f 100644
--- a/patches/api/0370-More-Teleport-API.patch
+++ b/patches/unapplied/api/0370-More-Teleport-API.patch
@@ -158,7 +158,7 @@ index 77e29cada05da8946d718fe331e28e7553922033..a7e0454344b145242a19eb8020c9c67b
       * Teleports this entity to the given location. If this entity is riding a
       * vehicle, it will be dismounted prior to teleportation.
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 0e42cd429a75d10f8628acad319ee3dd2cdf02c3..9794b8f812375ad52b4caceef0bf659d8fbf9d65 100644
+index 0e42cd429a75d10f8628acad319ee3dd2cdf02c3..6394f2e3ea47f6b28bab501acacceeb6e46a2ef6 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -3118,6 +3118,45 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0371-Add-EntityPortalReadyEvent.patch b/patches/unapplied/api/0371-Add-EntityPortalReadyEvent.patch
index 4b1b1f1e1f..4b1b1f1e1f 100644
--- a/patches/api/0371-Add-EntityPortalReadyEvent.patch
+++ b/patches/unapplied/api/0371-Add-EntityPortalReadyEvent.patch
diff --git a/patches/api/0372-Custom-Chat-Completion-Suggestions-API.patch b/patches/unapplied/api/0372-Custom-Chat-Completion-Suggestions-API.patch
index bda6ca8a88..ec248378f8 100644
--- a/patches/api/0372-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/unapplied/api/0372-Custom-Chat-Completion-Suggestions-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Custom Chat Completion Suggestions API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 9794b8f812375ad52b4caceef0bf659d8fbf9d65..f56bb863affa963615efefc35fe1f8d4b12d1253 100644
+index 6394f2e3ea47f6b28bab501acacceeb6e46a2ef6..83eaf1b4882c552cf72d222d45ed11fd8f8a57b2 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -3002,6 +3002,31 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0373-Collision-API.patch b/patches/unapplied/api/0373-Collision-API.patch
index 8a63115a96..8a63115a96 100644
--- a/patches/api/0373-Collision-API.patch
+++ b/patches/unapplied/api/0373-Collision-API.patch
diff --git a/patches/api/0374-Block-Ticking-API.patch b/patches/unapplied/api/0374-Block-Ticking-API.patch
index 122cb9dd52..122cb9dd52 100644
--- a/patches/api/0374-Block-Ticking-API.patch
+++ b/patches/unapplied/api/0374-Block-Ticking-API.patch
diff --git a/patches/api/0375-Add-NamespacedKey-biome-methods.patch b/patches/unapplied/api/0375-Add-NamespacedKey-biome-methods.patch
index ae9059caa8..ae9059caa8 100644
--- a/patches/api/0375-Add-NamespacedKey-biome-methods.patch
+++ b/patches/unapplied/api/0375-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/api/0376-Also-load-resources-from-LibraryLoader.patch b/patches/unapplied/api/0376-Also-load-resources-from-LibraryLoader.patch
index c999e55c24..c999e55c24 100644
--- a/patches/api/0376-Also-load-resources-from-LibraryLoader.patch
+++ b/patches/unapplied/api/0376-Also-load-resources-from-LibraryLoader.patch
diff --git a/patches/api/0377-Added-byte-array-serialization-deserialization-for-P.patch b/patches/unapplied/api/0377-Added-byte-array-serialization-deserialization-for-P.patch
index 161c82afe3..161c82afe3 100644
--- a/patches/api/0377-Added-byte-array-serialization-deserialization-for-P.patch
+++ b/patches/unapplied/api/0377-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/api/0378-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/unapplied/api/0378-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
index 291761dadb..291761dadb 100644
--- a/patches/api/0378-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
+++ b/patches/unapplied/api/0378-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/api/0379-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch b/patches/unapplied/api/0379-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
index 9b5ef25cf4..9b5ef25cf4 100644
--- a/patches/api/0379-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
+++ b/patches/unapplied/api/0379-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
diff --git a/patches/api/0380-Add-getDrops-to-BlockState.patch b/patches/unapplied/api/0380-Add-getDrops-to-BlockState.patch
index 0a8d8ad13a..0a8d8ad13a 100644
--- a/patches/api/0380-Add-getDrops-to-BlockState.patch
+++ b/patches/unapplied/api/0380-Add-getDrops-to-BlockState.patch
diff --git a/patches/api/0381-Add-PlayerInventorySlotChangeEvent.patch b/patches/unapplied/api/0381-Add-PlayerInventorySlotChangeEvent.patch
index f094f9dbc9..f094f9dbc9 100644
--- a/patches/api/0381-Add-PlayerInventorySlotChangeEvent.patch
+++ b/patches/unapplied/api/0381-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/api/0382-Elder-Guardian-appearance-API.patch b/patches/unapplied/api/0382-Elder-Guardian-appearance-API.patch
index a9afce2086..a9afce2086 100644
--- a/patches/api/0382-Elder-Guardian-appearance-API.patch
+++ b/patches/unapplied/api/0382-Elder-Guardian-appearance-API.patch
diff --git a/patches/api/0383-Allow-changing-bed-s-occupied-property.patch b/patches/unapplied/api/0383-Allow-changing-bed-s-occupied-property.patch
index 8dfafd6d33..8dfafd6d33 100644
--- a/patches/api/0383-Allow-changing-bed-s-occupied-property.patch
+++ b/patches/unapplied/api/0383-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/api/0384-Add-EquipmentSlot-convenience-methods.patch b/patches/unapplied/api/0384-Add-EquipmentSlot-convenience-methods.patch
index 0ef6b4c9b0..0ef6b4c9b0 100644
--- a/patches/api/0384-Add-EquipmentSlot-convenience-methods.patch
+++ b/patches/unapplied/api/0384-Add-EquipmentSlot-convenience-methods.patch
diff --git a/patches/api/0385-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch b/patches/unapplied/api/0385-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
index 86203fb4c3..86203fb4c3 100644
--- a/patches/api/0385-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
+++ b/patches/unapplied/api/0385-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
diff --git a/patches/api/0386-Add-entity-knockback-API.patch b/patches/unapplied/api/0386-Add-entity-knockback-API.patch
index 263f278b1b..263f278b1b 100644
--- a/patches/api/0386-Add-entity-knockback-API.patch
+++ b/patches/unapplied/api/0386-Add-entity-knockback-API.patch
diff --git a/patches/api/0387-Added-EntityToggleSitEvent.patch b/patches/unapplied/api/0387-Added-EntityToggleSitEvent.patch
index af2476123b..af2476123b 100644
--- a/patches/api/0387-Added-EntityToggleSitEvent.patch
+++ b/patches/unapplied/api/0387-Added-EntityToggleSitEvent.patch
diff --git a/patches/api/0388-Add-Moving-Piston-API.patch b/patches/unapplied/api/0388-Add-Moving-Piston-API.patch
index 8f889f1e3d..8f889f1e3d 100644
--- a/patches/api/0388-Add-Moving-Piston-API.patch
+++ b/patches/unapplied/api/0388-Add-Moving-Piston-API.patch
diff --git a/patches/api/0389-Add-PrePlayerAttackEntityEvent.patch b/patches/unapplied/api/0389-Add-PrePlayerAttackEntityEvent.patch
index 507b313e56..507b313e56 100644
--- a/patches/api/0389-Add-PrePlayerAttackEntityEvent.patch
+++ b/patches/unapplied/api/0389-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/api/0390-Add-Player-Warden-Warning-API.patch b/patches/unapplied/api/0390-Add-Player-Warden-Warning-API.patch
index a24951cd1b..a24951cd1b 100644
--- a/patches/api/0390-Add-Player-Warden-Warning-API.patch
+++ b/patches/unapplied/api/0390-Add-Player-Warden-Warning-API.patch
diff --git a/patches/api/0391-More-vanilla-friendly-methods-to-update-trades.patch b/patches/unapplied/api/0391-More-vanilla-friendly-methods-to-update-trades.patch
index f13fdb5601..f13fdb5601 100644
--- a/patches/api/0391-More-vanilla-friendly-methods-to-update-trades.patch
+++ b/patches/unapplied/api/0391-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/api/0392-Add-paper-dumplisteners-command.patch b/patches/unapplied/api/0392-Add-paper-dumplisteners-command.patch
index 8053dc2c4f..8053dc2c4f 100644
--- a/patches/api/0392-Add-paper-dumplisteners-command.patch
+++ b/patches/unapplied/api/0392-Add-paper-dumplisteners-command.patch
diff --git a/patches/api/0393-ItemStack-damage-API.patch b/patches/unapplied/api/0393-ItemStack-damage-API.patch
index 3617adca85..3617adca85 100644
--- a/patches/api/0393-ItemStack-damage-API.patch
+++ b/patches/unapplied/api/0393-ItemStack-damage-API.patch
diff --git a/patches/api/0394-Add-Tick-TemporalUnit.patch b/patches/unapplied/api/0394-Add-Tick-TemporalUnit.patch
index 562eb00082..562eb00082 100644
--- a/patches/api/0394-Add-Tick-TemporalUnit.patch
+++ b/patches/unapplied/api/0394-Add-Tick-TemporalUnit.patch
diff --git a/patches/api/0395-Friction-API.patch b/patches/unapplied/api/0395-Friction-API.patch
index dd826ded3b..bc522bb0bc 100644
--- a/patches/api/0395-Friction-API.patch
+++ b/patches/unapplied/api/0395-Friction-API.patch
@@ -59,7 +59,7 @@ index d0bef15785493b512ff0f7414c1d58d38fead581..58017fce436cdbda255f7172fbdadb72
      /**
       * Gets the item stack associated with this item drop.
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 7889ec8e0954c98e9611a20811b1ddc5bcd93b7f..f4c5ec3f7e5c29b1799eef6c4f76617e9f23c0d7 100644
+index 088f42f294784e14f4478255193f4fd40cba4e53..4682df5d422c24c2d145bd28bc3d0fa8b1cd6ce8 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -25,7 +25,7 @@ import org.jetbrains.annotations.Nullable;
diff --git a/patches/api/0396-Player-Entity-Tracking-Events.patch b/patches/unapplied/api/0396-Player-Entity-Tracking-Events.patch
index 4b11ceb409..4b11ceb409 100644
--- a/patches/api/0396-Player-Entity-Tracking-Events.patch
+++ b/patches/unapplied/api/0396-Player-Entity-Tracking-Events.patch
diff --git a/patches/api/0397-Add-missing-Fluid-type.patch b/patches/unapplied/api/0397-Add-missing-Fluid-type.patch
index c260bf8497..c260bf8497 100644
--- a/patches/api/0397-Add-missing-Fluid-type.patch
+++ b/patches/unapplied/api/0397-Add-missing-Fluid-type.patch
diff --git a/patches/api/0398-fix-Instruments.patch b/patches/unapplied/api/0398-fix-Instruments.patch
index 468dc80a34..468dc80a34 100644
--- a/patches/api/0398-fix-Instruments.patch
+++ b/patches/unapplied/api/0398-fix-Instruments.patch
diff --git a/patches/api/0399-Add-BlockLockCheckEvent.patch b/patches/unapplied/api/0399-Add-BlockLockCheckEvent.patch
index 55a23307b1..55a23307b1 100644
--- a/patches/api/0399-Add-BlockLockCheckEvent.patch
+++ b/patches/unapplied/api/0399-Add-BlockLockCheckEvent.patch
diff --git a/patches/api/0400-Add-Sneaking-API-for-Entities.patch b/patches/unapplied/api/0400-Add-Sneaking-API-for-Entities.patch
index e4d5a342b4..2afd3ae1ad 100644
--- a/patches/api/0400-Add-Sneaking-API-for-Entities.patch
+++ b/patches/unapplied/api/0400-Add-Sneaking-API-for-Entities.patch
@@ -35,7 +35,7 @@ index 368d8da056e41103ad10dde177cc244148c0130e..d601145b41f7e8d0441c0db7ac98a033
       * Get the category of spawn to which this entity belongs.
       *
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index e356a0927517d2e5a836e9e39514129f2ac5f54d..b6ddd0035c5e85fcae8e6c317503aabf93e78409 100644
+index aaa99aca492b14c775180214345095ec02dbc5fc..71e5e63a259d354b27cdd85d9a7622e95201702c 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -414,6 +414,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0401-Improve-PortalEvents.patch b/patches/unapplied/api/0401-Improve-PortalEvents.patch
index f7f53b19fc..f7f53b19fc 100644
--- a/patches/api/0401-Improve-PortalEvents.patch
+++ b/patches/unapplied/api/0401-Improve-PortalEvents.patch
diff --git a/patches/api/0402-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/unapplied/api/0402-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
index c9fd0c6501..c9fd0c6501 100644
--- a/patches/api/0402-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
+++ b/patches/unapplied/api/0402-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
diff --git a/patches/api/0403-Flying-Fall-Damage-API.patch b/patches/unapplied/api/0403-Flying-Fall-Damage-API.patch
index 56eb260b46..f4731633c0 100644
--- a/patches/api/0403-Flying-Fall-Damage-API.patch
+++ b/patches/unapplied/api/0403-Flying-Fall-Damage-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Flying Fall Damage API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 1a005fde018a7752209fbdcd92714d67ae5cc633..b9c8ca96b36050b2420c9f168bc15767f751ec23 100644
+index 71e5e63a259d354b27cdd85d9a7622e95201702c..72d105674fd93fcedbea07ddb20580e24297f292 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1765,6 +1765,23 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0404-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/unapplied/api/0404-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
index 25fa280b26..25fa280b26 100644
--- a/patches/api/0404-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
+++ b/patches/unapplied/api/0404-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
diff --git a/patches/api/0405-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch b/patches/unapplied/api/0405-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
index 3936bb4a92..3936bb4a92 100644
--- a/patches/api/0405-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
+++ b/patches/unapplied/api/0405-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
diff --git a/patches/api/0406-Win-Screen-API.patch b/patches/unapplied/api/0406-Win-Screen-API.patch
index 7be27304d8..5745690c56 100644
--- a/patches/api/0406-Win-Screen-API.patch
+++ b/patches/unapplied/api/0406-Win-Screen-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Win Screen API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index b9c8ca96b36050b2420c9f168bc15767f751ec23..5e1a706fb68658061ab5c29cba82d411716e5692 100644
+index 72d105674fd93fcedbea07ddb20580e24297f292..3c904524cdd88196116a089aefe913dd41d1a691 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1135,6 +1135,47 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0407-Add-Entity-Body-Yaw-API.patch b/patches/unapplied/api/0407-Add-Entity-Body-Yaw-API.patch
index 78d2ed63bb..78d2ed63bb 100644
--- a/patches/api/0407-Add-Entity-Body-Yaw-API.patch
+++ b/patches/unapplied/api/0407-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/api/0408-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch b/patches/unapplied/api/0408-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
index 1ae7f17da6..1ae7f17da6 100644
--- a/patches/api/0408-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
+++ b/patches/unapplied/api/0408-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
diff --git a/patches/api/0409-Add-EntityFertilizeEggEvent.patch b/patches/unapplied/api/0409-Add-EntityFertilizeEggEvent.patch
index 52283a9df2..52283a9df2 100644
--- a/patches/api/0409-Add-EntityFertilizeEggEvent.patch
+++ b/patches/unapplied/api/0409-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/api/0410-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/unapplied/api/0410-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
index f720032bf2..f720032bf2 100644
--- a/patches/api/0410-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
+++ b/patches/unapplied/api/0410-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/api/0411-Add-Shearable-API.patch b/patches/unapplied/api/0411-Add-Shearable-API.patch
index 96049cfd38..617157b499 100644
--- a/patches/api/0411-Add-Shearable-API.patch
+++ b/patches/unapplied/api/0411-Add-Shearable-API.patch
@@ -54,7 +54,7 @@ index 0000000000000000000000000000000000000000..0d5793790ab6a47525ad330335173612
 +    boolean readyToBeSheared();
 +}
 diff --git a/src/main/java/org/bukkit/entity/MushroomCow.java b/src/main/java/org/bukkit/entity/MushroomCow.java
-index 738d547d2a6966122cb2f9f6e94263ee526d9fab..a5ed2bb03684da44951ec8aecbb229fe2b355e63 100644
+index e14194a130ebd872bbc1eb24c7759f0388f3da97..a6020bf1e927c1478b5ab90ec9a6ee21f03579da 100644
 --- a/src/main/java/org/bukkit/entity/MushroomCow.java
 +++ b/src/main/java/org/bukkit/entity/MushroomCow.java
 @@ -5,7 +5,7 @@ import org.jetbrains.annotations.NotNull;
diff --git a/patches/api/0412-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/unapplied/api/0412-Fix-SpawnEggMeta-get-setSpawnedType.patch
index 4014e17083..4014e17083 100644
--- a/patches/api/0412-Fix-SpawnEggMeta-get-setSpawnedType.patch
+++ b/patches/unapplied/api/0412-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/api/0413-Add-Mob-Experience-reward-API.patch b/patches/unapplied/api/0413-Add-Mob-Experience-reward-API.patch
index 2e3a09921e..2e3a09921e 100644
--- a/patches/api/0413-Add-Mob-Experience-reward-API.patch
+++ b/patches/unapplied/api/0413-Add-Mob-Experience-reward-API.patch
diff --git a/patches/api/0414-Expand-PlayerItemMendEvent.patch b/patches/unapplied/api/0414-Expand-PlayerItemMendEvent.patch
index 223922e05e..223922e05e 100644
--- a/patches/api/0414-Expand-PlayerItemMendEvent.patch
+++ b/patches/unapplied/api/0414-Expand-PlayerItemMendEvent.patch
diff --git a/patches/api/0415-Add-transient-modifier-API.patch b/patches/unapplied/api/0415-Add-transient-modifier-API.patch
index a32e4c86a9..a32e4c86a9 100644
--- a/patches/api/0415-Add-transient-modifier-API.patch
+++ b/patches/unapplied/api/0415-Add-transient-modifier-API.patch
diff --git a/patches/api/0416-Properly-remove-the-experimental-smithing-inventory-.patch b/patches/unapplied/api/0416-Properly-remove-the-experimental-smithing-inventory-.patch
index adf74b3f77..8b67f602b7 100644
--- a/patches/api/0416-Properly-remove-the-experimental-smithing-inventory-.patch
+++ b/patches/unapplied/api/0416-Properly-remove-the-experimental-smithing-inventory-.patch
@@ -18,7 +18,7 @@ index 19ba2d948ad83baab2a14ae6f7b3ce43c3d4971f..cbce826add9dc2b3187c7bea00c27b78
      ;
  
 diff --git a/src/main/java/org/bukkit/inventory/InventoryView.java b/src/main/java/org/bukkit/inventory/InventoryView.java
-index aac9180fa3bcbdb0c17dcf96c86647b54ccc28c3..ae2abcb63ac10c20c5bf5c2497806faf380dd2da 100644
+index 8d14426eb1ebea27058d5f22ea652f22d00fccb9..ac6c5c7a58c2c88b6cb0f6632fb53e8d67f8a059 100644
 --- a/src/main/java/org/bukkit/inventory/InventoryView.java
 +++ b/src/main/java/org/bukkit/inventory/InventoryView.java
 @@ -370,7 +370,6 @@ public abstract class InventoryView {
diff --git a/patches/api/0417-Add-method-to-remove-all-active-potion-effects.patch b/patches/unapplied/api/0417-Add-method-to-remove-all-active-potion-effects.patch
index d0a824c013..016fec1d59 100644
--- a/patches/api/0417-Add-method-to-remove-all-active-potion-effects.patch
+++ b/patches/unapplied/api/0417-Add-method-to-remove-all-active-potion-effects.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add method to remove all active potion effects
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 03490d35a24c056ed148e45eea27d1786a58c8fc..19e58e62ae442ef9be02ca7fa2f55e370a54afa4 100644
+index bd5e53372ce860924f5403dca6b0c45878a9e4d2..a599ed2795ba1baf2cbb465d1c7145580c27e1ea 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -589,6 +589,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0418-Folia-scheduler-and-owned-region-API.patch b/patches/unapplied/api/0418-Folia-scheduler-and-owned-region-API.patch
index 4099cdbc1e..c979729d17 100644
--- a/patches/api/0418-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/unapplied/api/0418-Folia-scheduler-and-owned-region-API.patch
@@ -499,7 +499,7 @@ index 0000000000000000000000000000000000000000..a6b50c9d8af589cc4747e14d343d2045
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 65db3a8b736dc3c9080616517813119ebc722292..d1ddd924db3f781138696f49110953d10bf76d5f 100644
+index 458d98cc385718a86e0ef0eb90ff9ce64d77066a..2bafcb26c144a84d1b955c8cdf122cca6628afc4 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -2599,6 +2599,141 @@ public final class Bukkit {
@@ -645,7 +645,7 @@ index 65db3a8b736dc3c9080616517813119ebc722292..d1ddd924db3f781138696f49110953d1
      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 af2bbeff54f0044f51bf0df17727b2f8bec33fe4..3d8a33563cb266fd784e264f6ce3850213a3838a 100644
+index 383f1fcddaa50a8c94282c7a828912d73accfb62..cd1df326ef937863e427f47e1c8ac8720c01f75d 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -2267,4 +2267,119 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0419-Add-event-for-player-editing-sign.patch b/patches/unapplied/api/0419-Add-event-for-player-editing-sign.patch
index 738ff0d1f0..738ff0d1f0 100644
--- a/patches/api/0419-Add-event-for-player-editing-sign.patch
+++ b/patches/unapplied/api/0419-Add-event-for-player-editing-sign.patch
diff --git a/patches/api/0420-Add-Sign-getInteractableSideFor.patch b/patches/unapplied/api/0420-Add-Sign-getInteractableSideFor.patch
index c339b5b034..c339b5b034 100644
--- a/patches/api/0420-Add-Sign-getInteractableSideFor.patch
+++ b/patches/unapplied/api/0420-Add-Sign-getInteractableSideFor.patch
diff --git a/patches/api/0421-Fix-BanList-API.patch b/patches/unapplied/api/0421-Fix-BanList-API.patch
index 306478c765..1333db6fb0 100644
--- a/patches/api/0421-Fix-BanList-API.patch
+++ b/patches/unapplied/api/0421-Fix-BanList-API.patch
@@ -130,7 +130,7 @@ index e805e629cede1c4c0674282c930cb67852718c3e..5248cf08ef83c7304dd76c42a2f646bb
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 07d018c4c57d5519554db9063f6e91d017801719..017f6d682181ccba3cb4f826c393f90ee614868f 100644
+index 3c904524cdd88196116a089aefe913dd41d1a691..2fddfb32927023c64718664ecca7989c15f15a67 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -298,7 +298,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0422-Add-whitelist-events.patch b/patches/unapplied/api/0422-Add-whitelist-events.patch
index 236555f3ab..236555f3ab 100644
--- a/patches/api/0422-Add-whitelist-events.patch
+++ b/patches/unapplied/api/0422-Add-whitelist-events.patch
diff --git a/patches/api/0423-API-for-updating-recipes-on-clients.patch b/patches/unapplied/api/0423-API-for-updating-recipes-on-clients.patch
index e51f4a6052..1091394bc9 100644
--- a/patches/api/0423-API-for-updating-recipes-on-clients.patch
+++ b/patches/unapplied/api/0423-API-for-updating-recipes-on-clients.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] API for updating recipes on clients
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index d1ddd924db3f781138696f49110953d10bf76d5f..14ec0bf4e811028bf3ca419ac85d1676f801a331 100644
+index 2bafcb26c144a84d1b955c8cdf122cca6628afc4..07e6e66c73827afbbaf3bff35474c98ffb1f4393 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -960,6 +960,26 @@ public final class Bukkit {
@@ -82,7 +82,7 @@ index d1ddd924db3f781138696f49110953d10bf76d5f..14ec0bf4e811028bf3ca419ac85d1676
       * Gets a list of command aliases defined in the server properties.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 3d8a33563cb266fd784e264f6ce3850213a3838a..49b1f9596502c574638b58996fc8ca0bfde6826b 100644
+index cd1df326ef937863e427f47e1c8ac8720c01f75d..7142f0f4105ccbc594e5d120b2270fd5e8bb5470 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -812,6 +812,22 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0424-Add-PlayerFailMoveEvent.patch b/patches/unapplied/api/0424-Add-PlayerFailMoveEvent.patch
index 62ca61644a..62ca61644a 100644
--- a/patches/api/0424-Add-PlayerFailMoveEvent.patch
+++ b/patches/unapplied/api/0424-Add-PlayerFailMoveEvent.patch
diff --git a/patches/api/0425-Fix-custom-statistic-criteria-creation.patch b/patches/unapplied/api/0425-Fix-custom-statistic-criteria-creation.patch
index 42a05e6c6b..42a05e6c6b 100644
--- a/patches/api/0425-Fix-custom-statistic-criteria-creation.patch
+++ b/patches/unapplied/api/0425-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/api/0426-SculkCatalyst-bloom-API.patch b/patches/unapplied/api/0426-SculkCatalyst-bloom-API.patch
index 49d8c8c2bd..49d8c8c2bd 100644
--- a/patches/api/0426-SculkCatalyst-bloom-API.patch
+++ b/patches/unapplied/api/0426-SculkCatalyst-bloom-API.patch
diff --git a/patches/api/0427-API-for-an-entity-s-scoreboard-name.patch b/patches/unapplied/api/0427-API-for-an-entity-s-scoreboard-name.patch
index 3f7d2cff28..3f7d2cff28 100644
--- a/patches/api/0427-API-for-an-entity-s-scoreboard-name.patch
+++ b/patches/unapplied/api/0427-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/api/0428-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/unapplied/api/0428-Deprecate-and-replace-methods-with-old-StructureType.patch
index 683527dfc2..e3794f28ac 100644
--- a/patches/api/0428-Deprecate-and-replace-methods-with-old-StructureType.patch
+++ b/patches/unapplied/api/0428-Deprecate-and-replace-methods-with-old-StructureType.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Deprecate and replace methods with old StructureType
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 14ec0bf4e811028bf3ca419ac85d1676f801a331..884902cb7f86c0b56594ccafc7d05c6c7a23ab53 100644
+index 07e6e66c73827afbbaf3bff35474c98ffb1f4393..4863d9f21f0a0f11974be85360edc587ffd7eab3 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -916,7 +916,9 @@ public final class Bukkit {
@@ -84,7 +84,7 @@ index 14ec0bf4e811028bf3ca419ac85d1676f801a331..884902cb7f86c0b56594ccafc7d05c6c
      /**
       * Reloads the server, refreshing settings and plugin information.
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 49b1f9596502c574638b58996fc8ca0bfde6826b..d0c634629aa0b6bac0da93655dd86ad3aea0ce30 100644
+index 7142f0f4105ccbc594e5d120b2270fd5e8bb5470..f1fa97d12f97baf97beb92ca0719cf3cf906b225 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -776,16 +776,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0429-Add-Listing-API-for-Player.patch b/patches/unapplied/api/0429-Add-Listing-API-for-Player.patch
index d623acbed9..5c75d3f032 100644
--- a/patches/api/0429-Add-Listing-API-for-Player.patch
+++ b/patches/unapplied/api/0429-Add-Listing-API-for-Player.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Listing API for Player
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 7d44e8c3c52dcaa732525aa89cbe3d19e3e31b20..f376a6b77aeff0fbe8b0655bd2f1c43e19bbe3ce 100644
+index 2fddfb32927023c64718664ecca7989c15f15a67..7b74fe780a8f99068c542f2deb261503ffc3b9e5 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1901,6 +1901,32 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0430-Expose-clicked-BlockFace-during-BlockDamageEvent.patch b/patches/unapplied/api/0430-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
index 34d1940866..34d1940866 100644
--- a/patches/api/0430-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
+++ b/patches/unapplied/api/0430-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
diff --git a/patches/api/0431-Fix-NPE-on-Boat-getStatus.patch b/patches/unapplied/api/0431-Fix-NPE-on-Boat-getStatus.patch
index 1cf6096a92..1cf6096a92 100644
--- a/patches/api/0431-Fix-NPE-on-Boat-getStatus.patch
+++ b/patches/unapplied/api/0431-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/api/0432-Expand-Pose-API.patch b/patches/unapplied/api/0432-Expand-Pose-API.patch
index ae91084be1..ae91084be1 100644
--- a/patches/api/0432-Expand-Pose-API.patch
+++ b/patches/unapplied/api/0432-Expand-Pose-API.patch
diff --git a/patches/api/0433-MerchantRecipe-add-copy-constructor.patch b/patches/unapplied/api/0433-MerchantRecipe-add-copy-constructor.patch
index 1c5ba2803c..1c5ba2803c 100644
--- a/patches/api/0433-MerchantRecipe-add-copy-constructor.patch
+++ b/patches/unapplied/api/0433-MerchantRecipe-add-copy-constructor.patch
diff --git a/patches/api/0434-More-DragonBattle-API.patch b/patches/unapplied/api/0434-More-DragonBattle-API.patch
index f4ec0fbbcf..f4ec0fbbcf 100644
--- a/patches/api/0434-More-DragonBattle-API.patch
+++ b/patches/unapplied/api/0434-More-DragonBattle-API.patch
diff --git a/patches/api/0435-Add-PlayerPickItemEvent.patch b/patches/unapplied/api/0435-Add-PlayerPickItemEvent.patch
index c725cc690e..c725cc690e 100644
--- a/patches/api/0435-Add-PlayerPickItemEvent.patch
+++ b/patches/unapplied/api/0435-Add-PlayerPickItemEvent.patch
diff --git a/patches/api/0436-Allow-trident-custom-damage.patch b/patches/unapplied/api/0436-Allow-trident-custom-damage.patch
index 870b735548..870b735548 100644
--- a/patches/api/0436-Allow-trident-custom-damage.patch
+++ b/patches/unapplied/api/0436-Allow-trident-custom-damage.patch
diff --git a/patches/api/0437-Expose-hand-during-BlockCanBuildEvent.patch b/patches/unapplied/api/0437-Expose-hand-during-BlockCanBuildEvent.patch
index 97d99a40d2..97d99a40d2 100644
--- a/patches/api/0437-Expose-hand-during-BlockCanBuildEvent.patch
+++ b/patches/unapplied/api/0437-Expose-hand-during-BlockCanBuildEvent.patch
diff --git a/patches/api/0438-Limit-setBurnTime-to-valid-short-values.patch b/patches/unapplied/api/0438-Limit-setBurnTime-to-valid-short-values.patch
index 2faac56fd8..2faac56fd8 100644
--- a/patches/api/0438-Limit-setBurnTime-to-valid-short-values.patch
+++ b/patches/unapplied/api/0438-Limit-setBurnTime-to-valid-short-values.patch
diff --git a/patches/api/0439-Add-OfflinePlayer-isConnected.patch b/patches/unapplied/api/0439-Add-OfflinePlayer-isConnected.patch
index 1b0749a7f1..1b0749a7f1 100644
--- a/patches/api/0439-Add-OfflinePlayer-isConnected.patch
+++ b/patches/unapplied/api/0439-Add-OfflinePlayer-isConnected.patch
diff --git a/patches/api/0440-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/unapplied/api/0440-Add-titleOverride-to-InventoryOpenEvent.patch
index 68e755f010..68e755f010 100644
--- a/patches/api/0440-Add-titleOverride-to-InventoryOpenEvent.patch
+++ b/patches/unapplied/api/0440-Add-titleOverride-to-InventoryOpenEvent.patch
diff --git a/patches/api/0441-Allow-proper-checking-of-empty-item-stacks.patch b/patches/unapplied/api/0441-Allow-proper-checking-of-empty-item-stacks.patch
index e4c35df87b..e4c35df87b 100644
--- a/patches/api/0441-Allow-proper-checking-of-empty-item-stacks.patch
+++ b/patches/unapplied/api/0441-Allow-proper-checking-of-empty-item-stacks.patch
diff --git a/patches/api/0442-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch b/patches/unapplied/api/0442-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch
index e72f86be5d..e72f86be5d 100644
--- a/patches/api/0442-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch
+++ b/patches/unapplied/api/0442-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch
diff --git a/patches/api/0443-Add-player-idle-duration-API.patch b/patches/unapplied/api/0443-Add-player-idle-duration-API.patch
index 8326dd41b6..8326dd41b6 100644
--- a/patches/api/0443-Add-player-idle-duration-API.patch
+++ b/patches/unapplied/api/0443-Add-player-idle-duration-API.patch
diff --git a/patches/api/0444-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/unapplied/api/0444-Add-API-to-get-the-collision-shape-of-a-block-before.patch
index 8c93339e29..8c93339e29 100644
--- a/patches/api/0444-Add-API-to-get-the-collision-shape-of-a-block-before.patch
+++ b/patches/unapplied/api/0444-Add-API-to-get-the-collision-shape-of-a-block-before.patch
diff --git a/patches/api/0445-Add-predicate-for-blocks-when-raytracing.patch b/patches/unapplied/api/0445-Add-predicate-for-blocks-when-raytracing.patch
index 04fc2e3ab9..04fc2e3ab9 100644
--- a/patches/api/0445-Add-predicate-for-blocks-when-raytracing.patch
+++ b/patches/unapplied/api/0445-Add-predicate-for-blocks-when-raytracing.patch
diff --git a/patches/api/0446-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/unapplied/api/0446-Add-hand-to-fish-event-for-all-player-interactions.patch
index b431332b9a..b431332b9a 100644
--- a/patches/api/0446-Add-hand-to-fish-event-for-all-player-interactions.patch
+++ b/patches/unapplied/api/0446-Add-hand-to-fish-event-for-all-player-interactions.patch
diff --git a/patches/api/0447-Add-UUID-attribute-modifier-API.patch b/patches/unapplied/api/0447-Add-UUID-attribute-modifier-API.patch
index 251ae6e425..251ae6e425 100644
--- a/patches/api/0447-Add-UUID-attribute-modifier-API.patch
+++ b/patches/unapplied/api/0447-Add-UUID-attribute-modifier-API.patch
diff --git a/patches/api/0448-Expand-LingeringPotion-API.patch b/patches/unapplied/api/0448-Expand-LingeringPotion-API.patch
index 40b5a5f547..40b5a5f547 100644
--- a/patches/api/0448-Expand-LingeringPotion-API.patch
+++ b/patches/unapplied/api/0448-Expand-LingeringPotion-API.patch
diff --git a/patches/api/0449-Remove-unnecessary-durability-check-in-ItemStack-isS.patch b/patches/unapplied/api/0449-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
index 215fc0e435..215fc0e435 100644
--- a/patches/api/0449-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
+++ b/patches/unapplied/api/0449-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
diff --git a/patches/api/0450-Add-Structure-check-API.patch b/patches/unapplied/api/0450-Add-Structure-check-API.patch
index d6d4ff6970..d6d4ff6970 100644
--- a/patches/api/0450-Add-Structure-check-API.patch
+++ b/patches/unapplied/api/0450-Add-Structure-check-API.patch
diff --git a/patches/server/0001-Setup-Gradle-project.patch b/patches/unapplied/server/0001-Setup-Gradle-project.patch
index 2636d0cfaf..2636d0cfaf 100644
--- a/patches/server/0001-Setup-Gradle-project.patch
+++ b/patches/unapplied/server/0001-Setup-Gradle-project.patch
diff --git a/patches/server/0002-Remap-fixes.patch b/patches/unapplied/server/0002-Remap-fixes.patch
index dd48abe19a..dd48abe19a 100644
--- a/patches/server/0002-Remap-fixes.patch
+++ b/patches/unapplied/server/0002-Remap-fixes.patch
diff --git a/patches/server/0003-Build-system-changes.patch b/patches/unapplied/server/0003-Build-system-changes.patch
index e8ac50a834..cfad6f89d6 100644
--- a/patches/server/0003-Build-system-changes.patch
+++ b/patches/unapplied/server/0003-Build-system-changes.patch
@@ -137,7 +137,7 @@ index 7db49f077704f03d1815f8382523199bd6c9a0dc..4ed8f38ba9c7b075b99a0da0e213a1e9
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index e325cb56f2bafce21ce06bb5c674837abbb676e7..8a30ebbac91a0750c00ebbcb5372e6d2a45c064a 100644
+index b9bb24bae5943ca922d3bcddfc55ee3612d7d16a..5456b4fa5491bed89183024aea6ef99f4fad4688 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -209,7 +209,7 @@ public class Main {
diff --git a/patches/server/0004-Test-changes.patch b/patches/unapplied/server/0004-Test-changes.patch
index b7eeceef51..b7eeceef51 100644
--- a/patches/server/0004-Test-changes.patch
+++ b/patches/unapplied/server/0004-Test-changes.patch
diff --git a/patches/server/0005-Paper-config-files.patch b/patches/unapplied/server/0005-Paper-config-files.patch
index f5803a04ce..1bbeb548cb 100644
--- a/patches/server/0005-Paper-config-files.patch
+++ b/patches/unapplied/server/0005-Paper-config-files.patch
@@ -1390,7 +1390,7 @@ index 0000000000000000000000000000000000000000..351fbbc577556ebbd62222615801a96b
 +}
 diff --git a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..dbcab5a6095d1f318fd333e24f1aa54da7edcaf5
+index 0000000000000000000000000000000000000000..071d3877e386a0c7c4d2f2e8ddd06e0765c49d0d
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
 @@ -0,0 +1,541 @@
@@ -4957,7 +4957,7 @@ index 4dfb372f8c8f60b6aad18ea9b6334e1a7c9bc4ed..9f877007869ef984d2c95bd8e3d773a2
          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 811e31d2502cb6f7ed6b151d894dfceea63ac388..d1baf686c0a59584a4866490f4f4fe65b3ac6eed 100644
+index 46dd3c8957d5247366c2873c8962b012cd1464dc..79f9e87a2f0b517b762b3843fcd2bc119ed57b8a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -919,6 +919,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0006-MC-Dev-fixes.patch b/patches/unapplied/server/0006-MC-Dev-fixes.patch
index d889d94c33..10e05f1834 100644
--- a/patches/server/0006-MC-Dev-fixes.patch
+++ b/patches/unapplied/server/0006-MC-Dev-fixes.patch
@@ -94,7 +94,7 @@ index 41d6569c00db3d467f6e90d33ebd261529b89f4c..5f051cb22ae77f4d8994b07ac5b963bd
          };
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1561b26e1b4115f4d5631f20b31c2238d1d23202..124fad1031d6125bca233541e2d5f256da70ca44 100644
+index 7fca1f7a7ba2a6f6238eddc134f78f9abdc1531b..fdbc744e7a4843e564ffaeecdc05ef6bbd53b74a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1774,7 +1774,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0007-ConcurrentUtil.patch b/patches/unapplied/server/0007-ConcurrentUtil.patch
index c2bb4af335..c2bb4af335 100644
--- a/patches/server/0007-ConcurrentUtil.patch
+++ b/patches/unapplied/server/0007-ConcurrentUtil.patch
diff --git a/patches/server/0008-CB-fixes.patch b/patches/unapplied/server/0008-CB-fixes.patch
index 91c7ae9ec9..ce444b106c 100644
--- a/patches/server/0008-CB-fixes.patch
+++ b/patches/unapplied/server/0008-CB-fixes.patch
@@ -84,7 +84,7 @@ index 6ab2fd523b7f4e5cacef4ebb95f6812f391985d1..85133c388eff009ea1ffa391824b6556
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d1baf686c0a59584a4866490f4f4fe65b3ac6eed..3d2c168d29873c4418bc297740e7032d6020ff52 100644
+index 79f9e87a2f0b517b762b3843fcd2bc119ed57b8a..b7d5b46fa3af1420a402addb73d6ed95f2456375 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2422,7 +2422,13 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0009-MC-Utils.patch b/patches/unapplied/server/0009-MC-Utils.patch
index f3022f5712..f3022f5712 100644
--- a/patches/server/0009-MC-Utils.patch
+++ b/patches/unapplied/server/0009-MC-Utils.patch
diff --git a/patches/server/0010-Adventure.patch b/patches/unapplied/server/0010-Adventure.patch
index 09e49f8da8..0c8c3d05f5 100644
--- a/patches/server/0010-Adventure.patch
+++ b/patches/unapplied/server/0010-Adventure.patch
@@ -3124,7 +3124,7 @@ index cc9636326687f9d7cd091c97032ce3e43931625d..1678a5eca31033d31ea76bb8918b8d73
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 3523f8851472890c97e628e22df883b91ba603fe..9fb74017c655c5abe4388796c4cb0760498e7a99 100644
+index b1a1caef59f3ea0fa68ca47040ad6fff9820cc5a..d4b36863c55d3ffb2c71118b078c13ae95fc73d3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -20,6 +20,12 @@ public class Main {
diff --git a/patches/server/0011-Paper-command.patch b/patches/unapplied/server/0011-Paper-command.patch
index 62d96ccc95..39e983f051 100644
--- a/patches/server/0011-Paper-command.patch
+++ b/patches/unapplied/server/0011-Paper-command.patch
@@ -617,7 +617,7 @@ index 45657deb1ab3ebdfacf2a9bbb591a9a14236840c..7de6d496b40bbef5b628f1f08163ad24
  
          this.setPvpAllowed(dedicatedserverproperties.pvp);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 61f124c9c607d077cdaa6a1e9b14b323057af52d..b30c5e049d0570c94ca8b8906d9d3afd2c81649e 100644
+index 269174b1baa6edf91406d563c7873165da2c0b81..f48d3cc6afe76f35b087b49ca1b0d9a7fcca08cf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -943,6 +943,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0012-Paper-Metrics.patch b/patches/unapplied/server/0012-Paper-Metrics.patch
index 529e059814..529e059814 100644
--- a/patches/server/0012-Paper-Metrics.patch
+++ b/patches/unapplied/server/0012-Paper-Metrics.patch
diff --git a/patches/server/0013-Paper-Plugins.patch b/patches/unapplied/server/0013-Paper-Plugins.patch
index 7b6ce3a605..8e9ef18d12 100644
--- a/patches/server/0013-Paper-Plugins.patch
+++ b/patches/unapplied/server/0013-Paper-Plugins.patch
@@ -7094,7 +7094,7 @@ index 9cfdd5d8c1650d9c9bdfbc07980239e507ff942d..ae0b713870976d4b1e469a90cef9b2e2
              Bootstrap.validate();
              Util.startTimerHackThread();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b30c5e049d0570c94ca8b8906d9d3afd2c81649e..d7cc71f0f7c7977fcab76f32e60c58ec7b1e68d8 100644
+index f48d3cc6afe76f35b087b49ca1b0d9a7fcca08cf..e43969ac2881f14082ecb2af30c7e9145e1269bc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -275,7 +275,8 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0014-Timings-v2.patch b/patches/unapplied/server/0014-Timings-v2.patch
index d79011e6ff..d79011e6ff 100644
--- a/patches/server/0014-Timings-v2.patch
+++ b/patches/unapplied/server/0014-Timings-v2.patch
diff --git a/patches/server/0015-Rewrite-dataconverter-system.patch b/patches/unapplied/server/0015-Rewrite-dataconverter-system.patch
index 8a76ccb351..b3d649a766 100644
--- a/patches/server/0015-Rewrite-dataconverter-system.patch
+++ b/patches/unapplied/server/0015-Rewrite-dataconverter-system.patch
@@ -24587,7 +24587,7 @@ index a5c67686f7c1be10d31601903e27d24e41cff83e..e2c0ab0ab06b15dcfa6ce8c82ad4136f
  
          return nbttagcompound;
 diff --git a/src/main/java/net/minecraft/world/level/storage/PrimaryLevelData.java b/src/main/java/net/minecraft/world/level/storage/PrimaryLevelData.java
-index 626b861ef2f323a5fc50ab5178d3e108e0f9cc25..14b8011c8874e05647eb1636ee1eed5d90da8200 100644
+index b075f990692e68e82c10625d843109e90b1b6118..8f661e3080f8145c1e78ff7bd84d77707eef6d9e 100644
 --- a/src/main/java/net/minecraft/world/level/storage/PrimaryLevelData.java
 +++ b/src/main/java/net/minecraft/world/level/storage/PrimaryLevelData.java
 @@ -316,7 +316,7 @@ public class PrimaryLevelData implements ServerLevelData, WorldData {
diff --git a/patches/server/0016-Starlight.patch b/patches/unapplied/server/0016-Starlight.patch
index 7387fbaf57..2da6ef5db8 100644
--- a/patches/server/0016-Starlight.patch
+++ b/patches/unapplied/server/0016-Starlight.patch
@@ -4493,7 +4493,7 @@ index facfdbb87e89f4db33ce13233c2ba4366d35c15b..807a6bb1026dac2c4cd0a50afe06fd62
      private final DebugBuffer<ChunkHolder.ChunkSaveDebug> chunkToSaveHistory;
      public int oldTicketLevel;
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 4dc04c16453174dde2c6bfad711ec9dec01c8f30..b47e30e9ebe0d6a930e01aaf67c138fc345fb11e 100644
+index c1bb511cc25ca97282ee02d2b207e2940279c190..1fcfff903a9423512f1fc6c997b67597e4e2831d 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -124,7 +124,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -5135,7 +5135,7 @@ index 6bb508105641b5729572736c5c3f9bd6711e309a..60e760b42dd6471a229dfd45490dcf8c
      @Override
      public BlockEntity getBlockEntity(BlockPos pos) {
 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 1e434faaf56f7d1501367c4371131a8da30c0421..f75d37091018d5544099861e2fe7d3fd04870750 100644
+index 93348550f1632f7fc567eb5b42cd03d78532e383..42f29413d18b0df039736a87e4e5c1d15700f916 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -219,6 +219,12 @@ public class LevelChunk extends ChunkAccess {
diff --git a/patches/server/0017-Add-TickThread.patch b/patches/unapplied/server/0017-Add-TickThread.patch
index 462a214912..462a214912 100644
--- a/patches/server/0017-Add-TickThread.patch
+++ b/patches/unapplied/server/0017-Add-TickThread.patch
diff --git a/patches/server/0018-Rewrite-chunk-system.patch b/patches/unapplied/server/0018-Rewrite-chunk-system.patch
index 6a27f84772..6a27f84772 100644
--- a/patches/server/0018-Rewrite-chunk-system.patch
+++ b/patches/unapplied/server/0018-Rewrite-chunk-system.patch
diff --git a/patches/server/0019-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/unapplied/server/0019-Add-command-line-option-to-load-extra-plugin-jars-no.patch
index fd51e2815b..2852551c4e 100644
--- a/patches/server/0019-Add-command-line-option-to-load-extra-plugin-jars-no.patch
+++ b/patches/unapplied/server/0019-Add-command-line-option-to-load-extra-plugin-jars-no.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Add command line option to load extra plugin jars not in the
 ex: java -jar paperclip.jar nogui -add-plugin=/path/to/plugin.jar -add-plugin=/path/to/another/plugin_jar.jar
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 819e2238f62b0af747b7e44a72de69a1b79609bf..8dfed6347e5922bdd0083604fc7228eaef86be17 100644
+index 2df4e56450535d2d3f6e83c06261fac7ee7a12dd..66e4b4b12a38d537e8093ba1deb9489fdd56919a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -431,6 +431,35 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0020-Configurable-cactus-bamboo-and-reed-growth-heights.patch b/patches/unapplied/server/0020-Configurable-cactus-bamboo-and-reed-growth-heights.patch
index 2f67f3bc30..2f67f3bc30 100644
--- a/patches/server/0020-Configurable-cactus-bamboo-and-reed-growth-heights.patch
+++ b/patches/unapplied/server/0020-Configurable-cactus-bamboo-and-reed-growth-heights.patch
diff --git a/patches/server/0021-Configurable-baby-zombie-movement-speed.patch b/patches/unapplied/server/0021-Configurable-baby-zombie-movement-speed.patch
index f382282a21..6ff0884835 100644
--- a/patches/server/0021-Configurable-baby-zombie-movement-speed.patch
+++ b/patches/unapplied/server/0021-Configurable-baby-zombie-movement-speed.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable baby zombie movement speed
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index 883a5c7d0c842dc3c497ccd0694a77733bafeb16..9d760f3745efc1248b7817d580e5ceb451fc4096 100644
+index 190a02bce0026b2c6df796a5f14e639b5a84ccf1..37824f2470c7ddb77216ffbf4da02cc10a95a171 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 @@ -78,6 +78,7 @@ public class Zombie extends Monster {
diff --git a/patches/server/0022-Configurable-fishing-time-ranges.patch b/patches/unapplied/server/0022-Configurable-fishing-time-ranges.patch
index f47bc6f9c7..f47bc6f9c7 100644
--- a/patches/server/0022-Configurable-fishing-time-ranges.patch
+++ b/patches/unapplied/server/0022-Configurable-fishing-time-ranges.patch
diff --git a/patches/server/0023-Allow-nerfed-mobs-to-jump.patch b/patches/unapplied/server/0023-Allow-nerfed-mobs-to-jump.patch
index c7519d91f9..c7519d91f9 100644
--- a/patches/server/0023-Allow-nerfed-mobs-to-jump.patch
+++ b/patches/unapplied/server/0023-Allow-nerfed-mobs-to-jump.patch
diff --git a/patches/server/0024-Add-configurable-despawn-distances-for-living-entiti.patch b/patches/unapplied/server/0024-Add-configurable-despawn-distances-for-living-entiti.patch
index 7b6e03ca42..d8c587a6f3 100644
--- a/patches/server/0024-Add-configurable-despawn-distances-for-living-entiti.patch
+++ b/patches/unapplied/server/0024-Add-configurable-despawn-distances-for-living-entiti.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add configurable despawn distances for living entities
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index ffd8b35b606452ce5d189f2761aa76eb9b56ccd6..dc9162e8fa4b5649a631d3869be7cd9776f5c7b7 100644
+index 6cc544b39b62cf5be582e697a0df13f82fb73a4b..6e4980b0e6505f8da90d1d63584ef69f899896ea 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -852,14 +852,14 @@ public abstract class Mob extends LivingEntity implements Targeting {
diff --git a/patches/server/0025-Allow-for-toggling-of-spawn-chunks.patch b/patches/unapplied/server/0025-Allow-for-toggling-of-spawn-chunks.patch
index 22a4665115..22a4665115 100644
--- a/patches/server/0025-Allow-for-toggling-of-spawn-chunks.patch
+++ b/patches/unapplied/server/0025-Allow-for-toggling-of-spawn-chunks.patch
diff --git a/patches/server/0026-Drop-falling-block-and-tnt-entities-at-the-specified.patch b/patches/unapplied/server/0026-Drop-falling-block-and-tnt-entities-at-the-specified.patch
index f421a6a46f..2796f982aa 100644
--- a/patches/server/0026-Drop-falling-block-and-tnt-entities-at-the-specified.patch
+++ b/patches/unapplied/server/0026-Drop-falling-block-and-tnt-entities-at-the-specified.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Drop falling block and tnt entities at the specified height
 Co-authored-by: Jake Potrebic <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-index fd16e26875ac4adfb76affd81724dedafe5b4130..57323813e26964af991dc9aead35fc86f23b602a 100644
+index 15d7cb338a0a1c77e999c23042f04ef3f24ede9a..5e30e7a1447503f424ec3a5aa3983826ee960fd8 100644
 --- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 @@ -142,6 +142,16 @@ public class FallingBlockEntity extends Entity {
diff --git a/patches/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/patches/unapplied/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
index 0de457d774..c3acf9363e 100644
--- a/patches/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
+++ b/patches/unapplied/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
@@ -19,7 +19,7 @@ index 27ab6d2749b89cc5d3fd4e22603daee95634be71..6155d6e3c361bb4a0381e7065a7b603b
  
      public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8dfed6347e5922bdd0083604fc7228eaef86be17..94278a932c95070a5e478e8cf148406e67ffb99a 100644
+index 66e4b4b12a38d537e8093ba1deb9489fdd56919a..b94cc5540685989b8b42c5a5d364d33b16fe3782 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -266,7 +266,7 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
diff --git a/patches/server/0028-Implement-Paper-VersionChecker.patch b/patches/unapplied/server/0028-Implement-Paper-VersionChecker.patch
index 192dbbc368..192dbbc368 100644
--- a/patches/server/0028-Implement-Paper-VersionChecker.patch
+++ b/patches/unapplied/server/0028-Implement-Paper-VersionChecker.patch
diff --git a/patches/server/0029-Add-version-history-to-version-command.patch b/patches/unapplied/server/0029-Add-version-history-to-version-command.patch
index 5eb62e175b..5eb62e175b 100644
--- a/patches/server/0029-Add-version-history-to-version-command.patch
+++ b/patches/unapplied/server/0029-Add-version-history-to-version-command.patch
diff --git a/patches/server/0030-Player-affects-spawning-API.patch b/patches/unapplied/server/0030-Player-affects-spawning-API.patch
index c2d6033080..c2d6033080 100644
--- a/patches/server/0030-Player-affects-spawning-API.patch
+++ b/patches/unapplied/server/0030-Player-affects-spawning-API.patch
diff --git a/patches/server/0031-Further-improve-server-tick-loop.patch b/patches/unapplied/server/0031-Further-improve-server-tick-loop.patch
index f5ba24adf2..511a37bc52 100644
--- a/patches/server/0031-Further-improve-server-tick-loop.patch
+++ b/patches/unapplied/server/0031-Further-improve-server-tick-loop.patch
@@ -145,7 +145,7 @@ index 6155d6e3c361bb4a0381e7065a7b603b783a47a6..d13a0f5a3b95b0d0ca80c760f757087c
                  this.startMetricsRecordingTick();
                  this.profiler.push("tick");
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 94278a932c95070a5e478e8cf148406e67ffb99a..afe90d9948a68946cfc09174024ec71a2c126dcd 100644
+index b94cc5540685989b8b42c5a5d364d33b16fe3782..6f66f8514170e5686ed9410d1c755eeef5b61f8a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2540,6 +2540,17 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0032-Only-refresh-abilities-if-needed.patch b/patches/unapplied/server/0032-Only-refresh-abilities-if-needed.patch
index 56107359bd..56107359bd 100644
--- a/patches/server/0032-Only-refresh-abilities-if-needed.patch
+++ b/patches/unapplied/server/0032-Only-refresh-abilities-if-needed.patch
diff --git a/patches/server/0033-Entity-Origin-API.patch b/patches/unapplied/server/0033-Entity-Origin-API.patch
index 918a322e20..9c86f9bd45 100644
--- a/patches/server/0033-Entity-Origin-API.patch
+++ b/patches/unapplied/server/0033-Entity-Origin-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity Origin API
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 0261baddef54c47f7b32f4e2a31ba0172e676d38..c4490354ec7c6d66a0879e7f2c2eb4edd301d045 100644
+index fb183bff8844b6f9db5611b9b55b641f4ec438ff..79f6cdfe3e744b93007699a0da71613844c3a4c7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2354,6 +2354,15 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -25,7 +25,7 @@ index 0261baddef54c47f7b32f4e2a31ba0172e676d38..c4490354ec7c6d66a0879e7f2c2eb4ed
  
          public void onTrackingEnd(Entity entity) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 0e79e92014dd56fc2ba98ce6050463627a0cde9f..f496c3d95d1cc47cada8f86a99b055f44eb6cd5e 100644
+index 9eda990939b36c08a6f4820353942d6c8d43b42c..679f55d1b09868a28c5ba82746968eab1000aa88 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -312,7 +312,27 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -94,7 +94,7 @@ index 0e79e92014dd56fc2ba98ce6050463627a0cde9f..f496c3d95d1cc47cada8f86a99b055f4
              CrashReport crashreport = CrashReport.forThrowable(throwable, "Loading entity NBT");
              CrashReportCategory crashreportsystemdetails = crashreport.addCategory("Entity being loaded");
 diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-index 57323813e26964af991dc9aead35fc86f23b602a..90f52ed06b4493610f65c8a82d6a3a3b32fef1a7 100644
+index 5e30e7a1447503f424ec3a5aa3983826ee960fd8..0e349bc8dd0c31559437dc67481d5f0f81100e3b 100644
 --- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 @@ -343,6 +343,14 @@ public class FallingBlockEntity extends Entity {
@@ -132,7 +132,7 @@ index 415b8822f0dfb14d49bccb2a10ac04025891ddf7..89fd5d6b373d2705dccc2f22663048f4
  
      @Nullable
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 1557a28769cfe875b4c81ed503b2c1815caf8d90..210024c91eccd074a238e7a7834bbfb8c1b61b34 100644
+index 1f63d24ebe0563431c8f1d3f901e2816648c7a8f..402b6e5d6428c5a34d722888670f94c7fbe34fe4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1272,5 +1272,20 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0034-Prevent-tile-entity-and-entity-crashes.patch b/patches/unapplied/server/0034-Prevent-tile-entity-and-entity-crashes.patch
index 43749945e0..d1f128de3f 100644
--- a/patches/server/0034-Prevent-tile-entity-and-entity-crashes.patch
+++ b/patches/unapplied/server/0034-Prevent-tile-entity-and-entity-crashes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent tile entity and entity crashes
 
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index fb78a91d1ab77f909823422c6d4e2ef7ed10c9c3..a022d009b72e366ed69d05087457b712970c0b84 100644
+index 1e57df43ea47f18cc151dc8ad5fd6f18d3615462..bace136d8d62a85c5de5ca9a516d4712ddd3db99 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -728,11 +728,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -44,7 +44,7 @@ index b300d12e9e00519028b53aca9c3fb01f589eaa91..63acd109a79ed752a05df3d4f1b99309
          }
      }
 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 9da26705d41931e77bff0e6a4d73bb9263e6989e..aaf363b7074df5a8113242da1be140417e056e3d 100644
+index c2663fadd2c714b25fe411777ca9be957c3545df..86bcebd778e5d51e1029b96048145622cd2811f3 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -1143,11 +1143,11 @@ public class LevelChunk extends ChunkAccess {
diff --git a/patches/server/0035-Configurable-top-of-nether-void-damage.patch b/patches/unapplied/server/0035-Configurable-top-of-nether-void-damage.patch
index 370b46a4a6..76137828a0 100644
--- a/patches/server/0035-Configurable-top-of-nether-void-damage.patch
+++ b/patches/unapplied/server/0035-Configurable-top-of-nether-void-damage.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable top of nether void damage
 Co-authored-by: Jake Potrebic <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f496c3d95d1cc47cada8f86a99b055f44eb6cd5e..a9584072854fe3f8e946a271504fda70ebab9d2c 100644
+index 679f55d1b09868a28c5ba82746968eab1000aa88..5d5cdcc3d6ba9b76b083404beb532eecf3f83f50 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -715,7 +715,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0036-Check-online-mode-before-converting-and-renaming-pla.patch b/patches/unapplied/server/0036-Check-online-mode-before-converting-and-renaming-pla.patch
index 167b258277..167b258277 100644
--- a/patches/server/0036-Check-online-mode-before-converting-and-renaming-pla.patch
+++ b/patches/unapplied/server/0036-Check-online-mode-before-converting-and-renaming-pla.patch
diff --git a/patches/server/0037-Always-tick-falling-blocks.patch b/patches/unapplied/server/0037-Always-tick-falling-blocks.patch
index 2e80c8ca6a..10ac3a3800 100644
--- a/patches/server/0037-Always-tick-falling-blocks.patch
+++ b/patches/unapplied/server/0037-Always-tick-falling-blocks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Always tick falling blocks
 
 
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 6606a118e7bff01aa51440aea7540ec9feec6cc5..1d9ce6dae17ff572d4528971c69c63d0f85b313c 100644
+index 47e7fd7baf3ec6ed3ec9b5e6d73ed8611c2b1ce1..e4efed4e50188b71ff30238b3517a924b45b24b8 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -89,6 +89,7 @@ public class ActivationRange
diff --git a/patches/server/0038-Configurable-end-credits.patch b/patches/unapplied/server/0038-Configurable-end-credits.patch
index fbac332466..7c4a921f4e 100644
--- a/patches/server/0038-Configurable-end-credits.patch
+++ b/patches/unapplied/server/0038-Configurable-end-credits.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable end credits
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 80105ed5ab45552d86b2302586de7511dbe729d2..10a99aff9632db578d19683675ba12242ae6970b 100644
+index d7c4ce86956c0461603e8d569e9bebe39f07c8a1..61ec0ed91457e4b04a72010199be520c9d4a9488 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1069,6 +1069,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0039-Fix-lag-from-explosions-processing-dead-entities.patch b/patches/unapplied/server/0039-Fix-lag-from-explosions-processing-dead-entities.patch
index 6f5230d060..6f5230d060 100644
--- a/patches/server/0039-Fix-lag-from-explosions-processing-dead-entities.patch
+++ b/patches/unapplied/server/0039-Fix-lag-from-explosions-processing-dead-entities.patch
diff --git a/patches/server/0040-Optimize-explosions.patch b/patches/unapplied/server/0040-Optimize-explosions.patch
index 0bb6b1001b..00cec9c09b 100644
--- a/patches/server/0040-Optimize-explosions.patch
+++ b/patches/unapplied/server/0040-Optimize-explosions.patch
@@ -10,7 +10,7 @@ This patch adds a per-tick cache that is used for storing and retrieving
 an entity's exposure during an explosion.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 086be61bfc8a43076b502bbf00e9f2d2785495d3..0e5661716d72ecf57d76443d8c7627e90966ee4d 100644
+index d13a0f5a3b95b0d0ca80c760f757087c88eceaeb..4627eb980d5ac1571f57756bc90f2ae6d361f522 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1390,6 +1390,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -120,7 +120,7 @@ index 4f2e06dab92085edd8f98415272cf77952e4888f..03151b8042912882ebb969dda16cc378
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index a022d009b72e366ed69d05087457b712970c0b84..da553430864689c426ad2c1dd74ad7d1134ffbae 100644
+index bace136d8d62a85c5de5ca9a516d4712ddd3db99..30a3e2586a1e75c5f146f8d19c53cabe28f61925 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -167,6 +167,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0041-Disable-explosion-knockback.patch b/patches/unapplied/server/0041-Disable-explosion-knockback.patch
index 316d550bba..316d550bba 100644
--- a/patches/server/0041-Disable-explosion-knockback.patch
+++ b/patches/unapplied/server/0041-Disable-explosion-knockback.patch
diff --git a/patches/server/0042-Disable-thunder.patch b/patches/unapplied/server/0042-Disable-thunder.patch
index 2cec26a5e0..670b05eb48 100644
--- a/patches/server/0042-Disable-thunder.patch
+++ b/patches/unapplied/server/0042-Disable-thunder.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Disable thunder
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index c4490354ec7c6d66a0879e7f2c2eb4edd301d045..03e05ddb51f9695079fccca9f7119f7adedd75ba 100644
+index 79f6cdfe3e744b93007699a0da71613844c3a4c7..8cb58a39b6a352b9fb6f8876b31be5579bbfa832 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -825,7 +825,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0043-Disable-ice-and-snow.patch b/patches/unapplied/server/0043-Disable-ice-and-snow.patch
index add551b9f1..a0a4e9dcab 100644
--- a/patches/server/0043-Disable-ice-and-snow.patch
+++ b/patches/unapplied/server/0043-Disable-ice-and-snow.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Disable ice and snow
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 03e05ddb51f9695079fccca9f7119f7adedd75ba..35c401b41750748738c8f8aa2b8988377f4e679f 100644
+index 8cb58a39b6a352b9fb6f8876b31be5579bbfa832..3ec4c76f8c41beb822acbb19b58e19ac2f3f2ef4 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -855,11 +855,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0044-Configurable-mob-spawner-tick-rate.patch b/patches/unapplied/server/0044-Configurable-mob-spawner-tick-rate.patch
index 30b29b9251..30b29b9251 100644
--- a/patches/server/0044-Configurable-mob-spawner-tick-rate.patch
+++ b/patches/unapplied/server/0044-Configurable-mob-spawner-tick-rate.patch
diff --git a/patches/server/0045-Implement-PlayerLocaleChangeEvent.patch b/patches/unapplied/server/0045-Implement-PlayerLocaleChangeEvent.patch
index 4c64796a27..4c64796a27 100644
--- a/patches/server/0045-Implement-PlayerLocaleChangeEvent.patch
+++ b/patches/unapplied/server/0045-Implement-PlayerLocaleChangeEvent.patch
diff --git a/patches/server/0046-Add-BeaconEffectEvent.patch b/patches/unapplied/server/0046-Add-BeaconEffectEvent.patch
index 55ce19b8a7..55ce19b8a7 100644
--- a/patches/server/0046-Add-BeaconEffectEvent.patch
+++ b/patches/unapplied/server/0046-Add-BeaconEffectEvent.patch
diff --git a/patches/server/0047-Configurable-container-update-tick-rate.patch b/patches/unapplied/server/0047-Configurable-container-update-tick-rate.patch
index 267e285260..313da73872 100644
--- a/patches/server/0047-Configurable-container-update-tick-rate.patch
+++ b/patches/unapplied/server/0047-Configurable-container-update-tick-rate.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable container update tick rate
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 77668e9534f6d68755020cbae09aae5d47d10fa1..5d95cc1f0f66cdad867265c38a06938c00b3a2ed 100644
+index b5a8d2505fa41c68abb1400a4269f833537b6ebe..80b74383262ba8cc2f27882cb6a9548d1f505354 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -239,6 +239,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0048-Use-UserCache-for-player-heads.patch b/patches/unapplied/server/0048-Use-UserCache-for-player-heads.patch
index 48ccece56f..48ccece56f 100644
--- a/patches/server/0048-Use-UserCache-for-player-heads.patch
+++ b/patches/unapplied/server/0048-Use-UserCache-for-player-heads.patch
diff --git a/patches/server/0049-Disable-spigot-tick-limiters.patch b/patches/unapplied/server/0049-Disable-spigot-tick-limiters.patch
index 5ed28579f7..5ed28579f7 100644
--- a/patches/server/0049-Disable-spigot-tick-limiters.patch
+++ b/patches/unapplied/server/0049-Disable-spigot-tick-limiters.patch
diff --git a/patches/server/0050-Add-PlayerInitialSpawnEvent.patch b/patches/unapplied/server/0050-Add-PlayerInitialSpawnEvent.patch
index 7c18e2e07b..9319dc0216 100644
--- a/patches/server/0050-Add-PlayerInitialSpawnEvent.patch
+++ b/patches/unapplied/server/0050-Add-PlayerInitialSpawnEvent.patch
@@ -12,7 +12,7 @@ improve setPosition to use raw
 public net.minecraft.world.entity.Entity setRot(FF)V
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 5ae47b3449df7a83a5c22a266f7b9e4ea681a492..fa7aad589275598eaf3cae86a4e1e47d40b52f05 100644
+index afaa046ff1adf717ef8356cc276a55d63abc0aba..703f006bee56bc198f0711ad464570fca406284c 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -228,7 +228,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0051-Configurable-Disabling-Cat-Chest-Detection.patch b/patches/unapplied/server/0051-Configurable-Disabling-Cat-Chest-Detection.patch
index 41b3c127bd..5f0aea57be 100644
--- a/patches/server/0051-Configurable-Disabling-Cat-Chest-Detection.patch
+++ b/patches/unapplied/server/0051-Configurable-Disabling-Cat-Chest-Detection.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Disabling Cat Chest Detection
 Offers a gameplay feature to stop cats from blocking chests
 
 diff --git a/src/main/java/net/minecraft/world/level/block/ChestBlock.java b/src/main/java/net/minecraft/world/level/block/ChestBlock.java
-index d702444f7186fe2339f481cdced3ad3e34f1b3f1..5e22d175b1048a58802cdf64ac70a8b56329e915 100644
+index e89be04aed49723aca35c7b17b2a623eac0587e0..af6e245b02d5fb78764d2db0ac200056277b212a 100644
 --- a/src/main/java/net/minecraft/world/level/block/ChestBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/ChestBlock.java
 @@ -361,6 +361,11 @@ public class ChestBlock extends AbstractChestBlock<ChestBlockEntity> implements
diff --git a/patches/server/0052-Improve-Player-chat-API-handling.patch b/patches/unapplied/server/0052-Improve-Player-chat-API-handling.patch
index f0385e4343..ccf8e7a730 100644
--- a/patches/server/0052-Improve-Player-chat-API-handling.patch
+++ b/patches/unapplied/server/0052-Improve-Player-chat-API-handling.patch
@@ -40,7 +40,7 @@ index 70fe4e973f41c2e5b12c0d96be418dd40e69c0f2..adef64b955170dc00c75c06bf0f41a09
          if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot
          this.LOGGER.info(this.player.getScoreboardName() + " issued server command: " + s);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index afe90d9948a68946cfc09174024ec71a2c126dcd..eb091fcf6f8b295bfac54acfafe662adb9052e88 100644
+index 6f66f8514170e5686ed9410d1c755eeef5b61f8a..56fb2dfc920bde3554706fa218913af448a99fd9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -889,7 +889,7 @@ public final class CraftServer implements Server {
@@ -53,7 +53,7 @@ index afe90d9948a68946cfc09174024ec71a2c126dcd..eb091fcf6f8b295bfac54acfafe662ad
          if (this.commandMap.dispatch(sender, commandLine)) {
              return true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d99ae16d5e823d871d149ab61eeef4c0095b7740..6b753ee96706b38af0c80585222f2631b90e7c62 100644
+index d0448d310fde607a006acf37e86cd3eede93a2ba..4c4219ffe5c172d263106f522ea3ec7ba0d7dfad 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -494,7 +494,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0053-All-chunks-are-slime-spawn-chunks-toggle.patch b/patches/unapplied/server/0053-All-chunks-are-slime-spawn-chunks-toggle.patch
index db7696dd7c..db7696dd7c 100644
--- a/patches/server/0053-All-chunks-are-slime-spawn-chunks-toggle.patch
+++ b/patches/unapplied/server/0053-All-chunks-are-slime-spawn-chunks-toggle.patch
diff --git a/patches/server/0054-Expose-server-CommandMap.patch b/patches/unapplied/server/0054-Expose-server-CommandMap.patch
index a0f06e1192..bec5f46361 100644
--- a/patches/server/0054-Expose-server-CommandMap.patch
+++ b/patches/unapplied/server/0054-Expose-server-CommandMap.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose server CommandMap
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index eb091fcf6f8b295bfac54acfafe662adb9052e88..e9fb295f1ce47705ec7502a372e8fd9e5fe05310 100644
+index 56fb2dfc920bde3554706fa218913af448a99fd9..b1779442254a582f2563e99bb50e47ba9d98b1d8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2080,6 +2080,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0055-Be-a-bit-more-informative-in-maxHealth-exception.patch b/patches/unapplied/server/0055-Be-a-bit-more-informative-in-maxHealth-exception.patch
index e503e432e0..75c7eee8e3 100644
--- a/patches/server/0055-Be-a-bit-more-informative-in-maxHealth-exception.patch
+++ b/patches/unapplied/server/0055-Be-a-bit-more-informative-in-maxHealth-exception.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Be a bit more informative in maxHealth exception
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index c6f15e2626b6c9d451173dac28c7bdb5f14097d8..d75d98eb7f1699d3b180d11573628c3dd6704c76 100644
+index 8d7124a9efce888ccfbef320a90c750f6009f551..aaf8ad36078554aa2783874f395da0997f6af92c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -102,7 +102,12 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0056-Player-Tab-List-and-Title-APIs.patch b/patches/unapplied/server/0056-Player-Tab-List-and-Title-APIs.patch
index 3a362168db..71d8ee453b 100644
--- a/patches/server/0056-Player-Tab-List-and-Title-APIs.patch
+++ b/patches/unapplied/server/0056-Player-Tab-List-and-Title-APIs.patch
@@ -63,7 +63,7 @@ index bd808eb312ade7122973a47f4b96505829511da5..bf0f9cab7c66c089f35b851e799ba4a4
          // Paper end
          buf.writeComponent(this.text);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 422ed20cf1d77c0b7fa0a674a5bba95cb7cbc2df..e5b4aa1edb3f48b7356dbf25d7aba4ab6053ba03 100644
+index 4c4219ffe5c172d263106f522ea3ec7ba0d7dfad..ab8b584eb1c98d10caeb7d9581f826b4ae984c7c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1,5 +1,6 @@
diff --git a/patches/server/0057-Add-configurable-portal-search-radius.patch b/patches/unapplied/server/0057-Add-configurable-portal-search-radius.patch
index d93ecc093d..f81bc78f7b 100644
--- a/patches/server/0057-Add-configurable-portal-search-radius.patch
+++ b/patches/unapplied/server/0057-Add-configurable-portal-search-radius.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add configurable portal search radius
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a9584072854fe3f8e946a271504fda70ebab9d2c..1b301b9b577b632470a1e6d23f34288875c5ffb8 100644
+index 5d5cdcc3d6ba9b76b083404beb532eecf3f83f50..0d24d283ce035ab89136f4fc49a0ae08d90fd268 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3200,7 +3200,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0058-Add-velocity-warnings.patch b/patches/unapplied/server/0058-Add-velocity-warnings.patch
index 296d79b85b..d3a71f3f2e 100644
--- a/patches/server/0058-Add-velocity-warnings.patch
+++ b/patches/unapplied/server/0058-Add-velocity-warnings.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add velocity warnings
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e9fb295f1ce47705ec7502a372e8fd9e5fe05310..13a70d87689d49818b97611b83b77df0e9a6c8f5 100644
+index b1779442254a582f2563e99bb50e47ba9d98b1d8..3771ac5c7663bbd2cc2c4c1acfe8fd8848713ce8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -302,6 +302,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0059-Configurable-inter-world-teleportation-safety.patch b/patches/unapplied/server/0059-Configurable-inter-world-teleportation-safety.patch
index e54a85f1e9..e54a85f1e9 100644
--- a/patches/server/0059-Configurable-inter-world-teleportation-safety.patch
+++ b/patches/unapplied/server/0059-Configurable-inter-world-teleportation-safety.patch
diff --git a/patches/server/0060-Add-exception-reporting-event.patch b/patches/unapplied/server/0060-Add-exception-reporting-event.patch
index 9010147d71..d44ecfec50 100644
--- a/patches/server/0060-Add-exception-reporting-event.patch
+++ b/patches/unapplied/server/0060-Add-exception-reporting-event.patch
@@ -88,7 +88,7 @@ index c6fb4c33d7ea52b88d8fc0d90748cbab7387c565..fed09b886f4fa0006d160e5f2abb00df
              }
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 78041052d7ab2e6b60405ce7e02468458650db22..8149286827d9b609be47a4ded0413ca11f7858de 100644
+index c2dd635cba209962d24b43fbf0ee0e9d9e82fee0..f7c69de5227a9b3fc409374d715aaecdf6330e70 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -1,5 +1,10 @@
@@ -131,7 +131,7 @@ index 5d65baba605dd83e5f74d526aeda36d8ede8c014..92e76dd39dc3575e9466031dd799080a
                                  }
  
 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 aaf363b7074df5a8113242da1be140417e056e3d..080615881c93e73f207be1aa1105b0b1067fa308 100644
+index 86bcebd778e5d51e1029b96048145622cd2811f3..c050a5d39087722dad6bb31f95b7b04fe7e8b767 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -1,6 +1,7 @@
@@ -192,7 +192,7 @@ index 5103081e8469dd5a393595eae00c6f6c9d0a5028..ab9681ba3a86212e0e23a9af8788eec1
                  try {
                      filechannel.close();
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index fcbf32a233c240dd45f75ee736bd102ce9f79332..833240d2a4936343710a60876a66d01112e15a2c 100644
+index bd1057681d0c7470c497b873ff18abf03a0a6a66..f39c836970572fe2e29e794a6af35332af8f7424 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -434,6 +434,8 @@ public class CraftScheduler implements BukkitScheduler {
diff --git a/patches/server/0061-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch b/patches/unapplied/server/0061-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
index 2150c56cd7..2150c56cd7 100644
--- a/patches/server/0061-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
+++ b/patches/unapplied/server/0061-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
diff --git a/patches/server/0062-Disable-Scoreboards-for-non-players-by-default.patch b/patches/unapplied/server/0062-Disable-Scoreboards-for-non-players-by-default.patch
index 0f00f22dcd..8793195dfd 100644
--- a/patches/server/0062-Disable-Scoreboards-for-non-players-by-default.patch
+++ b/patches/unapplied/server/0062-Disable-Scoreboards-for-non-players-by-default.patch
@@ -11,7 +11,7 @@ So avoid looking up scoreboards and short circuit to the "not on a team"
 logic which is most likely to be true.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 1b301b9b577b632470a1e6d23f34288875c5ffb8..a8608e7b3dae15a54185d720c01a49d3a7e59994 100644
+index 0d24d283ce035ab89136f4fc49a0ae08d90fd268..25dbd41c5eb35b4d6cb1af159f665a1709e107d1 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2831,6 +2831,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -23,7 +23,7 @@ index 1b301b9b577b632470a1e6d23f34288875c5ffb8..a8608e7b3dae15a54185d720c01a49d3
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 7fd5e2cb9139f53c0c08cf14760db311347f843d..f22055ef2b5ff7a98c9388b0324b8e3e4b5e1172 100644
+index f6cfed5ac40726475d1c121d0095c105f9426ae7..0bf4e33a67adf515b2675037b763632f1629ba34 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -833,6 +833,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0063-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/patches/unapplied/server/0063-Add-methods-for-working-with-arrows-stuck-in-living-.patch
index 456609a588..eaa5849dc3 100644
--- a/patches/server/0063-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/patches/unapplied/server/0063-Add-methods-for-working-with-arrows-stuck-in-living-.patch
@@ -7,7 +7,7 @@ Upstream added methods for this, original methods are now
 deprecated
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index d75d98eb7f1699d3b180d11573628c3dd6704c76..166dfd2cde916709ef952216643bb7b92e9e1600 100644
+index aaf8ad36078554aa2783874f395da0997f6af92c..2be4b3f8129e38f72c6c0013cc0de7060a78ae76 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -267,9 +267,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0064-Chunk-Save-Reattempt.patch b/patches/unapplied/server/0064-Chunk-Save-Reattempt.patch
index 2717b86ad1..2717b86ad1 100644
--- a/patches/server/0064-Chunk-Save-Reattempt.patch
+++ b/patches/unapplied/server/0064-Chunk-Save-Reattempt.patch
diff --git a/patches/server/0065-Complete-resource-pack-API.patch b/patches/unapplied/server/0065-Complete-resource-pack-API.patch
index 64bd615c79..64bd615c79 100644
--- a/patches/server/0065-Complete-resource-pack-API.patch
+++ b/patches/unapplied/server/0065-Complete-resource-pack-API.patch
diff --git a/patches/server/0066-Default-loading-permissions.yml-before-plugins.patch b/patches/unapplied/server/0066-Default-loading-permissions.yml-before-plugins.patch
index 092f2226b3..6fc29b2301 100644
--- a/patches/server/0066-Default-loading-permissions.yml-before-plugins.patch
+++ b/patches/unapplied/server/0066-Default-loading-permissions.yml-before-plugins.patch
@@ -16,7 +16,7 @@ modify that. Under the previous logic, plugins were unable (cleanly) override pe
 A config option has been added for those who depend on the previous behavior, but I don't expect that.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 13a70d87689d49818b97611b83b77df0e9a6c8f5..0187cf0317ca427dd753e4a354361bec47ae55b8 100644
+index 3771ac5c7663bbd2cc2c4c1acfe8fd8848713ce8..231f59b2b2e90915787dfa80519ec55eed789d2d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -465,6 +465,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0067-Allow-Reloading-of-Custom-Permissions.patch b/patches/unapplied/server/0067-Allow-Reloading-of-Custom-Permissions.patch
index 2cc0ab5263..4fe19af119 100644
--- a/patches/server/0067-Allow-Reloading-of-Custom-Permissions.patch
+++ b/patches/unapplied/server/0067-Allow-Reloading-of-Custom-Permissions.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Custom Permissions
 https://github.com/PaperMC/Paper/issues/49
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0187cf0317ca427dd753e4a354361bec47ae55b8..9418fce310fe30ebb7c0f2368dda8c6000d9541c 100644
+index 231f59b2b2e90915787dfa80519ec55eed789d2d..111d86f1828b55844302b80b2855fb2ea88d67b6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2684,5 +2684,23 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0068-Remove-Metadata-on-reload.patch b/patches/unapplied/server/0068-Remove-Metadata-on-reload.patch
index fcddb8c6d3..84422bbfd7 100644
--- a/patches/server/0068-Remove-Metadata-on-reload.patch
+++ b/patches/unapplied/server/0068-Remove-Metadata-on-reload.patch
@@ -7,7 +7,7 @@ Metadata is not meant to persist reload as things break badly with non primitive
 This will remove metadata on reload so it does not crash everything if a plugin uses it.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9418fce310fe30ebb7c0f2368dda8c6000d9541c..3836e0ad2f09ab015a165794400edd64a017f439 100644
+index 111d86f1828b55844302b80b2855fb2ea88d67b6..f6e6b929c3ce5091a44bba4ab354b8dae73e7cc8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -956,8 +956,16 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0069-Handle-Item-Meta-Inconsistencies.patch b/patches/unapplied/server/0069-Handle-Item-Meta-Inconsistencies.patch
index c0b9b7f046..c0b9b7f046 100644
--- a/patches/server/0069-Handle-Item-Meta-Inconsistencies.patch
+++ b/patches/unapplied/server/0069-Handle-Item-Meta-Inconsistencies.patch
diff --git a/patches/server/0070-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/patches/unapplied/server/0070-Configurable-Non-Player-Arrow-Despawn-Rate.patch
index f6ec2d1cdb..a7f6855957 100644
--- a/patches/server/0070-Configurable-Non-Player-Arrow-Despawn-Rate.patch
+++ b/patches/unapplied/server/0070-Configurable-Non-Player-Arrow-Despawn-Rate.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Non Player Arrow Despawn Rate
 Can set a much shorter despawn rate for arrows that players can not pick up.
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-index 5268821d343aa6834b81e6598158c50b600e66ce..61a23f67c71116881bab9febf8db219a6c0b98a1 100644
+index e147c56ad30a8e634052385ee9fee97c1ac48dcd..8d9e78efcd07e0fea627c2a5a128c7f15cf3413c 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 @@ -312,7 +312,7 @@ public abstract class AbstractArrow extends Projectile {
diff --git a/patches/server/0071-Add-World-Util-Methods.patch b/patches/unapplied/server/0071-Add-World-Util-Methods.patch
index 624da03d47..17b4a8bfad 100644
--- a/patches/server/0071-Add-World-Util-Methods.patch
+++ b/patches/unapplied/server/0071-Add-World-Util-Methods.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add World Util Methods
 Methods that can be used for other patches to help improve logic.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 35c401b41750748738c8f8aa2b8988377f4e679f..b9d93d802e981139b79ecba91968f56f842acc48 100644
+index 3ec4c76f8c41beb822acbb19b58e19ac2f3f2ef4..e24b6ee29c26b3cff85de592f60e7cac5c3a8f92 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -221,7 +221,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -19,7 +19,7 @@ index 35c401b41750748738c8f8aa2b8988377f4e679f..b9d93d802e981139b79ecba91968f56f
      }
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 8149286827d9b609be47a4ded0413ca11f7858de..809f7db469583ea90fbb165cf180dc87055c6105 100644
+index f7c69de5227a9b3fc409374d715aaecdf6330e70..633dec47d91046f22f143421c9c9e20652a5b200 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -342,6 +342,22 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0072-Custom-replacement-for-eaten-items.patch b/patches/unapplied/server/0072-Custom-replacement-for-eaten-items.patch
index a3ac15371c..66d7937a3f 100644
--- a/patches/server/0072-Custom-replacement-for-eaten-items.patch
+++ b/patches/unapplied/server/0072-Custom-replacement-for-eaten-items.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Custom replacement for eaten items
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 0c049587bd99b66b5307cd37da72b1b01f201a86..b819c60cb7640c10594953597e3dde3007ff3be5 100644
+index 0bf4e33a67adf515b2675037b763632f1629ba34..85d36961dc90bb48e8462138e3ed503515fb313b 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3696,10 +3696,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0073-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/unapplied/server/0073-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
index fab09e7e0f..056710b400 100644
--- a/patches/server/0073-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
+++ b/patches/unapplied/server/0073-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
@@ -26,7 +26,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index b819c60cb7640c10594953597e3dde3007ff3be5..3fe9b954bf2394986cf8b76f37e6e0780b3d5978 100644
+index 85d36961dc90bb48e8462138e3ed503515fb313b..9b9e02f27f4281d3d39130521b1cc4e6979f8ea5 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3464,7 +3464,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -63,7 +63,7 @@ index d6d8bbc98fc71997cb52521d59ebb59d727d3c22..3b31a1927aaed7fffc1b4f4bcefc1212
      default BlockHitResult clip(ClipContext raytrace1, BlockPos blockposition) {
              BlockState iblockdata = this.getBlockState(blockposition);
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 809f7db469583ea90fbb165cf180dc87055c6105..37d5abf5a18b90695d1cea9e365c764e93b918bf 100644
+index 633dec47d91046f22f143421c9c9e20652a5b200..374e37bc235aa17c7bf8fa4197f7ec244fda8664 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -283,6 +283,90 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0074-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/patches/unapplied/server/0074-handle-NaN-health-absorb-values-and-repair-bad-data.patch
index ba842e7a5b..ba842e7a5b 100644
--- a/patches/server/0074-handle-NaN-health-absorb-values-and-repair-bad-data.patch
+++ b/patches/unapplied/server/0074-handle-NaN-health-absorb-values-and-repair-bad-data.patch
diff --git a/patches/server/0075-Use-a-Shared-Random-for-Entities.patch b/patches/unapplied/server/0075-Use-a-Shared-Random-for-Entities.patch
index 2658f7646d..aaf1727b57 100644
--- a/patches/server/0075-Use-a-Shared-Random-for-Entities.patch
+++ b/patches/unapplied/server/0075-Use-a-Shared-Random-for-Entities.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Use a Shared Random for Entities
 Reduces memory usage and provides ensures more randomness, Especially since a lot of garbage entity objects get created.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a8608e7b3dae15a54185d720c01a49d3a7e59994..fc39c3742e852bc9f4131b1ade62c32b318bdb02 100644
+index 25dbd41c5eb35b4d6cb1af159f665a1709e107d1..6b577914e6b7603f3cef4c4698d5f81b7ebff19c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -162,6 +162,79 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0076-Configurable-spawn-chances-for-skeleton-horses.patch b/patches/unapplied/server/0076-Configurable-spawn-chances-for-skeleton-horses.patch
index af6fe09b5c..a11f40fbd1 100644
--- a/patches/server/0076-Configurable-spawn-chances-for-skeleton-horses.patch
+++ b/patches/unapplied/server/0076-Configurable-spawn-chances-for-skeleton-horses.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable spawn chances for skeleton horses
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index b9d93d802e981139b79ecba91968f56f842acc48..d419ff842d1df822e14994e4f1d5b91352579cf1 100644
+index e24b6ee29c26b3cff85de592f60e7cac5c3a8f92..98468620840258701969abaf6d0df040d74f2298 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -830,7 +830,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0077-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/unapplied/server/0077-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
index 90d7e73478..b5d65629ac 100644
--- a/patches/server/0077-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
+++ b/patches/unapplied/server/0077-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
@@ -29,7 +29,7 @@ index 1b29c6872ebe54351f28c1f1f38b22561ba785ee..40950db0c242c65dfd4de247c8624935
          this.x = x;
          this.y = y;
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 37d5abf5a18b90695d1cea9e365c764e93b918bf..5502d037279ba876f5e4c6728cc678f128bce9d4 100644
+index 374e37bc235aa17c7bf8fa4197f7ec244fda8664..a9d04b3fd53532b4b380123fceab1ab5e4b206c2 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -368,7 +368,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -88,7 +88,7 @@ index 60e760b42dd6471a229dfd45490dcf8c51979d35..4a3ac7dedf5cb1e76f16ec4f18e82afc
      @Override
      public FluidState getFluidState(BlockPos pos) {
 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 080615881c93e73f207be1aa1105b0b1067fa308..b16e32720196b40a617122dbefe34e59b1a2ac8e 100644
+index c050a5d39087722dad6bb31f95b7b04fe7e8b767..47815824811a0ca82d70e585cc4d66a521129380 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -292,12 +292,29 @@ public class LevelChunk extends ChunkAccess {
diff --git a/patches/server/0078-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch b/patches/unapplied/server/0078-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
index 9b81d2ddcd..beb60551c8 100644
--- a/patches/server/0078-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
+++ b/patches/unapplied/server/0078-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Only process BlockPhysicsEvent if a plugin has a listener
 Saves on some object allocation and processing when no plugin listens to this
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0e5661716d72ecf57d76443d8c7627e90966ee4d..281884fedf6607581a24fef4b3326dfb81012124 100644
+index 4627eb980d5ac1571f57756bc90f2ae6d361f522..26015e5bf2c0f5c176c5e9d7c9eb98419617c509 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1351,6 +1351,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -18,7 +18,7 @@ index 0e5661716d72ecf57d76443d8c7627e90966ee4d..281884fedf6607581a24fef4b3326dfb
              this.profiler.push(() -> {
                  return worldserver + " " + worldserver.dimension().location();
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index d419ff842d1df822e14994e4f1d5b91352579cf1..9ee06d9b6eceb5df90275177ea855272fc61b016 100644
+index 98468620840258701969abaf6d0df040d74f2298..ab55fd417a8914eac912ef4c40527df80f72e2e4 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -220,6 +220,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -30,7 +30,7 @@ index d419ff842d1df822e14994e4f1d5b91352579cf1..9ee06d9b6eceb5df90275177ea855272
      @Override public LevelChunk getChunkIfLoaded(int x, int z) { // Paper - this was added in world too but keeping here for NMS ABI
          return this.chunkSource.getChunk(x, z, false);
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 5502d037279ba876f5e4c6728cc678f128bce9d4..ba7760b0b478c6f24dcbaa64919a4766e107a720 100644
+index a9d04b3fd53532b4b380123fceab1ab5e4b206c2..d9a03a3d262fee9f93b1ccf3a08ec0b77efa1c33 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -580,7 +580,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0079-Entity-AddTo-RemoveFrom-World-Events.patch b/patches/unapplied/server/0079-Entity-AddTo-RemoveFrom-World-Events.patch
index cc876dd9b6..f79bfa48e1 100644
--- a/patches/server/0079-Entity-AddTo-RemoveFrom-World-Events.patch
+++ b/patches/unapplied/server/0079-Entity-AddTo-RemoveFrom-World-Events.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity AddTo/RemoveFrom World Events
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 9ee06d9b6eceb5df90275177ea855272fc61b016..949404f3ac0e853cfc45e28453136dd166ac9563 100644
+index ab55fd417a8914eac912ef4c40527df80f72e2e4..3078aa3b6b4ba5afbe5f216a90f58834e6f72957 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2366,6 +2366,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0080-Configurable-Chunk-Inhabited-Time.patch b/patches/unapplied/server/0080-Configurable-Chunk-Inhabited-Time.patch
index 442ac0446a..99386554ec 100644
--- a/patches/server/0080-Configurable-Chunk-Inhabited-Time.patch
+++ b/patches/unapplied/server/0080-Configurable-Chunk-Inhabited-Time.patch
@@ -11,7 +11,7 @@ For people who want all chunks to be treated equally, you can chose a fixed valu
 This allows to fine-tune vanilla gameplay.
 
 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 b16e32720196b40a617122dbefe34e59b1a2ac8e..43cb8c3240fa058557f67d632a713747c1a19a39 100644
+index 47815824811a0ca82d70e585cc4d66a521129380..d9d2bf31a0e7ad374aa62197c71626a1abfbaf71 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -277,6 +277,13 @@ public class LevelChunk extends ChunkAccess {
diff --git a/patches/server/0081-EntityPathfindEvent.patch b/patches/unapplied/server/0081-EntityPathfindEvent.patch
index 0bab129aaf..0bab129aaf 100644
--- a/patches/server/0081-EntityPathfindEvent.patch
+++ b/patches/unapplied/server/0081-EntityPathfindEvent.patch
diff --git a/patches/server/0082-Sanitise-RegionFileCache-and-make-configurable.patch b/patches/unapplied/server/0082-Sanitise-RegionFileCache-and-make-configurable.patch
index 87c1dfbbb9..87c1dfbbb9 100644
--- a/patches/server/0082-Sanitise-RegionFileCache-and-make-configurable.patch
+++ b/patches/unapplied/server/0082-Sanitise-RegionFileCache-and-make-configurable.patch
diff --git a/patches/server/0083-Do-not-load-chunks-for-Pathfinding.patch b/patches/unapplied/server/0083-Do-not-load-chunks-for-Pathfinding.patch
index 5adba4580e..5adba4580e 100644
--- a/patches/server/0083-Do-not-load-chunks-for-Pathfinding.patch
+++ b/patches/unapplied/server/0083-Do-not-load-chunks-for-Pathfinding.patch
diff --git a/patches/server/0084-Add-PlayerUseUnknownEntityEvent.patch b/patches/unapplied/server/0084-Add-PlayerUseUnknownEntityEvent.patch
index 6c68a42dc2..6c68a42dc2 100644
--- a/patches/server/0084-Add-PlayerUseUnknownEntityEvent.patch
+++ b/patches/unapplied/server/0084-Add-PlayerUseUnknownEntityEvent.patch
diff --git a/patches/server/0085-Configurable-random-tick-rates-for-blocks.patch b/patches/unapplied/server/0085-Configurable-random-tick-rates-for-blocks.patch
index d492f4f705..d492f4f705 100644
--- a/patches/server/0085-Configurable-random-tick-rates-for-blocks.patch
+++ b/patches/unapplied/server/0085-Configurable-random-tick-rates-for-blocks.patch
diff --git a/patches/server/0086-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/patches/unapplied/server/0086-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
index 46e1468576..104a73791e 100644
--- a/patches/server/0086-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
+++ b/patches/unapplied/server/0086-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix Cancelling BlockPlaceEvent triggering physics
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 949404f3ac0e853cfc45e28453136dd166ac9563..f13e39082638310532a0fd1dab41e809c45287c0 100644
+index 3078aa3b6b4ba5afbe5f216a90f58834e6f72957..b9fcfaf683d9c0e90a287506afd759d8877f4b24 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1600,6 +1600,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0087-Optimize-DataBits.patch b/patches/unapplied/server/0087-Optimize-DataBits.patch
index b621ae42cc..b621ae42cc 100644
--- a/patches/server/0087-Optimize-DataBits.patch
+++ b/patches/unapplied/server/0087-Optimize-DataBits.patch
diff --git a/patches/server/0088-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/patches/unapplied/server/0088-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
index b6c2dcf1d9..b6c2dcf1d9 100644
--- a/patches/server/0088-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+++ b/patches/unapplied/server/0088-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
diff --git a/patches/server/0089-Configurable-Player-Collision.patch b/patches/unapplied/server/0089-Configurable-Player-Collision.patch
index 8de27b08b0..7cbe1e28aa 100644
--- a/patches/server/0089-Configurable-Player-Collision.patch
+++ b/patches/unapplied/server/0089-Configurable-Player-Collision.patch
@@ -18,7 +18,7 @@ index 1294b38262505b0d54089e428df9b363219de1f0..ee37ec0de1ca969144824427ae42b0c8
              buf.writeComponent(this.playerPrefix);
              buf.writeComponent(this.playerSuffix);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 281884fedf6607581a24fef4b3326dfb81012124..1356d61428a50b4fc09c6c4d4c02e02056b6b38b 100644
+index 26015e5bf2c0f5c176c5e9d7c9eb98419617c509..a6758b10f106eba19e508be8fbdb4f7903c1f185 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -575,6 +575,20 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -43,7 +43,7 @@ index 281884fedf6607581a24fef4b3326dfb81012124..1356d61428a50b4fc09c6c4d4c02e020
          this.server.getPluginManager().callEvent(new ServerLoadEvent(ServerLoadEvent.LoadType.STARTUP));
          this.connection.acceptConnections();
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index fa7aad589275598eaf3cae86a4e1e47d40b52f05..441c187b45bfa20d929fe3c5e8dc25db22c4aad1 100644
+index 703f006bee56bc198f0711ad464570fca406284c..2ceb330e087fd397887d2f4383fcc7590119ca6c 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -100,6 +100,7 @@ import net.minecraft.world.phys.Vec3;
diff --git a/patches/server/0090-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/patches/unapplied/server/0090-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
index 34e135f907..34e135f907 100644
--- a/patches/server/0090-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
+++ b/patches/unapplied/server/0090-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
diff --git a/patches/server/0091-Configurable-RCON-IP-address.patch b/patches/unapplied/server/0091-Configurable-RCON-IP-address.patch
index 4036fa039e..4036fa039e 100644
--- a/patches/server/0091-Configurable-RCON-IP-address.patch
+++ b/patches/unapplied/server/0091-Configurable-RCON-IP-address.patch
diff --git a/patches/server/0092-EntityRegainHealthEvent-isFastRegen-API.patch b/patches/unapplied/server/0092-EntityRegainHealthEvent-isFastRegen-API.patch
index c147b7613e..67a7dd2586 100644
--- a/patches/server/0092-EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/patches/unapplied/server/0092-EntityRegainHealthEvent-isFastRegen-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
 Don't even get me started
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 82eee07363edd313c6f1f6243867d91185076382..a820cdc5cf39bd5021e118bf9efdc8a8c92c722b 100644
+index 2cf9d80494c6b70992d8ec74fe1697c6522bd952..b60e970c604ae778cc0b5eb54cdfebceef91b2df 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1323,10 +1323,16 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -28,7 +28,7 @@ index 82eee07363edd313c6f1f6243867d91185076382..a820cdc5cf39bd5021e118bf9efdc8a8
              if (this.valid) {
                  this.level().getCraftServer().getPluginManager().callEvent(event);
 diff --git a/src/main/java/net/minecraft/world/food/FoodData.java b/src/main/java/net/minecraft/world/food/FoodData.java
-index 5ff0eba33f848de5172944274e14062090ab7407..2038df72f8d7d33d4105de8129628daf21de6f0f 100644
+index 14b2c31909adc0e8e828d9a563ce7d33d73b2a5a..c3448707fd8a632b457cc97b35d08a9c6933d5ee 100644
 --- a/src/main/java/net/minecraft/world/food/FoodData.java
 +++ b/src/main/java/net/minecraft/world/food/FoodData.java
 @@ -83,7 +83,7 @@ public class FoodData {
diff --git a/patches/server/0093-Add-ability-to-configure-frosted_ice-properties.patch b/patches/unapplied/server/0093-Add-ability-to-configure-frosted_ice-properties.patch
index 8e938c31ad..8e938c31ad 100644
--- a/patches/server/0093-Add-ability-to-configure-frosted_ice-properties.patch
+++ b/patches/unapplied/server/0093-Add-ability-to-configure-frosted_ice-properties.patch
diff --git a/patches/server/0094-remove-null-possibility-for-getServer-singleton.patch b/patches/unapplied/server/0094-remove-null-possibility-for-getServer-singleton.patch
index cb1512a183..edeb8cca8b 100644
--- a/patches/server/0094-remove-null-possibility-for-getServer-singleton.patch
+++ b/patches/unapplied/server/0094-remove-null-possibility-for-getServer-singleton.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] remove null possibility for getServer singleton
 to stop IDE complaining about potential NPE
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1356d61428a50b4fc09c6c4d4c02e02056b6b38b..1766cd6d83aee31800364402dbe4a439c56e63d0 100644
+index a6758b10f106eba19e508be8fbdb4f7903c1f185..937de8ff1f8c25861ae09af197d75577088b70fe 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -189,6 +189,7 @@ import co.aikar.timings.MinecraftTimings; // Paper
diff --git a/patches/server/0095-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/unapplied/server/0095-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index 19f0aa51b6..1d733881f9 100644
--- a/patches/server/0095-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/patches/unapplied/server/0095-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
@@ -13,7 +13,7 @@ custom renderers are in use, defaulting to the much simpler Vanilla system.
 Additionally, numerous issues to player position tracking on maps has been fixed.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index f13e39082638310532a0fd1dab41e809c45287c0..10c492e57958335a0f054f17c985209238df8b63 100644
+index b9fcfaf683d9c0e90a287506afd759d8877f4b24..b82f5d7eeb934d92f858a04f018c3bb05483fff6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2387,6 +2387,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -25,7 +25,7 @@ index f13e39082638310532a0fd1dab41e809c45287c0..10c492e57958335a0f054f17c9852092
                                  }
                              }
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 06522d8d3b7e0d455a42b10ec5004cc82e0d888d..62a52216e27c0e4847b9c346c35c3d1b7b3b15aa 100644
+index 45a5baf2f6e868fd5b41be1204bee46fb2e631b5..ca56004082460bc422d5898407eef9dae49071ab 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -769,6 +769,14 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0096-LootTable-API-Replenishable-Lootables-Feature.patch b/patches/unapplied/server/0096-LootTable-API-Replenishable-Lootables-Feature.patch
index 4577d6be87..157c320c38 100644
--- a/patches/server/0096-LootTable-API-Replenishable-Lootables-Feature.patch
+++ b/patches/unapplied/server/0096-LootTable-API-Replenishable-Lootables-Feature.patch
@@ -504,7 +504,7 @@ index 0000000000000000000000000000000000000000..9cfa5d36a6991067a3866e0d437749fa
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 3e8f8ead702daa15451fb7259a960a9f3033828f..6240ad60358bf8ba9891ca1d40af2d2a7d10130d 100644
+index 6b577914e6b7603f3cef4c4698d5f81b7ebff19c..c85833a54c79b9a6eb18bc22dae67a92dbbad724 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -235,6 +235,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0097-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/patches/unapplied/server/0097-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
index d0c0104fe6..d0c0104fe6 100644
--- a/patches/server/0097-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
+++ b/patches/unapplied/server/0097-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
diff --git a/patches/server/0098-System-property-for-disabling-watchdoge.patch b/patches/unapplied/server/0098-System-property-for-disabling-watchdoge.patch
index 65be04b57b..ce15780e36 100644
--- a/patches/server/0098-System-property-for-disabling-watchdoge.patch
+++ b/patches/unapplied/server/0098-System-property-for-disabling-watchdoge.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] System property for disabling watchdoge
 
 
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index 3ad14bf0697e682a2e777baa8faeb323d127fb13..a9897c494b3dc56d900356d74030359832febbaa 100644
+index b5a2cbc21165e80820d6f7e2690e6e18de54c420..e2bafc68e88c733873638ce7695b684d119f55da 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -61,7 +61,7 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
diff --git a/patches/server/0099-Async-GameProfileCache-saving.patch b/patches/unapplied/server/0099-Async-GameProfileCache-saving.patch
index 6b0d1609c1..31a4d3647d 100644
--- a/patches/server/0099-Async-GameProfileCache-saving.patch
+++ b/patches/unapplied/server/0099-Async-GameProfileCache-saving.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Async GameProfileCache saving
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1766cd6d83aee31800364402dbe4a439c56e63d0..b46cffe141921e499a47dac08318f167f21a5509 100644
+index 937de8ff1f8c25861ae09af197d75577088b70fe..2bb21a86f49ec996b7beeb65dd0ec8e2e5634053 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -914,7 +914,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -18,7 +18,7 @@ index 1766cd6d83aee31800364402dbe4a439c56e63d0..b46cffe141921e499a47dac08318f167
          // Spigot end
          io.papermc.paper.chunk.system.io.RegionFileIOThread.close(true); // Paper // Paper - rewrite chunk system
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index b77cbdd926cd54a4bae89e0d5a21e7d139bc0c63..f17e1621b498e70c8787dfe96dd819dc6e4b621f 100644
+index dbe57c172ed57694912ef940024f8f33577e92bd..1989bbc4bcceb86ab49786b0c93ff48f3836e904 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -242,7 +242,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0100-Optional-TNT-doesn-t-move-in-water.patch b/patches/unapplied/server/0100-Optional-TNT-doesn-t-move-in-water.patch
index 195c15af95..195c15af95 100644
--- a/patches/server/0100-Optional-TNT-doesn-t-move-in-water.patch
+++ b/patches/unapplied/server/0100-Optional-TNT-doesn-t-move-in-water.patch
diff --git a/patches/server/0101-Faster-redstone-torch-rapid-clock-removal.patch b/patches/unapplied/server/0101-Faster-redstone-torch-rapid-clock-removal.patch
index 6402112739..7fc6ae0995 100644
--- a/patches/server/0101-Faster-redstone-torch-rapid-clock-removal.patch
+++ b/patches/unapplied/server/0101-Faster-redstone-torch-rapid-clock-removal.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Faster redstone torch rapid clock removal
 Only resize the the redstone torch list once, since resizing arrays / lists is costly
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index ba7760b0b478c6f24dcbaa64919a4766e107a720..0c6384c6332babf8e517503c2e9b21a9d6e2ed88 100644
+index d9a03a3d262fee9f93b1ccf3a08ec0b77efa1c33..555e7efacd6cc37c6cf959e2931069be5c85fe8f 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -173,6 +173,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0102-Add-server-name-parameter.patch b/patches/unapplied/server/0102-Add-server-name-parameter.patch
index 13517340d4..13517340d4 100644
--- a/patches/server/0102-Add-server-name-parameter.patch
+++ b/patches/unapplied/server/0102-Add-server-name-parameter.patch
diff --git a/patches/server/0103-Only-send-global-sounds-to-same-world-if-limiting-ra.patch b/patches/unapplied/server/0103-Only-send-global-sounds-to-same-world-if-limiting-ra.patch
index 8762d2e14f..4444251841 100644
--- a/patches/server/0103-Only-send-global-sounds-to-same-world-if-limiting-ra.patch
+++ b/patches/unapplied/server/0103-Only-send-global-sounds-to-same-world-if-limiting-ra.patch
@@ -7,7 +7,7 @@ Co-authored-by: Evan McCarthy <[email protected]>
 Co-authored-by: lexikiq <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-index 3bf174b1e259aebef9007c66cf2ee8b87eae7681..1a787bd4bdbbf7c78f4bf6bd7e2f36540fec7d50 100644
+index a5d6f358aced725315f4bbb33953ef5f2cafdfde..4406d9622c6a5f817b7fbd1b448b8c3095c617b2 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 @@ -680,7 +680,7 @@ public class EnderDragon extends Mob implements Enemy {
diff --git a/patches/server/0104-Avoid-blocking-on-Network-Manager-creation.patch b/patches/unapplied/server/0104-Avoid-blocking-on-Network-Manager-creation.patch
index 8a8d5530d3..8a8d5530d3 100644
--- a/patches/server/0104-Avoid-blocking-on-Network-Manager-creation.patch
+++ b/patches/unapplied/server/0104-Avoid-blocking-on-Network-Manager-creation.patch
diff --git a/patches/server/0105-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/patches/unapplied/server/0105-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
index 1748c15f2b..1748c15f2b 100644
--- a/patches/server/0105-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
+++ b/patches/unapplied/server/0105-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
diff --git a/patches/server/0106-Add-setting-for-proxy-online-mode-status.patch b/patches/unapplied/server/0106-Add-setting-for-proxy-online-mode-status.patch
index 598cd36741..014c319f1d 100644
--- a/patches/server/0106-Add-setting-for-proxy-online-mode-status.patch
+++ b/patches/unapplied/server/0106-Add-setting-for-proxy-online-mode-status.patch
@@ -43,7 +43,7 @@ index 0214830d9bc98b8d435ff11f40df65596980cf77..5db27d7bcaaa2eeaeeb08401513d8d23
          } else {
              String[] astring1 = astring;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3836e0ad2f09ab015a165794400edd64a017f439..877ccdcbce7e69fab905c323ad88081c469db8b9 100644
+index f6e6b929c3ce5091a44bba4ab354b8dae73e7cc8..09c34d05c124e55a327e529bf1b247bc5c70ca6c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1789,7 +1789,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0107-Optimise-BlockState-s-hashCode-equals.patch b/patches/unapplied/server/0107-Optimise-BlockState-s-hashCode-equals.patch
index c2a7785d05..c2a7785d05 100644
--- a/patches/server/0107-Optimise-BlockState-s-hashCode-equals.patch
+++ b/patches/unapplied/server/0107-Optimise-BlockState-s-hashCode-equals.patch
diff --git a/patches/server/0108-Configurable-packet-in-spam-threshold.patch b/patches/unapplied/server/0108-Configurable-packet-in-spam-threshold.patch
index 8943918d45..8943918d45 100644
--- a/patches/server/0108-Configurable-packet-in-spam-threshold.patch
+++ b/patches/unapplied/server/0108-Configurable-packet-in-spam-threshold.patch
diff --git a/patches/server/0109-Configurable-flying-kick-messages.patch b/patches/unapplied/server/0109-Configurable-flying-kick-messages.patch
index 795569ea04..ce0db7a48d 100644
--- a/patches/server/0109-Configurable-flying-kick-messages.patch
+++ b/patches/unapplied/server/0109-Configurable-flying-kick-messages.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable flying kick messages
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 661796b360d69f239cf6147edcefde7a99943bce..18b9b172515a99941ab04c10eebf58270e8d3de0 100644
+index fabb6ab9a3dc7dcf724b1505ec1172f16158f502..8b81073813a7e31273816d1486a59ed6325589df 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -336,7 +336,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0110-Add-EntityZapEvent.patch b/patches/unapplied/server/0110-Add-EntityZapEvent.patch
index 154570991d..154570991d 100644
--- a/patches/server/0110-Add-EntityZapEvent.patch
+++ b/patches/unapplied/server/0110-Add-EntityZapEvent.patch
diff --git a/patches/server/0111-Filter-bad-tile-entity-nbt-data-from-falling-blocks.patch b/patches/unapplied/server/0111-Filter-bad-tile-entity-nbt-data-from-falling-blocks.patch
index 9221b51cb2..39e2892316 100644
--- a/patches/server/0111-Filter-bad-tile-entity-nbt-data-from-falling-blocks.patch
+++ b/patches/unapplied/server/0111-Filter-bad-tile-entity-nbt-data-from-falling-blocks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Filter bad tile entity nbt data from falling blocks
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-index 90f52ed06b4493610f65c8a82d6a3a3b32fef1a7..b8c8b10656e4151c8c19b8cecc3bc7502dd57d3d 100644
+index 0e349bc8dd0c31559437dc67481d5f0f81100e3b..c431ba283c31cf9bb7bfdb05dc8c181c9e1e0eb3 100644
 --- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 @@ -334,7 +334,7 @@ public class FallingBlockEntity extends Entity {
diff --git a/patches/server/0112-Cache-user-authenticator-threads.patch b/patches/unapplied/server/0112-Cache-user-authenticator-threads.patch
index fb564e652d..fb564e652d 100644
--- a/patches/server/0112-Cache-user-authenticator-threads.patch
+++ b/patches/unapplied/server/0112-Cache-user-authenticator-threads.patch
diff --git a/patches/server/0113-Allow-Reloading-of-Command-Aliases.patch b/patches/unapplied/server/0113-Allow-Reloading-of-Command-Aliases.patch
index 68a84a2345..e5f7429789 100644
--- a/patches/server/0113-Allow-Reloading-of-Command-Aliases.patch
+++ b/patches/unapplied/server/0113-Allow-Reloading-of-Command-Aliases.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Command Aliases
 Reload the aliases stored in commands.yml
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 877ccdcbce7e69fab905c323ad88081c469db8b9..7d115f02a003e36ba2b48b618a1cf8e063e38392 100644
+index 09c34d05c124e55a327e529bf1b247bc5c70ca6c..23b99cc6999c6db244793f6b744e6546bd04ae72 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2710,5 +2710,24 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0114-Add-source-to-PlayerExpChangeEvent.patch b/patches/unapplied/server/0114-Add-source-to-PlayerExpChangeEvent.patch
index 135acd92c8..135acd92c8 100644
--- a/patches/server/0114-Add-source-to-PlayerExpChangeEvent.patch
+++ b/patches/unapplied/server/0114-Add-source-to-PlayerExpChangeEvent.patch
diff --git a/patches/server/0115-Add-ProjectileCollideEvent.patch b/patches/unapplied/server/0115-Add-ProjectileCollideEvent.patch
index f199be83c4..f199be83c4 100644
--- a/patches/server/0115-Add-ProjectileCollideEvent.patch
+++ b/patches/unapplied/server/0115-Add-ProjectileCollideEvent.patch
diff --git a/patches/server/0116-Prevent-Pathfinding-out-of-World-Border.patch b/patches/unapplied/server/0116-Prevent-Pathfinding-out-of-World-Border.patch
index 5e7b08af48..5e7b08af48 100644
--- a/patches/server/0116-Prevent-Pathfinding-out-of-World-Border.patch
+++ b/patches/unapplied/server/0116-Prevent-Pathfinding-out-of-World-Border.patch
diff --git a/patches/server/0117-Optimize-World.isLoaded-BlockPosition-Z.patch b/patches/unapplied/server/0117-Optimize-World.isLoaded-BlockPosition-Z.patch
index 94ecd47c94..95a2e8fd81 100644
--- a/patches/server/0117-Optimize-World.isLoaded-BlockPosition-Z.patch
+++ b/patches/unapplied/server/0117-Optimize-World.isLoaded-BlockPosition-Z.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z
 Reduce method invocations for World.isLoaded(BlockPosition)Z
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 0c6384c6332babf8e517503c2e9b21a9d6e2ed88..7b681914b7f9e7fb6d2ea607e0d63ca7024a7ec3 100644
+index 555e7efacd6cc37c6cf959e2931069be5c85fe8f..17a15f7f1ad0ce7deed8d72c8a4175634992efc9 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -427,6 +427,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0118-Bound-Treasure-Maps-to-World-Border.patch b/patches/unapplied/server/0118-Bound-Treasure-Maps-to-World-Border.patch
index a546d2ee4a..a546d2ee4a 100644
--- a/patches/server/0118-Bound-Treasure-Maps-to-World-Border.patch
+++ b/patches/unapplied/server/0118-Bound-Treasure-Maps-to-World-Border.patch
diff --git a/patches/server/0119-Configurable-Cartographer-Treasure-Maps.patch b/patches/unapplied/server/0119-Configurable-Cartographer-Treasure-Maps.patch
index baa42e3976..baa42e3976 100644
--- a/patches/server/0119-Configurable-Cartographer-Treasure-Maps.patch
+++ b/patches/unapplied/server/0119-Configurable-Cartographer-Treasure-Maps.patch
diff --git a/patches/server/0120-Add-API-methods-to-control-if-armour-stands-can-move.patch b/patches/unapplied/server/0120-Add-API-methods-to-control-if-armour-stands-can-move.patch
index 183f58dad4..88a4ccea28 100644
--- a/patches/server/0120-Add-API-methods-to-control-if-armour-stands-can-move.patch
+++ b/patches/unapplied/server/0120-Add-API-methods-to-control-if-armour-stands-can-move.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add API methods to control if armour stands can move
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-index c0c4bbf25b2da40f53b1cdedb47fdd74b493fba2..d79fbc3e1cab0d4ec38ae25325e55eb23a1b5a19 100644
+index d1f5a80e8e08ccc3ef998cfb9b1203e0c2f5b00e..5df2b26be53ac24c329ea22fc9802a870e705e95 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 @@ -92,6 +92,7 @@ public class ArmorStand extends LivingEntity {
@@ -31,7 +31,7 @@ index c0c4bbf25b2da40f53b1cdedb47fdd74b493fba2..d79fbc3e1cab0d4ec38ae25325e55eb2
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-index 76536f0d700fb4b120ffef066588e305013a5a66..fc3b98746a558b3ad6c89543170225bdae1e63ba 100644
+index 04a7735d278c9e610a33294e65a17796e120fe7e..52ffc401bbb9fa768534a4b871f9cc7dbebb8b20 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 @@ -222,4 +222,15 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
diff --git a/patches/server/0121-String-based-Action-Bar-API.patch b/patches/unapplied/server/0121-String-based-Action-Bar-API.patch
index e4802216d8..596aad1479 100644
--- a/patches/server/0121-String-based-Action-Bar-API.patch
+++ b/patches/unapplied/server/0121-String-based-Action-Bar-API.patch
@@ -26,7 +26,7 @@ index 32ef3edebe94a2014168b7e438752a80b2687e5f..ab6c58eed6707ab7b0aa3e7549a871ad
          // Paper end
          buf.writeComponent(this.text);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7f9dceaf41426a88d682774c30a959db368fd03b..8c37947e9bc58f537691f2d83e2f419fc9f10d8e 100644
+index 7363c80d35d4ff61d771fb77125a4e520f745bba..4a5f67c47b7ff2e47630bd78421dd103e6278ed4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -342,6 +342,29 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0122-Properly-fix-item-duplication-bug.patch b/patches/unapplied/server/0122-Properly-fix-item-duplication-bug.patch
index e814a31638..552d0d3369 100644
--- a/patches/server/0122-Properly-fix-item-duplication-bug.patch
+++ b/patches/unapplied/server/0122-Properly-fix-item-duplication-bug.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Properly fix item duplication bug
 Credit to prplz for figuring out the real issue
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 5d95cc1f0f66cdad867265c38a06938c00b3a2ed..c6c046f3089759214739fc9c3b6f2936e41d1334 100644
+index 80b74383262ba8cc2f27882cb6a9548d1f505354..43e454be3f18d092913739bb6a92d5b82059ba59 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -2393,7 +2393,7 @@ public class ServerPlayer extends Player {
@@ -19,7 +19,7 @@ index 5d95cc1f0f66cdad867265c38a06938c00b3a2ed..c6c046f3089759214739fc9c3b6f2936
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index e8b12a8ae009023afa2818ecbf398a1440b9926e..6faec2ca225fcebbad65190ab485e2cab77cfd6e 100644
+index a258a252e749e3b7ebb1a6304b7f143e93a67178..1dec537f96cb612de73a2d682392f14c872d031c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 @@ -145,7 +145,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
diff --git a/patches/server/0123-Firework-API-s.patch b/patches/unapplied/server/0123-Firework-API-s.patch
index 2ce62771da..fa27f134b7 100644
--- a/patches/server/0123-Firework-API-s.patch
+++ b/patches/unapplied/server/0123-Firework-API-s.patch
@@ -76,7 +76,7 @@ index 5cafb6f0b507127665393741b372286da098d603..7c627d27300247db9122ab2081049345
                  if (!user.getAbilities().instabuild) {
                      itemStack.shrink(1);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
-index 437fd93bf0de2b4fd74b5f94d0b931ed10f2b6ec..7417e3d51497fe7e62e108d83ee4b70942972144 100644
+index 5ae87c370e47c545cef27a36e40da137e1ec656b..c9e15a9d82dee935293b2e7e233f5b9b2d822448 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
 @@ -129,4 +129,11 @@ public class CraftFirework extends CraftProjectile implements Firework {
diff --git a/patches/server/0124-PlayerTeleportEndGatewayEvent.patch b/patches/unapplied/server/0124-PlayerTeleportEndGatewayEvent.patch
index ff8a910755..ff8a910755 100644
--- a/patches/server/0124-PlayerTeleportEndGatewayEvent.patch
+++ b/patches/unapplied/server/0124-PlayerTeleportEndGatewayEvent.patch
diff --git a/patches/server/0125-Provide-E-TE-Chunk-count-stat-methods.patch b/patches/unapplied/server/0125-Provide-E-TE-Chunk-count-stat-methods.patch
index 9c45f7193f..9c45f7193f 100644
--- a/patches/server/0125-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/patches/unapplied/server/0125-Provide-E-TE-Chunk-count-stat-methods.patch
diff --git a/patches/server/0126-Enforce-Sync-Player-Saves.patch b/patches/unapplied/server/0126-Enforce-Sync-Player-Saves.patch
index 4bdce0e792..ac369df3c8 100644
--- a/patches/server/0126-Enforce-Sync-Player-Saves.patch
+++ b/patches/unapplied/server/0126-Enforce-Sync-Player-Saves.patch
@@ -7,7 +7,7 @@ Saving players async is extremely dangerous. This will force it to main
 the same way we handle async chunk loads.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 441c187b45bfa20d929fe3c5e8dc25db22c4aad1..bba11f3ad244bf9f3b7e6006128ce5e4228ab531 100644
+index 2ceb330e087fd397887d2f4383fcc7590119ca6c..8eca92373784616c1239b0c50fcd3af34704d508 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1063,11 +1063,13 @@ public abstract class PlayerList {
diff --git a/patches/server/0127-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/unapplied/server/0127-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index 281f5e8d60..d3f7498d81 100644
--- a/patches/server/0127-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/patches/unapplied/server/0127-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@@ -133,7 +133,7 @@ index f25466e132cb6b0012dc336877fdf17b88a12ddc..9d1cce3fb02bb2c3ff71055fbafc974b
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index c178a564156562d1dd2c0a30eec3040cb8b4c2d1..3d99e7ea6109261dc5d8de610791ec08dde180b4 100644
+index b60e970c604ae778cc0b5eb54cdfebceef91b2df..59d3ae122239f924d71d4e9d212b3bd343b80609 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1789,7 +1789,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -266,7 +266,7 @@ index af6829c25fcd186adc3575d50cab6d46db9a2fac..5c77992e0c49eb217dd66657b3516422
                      // CraftBukkit end
                      if (itemstack1.is(ItemTags.FISHES)) {
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/ThrownExperienceBottle.java b/src/main/java/net/minecraft/world/entity/projectile/ThrownExperienceBottle.java
-index 2191af62f4202413738542d738456ca71febdbf4..5b3059460d4b18d984483d655526d83204fb1c73 100644
+index 5d0e2c53d41e897532a8ec3c0a7b33e9b60e9ab5..e53046c6d47b4fd3d82132bc980a31b9491df6a7 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/ThrownExperienceBottle.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownExperienceBottle.java
 @@ -51,7 +51,7 @@ public class ThrownExperienceBottle extends ThrowableItemProjectile {
@@ -324,7 +324,7 @@ index e72ed2ed8664cbc408cbe1e38f1f0acacc3841dd..2f628f36c32752d1bac910e180b90639
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 8beb4670fffa2df0a9bd64ebb8810b25ce670f16..134b138abdf17fae340226ecac3868ad7a993086 100644
+index 31a5694a0a9a504eac6c068907083eccdee94acf..b286deebacaf00ff21585cfbc75291a8d80965c4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -943,7 +943,7 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
diff --git a/patches/server/0128-Cap-Entity-Collisions.patch b/patches/unapplied/server/0128-Cap-Entity-Collisions.patch
index ccc45c36c6..0e5e0af26c 100644
--- a/patches/server/0128-Cap-Entity-Collisions.patch
+++ b/patches/unapplied/server/0128-Cap-Entity-Collisions.patch
@@ -12,7 +12,7 @@ just as it does in Vanilla, but entity pushing logic will be capped.
 You can set this to 0 to disable collisions.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f3db63ddb175f82b6eafee48686065050437fc92..4e71fb3fcbd89c21e5132cfb76dcbf8cec7785dd 100644
+index c85833a54c79b9a6eb18bc22dae67a92dbbad724..bea207f8fc4cd1af06622e10ff904d9459d4bc66 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -387,6 +387,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -24,7 +24,7 @@ index f3db63ddb175f82b6eafee48686065050437fc92..4e71fb3fcbd89c21e5132cfb76dcbf8c
      private org.bukkit.util.Vector origin;
      @javax.annotation.Nullable
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index e9948f593c5d0df365104f50444e520b1be3d974..382e3546fb8d1482956484920ea6ece691a828e1 100644
+index 59d3ae122239f924d71d4e9d212b3bd343b80609..47726c9d2c5384d31983e53fd17d91cd12da8961 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3346,10 +3346,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0129-Remove-CraftScheduler-Async-Task-Debugger.patch b/patches/unapplied/server/0129-Remove-CraftScheduler-Async-Task-Debugger.patch
index bec7645bbb..94bbaced71 100644
--- a/patches/server/0129-Remove-CraftScheduler-Async-Task-Debugger.patch
+++ b/patches/unapplied/server/0129-Remove-CraftScheduler-Async-Task-Debugger.patch
@@ -9,7 +9,7 @@ One report of a suspected memory leak with the system.
 This adds additional overhead to asynchronous task dispatching
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 833240d2a4936343710a60876a66d01112e15a2c..ef4fdfa3fbe8216a0a020949347bc992cd5c0c60 100644
+index f39c836970572fe2e29e794a6af35332af8f7424..b1e61ce608eeacdbb70849c1e3e39daf37b3f2a2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -442,7 +442,7 @@ public class CraftScheduler implements BukkitScheduler {
diff --git a/patches/server/0130-Do-not-let-armorstands-drown.patch b/patches/unapplied/server/0130-Do-not-let-armorstands-drown.patch
index 21cc9d4ed3..865e789ddf 100644
--- a/patches/server/0130-Do-not-let-armorstands-drown.patch
+++ b/patches/unapplied/server/0130-Do-not-let-armorstands-drown.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Do not let armorstands drown
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-index d79fbc3e1cab0d4ec38ae25325e55eb23a1b5a19..37c19685049ef6b267a74a4323dc4ec33159c3d2 100644
+index 5df2b26be53ac24c329ea22fc9802a870e705e95..5a838c7070fc5ed8f8f2fdb0073221f4c22e1334 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 @@ -959,5 +959,12 @@ public class ArmorStand extends LivingEntity {
diff --git a/patches/server/0131-Properly-handle-async-calls-to-restart-the-server.patch b/patches/unapplied/server/0131-Properly-handle-async-calls-to-restart-the-server.patch
index a12364d7ee..0005f39521 100644
--- a/patches/server/0131-Properly-handle-async-calls-to-restart-the-server.patch
+++ b/patches/unapplied/server/0131-Properly-handle-async-calls-to-restart-the-server.patch
@@ -30,7 +30,7 @@ will have plugins and worlds saving to the disk has a high potential to result
 in corruption/dataloss.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b46cffe141921e499a47dac08318f167f21a5509..092f76d1d248e04c3fa5fa346373ec1f2600ee5c 100644
+index 2bb21a86f49ec996b7beeb65dd0ec8e2e5634053..182ae975a0a9bf4ade6932d1bb1a376f77af130a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -233,6 +233,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -64,7 +64,7 @@ index b46cffe141921e499a47dac08318f167f21a5509..092f76d1d248e04c3fa5fa346373ec1f
          if (waitForShutdown) {
              try {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index bba11f3ad244bf9f3b7e6006128ce5e4228ab531..845a90426545b554aaf5c278723c107ba9791270 100644
+index 8eca92373784616c1239b0c50fcd3af34704d508..6dad42086e598c86a27358e12c5b72a0a79b38ee 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1175,8 +1175,15 @@ public abstract class PlayerList {
@@ -84,7 +84,7 @@ index bba11f3ad244bf9f3b7e6006128ce5e4228ab531..845a90426545b554aaf5c278723c107b
          }
          // CraftBukkit end
 diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java
-index 882e93ad4471e3688f2fcfb1e6f16926786ee5e7..14eadb0f81dfad072d82d7793cce1a4dd3f2c5f0 100644
+index 1e251d0f6de25a0a8c739c5f18ec5b949d4fc396..051b9e3a5d29a5840d596468e3ddd013bedc8da3 100644
 --- a/src/main/java/org/spigotmc/RestartCommand.java
 +++ b/src/main/java/org/spigotmc/RestartCommand.java
 @@ -45,86 +45,134 @@ public class RestartCommand extends Command
diff --git a/patches/server/0132-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/patches/unapplied/server/0132-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
index 5c11879eb1..5c11879eb1 100644
--- a/patches/server/0132-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/patches/unapplied/server/0132-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
diff --git a/patches/server/0133-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/unapplied/server/0133-Add-configuration-option-to-prevent-player-names-fro.patch
index 2a2cf77a91..1975d3cbe1 100644
--- a/patches/server/0133-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/patches/unapplied/server/0133-Add-configuration-option-to-prevent-player-names-fro.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add configuration option to prevent player names from being
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7d115f02a003e36ba2b48b618a1cf8e063e38392..9265feda93edd01f8afc0b2e60cd3a54fcbdc208 100644
+index 23b99cc6999c6db244793f6b744e6546bd04ae72..e8fbecb9abee37946dd8055c1e4d8e95df324998 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2729,5 +2729,10 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0134-Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/unapplied/server/0134-Use-TerminalConsoleAppender-for-console-improvements.patch
index e7459443c7..03356effd4 100644
--- a/patches/server/0134-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/patches/unapplied/server/0134-Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -389,7 +389,7 @@ index 6dad42086e598c86a27358e12c5b72a0a79b38ee..daabc5739b7bf6b1cbeb497fe0e9b7ed
  
          this.bans = new UserBanList(PlayerList.USERBANLIST_FILE);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9265feda93edd01f8afc0b2e60cd3a54fcbdc208..7491c7a3fad265708c422e87d069120eb8e3d30c 100644
+index e8fbecb9abee37946dd8055c1e4d8e95df324998..7019a52796afe0fd438833c3b9690499ec120202 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -43,7 +43,7 @@ import java.util.logging.Level;
diff --git a/patches/server/0135-provide-a-configurable-option-to-disable-creeper-lin.patch b/patches/unapplied/server/0135-provide-a-configurable-option-to-disable-creeper-lin.patch
index f21ade656c..f21ade656c 100644
--- a/patches/server/0135-provide-a-configurable-option-to-disable-creeper-lin.patch
+++ b/patches/unapplied/server/0135-provide-a-configurable-option-to-disable-creeper-lin.patch
diff --git a/patches/server/0136-Item-canEntityPickup.patch b/patches/unapplied/server/0136-Item-canEntityPickup.patch
index a1f9419b67..20d5fcd96b 100644
--- a/patches/server/0136-Item-canEntityPickup.patch
+++ b/patches/unapplied/server/0136-Item-canEntityPickup.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Item#canEntityPickup
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 873a96693110982600d3e7979489fb00f3cd7941..645ee527b9e7e7edbf3320eae6e441bea84f58f9 100644
+index 2aa3df6ef2da77fa51c11d64124ac55a3769f567..2d0a188cca46a4d580fb76baa19e85a653e87687 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -669,6 +669,11 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -33,7 +33,7 @@ index 11dad6b6c6cf922417ab54a1db13d809c10c999e..adb8ac976397322f0b4122fd9469dd51
      public ItemEntity(EntityType<? extends ItemEntity> type, Level world) {
          super(type, world);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-index 8badae31059e3f229f448ca0f99e05627f1ee141..b1be6c99ebff90ff98a7d5cafec4a856b9704b66 100644
+index 8f1d3691132093398ceb38e2ad9bdc59c4fb6c19..7b11db70668951e5331b6d6b99f616e163d7d7d6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 @@ -63,6 +63,18 @@ public class CraftItem extends CraftEntity implements Item {
diff --git a/patches/server/0137-PlayerPickupItemEvent-setFlyAtPlayer.patch b/patches/unapplied/server/0137-PlayerPickupItemEvent-setFlyAtPlayer.patch
index d257dcb087..d257dcb087 100644
--- a/patches/server/0137-PlayerPickupItemEvent-setFlyAtPlayer.patch
+++ b/patches/unapplied/server/0137-PlayerPickupItemEvent-setFlyAtPlayer.patch
diff --git a/patches/server/0138-PlayerAttemptPickupItemEvent.patch b/patches/unapplied/server/0138-PlayerAttemptPickupItemEvent.patch
index 1026175974..1026175974 100644
--- a/patches/server/0138-PlayerAttemptPickupItemEvent.patch
+++ b/patches/unapplied/server/0138-PlayerAttemptPickupItemEvent.patch
diff --git a/patches/server/0139-Do-not-submit-profile-lookups-to-worldgen-threads.patch b/patches/unapplied/server/0139-Do-not-submit-profile-lookups-to-worldgen-threads.patch
index cbf775fcbe..2e5ca12977 100644
--- a/patches/server/0139-Do-not-submit-profile-lookups-to-worldgen-threads.patch
+++ b/patches/unapplied/server/0139-Do-not-submit-profile-lookups-to-worldgen-threads.patch
@@ -63,7 +63,7 @@ index cf7e64eac9e3eb395a0be0a2a4fa0175a731b6e7..f5162f7171c348ff523b18e577246561
  
      private static boolean hasTextures(GameProfile profile) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerProfile.java b/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerProfile.java
-index eef39c0323c57cbe33cee4cd38ad9f48654df2a9..9eafa36b086ed4cde107b81aa9470d1a43e557f1 100644
+index 1a0ba852b89b09ba2c118903f29ae7aeabe8ed45..2fff882c02aa84ab7b14b267bc6e28b5ad94def6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerProfile.java
 +++ b/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerProfile.java
 @@ -125,7 +125,7 @@ public final class CraftPlayerProfile implements PlayerProfile {
diff --git a/patches/server/0140-Add-UnknownCommandEvent.patch b/patches/unapplied/server/0140-Add-UnknownCommandEvent.patch
index 382d3b8965..c85e8b9f9e 100644
--- a/patches/server/0140-Add-UnknownCommandEvent.patch
+++ b/patches/unapplied/server/0140-Add-UnknownCommandEvent.patch
@@ -83,7 +83,7 @@ index d1ecf61ffecb8669214ad85334374a4569811de8..e63632f09d608371aaeaf09a6dac57c1
  
                  b1 = 0;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6c2283ec3a6062eea5a2e20a3e023064cad6b39e..ed3cf7cd9d49c58162caa7f0b4a0b631082358cd 100644
+index 7019a52796afe0fd438833c3b9690499ec120202..bdacf4220b00eea529266c7dfa563b9d858fbdba 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -532,6 +532,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0141-Basic-PlayerProfile-API.patch b/patches/unapplied/server/0141-Basic-PlayerProfile-API.patch
index 72030f583d..318d3fa341 100644
--- a/patches/server/0141-Basic-PlayerProfile-API.patch
+++ b/patches/unapplied/server/0141-Basic-PlayerProfile-API.patch
@@ -622,7 +622,7 @@ index c70cd016e1978931d115cfca94664897f0158196..eac9658fa4cab7a651e10e4e18c679e0
          String s1 = name.toLowerCase(Locale.ROOT);
          GameProfileCache.GameProfileInfo usercache_usercacheentry = (GameProfileCache.GameProfileInfo) this.profilesByName.get(s1);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ed3cf7cd9d49c58162caa7f0b4a0b631082358cd..67f2b02a23515796b8df450f2360d6914b74bb4a 100644
+index bdacf4220b00eea529266c7dfa563b9d858fbdba..6b9675a1170f9e536432826e52b3cb3fa5195272 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -265,6 +265,9 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
diff --git a/patches/server/0142-Shoulder-Entities-Release-API.patch b/patches/unapplied/server/0142-Shoulder-Entities-Release-API.patch
index 6cd2debe6f..867f053816 100644
--- a/patches/server/0142-Shoulder-Entities-Release-API.patch
+++ b/patches/unapplied/server/0142-Shoulder-Entities-Release-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Shoulder Entities Release API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index a2f6e3f381bf251d93a63aff9f9af307350ffc50..3d333332ae02951af087cd37cbe7f1ecf8b0c932 100644
+index fb9b81efea99b78449b453dd0e4fcdfecc71ec50..cd55aa48063fa4dc9646ab487b307b87b8b41315 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -2042,20 +2042,45 @@ public abstract class Player extends LivingEntity {
@@ -59,7 +59,7 @@ index a2f6e3f381bf251d93a63aff9f9af307350ffc50..3d333332ae02951af087cd37cbe7f1ec
      @Override
      public abstract boolean isSpectator();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index b9578f7d0f61d15bee1f99181bf932cdbb0e611c..c40b3b8ff02c0e21fab53f6749f9c72b7e3c48a1 100644
+index 2bc97adea45672cdb5c8891a9fa461b2a81ff4e6..32ad04d66b776aa1c300cca3c5eeb332d75ea5cc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -516,6 +516,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/patches/server/0143-Profile-Lookup-Events.patch b/patches/unapplied/server/0143-Profile-Lookup-Events.patch
index bd19d1292e..bd19d1292e 100644
--- a/patches/server/0143-Profile-Lookup-Events.patch
+++ b/patches/unapplied/server/0143-Profile-Lookup-Events.patch
diff --git a/patches/server/0144-Block-player-logins-during-server-shutdown.patch b/patches/unapplied/server/0144-Block-player-logins-during-server-shutdown.patch
index 737264a60e..2133806ab7 100644
--- a/patches/server/0144-Block-player-logins-during-server-shutdown.patch
+++ b/patches/unapplied/server/0144-Block-player-logins-during-server-shutdown.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Block player logins during server shutdown
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 490af173c265d03904396e9336c95520fcd16c48..b52ed512000328c1ac006fac18d997157faf4cb6 100644
+index 7a9094e69684c2d963411525a09872024c6f62e3..6e9e0385881c60c6921b06663869546f7c852804 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -72,6 +72,12 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
diff --git a/patches/server/0145-Entity-fromMobSpawner.patch b/patches/unapplied/server/0145-Entity-fromMobSpawner.patch
index 5650152e76..13f020fb4f 100644
--- a/patches/server/0145-Entity-fromMobSpawner.patch
+++ b/patches/unapplied/server/0145-Entity-fromMobSpawner.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity#fromMobSpawner()
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 4e71fb3fcbd89c21e5132cfb76dcbf8cec7785dd..1d21c5d5ea84f76d4cafe9d2d22226cf50232ee1 100644
+index bea207f8fc4cd1af06622e10ff904d9459d4bc66..4e20bdcd15b030b408a8ee640f36c51b45a90e26 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -388,6 +388,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -49,7 +49,7 @@ index 7ae0465091db8e8061737bf93884afa3db49feeb..5d6403fa27521860a69a707dc4358b01
                          if (org.bukkit.craftbukkit.event.CraftEventFactory.callSpawnerSpawnEvent(entity, pos).isCancelled()) {
                              continue;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index b4780e2a244b4cd8ab827bd844a01c3360f46b03..714a8fb1715751038c411ea7f2f0cf37ee41abd8 100644
+index 68d00a158751d24c7f0e38920d78c0547f1928eb..cc858aa0bdcfca69c37f962137e8caf9a8e33fd2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1317,5 +1317,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0146-Improve-the-Saddle-API-for-Horses.patch b/patches/unapplied/server/0146-Improve-the-Saddle-API-for-Horses.patch
index dc38a3b16d..c529ffab64 100644
--- a/patches/server/0146-Improve-the-Saddle-API-for-Horses.patch
+++ b/patches/unapplied/server/0146-Improve-the-Saddle-API-for-Horses.patch
@@ -7,7 +7,7 @@ Not all horses with Saddles have armor. This lets us break up the horses with sa
 and access their saddle state separately from an interface shared with Armor.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
-index 349bc3becee3f878fe8f6bc589cc9fbecf7dd17a..4bb5e953ec0ad6a2e068cb26237bc59e68c13699 100644
+index 8093e2bebd17d7a02d6df8882bc1ac000ca8b21c..81c34b5245133cdd119f36c6bc084fb8d99f97f8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
 @@ -5,6 +5,7 @@ import java.util.UUID;
@@ -27,7 +27,7 @@ index 349bc3becee3f878fe8f6bc589cc9fbecf7dd17a..4bb5e953ec0ad6a2e068cb26237bc59e
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java
-index 7013059856c2471dc34112a1a2068b96b809dd96..b72b4260fc1c0e9928d70f97589d8db00849b9e8 100644
+index 444de73d57b0c7a72eb84bff9f06d7ed14b9ab0a..547a05ba2b93c276a2c705e98a254e9015ce8b9d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java
 @@ -4,7 +4,7 @@ import net.minecraft.world.Container;
diff --git a/patches/server/0147-Implement-ensureServerConversions-API.patch b/patches/unapplied/server/0147-Implement-ensureServerConversions-API.patch
index e75e93f212..e75e93f212 100644
--- a/patches/server/0147-Implement-ensureServerConversions-API.patch
+++ b/patches/unapplied/server/0147-Implement-ensureServerConversions-API.patch
diff --git a/patches/server/0148-Implement-getI18NDisplayName.patch b/patches/unapplied/server/0148-Implement-getI18NDisplayName.patch
index c3c3780802..c3c3780802 100644
--- a/patches/server/0148-Implement-getI18NDisplayName.patch
+++ b/patches/unapplied/server/0148-Implement-getI18NDisplayName.patch
diff --git a/patches/server/0149-ProfileWhitelistVerifyEvent.patch b/patches/unapplied/server/0149-ProfileWhitelistVerifyEvent.patch
index e64e46dedb..6e1073f18e 100644
--- a/patches/server/0149-ProfileWhitelistVerifyEvent.patch
+++ b/patches/unapplied/server/0149-ProfileWhitelistVerifyEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] ProfileWhitelistVerifyEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index a3c150e9552fbc9b9244c70508c27f03a3834fa2..e4199b1c4b297db85a99e1e6a1c61ce6d7abc909 100644
+index daabc5739b7bf6b1cbeb497fe0e9b7ed6ed30975..d767d9259877ecf250d624a489e3f322df318e55 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -633,9 +633,9 @@ public abstract class PlayerList {
diff --git a/patches/server/0150-Fix-this-stupid-bullshit.patch b/patches/unapplied/server/0150-Fix-this-stupid-bullshit.patch
index 13c470a8dc..13c470a8dc 100644
--- a/patches/server/0150-Fix-this-stupid-bullshit.patch
+++ b/patches/unapplied/server/0150-Fix-this-stupid-bullshit.patch
diff --git a/patches/server/0151-LivingEntity-setKiller.patch b/patches/unapplied/server/0151-LivingEntity-setKiller.patch
index 99c026dfbf..5879bc677e 100644
--- a/patches/server/0151-LivingEntity-setKiller.patch
+++ b/patches/unapplied/server/0151-LivingEntity-setKiller.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] LivingEntity#setKiller
 public net.minecraft.world.entity.LivingEntity lastHurtByPlayerTime
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 166dfd2cde916709ef952216643bb7b92e9e1600..0dd733873606ae47deb5956ed1170d4b9ad3b890 100644
+index 2be4b3f8129e38f72c6c0013cc0de7060a78ae76..5c0c4051e2f63e923e99a621d04d6a5dd7c86b44 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -365,6 +365,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0152-Ocelot-despawns-should-honor-nametags-and-leash.patch b/patches/unapplied/server/0152-Ocelot-despawns-should-honor-nametags-and-leash.patch
index a72222c640..a72222c640 100644
--- a/patches/server/0152-Ocelot-despawns-should-honor-nametags-and-leash.patch
+++ b/patches/unapplied/server/0152-Ocelot-despawns-should-honor-nametags-and-leash.patch
diff --git a/patches/server/0153-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/patches/unapplied/server/0153-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
index 71cdedc8fa..71cdedc8fa 100644
--- a/patches/server/0153-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
+++ b/patches/unapplied/server/0153-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
diff --git a/patches/server/0154-Allow-specifying-a-custom-authentication-servers-dow.patch b/patches/unapplied/server/0154-Allow-specifying-a-custom-authentication-servers-dow.patch
index 919223290d..8d96eb72e6 100644
--- a/patches/server/0154-Allow-specifying-a-custom-authentication-servers-dow.patch
+++ b/patches/unapplied/server/0154-Allow-specifying-a-custom-authentication-servers-dow.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow specifying a custom "authentication servers down" kick
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index b52ed512000328c1ac006fac18d997157faf4cb6..b98c7bb70a2d8867e1236d3c8d78d2cfffe76e28 100644
+index 6e9e0385881c60c6921b06663869546f7c852804..85f1591d1f87b314d18b4eb46b6388b7c9d57be7 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -259,7 +259,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
diff --git a/patches/server/0155-Handle-plugin-prefixes-using-Log4J-configuration.patch b/patches/unapplied/server/0155-Handle-plugin-prefixes-using-Log4J-configuration.patch
index e4c5341fe8..d4ad90ff41 100644
--- a/patches/server/0155-Handle-plugin-prefixes-using-Log4J-configuration.patch
+++ b/patches/unapplied/server/0155-Handle-plugin-prefixes-using-Log4J-configuration.patch
@@ -15,7 +15,7 @@ This may cause additional prefixes to be disabled for plugins bypassing
 the plugin logger.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index f2285f5e5669ba5c13dc8a6eb61823b0bf213161..3e07bc8be9b1406b8ecbb9a4b3c6ed05f48cdbde 100644
+index 526f9e79502a6b0055807a6b831602271b704b23..8c17b903f077d3f7281b0090b9aefdbf1b59a17c 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -25,7 +25,7 @@ dependencies {
@@ -28,7 +28,7 @@ index f2285f5e5669ba5c13dc8a6eb61823b0bf213161..3e07bc8be9b1406b8ecbb9a4b3c6ed05
      runtimeOnly(log4jPlugins.output)
      alsoShade(log4jPlugins.output)
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 0a0aa6de31a94a701074cc5f43c94be7515a185c..489ce6f439778b26eb33ede9432681d4bf9e0116 100644
+index 0fca20580d81c461e903c8cbd1cf090f5d5083c6..bf368d3ab947f027eaffb5498c45429bf702788c 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -290,7 +290,7 @@ public class SpigotConfig
diff --git a/patches/server/0156-Improve-Log4J-Configuration-Plugin-Loggers.patch b/patches/unapplied/server/0156-Improve-Log4J-Configuration-Plugin-Loggers.patch
index 06b30f0a00..06b30f0a00 100644
--- a/patches/server/0156-Improve-Log4J-Configuration-Plugin-Loggers.patch
+++ b/patches/unapplied/server/0156-Improve-Log4J-Configuration-Plugin-Loggers.patch
diff --git a/patches/server/0157-Add-PlayerJumpEvent.patch b/patches/unapplied/server/0157-Add-PlayerJumpEvent.patch
index d5fd6d3ddf..d5fd6d3ddf 100644
--- a/patches/server/0157-Add-PlayerJumpEvent.patch
+++ b/patches/unapplied/server/0157-Add-PlayerJumpEvent.patch
diff --git a/patches/server/0158-handle-ServerboundKeepAlivePacket-async.patch b/patches/unapplied/server/0158-handle-ServerboundKeepAlivePacket-async.patch
index d4b5950dc2..cf3849b225 100644
--- a/patches/server/0158-handle-ServerboundKeepAlivePacket-async.patch
+++ b/patches/unapplied/server/0158-handle-ServerboundKeepAlivePacket-async.patch
@@ -15,7 +15,7 @@ also adding some additional logging in order to help work out what is causing
 random disconnections for clients.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index 6faec2ca225fcebbad65190ab485e2cab77cfd6e..e8fb051bf24a4c239ae980c37d8d64f261b5db60 100644
+index 1dec537f96cb612de73a2d682392f14c872d031c..aa4d8ccb9cd5af57ffd3a2b4ce34d22f6f3d632c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 @@ -83,14 +83,18 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
diff --git a/patches/server/0159-Expose-client-protocol-version-and-virtual-host.patch b/patches/unapplied/server/0159-Expose-client-protocol-version-and-virtual-host.patch
index 74ae2a562d..2dcb1d9f37 100644
--- a/patches/server/0159-Expose-client-protocol-version-and-virtual-host.patch
+++ b/patches/unapplied/server/0159-Expose-client-protocol-version-and-virtual-host.patch
@@ -75,7 +75,7 @@ index 5b267514504497de3faa7ffa490a179200d9415c..faac9ba36d83f537fe62e177c15ae237
      // Paper start - add utility methods
      public final net.minecraft.server.level.ServerPlayer getPlayer() {
 diff --git a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
-index 81bfce0374f281069f963c24040163cd968e3958..e50f0ae7ba5e0271e4c0947ea73126c953aeac6b 100644
+index 0d9658b1c6b5912a34058c0ce53b8e7f8c28afac..203fc53142bb0c9b6e2d1876fe8dfbe33c42af99 100644
 --- a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
 @@ -165,6 +165,10 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL
@@ -90,7 +90,7 @@ index 81bfce0374f281069f963c24040163cd968e3958..e50f0ae7ba5e0271e4c0947ea73126c9
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 8c37947e9bc58f537691f2d83e2f419fc9f10d8e..6595ad35eeec3763cb3df277145c6dc7d5f1b1d6 100644
+index 4a5f67c47b7ff2e47630bd78421dd103e6278ed4..3836c1d2c2565333072fbbae1fc163125663ba3c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -288,6 +288,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0160-revert-serverside-behavior-of-keepalives.patch b/patches/unapplied/server/0160-revert-serverside-behavior-of-keepalives.patch
index c3378b6db9..fd167198a6 100644
--- a/patches/server/0160-revert-serverside-behavior-of-keepalives.patch
+++ b/patches/unapplied/server/0160-revert-serverside-behavior-of-keepalives.patch
@@ -17,7 +17,7 @@ from networking or during connections flood of chunk packets on slower clients,
  at the cost of dead connections being kept open for longer.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index e8fb051bf24a4c239ae980c37d8d64f261b5db60..988820d6041f3784fec9321c7bc08e2e84a52ad5 100644
+index aa4d8ccb9cd5af57ffd3a2b4ce34d22f6f3d632c..4e450a3d7f2db7d7d346103cc9467654ca1b8a1f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 @@ -48,11 +48,12 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
diff --git a/patches/server/0161-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/patches/unapplied/server/0161-Send-attack-SoundEffects-only-to-players-who-can-see.patch
index 5e6a90819e..a8aa65e361 100644
--- a/patches/server/0161-Send-attack-SoundEffects-only-to-players-who-can-see.patch
+++ b/patches/unapplied/server/0161-Send-attack-SoundEffects-only-to-players-who-can-see.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Send attack SoundEffects only to players who can see the
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 3d333332ae02951af087cd37cbe7f1ecf8b0c932..42663ab48cb8a18c5e724ca840bc6f50d9b91170 100644
+index cd55aa48063fa4dc9646ab487b307b87b8b41315..cafcb53b9a35971a4c0c45fb20de072d2f07b829 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1240,7 +1240,7 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0162-Add-PlayerArmorChangeEvent.patch b/patches/unapplied/server/0162-Add-PlayerArmorChangeEvent.patch
index 6d4d32345c..b990010a33 100644
--- a/patches/server/0162-Add-PlayerArmorChangeEvent.patch
+++ b/patches/unapplied/server/0162-Add-PlayerArmorChangeEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerArmorChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 382e3546fb8d1482956484920ea6ece691a828e1..1371e57840727fee82186c44618064e8e147d260 100644
+index 47726c9d2c5384d31983e53fd17d91cd12da8961..f687bfd7cf820c1e7443c8b86ef9ca28a4768b02 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1,5 +1,6 @@
diff --git a/patches/server/0163-Prevent-logins-from-being-processed-when-the-player-.patch b/patches/unapplied/server/0163-Prevent-logins-from-being-processed-when-the-player-.patch
index d271a12cd3..e9d4e23a55 100644
--- a/patches/server/0163-Prevent-logins-from-being-processed-when-the-player-.patch
+++ b/patches/unapplied/server/0163-Prevent-logins-from-being-processed-when-the-player-.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent logins from being processed when the player has
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index b98c7bb70a2d8867e1236d3c8d78d2cfffe76e28..1202a60cf955dbfbfc2135c06d3304f215b23c2c 100644
+index 85f1591d1f87b314d18b4eb46b6388b7c9d57be7..2ecc29755eb0e79d49f0713e56849d7971dd38ed 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -79,7 +79,9 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
diff --git a/patches/server/0164-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/patches/unapplied/server/0164-Fix-MC-117075-TE-Unload-Lag-Spike.patch
index c917550a2f..c917550a2f 100644
--- a/patches/server/0164-Fix-MC-117075-TE-Unload-Lag-Spike.patch
+++ b/patches/unapplied/server/0164-Fix-MC-117075-TE-Unload-Lag-Spike.patch
diff --git a/patches/server/0165-use-CB-BlockState-implementations-for-captured-block.patch b/patches/unapplied/server/0165-use-CB-BlockState-implementations-for-captured-block.patch
index c5f6827d65..a0e6c95310 100644
--- a/patches/server/0165-use-CB-BlockState-implementations-for-captured-block.patch
+++ b/patches/unapplied/server/0165-use-CB-BlockState-implementations-for-captured-block.patch
@@ -18,7 +18,7 @@ the blockstate that will be valid for restoration, as opposed to dropping
 information on restoration when the event is cancelled.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 22dab285bbcea77d04a8625b025f054c625cadd4..ce24a52b2b9fb0ae7cfb085a204de8780bc8f5d6 100644
+index 3f88b1caf5f99499adeaa8ba24e2c9d8647ea7d5..be48f90db79509035a87103f20582fb2500449ad 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -154,7 +154,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0166-API-to-get-a-BlockState-without-a-snapshot.patch b/patches/unapplied/server/0166-API-to-get-a-BlockState-without-a-snapshot.patch
index 2f5cac0839..2f5cac0839 100644
--- a/patches/server/0166-API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/patches/unapplied/server/0166-API-to-get-a-BlockState-without-a-snapshot.patch
diff --git a/patches/server/0167-AsyncTabCompleteEvent.patch b/patches/unapplied/server/0167-AsyncTabCompleteEvent.patch
index e1cae59d0d..b8617c18e5 100644
--- a/patches/server/0167-AsyncTabCompleteEvent.patch
+++ b/patches/unapplied/server/0167-AsyncTabCompleteEvent.patch
@@ -91,7 +91,7 @@ index 6e2957e31ad4be418bcd475b2e3a4e56b5be591e..b5abb0d433322224ccbbed8755fb3ebf
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 67f2b02a23515796b8df450f2360d6914b74bb4a..654c174df812271e31c72a88445df57ba8aca675 100644
+index 6b9675a1170f9e536432826e52b3cb3fa5195272..3ceebd86f44d1997201c34559d1b63004a973282 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2195,7 +2195,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0168-PlayerPickupExperienceEvent.patch b/patches/unapplied/server/0168-PlayerPickupExperienceEvent.patch
index 7a00661b0c..3eeeb053ac 100644
--- a/patches/server/0168-PlayerPickupExperienceEvent.patch
+++ b/patches/unapplied/server/0168-PlayerPickupExperienceEvent.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] PlayerPickupExperienceEvent
 Allows plugins to cancel a player picking up an experience orb
 
 diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-index 6de7fcccb6da757185a38b79b3a22821b1186201..ff682a671f04a333615c4f22dc4b2aedd00eb117 100644
+index 9d1cce3fb02bb2c3ff71055fbafc974b6b98625a..2a192d0c1de8ab5440daacf591ff08f74cff9ff3 100644
 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 @@ -312,7 +312,7 @@ public class ExperienceOrb extends Entity {
diff --git a/patches/server/0169-Ability-to-apply-mending-to-XP-API.patch b/patches/unapplied/server/0169-Ability-to-apply-mending-to-XP-API.patch
index 36c186c604..36c186c604 100644
--- a/patches/server/0169-Ability-to-apply-mending-to-XP-API.patch
+++ b/patches/unapplied/server/0169-Ability-to-apply-mending-to-XP-API.patch
diff --git a/patches/server/0170-PlayerNaturallySpawnCreaturesEvent.patch b/patches/unapplied/server/0170-PlayerNaturallySpawnCreaturesEvent.patch
index dacc3de348..dacc3de348 100644
--- a/patches/server/0170-PlayerNaturallySpawnCreaturesEvent.patch
+++ b/patches/unapplied/server/0170-PlayerNaturallySpawnCreaturesEvent.patch
diff --git a/patches/server/0171-Add-setPlayerProfile-API-for-Skulls.patch b/patches/unapplied/server/0171-Add-setPlayerProfile-API-for-Skulls.patch
index 9a88d6ffaf..9a88d6ffaf 100644
--- a/patches/server/0171-Add-setPlayerProfile-API-for-Skulls.patch
+++ b/patches/unapplied/server/0171-Add-setPlayerProfile-API-for-Skulls.patch
diff --git a/patches/server/0172-PreCreatureSpawnEvent.patch b/patches/unapplied/server/0172-PreCreatureSpawnEvent.patch
index ba6c94c19d..ba6c94c19d 100644
--- a/patches/server/0172-PreCreatureSpawnEvent.patch
+++ b/patches/unapplied/server/0172-PreCreatureSpawnEvent.patch
diff --git a/patches/server/0173-Fill-Profile-Property-Events.patch b/patches/unapplied/server/0173-Fill-Profile-Property-Events.patch
index 4e37684e36..4e37684e36 100644
--- a/patches/server/0173-Fill-Profile-Property-Events.patch
+++ b/patches/unapplied/server/0173-Fill-Profile-Property-Events.patch
diff --git a/patches/server/0174-Add-PlayerAdvancementCriterionGrantEvent.patch b/patches/unapplied/server/0174-Add-PlayerAdvancementCriterionGrantEvent.patch
index 4ac554554f..4ac554554f 100644
--- a/patches/server/0174-Add-PlayerAdvancementCriterionGrantEvent.patch
+++ b/patches/unapplied/server/0174-Add-PlayerAdvancementCriterionGrantEvent.patch
diff --git a/patches/server/0175-Add-ArmorStand-Item-Meta.patch b/patches/unapplied/server/0175-Add-ArmorStand-Item-Meta.patch
index 53033be4f9..53033be4f9 100644
--- a/patches/server/0175-Add-ArmorStand-Item-Meta.patch
+++ b/patches/unapplied/server/0175-Add-ArmorStand-Item-Meta.patch
diff --git a/patches/server/0176-Extend-Player-Interact-cancellation.patch b/patches/unapplied/server/0176-Extend-Player-Interact-cancellation.patch
index b72a58cab5..2622e55cf4 100644
--- a/patches/server/0176-Extend-Player-Interact-cancellation.patch
+++ b/patches/unapplied/server/0176-Extend-Player-Interact-cancellation.patch
@@ -13,7 +13,7 @@ Update adjacent blocks of doors, double plants, pistons and beds
 when cancelling interaction.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 16468dfd657501f6fd5eefa4c32682e24eaba22d..7adf7d1248680e591638298f13f5ae88788f5e4c 100644
+index 61bc50ef899d2867d4f3c762b71012b27d74e7f6..5f79367fda576300c59774d69089f8f1c4408f8a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -519,7 +519,13 @@ public class ServerPlayerGameMode {
diff --git a/patches/server/0177-Tameable-getOwnerUniqueId-API.patch b/patches/unapplied/server/0177-Tameable-getOwnerUniqueId-API.patch
index 3cdc82d136..739f4d8b9c 100644
--- a/patches/server/0177-Tameable-getOwnerUniqueId-API.patch
+++ b/patches/unapplied/server/0177-Tameable-getOwnerUniqueId-API.patch
@@ -7,7 +7,7 @@ This is faster if all you need is the UUID, as .getOwner() will cause
 an OfflinePlayer to be loaded from disk.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
-index 4bb5e953ec0ad6a2e068cb26237bc59e68c13699..3f1f4d65525562b3117fdc21c8a7f535b12c3c46 100644
+index 81c34b5245133cdd119f36c6bc084fb8d99f97f8..264b3fb45c47fbb6be78262838a5c0438860915f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
 @@ -88,6 +88,10 @@ public abstract class CraftAbstractHorse extends CraftAnimals implements Abstrac
@@ -22,7 +22,7 @@ index 4bb5e953ec0ad6a2e068cb26237bc59e68c13699..3f1f4d65525562b3117fdc21c8a7f535
          return this.getHandle().getOwnerUUID();
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
-index f225da459d0c9b5b5322ba3256e63880a7b4ad5d..428437970cac144be53cd0e30af7af0cd1ce603b 100644
+index 8df43597e4d60be875c27c65e0e5c69ad60d5ce2..a06679e1e5686d9bd601b3dcf8492add58918bc4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
 @@ -17,6 +17,10 @@ public class CraftTameableAnimal extends CraftAnimals implements Tameable, Creat
diff --git a/patches/server/0178-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/patches/unapplied/server/0178-Toggleable-player-crits-helps-mitigate-hacked-client.patch
index 69ff693120..36fe95f2c9 100644
--- a/patches/server/0178-Toggleable-player-crits-helps-mitigate-hacked-client.patch
+++ b/patches/unapplied/server/0178-Toggleable-player-crits-helps-mitigate-hacked-client.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Toggleable player crits, helps mitigate hacked clients.
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 42663ab48cb8a18c5e724ca840bc6f50d9b91170..dabd68122861d673fc70cb1c66d24cb176129965 100644
+index cafcb53b9a35971a4c0c45fb20de072d2f07b829..695f19c77074f910fcd8c1a31d2e70cab10abb19 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1247,6 +1247,7 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0179-Disable-Explicit-Network-Manager-Flushing.patch b/patches/unapplied/server/0179-Disable-Explicit-Network-Manager-Flushing.patch
index a6f5d8c10c..a6f5d8c10c 100644
--- a/patches/server/0179-Disable-Explicit-Network-Manager-Flushing.patch
+++ b/patches/unapplied/server/0179-Disable-Explicit-Network-Manager-Flushing.patch
diff --git a/patches/server/0180-Implement-extended-PaperServerListPingEvent.patch b/patches/unapplied/server/0180-Implement-extended-PaperServerListPingEvent.patch
index c91d2d9333..289bb25aae 100644
--- a/patches/server/0180-Implement-extended-PaperServerListPingEvent.patch
+++ b/patches/unapplied/server/0180-Implement-extended-PaperServerListPingEvent.patch
@@ -181,7 +181,7 @@ index 0000000000000000000000000000000000000000..6b0bdc266109cdfb874f08bf74323603
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ee27251b9decc00a0094611cf79644bd83bce5c7..52f5c91d71a8fc86d14c3c4c9e258b9cf70ad57b 100644
+index 73155c8cb02a6156c1e48f9c75f512441f8b85a1..beebc3ed13b200a0d6585387bb7e06a6aaa07940 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -3,6 +3,9 @@ package net.minecraft.server;
@@ -204,7 +204,7 @@ index ee27251b9decc00a0094611cf79644bd83bce5c7..52f5c91d71a8fc86d14c3c4c9e258b9c
              int k = Mth.nextInt(this.random, 0, list.size() - j);
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerStatusPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerStatusPacketListenerImpl.java
-index d99b2235038eb1aba8cda474c4aa51e207149ef4..2c13147bc063a09bb7907d6f90c3a1e811a09eb1 100644
+index 7dd3dfd2ccc820d45849a89707239b7dbcaf44c3..e5006e7672ba79ed4bcf2c4173c5a9ed4c68395b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerStatusPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerStatusPacketListenerImpl.java
 @@ -48,6 +48,8 @@ public class ServerStatusPacketListenerImpl implements ServerStatusPacketListene
@@ -227,7 +227,7 @@ index d99b2235038eb1aba8cda474c4aa51e207149ef4..2c13147bc063a09bb7907d6f90c3a1e8
      }
  
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 489ce6f439778b26eb33ede9432681d4bf9e0116..ddc5f2d9aa7dda6aff132392927e3d7e3674dbff 100644
+index bf368d3ab947f027eaffb5498c45429bf702788c..99c82b9c82770df22a043d1927a1ad820e95d724 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -289,7 +289,7 @@ public class SpigotConfig
diff --git a/patches/server/0181-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/patches/unapplied/server/0181-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
index 8d72fc7052..6c1bca830d 100644
--- a/patches/server/0181-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
+++ b/patches/unapplied/server/0181-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent
 This will allow you to change the players name or skin on login.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 1202a60cf955dbfbfc2135c06d3304f215b23c2c..41de3c342f1dae9fc6af1b4938a676d337bcf5fa 100644
+index 2ecc29755eb0e79d49f0713e56849d7971dd38ed..41ba6f0c88b6205bf33de962c0bc545a0ac40c74 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -292,8 +292,16 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
diff --git a/patches/server/0182-Player.setPlayerProfile-API.patch b/patches/unapplied/server/0182-Player.setPlayerProfile-API.patch
index 58b8e0eee4..58b8e0eee4 100644
--- a/patches/server/0182-Player.setPlayerProfile-API.patch
+++ b/patches/unapplied/server/0182-Player.setPlayerProfile-API.patch
diff --git a/patches/server/0183-getPlayerUniqueId-API.patch b/patches/unapplied/server/0183-getPlayerUniqueId-API.patch
index ecbab9fb8a..d3d6d17d6c 100644
--- a/patches/server/0183-getPlayerUniqueId-API.patch
+++ b/patches/unapplied/server/0183-getPlayerUniqueId-API.patch
@@ -9,7 +9,7 @@ In Offline Mode, will return an Offline UUID
 This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 654c174df812271e31c72a88445df57ba8aca675..0dc45f47960eff60f5d779ee88d49f7477c41944 100644
+index 3ceebd86f44d1997201c34559d1b63004a973282..32f57ed7bb7c203ac126a4a0877e08c966c1638c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1793,6 +1793,25 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0184-Improved-Async-Task-Scheduler.patch b/patches/unapplied/server/0184-Improved-Async-Task-Scheduler.patch
index adf1ccd429..e8a6c646f6 100644
--- a/patches/server/0184-Improved-Async-Task-Scheduler.patch
+++ b/patches/unapplied/server/0184-Improved-Async-Task-Scheduler.patch
@@ -159,7 +159,7 @@ index 0000000000000000000000000000000000000000..3c1992e212a6d6f1db4d5b807b38d719
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index ef4fdfa3fbe8216a0a020949347bc992cd5c0c60..918e11422854d7301c84b466533770c2a429a682 100644
+index b1e61ce608eeacdbb70849c1e3e39daf37b3f2a2..215310984100722757d9dd38182f7cbc163a4a0f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -75,7 +75,7 @@ public class CraftScheduler implements BukkitScheduler {
diff --git a/patches/server/0185-Make-legacy-ping-handler-more-reliable.patch b/patches/unapplied/server/0185-Make-legacy-ping-handler-more-reliable.patch
index e9431bd1eb..e9431bd1eb 100644
--- a/patches/server/0185-Make-legacy-ping-handler-more-reliable.patch
+++ b/patches/unapplied/server/0185-Make-legacy-ping-handler-more-reliable.patch
diff --git a/patches/server/0186-Call-PaperServerListPingEvent-for-legacy-pings.patch b/patches/unapplied/server/0186-Call-PaperServerListPingEvent-for-legacy-pings.patch
index 5265180dd5..5265180dd5 100644
--- a/patches/server/0186-Call-PaperServerListPingEvent-for-legacy-pings.patch
+++ b/patches/unapplied/server/0186-Call-PaperServerListPingEvent-for-legacy-pings.patch
diff --git a/patches/server/0187-Flag-to-disable-the-channel-limit.patch b/patches/unapplied/server/0187-Flag-to-disable-the-channel-limit.patch
index d181448d30..d181448d30 100644
--- a/patches/server/0187-Flag-to-disable-the-channel-limit.patch
+++ b/patches/unapplied/server/0187-Flag-to-disable-the-channel-limit.patch
diff --git a/patches/server/0188-Add-openSign-method-to-HumanEntity.patch b/patches/unapplied/server/0188-Add-openSign-method-to-HumanEntity.patch
index 65af9d2231..3ccb99a8ba 100644
--- a/patches/server/0188-Add-openSign-method-to-HumanEntity.patch
+++ b/patches/unapplied/server/0188-Add-openSign-method-to-HumanEntity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add openSign method to HumanEntity
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index c40b3b8ff02c0e21fab53f6749f9c72b7e3c48a1..e5b2686e466a2604ebcdb6e5c3b6fb7ff7bc6eec 100644
+index 32ad04d66b776aa1c300cca3c5eeb332d75ea5cc..602cf19007c622ab9bb12a7018643cf05688f33e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -626,6 +626,12 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/patches/server/0189-Configurable-sprint-interruption-on-attack.patch b/patches/unapplied/server/0189-Configurable-sprint-interruption-on-attack.patch
index 32fabe624a..ad0d05aba7 100644
--- a/patches/server/0189-Configurable-sprint-interruption-on-attack.patch
+++ b/patches/unapplied/server/0189-Configurable-sprint-interruption-on-attack.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable sprint interruption on attack
 If the sprint interruption is disabled players continue sprinting when they attack entities.
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index dabd68122861d673fc70cb1c66d24cb176129965..4a3c6a583672179d4dd81726ef87d9d584dd139d 100644
+index 695f19c77074f910fcd8c1a31d2e70cab10abb19..502f42c81fb40bead619fb36f5caf2e0fe739c8b 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1296,7 +1296,11 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0190-EndermanEscapeEvent.patch b/patches/unapplied/server/0190-EndermanEscapeEvent.patch
index 46b4ce6fd7..3938ddc0cc 100644
--- a/patches/server/0190-EndermanEscapeEvent.patch
+++ b/patches/unapplied/server/0190-EndermanEscapeEvent.patch
@@ -8,7 +8,7 @@ Fires an event anytime an enderman intends to teleport away from the player
 You may cancel this, enabling ranged attacks to damage the enderman for example.
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index 3a5cf39c59fd14db865341f551bb67c9dc869ffd..1dea327e8df8651940f204bb96f56a8f6294aaed 100644
+index 4ad0a65cce22d92972a15c18ac6e213012b90c0a..c897d55acdceae54bc2e7f3f3694ce421a8df687 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 @@ -124,6 +124,12 @@ public class EnderMan extends Monster implements NeutralMob {
diff --git a/patches/server/0191-Enderman.teleportRandomly.patch b/patches/unapplied/server/0191-Enderman.teleportRandomly.patch
index d5a1395578..aeb2e69493 100644
--- a/patches/server/0191-Enderman.teleportRandomly.patch
+++ b/patches/unapplied/server/0191-Enderman.teleportRandomly.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Enderman.teleportRandomly()
 Ability to trigger the vanilla "teleport randomly" mechanic of an enderman.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
-index 0e13edd23016a6ffe6492de322e1d675137e3c9e..cb161c3d1a08d9c143201040018664298e98eafe 100644
+index 9074ef5427fea4035a08459e93f2663a3803cbe8..21dc209e6f98b6306833b41e2763e746047d5a94 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
 @@ -17,6 +17,7 @@ public class CraftEnderman extends CraftMonster implements Enderman {
diff --git a/patches/server/0192-Block-Enderpearl-Travel-Exploit.patch b/patches/unapplied/server/0192-Block-Enderpearl-Travel-Exploit.patch
index bac68c7c20..92c2588fbb 100644
--- a/patches/server/0192-Block-Enderpearl-Travel-Exploit.patch
+++ b/patches/unapplied/server/0192-Block-Enderpearl-Travel-Exploit.patch
@@ -16,7 +16,7 @@ public net.minecraft.world.entity.projectile.Projectile cachedOwner
 public net.minecraft.world.entity.projectile.Projectile ownerUUID
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 10c492e57958335a0f054f17c985209238df8b63..445b8839d2a7a5ec2debb853d606e499c2a1f20b 100644
+index b82f5d7eeb934d92f858a04f018c3bb05483fff6..39cabe9d047a44452de25be5937cdb2dd66c17ab 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2320,6 +2320,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0193-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/unapplied/server/0193-Expand-World.spawnParticle-API-and-add-Builder.patch
index f2e6033ee2..f2e6033ee2 100644
--- a/patches/server/0193-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/patches/unapplied/server/0193-Expand-World.spawnParticle-API-and-add-Builder.patch
diff --git a/patches/server/0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/patches/unapplied/server/0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
index 4a917ed814..4a917ed814 100644
--- a/patches/server/0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
+++ b/patches/unapplied/server/0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
diff --git a/patches/server/0195-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/patches/unapplied/server/0195-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
index b9c45b572d..b9c45b572d 100644
--- a/patches/server/0195-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
+++ b/patches/unapplied/server/0195-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
diff --git a/patches/server/0196-EndermanAttackPlayerEvent.patch b/patches/unapplied/server/0196-EndermanAttackPlayerEvent.patch
index 9c359b7cfb..7870cc0325 100644
--- a/patches/server/0196-EndermanAttackPlayerEvent.patch
+++ b/patches/unapplied/server/0196-EndermanAttackPlayerEvent.patch
@@ -8,7 +8,7 @@ Allow control over whether or not an enderman aggros a player.
 This allows you to override/extend the pumpkin/stare logic.
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index 1dea327e8df8651940f204bb96f56a8f6294aaed..bf5b7b996c9141c7cef9c281323115bd593dc777 100644
+index c897d55acdceae54bc2e7f3f3694ce421a8df687..5c620989acaff4fdb842944ea2d8ae331699a2b4 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 @@ -236,7 +236,15 @@ public class EnderMan extends Monster implements NeutralMob {
diff --git a/patches/server/0197-WitchConsumePotionEvent.patch b/patches/unapplied/server/0197-WitchConsumePotionEvent.patch
index 23ce9ddbba..23ce9ddbba 100644
--- a/patches/server/0197-WitchConsumePotionEvent.patch
+++ b/patches/unapplied/server/0197-WitchConsumePotionEvent.patch
diff --git a/patches/server/0198-WitchThrowPotionEvent.patch b/patches/unapplied/server/0198-WitchThrowPotionEvent.patch
index 860191b9db..860191b9db 100644
--- a/patches/server/0198-WitchThrowPotionEvent.patch
+++ b/patches/unapplied/server/0198-WitchThrowPotionEvent.patch
diff --git a/patches/server/0199-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/patches/unapplied/server/0199-Allow-spawning-Item-entities-with-World.spawnEntity.patch
index ea1eda36f6..832a8663d0 100644
--- a/patches/server/0199-Allow-spawning-Item-entities-with-World.spawnEntity.patch
+++ b/patches/unapplied/server/0199-Allow-spawning-Item-entities-with-World.spawnEntity.patch
@@ -8,7 +8,7 @@ This API has more capabilities than .dropItem with the Consumer function
 Item can be set inside of the Consumer pre spawn function.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 134b138abdf17fae340226ecac3868ad7a993086..75d4c33768a8ab15a94bcb71b2aa724cad1ce0aa 100644
+index b286deebacaf00ff21585cfbc75291a8d80965c4..f92f726d2ab63694bad0d6eb0ee718ae6194144f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -593,6 +593,10 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
diff --git a/patches/server/0200-WitchReadyPotionEvent.patch b/patches/unapplied/server/0200-WitchReadyPotionEvent.patch
index d22f2f2885..d22f2f2885 100644
--- a/patches/server/0200-WitchReadyPotionEvent.patch
+++ b/patches/unapplied/server/0200-WitchReadyPotionEvent.patch
diff --git a/patches/server/0201-ItemStack-getMaxItemUseDuration.patch b/patches/unapplied/server/0201-ItemStack-getMaxItemUseDuration.patch
index 538077687e..cfd7cd0d9f 100644
--- a/patches/server/0201-ItemStack-getMaxItemUseDuration.patch
+++ b/patches/unapplied/server/0201-ItemStack-getMaxItemUseDuration.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] ItemStack#getMaxItemUseDuration
 Allows you to determine how long it takes to use a usable/consumable item
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 4dcbd1ed61070c12adf5871a595875ca60110c5d..00bdaff22deab7a9f328670917fe2bae01e37a73 100644
+index f42f6f5fb7a2398c183eb9fa1a964a7680b687b8..4fa1085532e9374aad3c877ca6aba1b251640cc8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -184,6 +184,13 @@ public final class CraftItemStack extends ItemStack {
diff --git a/patches/server/0202-Implement-EntityTeleportEndGatewayEvent.patch b/patches/unapplied/server/0202-Implement-EntityTeleportEndGatewayEvent.patch
index 10ec95312f..10ec95312f 100644
--- a/patches/server/0202-Implement-EntityTeleportEndGatewayEvent.patch
+++ b/patches/unapplied/server/0202-Implement-EntityTeleportEndGatewayEvent.patch
diff --git a/patches/server/0203-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/patches/unapplied/server/0203-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
index ca3c8f8d69..ca3c8f8d69 100644
--- a/patches/server/0203-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
+++ b/patches/unapplied/server/0203-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
diff --git a/patches/server/0204-Fix-CraftEntity-hashCode.patch b/patches/unapplied/server/0204-Fix-CraftEntity-hashCode.patch
index e44e036f31..653fd8853a 100644
--- a/patches/server/0204-Fix-CraftEntity-hashCode.patch
+++ b/patches/unapplied/server/0204-Fix-CraftEntity-hashCode.patch
@@ -21,7 +21,7 @@ check is essentially the same as this.getHandle() == other.getHandle()
 However, replaced it too to make it clearer of intent.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 714a8fb1715751038c411ea7f2f0cf37ee41abd8..5e9642662716a0e60a700e6359539339f1cf5230 100644
+index cc858aa0bdcfca69c37f962137e8caf9a8e33fd2..f1df0a172e7e1589b9a6af6fab87ce0251c5a557 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -840,14 +840,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0205-Configurable-Alternative-LootPool-Luck-Formula.patch b/patches/unapplied/server/0205-Configurable-Alternative-LootPool-Luck-Formula.patch
index f5f2a2bcbf..f5f2a2bcbf 100644
--- a/patches/server/0205-Configurable-Alternative-LootPool-Luck-Formula.patch
+++ b/patches/unapplied/server/0205-Configurable-Alternative-LootPool-Luck-Formula.patch
diff --git a/patches/server/0206-Print-Error-details-when-failing-to-save-player-data.patch b/patches/unapplied/server/0206-Print-Error-details-when-failing-to-save-player-data.patch
index 2421d8de01..2421d8de01 100644
--- a/patches/server/0206-Print-Error-details-when-failing-to-save-player-data.patch
+++ b/patches/unapplied/server/0206-Print-Error-details-when-failing-to-save-player-data.patch
diff --git a/patches/server/0207-Make-shield-blocking-delay-configurable.patch b/patches/unapplied/server/0207-Make-shield-blocking-delay-configurable.patch
index d54988683e..6e81759062 100644
--- a/patches/server/0207-Make-shield-blocking-delay-configurable.patch
+++ b/patches/unapplied/server/0207-Make-shield-blocking-delay-configurable.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Make shield blocking delay configurable
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 1371e57840727fee82186c44618064e8e147d260..91de8c2ca2bd681c8289ce0c59f3ddb1d56be83e 100644
+index f687bfd7cf820c1e7443c8b86ef9ca28a4768b02..8892714b9e7776183da9d9253db2c56da43319c6 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3806,12 +3806,24 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -35,7 +35,7 @@ index 1371e57840727fee82186c44618064e8e147d260..91de8c2ca2bd681c8289ce0c59f3ddb1
          return this.isShiftKeyDown();
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 0dd733873606ae47deb5956ed1170d4b9ad3b890..d38f1661c1d5bfc4a0c5601bfac959b7527022ed 100644
+index 5c0c4051e2f63e923e99a621d04d6a5dd7c86b44..6544b8160af89e93e508c5d466c22ba389b7621c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -810,5 +810,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0208-Improve-EntityShootBowEvent.patch b/patches/unapplied/server/0208-Improve-EntityShootBowEvent.patch
index eef1882378..eef1882378 100644
--- a/patches/server/0208-Improve-EntityShootBowEvent.patch
+++ b/patches/unapplied/server/0208-Improve-EntityShootBowEvent.patch
diff --git a/patches/server/0209-PlayerReadyArrowEvent.patch b/patches/unapplied/server/0209-PlayerReadyArrowEvent.patch
index 1508f4e080..b5be6a2e88 100644
--- a/patches/server/0209-PlayerReadyArrowEvent.patch
+++ b/patches/unapplied/server/0209-PlayerReadyArrowEvent.patch
@@ -7,7 +7,7 @@ Called when a player is firing a bow and the server is choosing an arrow to use.
 Plugins can skip selection of certain arrows and control which is used.
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 4a3c6a583672179d4dd81726ef87d9d584dd139d..799ebcf4c148d402039efc369fd4cda5354c5473 100644
+index 502f42c81fb40bead619fb36f5caf2e0fe739c8b..587e3529b5b658ab943b4e7ffaa235de34542e9c 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -2262,18 +2262,29 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0210-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch b/patches/unapplied/server/0210-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch
index b06431eb02..57a11790c2 100644
--- a/patches/server/0210-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch
+++ b/patches/unapplied/server/0210-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch
@@ -9,7 +9,7 @@ Co-authored-by: aerulion <[email protected]>
 This event is called when an entity receives knockback by another entity.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 407195f54ec5e5a86a228d301222022cc48cdeb6..c039409ebb50496f79d535fcebcc4e7082d0f81c 100644
+index 4e20bdcd15b030b408a8ee640f36c51b45a90e26..7c4569fd5b331576be43fbdab30721134ea101fa 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1902,8 +1902,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0211-Expand-Explosions-API.patch b/patches/unapplied/server/0211-Expand-Explosions-API.patch
index 08a492eabd..08a492eabd 100644
--- a/patches/server/0211-Expand-Explosions-API.patch
+++ b/patches/unapplied/server/0211-Expand-Explosions-API.patch
diff --git a/patches/server/0212-LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/unapplied/server/0212-LivingEntity-Hand-Raised-Item-Use-API.patch
index 816010e115..bd1ecb6775 100644
--- a/patches/server/0212-LivingEntity-Hand-Raised-Item-Use-API.patch
+++ b/patches/unapplied/server/0212-LivingEntity-Hand-Raised-Item-Use-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API
 How long an entity has raised hands to charge an attack or use an item
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index d38f1661c1d5bfc4a0c5601bfac959b7527022ed..c2e83cc533decd31f21c7c732cdc32d8b52bc418 100644
+index 6544b8160af89e93e508c5d466c22ba389b7621c..754a4d026bdb9b3fc7781cd5e10bf01c70d2760e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -820,5 +820,30 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0213-RangedEntity-API.patch b/patches/unapplied/server/0213-RangedEntity-API.patch
index 48ffa5b24e..f20290a950 100644
--- a/patches/server/0213-RangedEntity-API.patch
+++ b/patches/unapplied/server/0213-RangedEntity-API.patch
@@ -57,7 +57,7 @@ index db6ad6eea8fa6f2755bbb0e1325df8bda98e708a..5ff566186431440c25a26900aba14e4a
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftDrowned.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftDrowned.java
-index b91d0841b7189d560150d41877e4a0bdea161539..14b575254171f66b8792033c93cf5a325a42b467 100644
+index c0e59845a7350b0fdb43eaff8a9ec81793e464d5..51fc4acae9f20e8891069704e4a27f212b870766 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftDrowned.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftDrowned.java
 @@ -3,7 +3,7 @@ package org.bukkit.craftbukkit.entity;
@@ -122,7 +122,7 @@ index d82cea48d9baeaba4dfa32540dcc9ca73651608b..2638c341bc02f201f7ab17fdebcdbdf3
      public CraftPillager(CraftServer server, net.minecraft.world.entity.monster.Pillager entity) {
          super(server, entity);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java
-index cb9efd2fa886d721a802d1c644d9b2c7e6eb948a..5d2e0fb911265f1184de5434464378ffba98d379 100644
+index 1f373896cc08cf78bc5f5b188b323c1fff9fd9f1..1e9807b8f468742d208f817e22d7625106fc1b58 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java
 @@ -4,7 +4,7 @@ import net.minecraft.world.entity.animal.SnowGolem;
@@ -135,7 +135,7 @@ index cb9efd2fa886d721a802d1c644d9b2c7e6eb948a..5d2e0fb911265f1184de5434464378ff
          super(server, entity);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
-index 399b045478d93b2b85b0b25c2dec427dc6a45166..5024a102fe71d7013bc809bb4140763bd4c466e7 100644
+index bf6acf783d6f2b02f528a4247ad11f3cd181c004..524b5ba5995affc09eedf9a85d22e8b0b4efc156 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
 @@ -3,7 +3,7 @@ package org.bukkit.craftbukkit.entity;
@@ -148,7 +148,7 @@ index 399b045478d93b2b85b0b25c2dec427dc6a45166..5024a102fe71d7013bc809bb4140763b
          super(server, entity);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
-index 2536d59a01e3557678125e26ace9676d7aec6099..83353863e0c58995d3699d5f812d38cae056f695 100644
+index 59bdb36ca10fa56a83a44b53e482480714cc7bd9..1113533d281ed159bb735040fb1f913482debf3a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
 @@ -9,7 +9,7 @@ import org.bukkit.craftbukkit.boss.CraftBossBar;
diff --git a/patches/server/0214-Add-config-to-disable-ender-dragon-legacy-check.patch b/patches/unapplied/server/0214-Add-config-to-disable-ender-dragon-legacy-check.patch
index adc52710df..adc52710df 100644
--- a/patches/server/0214-Add-config-to-disable-ender-dragon-legacy-check.patch
+++ b/patches/unapplied/server/0214-Add-config-to-disable-ender-dragon-legacy-check.patch
diff --git a/patches/server/0215-Implement-World.getEntity-UUID-API.patch b/patches/unapplied/server/0215-Implement-World.getEntity-UUID-API.patch
index ec4cfc9855..ec4cfc9855 100644
--- a/patches/server/0215-Implement-World.getEntity-UUID-API.patch
+++ b/patches/unapplied/server/0215-Implement-World.getEntity-UUID-API.patch
diff --git a/patches/server/0216-InventoryCloseEvent-Reason-API.patch b/patches/unapplied/server/0216-InventoryCloseEvent-Reason-API.patch
index 1717957631..1717957631 100644
--- a/patches/server/0216-InventoryCloseEvent-Reason-API.patch
+++ b/patches/unapplied/server/0216-InventoryCloseEvent-Reason-API.patch
diff --git a/patches/server/0217-Vex-get-setSummoner-API.patch b/patches/unapplied/server/0217-Vex-get-setSummoner-API.patch
index f0dff217b9..9c014ff1fc 100644
--- a/patches/server/0217-Vex-get-setSummoner-API.patch
+++ b/patches/unapplied/server/0217-Vex-get-setSummoner-API.patch
@@ -9,7 +9,7 @@ Allow setting the vex's summoner
 Co-authored-by: BillyGalbreath <[email protected]>
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
-index bf9e23702d30838770d612d7644713f6510497be..c4f7216c7ca7a49048fcf5240ef2a8f80e843f1c 100644
+index f816e30e36042438fa5ead72ce25e7b5bce232bb..1cfbe9c476f4a254edf3edf4b70696bbaba78558 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
 @@ -18,6 +18,19 @@ public class CraftVex extends CraftMonster implements Vex {
diff --git a/patches/server/0218-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/patches/unapplied/server/0218-Refresh-player-inventory-when-cancelling-PlayerInter.patch
index 3439b99842..3439b99842 100644
--- a/patches/server/0218-Refresh-player-inventory-when-cancelling-PlayerInter.patch
+++ b/patches/unapplied/server/0218-Refresh-player-inventory-when-cancelling-PlayerInter.patch
diff --git a/patches/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch b/patches/unapplied/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
index 8a66c6190d..e7d6aca094 100644
--- a/patches/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
+++ b/patches/unapplied/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use AsyncAppender to keep logging IO off main thread
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 05ca5df9b74ebf2b7d4674dabcbd88b7f8aaec53..d7b0aab57d3bd6f215876fd585b11f44b0c31829 100644
+index 8c17b903f077d3f7281b0090b9aefdbf1b59a17c..ce9ef2199364029c658812851d02047b982d92eb 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -37,6 +37,7 @@ dependencies {
diff --git a/patches/server/0220-add-more-information-to-Entity.toString.patch b/patches/unapplied/server/0220-add-more-information-to-Entity.toString.patch
index 0e0ae2885c..eaae26d94f 100644
--- a/patches/server/0220-add-more-information-to-Entity.toString.patch
+++ b/patches/unapplied/server/0220-add-more-information-to-Entity.toString.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] add more information to Entity.toString()
 UUID, ticks lived, valid, dead
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ca773bca9df5a313d979e97e3a5245e701353793..5ec7104201f4280208d8f0e0bae6b5e481c7bc56 100644
+index 7c4569fd5b331576be43fbdab30721134ea101fa..ef806837fd58a75d64da95e00e843a5ea0f32613 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3173,7 +3173,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0221-EnderDragon-Events.patch b/patches/unapplied/server/0221-EnderDragon-Events.patch
index 0559cac19b..0559cac19b 100644
--- a/patches/server/0221-EnderDragon-Events.patch
+++ b/patches/unapplied/server/0221-EnderDragon-Events.patch
diff --git a/patches/server/0222-PlayerElytraBoostEvent.patch b/patches/unapplied/server/0222-PlayerElytraBoostEvent.patch
index e99be47ba0..e99be47ba0 100644
--- a/patches/server/0222-PlayerElytraBoostEvent.patch
+++ b/patches/unapplied/server/0222-PlayerElytraBoostEvent.patch
diff --git a/patches/server/0223-PlayerLaunchProjectileEvent.patch b/patches/unapplied/server/0223-PlayerLaunchProjectileEvent.patch
index 558aaf5b04..558aaf5b04 100644
--- a/patches/server/0223-PlayerLaunchProjectileEvent.patch
+++ b/patches/unapplied/server/0223-PlayerLaunchProjectileEvent.patch
diff --git a/patches/server/0224-Improve-BlockPosition-inlining.patch b/patches/unapplied/server/0224-Improve-BlockPosition-inlining.patch
index 208af75831..208af75831 100644
--- a/patches/server/0224-Improve-BlockPosition-inlining.patch
+++ b/patches/unapplied/server/0224-Improve-BlockPosition-inlining.patch
diff --git a/patches/server/0225-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/patches/unapplied/server/0225-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
index 45c55e0e80..283aa6858d 100644
--- a/patches/server/0225-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/patches/unapplied/server/0225-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Option to prevent armor stands from doing entity lookups
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-index 37c19685049ef6b267a74a4323dc4ec33159c3d2..4859a4c78e59745ef75155bc8d6915fce5a217d8 100644
+index 5a838c7070fc5ed8f8f2fdb0073221f4c22e1334..228aed6b75296cf0eb9d611c2396b6a8b6e8018b 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 @@ -337,6 +337,7 @@ public class ArmorStand extends LivingEntity {
@@ -17,7 +17,7 @@ index 37c19685049ef6b267a74a4323dc4ec33159c3d2..4859a4c78e59745ef75155bc8d6915fc
          Iterator iterator = list.iterator();
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index ce24a52b2b9fb0ae7cfb085a204de8780bc8f5d6..0b02ba70956ea1352ea8e67957b3789408b67f6b 100644
+index be48f90db79509035a87103f20582fb2500449ad..b52a761e84e00f2ccac7b1b9db73e70ffa1c681b 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -849,6 +849,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0226-Vanished-players-don-t-have-rights.patch b/patches/unapplied/server/0226-Vanished-players-don-t-have-rights.patch
index e7b95e4245..e7b95e4245 100644
--- a/patches/server/0226-Vanished-players-don-t-have-rights.patch
+++ b/patches/unapplied/server/0226-Vanished-players-don-t-have-rights.patch
diff --git a/patches/server/0227-Allow-disabling-armour-stand-ticking.patch b/patches/unapplied/server/0227-Allow-disabling-armour-stand-ticking.patch
index ee05ce58ed..bfa713e27e 100644
--- a/patches/server/0227-Allow-disabling-armour-stand-ticking.patch
+++ b/patches/unapplied/server/0227-Allow-disabling-armour-stand-ticking.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow disabling armour stand ticking
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-index 4859a4c78e59745ef75155bc8d6915fce5a217d8..5176e17e39719def9a97473b87cebf1719653e60 100644
+index 228aed6b75296cf0eb9d611c2396b6a8b6e8018b..1047d9a46314e264ab3f72122aedefd161c7851d 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 @@ -93,9 +93,16 @@ public class ArmorStand extends LivingEntity {
@@ -123,7 +123,7 @@ index 4859a4c78e59745ef75155bc8d6915fce5a217d8..5176e17e39719def9a97473b87cebf17
  
      public Rotations getHeadPose() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-index fc3b98746a558b3ad6c89543170225bdae1e63ba..f4d46cd34fb97ebbf2e95d905d315b93add958b8 100644
+index 52ffc401bbb9fa768534a4b871f9cc7dbebb8b20..9923cea74ba39a774d6b16a225bc3e455e54c418 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 @@ -232,5 +232,16 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
diff --git a/patches/server/0228-SkeletonHorse-Additions.patch b/patches/unapplied/server/0228-SkeletonHorse-Additions.patch
index efb850022d..16f74f0083 100644
--- a/patches/server/0228-SkeletonHorse-Additions.patch
+++ b/patches/unapplied/server/0228-SkeletonHorse-Additions.patch
@@ -65,7 +65,7 @@ index 36d793b492d9776ee36f8285b5bab09e6463cdce..a25497eec004add7408a63b1a0f09e3f
      default Player getNearestPlayer(Entity entity, double maxDistance) {
          return this.getNearestPlayer(entity.getX(), entity.getY(), entity.getZ(), maxDistance, false);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java
-index 1a631ab092bbd03d24a09e22992bb16c825e7043..bba6dcac6df4841561cf39b9ea0fc116f57a901b 100644
+index 248e4febbe8fe225920b6504d2c29d295cf09ec6..fbb47491dcc75f8247dee9f123f946f99ef1467f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java
 @@ -44,4 +44,16 @@ public class CraftSkeletonHorse extends CraftAbstractHorse implements SkeletonHo
diff --git a/patches/server/0229-Don-t-call-getItemMeta-on-hasItemMeta.patch b/patches/unapplied/server/0229-Don-t-call-getItemMeta-on-hasItemMeta.patch
index 208d14eeb6..7716da7d9c 100644
--- a/patches/server/0229-Don-t-call-getItemMeta-on-hasItemMeta.patch
+++ b/patches/unapplied/server/0229-Don-t-call-getItemMeta-on-hasItemMeta.patch
@@ -11,7 +11,7 @@ Returns true if getDamage() == 0 or has damage tag or other tag is set.
 Check the `ItemMetaTest#testTaggedButNotMeta` method to see how this method behaves.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 00bdaff22deab7a9f328670917fe2bae01e37a73..cee7a93cd516ed8f483fd29dfcd6a54f4c37e348 100644
+index 4fa1085532e9374aad3c877ca6aba1b251640cc8..221a2ccc4bf840aa301931f26c1198b36ec317fe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -678,7 +678,7 @@ public final class CraftItemStack extends ItemStack {
diff --git a/patches/server/0230-Implement-Expanded-ArmorStand-API.patch b/patches/unapplied/server/0230-Implement-Expanded-ArmorStand-API.patch
index bce62779d9..54d871b2b0 100644
--- a/patches/server/0230-Implement-Expanded-ArmorStand-API.patch
+++ b/patches/unapplied/server/0230-Implement-Expanded-ArmorStand-API.patch
@@ -14,7 +14,7 @@ public net.minecraft.world.entity.decoration.ArmorStand isDisabled(Lnet/minecraf
 Co-authored-by: SoSeDiK <[email protected]>
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-index f4d46cd34fb97ebbf2e95d905d315b93add958b8..273f3c029f878c8a30e4f0911d79195c023d3442 100644
+index 9923cea74ba39a774d6b16a225bc3e455e54c418..2c16cedf8cb2e4047415e056c419ed9c33c80e93 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 @@ -233,6 +233,147 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
diff --git a/patches/server/0231-AnvilDamageEvent.patch b/patches/unapplied/server/0231-AnvilDamageEvent.patch
index ad0982dd6c..267d158dc2 100644
--- a/patches/server/0231-AnvilDamageEvent.patch
+++ b/patches/unapplied/server/0231-AnvilDamageEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] AnvilDamageEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
-index b3d4b8a1a3fecd58edeed6562ffabe123569c139..d15f01f5a4f14d25ded9de015c70cbc7977a6a77 100644
+index d829173d2fc9fc0e12c24d736f1ed44417b81612..e97953e3dad164862d7e2f86bd86a6eff5b80ae2 100644
 --- a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
 @@ -108,6 +108,16 @@ public class AnvilMenu extends ItemCombinerMenu {
diff --git a/patches/server/0232-Add-TNTPrimeEvent.patch b/patches/unapplied/server/0232-Add-TNTPrimeEvent.patch
index ea29cd03f1..ea29cd03f1 100644
--- a/patches/server/0232-Add-TNTPrimeEvent.patch
+++ b/patches/unapplied/server/0232-Add-TNTPrimeEvent.patch
diff --git a/patches/server/0233-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/unapplied/server/0233-Break-up-and-make-tab-spam-limits-configurable.patch
index dc7530f5d9..dc7530f5d9 100644
--- a/patches/server/0233-Break-up-and-make-tab-spam-limits-configurable.patch
+++ b/patches/unapplied/server/0233-Break-up-and-make-tab-spam-limits-configurable.patch
diff --git a/patches/server/0234-Fix-NBT-type-issues.patch b/patches/unapplied/server/0234-Fix-NBT-type-issues.patch
index c39cef9705..c31b02c099 100644
--- a/patches/server/0234-Fix-NBT-type-issues.patch
+++ b/patches/unapplied/server/0234-Fix-NBT-type-issues.patch
@@ -8,7 +8,7 @@ Addresses two issues:
 - Allay duplication cooldown is saved and exposed as a long, but loaded as an int
 
 diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-index ff682a671f04a333615c4f22dc4b2aedd00eb117..8d8fe55a05eea237a8af99ed15ab16d6167daa77 100644
+index 2a192d0c1de8ab5440daacf591ff08f74cff9ff3..37cd883f4920d5e1e58900ebdcfd4495a0abd2ae 100644
 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 @@ -295,7 +295,7 @@ public class ExperienceOrb extends Entity {
diff --git a/patches/server/0235-Remove-unnecessary-itemmeta-handling.patch b/patches/unapplied/server/0235-Remove-unnecessary-itemmeta-handling.patch
index e56b2f033b..e56b2f033b 100644
--- a/patches/server/0235-Remove-unnecessary-itemmeta-handling.patch
+++ b/patches/unapplied/server/0235-Remove-unnecessary-itemmeta-handling.patch
diff --git a/patches/server/0236-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/unapplied/server/0236-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
index 2793d417bf..965db23d0c 100644
--- a/patches/server/0236-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
+++ b/patches/unapplied/server/0236-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
@@ -8,7 +8,7 @@ Add -Ddebug.entities=true to your JVM flags to gain more information
 1.17: Needs to be reworked for new entity storage system
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index c483acf248484220aaca2100c84e75f3b46fbd31..c69be9cb3f03ec50e4e57d7e1e93a83701e4cd6c 100644
+index ea520b828378c268d05425096c6493ca1c7ad385..8d3a9f8210bf529484aeaf84ef9a55b54ce8f2af 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -879,6 +879,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -29,7 +29,7 @@ index c483acf248484220aaca2100c84e75f3b46fbd31..c69be9cb3f03ec50e4e57d7e1e93a837
  
      protected void tick() {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 1170b2fb6396fab0aa30a097bc8957e2551f4f1c..5de07950d549716e917ec3fd2f364c994007333e 100644
+index 2268babbdcd023c1ec7b3746319acf4306845fee..c9f22e24223c409a7a3aec668f02a59ed5102524 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -221,6 +221,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -72,7 +72,7 @@ index 1170b2fb6396fab0aa30a097bc8957e2551f4f1c..5de07950d549716e917ec3fd2f364c99
              return false;
          } else {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 5ec7104201f4280208d8f0e0bae6b5e481c7bc56..63f9f874ef9da0d5f0c6d6df2901be27df5e30a0 100644
+index ef806837fd58a75d64da95e00e843a5ea0f32613..d8528c84c9cc1724b5100276ba624cf8627dc6ce 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -238,6 +238,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -85,7 +85,7 @@ index 5ec7104201f4280208d8f0e0bae6b5e481c7bc56..63f9f874ef9da0d5f0c6d6df2901be27
          if (this.bukkitEntity == null) {
              this.bukkitEntity = CraftEntity.getEntity(this.level.getCraftServer(), this);
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 8320bece16dfa339e33801e43ff2f297bc876001..18234d71eba7d2a2874f3e5c9628d82970acc033 100644
+index f17cc5da4eb4b4e5bcfae8b234358464f6188f4a..baee74186c6349efb8e5e9ff087a114c08c7ae72 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -150,6 +150,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0237-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/unapplied/server/0237-Add-Early-Warning-Feature-to-WatchDog.patch
index 3328925b2d..b795bcf15e 100644
--- a/patches/server/0237-Add-Early-Warning-Feature-to-WatchDog.patch
+++ b/patches/unapplied/server/0237-Add-Early-Warning-Feature-to-WatchDog.patch
@@ -33,7 +33,7 @@ index 567c8fdbb0e21ec9cfc511f8c7487340785d3c62..3e0217cb096ba7a8f589c052db170b84
          com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics();
          com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1b903cb9fb0ccbc0e282cad1f6638683ea9e3337..c073f455de6c0b484f5b2e3dcf5e2a11d0d0dc5f 100644
+index 32f57ed7bb7c203ac126a4a0877e08c966c1638c..5c39a02cb9db3d6c45b5cfe845a9be79cf7a1574 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -919,6 +919,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0238-Use-ConcurrentHashMap-in-JsonList.patch b/patches/unapplied/server/0238-Use-ConcurrentHashMap-in-JsonList.patch
index 065570f504..855fc95d51 100644
--- a/patches/server/0238-Use-ConcurrentHashMap-in-JsonList.patch
+++ b/patches/unapplied/server/0238-Use-ConcurrentHashMap-in-JsonList.patch
@@ -23,7 +23,7 @@ Modified isEmpty to use the isEmpty() method instead of the slightly confusing s
 The point of this is readability, but does have a side-benefit of a small microptimization
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 49d5410341e949b51c003a0c79d9d77ba5a723f9..98c4a1b8542486f5af1274f974b898a69f2684f1 100644
+index 12448b92ffe848c540fffbc58f8e377ee631ff48..3cd1563480d40ff358dce52891ba4bdc8d119888 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -636,7 +636,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0239-Use-a-Queue-for-Queueing-Commands.patch b/patches/unapplied/server/0239-Use-a-Queue-for-Queueing-Commands.patch
index 9f8ca5045b..7d8c8e7d18 100644
--- a/patches/server/0239-Use-a-Queue-for-Queueing-Commands.patch
+++ b/patches/unapplied/server/0239-Use-a-Queue-for-Queueing-Commands.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Use a Queue for Queueing Commands
 Lists are bad as Queues mmmkay.
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index e3754d916ce38d0e0e8b8dbb623016ee6ebf4800..7088e0fc8980dcc547d5703d21c55a26adb5d378 100644
+index 3e0217cb096ba7a8f589c052db170b84e4d41ddf..97f80226793e700c8b05e41005bb2751a6b00f33 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -69,7 +69,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0240-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/unapplied/server/0240-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
index 45533e8ac2..45533e8ac2 100644
--- a/patches/server/0240-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
+++ b/patches/unapplied/server/0240-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
diff --git a/patches/server/0241-Optimize-BlockPosition-helper-methods.patch b/patches/unapplied/server/0241-Optimize-BlockPosition-helper-methods.patch
index 892d0f1554..892d0f1554 100644
--- a/patches/server/0241-Optimize-BlockPosition-helper-methods.patch
+++ b/patches/unapplied/server/0241-Optimize-BlockPosition-helper-methods.patch
diff --git a/patches/server/0242-Restore-vanilla-default-mob-spawn-range-and-water-an.patch b/patches/unapplied/server/0242-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
index 016ef05f64..aa9cfcc962 100644
--- a/patches/server/0242-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
+++ b/patches/unapplied/server/0242-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Restore vanilla default mob-spawn-range and water animals
 
 
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index afe68aa28f8b39fd490f650a335c90818e1c9a8d..e873a311e2918e1cb72f190e14d088a3ed540aa8 100644
+index 8491ff48051224204b58d273c4971d16ab8867c1..81c76360e8c7389bafd61f38e6782668e8c65d27 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -190,7 +190,7 @@ public class SpigotWorldConfig
diff --git a/patches/server/0243-Slime-Pathfinder-Events.patch b/patches/unapplied/server/0243-Slime-Pathfinder-Events.patch
index c4e2d008b9..f9f2af92ae 100644
--- a/patches/server/0243-Slime-Pathfinder-Events.patch
+++ b/patches/unapplied/server/0243-Slime-Pathfinder-Events.patch
@@ -132,7 +132,7 @@ index 382cdfd7d7dceeeffed1cdc34b9e475a69b5c76b..4677e47e4a84d09025cfb9327c1ed3be
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
-index d4891e026c5ccc3d75d5b455661ab641b9d4a3b5..9b219beb8922bf0701e538bcf874f0eb922f60bb 100644
+index 3d991d9d9388108ec6d137950913209d61d132e7..3d9b7c0e128ea05bec5600c774e9685998b71cac 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
 @@ -28,4 +28,16 @@ public class CraftSlime extends CraftMob implements Slime, CraftEnemy {
diff --git a/patches/server/0244-Configurable-speed-for-water-flowing-over-lava.patch b/patches/unapplied/server/0244-Configurable-speed-for-water-flowing-over-lava.patch
index 126fd3bfab..126fd3bfab 100644
--- a/patches/server/0244-Configurable-speed-for-water-flowing-over-lava.patch
+++ b/patches/unapplied/server/0244-Configurable-speed-for-water-flowing-over-lava.patch
diff --git a/patches/server/0245-Optimize-CraftBlockData-Creation.patch b/patches/unapplied/server/0245-Optimize-CraftBlockData-Creation.patch
index 22f9194649..22f9194649 100644
--- a/patches/server/0245-Optimize-CraftBlockData-Creation.patch
+++ b/patches/unapplied/server/0245-Optimize-CraftBlockData-Creation.patch
diff --git a/patches/server/0246-Optimize-MappedRegistry.patch b/patches/unapplied/server/0246-Optimize-MappedRegistry.patch
index 294d542f51..294d542f51 100644
--- a/patches/server/0246-Optimize-MappedRegistry.patch
+++ b/patches/unapplied/server/0246-Optimize-MappedRegistry.patch
diff --git a/patches/server/0247-Add-PhantomPreSpawnEvent.patch b/patches/unapplied/server/0247-Add-PhantomPreSpawnEvent.patch
index e92632febe..e92632febe 100644
--- a/patches/server/0247-Add-PhantomPreSpawnEvent.patch
+++ b/patches/unapplied/server/0247-Add-PhantomPreSpawnEvent.patch
diff --git a/patches/server/0248-Add-More-Creeper-API.patch b/patches/unapplied/server/0248-Add-More-Creeper-API.patch
index 850909dc61..7f86a576b2 100644
--- a/patches/server/0248-Add-More-Creeper-API.patch
+++ b/patches/unapplied/server/0248-Add-More-Creeper-API.patch
@@ -38,7 +38,7 @@ index 17ce05e7f9d2615be28a095ef6d3126885df8771..7fe90ebc8eced53f72c7f935e4074507
  
      public boolean canDropMobsSkull() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
-index e9a9154804bf2b26f4c613e81819e1cf448b76d0..6ccb32786b3abe1109dcc2d083cd231b70d8c6b4 100644
+index 127e65c5780c6727fde1ea3e597b116a475a666a..4191845bfe05d8691e50143c42090566522f7e74 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
 @@ -88,4 +88,16 @@ public class CraftCreeper extends CraftMonster implements Creeper {
diff --git a/patches/server/0249-Inventory-removeItemAnySlot.patch b/patches/unapplied/server/0249-Inventory-removeItemAnySlot.patch
index 1b771b629d..1b771b629d 100644
--- a/patches/server/0249-Inventory-removeItemAnySlot.patch
+++ b/patches/unapplied/server/0249-Inventory-removeItemAnySlot.patch
diff --git a/patches/server/0250-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/patches/unapplied/server/0250-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
index a43b36bd48..a43b36bd48 100644
--- a/patches/server/0250-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
+++ b/patches/unapplied/server/0250-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
diff --git a/patches/server/0251-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/unapplied/server/0251-Add-ray-tracing-methods-to-LivingEntity.patch
index aea462238b..76301867cb 100644
--- a/patches/server/0251-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/patches/unapplied/server/0251-Add-ray-tracing-methods-to-LivingEntity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add ray tracing methods to LivingEntity
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index d9ed53c65b8b59da452016d415e925e9e579fe94..036299bd181f36776cac3843d2909a65ec2a875e 100644
+index 06318ffaa20b2682c99c767b1ff4b66f377796e1..0cc9a6ae1adcae0a6e94fc2d8c448c2b5610e90a 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3827,6 +3827,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -30,7 +30,7 @@ index d9ed53c65b8b59da452016d415e925e9e579fe94..036299bd181f36776cac3843d2909a65
  
      public int getShieldBlockingDelay() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index c2e83cc533decd31f21c7c732cdc32d8b52bc418..e327cc9f2513ae79a871ac2ab144389b71a88f2a 100644
+index 754a4d026bdb9b3fc7781cd5e10bf01c70d2760e..540422f3148a92a25de8398c8616de307c85d0ae 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -201,6 +201,33 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0252-Expose-attack-cooldown-methods-for-Player.patch b/patches/unapplied/server/0252-Expose-attack-cooldown-methods-for-Player.patch
index 71f817467b..71f817467b 100644
--- a/patches/server/0252-Expose-attack-cooldown-methods-for-Player.patch
+++ b/patches/unapplied/server/0252-Expose-attack-cooldown-methods-for-Player.patch
diff --git a/patches/server/0253-Improve-death-events.patch b/patches/unapplied/server/0253-Improve-death-events.patch
index f59c5f3c85..f59c5f3c85 100644
--- a/patches/server/0253-Improve-death-events.patch
+++ b/patches/unapplied/server/0253-Improve-death-events.patch
diff --git a/patches/server/0254-Allow-chests-to-be-placed-with-NBT-data.patch b/patches/unapplied/server/0254-Allow-chests-to-be-placed-with-NBT-data.patch
index ee56f10dfd..ee56f10dfd 100644
--- a/patches/server/0254-Allow-chests-to-be-placed-with-NBT-data.patch
+++ b/patches/unapplied/server/0254-Allow-chests-to-be-placed-with-NBT-data.patch
diff --git a/patches/server/0255-Mob-Pathfinding-API.patch b/patches/unapplied/server/0255-Mob-Pathfinding-API.patch
index e3120486fa..e3120486fa 100644
--- a/patches/server/0255-Mob-Pathfinding-API.patch
+++ b/patches/unapplied/server/0255-Mob-Pathfinding-API.patch
diff --git a/patches/server/0256-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/patches/unapplied/server/0256-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
index bfabc2cd1e..bfabc2cd1e 100644
--- a/patches/server/0256-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
+++ b/patches/unapplied/server/0256-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
diff --git a/patches/server/0257-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/patches/unapplied/server/0257-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
index 398cfb3792..398cfb3792 100644
--- a/patches/server/0257-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
+++ b/patches/unapplied/server/0257-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
diff --git a/patches/server/0258-Prevent-mob-spawning-from-loading-generating-chunks.patch b/patches/unapplied/server/0258-Prevent-mob-spawning-from-loading-generating-chunks.patch
index 4a0e2020ca..4a0e2020ca 100644
--- a/patches/server/0258-Prevent-mob-spawning-from-loading-generating-chunks.patch
+++ b/patches/unapplied/server/0258-Prevent-mob-spawning-from-loading-generating-chunks.patch
diff --git a/patches/server/0259-Implement-furnace-cook-speed-multiplier-API.patch b/patches/unapplied/server/0259-Implement-furnace-cook-speed-multiplier-API.patch
index 696f2a665f..696f2a665f 100644
--- a/patches/server/0259-Implement-furnace-cook-speed-multiplier-API.patch
+++ b/patches/unapplied/server/0259-Implement-furnace-cook-speed-multiplier-API.patch
diff --git a/patches/server/0260-Honor-EntityAgeable.ageLock.patch b/patches/unapplied/server/0260-Honor-EntityAgeable.ageLock.patch
index a1db73f438..eb028448f8 100644
--- a/patches/server/0260-Honor-EntityAgeable.ageLock.patch
+++ b/patches/unapplied/server/0260-Honor-EntityAgeable.ageLock.patch
@@ -17,7 +17,7 @@ index be5e603d505566feac61cc7e591d35ce483a92df..2061d7ae62c1335c87aa67fd0cc004c4
          int k = j;
  
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
-index bd70aa9448a429f813f494c02d09432532985152..ea63802f2644bc2b5b3b0c72d7d09813cb68139d 100644
+index c5944875bd94d9186729e95d0b731d9e68e7b99f..5c89d824ef43792c34c9f2df5851ba8af503cbd9 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
 @@ -299,6 +299,7 @@ public class BeehiveBlockEntity extends BlockEntity {
diff --git a/patches/server/0261-Configurable-connection-throttle-kick-message.patch b/patches/unapplied/server/0261-Configurable-connection-throttle-kick-message.patch
index 9e1918b7c2..2e44ed6b6d 100644
--- a/patches/server/0261-Configurable-connection-throttle-kick-message.patch
+++ b/patches/unapplied/server/0261-Configurable-connection-throttle-kick-message.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable connection throttle kick message
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
-index e50f0ae7ba5e0271e4c0947ea73126c953aeac6b..e6275103156b720d774e197ea61659f1f1699025 100644
+index 203fc53142bb0c9b6e2d1876fe8dfbe33c42af99..e8cf9eafe0908bc9b716d9b6ead97828a43413ec 100644
 --- a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
 @@ -51,7 +51,7 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL
diff --git a/patches/server/0262-Prevent-chunk-loading-from-Fluid-Flowing.patch b/patches/unapplied/server/0262-Prevent-chunk-loading-from-Fluid-Flowing.patch
index 2a66b5c9da..2a66b5c9da 100644
--- a/patches/server/0262-Prevent-chunk-loading-from-Fluid-Flowing.patch
+++ b/patches/unapplied/server/0262-Prevent-chunk-loading-from-Fluid-Flowing.patch
diff --git a/patches/server/0263-Hook-into-CB-plugin-rewrites.patch b/patches/unapplied/server/0263-Hook-into-CB-plugin-rewrites.patch
index 6db828239e..6db828239e 100644
--- a/patches/server/0263-Hook-into-CB-plugin-rewrites.patch
+++ b/patches/unapplied/server/0263-Hook-into-CB-plugin-rewrites.patch
diff --git a/patches/server/0264-PreSpawnerSpawnEvent.patch b/patches/unapplied/server/0264-PreSpawnerSpawnEvent.patch
index f9634b126c..f9634b126c 100644
--- a/patches/server/0264-PreSpawnerSpawnEvent.patch
+++ b/patches/unapplied/server/0264-PreSpawnerSpawnEvent.patch
diff --git a/patches/server/0265-Add-LivingEntity-getTargetEntity.patch b/patches/unapplied/server/0265-Add-LivingEntity-getTargetEntity.patch
index 72b07b1c91..e004157b6d 100644
--- a/patches/server/0265-Add-LivingEntity-getTargetEntity.patch
+++ b/patches/unapplied/server/0265-Add-LivingEntity-getTargetEntity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add LivingEntity#getTargetEntity
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index a16e60f7dde5ad3b908d76d1889ea8ddb3d5e102..d8c413e60abbdbd337afef31f0b88a1b8ac6a59f 100644
+index 3c7dd373c557f3ceef0173e415d3d6c310fa9e95..5a638da349424a9d3bc5df87d81ba268b8052568 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -116,6 +116,7 @@ import net.minecraft.world.level.storage.loot.LootTable;
@@ -56,7 +56,7 @@ index a16e60f7dde5ad3b908d76d1889ea8ddb3d5e102..d8c413e60abbdbd337afef31f0b88a1b
  
      public int getShieldBlockingDelay() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index e327cc9f2513ae79a871ac2ab144389b71a88f2a..a3842078a394241a3a9b4c398d13fcdbcb5dbe10 100644
+index 540422f3148a92a25de8398c8616de307c85d0ae..9e15c5e2adfb46ffa3548b3a2eda225de4c44fb5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -1,5 +1,6 @@
diff --git a/patches/server/0266-Add-sun-related-API.patch b/patches/unapplied/server/0266-Add-sun-related-API.patch
index 1afb4b7b61..1afb4b7b61 100644
--- a/patches/server/0266-Add-sun-related-API.patch
+++ b/patches/unapplied/server/0266-Add-sun-related-API.patch
diff --git a/patches/server/0267-Catch-JsonParseException-in-Entity-and-TE-names.patch b/patches/unapplied/server/0267-Catch-JsonParseException-in-Entity-and-TE-names.patch
index 4555657f95..fb1f62292e 100644
--- a/patches/server/0267-Catch-JsonParseException-in-Entity-and-TE-names.patch
+++ b/patches/unapplied/server/0267-Catch-JsonParseException-in-Entity-and-TE-names.patch
@@ -63,7 +63,7 @@ index c6194fa1611412ac119fed493d5eab5a160e593d..d89037a83ae1b6d2afa6a589c1b8098c
  
          this.itemPatterns = nbt.getList("Patterns", 10);
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BaseContainerBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BaseContainerBlockEntity.java
-index e85022b31f2bc2783e88f5ba4c5173ac8a096c96..f1acd19432877a833f0d4339f9de4830a0f7b890 100644
+index 25764076fec05b1362aa9b9b608e03bd39817d90..fce3a45d09a93ca68a3d49f2e666afa4c860d042 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BaseContainerBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BaseContainerBlockEntity.java
 @@ -31,7 +31,7 @@ public abstract class BaseContainerBlockEntity extends BlockEntity implements Co
diff --git a/patches/server/0268-Turtle-API.patch b/patches/unapplied/server/0268-Turtle-API.patch
index 89bc808f04..89bc808f04 100644
--- a/patches/server/0268-Turtle-API.patch
+++ b/patches/unapplied/server/0268-Turtle-API.patch
diff --git a/patches/server/0269-Call-player-spectator-target-events-and-improve-impl.patch b/patches/unapplied/server/0269-Call-player-spectator-target-events-and-improve-impl.patch
index 5e38e1c9f4..5e38e1c9f4 100644
--- a/patches/server/0269-Call-player-spectator-target-events-and-improve-impl.patch
+++ b/patches/unapplied/server/0269-Call-player-spectator-target-events-and-improve-impl.patch
diff --git a/patches/server/0270-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/patches/unapplied/server/0270-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
index ea0eee4e26..ea0eee4e26 100644
--- a/patches/server/0270-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
+++ b/patches/unapplied/server/0270-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
diff --git a/patches/server/0271-Add-more-Witch-API.patch b/patches/unapplied/server/0271-Add-more-Witch-API.patch
index 5de246f125..c644efe98f 100644
--- a/patches/server/0271-Add-more-Witch-API.patch
+++ b/patches/unapplied/server/0271-Add-more-Witch-API.patch
@@ -60,7 +60,7 @@ index ca24b592273208e61e0e0ba59b7e5a3c11ebf952..580dff41d746d9591f718081d9dfe4ac
      public SoundEvent getCelebrateSound() {
          return SoundEvents.WITCH_CELEBRATE;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
-index 5024a102fe71d7013bc809bb4140763bd4c466e7..0acb96ae2102ab6af4b5610254ab3a1408ed9822 100644
+index 524b5ba5995affc09eedf9a85d22e8b0b4efc156..4b3d783cabcb2de1a67d7fbfb6f525bfb493aed1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
 @@ -2,6 +2,13 @@ package org.bukkit.craftbukkit.entity;
diff --git a/patches/server/0272-Check-Drowned-for-Villager-Aggression-Config.patch b/patches/unapplied/server/0272-Check-Drowned-for-Villager-Aggression-Config.patch
index 20eaf96a86..20eaf96a86 100644
--- a/patches/server/0272-Check-Drowned-for-Villager-Aggression-Config.patch
+++ b/patches/unapplied/server/0272-Check-Drowned-for-Villager-Aggression-Config.patch
diff --git a/patches/server/0273-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/unapplied/server/0273-Add-option-to-prevent-players-from-moving-into-unloa.patch
index f6fea97b7e..f6fea97b7e 100644
--- a/patches/server/0273-Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/patches/unapplied/server/0273-Add-option-to-prevent-players-from-moving-into-unloa.patch
diff --git a/patches/server/0274-Reset-players-airTicks-on-respawn.patch b/patches/unapplied/server/0274-Reset-players-airTicks-on-respawn.patch
index 34f4de0100..34f4de0100 100644
--- a/patches/server/0274-Reset-players-airTicks-on-respawn.patch
+++ b/patches/unapplied/server/0274-Reset-players-airTicks-on-respawn.patch
diff --git a/patches/server/0275-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/unapplied/server/0275-Don-t-sleep-after-profile-lookups-if-not-needed.patch
index 48b4bba2b0..48b4bba2b0 100644
--- a/patches/server/0275-Don-t-sleep-after-profile-lookups-if-not-needed.patch
+++ b/patches/unapplied/server/0275-Don-t-sleep-after-profile-lookups-if-not-needed.patch
diff --git a/patches/server/0276-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/unapplied/server/0276-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
index 388cea5974..3a987f71db 100644
--- a/patches/server/0276-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
+++ b/patches/unapplied/server/0276-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
@@ -79,7 +79,7 @@ index 30237ca94a36197ce21369bdcc7bb1dfafe02680..5e9401f0c2de0743aca9237ee8c4dfba
          return executorService;
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 41bad67b3a6b8ccdcf9467858cb7d9c0e0a03f0e..08f1a442137da542d23957b86db8ad4c62e771b4 100644
+index 88c1c7d0dd8efddcde6d8d81cb89b09c2f6fee2a..9326b35d57d9157f968aac9428dce6462d86da0f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -306,6 +306,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0277-Optimize-World-Time-Updates.patch b/patches/unapplied/server/0277-Optimize-World-Time-Updates.patch
index 4f8393d3d2..5511612b32 100644
--- a/patches/server/0277-Optimize-World-Time-Updates.patch
+++ b/patches/unapplied/server/0277-Optimize-World-Time-Updates.patch
@@ -8,7 +8,7 @@ the updates per world, so that we can re-use the same packet
 object for every player unless they have per-player time enabled.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 08f1a442137da542d23957b86db8ad4c62e771b4..950265d4ba677432b224bd8f2e5cb5076a9103fa 100644
+index 9326b35d57d9157f968aac9428dce6462d86da0f..85ca00396d1f9f845f8f833d0896266b55a1b84d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1373,12 +1373,24 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0278-Restore-custom-InventoryHolder-support.patch b/patches/unapplied/server/0278-Restore-custom-InventoryHolder-support.patch
index d94cb16b35..d94cb16b35 100644
--- a/patches/server/0278-Restore-custom-InventoryHolder-support.patch
+++ b/patches/unapplied/server/0278-Restore-custom-InventoryHolder-support.patch
diff --git a/patches/server/0279-Use-Vanilla-Minecart-Speeds.patch b/patches/unapplied/server/0279-Use-Vanilla-Minecart-Speeds.patch
index 85566a9815..85566a9815 100644
--- a/patches/server/0279-Use-Vanilla-Minecart-Speeds.patch
+++ b/patches/unapplied/server/0279-Use-Vanilla-Minecart-Speeds.patch
diff --git a/patches/server/0280-Fix-SpongeAbsortEvent-handling.patch b/patches/unapplied/server/0280-Fix-SpongeAbsortEvent-handling.patch
index 019425b6f9..019425b6f9 100644
--- a/patches/server/0280-Fix-SpongeAbsortEvent-handling.patch
+++ b/patches/unapplied/server/0280-Fix-SpongeAbsortEvent-handling.patch
diff --git a/patches/server/0281-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/unapplied/server/0281-Don-t-allow-digging-into-unloaded-chunks.patch
index 71996d3b78..1740416fd3 100644
--- a/patches/server/0281-Don-t-allow-digging-into-unloaded-chunks.patch
+++ b/patches/unapplied/server/0281-Don-t-allow-digging-into-unloaded-chunks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't allow digging into unloaded chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 4dac6b03e39be78071df1688ce61b3fc05d336df..56f391cef4bd85e67eb1f687e3febb18fa27831b 100644
+index 5f79367fda576300c59774d69089f8f1c4408f8a..c15d2b8862139a6f083547794617d8bd6c462287 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -119,8 +119,8 @@ public class ServerPlayerGameMode {
diff --git a/patches/server/0282-Make-the-default-permission-message-configurable.patch b/patches/unapplied/server/0282-Make-the-default-permission-message-configurable.patch
index e0ff8b65c6..e8ddfd0bb7 100644
--- a/patches/server/0282-Make-the-default-permission-message-configurable.patch
+++ b/patches/unapplied/server/0282-Make-the-default-permission-message-configurable.patch
@@ -18,7 +18,7 @@ index 0dd48e4098191c8b6e29945d62bc473e9f3a1e77..ae51993e0de706cb62c96795ca9de766
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c32315e6cd06ff02fe2a2c6c3f6f1c3c925147f9..08eb9c98b0ff86131e1842c1b73711fd62344516 100644
+index 5c39a02cb9db3d6c45b5cfe845a9be79cf7a1574..58ac20547480173f0b4cd4015fe0fb38d2d211ff 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2771,6 +2771,16 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0283-Prevent-rayTrace-from-loading-chunks.patch b/patches/unapplied/server/0283-Prevent-rayTrace-from-loading-chunks.patch
index 72d6ebc434..72d6ebc434 100644
--- a/patches/server/0283-Prevent-rayTrace-from-loading-chunks.patch
+++ b/patches/unapplied/server/0283-Prevent-rayTrace-from-loading-chunks.patch
diff --git a/patches/server/0284-Handle-Large-Packets-disconnecting-client.patch b/patches/unapplied/server/0284-Handle-Large-Packets-disconnecting-client.patch
index 11027a5b3d..11027a5b3d 100644
--- a/patches/server/0284-Handle-Large-Packets-disconnecting-client.patch
+++ b/patches/unapplied/server/0284-Handle-Large-Packets-disconnecting-client.patch
diff --git a/patches/server/0285-force-entity-dismount-during-teleportation.patch b/patches/unapplied/server/0285-force-entity-dismount-during-teleportation.patch
index 706b4d414d..6bae99a69a 100644
--- a/patches/server/0285-force-entity-dismount-during-teleportation.patch
+++ b/patches/unapplied/server/0285-force-entity-dismount-during-teleportation.patch
@@ -20,7 +20,7 @@ this is going to be the best soultion all around.
 Improvements/suggestions welcome!
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 63f9f874ef9da0d5f0c6d6df2901be27df5e30a0..72c33eaa232503c373bf8cf9a1c1c7603923e80a 100644
+index d8528c84c9cc1724b5100276ba624cf8627dc6ce..26b2ad3cda2a8b8166ec8eef520ab46ff9076e0f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2576,11 +2576,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -72,7 +72,7 @@ index 63f9f874ef9da0d5f0c6d6df2901be27df5e30a0..72c33eaa232503c373bf8cf9a1c1c760
              if (this.valid) {
                  Bukkit.getPluginManager().callEvent(event);
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index d8c413e60abbdbd337afef31f0b88a1b8ac6a59f..8606dabdc5759e7b09e3e47d5a1ef7045a0de78b 100644
+index 5a638da349424a9d3bc5df87d81ba268b8052568..072f1f4e342141a02e6f94849432f116ba2e0e5c 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3469,9 +3469,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -93,7 +93,7 @@ index d8c413e60abbdbd337afef31f0b88a1b8ac6a59f..8606dabdc5759e7b09e3e47d5a1ef704
              this.dismountVehicle(entity);
          }
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index ddd43b5e9ab77c1baaa7c777dc0b3e89789d7626..9d252aea2c372f9a6b46319564dc6dc5e94d9a91 100644
+index c2935b00737418749fc8c20624a1f6792ba7d071..cc6a9e9566d6f9bf453f3d6fba132c886248bf1c 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1154,7 +1154,13 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0286-Add-more-Zombie-API.patch b/patches/unapplied/server/0286-Add-more-Zombie-API.patch
index 43c7b9d006..007f48b73f 100644
--- a/patches/server/0286-Add-more-Zombie-API.patch
+++ b/patches/unapplied/server/0286-Add-more-Zombie-API.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Add more Zombie API
 public net.minecraft.world.entity.monster.Zombie isSunSensitive()Z
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index 61ecf5c51fbdf38ec5513453c2de037489fd8c7e..2be074ecbc131b68574cf77ba9cab96424715522 100644
+index 0c9a91990376482bc16f74a8b183ebf049ee1949..39a508b2834e554e94d635abd0d4a549f317dee5 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 @@ -96,6 +96,7 @@ public class Zombie extends Monster {
@@ -69,7 +69,7 @@ index 61ecf5c51fbdf38ec5513453c2de037489fd8c7e..2be074ecbc131b68574cf77ba9cab964
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
-index 47ee56a5623e0ebd4263ef9b9b92434a26a08311..1e303c3686e2fe4e05efe5a630dd2c1cb0f9edea 100644
+index 99dcaa827831a40ea46453f502d8b6ccb107f0ad..4412c913123f7521f449c98b60378e8d3b1671ce 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
 @@ -87,6 +87,42 @@ public class CraftZombie extends CraftMonster implements Zombie {
diff --git a/patches/server/0287-Book-Size-Limits.patch b/patches/unapplied/server/0287-Book-Size-Limits.patch
index 7e8f4afb62..7e8f4afb62 100644
--- a/patches/server/0287-Book-Size-Limits.patch
+++ b/patches/unapplied/server/0287-Book-Size-Limits.patch
diff --git a/patches/server/0288-Add-PlayerConnectionCloseEvent.patch b/patches/unapplied/server/0288-Add-PlayerConnectionCloseEvent.patch
index 0a1aca76e9..368ce0b6b1 100644
--- a/patches/server/0288-Add-PlayerConnectionCloseEvent.patch
+++ b/patches/unapplied/server/0288-Add-PlayerConnectionCloseEvent.patch
@@ -69,7 +69,7 @@ index 6fcbf8205e1852d5193a42bfe1154f62ab01e7ad..25881c890c643ce90bdcda6b094d912b
              }
          }
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index f870c20ecce27ebd893107a35e1b8f15e462ff85..c3e7a5f61e94d9905dc805bfc486819b61e143d1 100644
+index 03ff64ad395455f21f4ca30faae17fc6a1dc0501..673652231a65e9441ee882c86656b86a86547488 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -58,7 +58,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
diff --git a/patches/server/0289-Prevent-Enderman-from-loading-chunks.patch b/patches/unapplied/server/0289-Prevent-Enderman-from-loading-chunks.patch
index 248a1b8e0b..29f11b20e3 100644
--- a/patches/server/0289-Prevent-Enderman-from-loading-chunks.patch
+++ b/patches/unapplied/server/0289-Prevent-Enderman-from-loading-chunks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent Enderman from loading chunks
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index bf5b7b996c9141c7cef9c281323115bd593dc777..5b3da07def02830e4332d7d3a7f7b968e5663c7b 100644
+index 5c620989acaff4fdb842944ea2d8ae331699a2b4..8e72958dec9d4eb35330b72e057733a268e83745 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 @@ -517,7 +517,8 @@ public class EnderMan extends Monster implements NeutralMob {
diff --git a/patches/server/0290-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/unapplied/server/0290-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index 040fb843cb..040fb843cb 100644
--- a/patches/server/0290-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/patches/unapplied/server/0290-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
diff --git a/patches/server/0291-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/unapplied/server/0291-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
index a6e38741ae..50c1c3d109 100644
--- a/patches/server/0291-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
+++ b/patches/unapplied/server/0291-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Workaround for vehicle tracking issue on disconnect
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index bc17ba1dc7b744a4325b30703cda73b501da5104..46827935fdd790b7e6e8516bc65f8e4985988501 100644
+index 32ab4a254b04d8d66c62660c7ad9489ea8ecf7f2..a38eb9dfa24388508eddad3d51953441f3c2c69c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1647,6 +1647,13 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0292-Block-Entity-remove-from-being-called-on-Players.patch b/patches/unapplied/server/0292-Block-Entity-remove-from-being-called-on-Players.patch
index 2926292a14..2926292a14 100644
--- a/patches/server/0292-Block-Entity-remove-from-being-called-on-Players.patch
+++ b/patches/unapplied/server/0292-Block-Entity-remove-from-being-called-on-Players.patch
diff --git a/patches/server/0293-BlockDestroyEvent.patch b/patches/unapplied/server/0293-BlockDestroyEvent.patch
index 8aeb73edf5..234cac1cf6 100644
--- a/patches/server/0293-BlockDestroyEvent.patch
+++ b/patches/unapplied/server/0293-BlockDestroyEvent.patch
@@ -11,7 +11,7 @@ floating in the air.
 This can replace many uses of BlockPhysicsEvent
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 18234d71eba7d2a2874f3e5c9628d82970acc033..b3a0f4dd651dda29d2064b629da67378c00a6a78 100644
+index baee74186c6349efb8e5e9ff087a114c08c7ae72..3f6d9b7c91a14dedeee11968e80de26adeccb510 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -30,6 +30,7 @@ import net.minecraft.nbt.CompoundTag;
diff --git a/patches/server/0294-Async-command-map-building.patch b/patches/unapplied/server/0294-Async-command-map-building.patch
index 09e485ed88..b75ae1d63c 100644
--- a/patches/server/0294-Async-command-map-building.patch
+++ b/patches/unapplied/server/0294-Async-command-map-building.patch
@@ -53,7 +53,7 @@ index e63632f09d608371aaeaf09a6dac57c1d8a719d4..bbf4db5faf4694e78e01f4e74e277b46
          event.getPlayer().getServer().getPluginManager().callEvent(event);
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 950265d4ba677432b224bd8f2e5cb5076a9103fa..afc8a65c0513a394f5a6736a952afba1397cae6a 100644
+index 85ca00396d1f9f845f8f833d0896266b55a1b84d..c0918bcfa78782c54a548267c2363f1edd197412 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -880,6 +880,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0295-Implement-Brigadier-Mojang-API.patch b/patches/unapplied/server/0295-Implement-Brigadier-Mojang-API.patch
index 09febae3e0..09febae3e0 100644
--- a/patches/server/0295-Implement-Brigadier-Mojang-API.patch
+++ b/patches/unapplied/server/0295-Implement-Brigadier-Mojang-API.patch
diff --git a/patches/server/0296-Improve-exact-choice-recipe-ingredients.patch b/patches/unapplied/server/0296-Improve-exact-choice-recipe-ingredients.patch
index 47a51d830f..47a51d830f 100644
--- a/patches/server/0296-Improve-exact-choice-recipe-ingredients.patch
+++ b/patches/unapplied/server/0296-Improve-exact-choice-recipe-ingredients.patch
diff --git a/patches/server/0297-Limit-Client-Sign-length-more.patch b/patches/unapplied/server/0297-Limit-Client-Sign-length-more.patch
index 20c34a9a2c..20c34a9a2c 100644
--- a/patches/server/0297-Limit-Client-Sign-length-more.patch
+++ b/patches/unapplied/server/0297-Limit-Client-Sign-length-more.patch
diff --git a/patches/server/0298-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/unapplied/server/0298-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
index a9e1668d8d..76a6eca58f 100644
--- a/patches/server/0298-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
+++ b/patches/unapplied/server/0298-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Call WhitelistToggleEvent when whitelist is toggled
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 45bfb32505dfd2a66d8a6ee4627ec293a88da818..2e4e90223160361e21e651c9dbcffdef7b235af7 100644
+index 1619a0573c6996e0f5494bfab6788ba96c08a6d3..72dc59f2081e517587d66d03d9b5910caf0e1c17 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1151,6 +1151,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0299-Handle-Oversized-Tile-Entities-in-chunks.patch b/patches/unapplied/server/0299-Handle-Oversized-Tile-Entities-in-chunks.patch
index a99bed7305..a99bed7305 100644
--- a/patches/server/0299-Handle-Oversized-Tile-Entities-in-chunks.patch
+++ b/patches/unapplied/server/0299-Handle-Oversized-Tile-Entities-in-chunks.patch
diff --git a/patches/server/0300-Entity-getEntitySpawnReason.patch b/patches/unapplied/server/0300-Entity-getEntitySpawnReason.patch
index e944bf599e..87cba99cd3 100644
--- a/patches/server/0300-Entity-getEntitySpawnReason.patch
+++ b/patches/unapplied/server/0300-Entity-getEntitySpawnReason.patch
@@ -22,7 +22,7 @@ index 2eddeb8d5239bbfeefbf4d3bd363f1ad083299b6..a7c89cdf20cb63792c76de81c1ff9f2c
              });
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 0d253f0dd5332d2e68842c4b6c6a3a0909ace440..39bfb4660423cd8bdf67a0aca66fe5b0d353aa84 100644
+index c9f22e24223c409a7a3aec668f02a59ed5102524..47a1fb476e3825f489fc217ef83fd273b52676a1 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1431,6 +1431,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -59,7 +59,7 @@ index 72dc59f2081e517587d66d03d9b5910caf0e1c17..e06748a8550ffff34ea4e070e1433483
              });
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index d4a3002daeac944430b92e1924c7febc384ba871..23194db56de5e9b488048386720fdf855729bbd0 100644
+index 26b2ad3cda2a8b8166ec8eef520ab46ff9076e0f..bf046bea5fdff67f362c401f1ddbfa9d2863a9d7 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -234,6 +234,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -133,7 +133,7 @@ index faad948f089575e4988d989790cc1dd13f8a79cd..ee11a52e82091911aa3a196bcc1f7ab8
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 990525598365e8fd88c9c4219a2f125c7c594a95..d84ec9e1dc7c536e46fbb924c27f5734ed8e1303 100644
+index f1df0a172e7e1589b9a6af6fab87ce0251c5a557..e1f75dfcb22918d953d35d345280c61301688ac7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1323,5 +1323,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0301-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/unapplied/server/0301-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
index cbd7df1772..cbd7df1772 100644
--- a/patches/server/0301-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
+++ b/patches/unapplied/server/0301-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/patches/server/0302-Fire-event-on-GS4-query.patch b/patches/unapplied/server/0302-Fire-event-on-GS4-query.patch
index 445725e8b8..445725e8b8 100644
--- a/patches/server/0302-Fire-event-on-GS4-query.patch
+++ b/patches/unapplied/server/0302-Fire-event-on-GS4-query.patch
diff --git a/patches/server/0303-Implement-PlayerPostRespawnEvent.patch b/patches/unapplied/server/0303-Implement-PlayerPostRespawnEvent.patch
index 3a208b92c8..486e4b79d3 100644
--- a/patches/server/0303-Implement-PlayerPostRespawnEvent.patch
+++ b/patches/unapplied/server/0303-Implement-PlayerPostRespawnEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement PlayerPostRespawnEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 11e52541ea928e77c2913ff4029bde8c612ee229..b9da3530f72ebb3854da7c96ee20431efb0c93bd 100644
+index e06748a8550ffff34ea4e070e143348397d4d438..7321e5b9905cf5afb684a9d2d39048f43c245504 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -753,9 +753,14 @@ public abstract class PlayerList {
diff --git a/patches/server/0304-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/unapplied/server/0304-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
index aaeef4e981..aaeef4e981 100644
--- a/patches/server/0304-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
+++ b/patches/unapplied/server/0304-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
diff --git a/patches/server/0305-Server-Tick-Events.patch b/patches/unapplied/server/0305-Server-Tick-Events.patch
index 13e4840fa3..5e7e353183 100644
--- a/patches/server/0305-Server-Tick-Events.patch
+++ b/patches/unapplied/server/0305-Server-Tick-Events.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Server Tick Events
 Fires event at start and end of a server tick
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index afc8a65c0513a394f5a6736a952afba1397cae6a..679211aed0fc5bdd630369aa9c82aa6aca9059f4 100644
+index c0918bcfa78782c54a548267c2363f1edd197412..fb2851e94c178f49ee8046176b196c63254907e7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1286,6 +1286,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0306-PlayerDeathEvent-getItemsToKeep.patch b/patches/unapplied/server/0306-PlayerDeathEvent-getItemsToKeep.patch
index e7e4dd531f..3179ac1873 100644
--- a/patches/server/0306-PlayerDeathEvent-getItemsToKeep.patch
+++ b/patches/unapplied/server/0306-PlayerDeathEvent-getItemsToKeep.patch
@@ -11,7 +11,7 @@ Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4
 public net.minecraft.world.entity.player.Inventory compartments
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 46827935fdd790b7e6e8516bc65f8e4985988501..0e59ea13f1fd3abf684133b0e7f3df00c93b2061 100644
+index a38eb9dfa24388508eddad3d51953441f3c2c69c..151f1918392e26163323ddf1cfd6cd52abaea9c3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -850,6 +850,46 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0307-Optimize-Captured-TileEntity-Lookup.patch b/patches/unapplied/server/0307-Optimize-Captured-TileEntity-Lookup.patch
index b58f0b7c64..c6c1651f1a 100644
--- a/patches/server/0307-Optimize-Captured-TileEntity-Lookup.patch
+++ b/patches/unapplied/server/0307-Optimize-Captured-TileEntity-Lookup.patch
@@ -10,7 +10,7 @@ Optimize to check if the captured list even has values in it, and also to
 just do a get call since the value can never be null.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index b3a0f4dd651dda29d2064b629da67378c00a6a78..b1111e644f860f40a944fd43ac900db4615a1c5e 100644
+index 3f6d9b7c91a14dedeee11968e80de26adeccb510..0c64e65af843034b26147f62c49c6ab12ac5ddd2 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -982,9 +982,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0308-Add-Heightmap-API.patch b/patches/unapplied/server/0308-Add-Heightmap-API.patch
index 3efaa1778f..3efaa1778f 100644
--- a/patches/server/0308-Add-Heightmap-API.patch
+++ b/patches/unapplied/server/0308-Add-Heightmap-API.patch
diff --git a/patches/server/0309-Mob-Spawner-API-Enhancements.patch b/patches/unapplied/server/0309-Mob-Spawner-API-Enhancements.patch
index f31f550c94..f31f550c94 100644
--- a/patches/server/0309-Mob-Spawner-API-Enhancements.patch
+++ b/patches/unapplied/server/0309-Mob-Spawner-API-Enhancements.patch
diff --git a/patches/server/0310-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/unapplied/server/0310-Fix-CB-call-to-changed-postToMainThread-method.patch
index 39e898eb87..db502af414 100644
--- a/patches/server/0310-Fix-CB-call-to-changed-postToMainThread-method.patch
+++ b/patches/unapplied/server/0310-Fix-CB-call-to-changed-postToMainThread-method.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix CB call to changed postToMainThread method
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index 988820d6041f3784fec9321c7bc08e2e84a52ad5..d1808bf9dc19fad84da5eb3b4c3d549bc624b00a 100644
+index 4e450a3d7f2db7d7d346103cc9467654ca1b8a1f..d25b6431ce617d90fd1d6489a308d6630b92c175 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 @@ -297,7 +297,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
diff --git a/patches/server/0311-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/unapplied/server/0311-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
index 2318e7e8c7..2318e7e8c7 100644
--- a/patches/server/0311-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
+++ b/patches/unapplied/server/0311-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
diff --git a/patches/server/0312-Implement-CraftBlockSoundGroup.patch b/patches/unapplied/server/0312-Implement-CraftBlockSoundGroup.patch
index a61170b03b..19fa45d718 100644
--- a/patches/server/0312-Implement-CraftBlockSoundGroup.patch
+++ b/patches/unapplied/server/0312-Implement-CraftBlockSoundGroup.patch
@@ -50,7 +50,7 @@ index 0000000000000000000000000000000000000000..3913c407a3bfa7dfa4a5e374a5e79296
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 8a62231dffcff0260c1c15bd3115b27922c03239..ce8f3d66b0f64531e818823761fd1823da4f01d5 100644
+index 9aa8c6c11d5aee83627cb91258c16844f791cd26..b25ebc5f1c54ea3ecc38e96b79e5cca88aafb816 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -621,4 +621,16 @@ public class CraftBlock implements Block {
diff --git a/patches/server/0313-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/patches/unapplied/server/0313-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index fb41b5548b..fb41b5548b 100644
--- a/patches/server/0313-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/patches/unapplied/server/0313-Configurable-Keep-Spawn-Loaded-range-per-world.patch
diff --git a/patches/server/0314-Allow-Saving-of-Oversized-Chunks.patch b/patches/unapplied/server/0314-Allow-Saving-of-Oversized-Chunks.patch
index 1233e2c468..1233e2c468 100644
--- a/patches/server/0314-Allow-Saving-of-Oversized-Chunks.patch
+++ b/patches/unapplied/server/0314-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/patches/server/0315-Expose-the-internal-current-tick.patch b/patches/unapplied/server/0315-Expose-the-internal-current-tick.patch
index 0eeb26ed18..bffab45c7e 100644
--- a/patches/server/0315-Expose-the-internal-current-tick.patch
+++ b/patches/unapplied/server/0315-Expose-the-internal-current-tick.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose the internal current tick
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 08eb9c98b0ff86131e1842c1b73711fd62344516..4a5b18b4e9e664687c1136c5f1a97b8f50f87bf2 100644
+index 58ac20547480173f0b4cd4015fe0fb38d2d211ff..53f387da05ed3c9e981cea2141c42fe630b49892 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2817,5 +2817,10 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0316-Fix-World-isChunkGenerated-calls.patch b/patches/unapplied/server/0316-Fix-World-isChunkGenerated-calls.patch
index 36f754eb8f..36f754eb8f 100644
--- a/patches/server/0316-Fix-World-isChunkGenerated-calls.patch
+++ b/patches/unapplied/server/0316-Fix-World-isChunkGenerated-calls.patch
diff --git a/patches/server/0317-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/unapplied/server/0317-Show-blockstate-location-if-we-failed-to-read-it.patch
index 064cc86399..737d6a1d23 100644
--- a/patches/server/0317-Show-blockstate-location-if-we-failed-to-read-it.patch
+++ b/patches/unapplied/server/0317-Show-blockstate-location-if-we-failed-to-read-it.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Show blockstate location if we failed to read it
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
-index b52a34ded5a9697f3107a730a9817df3044dedba..2ced6d0b3a839935dfb715f339a9501e9e519cf8 100644
+index f046f507a095e0cb8f839b9b4b06add3a671486b..f7f211b4f08a7f21a183078affd6f875aa30dd50 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 @@ -25,6 +25,7 @@ public class CraftBlockEntityState<T extends BlockEntity> extends CraftBlockStat
diff --git a/patches/server/0318-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/unapplied/server/0318-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
index 239e4cf974..239e4cf974 100644
--- a/patches/server/0318-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
+++ b/patches/unapplied/server/0318-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
diff --git a/patches/server/0319-Configurable-projectile-relative-velocity.patch b/patches/unapplied/server/0319-Configurable-projectile-relative-velocity.patch
index 8f71437319..8f71437319 100644
--- a/patches/server/0319-Configurable-projectile-relative-velocity.patch
+++ b/patches/unapplied/server/0319-Configurable-projectile-relative-velocity.patch
diff --git a/patches/server/0320-offset-item-frame-ticking.patch b/patches/unapplied/server/0320-offset-item-frame-ticking.patch
index 7908f200e5..7908f200e5 100644
--- a/patches/server/0320-offset-item-frame-ticking.patch
+++ b/patches/unapplied/server/0320-offset-item-frame-ticking.patch
diff --git a/patches/server/0321-Fix-MC-158900.patch b/patches/unapplied/server/0321-Fix-MC-158900.patch
index ef03c99b3d..d05ef31814 100644
--- a/patches/server/0321-Fix-MC-158900.patch
+++ b/patches/unapplied/server/0321-Fix-MC-158900.patch
@@ -7,7 +7,7 @@ The problem was we were checking isExpired() on the entry, but if it
 was expired at that point, then it would be null.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index b9da3530f72ebb3854da7c96ee20431efb0c93bd..cffda75eebe70e1c9b5ac7905f69929b2634aeb0 100644
+index 7321e5b9905cf5afb684a9d2d39048f43c245504..c5287f08c675550c897d72fd7eff3331d0640800 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -629,8 +629,10 @@ public abstract class PlayerList {
diff --git a/patches/server/0322-Prevent-consuming-the-wrong-itemstack.patch b/patches/unapplied/server/0322-Prevent-consuming-the-wrong-itemstack.patch
index 60919ddd47..986e410dc8 100644
--- a/patches/server/0322-Prevent-consuming-the-wrong-itemstack.patch
+++ b/patches/unapplied/server/0322-Prevent-consuming-the-wrong-itemstack.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent consuming the wrong itemstack
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 8606dabdc5759e7b09e3e47d5a1ef7045a0de78b..80b60e33e9e39bc62f65bfddf121254d333aecae 100644
+index 072f1f4e342141a02e6f94849432f116ba2e0e5c..c95c7619820d1dbabc52ae8ccef88e03a2f1d9a3 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3707,9 +3707,14 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0323-Dont-send-unnecessary-sign-update.patch b/patches/unapplied/server/0323-Dont-send-unnecessary-sign-update.patch
index f05192e925..f05192e925 100644
--- a/patches/server/0323-Dont-send-unnecessary-sign-update.patch
+++ b/patches/unapplied/server/0323-Dont-send-unnecessary-sign-update.patch
diff --git a/patches/server/0324-Add-option-to-disable-pillager-patrols.patch b/patches/unapplied/server/0324-Add-option-to-disable-pillager-patrols.patch
index 65d645b929..65d645b929 100644
--- a/patches/server/0324-Add-option-to-disable-pillager-patrols.patch
+++ b/patches/unapplied/server/0324-Add-option-to-disable-pillager-patrols.patch
diff --git a/patches/server/0325-Flat-bedrock-generator-settings.patch b/patches/unapplied/server/0325-Flat-bedrock-generator-settings.patch
index 3ca530eeff..e0e903d76c 100644
--- a/patches/server/0325-Flat-bedrock-generator-settings.patch
+++ b/patches/unapplied/server/0325-Flat-bedrock-generator-settings.patch
@@ -135,7 +135,7 @@ index 902156477bdfc9917105f1229f760c26e5af302a..58609a0911c4e32b6f80f050cd3d23f7
  
          for (int j = -8; j <= 8; ++j) {
 diff --git a/src/main/java/net/minecraft/world/level/levelgen/WorldGenerationContext.java b/src/main/java/net/minecraft/world/level/levelgen/WorldGenerationContext.java
-index a0aa1087f5cb4d2d50c127447745a9e25c5079d6..192bcd833bf910b9372f8a05eea0de832ada431b 100644
+index b99283c31193e2110f6e3f39c23dbfc2442bab2b..1c9d9ecdafb2bd04348045ba0404da052dcd6437 100644
 --- a/src/main/java/net/minecraft/world/level/levelgen/WorldGenerationContext.java
 +++ b/src/main/java/net/minecraft/world/level/levelgen/WorldGenerationContext.java
 @@ -6,10 +6,13 @@ import net.minecraft.world.level.chunk.ChunkGenerator;
@@ -168,7 +168,7 @@ index a0aa1087f5cb4d2d50c127447745a9e25c5079d6..192bcd833bf910b9372f8a05eea0de83
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/world/level/levelgen/carver/CarvingContext.java b/src/main/java/net/minecraft/world/level/levelgen/carver/CarvingContext.java
-index df7183f221f0a5bc6fba7a5857c16555411bcff0..bef1f5ebf284bffc863e4174b3fb259956bf3303 100644
+index a745458ea3581ea91a68c863e3fd0a0292d73a61..f84ee8afe95f912a972e37fbae7a06ecdd3aba06 100644
 --- a/src/main/java/net/minecraft/world/level/levelgen/carver/CarvingContext.java
 +++ b/src/main/java/net/minecraft/world/level/levelgen/carver/CarvingContext.java
 @@ -21,8 +21,8 @@ public class CarvingContext extends WorldGenerationContext {
@@ -183,7 +183,7 @@ index df7183f221f0a5bc6fba7a5857c16555411bcff0..bef1f5ebf284bffc863e4174b3fb2599
          this.noiseChunk = chunkNoiseSampler;
          this.randomState = noiseConfig;
 diff --git a/src/main/java/net/minecraft/world/level/levelgen/placement/PlacementContext.java b/src/main/java/net/minecraft/world/level/levelgen/placement/PlacementContext.java
-index 9915ddef87c759df442a8c7b6960a88e3657ba44..d167caddd99604494f8d67b169d50b3abbb2a276 100644
+index 640c2683c842655bbaee8f293f1c2613ef44844e..53d818b0cc602f827d0b907e293515f6810c6792 100644
 --- a/src/main/java/net/minecraft/world/level/levelgen/placement/PlacementContext.java
 +++ b/src/main/java/net/minecraft/world/level/levelgen/placement/PlacementContext.java
 @@ -18,7 +18,7 @@ public class PlacementContext extends WorldGenerationContext {
diff --git a/patches/server/0326-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/unapplied/server/0326-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
index 1bf426b9ec..1bf426b9ec 100644
--- a/patches/server/0326-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
+++ b/patches/unapplied/server/0326-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
diff --git a/patches/server/0327-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/unapplied/server/0327-MC-145656-Fix-Follow-Range-Initial-Target.patch
index 4494b22853..4494b22853 100644
--- a/patches/server/0327-MC-145656-Fix-Follow-Range-Initial-Target.patch
+++ b/patches/unapplied/server/0327-MC-145656-Fix-Follow-Range-Initial-Target.patch
diff --git a/patches/server/0328-Duplicate-UUID-Resolve-Option.patch b/patches/unapplied/server/0328-Duplicate-UUID-Resolve-Option.patch
index 3529175289..18cf5ebd5a 100644
--- a/patches/server/0328-Duplicate-UUID-Resolve-Option.patch
+++ b/patches/unapplied/server/0328-Duplicate-UUID-Resolve-Option.patch
@@ -56,7 +56,7 @@ index cbeaadaecf816070b3a37938c8e683180939afc4..95e5073a68e4dd38b70e8268daf21609
  
      public static void onChunkHolderCreate(final ServerLevel level, final ChunkHolder holder) {
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 5b7260b5a14cb9d2b90cf3c411d119e6bfa84046..0b1aadd3648f46680e4edc137de3e5ce52428383 100644
+index 15e423cdb61547ddffb4497f5c51e101f5dbe8af..cfef1d3ca1975c459556f583f0a09c2a888c0792 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -534,6 +534,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0329-PlayerDeathEvent-shouldDropExperience.patch b/patches/unapplied/server/0329-PlayerDeathEvent-shouldDropExperience.patch
index d57194334c..ba4804ccd0 100644
--- a/patches/server/0329-PlayerDeathEvent-shouldDropExperience.patch
+++ b/patches/unapplied/server/0329-PlayerDeathEvent-shouldDropExperience.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerDeathEvent#shouldDropExperience
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 0e59ea13f1fd3abf684133b0e7f3df00c93b2061..dcb6a1bd3774e63dd14fbd8ddd6ff09c68741379 100644
+index 151f1918392e26163323ddf1cfd6cd52abaea9c3..b0065a0e9494e0ebbd212874997839f04cda5fd7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -970,7 +970,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0330-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/unapplied/server/0330-Prevent-bees-loading-chunks-checking-hive-position.patch
index 0e77519ffd..0e77519ffd 100644
--- a/patches/server/0330-Prevent-bees-loading-chunks-checking-hive-position.patch
+++ b/patches/unapplied/server/0330-Prevent-bees-loading-chunks-checking-hive-position.patch
diff --git a/patches/server/0331-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/unapplied/server/0331-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
index 71f28eb22f..71f28eb22f 100644
--- a/patches/server/0331-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
+++ b/patches/unapplied/server/0331-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
diff --git a/patches/server/0332-Optimise-EntityGetter-getPlayerByUUID.patch b/patches/unapplied/server/0332-Optimise-EntityGetter-getPlayerByUUID.patch
index 79988c201b..8175a3b4a7 100644
--- a/patches/server/0332-Optimise-EntityGetter-getPlayerByUUID.patch
+++ b/patches/unapplied/server/0332-Optimise-EntityGetter-getPlayerByUUID.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimise EntityGetter#getPlayerByUUID
 Use the PlayerList map instead of iterating over all players
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index c4ae2f4f1ec9aa39478815f46e0d1d13144acf5b..7c780e464faae69b74d69e40bbeeeccf4c609eab 100644
+index dc0a02f08d1c211443f35a10270110791b6fbbcc..0f039eae0ca81f80bf2e644b64a356427ce611bb 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -552,6 +552,15 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0333-Fix-items-not-falling-correctly.patch b/patches/unapplied/server/0333-Fix-items-not-falling-correctly.patch
index 7810b28255..b1f409ec73 100644
--- a/patches/server/0333-Fix-items-not-falling-correctly.patch
+++ b/patches/unapplied/server/0333-Fix-items-not-falling-correctly.patch
@@ -28,7 +28,7 @@ index 2edc55f09b79ac75788a0ded8b3d2a6800674470..9b9d491c7c41590c93d606414902329b
                  float f1 = 0.98F;
  
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 1d9ce6dae17ff572d4528971c69c63d0f85b313c..305d9772f2af22e8bdf73235cdb15ea01ac2c3b3 100644
+index e4efed4e50188b71ff30238b3517a924b45b24b8..d5374072a97f791964033d107f023b3cc657b343 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -257,7 +257,7 @@ public class ActivationRange
diff --git a/patches/server/0334-Optimize-call-to-getFluid-for-explosions.patch b/patches/unapplied/server/0334-Optimize-call-to-getFluid-for-explosions.patch
index ba51e34bdd..ba51e34bdd 100644
--- a/patches/server/0334-Optimize-call-to-getFluid-for-explosions.patch
+++ b/patches/unapplied/server/0334-Optimize-call-to-getFluid-for-explosions.patch
diff --git a/patches/server/0335-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/unapplied/server/0335-Fix-last-firework-in-stack-not-having-effects-when-d.patch
index 068f604c0a..068f604c0a 100644
--- a/patches/server/0335-Fix-last-firework-in-stack-not-having-effects-when-d.patch
+++ b/patches/unapplied/server/0335-Fix-last-firework-in-stack-not-having-effects-when-d.patch
diff --git a/patches/server/0336-Entity-Activation-Range-2.0.patch b/patches/unapplied/server/0336-Entity-Activation-Range-2.0.patch
index 516e5866a8..b87ad8c45a 100644
--- a/patches/server/0336-Entity-Activation-Range-2.0.patch
+++ b/patches/unapplied/server/0336-Entity-Activation-Range-2.0.patch
@@ -18,7 +18,7 @@ public net.minecraft.world.entity.Entity isInsidePortal
 public net.minecraft.world.entity.LivingEntity jumping
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index d832f19c5d8859239e06f4b3317e9ca2df1c9508..82510154e6a0cef509316b1f8c71021cca39a323 100644
+index 0f039eae0ca81f80bf2e644b64a356427ce611bb..88cde9de26d3da3d863a9d44f5c127eed0a1f4b6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2,7 +2,6 @@ package net.minecraft.server.level;
@@ -112,7 +112,7 @@ index d832f19c5d8859239e06f4b3317e9ca2df1c9508..82510154e6a0cef509316b1f8c71021c
          } else {
              passenger.stopRiding();
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 23194db56de5e9b488048386720fdf855729bbd0..cf05d938c4f9c7db44a76e6a736c41a8c9cc8b35 100644
+index bf046bea5fdff67f362c401f1ddbfa9d2863a9d7..0cb02541e7671281ed910793495c3268238726a5 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -390,6 +390,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -148,7 +148,7 @@ index 23194db56de5e9b488048386720fdf855729bbd0..cf05d938c4f9c7db44a76e6a736c41a8
              movement = this.maybeBackOffFromEdge(movement, movementType);
              Vec3 vec3d1 = this.collide(movement);
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index df0cc02f9bbea857226765c6066a2b945036a0d9..7bbb68bf06e04b58b6c4fa546fe919e387e00b27 100644
+index 3d754bcfc7ab44fe833b6a68794cbcf8da5f4792..20007742739eb57fd36865526aa79ccebfca0b99 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -220,6 +220,19 @@ public abstract class Mob extends LivingEntity implements Targeting {
diff --git a/patches/server/0337-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/unapplied/server/0337-Guard-against-serializing-mismatching-chunk-coordina.patch
index ee12496e7a..ee12496e7a 100644
--- a/patches/server/0337-Guard-against-serializing-mismatching-chunk-coordina.patch
+++ b/patches/unapplied/server/0337-Guard-against-serializing-mismatching-chunk-coordina.patch
diff --git a/patches/server/0338-Implement-alternative-item-despawn-rate.patch b/patches/unapplied/server/0338-Implement-alternative-item-despawn-rate.patch
index e0c9184ee5..e0c9184ee5 100644
--- a/patches/server/0338-Implement-alternative-item-despawn-rate.patch
+++ b/patches/unapplied/server/0338-Implement-alternative-item-despawn-rate.patch
diff --git a/patches/server/0339-Tracking-Range-Improvements.patch b/patches/unapplied/server/0339-Tracking-Range-Improvements.patch
index 6c4625adcf..f743c56a9e 100644
--- a/patches/server/0339-Tracking-Range-Improvements.patch
+++ b/patches/unapplied/server/0339-Tracking-Range-Improvements.patch
@@ -8,7 +8,7 @@ Sets tracking range of watermobs to animals instead of misc and simplifies code
 Also ignores Enderdragon, defaulting it to Mojang's setting
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 0b1aadd3648f46680e4edc137de3e5ce52428383..06e53890fab287846c8d846f1f829650a1b3c09b 100644
+index cfef1d3ca1975c459556f583f0a09c2a888c0792..9b16464c4edf334093c9aa0bd164348197b96455 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1265,6 +1265,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0340-Fix-items-vanishing-through-end-portal.patch b/patches/unapplied/server/0340-Fix-items-vanishing-through-end-portal.patch
index c25aebab62..38a793d269 100644
--- a/patches/server/0340-Fix-items-vanishing-through-end-portal.patch
+++ b/patches/unapplied/server/0340-Fix-items-vanishing-through-end-portal.patch
@@ -13,7 +13,7 @@ Quickly loading the exact world spawn chunk before searching the
 heightmap resolves the issue without having to load all spawn chunks.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index cd8a75a830512014fbc694325ff860265b9b70f9..29125ecad7bd1a66c46656a24d657ac175e75b5d 100644
+index 0cb02541e7671281ed910793495c3268238726a5..7ba9b07c4f3335fabc3aeb28cdcd331b0c5ada86 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3378,6 +3378,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0341-implement-optional-per-player-mob-spawns.patch b/patches/unapplied/server/0341-implement-optional-per-player-mob-spawns.patch
index 8842042bf8..9d88215ce6 100644
--- a/patches/server/0341-implement-optional-per-player-mob-spawns.patch
+++ b/patches/unapplied/server/0341-implement-optional-per-player-mob-spawns.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] implement optional per player mob spawns
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 06e53890fab287846c8d846f1f829650a1b3c09b..847019bf4a81b82e6e11a19aebd69b7270d81b06 100644
+index 9b16464c4edf334093c9aa0bd164348197b96455..bd15131b7506e965bcf64be20330731256a1e1f0 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -289,6 +289,29 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -39,7 +39,7 @@ index 06e53890fab287846c8d846f1f829650a1b3c09b..847019bf4a81b82e6e11a19aebd69b72
          double d0 = (double) SectionPos.sectionToBlockCoord(pos.x, 8);
          double d1 = (double) SectionPos.sectionToBlockCoord(pos.z, 8);
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 4649e597b86335b33d9e9227d966dd7ad8208096..b73d45c205db39ed3e97a127e53371db81e0d63f 100644
+index 821b2c8860c1328e2ecc009deeb533648ce16540..ce8afee7d1db99de43c9ec47edcbc929e025b159 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -543,7 +543,18 @@ public class ServerChunkCache extends ChunkSource {
@@ -63,7 +63,7 @@ index 4649e597b86335b33d9e9227d966dd7ad8208096..b73d45c205db39ed3e97a127e53371db
  
              this.lastSpawnState = spawnercreature_d;
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index dcb6a1bd3774e63dd14fbd8ddd6ff09c68741379..55c3416f209178a1a100228d9b1db620c79bc288 100644
+index b0065a0e9494e0ebbd212874997839f04cda5fd7..0952769c94519f9fb300bc14c498f19107364643 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -246,6 +246,10 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0342-Anti-Xray.patch b/patches/unapplied/server/0342-Anti-Xray.patch
index 77e6287283..74a754174b 100644
--- a/patches/server/0342-Anti-Xray.patch
+++ b/patches/unapplied/server/0342-Anti-Xray.patch
@@ -1117,7 +1117,7 @@ index 88cde9de26d3da3d863a9d44f5c127eed0a1f4b6..90c80bc7fc7d6f9b91d9f9953d19eef0
          this.convertable = convertable_conversionsession;
          this.uuid = WorldUUID.getUUID(convertable_conversionsession.levelDirectory.path().toFile());
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 58277908737a1f3da89e5df827e108e2381396ff..f47fcae72d48cd410a4ac3e0a4bd21f42fae7eec 100644
+index c15d2b8862139a6f083547794617d8bd6c462287..0ff4372afa4b159acc59e3dbd2e9efbd7b7ab6a2 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -49,7 +49,7 @@ import org.bukkit.event.player.PlayerInteractEvent;
@@ -1545,7 +1545,7 @@ index 982fb3ef071d6a66f16744717e8e146bef6d9e8c..02beedb84a8bec001270116c6ce496db
      // CraftBukkit end
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-index 593cfd68dc0f3679c684b6a1d2036419d4f3bc0c..b4b2f961d1e4f8b5b199052efefd96bcbfc3e68b 100644
+index 545b14f02ac72dda30891d681eba585d19fd5e1d..6dc7e23e96aaffb912611a9dbd41459cb8489056 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 @@ -53,7 +53,7 @@ public class CraftChunk implements Chunk {
diff --git a/patches/server/0343-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/unapplied/server/0343-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
index e561797b3b..e561797b3b 100644
--- a/patches/server/0343-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
+++ b/patches/unapplied/server/0343-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
diff --git a/patches/server/0344-Improve-Block-breakNaturally-API.patch b/patches/unapplied/server/0344-Improve-Block-breakNaturally-API.patch
index 27a3b4f8bb..27a3b4f8bb 100644
--- a/patches/server/0344-Improve-Block-breakNaturally-API.patch
+++ b/patches/unapplied/server/0344-Improve-Block-breakNaturally-API.patch
diff --git a/patches/server/0345-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/unapplied/server/0345-Optimise-getChunkAt-calls-for-loaded-chunks.patch
index 3b47f02e45..e48d184ea9 100644
--- a/patches/server/0345-Optimise-getChunkAt-calls-for-loaded-chunks.patch
+++ b/patches/unapplied/server/0345-Optimise-getChunkAt-calls-for-loaded-chunks.patch
@@ -7,7 +7,7 @@ bypass the need to get a player chunk, then get the either,
 then unwrap it...
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index b73d45c205db39ed3e97a127e53371db81e0d63f..ab1a45f30930408a3e3c7172169ff648643ba54d 100644
+index ce8afee7d1db99de43c9ec47edcbc929e025b159..8f5d30ad2cf6274bc6a1721be9ccde8dac0be333 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -270,6 +270,12 @@ public class ServerChunkCache extends ChunkSource {
diff --git a/patches/server/0346-Add-debug-for-sync-chunk-loads.patch b/patches/unapplied/server/0346-Add-debug-for-sync-chunk-loads.patch
index 70c3c7be99..c6b69e9ed2 100644
--- a/patches/server/0346-Add-debug-for-sync-chunk-loads.patch
+++ b/patches/unapplied/server/0346-Add-debug-for-sync-chunk-loads.patch
@@ -300,7 +300,7 @@ index 0000000000000000000000000000000000000000..95d6022c9cfb2e36ec5a71be6e343540
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index ab1a45f30930408a3e3c7172169ff648643ba54d..a8c1620ec48adcd2bb116d48f8bb2d4af50f5f43 100644
+index 8f5d30ad2cf6274bc6a1721be9ccde8dac0be333..e27067e72a49e127aa4abb17f5ed1df09f943f3c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -294,6 +294,7 @@ public class ServerChunkCache extends ChunkSource {
@@ -312,7 +312,7 @@ index ab1a45f30930408a3e3c7172169ff648643ba54d..a8c1620ec48adcd2bb116d48f8bb2d4a
              chunkproviderserver_b.managedBlock(completablefuture::isDone);
                  io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler.popChunkWait(); // Paper - async chunk debug  // Paper - rewrite chunk system
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 041a6b20fa88852cd5b37438f2ddf30517b95820..88abc0df7f5b9e285b10f412b58422b326b0a99a 100644
+index 90c80bc7fc7d6f9b91d9f9953d19eef021435780..6c8fa0ed1e445e77593b6d26c09eeaac1437787d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -645,6 +645,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0347-Improve-java-version-check.patch b/patches/unapplied/server/0347-Improve-java-version-check.patch
index b5c206c627..b5c206c627 100644
--- a/patches/server/0347-Improve-java-version-check.patch
+++ b/patches/unapplied/server/0347-Improve-java-version-check.patch
diff --git a/patches/server/0348-Add-ThrownEggHatchEvent.patch b/patches/unapplied/server/0348-Add-ThrownEggHatchEvent.patch
index aaf3812fef..aaf3812fef 100644
--- a/patches/server/0348-Add-ThrownEggHatchEvent.patch
+++ b/patches/unapplied/server/0348-Add-ThrownEggHatchEvent.patch
diff --git a/patches/server/0349-Entity-Jump-API.patch b/patches/unapplied/server/0349-Entity-Jump-API.patch
index 5d59659b18..a77e75d1bc 100644
--- a/patches/server/0349-Entity-Jump-API.patch
+++ b/patches/unapplied/server/0349-Entity-Jump-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity Jump API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 80b60e33e9e39bc62f65bfddf121254d333aecae..1b8f69d2bc595b655de4a2cdffe77c81433648e3 100644
+index c95c7619820d1dbabc52ae8ccef88e03a2f1d9a3..63e00b3aa1b31c14fc4630fb4b2d3355349bdf24 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3281,8 +3281,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -48,7 +48,7 @@ index 344e933311f5cdccb66069d486b111a003639dfe..add3cd866452df727107e94fb2039bdd
              }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index a3842078a394241a3a9b4c398d13fcdbcb5dbe10..9ba85d099d0e6893dc3489ce0753119348e937b3 100644
+index 9e15c5e2adfb46ffa3548b3a2eda225de4c44fb5..904f34f52659e864d148204cb0eebb9b381cc24a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -906,5 +906,19 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0350-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/unapplied/server/0350-Add-option-to-nerf-pigmen-from-nether-portals.patch
index 5ba5da5033..248b3d2aae 100644
--- a/patches/server/0350-Add-option-to-nerf-pigmen-from-nether-portals.patch
+++ b/patches/unapplied/server/0350-Add-option-to-nerf-pigmen-from-nether-portals.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to nerf pigmen from nether portals
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 29125ecad7bd1a66c46656a24d657ac175e75b5d..a3885b4a6453d4317323a97f0b4e86c377448ddc 100644
+index 7ba9b07c4f3335fabc3aeb28cdcd331b0c5ada86..15b807c0a49461ae5daecd6aef43f5c2d464b224 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -392,6 +392,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0351-Make-the-GUI-graph-fancier.patch b/patches/unapplied/server/0351-Make-the-GUI-graph-fancier.patch
index 2768fc5d7c..2768fc5d7c 100644
--- a/patches/server/0351-Make-the-GUI-graph-fancier.patch
+++ b/patches/unapplied/server/0351-Make-the-GUI-graph-fancier.patch
diff --git a/patches/server/0352-add-hand-to-BlockMultiPlaceEvent.patch b/patches/unapplied/server/0352-add-hand-to-BlockMultiPlaceEvent.patch
index 1fca97a93b..1fca97a93b 100644
--- a/patches/server/0352-add-hand-to-BlockMultiPlaceEvent.patch
+++ b/patches/unapplied/server/0352-add-hand-to-BlockMultiPlaceEvent.patch
diff --git a/patches/server/0353-Validate-tripwire-hook-placement-before-update.patch b/patches/unapplied/server/0353-Validate-tripwire-hook-placement-before-update.patch
index fd8a74807c..fd8a74807c 100644
--- a/patches/server/0353-Validate-tripwire-hook-placement-before-update.patch
+++ b/patches/unapplied/server/0353-Validate-tripwire-hook-placement-before-update.patch
diff --git a/patches/server/0354-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/unapplied/server/0354-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
index 261a4d131f..261a4d131f 100644
--- a/patches/server/0354-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
+++ b/patches/unapplied/server/0354-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
diff --git a/patches/server/0355-Configurable-chance-of-villager-zombie-infection.patch b/patches/unapplied/server/0355-Configurable-chance-of-villager-zombie-infection.patch
index 1da6163a58..1da6163a58 100644
--- a/patches/server/0355-Configurable-chance-of-villager-zombie-infection.patch
+++ b/patches/unapplied/server/0355-Configurable-chance-of-villager-zombie-infection.patch
diff --git a/patches/server/0356-Optimise-Chunk-getFluid.patch b/patches/unapplied/server/0356-Optimise-Chunk-getFluid.patch
index 51323fdeb3..22982d0790 100644
--- a/patches/server/0356-Optimise-Chunk-getFluid.patch
+++ b/patches/unapplied/server/0356-Optimise-Chunk-getFluid.patch
@@ -8,7 +8,7 @@ faster on its own, however removing the try catch makes it
 easier to inline due to code size
 
 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 44ef27e5c297055f7a2512ae49d68d50cfcde72a..78004403ca444b2880a663b72c9e15c5b57faedd 100644
+index 4a5491a79281b7cddf5ad5f060567f174b89d14b..12834995b2bab9e82a40feb01f038532961296cf 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -377,18 +377,20 @@ public class LevelChunk extends ChunkAccess {
diff --git a/patches/server/0357-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/unapplied/server/0357-Set-spigots-verbose-world-setting-to-false-by-def.patch
index 9e3cf72266..b9d2820ee5 100644
--- a/patches/server/0357-Set-spigots-verbose-world-setting-to-false-by-def.patch
+++ b/patches/unapplied/server/0357-Set-spigots-verbose-world-setting-to-false-by-def.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Set spigots verbose world setting to false by def
 
 
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 77698b0555c5930645659b4af061c3f428bf8f65..b7d6197cb5f46bb020fff049ae2dd8fc3ee8ff2f 100644
+index 50e57486d49694396816122504028e410ebb602d..11ac344ef113732fa717b67c51f76692b9b247e7 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -20,7 +20,7 @@ public class SpigotWorldConfig
diff --git a/patches/server/0358-Add-tick-times-API-and-mspt-command.patch b/patches/unapplied/server/0358-Add-tick-times-API-and-mspt-command.patch
index bffbded7a3..c78450b742 100644
--- a/patches/server/0358-Add-tick-times-API-and-mspt-command.patch
+++ b/patches/unapplied/server/0358-Add-tick-times-API-and-mspt-command.patch
@@ -184,7 +184,7 @@ index ef6d98d503fdca4322000278de4cf325df56f99d..f700e677d75f911b786a22b4cc9d0a01
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 212d8473458ce830804f7a7a2848d2df6f4bb3ba..644c9aab6c2e34263888a6ba854f992c04a1dde1 100644
+index 871a1095d28bde74cfb63091d77c860f92a2ea0e..4545083ceb2e180881b981842ef8857dbe4773dd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2596,6 +2596,16 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0359-Expose-MinecraftServer-isRunning.patch b/patches/unapplied/server/0359-Expose-MinecraftServer-isRunning.patch
index c00d1eec4f..8351ea66ee 100644
--- a/patches/server/0359-Expose-MinecraftServer-isRunning.patch
+++ b/patches/unapplied/server/0359-Expose-MinecraftServer-isRunning.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose MinecraftServer#isRunning
 This allows for plugins to detect if the server is actually turning off in onDisable rather than just plugins reloading.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 644c9aab6c2e34263888a6ba854f992c04a1dde1..f5357e9816fdd985f7ca9ad705e8c1f42626622f 100644
+index 4545083ceb2e180881b981842ef8857dbe4773dd..83661761abdb31e62ea56af9d60fed393326be50 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2832,5 +2832,10 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0360-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/unapplied/server/0360-Add-Raw-Byte-ItemStack-Serialization.patch
index f532915d0a..f532915d0a 100644
--- a/patches/server/0360-Add-Raw-Byte-ItemStack-Serialization.patch
+++ b/patches/unapplied/server/0360-Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/patches/server/0361-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/unapplied/server/0361-Pillager-patrol-spawn-settings-and-per-player-option.patch
index a30c8f377b..7a4cf4768a 100644
--- a/patches/server/0361-Pillager-patrol-spawn-settings-and-per-player-option.patch
+++ b/patches/unapplied/server/0361-Pillager-patrol-spawn-settings-and-per-player-option.patch
@@ -10,7 +10,7 @@ When not per player it will use the Vanilla mechanic of one delay per
 world and the world age for the start day.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 55c3416f209178a1a100228d9b1db620c79bc288..5c0b406214b7da3b33acf1f545105d4ecae1f783 100644
+index 0952769c94519f9fb300bc14c498f19107364643..100bcf5174c06bb4450f0056bb5b5ef610ee1da6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -242,6 +242,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0362-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/unapplied/server/0362-Remote-Connections-shouldn-t-hold-up-shutdown.patch
index a4a67214ec..342b0f296f 100644
--- a/patches/server/0362-Remote-Connections-shouldn-t-hold-up-shutdown.patch
+++ b/patches/unapplied/server/0362-Remote-Connections-shouldn-t-hold-up-shutdown.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Remote Connections shouldn't hold up shutdown
 Bugs in the connection logic appears to leave stale connections even, preventing shutdown
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 2ae9b52d43a44b2164034d9162b644daba618d66..7889a55c8ddf8b1b1b27a8241875c071f6ac0eba 100644
+index 97f80226793e700c8b05e41005bb2751a6b00f33..307f3ab69186c0980f33d664bb2db8d1aae228f8 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -390,11 +390,11 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0363-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/unapplied/server/0363-Do-not-allow-bees-to-load-chunks-for-beehives.patch
index aa41e146a6..aa41e146a6 100644
--- a/patches/server/0363-Do-not-allow-bees-to-load-chunks-for-beehives.patch
+++ b/patches/unapplied/server/0363-Do-not-allow-bees-to-load-chunks-for-beehives.patch
diff --git a/patches/server/0364-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/unapplied/server/0364-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
index bc5a912401..8a7a7b6c2a 100644
--- a/patches/server/0364-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
+++ b/patches/unapplied/server/0364-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
@@ -7,7 +7,7 @@ Suspected case would be around the technique used in .stopRiding
 Stack will identify any causer of this and warn instead of crashing.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 847019bf4a81b82e6e11a19aebd69b7270d81b06..41a6712d4c55907df1274f5a825e86d7fedb42bb 100644
+index bd15131b7506e965bcf64be20330731256a1e1f0..0e3c89b9d75160d0e8947d042a1568da13d62fcf 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -994,6 +994,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -25,7 +25,7 @@ index 847019bf4a81b82e6e11a19aebd69b7270d81b06..41a6712d4c55907df1274f5a825e86d7
              EntityType<?> entitytypes = entity.getType();
              int i = entitytypes.clientTrackingRange() * 16;
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 88abc0df7f5b9e285b10f412b58422b326b0a99a..19e7424d3098625b967e9fabb9681ffd9f09d16c 100644
+index 6c8fa0ed1e445e77593b6d26c09eeaac1437787d..0353b3e3a9d9a0bd44f48a61a02811ec0bad186a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2466,7 +2466,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0365-Don-t-tick-dead-players.patch b/patches/unapplied/server/0365-Don-t-tick-dead-players.patch
index 609adabf08..ba510841bd 100644
--- a/patches/server/0365-Don-t-tick-dead-players.patch
+++ b/patches/unapplied/server/0365-Don-t-tick-dead-players.patch
@@ -7,7 +7,7 @@ Causes sync chunk loads and who knows what all else.
 This is safe because Spectators are skipped in unloaded chunks too in vanilla.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 5c0b406214b7da3b33acf1f545105d4ecae1f783..40709c98687334b5383ad9d412d5b6ff7748b02b 100644
+index 100bcf5174c06bb4450f0056bb5b5ef610ee1da6..d35b358ec97762788fd72b37470d97f1d6d927ef 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -725,7 +725,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0366-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/unapplied/server/0366-Dead-Player-s-shouldn-t-be-able-to-move.patch
index 3fcf32908f..e2aba05613 100644
--- a/patches/server/0366-Dead-Player-s-shouldn-t-be-able-to-move.patch
+++ b/patches/unapplied/server/0366-Dead-Player-s-shouldn-t-be-able-to-move.patch
@@ -7,7 +7,7 @@ This fixes a lot of game state issues where packets were delayed for processing
 due to 1.15's new queue but processed while dead.
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 9d252aea2c372f9a6b46319564dc6dc5e94d9a91..00d9dd5affd62ceb35bb783d6bcc9e1e600c0fb4 100644
+index cc6a9e9566d6f9bf453f3d6fba132c886248bf1c..fb3f65feab6f5febf58be71f0b9b1a4381958f1d 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1166,7 +1166,7 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0367-Optimize-Collision-to-not-load-chunks.patch b/patches/unapplied/server/0367-Optimize-Collision-to-not-load-chunks.patch
index 78012d2193..b01a858ade 100644
--- a/patches/server/0367-Optimize-Collision-to-not-load-chunks.patch
+++ b/patches/unapplied/server/0367-Optimize-Collision-to-not-load-chunks.patch
@@ -14,7 +14,7 @@ movement will load only the chunk the player enters anyways and avoids loading
 massive amounts of surrounding chunks due to large AABB lookups.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index cffda75eebe70e1c9b5ac7905f69929b2634aeb0..7d8304497377993163f2837ee615c844f676481c 100644
+index c5287f08c675550c897d72fd7eff3331d0640800..211cc5e508473f14827910aef88ee75a1203edab 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -824,6 +824,7 @@ public abstract class PlayerList {
@@ -26,7 +26,7 @@ index cffda75eebe70e1c9b5ac7905f69929b2634aeb0..7d8304497377993163f2837ee615c844
              // CraftBukkit end
              entityplayer1.setPos(entityplayer1.getX(), entityplayer1.getY() + 1.0D, entityplayer1.getZ());
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a3885b4a6453d4317323a97f0b4e86c377448ddc..32707ab485111e265cc34d5f09507c97067dfa09 100644
+index 15b807c0a49461ae5daecd6aef43f5c2d464b224..2f189712675b988a5bbb796abf54740470d836f4 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -237,6 +237,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0368-Don-t-move-existing-players-to-world-spawn.patch b/patches/unapplied/server/0368-Don-t-move-existing-players-to-world-spawn.patch
index 24403cc3e9..8910722e11 100644
--- a/patches/server/0368-Don-t-move-existing-players-to-world-spawn.patch
+++ b/patches/unapplied/server/0368-Don-t-move-existing-players-to-world-spawn.patch
@@ -13,7 +13,7 @@ By skipping this, we avoid potential for a large spike on server start.
 public net.minecraft.server.level.ServerPlayer fudgeSpawnLocation(Lnet/minecraft/server/level/ServerLevel;)V
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 40709c98687334b5383ad9d412d5b6ff7748b02b..de8121b1e4a30e091ce6eb7d3e5beb6029fd95d8 100644
+index d35b358ec97762788fd72b37470d97f1d6d927ef..a5dd060ad0b978fddbc193feb8bbab99342b4d56 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -378,7 +378,7 @@ public class ServerPlayer extends Player {
@@ -35,7 +35,7 @@ index 40709c98687334b5383ad9d412d5b6ff7748b02b..de8121b1e4a30e091ce6eb7d3e5beb60
          this.gameMode.setLevel((ServerLevel) world);
      }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 7d8304497377993163f2837ee615c844f676481c..abd0acb3aa7a430888d143b58a96c7eac3ba10e3 100644
+index 211cc5e508473f14827910aef88ee75a1203edab..f894d6549e4abf1001de68c8bc3ea0129e973e18 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -228,6 +228,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0369-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/unapplied/server/0369-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
index 70dff6f0dc..70dff6f0dc 100644
--- a/patches/server/0369-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
+++ b/patches/unapplied/server/0369-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/server/0370-Improved-Watchdog-Support.patch b/patches/unapplied/server/0370-Improved-Watchdog-Support.patch
index 934b465bbd..934b465bbd 100644
--- a/patches/server/0370-Improved-Watchdog-Support.patch
+++ b/patches/unapplied/server/0370-Improved-Watchdog-Support.patch
diff --git a/patches/server/0371-Optimize-Pathfinding.patch b/patches/unapplied/server/0371-Optimize-Pathfinding.patch
index 8fca2b48b1..8fca2b48b1 100644
--- a/patches/server/0371-Optimize-Pathfinding.patch
+++ b/patches/unapplied/server/0371-Optimize-Pathfinding.patch
diff --git a/patches/server/0372-Reduce-Either-Optional-allocation.patch b/patches/unapplied/server/0372-Reduce-Either-Optional-allocation.patch
index 1833cacdfe..1833cacdfe 100644
--- a/patches/server/0372-Reduce-Either-Optional-allocation.patch
+++ b/patches/unapplied/server/0372-Reduce-Either-Optional-allocation.patch
diff --git a/patches/server/0373-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/unapplied/server/0373-Reduce-memory-footprint-of-NBTTagCompound.patch
index e6907357f4..e6907357f4 100644
--- a/patches/server/0373-Reduce-memory-footprint-of-NBTTagCompound.patch
+++ b/patches/unapplied/server/0373-Reduce-memory-footprint-of-NBTTagCompound.patch
diff --git a/patches/server/0374-Prevent-opening-inventories-when-frozen.patch b/patches/unapplied/server/0374-Prevent-opening-inventories-when-frozen.patch
index fa840acd71..76cceb93c4 100644
--- a/patches/server/0374-Prevent-opening-inventories-when-frozen.patch
+++ b/patches/unapplied/server/0374-Prevent-opening-inventories-when-frozen.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent opening inventories when frozen
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index de8121b1e4a30e091ce6eb7d3e5beb6029fd95d8..0bab5208a38e8e7c848e9162396df535eb7e5711 100644
+index a5dd060ad0b978fddbc193feb8bbab99342b4d56..b5e42c3602f45a5b540dfc54421ab22866f2e4d9 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -694,7 +694,7 @@ public class ServerPlayer extends Player {
@@ -27,7 +27,7 @@ index de8121b1e4a30e091ce6eb7d3e5beb6029fd95d8..0bab5208a38e8e7c848e9162396df535
                  this.initMenu(container);
                  return OptionalInt.of(this.containerCounter);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index aa131c233ee9d7926ca77e1afedd27baf7639423..872adf91703baa24d67f417e7a45309f92984da9 100644
+index 607dc510ac856a0bf3a54bf1004bdf98825131e7..6a9ab8bab7eb443f83e939bed17cb6fc9d1f3906 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -325,7 +325,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/patches/server/0375-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/unapplied/server/0375-Don-t-run-entity-collision-code-if-not-needed.patch
index a6ba97f012..874b78866d 100644
--- a/patches/server/0375-Don-t-run-entity-collision-code-if-not-needed.patch
+++ b/patches/unapplied/server/0375-Don-t-run-entity-collision-code-if-not-needed.patch
@@ -12,7 +12,7 @@ The entity's current team collision rule causes them to NEVER collide.
 Co-authored-by: Owen1212055 <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 1b8f69d2bc595b655de4a2cdffe77c81433648e3..53adda63cf8a212af28ef14a7c26c0254c9bae55 100644
+index 63e00b3aa1b31c14fc4630fb4b2d3355349bdf24..ad0c8e43d27feb24e614fa15569edab625eff875 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3396,10 +3396,24 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0376-Implement-Player-Client-Options-API.patch b/patches/unapplied/server/0376-Implement-Player-Client-Options-API.patch
index 0b7a3c5f0d..1ca4e57468 100644
--- a/patches/server/0376-Implement-Player-Client-Options-API.patch
+++ b/patches/unapplied/server/0376-Implement-Player-Client-Options-API.patch
@@ -87,7 +87,7 @@ index 0000000000000000000000000000000000000000..b6f4400df3d8ec7e06a996de54f8cabb
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index b94874cc1484190646798c223b19ddba43a107c7..b0d15e7c2c4d9e04c2a473ff68a01fb0463dd30e 100644
+index b5e42c3602f45a5b540dfc54421ab22866f2e4d9..983b006d6db81bbc285fceac23ea4b9f15b2029b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -379,7 +379,7 @@ public class ServerPlayer extends Player {
@@ -136,7 +136,7 @@ index b94874cc1484190646798c223b19ddba43a107c7..b0d15e7c2c4d9e04c2a473ff68a01fb0
          this.adventure$locale = net.kyori.adventure.translation.Translator.parseLocale(this.language); // Paper
          this.requestedViewDistance = clientOptions.viewDistance();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 45f3d75fbb68a3f93fc3ceaa63183ab5f5c7e91c..b92cc9f8d62cc3bfefe42c4c1fb08af4731dd48f 100644
+index 8341d66dd5cad3cebdd95cfbc995cc3e8d43d934..7c40718a53d2ef480441fd053de7c45971efe416 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -604,6 +604,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0377-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/unapplied/server/0377-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
index 9c4eda5303..9c4eda5303 100644
--- a/patches/server/0377-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
+++ b/patches/unapplied/server/0377-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/patches/server/0378-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/unapplied/server/0378-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
index 62f1c4ed1c..452276cccd 100644
--- a/patches/server/0378-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
+++ b/patches/unapplied/server/0378-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
@@ -31,7 +31,7 @@ delays anymore.
 public net.minecraft.server.level.ChunkMap addEntity(Lnet/minecraft/world/entity/Entity;)V
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 41a6712d4c55907df1274f5a825e86d7fedb42bb..c10ef2e6af3e6c52eeb8c96cdbf5352d9dd25dd2 100644
+index 0e3c89b9d75160d0e8947d042a1568da13d62fcf..8d12a6da0f0679fd14c2a498f9645bd04b2d8ed7 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1000,6 +1000,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -43,7 +43,7 @@ index 41a6712d4c55907df1274f5a825e86d7fedb42bb..c10ef2e6af3e6c52eeb8c96cdbf5352d
          if (!(entity instanceof EnderDragonPart)) {
              EntityType<?> entitytypes = entity.getType();
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index baec871645598c36cefda7478e91b560bdfdf6fe..d31670aecc2ebe67bf6071c67126ce4142b93053 100644
+index 983b006d6db81bbc285fceac23ea4b9f15b2029b..49d341605ac7e82c5dcdcc960b6581aa7e1fb8f3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -264,6 +264,7 @@ public class ServerPlayer extends Player {
@@ -55,7 +55,7 @@ index baec871645598c36cefda7478e91b560bdfdf6fe..d31670aecc2ebe67bf6071c67126ce41
      // CraftBukkit end
      public boolean isRealPlayer; // Paper
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 29f9dc6771029295d9ad3a8e74e90c3abc1ab138..8b4c98ff8c411ee6f4efdf4839f9b34ea79fd599 100644
+index 0267886463facdfda43b2dde7efc62001a9adf97..f8679d4b52a5948048a91338dc2cac8bfa5ef9e3 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -297,6 +297,12 @@ public abstract class PlayerList {
diff --git a/patches/server/0379-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/unapplied/server/0379-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
index f5d4cd1e7f..a75044b8aa 100644
--- a/patches/server/0379-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
+++ b/patches/unapplied/server/0379-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
@@ -87,7 +87,7 @@ index f8679d4b52a5948048a91338dc2cac8bfa5ef9e3..ac6c1c1cf0d736c31a4e3666cb9e10ba
          }
          // Paper end
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 9dd5844c31fa8733298eb70bb2a8deebfaea2a23..2f4afa9dd08820c3130fe6a85b051adb80057907 100644
+index 2f189712675b988a5bbb796abf54740470d836f4..186e9541031eb2daaf479d7d14782e917b3e16e5 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2312,27 +2312,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0380-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/unapplied/server/0380-Add-PlayerAttackEntityCooldownResetEvent.patch
index 4f8d5ef21b..c7a17cccc4 100644
--- a/patches/server/0380-Add-PlayerAttackEntityCooldownResetEvent.patch
+++ b/patches/unapplied/server/0380-Add-PlayerAttackEntityCooldownResetEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerAttackEntityCooldownResetEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 53adda63cf8a212af28ef14a7c26c0254c9bae55..00a3b2d0b28e6f76ad94105f091c78366c91b2d7 100644
+index ad0c8e43d27feb24e614fa15569edab625eff875..5d4bf7390a4b368e9ef8f39da2aa4ff60329c161 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2193,7 +2193,16 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0381-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/unapplied/server/0381-Don-t-fire-BlockFade-on-worldgen-threads.patch
index 5e8eee07ab..614f7cf313 100644
--- a/patches/server/0381-Don-t-fire-BlockFade-on-worldgen-threads.patch
+++ b/patches/unapplied/server/0381-Don-t-fire-BlockFade-on-worldgen-threads.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Don't fire BlockFade on worldgen threads
 Caused a deadlock
 
 diff --git a/src/main/java/net/minecraft/world/level/block/FireBlock.java b/src/main/java/net/minecraft/world/level/block/FireBlock.java
-index 945d8b0f58f6a5b2281f136d3afbba3b34e0e6b5..8c6edd032c927f7d1e04e944b4ce5598d71cdd81 100644
+index 9cda3353c033b3fb4e34a8a0e2cc4085fec9cdaa..893ff998afaa47500a03ae55ce45e9862ab1cc18 100644
 --- a/src/main/java/net/minecraft/world/level/block/FireBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/FireBlock.java
 @@ -101,6 +101,7 @@ public class FireBlock extends BaseFireBlock {
diff --git a/patches/server/0382-Add-phantom-creative-and-insomniac-controls.patch b/patches/unapplied/server/0382-Add-phantom-creative-and-insomniac-controls.patch
index ae5ef43e67..ae5ef43e67 100644
--- a/patches/server/0382-Add-phantom-creative-and-insomniac-controls.patch
+++ b/patches/unapplied/server/0382-Add-phantom-creative-and-insomniac-controls.patch
diff --git a/patches/server/0383-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/unapplied/server/0383-Fix-numerous-item-duplication-issues-and-teleport-is.patch
index a86be5da2e..a86be5da2e 100644
--- a/patches/server/0383-Fix-numerous-item-duplication-issues-and-teleport-is.patch
+++ b/patches/unapplied/server/0383-Fix-numerous-item-duplication-issues-and-teleport-is.patch
diff --git a/patches/server/0384-Villager-Restocks-API.patch b/patches/unapplied/server/0384-Villager-Restocks-API.patch
index b263d39f2a..75b7928672 100644
--- a/patches/server/0384-Villager-Restocks-API.patch
+++ b/patches/unapplied/server/0384-Villager-Restocks-API.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Villager Restocks API
 public net.minecraft.world.entity.npc.Villager numberOfRestocksToday
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
-index 6ee10f8a30041355a1fb0b805c7c61b7ac4ad5af..fb9f1fa2f66dbeb1ffea2679d6efe47ed616f0ab 100644
+index 3b765b9f3b449ef8ff9c82967e4e730a090d4e5d..423f6fcaf49252553d2285308633f13e2427b607 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
 @@ -87,6 +87,18 @@ public class CraftVillager extends CraftAbstractVillager implements Villager {
diff --git a/patches/server/0385-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/unapplied/server/0385-Validate-PickItem-Packet-and-kick-for-invalid.patch
index f018765ed2..f018765ed2 100644
--- a/patches/server/0385-Validate-PickItem-Packet-and-kick-for-invalid.patch
+++ b/patches/unapplied/server/0385-Validate-PickItem-Packet-and-kick-for-invalid.patch
diff --git a/patches/server/0386-Expose-game-version.patch b/patches/unapplied/server/0386-Expose-game-version.patch
index a8b54fe8da..1d273f3f91 100644
--- a/patches/server/0386-Expose-game-version.patch
+++ b/patches/unapplied/server/0386-Expose-game-version.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose game version
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f5357e9816fdd985f7ca9ad705e8c1f42626622f..914f4673a0add2b14bcba389eed799e599984616 100644
+index 83661761abdb31e62ea56af9d60fed393326be50..e7fbdccdd93bef036a7785acb19def334b039f0f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -586,6 +586,13 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0387-Optimize-Voxel-Shape-Merging.patch b/patches/unapplied/server/0387-Optimize-Voxel-Shape-Merging.patch
index 2c47963e34..2c47963e34 100644
--- a/patches/server/0387-Optimize-Voxel-Shape-Merging.patch
+++ b/patches/unapplied/server/0387-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/0388-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/unapplied/server/0388-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
index 5fd929f57b..a03ecf095c 100644
--- a/patches/server/0388-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
+++ b/patches/unapplied/server/0388-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
@@ -17,7 +17,7 @@ keeping long lived large direct buffers in cache.
 Set system properly at server startup if not set already to help protect from this.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 62aa0381b380ddd583d1ce2e24e04a9a607a89a7..9d7905b7f93d33700045c18b8ccecb7426cb30a7 100644
+index bec85212b48f8ae0c89aef01c3cd245ae0c282fc..334743a8c82bbcb2f09d0919fc9597750a25b8dd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -26,6 +26,7 @@ public class Main {
diff --git a/patches/server/0389-misc-debugging-dumps.patch b/patches/unapplied/server/0389-misc-debugging-dumps.patch
index e2ab0e9a06..764871463d 100644
--- a/patches/server/0389-misc-debugging-dumps.patch
+++ b/patches/unapplied/server/0389-misc-debugging-dumps.patch
@@ -74,7 +74,7 @@ index ed80d9551cd7cc1ec26a5d5fd7bc185b38fddd78..77e19f345bf68d12686a65e669cd597c
              this.connection.disconnect(ServerConfigurationPacketListenerImpl.DISCONNECT_REASON_INVALID_DATA);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 914f4673a0add2b14bcba389eed799e599984616..753dc48330acc93b8ddbd9ed8f5c9655c72ff311 100644
+index e7fbdccdd93bef036a7785acb19def334b039f0f..6ad11ded56422417f3407b043c42eb5d17557e60 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1010,6 +1010,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0390-Prevent-teleporting-dead-entities.patch b/patches/unapplied/server/0390-Prevent-teleporting-dead-entities.patch
index 6f9db4c9af..6f9db4c9af 100644
--- a/patches/server/0390-Prevent-teleporting-dead-entities.patch
+++ b/patches/unapplied/server/0390-Prevent-teleporting-dead-entities.patch
diff --git a/patches/server/0391-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/unapplied/server/0391-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
index b26702792f..b26702792f 100644
--- a/patches/server/0391-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
+++ b/patches/unapplied/server/0391-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
diff --git a/patches/server/0392-Implement-Mob-Goal-API.patch b/patches/unapplied/server/0392-Implement-Mob-Goal-API.patch
index f821c1b661..b7179a411c 100644
--- a/patches/server/0392-Implement-Mob-Goal-API.patch
+++ b/patches/unapplied/server/0392-Implement-Mob-Goal-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement Mob Goal API
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index dd300f1048b806c1292ac09dd232fd3eb24a7bf0..61d2f46ed71a8abff05e8295ac764b4af78095de 100644
+index dfd12484b424fffb529f408b6a9974c21598f9c2..08962fc6c7b66a79e7f6985c45ef593407594f96 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -45,6 +45,7 @@ dependencies {
@@ -792,7 +792,7 @@ index 4379b9948f1eecfe6fd7dea98e298ad5f761019a..3f081183521603824430709886a9cc31
          LOOK,
          JUMP,
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 753dc48330acc93b8ddbd9ed8f5c9655c72ff311..ac8ed31a991e20b7584e98a8923614f6ecb97d38 100644
+index 6ad11ded56422417f3407b043c42eb5d17557e60..03ff1e8faec27f042aa9b3b5f5bcbe1abbde2cbd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2845,5 +2845,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0393-Add-villager-reputation-API.patch b/patches/unapplied/server/0393-Add-villager-reputation-API.patch
index a0dafd0a25..95494c8d09 100644
--- a/patches/server/0393-Add-villager-reputation-API.patch
+++ b/patches/unapplied/server/0393-Add-villager-reputation-API.patch
@@ -57,7 +57,7 @@ index a28f359202e6502c6ea5e9c918ec0b3e9a3fca61..76dffb2705e5207db96895f82f1c7c56
  
      static record GossipEntry(UUID target, GossipType type, int value) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
-index fb9f1fa2f66dbeb1ffea2679d6efe47ed616f0ab..5e779b7f1ba40e418d24c9d37506420c83bfb3fe 100644
+index 423f6fcaf49252553d2285308633f13e2427b607..00fb708bce2c79817cd9fccadec72f07f0d26317 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
 @@ -18,6 +18,13 @@ import org.bukkit.entity.Villager;
diff --git a/patches/server/0394-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/unapplied/server/0394-Option-for-maximum-exp-value-when-merging-orbs.patch
index be87bfcc03..be87bfcc03 100644
--- a/patches/server/0394-Option-for-maximum-exp-value-when-merging-orbs.patch
+++ b/patches/unapplied/server/0394-Option-for-maximum-exp-value-when-merging-orbs.patch
diff --git a/patches/server/0395-ExperienceOrbMergeEvent.patch b/patches/unapplied/server/0395-ExperienceOrbMergeEvent.patch
index f0074453c8..f0074453c8 100644
--- a/patches/server/0395-ExperienceOrbMergeEvent.patch
+++ b/patches/unapplied/server/0395-ExperienceOrbMergeEvent.patch
diff --git a/patches/server/0396-Fix-PotionEffect-ignores-icon-flag.patch b/patches/unapplied/server/0396-Fix-PotionEffect-ignores-icon-flag.patch
index ef4b3fe685..6e7fe54526 100644
--- a/patches/server/0396-Fix-PotionEffect-ignores-icon-flag.patch
+++ b/patches/unapplied/server/0396-Fix-PotionEffect-ignores-icon-flag.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix PotionEffect ignores icon flag
 Co-authored-by: Tamion <[email protected]>
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 9ba85d099d0e6893dc3489ce0753119348e937b3..fd006bc0f14ebd3a2d5373611480a84a2d93bb0b 100644
+index 904f34f52659e864d148204cb0eebb9b381cc24a..38cad5b0d7e6018adda56b3292280738c46622e9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -443,7 +443,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0397-Optimize-brigadier-child-sorting-performance.patch b/patches/unapplied/server/0397-Optimize-brigadier-child-sorting-performance.patch
index 3651f34b15..3651f34b15 100644
--- a/patches/server/0397-Optimize-brigadier-child-sorting-performance.patch
+++ b/patches/unapplied/server/0397-Optimize-brigadier-child-sorting-performance.patch
diff --git a/patches/server/0398-Potential-bed-API.patch b/patches/unapplied/server/0398-Potential-bed-API.patch
index 4bd69d95b0..0840f1d26f 100644
--- a/patches/server/0398-Potential-bed-API.patch
+++ b/patches/unapplied/server/0398-Potential-bed-API.patch
@@ -8,7 +8,7 @@ Adds a new method to fetch the location of a player's bed without generating any
 getPotentialBedLocation - Gets the last known location of a player's bed. This does not preform any check if the bed is still valid and does not load any chunks.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 872adf91703baa24d67f417e7a45309f92984da9..80694a1d660a10909408c9b3169dda7847bf295e 100644
+index 6a9ab8bab7eb443f83e939bed17cb6fc9d1f3906..4ac714e39804fc8d269a717e8abf98f5814319e8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -12,6 +12,7 @@ import net.minecraft.nbt.CompoundTag;
diff --git a/patches/server/0399-Wait-for-Async-Tasks-during-shutdown.patch b/patches/unapplied/server/0399-Wait-for-Async-Tasks-during-shutdown.patch
index 65b6451503..d28439d3c2 100644
--- a/patches/server/0399-Wait-for-Async-Tasks-during-shutdown.patch
+++ b/patches/unapplied/server/0399-Wait-for-Async-Tasks-during-shutdown.patch
@@ -22,7 +22,7 @@ index fdaf757cbbc90841747989add56c13f252f645e5..6b7bacb0ea667c488b09da8c2a8a685d
          // CraftBukkit end
          this.getConnection().stop();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ac8ed31a991e20b7584e98a8923614f6ecb97d38..509927dc2a8d7f4968470130cde346d039aa50d4 100644
+index 03ff1e8faec27f042aa9b3b5f5bcbe1abbde2cbd..8d78720a613c089ad1bd2d78b83da8a42b76fc76 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1020,6 +1020,31 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0400-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/unapplied/server/0400-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
index d47ba47011..d47ba47011 100644
--- a/patches/server/0400-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
+++ b/patches/unapplied/server/0400-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/patches/server/0401-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/unapplied/server/0401-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index 7124d4bad5..52cbe3c654 100644
--- a/patches/server/0401-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/patches/unapplied/server/0401-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
@@ -34,7 +34,7 @@ index c0227cda09b9ca508c1de1fbe1e57afd743a9426..93529defa5d36bb9b4c69eedda9b7ac3
  
                      this.level.getProfiler().push("explosion_blocks");
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 52a44510d0499df56d2ebef0963fe8164eda7301..221a1e66814dda35feff9fa9ca0fe54feec335f9 100644
+index 046fa6e5b2013c0872176592dd8cc6681a9b308a..7825f6185a9a73dd395cdb6d86947d33d8512200 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -518,6 +518,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -73,7 +73,7 @@ index 7646b66bc5ba0288608de0d836c7307e02eebe67..36b196c8834c4eb873bfca0b12f1fc2b
      public co.aikar.timings.Timing getTiming() {
          if (timing == null) {
 diff --git a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
-index 6c90a37f8f98be975b9f961259aaadd03b091760..7248a8c51d0e285e2296826e48782f721265605b 100644
+index e4e4ad933db6484589dc2b51ef2f5a6745ffb891..6b0f70907236065bc2769541bf430ccc66df5081 100644
 --- a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
 @@ -199,6 +199,12 @@ public class PistonBaseBlock extends DirectionalBlock {
diff --git a/patches/server/0402-Ensure-safe-gateway-teleport.patch b/patches/unapplied/server/0402-Ensure-safe-gateway-teleport.patch
index 2782768b84..2782768b84 100644
--- a/patches/server/0402-Ensure-safe-gateway-teleport.patch
+++ b/patches/unapplied/server/0402-Ensure-safe-gateway-teleport.patch
diff --git a/patches/server/0403-Add-option-for-console-having-all-permissions.patch b/patches/unapplied/server/0403-Add-option-for-console-having-all-permissions.patch
index 8d4ac63012..ace91d22dd 100644
--- a/patches/server/0403-Add-option-for-console-having-all-permissions.patch
+++ b/patches/unapplied/server/0403-Add-option-for-console-having-all-permissions.patch
@@ -25,7 +25,7 @@ index 324e6d1a4fadd3e557e4ba05f04e6a5891cc54df..4e56018b64d11f76c8da43fd8f85c6de
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/CraftRemoteConsoleCommandSender.java b/src/main/java/org/bukkit/craftbukkit/command/CraftRemoteConsoleCommandSender.java
-index ad731c5f76f19394866a121c64d4169ea8fb8cd7..55413cc3da415326b280ddbc0b4f4b201a301d5b 100644
+index 5b7d230103f421fb939072e1526854f715430e51..b5e325a7b2d3f49299b35e233ed6539b5bfc3465 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/CraftRemoteConsoleCommandSender.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/CraftRemoteConsoleCommandSender.java
 @@ -55,4 +55,16 @@ public class CraftRemoteConsoleCommandSender extends ServerCommandSender impleme
diff --git a/patches/server/0404-Fix-villager-trading-demand-MC-163962.patch b/patches/unapplied/server/0404-Fix-villager-trading-demand-MC-163962.patch
index 79eb053dba..79eb053dba 100644
--- a/patches/server/0404-Fix-villager-trading-demand-MC-163962.patch
+++ b/patches/unapplied/server/0404-Fix-villager-trading-demand-MC-163962.patch
diff --git a/patches/server/0405-Maps-shouldn-t-load-chunks.patch b/patches/unapplied/server/0405-Maps-shouldn-t-load-chunks.patch
index 8fb69b3ba6..8fb69b3ba6 100644
--- a/patches/server/0405-Maps-shouldn-t-load-chunks.patch
+++ b/patches/unapplied/server/0405-Maps-shouldn-t-load-chunks.patch
diff --git a/patches/server/0406-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/unapplied/server/0406-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
index 7b6faee053..7b6faee053 100644
--- a/patches/server/0406-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
+++ b/patches/unapplied/server/0406-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/patches/server/0407-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/unapplied/server/0407-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
index 79528977b9..79528977b9 100644
--- a/patches/server/0407-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
+++ b/patches/unapplied/server/0407-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/patches/server/0408-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/unapplied/server/0408-Fix-piston-physics-inconsistency-MC-188840.patch
index 01fa3d45c0..0395c15e04 100644
--- a/patches/server/0408-Fix-piston-physics-inconsistency-MC-188840.patch
+++ b/patches/unapplied/server/0408-Fix-piston-physics-inconsistency-MC-188840.patch
@@ -32,7 +32,7 @@ This patch fixes https://bugs.mojang.com/browse/MC-188840
 This patch also fixes rail duping and carpet duping.
 
 diff --git a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
-index 7248a8c51d0e285e2296826e48782f721265605b..48ee146dea30f7d8c48c6bee7a1547ad2a69959d 100644
+index 6b0f70907236065bc2769541bf430ccc66df5081..929241e479a42011f073fb9d144739b6504132b1 100644
 --- a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
 @@ -413,14 +413,26 @@ public class PistonBaseBlock extends DirectionalBlock {
diff --git a/patches/server/0409-Fix-sand-duping.patch b/patches/unapplied/server/0409-Fix-sand-duping.patch
index b936304572..b1e0d61dc8 100644
--- a/patches/server/0409-Fix-sand-duping.patch
+++ b/patches/unapplied/server/0409-Fix-sand-duping.patch
@@ -7,7 +7,7 @@ If the falling block dies during teleportation (entity#move), then we need
 to detect that by placing a check after the move.
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-index b8c8b10656e4151c8c19b8cecc3bc7502dd57d3d..c64dcceabc41c11542b535d104b7f43172032842 100644
+index c431ba283c31cf9bb7bfdb05dc8c181c9e1e0eb3..5164c2bfb32275beff01b6e76dfbd9d031231bc6 100644
 --- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 @@ -131,6 +131,11 @@ public class FallingBlockEntity extends Entity {
diff --git a/patches/server/0410-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/unapplied/server/0410-Fix-missing-chunks-due-to-integer-overflow.patch
index 979e1e474e..979e1e474e 100644
--- a/patches/server/0410-Fix-missing-chunks-due-to-integer-overflow.patch
+++ b/patches/unapplied/server/0410-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/patches/server/0411-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/unapplied/server/0411-Prevent-position-desync-in-playerconnection-causing-.patch
index 543b03cce0..543b03cce0 100644
--- a/patches/server/0411-Prevent-position-desync-in-playerconnection-causing-.patch
+++ b/patches/unapplied/server/0411-Prevent-position-desync-in-playerconnection-causing-.patch
diff --git a/patches/server/0412-Inventory-getHolder-method-without-block-snapshot.patch b/patches/unapplied/server/0412-Inventory-getHolder-method-without-block-snapshot.patch
index f930fed575..83f965e80a 100644
--- a/patches/server/0412-Inventory-getHolder-method-without-block-snapshot.patch
+++ b/patches/unapplied/server/0412-Inventory-getHolder-method-without-block-snapshot.patch
@@ -23,7 +23,7 @@ index c064022d248ff3e0b52c0e815ab90527f9132fb7..3680f101036d98814fe47b707baeeb8e
      public int getMaxStackSize() {
          return this.inventory.getMaxStackSize();
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryDoubleChest.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryDoubleChest.java
-index d5defc82aec2279463e14029e213cfb8c3a40ce1..83712cc8da9751b6d4cc1f34a1cc0798bf848ae1 100644
+index c00c787a73b0796b645667427666b7ec4e333992..c3e2c9e2c3cbec2eda38096b6482bac1a0ea1dce 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryDoubleChest.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryDoubleChest.java
 @@ -63,6 +63,13 @@ public class CraftInventoryDoubleChest extends CraftInventory implements DoubleC
diff --git a/patches/server/0413-Improve-Arrow-API.patch b/patches/unapplied/server/0413-Improve-Arrow-API.patch
index a6dc061557..cbf5d4d815 100644
--- a/patches/server/0413-Improve-Arrow-API.patch
+++ b/patches/unapplied/server/0413-Improve-Arrow-API.patch
@@ -9,7 +9,7 @@ to set the arrow's "noclip" status
 Co-authored-by: Jake Potrebic <[email protected]>
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
-index e734cdb23f6289ac1cf3494f8efd2cae0562657e..5056ec1ad51be9209591d34d32d256c350feed63 100644
+index 35d8fbd9c5751568a1a3b8928017e23cd41bb163..762c395e45a681a11f3fe9d10e7f0ba310786e80 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
 @@ -99,6 +99,23 @@ public class CraftArrow extends AbstractProjectile implements AbstractArrow {
diff --git a/patches/server/0414-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/unapplied/server/0414-Add-and-implement-PlayerRecipeBookClickEvent.patch
index 455db3f928..455db3f928 100644
--- a/patches/server/0414-Add-and-implement-PlayerRecipeBookClickEvent.patch
+++ b/patches/unapplied/server/0414-Add-and-implement-PlayerRecipeBookClickEvent.patch
diff --git a/patches/server/0415-Use-distance-map-to-optimise-entity-tracker.patch b/patches/unapplied/server/0415-Use-distance-map-to-optimise-entity-tracker.patch
index 1b8cff12fd..f13e26a7c9 100644
--- a/patches/server/0415-Use-distance-map-to-optimise-entity-tracker.patch
+++ b/patches/unapplied/server/0415-Use-distance-map-to-optimise-entity-tracker.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Use distance map to optimise entity tracker
 Use the distance map to find candidate players for tracking.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index c10ef2e6af3e6c52eeb8c96cdbf5352d9dd25dd2..3e54982bc60f5368e3515cf337f23d6803f4c967 100644
+index 8d12a6da0f0679fd14c2a498f9645bd04b2d8ed7..290a231deb203eb46cb91eb23c28d8e9d49b0f34 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -147,6 +147,23 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -236,7 +236,7 @@ index c10ef2e6af3e6c52eeb8c96cdbf5352d9dd25dd2..3e54982bc60f5368e3515cf337f23d68
              return object instanceof ChunkMap.TrackedEntity ? ((ChunkMap.TrackedEntity) object).entity.getId() == this.entity.getId() : false;
          }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 1d2dd9b8ae43f22d875cb530130118df247b87dc..b80e8f05a8f99cc912904470c31092faad0717da 100644
+index 8ecb398ca26753e602c2862bf0c35b76f9a413c0..082509d2ab18380b37868decef3fdff6542bf764 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -56,6 +56,7 @@ import net.minecraft.network.syncher.EntityDataSerializers;
diff --git a/patches/server/0416-Hide-sync-chunk-writes-behind-flag.patch b/patches/unapplied/server/0416-Hide-sync-chunk-writes-behind-flag.patch
index 070cae85dd..070cae85dd 100644
--- a/patches/server/0416-Hide-sync-chunk-writes-behind-flag.patch
+++ b/patches/unapplied/server/0416-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/0417-Add-permission-for-command-blocks.patch b/patches/unapplied/server/0417-Add-permission-for-command-blocks.patch
index 1977dfdd5c..526bf7a6a8 100644
--- a/patches/server/0417-Add-permission-for-command-blocks.patch
+++ b/patches/unapplied/server/0417-Add-permission-for-command-blocks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add permission for command blocks
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index f47fcae72d48cd410a4ac3e0a4bd21f42fae7eec..345bae8d145abd8357f4b71f4977e5850b980ff4 100644
+index 0ff4372afa4b159acc59e3dbd2e9efbd7b7ab6a2..1685dd08ef6331e133d752cd9ce3874c9eda5a05 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -399,7 +399,7 @@ public class ServerPlayerGameMode {
diff --git a/patches/server/0418-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/unapplied/server/0418-Ensure-Entity-AABB-s-are-never-invalid.patch
index d6a09ee820..51fac29bda 100644
--- a/patches/server/0418-Ensure-Entity-AABB-s-are-never-invalid.patch
+++ b/patches/unapplied/server/0418-Ensure-Entity-AABB-s-are-never-invalid.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ensure Entity AABB's are never invalid
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 9c021bc57a3c4002b2f8f6e4d53f996eaf729c73..eedb6db6a5e4879847ea593975d6f6f1de954642 100644
+index 082509d2ab18380b37868decef3fdff6542bf764..78af47c54f8dd3b1b4f81b740bcd438132c27947 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -721,8 +721,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0419-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/unapplied/server/0419-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index 5f1ce2b82c..5f1ce2b82c 100644
--- a/patches/server/0419-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/patches/unapplied/server/0419-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
diff --git a/patches/server/0420-Paper-dumpitem-command.patch b/patches/unapplied/server/0420-Paper-dumpitem-command.patch
index 5722936af7..5722936af7 100644
--- a/patches/server/0420-Paper-dumpitem-command.patch
+++ b/patches/unapplied/server/0420-Paper-dumpitem-command.patch
diff --git a/patches/server/0421-Improve-Legacy-Component-serialization-size.patch b/patches/unapplied/server/0421-Improve-Legacy-Component-serialization-size.patch
index 866302739f..1554905af7 100644
--- a/patches/server/0421-Improve-Legacy-Component-serialization-size.patch
+++ b/patches/unapplied/server/0421-Improve-Legacy-Component-serialization-size.patch
@@ -7,7 +7,7 @@ Don't constantly send format: false for all formatting options when parent alrea
 has it false
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
-index 4fede2161792ba3e7cdf0cc5a1f533188becc6f7..0f70be614f8f5350ad558d0ae645cdf0027e1e76 100644
+index 19a102792fab30f8f6a7364d0a9b4063d76f1489..7c36d2bd36926c0ae5a0db6a97bd47a85566cf26 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
 @@ -47,6 +47,7 @@ public final class CraftChatMessage {
diff --git a/patches/server/0422-Optimize-Bit-Operations-by-inlining.patch b/patches/unapplied/server/0422-Optimize-Bit-Operations-by-inlining.patch
index 468568d8aa..468568d8aa 100644
--- a/patches/server/0422-Optimize-Bit-Operations-by-inlining.patch
+++ b/patches/unapplied/server/0422-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/0423-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/unapplied/server/0423-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
index 2d30e2b221..2d30e2b221 100644
--- a/patches/server/0423-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
+++ b/patches/unapplied/server/0423-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
diff --git a/patches/server/0424-incremental-chunk-and-player-saving.patch b/patches/unapplied/server/0424-incremental-chunk-and-player-saving.patch
index 80ee782cde..5b5117df17 100644
--- a/patches/server/0424-incremental-chunk-and-player-saving.patch
+++ b/patches/unapplied/server/0424-incremental-chunk-and-player-saving.patch
@@ -73,7 +73,7 @@ index e27067e72a49e127aa4abb17f5ed1df09f943f3c..4e58f31e4852a0811f85596653f6db63
      public void close() throws IOException {
          // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 754e8de31e27264deebc94b1d3a9a51b5ca7e965..0ff614ea19ff5420c506fe402caf230b1e0a3a36 100644
+index 58a44898144af605e6e7d9253d99149ddc12bcbd..c1214a8f53428c19ca1fc72942f5040066f45b12 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1283,6 +1283,37 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0425-Support-old-UUID-format-for-NBT.patch b/patches/unapplied/server/0425-Support-old-UUID-format-for-NBT.patch
index fe9c23b739..fe9c23b739 100644
--- a/patches/server/0425-Support-old-UUID-format-for-NBT.patch
+++ b/patches/unapplied/server/0425-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0426-Convert-legacy-attributes-in-Item-Meta.patch b/patches/unapplied/server/0426-Convert-legacy-attributes-in-Item-Meta.patch
index 84a140d2ee..84a140d2ee 100644
--- a/patches/server/0426-Convert-legacy-attributes-in-Item-Meta.patch
+++ b/patches/unapplied/server/0426-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/patches/server/0427-Remove-some-streams-from-structures.patch b/patches/unapplied/server/0427-Remove-some-streams-from-structures.patch
index 136b102df3..136b102df3 100644
--- a/patches/server/0427-Remove-some-streams-from-structures.patch
+++ b/patches/unapplied/server/0427-Remove-some-streams-from-structures.patch
diff --git a/patches/server/0428-Remove-streams-from-classes-related-villager-gossip.patch b/patches/unapplied/server/0428-Remove-streams-from-classes-related-villager-gossip.patch
index b9c37f3a08..b9c37f3a08 100644
--- a/patches/server/0428-Remove-streams-from-classes-related-villager-gossip.patch
+++ b/patches/unapplied/server/0428-Remove-streams-from-classes-related-villager-gossip.patch
diff --git a/patches/server/0429-Support-components-in-ItemMeta.patch b/patches/unapplied/server/0429-Support-components-in-ItemMeta.patch
index b2eb6e8d9c..b2eb6e8d9c 100644
--- a/patches/server/0429-Support-components-in-ItemMeta.patch
+++ b/patches/unapplied/server/0429-Support-components-in-ItemMeta.patch
diff --git a/patches/server/0430-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/unapplied/server/0430-Improve-fix-EntityTargetLivingEntityEvent.patch
index 513faeb27d..513faeb27d 100644
--- a/patches/server/0430-Improve-fix-EntityTargetLivingEntityEvent.patch
+++ b/patches/unapplied/server/0430-Improve-fix-EntityTargetLivingEntityEvent.patch
diff --git a/patches/server/0431-Add-entity-liquid-API.patch b/patches/unapplied/server/0431-Add-entity-liquid-API.patch
index 4cfcf96366..bebefdb57e 100644
--- a/patches/server/0431-Add-entity-liquid-API.patch
+++ b/patches/unapplied/server/0431-Add-entity-liquid-API.patch
@@ -8,7 +8,7 @@ public net.minecraft.world.entity.Entity isInRain()Z
 public net.minecraft.world.entity.Entity isInBubbleColumn()Z
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 96f78f74433b4b54cf4ebec624649eca4f157602..eaa59959f4804d38ae486028c854ed63207fd3b9 100644
+index e1f75dfcb22918d953d35d345280c61301688ac7..0498a83ceb4c009b76086dc44f80395efaab797e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1328,5 +1328,40 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0432-Update-itemstack-legacy-name-and-lore.patch b/patches/unapplied/server/0432-Update-itemstack-legacy-name-and-lore.patch
index 2c58b8b314..2c58b8b314 100644
--- a/patches/server/0432-Update-itemstack-legacy-name-and-lore.patch
+++ b/patches/unapplied/server/0432-Update-itemstack-legacy-name-and-lore.patch
diff --git a/patches/server/0433-Add-PrepareResultEvent.patch b/patches/unapplied/server/0433-Add-PrepareResultEvent.patch
index 911e4ae943..911e4ae943 100644
--- a/patches/server/0433-Add-PrepareResultEvent.patch
+++ b/patches/unapplied/server/0433-Add-PrepareResultEvent.patch
diff --git a/patches/server/0434-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/unapplied/server/0434-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
index e9ae4d3181..e9ae4d3181 100644
--- a/patches/server/0434-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
+++ b/patches/unapplied/server/0434-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
diff --git a/patches/server/0435-Fix-arrows-never-despawning-MC-125757.patch b/patches/unapplied/server/0435-Fix-arrows-never-despawning-MC-125757.patch
index 7ac2958bcd..7ac2958bcd 100644
--- a/patches/server/0435-Fix-arrows-never-despawning-MC-125757.patch
+++ b/patches/unapplied/server/0435-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0436-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/unapplied/server/0436-Thread-Safe-Vanilla-Command-permission-checking.patch
index b99c971369..b99c971369 100644
--- a/patches/server/0436-Thread-Safe-Vanilla-Command-permission-checking.patch
+++ b/patches/unapplied/server/0436-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0437-Fix-SPIGOT-5989.patch b/patches/unapplied/server/0437-Fix-SPIGOT-5989.patch
index a2f9e1a3c2..a2f9e1a3c2 100644
--- a/patches/server/0437-Fix-SPIGOT-5989.patch
+++ b/patches/unapplied/server/0437-Fix-SPIGOT-5989.patch
diff --git a/patches/server/0438-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/unapplied/server/0438-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
index f92eb1a39d..f92eb1a39d 100644
--- a/patches/server/0438-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
+++ b/patches/unapplied/server/0438-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0439-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/unapplied/server/0439-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
index f5cba763c4..f5cba763c4 100644
--- a/patches/server/0439-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
+++ b/patches/unapplied/server/0439-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0440-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/unapplied/server/0440-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
index 5c1357ca7c..5c1357ca7c 100644
--- a/patches/server/0440-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
+++ b/patches/unapplied/server/0440-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0441-Optimize-NetworkManager-Exception-Handling.patch b/patches/unapplied/server/0441-Optimize-NetworkManager-Exception-Handling.patch
index ff42b6bac8..ff42b6bac8 100644
--- a/patches/server/0441-Optimize-NetworkManager-Exception-Handling.patch
+++ b/patches/unapplied/server/0441-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0442-Fix-some-rails-connecting-improperly.patch b/patches/unapplied/server/0442-Fix-some-rails-connecting-improperly.patch
index 1db425010e..1db425010e 100644
--- a/patches/server/0442-Fix-some-rails-connecting-improperly.patch
+++ b/patches/unapplied/server/0442-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0443-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/unapplied/server/0443-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
index 68d17065ec..68d17065ec 100644
--- a/patches/server/0443-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
+++ b/patches/unapplied/server/0443-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0444-Brand-support.patch b/patches/unapplied/server/0444-Brand-support.patch
index f05ccbba27..f05ccbba27 100644
--- a/patches/server/0444-Brand-support.patch
+++ b/patches/unapplied/server/0444-Brand-support.patch
diff --git a/patches/server/0445-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/unapplied/server/0445-Add-playPickupItemAnimation-to-LivingEntity.patch
index 5e9439a17f..5e9439a17f 100644
--- a/patches/server/0445-Add-playPickupItemAnimation-to-LivingEntity.patch
+++ b/patches/unapplied/server/0445-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0446-Don-t-require-FACING-data.patch b/patches/unapplied/server/0446-Don-t-require-FACING-data.patch
index bc170b7402..bc170b7402 100644
--- a/patches/server/0446-Don-t-require-FACING-data.patch
+++ b/patches/unapplied/server/0446-Don-t-require-FACING-data.patch
diff --git a/patches/server/0447-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/unapplied/server/0447-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index a61469e2b4..a61469e2b4 100644
--- a/patches/server/0447-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/unapplied/server/0447-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
diff --git a/patches/server/0448-Add-moon-phase-API.patch b/patches/unapplied/server/0448-Add-moon-phase-API.patch
index df66928ff7..594d395ebb 100644
--- a/patches/server/0448-Add-moon-phase-API.patch
+++ b/patches/unapplied/server/0448-Add-moon-phase-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add moon phase API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 75d4c33768a8ab15a94bcb71b2aa724cad1ce0aa..93f44ca0c8388935baaa41f9b0ebb6de2f6906bb 100644
+index f92f726d2ab63694bad0d6eb0ee718ae6194144f..f0360d00918d115008775c41fb586d553c1e2b41 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -981,4 +981,11 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
diff --git a/patches/server/0449-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/unapplied/server/0449-Do-not-let-the-server-load-chunks-from-newer-version.patch
index 977fecbd78..977fecbd78 100644
--- a/patches/server/0449-Do-not-let-the-server-load-chunks-from-newer-version.patch
+++ b/patches/unapplied/server/0449-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0450-Prevent-headless-pistons-from-being-created.patch b/patches/unapplied/server/0450-Prevent-headless-pistons-from-being-created.patch
index a044172f14..a044172f14 100644
--- a/patches/server/0450-Prevent-headless-pistons-from-being-created.patch
+++ b/patches/unapplied/server/0450-Prevent-headless-pistons-from-being-created.patch
diff --git a/patches/server/0451-Add-BellRingEvent.patch b/patches/unapplied/server/0451-Add-BellRingEvent.patch
index 539214613a..539214613a 100644
--- a/patches/server/0451-Add-BellRingEvent.patch
+++ b/patches/unapplied/server/0451-Add-BellRingEvent.patch
diff --git a/patches/server/0452-Add-zombie-targets-turtle-egg-config.patch b/patches/unapplied/server/0452-Add-zombie-targets-turtle-egg-config.patch
index 157c5ec344..157c5ec344 100644
--- a/patches/server/0452-Add-zombie-targets-turtle-egg-config.patch
+++ b/patches/unapplied/server/0452-Add-zombie-targets-turtle-egg-config.patch
diff --git a/patches/server/0453-Buffer-joins-to-world.patch b/patches/unapplied/server/0453-Buffer-joins-to-world.patch
index a0a51f955d..a0a51f955d 100644
--- a/patches/server/0453-Buffer-joins-to-world.patch
+++ b/patches/unapplied/server/0453-Buffer-joins-to-world.patch
diff --git a/patches/server/0454-Eigencraft-redstone-implementation.patch b/patches/unapplied/server/0454-Eigencraft-redstone-implementation.patch
index 5991ef0146..5991ef0146 100644
--- a/patches/server/0454-Eigencraft-redstone-implementation.patch
+++ b/patches/unapplied/server/0454-Eigencraft-redstone-implementation.patch
diff --git a/patches/server/0455-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/unapplied/server/0455-Fix-hex-colors-not-working-in-some-kick-messages.patch
index 17c5c43c44..17c5c43c44 100644
--- a/patches/server/0455-Fix-hex-colors-not-working-in-some-kick-messages.patch
+++ b/patches/unapplied/server/0455-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/patches/server/0456-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/unapplied/server/0456-PortalCreateEvent-needs-to-know-its-entity.patch
index a8f5144e8d..a8f5144e8d 100644
--- a/patches/server/0456-PortalCreateEvent-needs-to-know-its-entity.patch
+++ b/patches/unapplied/server/0456-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/patches/server/0457-Add-more-Evoker-API.patch b/patches/unapplied/server/0457-Add-more-Evoker-API.patch
index 742d85985e..742d85985e 100644
--- a/patches/server/0457-Add-more-Evoker-API.patch
+++ b/patches/unapplied/server/0457-Add-more-Evoker-API.patch
diff --git a/patches/server/0458-Add-methods-to-get-translation-keys.patch b/patches/unapplied/server/0458-Add-methods-to-get-translation-keys.patch
index 5f785eb079..5f785eb079 100644
--- a/patches/server/0458-Add-methods-to-get-translation-keys.patch
+++ b/patches/unapplied/server/0458-Add-methods-to-get-translation-keys.patch
diff --git a/patches/server/0459-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/unapplied/server/0459-Create-HoverEvent-from-ItemStack-Entity.patch
index 9abcb54dc7..9abcb54dc7 100644
--- a/patches/server/0459-Create-HoverEvent-from-ItemStack-Entity.patch
+++ b/patches/unapplied/server/0459-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0460-Cache-block-data-strings.patch b/patches/unapplied/server/0460-Cache-block-data-strings.patch
index bec929642c..bec929642c 100644
--- a/patches/server/0460-Cache-block-data-strings.patch
+++ b/patches/unapplied/server/0460-Cache-block-data-strings.patch
diff --git a/patches/server/0461-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/unapplied/server/0461-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index e3fb5a8319..e3fb5a8319 100644
--- a/patches/server/0461-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/patches/unapplied/server/0461-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
diff --git a/patches/server/0462-Add-additional-open-container-api-to-HumanEntity.patch b/patches/unapplied/server/0462-Add-additional-open-container-api-to-HumanEntity.patch
index 63c8f421ec..63c8f421ec 100644
--- a/patches/server/0462-Add-additional-open-container-api-to-HumanEntity.patch
+++ b/patches/unapplied/server/0462-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0463-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/unapplied/server/0463-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
index b5d192ac20..b5d192ac20 100644
--- a/patches/server/0463-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
+++ b/patches/unapplied/server/0463-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0464-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/unapplied/server/0464-Extend-block-drop-capture-to-capture-all-items-added.patch
index 6f8ab40d5b..f647fd0ee3 100644
--- a/patches/server/0464-Extend-block-drop-capture-to-capture-all-items-added.patch
+++ b/patches/unapplied/server/0464-Extend-block-drop-capture-to-capture-all-items-added.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Extend block drop capture to capture all items added to the
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index e6694cb87031cb273ba53ac991d4c79b1f5c1ced..fe376f3224ed4083d0bfc20911fc059d7b32e2c9 100644
+index d3f0cb141ce0942e55e395bfd2e7c3e2c2e48952..dd5ac4b4c30afab7b376947548722050fb3af106 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1509,6 +1509,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -23,7 +23,7 @@ index e6694cb87031cb273ba53ac991d4c79b1f5c1ced..fe376f3224ed4083d0bfc20911fc059d
              if (spawnReason != null && !CraftEventFactory.doEntityAddEventCalling(this, entity, spawnReason)) {
                  return false;
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 345bae8d145abd8357f4b71f4977e5850b980ff4..40ac674da09a5d28c3b691d8979b228b9c6a8a84 100644
+index 1685dd08ef6331e133d752cd9ce3874c9eda5a05..49828aa38e06d7a2f0c7c5b7c4be374996ef4524 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -431,10 +431,12 @@ public class ServerPlayerGameMode {
diff --git a/patches/server/0465-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/unapplied/server/0465-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index 40b2934456..00859614c6 100644
--- a/patches/server/0465-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/unapplied/server/0465-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose the Entity Counter to allow plugins to use valid and
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 1035faf0a7af0cae34065c93da23736bcfe2f0ef..1a092af20c9dd18ddcf770bcc3cb3bead1a609a8 100644
+index d751bae633161abf9aa63197239e519c00676edf..14a3163e0e82eed9bf91b5c703774547f125c3c5 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4451,4 +4451,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0466-Lazily-track-plugin-scoreboards-by-default.patch b/patches/unapplied/server/0466-Lazily-track-plugin-scoreboards-by-default.patch
index 88b6225968..88b6225968 100644
--- a/patches/server/0466-Lazily-track-plugin-scoreboards-by-default.patch
+++ b/patches/unapplied/server/0466-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0467-Entity-isTicking.patch b/patches/unapplied/server/0467-Entity-isTicking.patch
index 705acc6135..dbb82c6624 100644
--- a/patches/server/0467-Entity-isTicking.patch
+++ b/patches/unapplied/server/0467-Entity-isTicking.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity#isTicking
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 1a092af20c9dd18ddcf770bcc3cb3bead1a609a8..121139196c82eb87be771d93f0ca52b951c7eb52 100644
+index 14a3163e0e82eed9bf91b5c703774547f125c3c5..79ce14647009a667ee64dc5ed8a9c1c8dabe2a6d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4456,5 +4456,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -19,7 +19,7 @@ index 1a092af20c9dd18ddcf770bcc3cb3bead1a609a8..121139196c82eb87be771d93f0ca52b9
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index a5751fa22a6638abae155de483a769f12b125650..505ab2218c87961fd8c616a130de5b5e2e597eb4 100644
+index 747445306a19db2b89fa7cdfc5dcd7f361a69f54..fb0cde02f2fc143d69f926131b2fb3dc69bfdea3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1363,5 +1363,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0468-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/unapplied/server/0468-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
index 3f7af9b6a5..3f7af9b6a5 100644
--- a/patches/server/0468-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
+++ b/patches/unapplied/server/0468-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/patches/server/0469-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/unapplied/server/0469-Fix-Concurrency-issue-in-ShufflingList.patch
index 07c57efa62..07c57efa62 100644
--- a/patches/server/0469-Fix-Concurrency-issue-in-ShufflingList.patch
+++ b/patches/unapplied/server/0469-Fix-Concurrency-issue-in-ShufflingList.patch
diff --git a/patches/server/0470-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/unapplied/server/0470-Reset-Ender-Crystals-on-Dragon-Spawn.patch
index fd459bdab5..fd459bdab5 100644
--- a/patches/server/0470-Reset-Ender-Crystals-on-Dragon-Spawn.patch
+++ b/patches/unapplied/server/0470-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0471-Fix-for-large-move-vectors-crashing-server.patch b/patches/unapplied/server/0471-Fix-for-large-move-vectors-crashing-server.patch
index 6d40d79362..6d40d79362 100644
--- a/patches/server/0471-Fix-for-large-move-vectors-crashing-server.patch
+++ b/patches/unapplied/server/0471-Fix-for-large-move-vectors-crashing-server.patch
diff --git a/patches/server/0472-Optimise-getType-calls.patch b/patches/unapplied/server/0472-Optimise-getType-calls.patch
index 3ac5b9ed7e..3ac5b9ed7e 100644
--- a/patches/server/0472-Optimise-getType-calls.patch
+++ b/patches/unapplied/server/0472-Optimise-getType-calls.patch
diff --git a/patches/server/0473-Villager-resetOffers.patch b/patches/unapplied/server/0473-Villager-resetOffers.patch
index f094a1397c..f094a1397c 100644
--- a/patches/server/0473-Villager-resetOffers.patch
+++ b/patches/unapplied/server/0473-Villager-resetOffers.patch
diff --git a/patches/server/0474-Retain-block-place-order-when-capturing-blockstates.patch b/patches/unapplied/server/0474-Retain-block-place-order-when-capturing-blockstates.patch
index beeaff12c5..beeaff12c5 100644
--- a/patches/server/0474-Retain-block-place-order-when-capturing-blockstates.patch
+++ b/patches/unapplied/server/0474-Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/patches/server/0475-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/unapplied/server/0475-Reduce-blockpos-allocation-from-pathfinding.patch
index e1ea18140b..e1ea18140b 100644
--- a/patches/server/0475-Reduce-blockpos-allocation-from-pathfinding.patch
+++ b/patches/unapplied/server/0475-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/patches/server/0476-Fix-item-locations-dropped-from-campfires.patch b/patches/unapplied/server/0476-Fix-item-locations-dropped-from-campfires.patch
index d8e81d50ef..d8e81d50ef 100644
--- a/patches/server/0476-Fix-item-locations-dropped-from-campfires.patch
+++ b/patches/unapplied/server/0476-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0477-Fixed-TileEntityBell-memory-leak.patch b/patches/unapplied/server/0477-Fixed-TileEntityBell-memory-leak.patch
index 0cd7feb8d4..0cd7feb8d4 100644
--- a/patches/server/0477-Fixed-TileEntityBell-memory-leak.patch
+++ b/patches/unapplied/server/0477-Fixed-TileEntityBell-memory-leak.patch
diff --git a/patches/server/0478-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/unapplied/server/0478-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
index 27b0ff407c..27b0ff407c 100644
--- a/patches/server/0478-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
+++ b/patches/unapplied/server/0478-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0479-Add-getOfflinePlayerIfCached-String.patch b/patches/unapplied/server/0479-Add-getOfflinePlayerIfCached-String.patch
index 387c4872e4..bb87f2c5ac 100644
--- a/patches/server/0479-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/unapplied/server/0479-Add-getOfflinePlayerIfCached-String.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add getOfflinePlayerIfCached(String)
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a0e67773f4af7e35edad2535f95426308868c69b..99942a9292056998026ef7e2293e882d9b61dfd1 100644
+index c71a409a457deea6817b863ddbb8bcbf64206544..475e623d2d42f372b12cf50c2b26b4d2dc203072 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1877,6 +1877,28 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0480-Add-ignore-discounts-API.patch b/patches/unapplied/server/0480-Add-ignore-discounts-API.patch
index 94293b80ce..94293b80ce 100644
--- a/patches/server/0480-Add-ignore-discounts-API.patch
+++ b/patches/unapplied/server/0480-Add-ignore-discounts-API.patch
diff --git a/patches/server/0481-Toggle-for-removing-existing-dragon.patch b/patches/unapplied/server/0481-Toggle-for-removing-existing-dragon.patch
index 0ec8e9d4ef..0ec8e9d4ef 100644
--- a/patches/server/0481-Toggle-for-removing-existing-dragon.patch
+++ b/patches/unapplied/server/0481-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/0482-Fix-client-lag-on-advancement-loading.patch b/patches/unapplied/server/0482-Fix-client-lag-on-advancement-loading.patch
index 9d922ffc2f..9d922ffc2f 100644
--- a/patches/server/0482-Fix-client-lag-on-advancement-loading.patch
+++ b/patches/unapplied/server/0482-Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/server/0483-Item-no-age-no-player-pickup.patch b/patches/unapplied/server/0483-Item-no-age-no-player-pickup.patch
index 8ab619bbbd..8ab619bbbd 100644
--- a/patches/server/0483-Item-no-age-no-player-pickup.patch
+++ b/patches/unapplied/server/0483-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0484-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/unapplied/server/0484-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
index 9a80ce81b8..9a80ce81b8 100644
--- a/patches/server/0484-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
+++ b/patches/unapplied/server/0484-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/0485-Beacon-API-custom-effect-ranges.patch b/patches/unapplied/server/0485-Beacon-API-custom-effect-ranges.patch
index f3b72c6e9c..f3b72c6e9c 100644
--- a/patches/server/0485-Beacon-API-custom-effect-ranges.patch
+++ b/patches/unapplied/server/0485-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0486-Add-API-for-quit-reason.patch b/patches/unapplied/server/0486-Add-API-for-quit-reason.patch
index fb77faf050..fb77faf050 100644
--- a/patches/server/0486-Add-API-for-quit-reason.patch
+++ b/patches/unapplied/server/0486-Add-API-for-quit-reason.patch
diff --git a/patches/server/0487-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/unapplied/server/0487-Add-Wandering-Trader-spawn-rate-config-options.patch
index 09e0c87600..09e0c87600 100644
--- a/patches/server/0487-Add-Wandering-Trader-spawn-rate-config-options.patch
+++ b/patches/unapplied/server/0487-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0488-Expose-world-spawn-angle.patch b/patches/unapplied/server/0488-Expose-world-spawn-angle.patch
index c2242a53f8..c2242a53f8 100644
--- a/patches/server/0488-Expose-world-spawn-angle.patch
+++ b/patches/unapplied/server/0488-Expose-world-spawn-angle.patch
diff --git a/patches/server/0489-Add-Destroy-Speed-API.patch b/patches/unapplied/server/0489-Add-Destroy-Speed-API.patch
index eda1608ac3..eda1608ac3 100644
--- a/patches/server/0489-Add-Destroy-Speed-API.patch
+++ b/patches/unapplied/server/0489-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0490-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/unapplied/server/0490-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
index 4c5c5e4400..4c5c5e4400 100644
--- a/patches/server/0490-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
+++ b/patches/unapplied/server/0490-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
diff --git a/patches/server/0491-Add-LivingEntity-clearActiveItem.patch b/patches/unapplied/server/0491-Add-LivingEntity-clearActiveItem.patch
index ee851be253..ee851be253 100644
--- a/patches/server/0491-Add-LivingEntity-clearActiveItem.patch
+++ b/patches/unapplied/server/0491-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0492-Add-PlayerItemCooldownEvent.patch b/patches/unapplied/server/0492-Add-PlayerItemCooldownEvent.patch
index 751841d117..751841d117 100644
--- a/patches/server/0492-Add-PlayerItemCooldownEvent.patch
+++ b/patches/unapplied/server/0492-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0493-Significantly-improve-performance-of-the-end-generat.patch b/patches/unapplied/server/0493-Significantly-improve-performance-of-the-end-generat.patch
index 95f0914262..95f0914262 100644
--- a/patches/server/0493-Significantly-improve-performance-of-the-end-generat.patch
+++ b/patches/unapplied/server/0493-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0494-More-lightning-API.patch b/patches/unapplied/server/0494-More-lightning-API.patch
index bda291858a..bda291858a 100644
--- a/patches/server/0494-More-lightning-API.patch
+++ b/patches/unapplied/server/0494-More-lightning-API.patch
diff --git a/patches/server/0495-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/unapplied/server/0495-Climbing-should-not-bypass-cramming-gamerule.patch
index 4bfcf1a94b..a9899d4d3d 100644
--- a/patches/server/0495-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/unapplied/server/0495-Climbing-should-not-bypass-cramming-gamerule.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Climbing should not bypass cramming gamerule
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index d4f89c87b989be9cfb4bd991bc69b85760df4bb2..9068a9646a7e436a5a0d9ea9deb52b78a316ba4a 100644
+index 79ce14647009a667ee64dc5ed8a9c1c8dabe2a6d..4841e57256092b5c8b71fa1dc56b61f790837cdd 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2057,6 +2057,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0496-Added-missing-default-perms-for-commands.patch b/patches/unapplied/server/0496-Added-missing-default-perms-for-commands.patch
index 9a4184db30..9a4184db30 100644
--- a/patches/server/0496-Added-missing-default-perms-for-commands.patch
+++ b/patches/unapplied/server/0496-Added-missing-default-perms-for-commands.patch
diff --git a/patches/server/0497-Add-PlayerShearBlockEvent.patch b/patches/unapplied/server/0497-Add-PlayerShearBlockEvent.patch
index 56a84bee18..56a84bee18 100644
--- a/patches/server/0497-Add-PlayerShearBlockEvent.patch
+++ b/patches/unapplied/server/0497-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0498-Limit-recipe-packets.patch b/patches/unapplied/server/0498-Limit-recipe-packets.patch
index fe3937e4ca..fe3937e4ca 100644
--- a/patches/server/0498-Limit-recipe-packets.patch
+++ b/patches/unapplied/server/0498-Limit-recipe-packets.patch
diff --git a/patches/server/0499-Fix-CraftSound-backwards-compatibility.patch b/patches/unapplied/server/0499-Fix-CraftSound-backwards-compatibility.patch
index 9ca7f86992..9ca7f86992 100644
--- a/patches/server/0499-Fix-CraftSound-backwards-compatibility.patch
+++ b/patches/unapplied/server/0499-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0500-Player-Chunk-Load-Unload-Events.patch b/patches/unapplied/server/0500-Player-Chunk-Load-Unload-Events.patch
index 504b607773..504b607773 100644
--- a/patches/server/0500-Player-Chunk-Load-Unload-Events.patch
+++ b/patches/unapplied/server/0500-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0501-Optimize-Dynamic-get-Missing-Keys.patch b/patches/unapplied/server/0501-Optimize-Dynamic-get-Missing-Keys.patch
index d664f7ff69..d664f7ff69 100644
--- a/patches/server/0501-Optimize-Dynamic-get-Missing-Keys.patch
+++ b/patches/unapplied/server/0501-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0502-Expose-LivingEntity-hurt-direction.patch b/patches/unapplied/server/0502-Expose-LivingEntity-hurt-direction.patch
index 4ff58cbd93..4ff58cbd93 100644
--- a/patches/server/0502-Expose-LivingEntity-hurt-direction.patch
+++ b/patches/unapplied/server/0502-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0503-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/unapplied/server/0503-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
index f6295463bd..f6295463bd 100644
--- a/patches/server/0503-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
+++ b/patches/unapplied/server/0503-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/server/0504-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/unapplied/server/0504-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
index 429087e774..429087e774 100644
--- a/patches/server/0504-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
+++ b/patches/unapplied/server/0504-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/patches/server/0505-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/unapplied/server/0505-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
index d4c042a0ed..d4c042a0ed 100644
--- a/patches/server/0505-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
+++ b/patches/unapplied/server/0505-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0506-Implement-TargetHitEvent.patch b/patches/unapplied/server/0506-Implement-TargetHitEvent.patch
index 78722933d9..78722933d9 100644
--- a/patches/server/0506-Implement-TargetHitEvent.patch
+++ b/patches/unapplied/server/0506-Implement-TargetHitEvent.patch
diff --git a/patches/server/0507-MC-4-Fix-item-position-desync.patch b/patches/unapplied/server/0507-MC-4-Fix-item-position-desync.patch
index 9976e41aba..cd869dfa25 100644
--- a/patches/server/0507-MC-4-Fix-item-position-desync.patch
+++ b/patches/unapplied/server/0507-MC-4-Fix-item-position-desync.patch
@@ -28,7 +28,7 @@ index 05ac41e136da43284fb24a6b698ebd36318278fb..33d9131e9c75ef23cd637f5d6c39a270
  
      public Vec3 decode(long x, long y, long z) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 9257855651f7605935ecab121e239bef7218e53c..e8604fa9ef819db8a5f5fabc99022095bce7b00d 100644
+index 4841e57256092b5c8b71fa1dc56b61f790837cdd..8ba9dc9c1fe2c2589178ec54b5ff2d19a7a8c633 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4227,6 +4227,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0508-Additional-Block-Material-API-s.patch b/patches/unapplied/server/0508-Additional-Block-Material-API-s.patch
index 051b8a644d..051b8a644d 100644
--- a/patches/server/0508-Additional-Block-Material-API-s.patch
+++ b/patches/unapplied/server/0508-Additional-Block-Material-API-s.patch
diff --git a/patches/server/0509-Fix-harming-potion-dupe.patch b/patches/unapplied/server/0509-Fix-harming-potion-dupe.patch
index 7b2d745291..7b2d745291 100644
--- a/patches/server/0509-Fix-harming-potion-dupe.patch
+++ b/patches/unapplied/server/0509-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0510-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/unapplied/server/0510-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
index 754c03c42c..754c03c42c 100644
--- a/patches/server/0510-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
+++ b/patches/unapplied/server/0510-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/patches/server/0511-Cache-burn-durations.patch b/patches/unapplied/server/0511-Cache-burn-durations.patch
index c4372f6401..c4372f6401 100644
--- a/patches/server/0511-Cache-burn-durations.patch
+++ b/patches/unapplied/server/0511-Cache-burn-durations.patch
diff --git a/patches/server/0512-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/unapplied/server/0512-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
index bd783eafb5..bd783eafb5 100644
--- a/patches/server/0512-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
+++ b/patches/unapplied/server/0512-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0513-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/unapplied/server/0513-Fix-Not-a-string-Map-Conversion-spam.patch
index 38593b84f5..38593b84f5 100644
--- a/patches/server/0513-Fix-Not-a-string-Map-Conversion-spam.patch
+++ b/patches/unapplied/server/0513-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0514-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/unapplied/server/0514-Implement-PlayerFlowerPotManipulateEvent.patch
index 75632f7d24..75632f7d24 100644
--- a/patches/server/0514-Implement-PlayerFlowerPotManipulateEvent.patch
+++ b/patches/unapplied/server/0514-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0515-Fix-interact-event-not-being-called-sometimes.patch b/patches/unapplied/server/0515-Fix-interact-event-not-being-called-sometimes.patch
index 8ba9b9c78d..8ba9b9c78d 100644
--- a/patches/server/0515-Fix-interact-event-not-being-called-sometimes.patch
+++ b/patches/unapplied/server/0515-Fix-interact-event-not-being-called-sometimes.patch
diff --git a/patches/server/0516-Zombie-API-breaking-doors.patch b/patches/unapplied/server/0516-Zombie-API-breaking-doors.patch
index 50bb6965cf..50bb6965cf 100644
--- a/patches/server/0516-Zombie-API-breaking-doors.patch
+++ b/patches/unapplied/server/0516-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0517-Fix-nerfed-slime-when-splitting.patch b/patches/unapplied/server/0517-Fix-nerfed-slime-when-splitting.patch
index d2beca8665..d2beca8665 100644
--- a/patches/server/0517-Fix-nerfed-slime-when-splitting.patch
+++ b/patches/unapplied/server/0517-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0518-Add-EntityLoadCrossbowEvent.patch b/patches/unapplied/server/0518-Add-EntityLoadCrossbowEvent.patch
index 07e5946fbf..07e5946fbf 100644
--- a/patches/server/0518-Add-EntityLoadCrossbowEvent.patch
+++ b/patches/unapplied/server/0518-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0519-Added-WorldGameRuleChangeEvent.patch b/patches/unapplied/server/0519-Added-WorldGameRuleChangeEvent.patch
index fadf4b1d55..fadf4b1d55 100644
--- a/patches/server/0519-Added-WorldGameRuleChangeEvent.patch
+++ b/patches/unapplied/server/0519-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0520-Added-ServerResourcesReloadedEvent.patch b/patches/unapplied/server/0520-Added-ServerResourcesReloadedEvent.patch
index 490a9f39f8..490a9f39f8 100644
--- a/patches/server/0520-Added-ServerResourcesReloadedEvent.patch
+++ b/patches/unapplied/server/0520-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/0521-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/unapplied/server/0521-Added-world-settings-for-mobs-picking-up-loot.patch
index 9d7b4d29c5..9d7b4d29c5 100644
--- a/patches/server/0521-Added-world-settings-for-mobs-picking-up-loot.patch
+++ b/patches/unapplied/server/0521-Added-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0522-Implemented-BlockFailedDispenseEvent.patch b/patches/unapplied/server/0522-Implemented-BlockFailedDispenseEvent.patch
index 3b210a9abe..3b210a9abe 100644
--- a/patches/server/0522-Implemented-BlockFailedDispenseEvent.patch
+++ b/patches/unapplied/server/0522-Implemented-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0523-Added-PlayerLecternPageChangeEvent.patch b/patches/unapplied/server/0523-Added-PlayerLecternPageChangeEvent.patch
index 57485f4ee7..57485f4ee7 100644
--- a/patches/server/0523-Added-PlayerLecternPageChangeEvent.patch
+++ b/patches/unapplied/server/0523-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0524-Added-PlayerLoomPatternSelectEvent.patch b/patches/unapplied/server/0524-Added-PlayerLoomPatternSelectEvent.patch
index 93e862a643..93e862a643 100644
--- a/patches/server/0524-Added-PlayerLoomPatternSelectEvent.patch
+++ b/patches/unapplied/server/0524-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0525-Configurable-door-breaking-difficulty.patch b/patches/unapplied/server/0525-Configurable-door-breaking-difficulty.patch
index 5338964e49..5338964e49 100644
--- a/patches/server/0525-Configurable-door-breaking-difficulty.patch
+++ b/patches/unapplied/server/0525-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0526-Empty-commands-shall-not-be-dispatched.patch b/patches/unapplied/server/0526-Empty-commands-shall-not-be-dispatched.patch
index 9b41ebaaf7..9b41ebaaf7 100644
--- a/patches/server/0526-Empty-commands-shall-not-be-dispatched.patch
+++ b/patches/unapplied/server/0526-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0527-Remove-stale-POIs.patch b/patches/unapplied/server/0527-Remove-stale-POIs.patch
index ffd7e9574e..fb37d08031 100644
--- a/patches/server/0527-Remove-stale-POIs.patch
+++ b/patches/unapplied/server/0527-Remove-stale-POIs.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Remove stale POIs
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index fe376f3224ed4083d0bfc20911fc059d7b32e2c9..d24520f3c11fb93c470ad021ba4bdc5f2db43ac4 100644
+index dd5ac4b4c30afab7b376947548722050fb3af106..3e06d5d172260cef78413398328fcec1965ab469 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2065,6 +2065,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0528-Fix-villager-boat-exploit.patch b/patches/unapplied/server/0528-Fix-villager-boat-exploit.patch
index e4f758d90a..e4f758d90a 100644
--- a/patches/server/0528-Fix-villager-boat-exploit.patch
+++ b/patches/unapplied/server/0528-Fix-villager-boat-exploit.patch
diff --git a/patches/server/0529-Add-sendOpLevel-API.patch b/patches/unapplied/server/0529-Add-sendOpLevel-API.patch
index 281c9b08de..15617bc2f6 100644
--- a/patches/server/0529-Add-sendOpLevel-API.patch
+++ b/patches/unapplied/server/0529-Add-sendOpLevel-API.patch
@@ -32,7 +32,7 @@ index 270e3aec3c477a80ea6f5e2e83337585a1dc9821..705c0f7b601d025dfd7bbe1e69aec558
  
      public boolean isWhiteListed(GameProfile profile) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1f742a39d1f31ef27cb4e662a6c3935600728d0b..69d0694f2f25ce51f40c7cd283e1591fe05ffe2c 100644
+index 9ba0165896e819ebb4482cc34113b72ecb466c43..c7090918ef8ad62742f44eb98756dc9a59d30a45 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -628,6 +628,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0530-TODO-Registry-Modification-API.patch b/patches/unapplied/server/0530-TODO-Registry-Modification-API.patch
index c247dad753..c247dad753 100644
--- a/patches/server/0530-TODO-Registry-Modification-API.patch
+++ b/patches/unapplied/server/0530-TODO-Registry-Modification-API.patch
diff --git a/patches/server/0531-Add-StructuresLocateEvent.patch b/patches/unapplied/server/0531-Add-StructuresLocateEvent.patch
index 47d435b995..47d435b995 100644
--- a/patches/server/0531-Add-StructuresLocateEvent.patch
+++ b/patches/unapplied/server/0531-Add-StructuresLocateEvent.patch
diff --git a/patches/server/0532-Collision-option-for-requiring-a-player-participant.patch b/patches/unapplied/server/0532-Collision-option-for-requiring-a-player-participant.patch
index b6f116cf0a..f0ac75fa2c 100644
--- a/patches/server/0532-Collision-option-for-requiring-a-player-participant.patch
+++ b/patches/unapplied/server/0532-Collision-option-for-requiring-a-player-participant.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Collision option for requiring a player participant
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e8604fa9ef819db8a5f5fabc99022095bce7b00d..62de1d9529fe3d3a31f050cd6e0b7378c62aacc8 100644
+index 8ba9dc9c1fe2c2589178ec54b5ff2d19a7a8c633..3213555082444edcfbfd5db25aac50738f644d3d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1927,6 +1927,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0533-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/unapplied/server/0533-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
index 3f7c51ddfe..3f7c51ddfe 100644
--- a/patches/server/0533-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
+++ b/patches/unapplied/server/0533-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0534-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/unapplied/server/0534-Return-chat-component-with-empty-text-instead-of-thr.patch
index 17e9def19b..17e9def19b 100644
--- a/patches/server/0534-Return-chat-component-with-empty-text-instead-of-thr.patch
+++ b/patches/unapplied/server/0534-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0535-Make-schedule-command-per-world.patch b/patches/unapplied/server/0535-Make-schedule-command-per-world.patch
index 8e29559590..8e29559590 100644
--- a/patches/server/0535-Make-schedule-command-per-world.patch
+++ b/patches/unapplied/server/0535-Make-schedule-command-per-world.patch
diff --git a/patches/server/0536-Configurable-max-leash-distance.patch b/patches/unapplied/server/0536-Configurable-max-leash-distance.patch
index c1ac4b5634..c1ac4b5634 100644
--- a/patches/server/0536-Configurable-max-leash-distance.patch
+++ b/patches/unapplied/server/0536-Configurable-max-leash-distance.patch
diff --git a/patches/server/0537-Implement-BlockPreDispenseEvent.patch b/patches/unapplied/server/0537-Implement-BlockPreDispenseEvent.patch
index 9950944d95..9950944d95 100644
--- a/patches/server/0537-Implement-BlockPreDispenseEvent.patch
+++ b/patches/unapplied/server/0537-Implement-BlockPreDispenseEvent.patch
diff --git a/patches/server/0538-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/unapplied/server/0538-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
index 03d8cdf4c8..03d8cdf4c8 100644
--- a/patches/server/0538-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
+++ b/patches/unapplied/server/0538-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0539-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/unapplied/server/0539-Add-toggle-for-always-placing-the-dragon-egg.patch
index 39e24e6044..39e24e6044 100644
--- a/patches/server/0539-Add-toggle-for-always-placing-the-dragon-egg.patch
+++ b/patches/unapplied/server/0539-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0540-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/unapplied/server/0540-Added-PlayerStonecutterRecipeSelectEvent.patch
index 9750570e73..9750570e73 100644
--- a/patches/server/0540-Added-PlayerStonecutterRecipeSelectEvent.patch
+++ b/patches/unapplied/server/0540-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0541-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/unapplied/server/0541-Add-dropLeash-variable-to-EntityUnleashEvent.patch
index 611e5093da..611e5093da 100644
--- a/patches/server/0541-Add-dropLeash-variable-to-EntityUnleashEvent.patch
+++ b/patches/unapplied/server/0541-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/server/0542-Reset-shield-blocking-on-dimension-change.patch b/patches/unapplied/server/0542-Reset-shield-blocking-on-dimension-change.patch
index 77d3f29709..77d3f29709 100644
--- a/patches/server/0542-Reset-shield-blocking-on-dimension-change.patch
+++ b/patches/unapplied/server/0542-Reset-shield-blocking-on-dimension-change.patch
diff --git a/patches/server/0543-add-DragonEggFormEvent.patch b/patches/unapplied/server/0543-add-DragonEggFormEvent.patch
index e4c888b12d..e4c888b12d 100644
--- a/patches/server/0543-add-DragonEggFormEvent.patch
+++ b/patches/unapplied/server/0543-add-DragonEggFormEvent.patch
diff --git a/patches/server/0544-EntityMoveEvent.patch b/patches/unapplied/server/0544-EntityMoveEvent.patch
index 1597623bc7..3df3a5972e 100644
--- a/patches/server/0544-EntityMoveEvent.patch
+++ b/patches/unapplied/server/0544-EntityMoveEvent.patch
@@ -17,7 +17,7 @@ index 27c7c696647271ffed345e339822526730a9523b..ced37ae135b8b856665819a7b618f62f
              this.profiler.push(() -> {
                  return worldserver + " " + worldserver.dimension().location();
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index d24520f3c11fb93c470ad021ba4bdc5f2db43ac4..1f4226e340f4987d48218d8f4012401272a6dcb3 100644
+index 3e06d5d172260cef78413398328fcec1965ab469..3dd92b6ca926a04fabf552eb8c1f12ff4d90070f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -220,6 +220,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0545-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/unapplied/server/0545-added-option-to-disable-pathfinding-updates-on-block.patch
index 2019b707c1..b1a87f859b 100644
--- a/patches/server/0545-added-option-to-disable-pathfinding-updates-on-block.patch
+++ b/patches/unapplied/server/0545-added-option-to-disable-pathfinding-updates-on-block.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] added option to disable pathfinding updates on block changes
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 1f4226e340f4987d48218d8f4012401272a6dcb3..f6ee996e6d85e1ab886ffc941a4a8cc05857e4e0 100644
+index 3dd92b6ca926a04fabf552eb8c1f12ff4d90070f..bc7bed7f98723a68c1d919020e9e88ad2213d7b8 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1654,6 +1654,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0546-Inline-shift-direction-fields.patch b/patches/unapplied/server/0546-Inline-shift-direction-fields.patch
index f0c71d61f2..f0c71d61f2 100644
--- a/patches/server/0546-Inline-shift-direction-fields.patch
+++ b/patches/unapplied/server/0546-Inline-shift-direction-fields.patch
diff --git a/patches/server/0547-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/unapplied/server/0547-Allow-adding-items-to-BlockDropItemEvent.patch
index e7d78b6fdc..e7d78b6fdc 100644
--- a/patches/server/0547-Allow-adding-items-to-BlockDropItemEvent.patch
+++ b/patches/unapplied/server/0547-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0548-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/unapplied/server/0548-Add-getMainThreadExecutor-to-BukkitScheduler.patch
index 88e136bf5d..fae7ff0de6 100644
--- a/patches/server/0548-Add-getMainThreadExecutor-to-BukkitScheduler.patch
+++ b/patches/unapplied/server/0548-Add-getMainThreadExecutor-to-BukkitScheduler.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add getMainThreadExecutor to BukkitScheduler
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 806dc15cec7d0ec082a2d3e512cd84edfbe6d9bf..3ceb5d83be20183da907915f70ba9e64369373a9 100644
+index acb2af336184c0215c409c748b56fddd8d1fb4be..700932b65e4fda560d684b0aa079bcee3923f73e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -651,4 +651,15 @@ public class CraftScheduler implements BukkitScheduler {
diff --git a/patches/server/0549-living-entity-allow-attribute-registration.patch b/patches/unapplied/server/0549-living-entity-allow-attribute-registration.patch
index d9d31ae912..d9d31ae912 100644
--- a/patches/server/0549-living-entity-allow-attribute-registration.patch
+++ b/patches/unapplied/server/0549-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0550-fix-dead-slime-setSize-invincibility.patch b/patches/unapplied/server/0550-fix-dead-slime-setSize-invincibility.patch
index 494e56127e..494e56127e 100644
--- a/patches/server/0550-fix-dead-slime-setSize-invincibility.patch
+++ b/patches/unapplied/server/0550-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0551-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/unapplied/server/0551-Merchant-getRecipes-should-return-an-immutable-list.patch
index cbb0cdc052..cbb0cdc052 100644
--- a/patches/server/0551-Merchant-getRecipes-should-return-an-immutable-list.patch
+++ b/patches/unapplied/server/0551-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0552-Expose-Tracked-Players.patch b/patches/unapplied/server/0552-Expose-Tracked-Players.patch
index d997a95f37..8c34b0992c 100644
--- a/patches/server/0552-Expose-Tracked-Players.patch
+++ b/patches/unapplied/server/0552-Expose-Tracked-Players.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose Tracked Players
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 505ab2218c87961fd8c616a130de5b5e2e597eb4..d270d9ca6f1dea0ad4e6a919b58b845eebf3dc87 100644
+index fb0cde02f2fc143d69f926131b2fb3dc69bfdea3..b23338739b7badbb4fae1428a02a67625133b6e0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1368,5 +1368,18 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0553-Remove-streams-from-SensorNearest.patch b/patches/unapplied/server/0553-Remove-streams-from-SensorNearest.patch
index a7ae5d1a98..a7ae5d1a98 100644
--- a/patches/server/0553-Remove-streams-from-SensorNearest.patch
+++ b/patches/unapplied/server/0553-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0554-Improve-ServerGUI.patch b/patches/unapplied/server/0554-Improve-ServerGUI.patch
index cb4eed5f13..cb4eed5f13 100644
--- a/patches/server/0554-Improve-ServerGUI.patch
+++ b/patches/unapplied/server/0554-Improve-ServerGUI.patch
diff --git a/patches/server/0555-fix-converting-txt-to-json-file.patch b/patches/unapplied/server/0555-fix-converting-txt-to-json-file.patch
index b90cade101..b90cade101 100644
--- a/patches/server/0555-fix-converting-txt-to-json-file.patch
+++ b/patches/unapplied/server/0555-fix-converting-txt-to-json-file.patch
diff --git a/patches/server/0556-Add-worldborder-events.patch b/patches/unapplied/server/0556-Add-worldborder-events.patch
index 176d1259e4..176d1259e4 100644
--- a/patches/server/0556-Add-worldborder-events.patch
+++ b/patches/unapplied/server/0556-Add-worldborder-events.patch
diff --git a/patches/server/0557-added-PlayerNameEntityEvent.patch b/patches/unapplied/server/0557-added-PlayerNameEntityEvent.patch
index d5a8060153..d5a8060153 100644
--- a/patches/server/0557-added-PlayerNameEntityEvent.patch
+++ b/patches/unapplied/server/0557-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0558-Prevent-grindstones-from-overstacking-items.patch b/patches/unapplied/server/0558-Prevent-grindstones-from-overstacking-items.patch
index 896e20afba..896e20afba 100644
--- a/patches/server/0558-Prevent-grindstones-from-overstacking-items.patch
+++ b/patches/unapplied/server/0558-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0559-Add-recipe-to-cook-events.patch b/patches/unapplied/server/0559-Add-recipe-to-cook-events.patch
index e7fabd3ae9..e7fabd3ae9 100644
--- a/patches/server/0559-Add-recipe-to-cook-events.patch
+++ b/patches/unapplied/server/0559-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0560-Add-Block-isValidTool.patch b/patches/unapplied/server/0560-Add-Block-isValidTool.patch
index ff5e330151..ff5e330151 100644
--- a/patches/server/0560-Add-Block-isValidTool.patch
+++ b/patches/unapplied/server/0560-Add-Block-isValidTool.patch
diff --git a/patches/server/0561-Allow-using-signs-inside-spawn-protection.patch b/patches/unapplied/server/0561-Allow-using-signs-inside-spawn-protection.patch
index 2734a5afe5..2734a5afe5 100644
--- a/patches/server/0561-Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/unapplied/server/0561-Allow-using-signs-inside-spawn-protection.patch
diff --git a/patches/server/0562-Expand-world-key-API.patch b/patches/unapplied/server/0562-Expand-world-key-API.patch
index f58e673dde..6b7e8f4699 100644
--- a/patches/server/0562-Expand-world-key-API.patch
+++ b/patches/unapplied/server/0562-Expand-world-key-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expand world key API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 93f44ca0c8388935baaa41f9b0ebb6de2f6906bb..53b62be779bbb31723c4953221d8b5f22e77824c 100644
+index f0360d00918d115008775c41fb586d553c1e2b41..970c85656c398b72e225fb755833e2887c04a68c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -987,5 +987,10 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
@@ -20,7 +20,7 @@ index 93f44ca0c8388935baaa41f9b0ebb6de2f6906bb..53b62be779bbb31723c4953221d8b5f2
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 99942a9292056998026ef7e2293e882d9b61dfd1..cbd139c6d11b28b788b96d4f403ef40d350529fd 100644
+index 475e623d2d42f372b12cf50c2b26b4d2dc203072..dda032b2b4e7b699d62b6bec43aa120d8b385700 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1141,9 +1141,15 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0563-Add-fast-alternative-constructor-for-Rotations.patch b/patches/unapplied/server/0563-Add-fast-alternative-constructor-for-Rotations.patch
index bbdcc665bb..bbdcc665bb 100644
--- a/patches/server/0563-Add-fast-alternative-constructor-for-Rotations.patch
+++ b/patches/unapplied/server/0563-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0564-Item-Rarity-API.patch b/patches/unapplied/server/0564-Item-Rarity-API.patch
index 370339eb5f..370339eb5f 100644
--- a/patches/server/0564-Item-Rarity-API.patch
+++ b/patches/unapplied/server/0564-Item-Rarity-API.patch
diff --git a/patches/server/0565-Drop-carried-item-when-player-has-disconnected.patch b/patches/unapplied/server/0565-Drop-carried-item-when-player-has-disconnected.patch
index 8d13fb736c..8d13fb736c 100644
--- a/patches/server/0565-Drop-carried-item-when-player-has-disconnected.patch
+++ b/patches/unapplied/server/0565-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0566-forced-whitelist-use-configurable-kick-message.patch b/patches/unapplied/server/0566-forced-whitelist-use-configurable-kick-message.patch
index 0d27e71091..0d27e71091 100644
--- a/patches/server/0566-forced-whitelist-use-configurable-kick-message.patch
+++ b/patches/unapplied/server/0566-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0567-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/unapplied/server/0567-Don-t-ignore-result-of-PlayerEditBookEvent.patch
index d0ba8dc9ef..d0ba8dc9ef 100644
--- a/patches/server/0567-Don-t-ignore-result-of-PlayerEditBookEvent.patch
+++ b/patches/unapplied/server/0567-Don-t-ignore-result-of-PlayerEditBookEvent.patch
diff --git a/patches/server/0568-Expose-protocol-version.patch b/patches/unapplied/server/0568-Expose-protocol-version.patch
index fad23f6e40..fad23f6e40 100644
--- a/patches/server/0568-Expose-protocol-version.patch
+++ b/patches/unapplied/server/0568-Expose-protocol-version.patch
diff --git a/patches/server/0569-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/unapplied/server/0569-Enhance-console-tab-completions-for-brigadier-comman.patch
index 80761df4ca..78685db8f9 100644
--- a/patches/server/0569-Enhance-console-tab-completions-for-brigadier-comman.patch
+++ b/patches/unapplied/server/0569-Enhance-console-tab-completions-for-brigadier-comman.patch
@@ -208,7 +208,7 @@ index 0000000000000000000000000000000000000000..dd9d77d7c7f1a5a130a1f4c15e5b1e68
 +    public void setErrorIndex(final int errorIndex) {}
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 2546136ecfc94a8220932a04993ffa46380aba7e..0b5d6a544775fa68a1b33115c899ca7b00ba92d6 100644
+index 4a088f998befc0f3e21f28da74bba14475b0e1c8..27034f08e6fcacb0670f2bdddce6d073a3dd1bc1 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -173,7 +173,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0570-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/unapplied/server/0570-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
index 9fed251180..9fed251180 100644
--- a/patches/server/0570-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
+++ b/patches/unapplied/server/0570-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0571-Add-bypass-host-check.patch b/patches/unapplied/server/0571-Add-bypass-host-check.patch
index 21a11f4ee1..21a11f4ee1 100644
--- a/patches/server/0571-Add-bypass-host-check.patch
+++ b/patches/unapplied/server/0571-Add-bypass-host-check.patch
diff --git a/patches/server/0572-Set-area-affect-cloud-rotation.patch b/patches/unapplied/server/0572-Set-area-affect-cloud-rotation.patch
index 963479559a..9406729264 100644
--- a/patches/server/0572-Set-area-affect-cloud-rotation.patch
+++ b/patches/unapplied/server/0572-Set-area-affect-cloud-rotation.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Set area affect cloud rotation
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 53b62be779bbb31723c4953221d8b5f22e77824c..0e8cf9386fa8b869e3738ac408be2dc86b9a2d9b 100644
+index 970c85656c398b72e225fb755833e2887c04a68c..a8716fec24006a89bcaa1e3acb394cc557944703 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -953,6 +953,7 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
diff --git a/patches/server/0573-add-isDeeplySleeping-to-HumanEntity.patch b/patches/unapplied/server/0573-add-isDeeplySleeping-to-HumanEntity.patch
index cb15f6a02e..cb15f6a02e 100644
--- a/patches/server/0573-add-isDeeplySleeping-to-HumanEntity.patch
+++ b/patches/unapplied/server/0573-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0574-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/unapplied/server/0574-add-consumeFuel-to-FurnaceBurnEvent.patch
index 68c2cd3ffe..68c2cd3ffe 100644
--- a/patches/server/0574-add-consumeFuel-to-FurnaceBurnEvent.patch
+++ b/patches/unapplied/server/0574-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0575-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/unapplied/server/0575-add-get-set-drop-chance-to-EntityEquipment.patch
index fd7cafa884..fd7cafa884 100644
--- a/patches/server/0575-add-get-set-drop-chance-to-EntityEquipment.patch
+++ b/patches/unapplied/server/0575-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0576-fix-PigZombieAngerEvent-cancellation.patch b/patches/unapplied/server/0576-fix-PigZombieAngerEvent-cancellation.patch
index ecc0f6c3cd..ecc0f6c3cd 100644
--- a/patches/server/0576-fix-PigZombieAngerEvent-cancellation.patch
+++ b/patches/unapplied/server/0576-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0577-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/unapplied/server/0577-fix-PlayerItemHeldEvent-firing-twice.patch
index b0a36b045a..b0a36b045a 100644
--- a/patches/server/0577-fix-PlayerItemHeldEvent-firing-twice.patch
+++ b/patches/unapplied/server/0577-fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/patches/server/0578-Added-PlayerDeepSleepEvent.patch b/patches/unapplied/server/0578-Added-PlayerDeepSleepEvent.patch
index d2c5959056..d2c5959056 100644
--- a/patches/server/0578-Added-PlayerDeepSleepEvent.patch
+++ b/patches/unapplied/server/0578-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0579-More-World-API.patch b/patches/unapplied/server/0579-More-World-API.patch
index ff39b189bb..ff39b189bb 100644
--- a/patches/server/0579-More-World-API.patch
+++ b/patches/unapplied/server/0579-More-World-API.patch
diff --git a/patches/server/0580-Added-PlayerBedFailEnterEvent.patch b/patches/unapplied/server/0580-Added-PlayerBedFailEnterEvent.patch
index dd4d2712ed..dd4d2712ed 100644
--- a/patches/server/0580-Added-PlayerBedFailEnterEvent.patch
+++ b/patches/unapplied/server/0580-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0581-Implement-methods-to-convert-between-Component-and-B.patch b/patches/unapplied/server/0581-Implement-methods-to-convert-between-Component-and-B.patch
index 69751ade08..4b5e8c738f 100644
--- a/patches/server/0581-Implement-methods-to-convert-between-Component-and-B.patch
+++ b/patches/unapplied/server/0581-Implement-methods-to-convert-between-Component-and-B.patch
@@ -42,7 +42,7 @@ index 0000000000000000000000000000000000000000..dd6012b6a097575b2d1471be5069ecce
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 0b5d6a544775fa68a1b33115c899ca7b00ba92d6..3c751c98de1d5a9b41ebd832be0ae317d4ac9362 100644
+index 27034f08e6fcacb0670f2bdddce6d073a3dd1bc1..16a32e2baebe01d1f2d077500b775aeca7ec61aa 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -209,6 +209,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0582-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/unapplied/server/0582-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
index 2b298c5771..2b298c5771 100644
--- a/patches/server/0582-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
+++ b/patches/unapplied/server/0582-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
diff --git a/patches/server/0583-Introduce-beacon-activation-deactivation-events.patch b/patches/unapplied/server/0583-Introduce-beacon-activation-deactivation-events.patch
index d28ff36b79..d28ff36b79 100644
--- a/patches/server/0583-Introduce-beacon-activation-deactivation-events.patch
+++ b/patches/unapplied/server/0583-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0584-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/unapplied/server/0584-add-RespawnFlags-to-PlayerRespawnEvent.patch
index aa48b1e763..aa48b1e763 100644
--- a/patches/server/0584-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/unapplied/server/0584-add-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/patches/server/0585-Add-Channel-initialization-listeners.patch b/patches/unapplied/server/0585-Add-Channel-initialization-listeners.patch
index 360d19718e..360d19718e 100644
--- a/patches/server/0585-Add-Channel-initialization-listeners.patch
+++ b/patches/unapplied/server/0585-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0586-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/unapplied/server/0586-Send-empty-commands-if-tab-completion-is-disabled.patch
index d0ff308b9e..d0ff308b9e 100644
--- a/patches/server/0586-Send-empty-commands-if-tab-completion-is-disabled.patch
+++ b/patches/unapplied/server/0586-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0587-Add-more-WanderingTrader-API.patch b/patches/unapplied/server/0587-Add-more-WanderingTrader-API.patch
index e7542c5ef9..e7542c5ef9 100644
--- a/patches/server/0587-Add-more-WanderingTrader-API.patch
+++ b/patches/unapplied/server/0587-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0588-Add-EntityBlockStorage-clearEntities.patch b/patches/unapplied/server/0588-Add-EntityBlockStorage-clearEntities.patch
index 0488f4f727..0488f4f727 100644
--- a/patches/server/0588-Add-EntityBlockStorage-clearEntities.patch
+++ b/patches/unapplied/server/0588-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0589-Entity-load-save-limit-per-chunk.patch b/patches/unapplied/server/0589-Entity-load-save-limit-per-chunk.patch
index f07dc4c039..f07dc4c039 100644
--- a/patches/server/0589-Entity-load-save-limit-per-chunk.patch
+++ b/patches/unapplied/server/0589-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/0590-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/unapplied/server/0590-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
index 85efd06d0c..85efd06d0c 100644
--- a/patches/server/0590-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
+++ b/patches/unapplied/server/0590-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0591-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/unapplied/server/0591-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
index 87bbcb36ba..87bbcb36ba 100644
--- a/patches/server/0591-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/unapplied/server/0591-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0592-Inventory-close.patch b/patches/unapplied/server/0592-Inventory-close.patch
index 9e9df237f4..9e9df237f4 100644
--- a/patches/server/0592-Inventory-close.patch
+++ b/patches/unapplied/server/0592-Inventory-close.patch
diff --git a/patches/server/0593-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/unapplied/server/0593-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
index 33c6b6d97f..33c6b6d97f 100644
--- a/patches/server/0593-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/unapplied/server/0593-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0594-Add-basic-Datapack-API.patch b/patches/unapplied/server/0594-Add-basic-Datapack-API.patch
index 8be755ff40..8bdac22a38 100644
--- a/patches/server/0594-Add-basic-Datapack-API.patch
+++ b/patches/unapplied/server/0594-Add-basic-Datapack-API.patch
@@ -92,7 +92,7 @@ index 0000000000000000000000000000000000000000..cf4374493c11057451a62a655514415c
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index cbd139c6d11b28b788b96d4f403ef40d350529fd..4f6ba50ec5852b12fdb1b74a04f74e706e3019aa 100644
+index dda032b2b4e7b699d62b6bec43aa120d8b385700..40773e62218fabd91b64615868c3a3262ea6dfd7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -305,6 +305,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0595-Add-environment-variable-to-disable-server-gui.patch b/patches/unapplied/server/0595-Add-environment-variable-to-disable-server-gui.patch
index 15f4f2968a..15f4f2968a 100644
--- a/patches/server/0595-Add-environment-variable-to-disable-server-gui.patch
+++ b/patches/unapplied/server/0595-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0596-additions-to-PlayerGameModeChangeEvent.patch b/patches/unapplied/server/0596-additions-to-PlayerGameModeChangeEvent.patch
index 12f0319dd2..38036b8844 100644
--- a/patches/server/0596-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/unapplied/server/0596-additions-to-PlayerGameModeChangeEvent.patch
@@ -94,7 +94,7 @@ index 86b870e8316d2c27861c85ee5a8f7ddd857e8297..176a966ed1cc1c2e436e1d1fd849bfa0
      }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 40ac674da09a5d28c3b691d8979b228b9c6a8a84..8a8b766d91d9e2328486e3156bd6a408808dc1e3 100644
+index 49828aa38e06d7a2f0c7c5b7c4be374996ef4524..70107194d690eb51d77bc76f0d5830bba087c0b2 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -73,21 +73,28 @@ public class ServerPlayerGameMode {
diff --git a/patches/server/0597-ItemStack-repair-check-API.patch b/patches/unapplied/server/0597-ItemStack-repair-check-API.patch
index b82fb6d5dd..b82fb6d5dd 100644
--- a/patches/server/0597-ItemStack-repair-check-API.patch
+++ b/patches/unapplied/server/0597-ItemStack-repair-check-API.patch
diff --git a/patches/server/0598-More-Enchantment-API.patch b/patches/unapplied/server/0598-More-Enchantment-API.patch
index 8c55414347..c1e32b48bb 100644
--- a/patches/server/0598-More-Enchantment-API.patch
+++ b/patches/unapplied/server/0598-More-Enchantment-API.patch
@@ -9,7 +9,7 @@ public net.minecraft.world.item.enchantment.Enchantment slots
 Co-authored-by: Luis <[email protected]>
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java b/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
-index 5b09e7e08c61b10044ac5f481bf10bb79feda8a3..06a857ae432fc81737b53a6d2b8742c1e80e5f8a 100644
+index 5b09e7e08c61b10044ac5f481bf10bb79feda8a3..21e83238a0bad86ffacf60d5c5612771a49ef33d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
 +++ b/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
 @@ -71,7 +71,7 @@ public class CraftEnchantment extends Enchantment {
diff --git a/patches/server/0599-Move-range-check-for-block-placing-up.patch b/patches/unapplied/server/0599-Move-range-check-for-block-placing-up.patch
index a91002873b..a91002873b 100644
--- a/patches/server/0599-Move-range-check-for-block-placing-up.patch
+++ b/patches/unapplied/server/0599-Move-range-check-for-block-placing-up.patch
diff --git a/patches/server/0600-Fix-and-optimise-world-force-upgrading.patch b/patches/unapplied/server/0600-Fix-and-optimise-world-force-upgrading.patch
index 3096f18e1c..23d30d9bad 100644
--- a/patches/server/0600-Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/unapplied/server/0600-Fix-and-optimise-world-force-upgrading.patch
@@ -360,7 +360,7 @@ index b850dba2b0fa5bc762b170ed7083cf8904761f17..7dee0f7d49f3492c92fceff7750e6962
          return this.regionCache.getAndMoveToFirst(ChunkPos.asLong(chunkcoordintpair.getRegionX(), chunkcoordintpair.getRegionZ()));
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4f6ba50ec5852b12fdb1b74a04f74e706e3019aa..56c0677cab4ca77bbcf853a57d5bacc0042adb74 100644
+index 40773e62218fabd91b64615868c3a3262ea6dfd7..bc75c1295427dc1c0e4f7c708e944f10e54ae8b9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1218,9 +1218,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0601-Add-Mob-lookAt-API.patch b/patches/unapplied/server/0601-Add-Mob-lookAt-API.patch
index 1215b07374..1215b07374 100644
--- a/patches/server/0601-Add-Mob-lookAt-API.patch
+++ b/patches/unapplied/server/0601-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0602-Add-Unix-domain-socket-support.patch b/patches/unapplied/server/0602-Add-Unix-domain-socket-support.patch
index ad01611040..ab9c0fa81b 100644
--- a/patches/server/0602-Add-Unix-domain-socket-support.patch
+++ b/patches/unapplied/server/0602-Add-Unix-domain-socket-support.patch
@@ -11,7 +11,7 @@ Tested-by: Mariell Hoversholm <[email protected]>
 Reviewed-by: Mariell Hoversholm <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 3c751c98de1d5a9b41ebd832be0ae317d4ac9362..51c924f051c25cac8172b0ddab83f3b7a69adfe6 100644
+index 16a32e2baebe01d1f2d077500b775aeca7ec61aa..96de992ea9bc9182ea6a30a33e86d7970b70611b 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -219,6 +219,20 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0603-Add-EntityInsideBlockEvent.patch b/patches/unapplied/server/0603-Add-EntityInsideBlockEvent.patch
index ca5eb3ba9f..ca5eb3ba9f 100644
--- a/patches/server/0603-Add-EntityInsideBlockEvent.patch
+++ b/patches/unapplied/server/0603-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0604-Attributes-API-for-item-defaults.patch b/patches/unapplied/server/0604-Attributes-API-for-item-defaults.patch
index 3b1bb9e3fd..3b1bb9e3fd 100644
--- a/patches/server/0604-Attributes-API-for-item-defaults.patch
+++ b/patches/unapplied/server/0604-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0605-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/unapplied/server/0605-Add-cause-to-Weather-ThunderChangeEvents.patch
index f9b1b1ae80..f9b1b1ae80 100644
--- a/patches/server/0605-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/unapplied/server/0605-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/server/0606-More-Lidded-Block-API.patch b/patches/unapplied/server/0606-More-Lidded-Block-API.patch
index e65c6a26cb..e65c6a26cb 100644
--- a/patches/server/0606-More-Lidded-Block-API.patch
+++ b/patches/unapplied/server/0606-More-Lidded-Block-API.patch
diff --git a/patches/server/0607-Limit-item-frame-cursors-on-maps.patch b/patches/unapplied/server/0607-Limit-item-frame-cursors-on-maps.patch
index 64dc46158b..64dc46158b 100644
--- a/patches/server/0607-Limit-item-frame-cursors-on-maps.patch
+++ b/patches/unapplied/server/0607-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0608-Add-PlayerKickEvent-causes.patch b/patches/unapplied/server/0608-Add-PlayerKickEvent-causes.patch
index 8a96bc776f..22297d3072 100644
--- a/patches/server/0608-Add-PlayerKickEvent-causes.patch
+++ b/patches/unapplied/server/0608-Add-PlayerKickEvent-causes.patch
@@ -488,7 +488,7 @@ index 6724d0a1af13e97bc1d3bd94fd43fef742a0deab..20ba0a0c9eae28658888a77dd2170f62
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 674084fa12cf1f7defd00e64a198e278855668d0..7b7afb768bbc75827cd0a03da568d2a82b16dca7 100644
+index 82616cc51a84425edc3f6c5db36945551d74b55f..31e2c25adba68ba0527f7ad0104318d454826ada 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -586,7 +586,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0609-Add-PufferFishStateChangeEvent.patch b/patches/unapplied/server/0609-Add-PufferFishStateChangeEvent.patch
index 091a042a02..091a042a02 100644
--- a/patches/server/0609-Add-PufferFishStateChangeEvent.patch
+++ b/patches/unapplied/server/0609-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0610-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/unapplied/server/0610-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
index 1dbdf33922..1dbdf33922 100644
--- a/patches/server/0610-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
+++ b/patches/unapplied/server/0610-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0611-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/unapplied/server/0611-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
index e8ae16c851..e8ae16c851 100644
--- a/patches/server/0611-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
+++ b/patches/unapplied/server/0611-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0612-Add-option-to-fix-items-merging-through-walls.patch b/patches/unapplied/server/0612-Add-option-to-fix-items-merging-through-walls.patch
index 8f2e06ffef..8f2e06ffef 100644
--- a/patches/server/0612-Add-option-to-fix-items-merging-through-walls.patch
+++ b/patches/unapplied/server/0612-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0613-Add-BellRevealRaiderEvent.patch b/patches/unapplied/server/0613-Add-BellRevealRaiderEvent.patch
index ed8e81f6a2..ed8e81f6a2 100644
--- a/patches/server/0613-Add-BellRevealRaiderEvent.patch
+++ b/patches/unapplied/server/0613-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0614-Fix-invulnerable-end-crystals.patch b/patches/unapplied/server/0614-Fix-invulnerable-end-crystals.patch
index 195d6b8a42..195d6b8a42 100644
--- a/patches/server/0614-Fix-invulnerable-end-crystals.patch
+++ b/patches/unapplied/server/0614-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0615-Add-ElderGuardianAppearanceEvent.patch b/patches/unapplied/server/0615-Add-ElderGuardianAppearanceEvent.patch
index 93e8beb3d3..93e8beb3d3 100644
--- a/patches/server/0615-Add-ElderGuardianAppearanceEvent.patch
+++ b/patches/unapplied/server/0615-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0616-Fix-dangerous-end-portal-logic.patch b/patches/unapplied/server/0616-Fix-dangerous-end-portal-logic.patch
index 0e878f6124..04141b878f 100644
--- a/patches/server/0616-Fix-dangerous-end-portal-logic.patch
+++ b/patches/unapplied/server/0616-Fix-dangerous-end-portal-logic.patch
@@ -11,7 +11,7 @@ Move the tick logic into the post tick, where portaling was
 designed to happen in the first place.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 62de1d9529fe3d3a31f050cd6e0b7378c62aacc8..faac05c4d338ca33c7bcc8243b967b639177320e 100644
+index 3213555082444edcfbfd5db25aac50738f644d3d..21b2d4cbf399b90156200899ba0952de9a5ee7ee 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -485,6 +485,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0617-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/unapplied/server/0617-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
index ef457d74af..ef457d74af 100644
--- a/patches/server/0617-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
+++ b/patches/unapplied/server/0617-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0618-Make-item-validations-configurable.patch b/patches/unapplied/server/0618-Make-item-validations-configurable.patch
index c080248e33..c080248e33 100644
--- a/patches/server/0618-Make-item-validations-configurable.patch
+++ b/patches/unapplied/server/0618-Make-item-validations-configurable.patch
diff --git a/patches/server/0619-Line-Of-Sight-Changes.patch b/patches/unapplied/server/0619-Line-Of-Sight-Changes.patch
index ba904ef595..9072f892b0 100644
--- a/patches/server/0619-Line-Of-Sight-Changes.patch
+++ b/patches/unapplied/server/0619-Line-Of-Sight-Changes.patch
@@ -19,7 +19,7 @@ index 9ce8052369e3279a89b55b56c476c1e1405c6570..1c8742e272e984d9a093d049b9420036
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 0e8cf9386fa8b869e3738ac408be2dc86b9a2d9b..c3a26a55f46737a470448c6554d6827b1d6fc89c 100644
+index a8716fec24006a89bcaa1e3acb394cc557944703..b1c0baa5a535c629008960bdc94b6010a147c329 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -993,5 +993,21 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
diff --git a/patches/server/0620-add-per-world-spawn-limits.patch b/patches/unapplied/server/0620-add-per-world-spawn-limits.patch
index 4e001578b7..4e001578b7 100644
--- a/patches/server/0620-add-per-world-spawn-limits.patch
+++ b/patches/unapplied/server/0620-add-per-world-spawn-limits.patch
diff --git a/patches/server/0621-Fix-potions-splash-events.patch b/patches/unapplied/server/0621-Fix-potions-splash-events.patch
index e217ede002..e217ede002 100644
--- a/patches/server/0621-Fix-potions-splash-events.patch
+++ b/patches/unapplied/server/0621-Fix-potions-splash-events.patch
diff --git a/patches/server/0622-Add-more-LimitedRegion-API.patch b/patches/unapplied/server/0622-Add-more-LimitedRegion-API.patch
index 2a50497e38..e07c70638d 100644
--- a/patches/server/0622-Add-more-LimitedRegion-API.patch
+++ b/patches/unapplied/server/0622-Add-more-LimitedRegion-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add more LimitedRegion API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CraftLimitedRegion.java b/src/main/java/org/bukkit/craftbukkit/generator/CraftLimitedRegion.java
-index a4aaa1da9987aaf2ac3b9338d272ca55ab2ac948..5830635e96ab9e10320f790f17a3b345c690ff85 100644
+index 3bf4791affe01ff986aeb6611a3622496248a52b..bb06ec1a0cee953860ce2933b892c2bdb94608b2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/generator/CraftLimitedRegion.java
 +++ b/src/main/java/org/bukkit/craftbukkit/generator/CraftLimitedRegion.java
 @@ -249,4 +249,45 @@ public class CraftLimitedRegion extends CraftRegionAccessor implements LimitedRe
diff --git a/patches/server/0623-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/unapplied/server/0623-Fix-PlayerDropItemEvent-using-wrong-item.patch
index 71965c5192..71965c5192 100644
--- a/patches/server/0623-Fix-PlayerDropItemEvent-using-wrong-item.patch
+++ b/patches/unapplied/server/0623-Fix-PlayerDropItemEvent-using-wrong-item.patch
diff --git a/patches/server/0624-Missing-Entity-API.patch b/patches/unapplied/server/0624-Missing-Entity-API.patch
index 8c3763aa0c..8c3763aa0c 100644
--- a/patches/server/0624-Missing-Entity-API.patch
+++ b/patches/unapplied/server/0624-Missing-Entity-API.patch
diff --git a/patches/server/0625-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/unapplied/server/0625-Ensure-disconnect-for-book-edit-is-called-on-main.patch
index 4774af5eee..4774af5eee 100644
--- a/patches/server/0625-Ensure-disconnect-for-book-edit-is-called-on-main.patch
+++ b/patches/unapplied/server/0625-Ensure-disconnect-for-book-edit-is-called-on-main.patch
diff --git a/patches/server/0626-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/unapplied/server/0626-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
index 46818e51e6..46818e51e6 100644
--- a/patches/server/0626-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
+++ b/patches/unapplied/server/0626-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0627-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/unapplied/server/0627-Use-getChunkIfLoadedImmediately-in-places.patch
index 4bdc40acc5..570b4fe5be 100644
--- a/patches/server/0627-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/patches/unapplied/server/0627-Use-getChunkIfLoadedImmediately-in-places.patch
@@ -8,7 +8,7 @@ ticket level 33 (yes getChunkIfLoaded will actually perform a chunk
 load in that case).
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 61b8ec1ba224551f6898f3e2abbb67992dbb7001..eb4ad9cfd2291b01fd09be2114b56502149fe049 100644
+index 5b9107557c397b3e1cbfe8378750ea5888f18af0..4cc1cd4924aed4fddd46db9f8c76e45e7bfc661a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -228,7 +228,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0628-Fix-commands-from-signs-not-firing-command-events.patch b/patches/unapplied/server/0628-Fix-commands-from-signs-not-firing-command-events.patch
index 915947a504..915947a504 100644
--- a/patches/server/0628-Fix-commands-from-signs-not-firing-command-events.patch
+++ b/patches/unapplied/server/0628-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0629-Adds-PlayerArmSwingEvent.patch b/patches/unapplied/server/0629-Adds-PlayerArmSwingEvent.patch
index c31ebb50d3..c31ebb50d3 100644
--- a/patches/server/0629-Adds-PlayerArmSwingEvent.patch
+++ b/patches/unapplied/server/0629-Adds-PlayerArmSwingEvent.patch
diff --git a/patches/server/0630-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/unapplied/server/0630-Fixes-kick-event-leave-message-not-being-sent.patch
index abfd6ed5e9..abfd6ed5e9 100644
--- a/patches/server/0630-Fixes-kick-event-leave-message-not-being-sent.patch
+++ b/patches/unapplied/server/0630-Fixes-kick-event-leave-message-not-being-sent.patch
diff --git a/patches/server/0631-Add-config-for-mobs-immune-to-default-effects.patch b/patches/unapplied/server/0631-Add-config-for-mobs-immune-to-default-effects.patch
index 6f53f12f33..6f53f12f33 100644
--- a/patches/server/0631-Add-config-for-mobs-immune-to-default-effects.patch
+++ b/patches/unapplied/server/0631-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/0632-Fix-incorrect-message-for-outdated-client.patch b/patches/unapplied/server/0632-Fix-incorrect-message-for-outdated-client.patch
index c668a16be5..c668a16be5 100644
--- a/patches/server/0632-Fix-incorrect-message-for-outdated-client.patch
+++ b/patches/unapplied/server/0632-Fix-incorrect-message-for-outdated-client.patch
diff --git a/patches/server/0633-Don-t-apply-cramming-damage-to-players.patch b/patches/unapplied/server/0633-Don-t-apply-cramming-damage-to-players.patch
index 99113340f6..99113340f6 100644
--- a/patches/server/0633-Don-t-apply-cramming-damage-to-players.patch
+++ b/patches/unapplied/server/0633-Don-t-apply-cramming-damage-to-players.patch
diff --git a/patches/server/0634-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/unapplied/server/0634-Rate-options-and-timings-for-sensors-and-behaviors.patch
index 297c6b3a06..297c6b3a06 100644
--- a/patches/server/0634-Rate-options-and-timings-for-sensors-and-behaviors.patch
+++ b/patches/unapplied/server/0634-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0635-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/unapplied/server/0635-Add-a-bunch-of-missing-forceDrop-toggles.patch
index 4a998000b2..4a998000b2 100644
--- a/patches/server/0635-Add-a-bunch-of-missing-forceDrop-toggles.patch
+++ b/patches/unapplied/server/0635-Add-a-bunch-of-missing-forceDrop-toggles.patch
diff --git a/patches/server/0636-Stinger-API.patch b/patches/unapplied/server/0636-Stinger-API.patch
index a7104402ba..e5facd3b07 100644
--- a/patches/server/0636-Stinger-API.patch
+++ b/patches/unapplied/server/0636-Stinger-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Stinger API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 7745c32b312a7f91e6919ccfb0871d765d0e06f3..886f9b0a4cb4bd6d7341a1ea707565c4492f31d4 100644
+index a951d4f0754a4be03ae4efa07e60726d733b03e4..c5f8b461b8315d3db029dea2d5f7e9a764fc3443 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -338,7 +338,28 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0637-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/unapplied/server/0637-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
index d3cf90c2af..d3cf90c2af 100644
--- a/patches/server/0637-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
+++ b/patches/unapplied/server/0637-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0638-Add-System.out-err-catcher.patch b/patches/unapplied/server/0638-Add-System.out-err-catcher.patch
index 2d4fef523b..abfe99eda2 100644
--- a/patches/server/0638-Add-System.out-err-catcher.patch
+++ b/patches/unapplied/server/0638-Add-System.out-err-catcher.patch
@@ -105,7 +105,7 @@ index 0000000000000000000000000000000000000000..a8e813ca89b033f061e695288b3383bd
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 56c0677cab4ca77bbcf853a57d5bacc0042adb74..c47716b6136c4eaf55864ccc137652e82b620da4 100644
+index bc75c1295427dc1c0e4f7c708e944f10e54ae8b9..b18bf7b943fe2bb009babf9414559b832a51d505 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -307,6 +307,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0639-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/unapplied/server/0639-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
index f4242ad30e..f4242ad30e 100644
--- a/patches/server/0639-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
+++ b/patches/unapplied/server/0639-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0640-Improve-boat-collision-performance.patch b/patches/unapplied/server/0640-Improve-boat-collision-performance.patch
index 30906bd16a..30906bd16a 100644
--- a/patches/server/0640-Improve-boat-collision-performance.patch
+++ b/patches/unapplied/server/0640-Improve-boat-collision-performance.patch
diff --git a/patches/server/0641-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/unapplied/server/0641-Prevent-AFK-kick-while-watching-end-credits.patch
index f97c806cf2..a93d8ba382 100644
--- a/patches/server/0641-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/unapplied/server/0641-Prevent-AFK-kick-while-watching-end-credits.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent AFK kick while watching end credits.
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index eabdaf85e904224f936154d415d183ba65e4dbbf..43e9f9ce338bd1cf803ad707d318cd2435231426 100644
+index c885f3dea2ef128758da59acba42765887ae41ee..f9c9c3b2f9c6796e4799a829dffc86b90b62559f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -388,7 +388,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0642-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/unapplied/server/0642-Allow-skipping-writing-of-comments-to-server.propert.patch
index 9fba827e12..9fba827e12 100644
--- a/patches/server/0642-Allow-skipping-writing-of-comments-to-server.propert.patch
+++ b/patches/unapplied/server/0642-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0643-Add-PlayerSetSpawnEvent.patch b/patches/unapplied/server/0643-Add-PlayerSetSpawnEvent.patch
index e5595175b1..e5595175b1 100644
--- a/patches/server/0643-Add-PlayerSetSpawnEvent.patch
+++ b/patches/unapplied/server/0643-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/server/0644-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/unapplied/server/0644-Make-hoppers-respect-inventory-max-stack-size.patch
index 45531b8594..45531b8594 100644
--- a/patches/server/0644-Make-hoppers-respect-inventory-max-stack-size.patch
+++ b/patches/unapplied/server/0644-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0645-Optimize-entity-tracker-passenger-checks.patch b/patches/unapplied/server/0645-Optimize-entity-tracker-passenger-checks.patch
index 524e1fabfb..524e1fabfb 100644
--- a/patches/server/0645-Optimize-entity-tracker-passenger-checks.patch
+++ b/patches/unapplied/server/0645-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0646-Config-option-for-Piglins-guarding-chests.patch b/patches/unapplied/server/0646-Config-option-for-Piglins-guarding-chests.patch
index 63865bec49..63865bec49 100644
--- a/patches/server/0646-Config-option-for-Piglins-guarding-chests.patch
+++ b/patches/unapplied/server/0646-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0647-Added-EntityDamageItemEvent.patch b/patches/unapplied/server/0647-Added-EntityDamageItemEvent.patch
index 935084ef4b..935084ef4b 100644
--- a/patches/server/0647-Added-EntityDamageItemEvent.patch
+++ b/patches/unapplied/server/0647-Added-EntityDamageItemEvent.patch
diff --git a/patches/server/0648-Optimize-indirect-passenger-iteration.patch b/patches/unapplied/server/0648-Optimize-indirect-passenger-iteration.patch
index 7d763603aa..2cb44e9521 100644
--- a/patches/server/0648-Optimize-indirect-passenger-iteration.patch
+++ b/patches/unapplied/server/0648-Optimize-indirect-passenger-iteration.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Optimize indirect passenger iteration
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index faac05c4d338ca33c7bcc8243b967b639177320e..c8c145048ebe58e40818f998092c2912000f4c63 100644
+index 21b2d4cbf399b90156200899ba0952de9a5ee7ee..c65986830ce27a2fac7b3154df8db47a021a064e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3888,20 +3888,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0649-Configurable-item-frame-map-cursor-update-interval.patch b/patches/unapplied/server/0649-Configurable-item-frame-map-cursor-update-interval.patch
index a1e4f933cb..a1e4f933cb 100644
--- a/patches/server/0649-Configurable-item-frame-map-cursor-update-interval.patch
+++ b/patches/unapplied/server/0649-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0650-Make-EntityUnleashEvent-cancellable.patch b/patches/unapplied/server/0650-Make-EntityUnleashEvent-cancellable.patch
index 17a8a654c4..17a8a654c4 100644
--- a/patches/server/0650-Make-EntityUnleashEvent-cancellable.patch
+++ b/patches/unapplied/server/0650-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/server/0651-Clear-bucket-NBT-after-dispense.patch b/patches/unapplied/server/0651-Clear-bucket-NBT-after-dispense.patch
index 1f2a7cae78..1f2a7cae78 100644
--- a/patches/server/0651-Clear-bucket-NBT-after-dispense.patch
+++ b/patches/unapplied/server/0651-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0652-Change-EnderEye-target-without-changing-other-things.patch b/patches/unapplied/server/0652-Change-EnderEye-target-without-changing-other-things.patch
index 48c5524ab8..48c5524ab8 100644
--- a/patches/server/0652-Change-EnderEye-target-without-changing-other-things.patch
+++ b/patches/unapplied/server/0652-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0653-Add-BlockBreakBlockEvent.patch b/patches/unapplied/server/0653-Add-BlockBreakBlockEvent.patch
index 52a9d63ddc..52a9d63ddc 100644
--- a/patches/server/0653-Add-BlockBreakBlockEvent.patch
+++ b/patches/unapplied/server/0653-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0654-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/unapplied/server/0654-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
index 1002fe00f7..1002fe00f7 100644
--- a/patches/server/0654-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
+++ b/patches/unapplied/server/0654-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0655-More-CommandBlock-API.patch b/patches/unapplied/server/0655-More-CommandBlock-API.patch
index 65a5093980..65a5093980 100644
--- a/patches/server/0655-More-CommandBlock-API.patch
+++ b/patches/unapplied/server/0655-More-CommandBlock-API.patch
diff --git a/patches/server/0656-Add-missing-team-sidebar-display-slots.patch b/patches/unapplied/server/0656-Add-missing-team-sidebar-display-slots.patch
index 446d882c45..446d882c45 100644
--- a/patches/server/0656-Add-missing-team-sidebar-display-slots.patch
+++ b/patches/unapplied/server/0656-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0657-Add-back-EntityPortalExitEvent.patch b/patches/unapplied/server/0657-Add-back-EntityPortalExitEvent.patch
index 0aeb5e4001..37828943ad 100644
--- a/patches/server/0657-Add-back-EntityPortalExitEvent.patch
+++ b/patches/unapplied/server/0657-Add-back-EntityPortalExitEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add back EntityPortalExitEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c8c145048ebe58e40818f998092c2912000f4c63..52022b9df1a66ec4dad9e315450cbe5806e70fa1 100644
+index c65986830ce27a2fac7b3154df8db47a021a064e..44c63a57cc6bb992ae6788e23cc23300d43430f0 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3344,6 +3344,28 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0658-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/unapplied/server/0658-Add-methods-to-find-targets-for-lightning-strikes.patch
index 8668b37192..8668b37192 100644
--- a/patches/server/0658-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/unapplied/server/0658-Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/server/0659-Get-entity-default-attributes.patch b/patches/unapplied/server/0659-Get-entity-default-attributes.patch
index afd4c49b4d..afd4c49b4d 100644
--- a/patches/server/0659-Get-entity-default-attributes.patch
+++ b/patches/unapplied/server/0659-Get-entity-default-attributes.patch
diff --git a/patches/server/0660-Left-handed-API.patch b/patches/unapplied/server/0660-Left-handed-API.patch
index 2a665f7283..41836756f3 100644
--- a/patches/server/0660-Left-handed-API.patch
+++ b/patches/unapplied/server/0660-Left-handed-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Left handed API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-index 6152f4d3d58f4b598d5bd92dbd7c5428c5ff8bc5..40d277f2737f1a060c3047313289c73307948e73 100644
+index a5d3845acc607f640dace05a85f0089611c7d23a..b8d16e2e91e3bf1c004f887bf37e5502938fdd1d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 @@ -147,6 +147,16 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {
diff --git a/patches/server/0661-Add-more-advancement-API.patch b/patches/unapplied/server/0661-Add-more-advancement-API.patch
index c7966b2e3e..c7966b2e3e 100644
--- a/patches/server/0661-Add-more-advancement-API.patch
+++ b/patches/unapplied/server/0661-Add-more-advancement-API.patch
diff --git a/patches/server/0662-Add-ItemFactory-getSpawnEgg-API.patch b/patches/unapplied/server/0662-Add-ItemFactory-getSpawnEgg-API.patch
index 2890a69389..2890a69389 100644
--- a/patches/server/0662-Add-ItemFactory-getSpawnEgg-API.patch
+++ b/patches/unapplied/server/0662-Add-ItemFactory-getSpawnEgg-API.patch
diff --git a/patches/server/0663-Add-critical-damage-API.patch b/patches/unapplied/server/0663-Add-critical-damage-API.patch
index b2d6f4c157..b2d6f4c157 100644
--- a/patches/server/0663-Add-critical-damage-API.patch
+++ b/patches/unapplied/server/0663-Add-critical-damage-API.patch
diff --git a/patches/server/0664-Fix-issues-with-mob-conversion.patch b/patches/unapplied/server/0664-Fix-issues-with-mob-conversion.patch
index 237d313b89..237d313b89 100644
--- a/patches/server/0664-Fix-issues-with-mob-conversion.patch
+++ b/patches/unapplied/server/0664-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0665-Add-isCollidable-methods-to-various-places.patch b/patches/unapplied/server/0665-Add-isCollidable-methods-to-various-places.patch
index 8c0d3f840e..8c0d3f840e 100644
--- a/patches/server/0665-Add-isCollidable-methods-to-various-places.patch
+++ b/patches/unapplied/server/0665-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/server/0666-Goat-ram-API.patch b/patches/unapplied/server/0666-Goat-ram-API.patch
index 443c58b4ee..443c58b4ee 100644
--- a/patches/server/0666-Goat-ram-API.patch
+++ b/patches/unapplied/server/0666-Goat-ram-API.patch
diff --git a/patches/server/0667-Add-API-for-resetting-a-single-score.patch b/patches/unapplied/server/0667-Add-API-for-resetting-a-single-score.patch
index 7d45195961..7d45195961 100644
--- a/patches/server/0667-Add-API-for-resetting-a-single-score.patch
+++ b/patches/unapplied/server/0667-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0668-Add-Raw-Byte-Entity-Serialization.patch b/patches/unapplied/server/0668-Add-Raw-Byte-Entity-Serialization.patch
index f11527f5cf..d794e27eeb 100644
--- a/patches/server/0668-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/unapplied/server/0668-Add-Raw-Byte-Entity-Serialization.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Add Raw Byte Entity Serialization
 public net.minecraft.world.entity.Entity setLevel(Lnet/minecraft/world/level/Level;)V
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 52022b9df1a66ec4dad9e315450cbe5806e70fa1..7418c2204cfbdd539b20b5f9f0b160dd7c3ccfa8 100644
+index 44c63a57cc6bb992ae6788e23cc23300d43430f0..80ab060e9252d3284f9696ef739e96a35fead3e4 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2146,6 +2146,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -27,7 +27,7 @@ index 52022b9df1a66ec4dad9e315450cbe5806e70fa1..7418c2204cfbdd539b20b5f9f0b160dd
          return this.isPassenger() ? false : this.saveAsPassenger(nbt);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 0a29960fca388dd95710bdba19f37fde6be52073..b38e974ee4aa1577860e1b97cc4b05af3c9b1a39 100644
+index af7fec4029a5b6cd11a401d31b327c32ba79667b..0c0e3727cc1d911a9949fcaf6dcd0820b172edc0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1387,5 +1387,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0669-Vanilla-command-permission-fixes.patch b/patches/unapplied/server/0669-Vanilla-command-permission-fixes.patch
index 316475ab5c..316475ab5c 100644
--- a/patches/server/0669-Vanilla-command-permission-fixes.patch
+++ b/patches/unapplied/server/0669-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0670-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/unapplied/server/0670-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index 0949a12465..0ada2d7d00 100644
--- a/patches/server/0670-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/unapplied/server/0670-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
@@ -9,7 +9,7 @@ chunk through it. This should also be OK from a leak prevention/
 state desync POV because the TE is getting unloaded anyways.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 9fd3eca485fc71e5da142f8b6763e44691e3f41c..48513493d92ea0fe5e2cb4f021c843b10caab062 100644
+index dceddff95dd9b152e25f656b95cc71025a123099..d65e3cfeb8c6e7d26c03af8870d328c2f4094541 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1555,9 +1555,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0671-Fix-GameProfileCache-concurrency.patch b/patches/unapplied/server/0671-Fix-GameProfileCache-concurrency.patch
index 0337248104..0337248104 100644
--- a/patches/server/0671-Fix-GameProfileCache-concurrency.patch
+++ b/patches/unapplied/server/0671-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0672-Improve-and-expand-AsyncCatcher.patch b/patches/unapplied/server/0672-Improve-and-expand-AsyncCatcher.patch
index 23aaa03d81..e2351667a7 100644
--- a/patches/server/0672-Improve-and-expand-AsyncCatcher.patch
+++ b/patches/unapplied/server/0672-Improve-and-expand-AsyncCatcher.patch
@@ -166,7 +166,7 @@ index 47bab513feec217d875192afef61f3af95b93d24..d3fb277878adb26c7d80cf21f2707038
                  PersistentEntitySectionManager.LOGGER.warn("Entity {} wasn't found in section {} (destroying due to {})", new Object[]{this.entity, SectionPos.of(this.currentSectionKey), reason});
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 886f9b0a4cb4bd6d7341a1ea707565c4492f31d4..03b1b9d8bf7b12343564ff6eb4fb865e4626b1e4 100644
+index c5f8b461b8315d3db029dea2d5f7e9a764fc3443..0faed04c7794dd4fd758a151d15ad5956e4f4907 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -464,6 +464,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0673-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/unapplied/server/0673-Add-paper-mobcaps-and-paper-playermobcaps.patch
index cd3071c768..cd3071c768 100644
--- a/patches/server/0673-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/unapplied/server/0673-Add-paper-mobcaps-and-paper-playermobcaps.patch
diff --git a/patches/server/0674-Sanitize-ResourceLocation-error-logging.patch b/patches/unapplied/server/0674-Sanitize-ResourceLocation-error-logging.patch
index 989716f6fd..989716f6fd 100644
--- a/patches/server/0674-Sanitize-ResourceLocation-error-logging.patch
+++ b/patches/unapplied/server/0674-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0675-Optimise-general-POI-access.patch b/patches/unapplied/server/0675-Optimise-general-POI-access.patch
index 332786d627..332786d627 100644
--- a/patches/server/0675-Optimise-general-POI-access.patch
+++ b/patches/unapplied/server/0675-Optimise-general-POI-access.patch
diff --git a/patches/server/0676-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/unapplied/server/0676-Custom-table-implementation-for-blockstate-state-loo.patch
index 0023c8bd8c..0023c8bd8c 100644
--- a/patches/server/0676-Custom-table-implementation-for-blockstate-state-loo.patch
+++ b/patches/unapplied/server/0676-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/0677-Manually-inline-methods-in-BlockPosition.patch b/patches/unapplied/server/0677-Manually-inline-methods-in-BlockPosition.patch
index c8b8adfce9..c8b8adfce9 100644
--- a/patches/server/0677-Manually-inline-methods-in-BlockPosition.patch
+++ b/patches/unapplied/server/0677-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0678-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/unapplied/server/0678-Name-craft-scheduler-threads-according-to-the-plugin.patch
index e97fc69558..e97fc69558 100644
--- a/patches/server/0678-Name-craft-scheduler-threads-according-to-the-plugin.patch
+++ b/patches/unapplied/server/0678-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0679-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/unapplied/server/0679-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
index 007351ae6c..007351ae6c 100644
--- a/patches/server/0679-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
+++ b/patches/unapplied/server/0679-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0680-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/unapplied/server/0680-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
index 5475ff2092..5475ff2092 100644
--- a/patches/server/0680-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
+++ b/patches/unapplied/server/0680-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0681-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/unapplied/server/0681-Don-t-lookup-fluid-state-when-raytracing.patch
index d931ef54fa..d931ef54fa 100644
--- a/patches/server/0681-Don-t-lookup-fluid-state-when-raytracing.patch
+++ b/patches/unapplied/server/0681-Don-t-lookup-fluid-state-when-raytracing.patch
diff --git a/patches/server/0682-Time-scoreboard-search.patch b/patches/unapplied/server/0682-Time-scoreboard-search.patch
index e2bd684e63..e2bd684e63 100644
--- a/patches/server/0682-Time-scoreboard-search.patch
+++ b/patches/unapplied/server/0682-Time-scoreboard-search.patch
diff --git a/patches/server/0683-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/unapplied/server/0683-Send-full-pos-packets-for-hard-colliding-entities.patch
index f005ae7e71..f005ae7e71 100644
--- a/patches/server/0683-Send-full-pos-packets-for-hard-colliding-entities.patch
+++ b/patches/unapplied/server/0683-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/0684-Do-not-run-raytrace-logic-for-AIR.patch b/patches/unapplied/server/0684-Do-not-run-raytrace-logic-for-AIR.patch
index 75ece1bf8b..75ece1bf8b 100644
--- a/patches/server/0684-Do-not-run-raytrace-logic-for-AIR.patch
+++ b/patches/unapplied/server/0684-Do-not-run-raytrace-logic-for-AIR.patch
diff --git a/patches/server/0685-Execute-chunk-tasks-mid-tick.patch b/patches/unapplied/server/0685-Execute-chunk-tasks-mid-tick.patch
index 3a0637b6e5..a1e536e85b 100644
--- a/patches/server/0685-Execute-chunk-tasks-mid-tick.patch
+++ b/patches/unapplied/server/0685-Execute-chunk-tasks-mid-tick.patch
@@ -126,7 +126,7 @@ index 4e58f31e4852a0811f85596653f6db630a75b069..8907396dc21dbfb31ff15286a7daa211
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 48513493d92ea0fe5e2cb4f021c843b10caab062..82867a6d6e2277355269712e9e45602fc7afac45 100644
+index d65e3cfeb8c6e7d26c03af8870d328c2f4094541..8436a2a517c3cff92d017bb3bc4acbd2e590597e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -215,6 +215,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0686-Oprimise-map-impl-for-tracked-players.patch b/patches/unapplied/server/0686-Oprimise-map-impl-for-tracked-players.patch
index 42fe98d24e..42fe98d24e 100644
--- a/patches/server/0686-Oprimise-map-impl-for-tracked-players.patch
+++ b/patches/unapplied/server/0686-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0687-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/unapplied/server/0687-Optimise-BlockSoil-nearby-water-lookup.patch
index 0e1204b2ec..0e1204b2ec 100644
--- a/patches/server/0687-Optimise-BlockSoil-nearby-water-lookup.patch
+++ b/patches/unapplied/server/0687-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0688-Optimise-random-block-ticking.patch b/patches/unapplied/server/0688-Optimise-random-block-ticking.patch
index 3587292de4..3d0e2310b6 100644
--- a/patches/server/0688-Optimise-random-block-ticking.patch
+++ b/patches/unapplied/server/0688-Optimise-random-block-ticking.patch
@@ -90,7 +90,7 @@ index 0000000000000000000000000000000000000000..7d93652c1abbb6aee6eb7c26cf35d4d0
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 82867a6d6e2277355269712e9e45602fc7afac45..59bc500d1dfabbd68cb0948b53f1a2f77378766c 100644
+index 8436a2a517c3cff92d017bb3bc4acbd2e590597e..1c6cd0671b501dde08cace07043565efa4c740f1 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -839,6 +839,10 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0689-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/unapplied/server/0689-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
index 0a7c36c977..0a7c36c977 100644
--- a/patches/server/0689-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
+++ b/patches/unapplied/server/0689-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/0690-Use-Velocity-compression-and-cipher-natives.patch b/patches/unapplied/server/0690-Use-Velocity-compression-and-cipher-natives.patch
index cc0f4ae232..50ce1c97d3 100644
--- a/patches/server/0690-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/unapplied/server/0690-Use-Velocity-compression-and-cipher-natives.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use Velocity compression and cipher natives
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 61d2f46ed71a8abff05e8295ac764b4af78095de..6da6120bc37b573a5398f1593b72ffc7f569682b 100644
+index 08962fc6c7b66a79e7f6985c45ef593407594f96..0a98693535b55e03abd158f5c469d2eada80650f 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -40,6 +40,11 @@ dependencies {
diff --git a/patches/server/0691-Detail-more-information-in-watchdog-dumps.patch b/patches/unapplied/server/0691-Detail-more-information-in-watchdog-dumps.patch
index c07f133ae7..0a72348da6 100644
--- a/patches/server/0691-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/unapplied/server/0691-Detail-more-information-in-watchdog-dumps.patch
@@ -76,7 +76,7 @@ index 047fc7206131e0f36ab45d04e98b7a235431e342..6ac03dee902051a26493dba468d6a2f5
              });
              throw RunningOnDifferentThreadException.RUNNING_ON_DIFFERENT_THREAD;
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 59bc500d1dfabbd68cb0948b53f1a2f77378766c..7580fbc59780161946d9dc65587b6c6aea81671b 100644
+index 1c6cd0671b501dde08cace07043565efa4c740f1..e7e1ed9d3031bc5614cedc97d0261d22800e8479 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1216,7 +1216,26 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -122,7 +122,7 @@ index 59bc500d1dfabbd68cb0948b53f1a2f77378766c..7580fbc59780161946d9dc65587b6c6a
  
      private void tickPassenger(Entity vehicle, Entity passenger) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 7418c2204cfbdd539b20b5f9f0b160dd7c3ccfa8..bd50f7bee65337cc15f700d80052c90e19eaf2c2 100644
+index 80ab060e9252d3284f9696ef739e96a35fead3e4..43961098f06119a4ad7e2c6c6bdf16901b1e9ff5 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1024,7 +1024,42 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0692-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/unapplied/server/0692-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
index 429df0d968..429df0d968 100644
--- a/patches/server/0692-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
+++ b/patches/unapplied/server/0692-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
diff --git a/patches/server/0693-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/unapplied/server/0693-Fix-Bukkit-NamespacedKey-shenanigans.patch
index c77b9ae0d6..c77b9ae0d6 100644
--- a/patches/server/0693-Fix-Bukkit-NamespacedKey-shenanigans.patch
+++ b/patches/unapplied/server/0693-Fix-Bukkit-NamespacedKey-shenanigans.patch
diff --git a/patches/server/0694-Distance-manager-tick-timings.patch b/patches/unapplied/server/0694-Distance-manager-tick-timings.patch
index c7179fd70d..c7179fd70d 100644
--- a/patches/server/0694-Distance-manager-tick-timings.patch
+++ b/patches/unapplied/server/0694-Distance-manager-tick-timings.patch
diff --git a/patches/server/0695-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/unapplied/server/0695-Fix-merchant-inventory-not-closing-on-entity-removal.patch
index 2450152a70..a481a2ef7a 100644
--- a/patches/server/0695-Fix-merchant-inventory-not-closing-on-entity-removal.patch
+++ b/patches/unapplied/server/0695-Fix-merchant-inventory-not-closing-on-entity-removal.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix merchant inventory not closing on entity removal
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 7580fbc59780161946d9dc65587b6c6aea81671b..38931091d573059d7e265fd86a704b96f48bdc48 100644
+index e7e1ed9d3031bc5614cedc97d0261d22800e8479..9cc9815aab6d0548c45e380ad3a90130c1d731d7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2642,6 +2642,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0696-Check-requirement-before-suggesting-root-nodes.patch b/patches/unapplied/server/0696-Check-requirement-before-suggesting-root-nodes.patch
index f32c6d0bed..f32c6d0bed 100644
--- a/patches/server/0696-Check-requirement-before-suggesting-root-nodes.patch
+++ b/patches/unapplied/server/0696-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0697-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/unapplied/server/0697-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index 301d6807c0..301d6807c0 100644
--- a/patches/server/0697-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/unapplied/server/0697-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
diff --git a/patches/server/0698-Add-packet-limiter-config.patch b/patches/unapplied/server/0698-Add-packet-limiter-config.patch
index 6b454b34dd..6b454b34dd 100644
--- a/patches/server/0698-Add-packet-limiter-config.patch
+++ b/patches/unapplied/server/0698-Add-packet-limiter-config.patch
diff --git a/patches/server/0699-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/unapplied/server/0699-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
index 341421e59d..341421e59d 100644
--- a/patches/server/0699-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
+++ b/patches/unapplied/server/0699-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0700-Ensure-valid-vehicle-status.patch b/patches/unapplied/server/0700-Ensure-valid-vehicle-status.patch
index 608f09c5af..608f09c5af 100644
--- a/patches/server/0700-Ensure-valid-vehicle-status.patch
+++ b/patches/unapplied/server/0700-Ensure-valid-vehicle-status.patch
diff --git a/patches/server/0701-Prevent-softlocked-end-exit-portal-generation.patch b/patches/unapplied/server/0701-Prevent-softlocked-end-exit-portal-generation.patch
index df49391139..df49391139 100644
--- a/patches/server/0701-Prevent-softlocked-end-exit-portal-generation.patch
+++ b/patches/unapplied/server/0701-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0702-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/unapplied/server/0702-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
index b415f668ab..b415f668ab 100644
--- a/patches/server/0702-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
+++ b/patches/unapplied/server/0702-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0703-Don-t-log-debug-logging-being-disabled.patch b/patches/unapplied/server/0703-Don-t-log-debug-logging-being-disabled.patch
index 2130840734..2130840734 100644
--- a/patches/server/0703-Don-t-log-debug-logging-being-disabled.patch
+++ b/patches/unapplied/server/0703-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0704-fix-various-menus-with-empty-level-accesses.patch b/patches/unapplied/server/0704-fix-various-menus-with-empty-level-accesses.patch
index 3bda24b9c6..3bda24b9c6 100644
--- a/patches/server/0704-fix-various-menus-with-empty-level-accesses.patch
+++ b/patches/unapplied/server/0704-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0705-Preserve-overstacked-loot.patch b/patches/unapplied/server/0705-Preserve-overstacked-loot.patch
index 004c7c6f77..004c7c6f77 100644
--- a/patches/server/0705-Preserve-overstacked-loot.patch
+++ b/patches/unapplied/server/0705-Preserve-overstacked-loot.patch
diff --git a/patches/server/0706-Update-head-rotation-in-missing-places.patch b/patches/unapplied/server/0706-Update-head-rotation-in-missing-places.patch
index 0ad23dd235..7355b2580d 100644
--- a/patches/server/0706-Update-head-rotation-in-missing-places.patch
+++ b/patches/unapplied/server/0706-Update-head-rotation-in-missing-places.patch
@@ -8,7 +8,7 @@ This is because bukkit uses a separate head rotation field for yaw.
 This issue only applies to players.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index bd50f7bee65337cc15f700d80052c90e19eaf2c2..775ecdec4cec3d7ea291ee8c238a5e3b44fbbf73 100644
+index 43961098f06119a4ad7e2c6c6bdf16901b1e9ff5..aadc101d54a688330ff43ce5a63b65c57566b093 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1911,6 +1911,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0707-prevent-unintended-light-block-manipulation.patch b/patches/unapplied/server/0707-prevent-unintended-light-block-manipulation.patch
index 745b4cd9b5..745b4cd9b5 100644
--- a/patches/server/0707-prevent-unintended-light-block-manipulation.patch
+++ b/patches/unapplied/server/0707-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0708-Fix-CraftCriteria-defaults-map.patch b/patches/unapplied/server/0708-Fix-CraftCriteria-defaults-map.patch
index 3e79bd7fb7..3e79bd7fb7 100644
--- a/patches/server/0708-Fix-CraftCriteria-defaults-map.patch
+++ b/patches/unapplied/server/0708-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0709-Fix-upstreams-block-state-factories.patch b/patches/unapplied/server/0709-Fix-upstreams-block-state-factories.patch
index da98b563f3..da98b563f3 100644
--- a/patches/server/0709-Fix-upstreams-block-state-factories.patch
+++ b/patches/unapplied/server/0709-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0710-Configurable-feature-seeds.patch b/patches/unapplied/server/0710-Configurable-feature-seeds.patch
index 2e7ba7f297..2e7ba7f297 100644
--- a/patches/server/0710-Configurable-feature-seeds.patch
+++ b/patches/unapplied/server/0710-Configurable-feature-seeds.patch
diff --git a/patches/server/0711-Add-root-admin-user-detection.patch b/patches/unapplied/server/0711-Add-root-admin-user-detection.patch
index 8f7dec5ba1..ff1dd9c993 100644
--- a/patches/server/0711-Add-root-admin-user-detection.patch
+++ b/patches/unapplied/server/0711-Add-root-admin-user-detection.patch
@@ -57,7 +57,7 @@ index 0000000000000000000000000000000000000000..6bd0afddbcc461149dfe9a5c7a86fff6
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 51c924f051c25cac8172b0ddab83f3b7a69adfe6..5a0a34ea500607b1370df3e5ee4c1ad64f252449 100644
+index 96de992ea9bc9182ea6a30a33e86d7970b70611b..ab7cd594731aaa7b36f80fde00eada52f9e913a5 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -179,6 +179,16 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0712-Always-allow-item-changing-in-Fireball.patch b/patches/unapplied/server/0712-Always-allow-item-changing-in-Fireball.patch
index f8453901a9..f8453901a9 100644
--- a/patches/server/0712-Always-allow-item-changing-in-Fireball.patch
+++ b/patches/unapplied/server/0712-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0713-don-t-attempt-to-teleport-dead-entities.patch b/patches/unapplied/server/0713-don-t-attempt-to-teleport-dead-entities.patch
index 6a600a86b3..e9dac8b470 100644
--- a/patches/server/0713-don-t-attempt-to-teleport-dead-entities.patch
+++ b/patches/unapplied/server/0713-don-t-attempt-to-teleport-dead-entities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] don't attempt to teleport dead entities
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 775ecdec4cec3d7ea291ee8c238a5e3b44fbbf73..5f77b6851baee35a279d570fba5baacec9278568 100644
+index aadc101d54a688330ff43ce5a63b65c57566b093..21029c7e00f7815ac6f6c8931571e4259ea56742 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -787,7 +787,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0714-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/unapplied/server/0714-Prevent-excessive-velocity-through-repeated-crits.patch
index 3f080e05bc..3f080e05bc 100644
--- a/patches/server/0714-Prevent-excessive-velocity-through-repeated-crits.patch
+++ b/patches/unapplied/server/0714-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0715-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/unapplied/server/0715-Remove-client-side-code-using-deprecated-for-removal.patch
index db5dd67f1b..db5dd67f1b 100644
--- a/patches/server/0715-Remove-client-side-code-using-deprecated-for-removal.patch
+++ b/patches/unapplied/server/0715-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0716-Fix-removing-recipes-from-RecipeIterator.patch b/patches/unapplied/server/0716-Fix-removing-recipes-from-RecipeIterator.patch
index c57379be37..c57379be37 100644
--- a/patches/server/0716-Fix-removing-recipes-from-RecipeIterator.patch
+++ b/patches/unapplied/server/0716-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0717-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/unapplied/server/0717-Prevent-sending-oversized-item-data-in-equipment-and.patch
index 2d07a04363..2d07a04363 100644
--- a/patches/server/0717-Prevent-sending-oversized-item-data-in-equipment-and.patch
+++ b/patches/unapplied/server/0717-Prevent-sending-oversized-item-data-in-equipment-and.patch
diff --git a/patches/server/0718-Hide-unnecessary-itemmeta-from-clients.patch b/patches/unapplied/server/0718-Hide-unnecessary-itemmeta-from-clients.patch
index 1bdad58ffc..1bdad58ffc 100644
--- a/patches/server/0718-Hide-unnecessary-itemmeta-from-clients.patch
+++ b/patches/unapplied/server/0718-Hide-unnecessary-itemmeta-from-clients.patch
diff --git a/patches/server/0719-Fix-Spigot-growth-modifiers.patch b/patches/unapplied/server/0719-Fix-Spigot-growth-modifiers.patch
index 2535a2a265..2535a2a265 100644
--- a/patches/server/0719-Fix-Spigot-growth-modifiers.patch
+++ b/patches/unapplied/server/0719-Fix-Spigot-growth-modifiers.patch
diff --git a/patches/server/0720-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/unapplied/server/0720-Prevent-ContainerOpenersCounter-openCount-from-going.patch
index 62a65ff130..62a65ff130 100644
--- a/patches/server/0720-Prevent-ContainerOpenersCounter-openCount-from-going.patch
+++ b/patches/unapplied/server/0720-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0721-Add-PlayerItemFrameChangeEvent.patch b/patches/unapplied/server/0721-Add-PlayerItemFrameChangeEvent.patch
index 6214bdbdef..6214bdbdef 100644
--- a/patches/server/0721-Add-PlayerItemFrameChangeEvent.patch
+++ b/patches/unapplied/server/0721-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0722-Optimize-HashMapPalette.patch b/patches/unapplied/server/0722-Optimize-HashMapPalette.patch
index 9e2b26701e..9e2b26701e 100644
--- a/patches/server/0722-Optimize-HashMapPalette.patch
+++ b/patches/unapplied/server/0722-Optimize-HashMapPalette.patch
diff --git a/patches/server/0723-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/unapplied/server/0723-Allow-delegation-to-vanilla-chunk-gen.patch
index de93c2dcbb..0bf340fd68 100644
--- a/patches/server/0723-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/unapplied/server/0723-Allow-delegation-to-vanilla-chunk-gen.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow delegation to vanilla chunk gen
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3f83b3e54747c42a1321137bb668c6a457677d05..eccfd44eaeb20db22d77fc85307d2a6caa80a587 100644
+index 443ffc28a387c6d29f841288da1bf93e45f30c9b..dbddca7d3188c7729d276159f2fb05300fdd97ed 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2427,6 +2427,88 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0724-Collision-optimisations.patch b/patches/unapplied/server/0724-Collision-optimisations.patch
index 17b4be9180..d3dc998507 100644
--- a/patches/server/0724-Collision-optimisations.patch
+++ b/patches/unapplied/server/0724-Collision-optimisations.patch
@@ -2239,7 +2239,7 @@ index b06f36138bfda3f9802ee15e57e1895d8fe16c54..9010da755303a9c5bb9a2fbacaf6bcfd
              entityplayer1.setPos(entityplayer1.getX(), entityplayer1.getY() + 1.0D, entityplayer1.getZ());
          }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 5f77b6851baee35a279d570fba5baacec9278568..5177dc096254cf17e61c93ce4f9f0c768730d70b 100644
+index 21029c7e00f7815ac6f6c8931571e4259ea56742..9541025ac61c0f71a4e1550b598b1e6bce278605 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1210,9 +1210,44 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0725-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/unapplied/server/0725-Optimise-collision-checking-in-player-move-packet-ha.patch
index b3b8731f89..b3b8731f89 100644
--- a/patches/server/0725-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/unapplied/server/0725-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/0726-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/unapplied/server/0726-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
index 3302cf5d13..c92ed9b709 100644
--- a/patches/server/0726-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
+++ b/patches/unapplied/server/0726-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix ChunkSnapshot#isSectionEmpty(int) and optimize
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-index b4b2f961d1e4f8b5b199052efefd96bcbfc3e68b..41981307bc7d5bfce99f902290201ddd377dfc22 100644
+index 6dc7e23e96aaffb912611a9dbd41459cb8489056..b6716f2b0037d12fb9956d7d1d0fab9b86cf4433 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 @@ -291,13 +291,17 @@ public class CraftChunk implements Chunk {
diff --git a/patches/server/0727-Add-more-Campfire-API.patch b/patches/unapplied/server/0727-Add-more-Campfire-API.patch
index 61de925634..61de925634 100644
--- a/patches/server/0727-Add-more-Campfire-API.patch
+++ b/patches/unapplied/server/0727-Add-more-Campfire-API.patch
diff --git a/patches/server/0728-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/unapplied/server/0728-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
index 5c74ea64c9..5c74ea64c9 100644
--- a/patches/server/0728-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
+++ b/patches/unapplied/server/0728-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0729-Fix-tripwire-state-inconsistency.patch b/patches/unapplied/server/0729-Fix-tripwire-state-inconsistency.patch
index 8c45070e31..8c45070e31 100644
--- a/patches/server/0729-Fix-tripwire-state-inconsistency.patch
+++ b/patches/unapplied/server/0729-Fix-tripwire-state-inconsistency.patch
diff --git a/patches/server/0730-Forward-CraftEntity-in-teleport-command.patch b/patches/unapplied/server/0730-Forward-CraftEntity-in-teleport-command.patch
index 5cba16fd32..0d0ab002fd 100644
--- a/patches/server/0730-Forward-CraftEntity-in-teleport-command.patch
+++ b/patches/unapplied/server/0730-Forward-CraftEntity-in-teleport-command.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Forward CraftEntity in teleport command
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 5177dc096254cf17e61c93ce4f9f0c768730d70b..d9df2df697d2abbcdb5f7928bb51f1210d71b888 100644
+index 9541025ac61c0f71a4e1550b598b1e6bce278605..2d505eeff4ae0ba7417a2eab4dbe3adb47e3ca3e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3506,6 +3506,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0731-Improve-scoreboard-entries.patch b/patches/unapplied/server/0731-Improve-scoreboard-entries.patch
index a11751b6c8..a11751b6c8 100644
--- a/patches/server/0731-Improve-scoreboard-entries.patch
+++ b/patches/unapplied/server/0731-Improve-scoreboard-entries.patch
diff --git a/patches/server/0732-Entity-powdered-snow-API.patch b/patches/unapplied/server/0732-Entity-powdered-snow-API.patch
index 695d4ee581..b159ea05c5 100644
--- a/patches/server/0732-Entity-powdered-snow-API.patch
+++ b/patches/unapplied/server/0732-Entity-powdered-snow-API.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Entity powdered snow API
 public net.minecraft.world.entity.monster.Skeleton inPowderSnowTime
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index b38e974ee4aa1577860e1b97cc4b05af3c9b1a39..cd2b8fa364ce49054007468ee607bd9a8c741971 100644
+index 0c0e3727cc1d911a9949fcaf6dcd0820b172edc0..b17522b77382e8c781811ee4e176581ee1d40290 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1397,5 +1397,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0733-Add-API-for-item-entity-health.patch b/patches/unapplied/server/0733-Add-API-for-item-entity-health.patch
index dd1d43a643..dd1d43a643 100644
--- a/patches/server/0733-Add-API-for-item-entity-health.patch
+++ b/patches/unapplied/server/0733-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0734-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/unapplied/server/0734-Fix-entity-type-tags-suggestions-in-selectors.patch
index 213b301fc1..213b301fc1 100644
--- a/patches/server/0734-Fix-entity-type-tags-suggestions-in-selectors.patch
+++ b/patches/unapplied/server/0734-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/0735-Configurable-max-block-light-for-monster-spawning.patch b/patches/unapplied/server/0735-Configurable-max-block-light-for-monster-spawning.patch
index 59eb60edd7..59eb60edd7 100644
--- a/patches/server/0735-Configurable-max-block-light-for-monster-spawning.patch
+++ b/patches/unapplied/server/0735-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0736-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/unapplied/server/0736-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
index 913048fffc..913048fffc 100644
--- a/patches/server/0736-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
+++ b/patches/unapplied/server/0736-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0737-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/unapplied/server/0737-Load-effect-amplifiers-greater-than-127-correctly.patch
index b0884e52bd..b0884e52bd 100644
--- a/patches/server/0737-Load-effect-amplifiers-greater-than-127-correctly.patch
+++ b/patches/unapplied/server/0737-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0738-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/unapplied/server/0738-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
index d7ccde8439..d7ccde8439 100644
--- a/patches/server/0738-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
+++ b/patches/unapplied/server/0738-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0739-Fix-bees-aging-inside-hives.patch b/patches/unapplied/server/0739-Fix-bees-aging-inside-hives.patch
index 646f563356..646f563356 100644
--- a/patches/server/0739-Fix-bees-aging-inside-hives.patch
+++ b/patches/unapplied/server/0739-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0740-Bucketable-API.patch b/patches/unapplied/server/0740-Bucketable-API.patch
index 274ccde059..274ccde059 100644
--- a/patches/server/0740-Bucketable-API.patch
+++ b/patches/unapplied/server/0740-Bucketable-API.patch
diff --git a/patches/server/0741-Validate-usernames.patch b/patches/unapplied/server/0741-Validate-usernames.patch
index 4ea7843114..4ea7843114 100644
--- a/patches/server/0741-Validate-usernames.patch
+++ b/patches/unapplied/server/0741-Validate-usernames.patch
diff --git a/patches/server/0742-Make-water-animal-spawn-height-configurable.patch b/patches/unapplied/server/0742-Make-water-animal-spawn-height-configurable.patch
index 9e90672eb5..9e90672eb5 100644
--- a/patches/server/0742-Make-water-animal-spawn-height-configurable.patch
+++ b/patches/unapplied/server/0742-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0743-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/unapplied/server/0743-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index 4821830d4a..4821830d4a 100644
--- a/patches/server/0743-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/unapplied/server/0743-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
diff --git a/patches/server/0744-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/unapplied/server/0744-Add-config-option-for-worlds-affected-by-time-cmd.patch
index 156eacada9..156eacada9 100644
--- a/patches/server/0744-Add-config-option-for-worlds-affected-by-time-cmd.patch
+++ b/patches/unapplied/server/0744-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0745-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/unapplied/server/0745-Add-new-overload-to-PersistentDataContainer-has.patch
index ad9460d017..ad9460d017 100644
--- a/patches/server/0745-Add-new-overload-to-PersistentDataContainer-has.patch
+++ b/patches/unapplied/server/0745-Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/server/0746-Multiple-Entries-with-Scoreboards.patch b/patches/unapplied/server/0746-Multiple-Entries-with-Scoreboards.patch
index d3d92906dd..d3d92906dd 100644
--- a/patches/server/0746-Multiple-Entries-with-Scoreboards.patch
+++ b/patches/unapplied/server/0746-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0747-Reset-placed-block-on-exception.patch b/patches/unapplied/server/0747-Reset-placed-block-on-exception.patch
index 308089d693..308089d693 100644
--- a/patches/server/0747-Reset-placed-block-on-exception.patch
+++ b/patches/unapplied/server/0747-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0748-Add-configurable-height-for-slime-spawn.patch b/patches/unapplied/server/0748-Add-configurable-height-for-slime-spawn.patch
index a9aa51d551..a9aa51d551 100644
--- a/patches/server/0748-Add-configurable-height-for-slime-spawn.patch
+++ b/patches/unapplied/server/0748-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0749-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/unapplied/server/0749-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
index 5d3797471d..5d3797471d 100644
--- a/patches/server/0749-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/unapplied/server/0749-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0750-Fix-xp-reward-for-baby-zombies.patch b/patches/unapplied/server/0750-Fix-xp-reward-for-baby-zombies.patch
index a8293675b5..a8293675b5 100644
--- a/patches/server/0750-Fix-xp-reward-for-baby-zombies.patch
+++ b/patches/unapplied/server/0750-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0751-Kick-on-main-for-illegal-chat.patch b/patches/unapplied/server/0751-Kick-on-main-for-illegal-chat.patch
index da30a2123a..da30a2123a 100644
--- a/patches/server/0751-Kick-on-main-for-illegal-chat.patch
+++ b/patches/unapplied/server/0751-Kick-on-main-for-illegal-chat.patch
diff --git a/patches/server/0752-Multi-Block-Change-API-Implementation.patch b/patches/unapplied/server/0752-Multi-Block-Change-API-Implementation.patch
index fd0dcd7a25..fd0dcd7a25 100644
--- a/patches/server/0752-Multi-Block-Change-API-Implementation.patch
+++ b/patches/unapplied/server/0752-Multi-Block-Change-API-Implementation.patch
diff --git a/patches/server/0753-Fix-NotePlayEvent.patch b/patches/unapplied/server/0753-Fix-NotePlayEvent.patch
index 5104743fbe..5104743fbe 100644
--- a/patches/server/0753-Fix-NotePlayEvent.patch
+++ b/patches/unapplied/server/0753-Fix-NotePlayEvent.patch
diff --git a/patches/server/0754-Freeze-Tick-Lock-API.patch b/patches/unapplied/server/0754-Freeze-Tick-Lock-API.patch
index 379ad1559c..19d47698bb 100644
--- a/patches/server/0754-Freeze-Tick-Lock-API.patch
+++ b/patches/unapplied/server/0754-Freeze-Tick-Lock-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Freeze Tick Lock API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index d9df2df697d2abbcdb5f7928bb51f1210d71b888..8b23d7dcfc4a877ec5332c8fce94db1375a3e2dd 100644
+index 2d505eeff4ae0ba7417a2eab4dbe3adb47e3ca3e..0d3bbf0fd866a375d4db1b1819e0cca5f2d43a1f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -402,6 +402,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -59,7 +59,7 @@ index e0e9a1a0becd4754f4ee1a53e7a91206da22ac45..6aec9841fbb41ba448b7c77723f7081b
  
              if (this.isInPowderSnow && this.canFreeze()) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index cd2b8fa364ce49054007468ee607bd9a8c741971..b9c69703bb41f7d04f95bef27eb0614c5931c326 100644
+index b17522b77382e8c781811ee4e176581ee1d40290..28cda0cc2e179b3f03d4bee3ca6c24c3f831214a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -668,6 +668,17 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0755-Dolphin-API.patch b/patches/unapplied/server/0755-Dolphin-API.patch
index e971f87322..e971f87322 100644
--- a/patches/server/0755-Dolphin-API.patch
+++ b/patches/unapplied/server/0755-Dolphin-API.patch
diff --git a/patches/server/0756-More-PotionEffectType-API.patch b/patches/unapplied/server/0756-More-PotionEffectType-API.patch
index 5103da4ead..5103da4ead 100644
--- a/patches/server/0756-More-PotionEffectType-API.patch
+++ b/patches/unapplied/server/0756-More-PotionEffectType-API.patch
diff --git a/patches/server/0757-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/unapplied/server/0757-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
index 84ed67d62f..9c5ece870b 100644
--- a/patches/server/0757-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
+++ b/patches/unapplied/server/0757-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Use a CHM for StructureTemplate.Pallete cache
 fixes a CME due to this collection being shared across threads
 
 diff --git a/src/main/java/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate.java b/src/main/java/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate.java
-index 9f6feac85e8d7266a419bc8c8e11ef976e8f0f83..b56262bdf817de092e49183cd9ded7da55758873 100644
+index f7b71c01b4ee67cbec4e25a643cb29e7ec7cf660..48dcee0757af22dea954681689bb9fd12315bd37 100644
 --- a/src/main/java/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate.java
 +++ b/src/main/java/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate.java
 @@ -852,7 +852,7 @@ public class StructureTemplate {
diff --git a/patches/server/0758-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/unapplied/server/0758-API-for-creating-command-sender-which-forwards-feedb.patch
index 0abfde5122..4cd5df5c18 100644
--- a/patches/server/0758-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/unapplied/server/0758-API-for-creating-command-sender-which-forwards-feedb.patch
@@ -122,7 +122,7 @@ index 0000000000000000000000000000000000000000..e3a5f1ec376319bdfda87fa27ae217bf
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1152e408dc13a9b54507707d7a34e9c63655f02c..0710929b44d721c1996af57186ff2e66b2c305ab 100644
+index 43877a44ff5c0af7ff4819b63d234af6d9c32b11..c88d51e7ab9068cf2d3ac82a0c84129b7d3af011 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2078,6 +2078,13 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0759-Add-missing-structure-set-seed-configs.patch b/patches/unapplied/server/0759-Add-missing-structure-set-seed-configs.patch
index 619c499781..619c499781 100644
--- a/patches/server/0759-Add-missing-structure-set-seed-configs.patch
+++ b/patches/unapplied/server/0759-Add-missing-structure-set-seed-configs.patch
diff --git a/patches/server/0760-Implement-regenerateChunk.patch b/patches/unapplied/server/0760-Implement-regenerateChunk.patch
index 8098f3a77c..8098f3a77c 100644
--- a/patches/server/0760-Implement-regenerateChunk.patch
+++ b/patches/unapplied/server/0760-Implement-regenerateChunk.patch
diff --git a/patches/server/0761-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/unapplied/server/0761-Fix-cancelled-powdered-snow-bucket-placement.patch
index 21962ca5e6..21962ca5e6 100644
--- a/patches/server/0761-Fix-cancelled-powdered-snow-bucket-placement.patch
+++ b/patches/unapplied/server/0761-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0762-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/unapplied/server/0762-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
index f60a24d4c2..bcf2a9d902 100644
--- a/patches/server/0762-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
+++ b/patches/unapplied/server/0762-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add missing Validate calls to CraftServer#getSpawnLimit
 Copies appropriate checks from CraftWorld#getSpawnLimit
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0710929b44d721c1996af57186ff2e66b2c305ab..51094b7bb864e92c5928008b2db520bf2816bd9a 100644
+index c88d51e7ab9068cf2d3ac82a0c84129b7d3af011..52104be57466bcc08370f784ae57986d1f07998b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2255,6 +2255,8 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0763-Add-GameEvent-tags.patch b/patches/unapplied/server/0763-Add-GameEvent-tags.patch
index ed4ed1ccb8..d095d9effe 100644
--- a/patches/server/0763-Add-GameEvent-tags.patch
+++ b/patches/unapplied/server/0763-Add-GameEvent-tags.patch
@@ -46,7 +46,7 @@ index 0000000000000000000000000000000000000000..e7d9fd2702a1ce96596580fff8f5ee4f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 51094b7bb864e92c5928008b2db520bf2816bd9a..c934b7751c591ece8004f2a25668ddfcc4cd0bc7 100644
+index 52104be57466bcc08370f784ae57986d1f07998b..82dd7501d8118ce106f3c9d52b275cb7ff1f4c86 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2676,6 +2676,15 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0764-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/unapplied/server/0764-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
index 1c13cca49e..1c13cca49e 100644
--- a/patches/server/0764-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
+++ b/patches/unapplied/server/0764-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0765-Furnace-RecipesUsed-API.patch b/patches/unapplied/server/0765-Furnace-RecipesUsed-API.patch
index 075cd97b56..075cd97b56 100644
--- a/patches/server/0765-Furnace-RecipesUsed-API.patch
+++ b/patches/unapplied/server/0765-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0766-Configurable-sculk-sensor-listener-range.patch b/patches/unapplied/server/0766-Configurable-sculk-sensor-listener-range.patch
index ff5a549be0..ff5a549be0 100644
--- a/patches/server/0766-Configurable-sculk-sensor-listener-range.patch
+++ b/patches/unapplied/server/0766-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0767-Add-missing-block-data-mins-and-maxes.patch b/patches/unapplied/server/0767-Add-missing-block-data-mins-and-maxes.patch
index bf5dcd67c2..bf5dcd67c2 100644
--- a/patches/server/0767-Add-missing-block-data-mins-and-maxes.patch
+++ b/patches/unapplied/server/0767-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0768-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/unapplied/server/0768-Option-to-have-default-CustomSpawners-in-custom-worl.patch
index 9a36732d25..9a36732d25 100644
--- a/patches/server/0768-Option-to-have-default-CustomSpawners-in-custom-worl.patch
+++ b/patches/unapplied/server/0768-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0769-Put-world-into-worldlist-before-initing-the-world.patch b/patches/unapplied/server/0769-Put-world-into-worldlist-before-initing-the-world.patch
index bfabb45ba3..de58e4d382 100644
--- a/patches/server/0769-Put-world-into-worldlist-before-initing-the-world.patch
+++ b/patches/unapplied/server/0769-Put-world-into-worldlist-before-initing-the-world.patch
@@ -23,7 +23,7 @@ index ebf31af53f26d33a745badbfc6fa4e7f84aea87d..9f56553b416df71ec60a3327a58d843b
  
              if (worlddata.getCustomBossEvents() != null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c934b7751c591ece8004f2a25668ddfcc4cd0bc7..ca84472f533f980f3ec83de5b0002712f6720581 100644
+index 82dd7501d8118ce106f3c9d52b275cb7ff1f4c86..a6365b196123e9b1b92cb7cd55cf21f4642d09c0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1255,10 +1255,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0770-Fix-Entity-Position-Desync.patch b/patches/unapplied/server/0770-Fix-Entity-Position-Desync.patch
index 1a885e69f8..1a885e69f8 100644
--- a/patches/server/0770-Fix-Entity-Position-Desync.patch
+++ b/patches/unapplied/server/0770-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0771-Custom-Potion-Mixes.patch b/patches/unapplied/server/0771-Custom-Potion-Mixes.patch
index 6fff830011..8d6e3e97be 100644
--- a/patches/server/0771-Custom-Potion-Mixes.patch
+++ b/patches/unapplied/server/0771-Custom-Potion-Mixes.patch
@@ -172,7 +172,7 @@ index 424406d2692856cfd82b6f3b7b6228fa3bd20c2f..c57efcb9a79337ec791e4e8f6671612f
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ca84472f533f980f3ec83de5b0002712f6720581..9df3deb1f3b277f71f0efb692ed23392a1630dd9 100644
+index a6365b196123e9b1b92cb7cd55cf21f4642d09c0..9ac414484838a86d3dc7a1bde74e0e26606736a5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -308,6 +308,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0772-Force-close-world-loading-screen.patch b/patches/unapplied/server/0772-Force-close-world-loading-screen.patch
index d9dd154b5a..d9dd154b5a 100644
--- a/patches/server/0772-Force-close-world-loading-screen.patch
+++ b/patches/unapplied/server/0772-Force-close-world-loading-screen.patch
diff --git a/patches/server/0773-Fix-falling-block-spawn-methods.patch b/patches/unapplied/server/0773-Fix-falling-block-spawn-methods.patch
index e2ebd338cc..e2ebd338cc 100644
--- a/patches/server/0773-Fix-falling-block-spawn-methods.patch
+++ b/patches/unapplied/server/0773-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0774-Expose-furnace-minecart-push-values.patch b/patches/unapplied/server/0774-Expose-furnace-minecart-push-values.patch
index 6245e14b4e..6245e14b4e 100644
--- a/patches/server/0774-Expose-furnace-minecart-push-values.patch
+++ b/patches/unapplied/server/0774-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0775-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/unapplied/server/0775-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
index 9a608358db..9a608358db 100644
--- a/patches/server/0775-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
+++ b/patches/unapplied/server/0775-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0776-More-Projectile-API.patch b/patches/unapplied/server/0776-More-Projectile-API.patch
index 5cf60d9954..5cf60d9954 100644
--- a/patches/server/0776-More-Projectile-API.patch
+++ b/patches/unapplied/server/0776-More-Projectile-API.patch
diff --git a/patches/server/0777-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/unapplied/server/0777-Fix-swamp-hut-cat-generation-deadlock.patch
index b2499e69cc..b2499e69cc 100644
--- a/patches/server/0777-Fix-swamp-hut-cat-generation-deadlock.patch
+++ b/patches/unapplied/server/0777-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0778-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/unapplied/server/0778-Don-t-allow-vehicle-movement-from-players-while-tele.patch
index 62ec01585d..17ad7898aa 100644
--- a/patches/server/0778-Don-t-allow-vehicle-movement-from-players-while-tele.patch
+++ b/patches/unapplied/server/0778-Don-t-allow-vehicle-movement-from-players-while-tele.patch
@@ -7,7 +7,7 @@ Bring the vehicle move packet behavior in line with the
 regular player move packet.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 5dad35d1b38ef4e82d1480ccc04d306dcd6aa9c8..fce18ec126c3019249d2630dce1d8efa9d8f326b 100644
+index 69d72c411ad6d8f9ee35bd71307d088c17564aa0..df0aa82361cc7172c35f01c119912c5a936f19f9 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -463,6 +463,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0779-Implement-getComputedBiome-API.patch b/patches/unapplied/server/0779-Implement-getComputedBiome-API.patch
index 4421a72bbd..c876be4301 100644
--- a/patches/server/0779-Implement-getComputedBiome-API.patch
+++ b/patches/unapplied/server/0779-Implement-getComputedBiome-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement getComputedBiome API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 30a893f7f63961b752e043b81dda20d946cd63aa..57bb76050919d187adef4bfa8b21416a70867d23 100644
+index c21bb08363e35866774871505a32a7c41e12cb45..5a94a06bb531fe7805b43b5033a1d6edeee3b883 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -221,6 +221,13 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
@@ -41,7 +41,7 @@ index 6027b675ca032d7c8f6d43624dcfca69d26849ff..8f588ce8de7304dbb48bca01ed331f65
      public void setBiome(Biome bio) {
          this.getWorld().setBiome(this.getX(), this.getY(), this.getZ(), bio);
 diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CraftLimitedRegion.java b/src/main/java/org/bukkit/craftbukkit/generator/CraftLimitedRegion.java
-index 5830635e96ab9e10320f790f17a3b345c690ff85..881de6bf2edf74783fc3faaf0d6b08e49c32334f 100644
+index bb06ec1a0cee953860ce2933b892c2bdb94608b2..9b6b8eadd10b02e9a3089b3ba6e9a10a7d36c82c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/generator/CraftLimitedRegion.java
 +++ b/src/main/java/org/bukkit/craftbukkit/generator/CraftLimitedRegion.java
 @@ -165,6 +165,14 @@ public class CraftLimitedRegion extends CraftRegionAccessor implements LimitedRe
diff --git a/patches/server/0780-Make-some-itemstacks-nonnull.patch b/patches/unapplied/server/0780-Make-some-itemstacks-nonnull.patch
index 4679d4a859..4679d4a859 100644
--- a/patches/server/0780-Make-some-itemstacks-nonnull.patch
+++ b/patches/unapplied/server/0780-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0781-Implement-enchantWithLevels-API.patch b/patches/unapplied/server/0781-Implement-enchantWithLevels-API.patch
index 03567d8a09..03567d8a09 100644
--- a/patches/server/0781-Implement-enchantWithLevels-API.patch
+++ b/patches/unapplied/server/0781-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0782-Fix-saving-in-unloadWorld.patch b/patches/unapplied/server/0782-Fix-saving-in-unloadWorld.patch
index 8529b67172..3f94c47b75 100644
--- a/patches/server/0782-Fix-saving-in-unloadWorld.patch
+++ b/patches/unapplied/server/0782-Fix-saving-in-unloadWorld.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix saving in unloadWorld
 Change savingDisabled to false to ensure ServerLevel's saving logic gets called when unloadWorld is called with save = true
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9df3deb1f3b277f71f0efb692ed23392a1630dd9..694cea63c676757aac083e9bd541b33e720529a5 100644
+index 9ac414484838a86d3dc7a1bde74e0e26606736a5..099b85c3663285cce34aee8777e933622e07d079 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1303,7 +1303,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0783-Buffer-OOB-setBlock-calls.patch b/patches/unapplied/server/0783-Buffer-OOB-setBlock-calls.patch
index d17173fb30..d17173fb30 100644
--- a/patches/server/0783-Buffer-OOB-setBlock-calls.patch
+++ b/patches/unapplied/server/0783-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0784-Add-TameableDeathMessageEvent.patch b/patches/unapplied/server/0784-Add-TameableDeathMessageEvent.patch
index b08801fd3d..b08801fd3d 100644
--- a/patches/server/0784-Add-TameableDeathMessageEvent.patch
+++ b/patches/unapplied/server/0784-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0785-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/unapplied/server/0785-Fix-new-block-data-for-EntityChangeBlockEvent.patch
index 13a94d9cac..13a94d9cac 100644
--- a/patches/server/0785-Fix-new-block-data-for-EntityChangeBlockEvent.patch
+++ b/patches/unapplied/server/0785-Fix-new-block-data-for-EntityChangeBlockEvent.patch
diff --git a/patches/server/0786-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/unapplied/server/0786-fix-player-loottables-running-when-mob-loot-gamerule.patch
index 7730bb996e..7730bb996e 100644
--- a/patches/server/0786-fix-player-loottables-running-when-mob-loot-gamerule.patch
+++ b/patches/unapplied/server/0786-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff --git a/patches/server/0787-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/unapplied/server/0787-Ensure-entity-passenger-world-matches-ridden-entity.patch
index 91086db186..87b71c3bce 100644
--- a/patches/server/0787-Ensure-entity-passenger-world-matches-ridden-entity.patch
+++ b/patches/unapplied/server/0787-Ensure-entity-passenger-world-matches-ridden-entity.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Ensure entity passenger world matches ridden entity
 Bad plugins doing this would cause some obvious problems...
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 8b23d7dcfc4a877ec5332c8fce94db1375a3e2dd..da90572d7f258ff9035cbae4f85df4e256bebaa1 100644
+index 0d3bbf0fd866a375d4db1b1819e0cca5f2d43a1f..e36a167eb5efe4dab21e7b4e0e804d5ffea12b3a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2820,7 +2820,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0788-Guard-against-invalid-entity-positions.patch b/patches/unapplied/server/0788-Guard-against-invalid-entity-positions.patch
index fe431a5d58..1b4774419f 100644
--- a/patches/server/0788-Guard-against-invalid-entity-positions.patch
+++ b/patches/unapplied/server/0788-Guard-against-invalid-entity-positions.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Guard against invalid entity positions
 Anything not finite should be blocked and logged
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index da90572d7f258ff9035cbae4f85df4e256bebaa1..e00b936d7cc46c5372d8a29a5b97efc44aa3ba4a 100644
+index e36a167eb5efe4dab21e7b4e0e804d5ffea12b3a..82311b1f91af8cf1bfdf6036e5ac4334716dfeaf 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4501,11 +4501,33 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0789-cache-resource-keys.patch b/patches/unapplied/server/0789-cache-resource-keys.patch
index d444813b7a..d444813b7a 100644
--- a/patches/server/0789-cache-resource-keys.patch
+++ b/patches/unapplied/server/0789-cache-resource-keys.patch
diff --git a/patches/server/0790-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/unapplied/server/0790-Allow-to-change-the-podium-for-the-EnderDragon.patch
index 26b7c6f5cf..26b7c6f5cf 100644
--- a/patches/server/0790-Allow-to-change-the-podium-for-the-EnderDragon.patch
+++ b/patches/unapplied/server/0790-Allow-to-change-the-podium-for-the-EnderDragon.patch
diff --git a/patches/server/0791-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/unapplied/server/0791-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
index e9c2bc86cd..c631773db5 100644
--- a/patches/server/0791-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
+++ b/patches/unapplied/server/0791-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
@@ -9,7 +9,7 @@ is not a WorldGenRegion, we can bypass the deadlock entirely.
 See https://bugs.mojang.com/browse/MC-246262
 
 diff --git a/src/main/java/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate.java b/src/main/java/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate.java
-index b56262bdf817de092e49183cd9ded7da55758873..8988fbf5684e85677586d4fd27e21d3c630f3b65 100644
+index 48dcee0757af22dea954681689bb9fd12315bd37..f6002cb6565d5f3f1ed729892ca38c9b5a021387 100644
 --- a/src/main/java/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate.java
 +++ b/src/main/java/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate.java
 @@ -279,7 +279,11 @@ public class StructureTemplate {
diff --git a/patches/server/0792-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/unapplied/server/0792-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
index c7c36d1add..c7c36d1add 100644
--- a/patches/server/0792-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
+++ b/patches/unapplied/server/0792-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
diff --git a/patches/server/0793-Prevent-tile-entity-copies-loading-chunks.patch b/patches/unapplied/server/0793-Prevent-tile-entity-copies-loading-chunks.patch
index 30492bd5ff..30492bd5ff 100644
--- a/patches/server/0793-Prevent-tile-entity-copies-loading-chunks.patch
+++ b/patches/unapplied/server/0793-Prevent-tile-entity-copies-loading-chunks.patch
diff --git a/patches/server/0794-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/unapplied/server/0794-Use-username-instead-of-display-name-in-PlayerList-g.patch
index 098bf69f0e..098bf69f0e 100644
--- a/patches/server/0794-Use-username-instead-of-display-name-in-PlayerList-g.patch
+++ b/patches/unapplied/server/0794-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0795-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/unapplied/server/0795-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
index 7f78aa076d..7f78aa076d 100644
--- a/patches/server/0795-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
+++ b/patches/unapplied/server/0795-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
diff --git a/patches/server/0796-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/unapplied/server/0796-Pass-ServerLevel-for-gamerule-callbacks.patch
index 0f9f02d756..0f9f02d756 100644
--- a/patches/server/0796-Pass-ServerLevel-for-gamerule-callbacks.patch
+++ b/patches/unapplied/server/0796-Pass-ServerLevel-for-gamerule-callbacks.patch
diff --git a/patches/server/0797-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/unapplied/server/0797-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
index 676f145bb4..676f145bb4 100644
--- a/patches/server/0797-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
+++ b/patches/unapplied/server/0797-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/server/0798-WorldCreator-keepSpawnLoaded.patch b/patches/unapplied/server/0798-WorldCreator-keepSpawnLoaded.patch
index a91c469099..259109b250 100644
--- a/patches/server/0798-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/unapplied/server/0798-WorldCreator-keepSpawnLoaded.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] WorldCreator#keepSpawnLoaded
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 694cea63c676757aac083e9bd541b33e720529a5..45f6828ce1d08ec2af4ce2879ea6c75632135f4f 100644
+index 099b85c3663285cce34aee8777e933622e07d079..fc4866d60368b60528dfc3e7cab7892f82680ec7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1250,7 +1250,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0799-Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/unapplied/server/0799-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
index 0510692ca9..0510692ca9 100644
--- a/patches/server/0799-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
+++ b/patches/unapplied/server/0799-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
diff --git a/patches/server/0800-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/unapplied/server/0800-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
index b975775dff..2b662c68c6 100644
--- a/patches/server/0800-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
+++ b/patches/unapplied/server/0800-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Trigger bee_nest_destroyed trigger in the correct place
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 8a8b766d91d9e2328486e3156bd6a408808dc1e3..3fe747fdc4500bd65029446f63e314031d71ed4a 100644
+index 70107194d690eb51d77bc76f0d5830bba087c0b2..6cd4e043de742bd9c84dd6408dc80598aedaa3a4 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -423,12 +423,16 @@ public class ServerPlayerGameMode {
diff --git a/patches/server/0801-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/unapplied/server/0801-Add-EntityDyeEvent-and-CollarColorable-interface.patch
index 76380e425b..76380e425b 100644
--- a/patches/server/0801-Add-EntityDyeEvent-and-CollarColorable-interface.patch
+++ b/patches/unapplied/server/0801-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0802-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/unapplied/server/0802-Fire-CauldronLevelChange-on-initial-fill.patch
index bcc871d7bc..bcc871d7bc 100644
--- a/patches/server/0802-Fire-CauldronLevelChange-on-initial-fill.patch
+++ b/patches/unapplied/server/0802-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0803-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/unapplied/server/0803-fix-powder-snow-cauldrons-not-turning-to-water.patch
index fec28b7e17..fec28b7e17 100644
--- a/patches/server/0803-fix-powder-snow-cauldrons-not-turning-to-water.patch
+++ b/patches/unapplied/server/0803-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0804-Add-PlayerStopUsingItemEvent.patch b/patches/unapplied/server/0804-Add-PlayerStopUsingItemEvent.patch
index 3134b2b297..3134b2b297 100644
--- a/patches/server/0804-Add-PlayerStopUsingItemEvent.patch
+++ b/patches/unapplied/server/0804-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0805-Don-t-tick-markers.patch b/patches/unapplied/server/0805-Don-t-tick-markers.patch
index 48b356285d..1ca6770933 100644
--- a/patches/server/0805-Don-t-tick-markers.patch
+++ b/patches/unapplied/server/0805-Don-t-tick-markers.patch
@@ -23,7 +23,7 @@ index ff99336e0b8131ae161cfa5c4fc83c6905e3dbc8..5f43aedc6596e2b1ac7af97115157147
                  }
              });
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 38931091d573059d7e265fd86a704b96f48bdc48..8f4d7e1878f34d56de7447ec39c794e1246008bc 100644
+index 9cc9815aab6d0548c45e380ad3a90130c1d731d7..990e05590e0de258ae8b03335b2d888bc6be0229 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2552,6 +2552,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0806-Expand-FallingBlock-API.patch b/patches/unapplied/server/0806-Expand-FallingBlock-API.patch
index 69b20741d3..69b20741d3 100644
--- a/patches/server/0806-Expand-FallingBlock-API.patch
+++ b/patches/unapplied/server/0806-Expand-FallingBlock-API.patch
diff --git a/patches/server/0807-Do-not-accept-invalid-client-settings.patch b/patches/unapplied/server/0807-Do-not-accept-invalid-client-settings.patch
index 37641891a3..37641891a3 100644
--- a/patches/server/0807-Do-not-accept-invalid-client-settings.patch
+++ b/patches/unapplied/server/0807-Do-not-accept-invalid-client-settings.patch
diff --git a/patches/server/0808-Add-support-for-Proxy-Protocol.patch b/patches/unapplied/server/0808-Add-support-for-Proxy-Protocol.patch
index 30de84af65..08473c1815 100644
--- a/patches/server/0808-Add-support-for-Proxy-Protocol.patch
+++ b/patches/unapplied/server/0808-Add-support-for-Proxy-Protocol.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add support for Proxy Protocol
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 6da6120bc37b573a5398f1593b72ffc7f569682b..79beac737c17412913983614bd478d33e3c6ed58 100644
+index 0a98693535b55e03abd158f5c469d2eada80650f..64479f0a892d6847f987d844efe282a6080d607b 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -30,6 +30,7 @@ dependencies {
diff --git a/patches/server/0809-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/unapplied/server/0809-Fix-OfflinePlayer-getBedSpawnLocation.patch
index ed4f98caf0..7d9e9d920f 100644
--- a/patches/server/0809-Fix-OfflinePlayer-getBedSpawnLocation.patch
+++ b/patches/unapplied/server/0809-Fix-OfflinePlayer-getBedSpawnLocation.patch
@@ -8,7 +8,7 @@ instance of CraftOfflinePlayer the world was incorrect
 due to the logic for reading the NBT not being up-to-date.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-index ffc813934e719129d3805a2a181093c45db7cc71..9e01ef76bc6d18ab622fbec729f8bde3aa8d3e41 100644
+index 5f590575f95eff8bf0cdcafde7dee0e3c7fc30ad..a0fcd11e6b0ca2a7055a4d1910124b20bd9c0b94 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 @@ -36,6 +36,7 @@ import org.bukkit.profile.PlayerProfile;
diff --git a/patches/server/0810-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/unapplied/server/0810-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
index 59fabed7e4..59fabed7e4 100644
--- a/patches/server/0810-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
+++ b/patches/unapplied/server/0810-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0811-Sanitize-Sent-BlockEntity-NBT.patch b/patches/unapplied/server/0811-Sanitize-Sent-BlockEntity-NBT.patch
index b3404362f9..b3404362f9 100644
--- a/patches/server/0811-Sanitize-Sent-BlockEntity-NBT.patch
+++ b/patches/unapplied/server/0811-Sanitize-Sent-BlockEntity-NBT.patch
diff --git a/patches/server/0812-Disable-component-selector-resolving-in-books-by-def.patch b/patches/unapplied/server/0812-Disable-component-selector-resolving-in-books-by-def.patch
index 72862c20c5..72862c20c5 100644
--- a/patches/server/0812-Disable-component-selector-resolving-in-books-by-def.patch
+++ b/patches/unapplied/server/0812-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0813-Prevent-entity-loading-causing-async-lookups.patch b/patches/unapplied/server/0813-Prevent-entity-loading-causing-async-lookups.patch
index 36c50cdc6b..00b5ed1faf 100644
--- a/patches/server/0813-Prevent-entity-loading-causing-async-lookups.patch
+++ b/patches/unapplied/server/0813-Prevent-entity-loading-causing-async-lookups.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent entity loading causing async lookups
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e00b936d7cc46c5372d8a29a5b97efc44aa3ba4a..291d6701045acf96b3174fe877f1425fc1cbad88 100644
+index 82311b1f91af8cf1bfdf6036e5ac4334716dfeaf..31d4c3627230f27b955348828d86e86b28ed02e6 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -796,6 +796,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0814-Throw-exception-on-world-create-while-being-ticked.patch b/patches/unapplied/server/0814-Throw-exception-on-world-create-while-being-ticked.patch
index 3c32ef7d50..ec69d526bf 100644
--- a/patches/server/0814-Throw-exception-on-world-create-while-being-ticked.patch
+++ b/patches/unapplied/server/0814-Throw-exception-on-world-create-while-being-ticked.patch
@@ -45,7 +45,7 @@ index 18041f137157ca95639c0511f225bbb58356fe2b..47c984495a66fdbb10dea6bab33da78f
          this.profiler.popPush("connection");
          MinecraftTimings.connectionTimer.startTiming(); // Spigot
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 45f6828ce1d08ec2af4ce2879ea6c75632135f4f..7405101ee0f499e7d49bc723fcc5be55d0c3ff6f 100644
+index fc4866d60368b60528dfc3e7cab7892f82680ec7..5c84ce0ec10d00a0c36b2e2fa66ca7387139efda 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -878,6 +878,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0815-Add-Alternate-Current-redstone-implementation.patch b/patches/unapplied/server/0815-Add-Alternate-Current-redstone-implementation.patch
index 1fc17d2b19..370be3b183 100644
--- a/patches/server/0815-Add-Alternate-Current-redstone-implementation.patch
+++ b/patches/unapplied/server/0815-Add-Alternate-Current-redstone-implementation.patch
@@ -2008,7 +2008,7 @@ index 0000000000000000000000000000000000000000..33cd90c30c22200a4e1ae64f40a0bf78
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 8f4d7e1878f34d56de7447ec39c794e1246008bc..eb81f8340d4e1dd87003db943516d1d1bdc1cdbf 100644
+index 990e05590e0de258ae8b03335b2d888bc6be0229..244601cd37006b8abdf5bf9dd849d54c24928499 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -222,6 +222,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0816-Dont-resent-entity-on-art-update.patch b/patches/unapplied/server/0816-Dont-resent-entity-on-art-update.patch
index 38d1a4ca58..38d1a4ca58 100644
--- a/patches/server/0816-Dont-resent-entity-on-art-update.patch
+++ b/patches/unapplied/server/0816-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0817-Add-WardenAngerChangeEvent.patch b/patches/unapplied/server/0817-Add-WardenAngerChangeEvent.patch
index eb11b51339..eb11b51339 100644
--- a/patches/server/0817-Add-WardenAngerChangeEvent.patch
+++ b/patches/unapplied/server/0817-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0818-Add-option-for-strict-advancement-dimension-checks.patch b/patches/unapplied/server/0818-Add-option-for-strict-advancement-dimension-checks.patch
index 919ba3b905..919ba3b905 100644
--- a/patches/server/0818-Add-option-for-strict-advancement-dimension-checks.patch
+++ b/patches/unapplied/server/0818-Add-option-for-strict-advancement-dimension-checks.patch
diff --git a/patches/server/0819-Add-missing-important-BlockStateListPopulator-method.patch b/patches/unapplied/server/0819-Add-missing-important-BlockStateListPopulator-method.patch
index c18323e95f..c18323e95f 100644
--- a/patches/server/0819-Add-missing-important-BlockStateListPopulator-method.patch
+++ b/patches/unapplied/server/0819-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0820-Nameable-Banner-API.patch b/patches/unapplied/server/0820-Nameable-Banner-API.patch
index 351d3597e0..351d3597e0 100644
--- a/patches/server/0820-Nameable-Banner-API.patch
+++ b/patches/unapplied/server/0820-Nameable-Banner-API.patch
diff --git a/patches/server/0821-Don-t-broadcast-messages-to-command-blocks.patch b/patches/unapplied/server/0821-Don-t-broadcast-messages-to-command-blocks.patch
index 0feaf1bbdd..5025c61620 100644
--- a/patches/server/0821-Don-t-broadcast-messages-to-command-blocks.patch
+++ b/patches/unapplied/server/0821-Don-t-broadcast-messages-to-command-blocks.patch
@@ -20,7 +20,7 @@ index e05eb08a9c229b371887676da510df948b896a85..ceeedbd88c56c08ec8b047c9ca2f14cc
              Date date = new Date();
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7405101ee0f499e7d49bc723fcc5be55d0c3ff6f..73442cb5ae468b0a342d5f8ffe3e5539172fb3e8 100644
+index 5c84ce0ec10d00a0c36b2e2fa66ca7387139efda..8148d1cddc6f062cfc3938f2b185be0ed3afe3ab 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1840,7 +1840,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0822-Prevent-empty-items-from-being-added-to-world.patch b/patches/unapplied/server/0822-Prevent-empty-items-from-being-added-to-world.patch
index 6ba582fff8..1dbf234136 100644
--- a/patches/server/0822-Prevent-empty-items-from-being-added-to-world.patch
+++ b/patches/unapplied/server/0822-Prevent-empty-items-from-being-added-to-world.patch
@@ -7,7 +7,7 @@ The previous solution caused a bunch of bandaid fixes inorder to resolve edge ca
 Just simply prevent them from being added to the world instead.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index eb81f8340d4e1dd87003db943516d1d1bdc1cdbf..6b923585821a252943ea6a765c3b02217eb7a21e 100644
+index 244601cd37006b8abdf5bf9dd849d54c24928499..1f1cdf5516eab738e5d434eb5f2933ff3d7a1359 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1559,6 +1559,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0823-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/unapplied/server/0823-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
index 5816232b91..5816232b91 100644
--- a/patches/server/0823-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
+++ b/patches/unapplied/server/0823-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0824-Add-Player-getFishHook.patch b/patches/unapplied/server/0824-Add-Player-getFishHook.patch
index 8823cf2f88..8823cf2f88 100644
--- a/patches/server/0824-Add-Player-getFishHook.patch
+++ b/patches/unapplied/server/0824-Add-Player-getFishHook.patch
diff --git a/patches/server/0825-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/unapplied/server/0825-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
index 3956916b04..3956916b04 100644
--- a/patches/server/0825-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
+++ b/patches/unapplied/server/0825-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0826-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/unapplied/server/0826-Add-various-missing-EntityDropItemEvent-calls.patch
index ad46611a69..fd440d0178 100644
--- a/patches/server/0826-Add-various-missing-EntityDropItemEvent-calls.patch
+++ b/patches/unapplied/server/0826-Add-various-missing-EntityDropItemEvent-calls.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add various missing EntityDropItemEvent calls
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 291d6701045acf96b3174fe877f1425fc1cbad88..c328c90ad346e1f631490526d65b86abdc6b6282 100644
+index 31d4c3627230f27b955348828d86e86b28ed02e6..ba787852ba551130d3200b6f930861c7c35fe7c0 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2672,6 +2672,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0827-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/unapplied/server/0827-Add-some-minimal-debug-information-to-chat-packet-er.patch
index 7ae9ebbdd4..7ae9ebbdd4 100644
--- a/patches/server/0827-Add-some-minimal-debug-information-to-chat-packet-er.patch
+++ b/patches/unapplied/server/0827-Add-some-minimal-debug-information-to-chat-packet-er.patch
diff --git a/patches/server/0828-Fix-Bee-flower-NPE.patch b/patches/unapplied/server/0828-Fix-Bee-flower-NPE.patch
index bbc40a996b..bbc40a996b 100644
--- a/patches/server/0828-Fix-Bee-flower-NPE.patch
+++ b/patches/unapplied/server/0828-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0829-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/unapplied/server/0829-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
index 66722589c2..66722589c2 100644
--- a/patches/server/0829-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
+++ b/patches/unapplied/server/0829-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
diff --git a/patches/server/0830-More-Teleport-API.patch b/patches/unapplied/server/0830-More-Teleport-API.patch
index ba7ea43504..ba7ea43504 100644
--- a/patches/server/0830-More-Teleport-API.patch
+++ b/patches/unapplied/server/0830-More-Teleport-API.patch
diff --git a/patches/server/0831-Add-EntityPortalReadyEvent.patch b/patches/unapplied/server/0831-Add-EntityPortalReadyEvent.patch
index 7dc5937171..cbc5fd7f5e 100644
--- a/patches/server/0831-Add-EntityPortalReadyEvent.patch
+++ b/patches/unapplied/server/0831-Add-EntityPortalReadyEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add EntityPortalReadyEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c328c90ad346e1f631490526d65b86abdc6b6282..45178d204a79eb47b36adf6e4dfa17d71c6b2c3a 100644
+index ba787852ba551130d3200b6f930861c7c35fe7c0..ce765fbe067d56ce0e5ae0bfade01f3b50e004be 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3074,6 +3074,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0832-Don-t-use-level-random-in-entity-constructors.patch b/patches/unapplied/server/0832-Don-t-use-level-random-in-entity-constructors.patch
index 380c4d5c5d..380c4d5c5d 100644
--- a/patches/server/0832-Don-t-use-level-random-in-entity-constructors.patch
+++ b/patches/unapplied/server/0832-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0833-Send-block-entities-after-destroy-prediction.patch b/patches/unapplied/server/0833-Send-block-entities-after-destroy-prediction.patch
index 7ecc3ce4c8..4e4fdd357f 100644
--- a/patches/server/0833-Send-block-entities-after-destroy-prediction.patch
+++ b/patches/unapplied/server/0833-Send-block-entities-after-destroy-prediction.patch
@@ -7,7 +7,7 @@ Minecraft's prediction system does not handle block entities, so if we are manua
 block breaking we need to set it after the prediction is finished. This fixes block entities not showing when cancelling the BlockBreakEvent.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 3fe747fdc4500bd65029446f63e314031d71ed4a..19573bfb05d7f9641964c76e6670e4a7658a1bbd 100644
+index 6cd4e043de742bd9c84dd6408dc80598aedaa3a4..b965df96bd92c0e3ab20f46f5a3712fcb0fb9fce 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -62,6 +62,8 @@ public class ServerPlayerGameMode {
diff --git a/patches/server/0834-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/unapplied/server/0834-Warn-on-plugins-accessing-faraway-chunks.patch
index ad5f6ed830..ad5f6ed830 100644
--- a/patches/server/0834-Warn-on-plugins-accessing-faraway-chunks.patch
+++ b/patches/unapplied/server/0834-Warn-on-plugins-accessing-faraway-chunks.patch
diff --git a/patches/server/0835-Custom-Chat-Completion-Suggestions-API.patch b/patches/unapplied/server/0835-Custom-Chat-Completion-Suggestions-API.patch
index 94ccf0b6a5..9608ba1c46 100644
--- a/patches/server/0835-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/unapplied/server/0835-Custom-Chat-Completion-Suggestions-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Custom Chat Completion Suggestions API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3f31fca8d1bbbcd62d72c3d8ce47237aff2a326d..0d8bdc59e8b900fc39234aaeb9b0faa97c71ec33 100644
+index 2b4f34e5889bac44f724935b6e1fc330a75bd9d6..337dbf8e5a2537e1d617d355a9a0f79171a69524 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -642,6 +642,24 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0836-Add-and-fix-missing-BlockFadeEvents.patch b/patches/unapplied/server/0836-Add-and-fix-missing-BlockFadeEvents.patch
index dd7008cfb5..dd7008cfb5 100644
--- a/patches/server/0836-Add-and-fix-missing-BlockFadeEvents.patch
+++ b/patches/unapplied/server/0836-Add-and-fix-missing-BlockFadeEvents.patch
diff --git a/patches/server/0837-Collision-API.patch b/patches/unapplied/server/0837-Collision-API.patch
index efa8916419..590aa862ed 100644
--- a/patches/server/0837-Collision-API.patch
+++ b/patches/unapplied/server/0837-Collision-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Collision API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 57bb76050919d187adef4bfa8b21416a70867d23..254cdf5efe85583c5ef126d46af7c5246daa97c2 100644
+index 5a94a06bb531fe7805b43b5033a1d6edeee3b883..8cc1d7f5c5f8e9b9d6f7ab26025acf7237262959 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -1021,5 +1021,12 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
@@ -22,7 +22,7 @@ index 57bb76050919d187adef4bfa8b21416a70867d23..254cdf5efe85583c5ef126d46af7c524
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 706eeebe3ebbecd431c42140e7f351d5f7faf032..53bda7a59a3abf6f99a044df5f2c44bedf1af501 100644
+index e02c454ba75f440342d85b466426b9363992d923..4199bc76c1f304e19fa7c3b7763d31b56a57221b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1435,4 +1435,19 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0838-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/unapplied/server/0838-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
index bffcadeb49..bffcadeb49 100644
--- a/patches/server/0838-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
+++ b/patches/unapplied/server/0838-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0839-Block-Ticking-API.patch b/patches/unapplied/server/0839-Block-Ticking-API.patch
index 4511a8454a..4511a8454a 100644
--- a/patches/server/0839-Block-Ticking-API.patch
+++ b/patches/unapplied/server/0839-Block-Ticking-API.patch
diff --git a/patches/server/0840-Add-Velocity-IP-Forwarding-Support.patch b/patches/unapplied/server/0840-Add-Velocity-IP-Forwarding-Support.patch
index 6703fca5b1..88aa921852 100644
--- a/patches/server/0840-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/unapplied/server/0840-Add-Velocity-IP-Forwarding-Support.patch
@@ -95,7 +95,7 @@ index 0000000000000000000000000000000000000000..a34381122de53123169927e181df6628
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 321675996b83fbe34d7e0d690eafe170d7466e17..2b5d82fbf4e7ec32d0c53dd3e8207b1dba708bbd 100644
+index 72c685ed3ece3752e34fc0ae25c7278ec131a505..4454944ba851216c8c88fe76ee910a2da52a2292 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -274,13 +274,20 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -215,7 +215,7 @@ index 5ff49a0f2f42b63d606c7d9205c0e63fe39e163f..aac84898d2563bfb45c7d0884d65be23
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 73442cb5ae468b0a342d5f8ffe3e5539172fb3e8..64c3eafd2b676938017b43bf46ea6a0e0f324fd6 100644
+index 8148d1cddc6f062cfc3938f2b185be0ed3afe3ab..7376d3acb27edd7209916e9e9df4ce9b9514e50c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -807,7 +807,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0841-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/unapplied/server/0841-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
index c067fd1eaf..c067fd1eaf 100644
--- a/patches/server/0841-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
+++ b/patches/unapplied/server/0841-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
diff --git a/patches/server/0842-Add-NamespacedKey-biome-methods.patch b/patches/unapplied/server/0842-Add-NamespacedKey-biome-methods.patch
index 6c282cba3f..6c282cba3f 100644
--- a/patches/server/0842-Add-NamespacedKey-biome-methods.patch
+++ b/patches/unapplied/server/0842-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0843-Fix-plugin-loggers-on-server-shutdown.patch b/patches/unapplied/server/0843-Fix-plugin-loggers-on-server-shutdown.patch
index a3c6981860..84e13de76c 100644
--- a/patches/server/0843-Fix-plugin-loggers-on-server-shutdown.patch
+++ b/patches/unapplied/server/0843-Fix-plugin-loggers-on-server-shutdown.patch
@@ -49,7 +49,7 @@ index 47c984495a66fdbb10dea6bab33da78f4ab70a38..ebc35224004375b77039342926876a40
          // Paper end - move final shutdown items here
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 9d7905b7f93d33700045c18b8ccecb7426cb30a7..c8ae7b3eab18cc9e7be4e92200fb3ac345216357 100644
+index 334743a8c82bbcb2f09d0919fc9597750a25b8dd..ab4cf79e297ada08a0a5e2cbf294a70f9e87c635 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -18,6 +18,12 @@ public class Main {
diff --git a/patches/server/0844-Stop-large-look-changes-from-crashing-the-server.patch b/patches/unapplied/server/0844-Stop-large-look-changes-from-crashing-the-server.patch
index 9c3d5e3b5f..9c3d5e3b5f 100644
--- a/patches/server/0844-Stop-large-look-changes-from-crashing-the-server.patch
+++ b/patches/unapplied/server/0844-Stop-large-look-changes-from-crashing-the-server.patch
diff --git a/patches/server/0845-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/unapplied/server/0845-Fire-EntityChangeBlockEvent-in-more-places.patch
index 4f0d9f51f2..4f0d9f51f2 100644
--- a/patches/server/0845-Fire-EntityChangeBlockEvent-in-more-places.patch
+++ b/patches/unapplied/server/0845-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0846-Missing-eating-regain-reason.patch b/patches/unapplied/server/0846-Missing-eating-regain-reason.patch
index e04644ebf1..e04644ebf1 100644
--- a/patches/server/0846-Missing-eating-regain-reason.patch
+++ b/patches/unapplied/server/0846-Missing-eating-regain-reason.patch
diff --git a/patches/server/0847-Missing-effect-cause.patch b/patches/unapplied/server/0847-Missing-effect-cause.patch
index c5a77c1456..c5a77c1456 100644
--- a/patches/server/0847-Missing-effect-cause.patch
+++ b/patches/unapplied/server/0847-Missing-effect-cause.patch
diff --git a/patches/server/0848-Added-byte-array-serialization-deserialization-for-P.patch b/patches/unapplied/server/0848-Added-byte-array-serialization-deserialization-for-P.patch
index 3e6734569e..3e6734569e 100644
--- a/patches/server/0848-Added-byte-array-serialization-deserialization-for-P.patch
+++ b/patches/unapplied/server/0848-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0849-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/unapplied/server/0849-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
index f0cff17ef6..f0cff17ef6 100644
--- a/patches/server/0849-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
+++ b/patches/unapplied/server/0849-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/server/0850-Call-BlockPhysicsEvent-more-often.patch b/patches/unapplied/server/0850-Call-BlockPhysicsEvent-more-often.patch
index ea04c3e249..ea04c3e249 100644
--- a/patches/server/0850-Call-BlockPhysicsEvent-more-often.patch
+++ b/patches/unapplied/server/0850-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0851-Configurable-chat-thread-limit.patch b/patches/unapplied/server/0851-Configurable-chat-thread-limit.patch
index 5e312d3a14..5e312d3a14 100644
--- a/patches/server/0851-Configurable-chat-thread-limit.patch
+++ b/patches/unapplied/server/0851-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0852-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/unapplied/server/0852-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
index 764d46a061..764d46a061 100644
--- a/patches/server/0852-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
+++ b/patches/unapplied/server/0852-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0853-fix-Jigsaw-block-kicking-user.patch b/patches/unapplied/server/0853-fix-Jigsaw-block-kicking-user.patch
index 6206d8d028..6206d8d028 100644
--- a/patches/server/0853-fix-Jigsaw-block-kicking-user.patch
+++ b/patches/unapplied/server/0853-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0854-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/unapplied/server/0854-use-BlockFormEvent-for-mud-converting-into-clay.patch
index 39be29edef..39be29edef 100644
--- a/patches/server/0854-use-BlockFormEvent-for-mud-converting-into-clay.patch
+++ b/patches/unapplied/server/0854-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0855-Add-getDrops-to-BlockState.patch b/patches/unapplied/server/0855-Add-getDrops-to-BlockState.patch
index f1c9e20197..f1c9e20197 100644
--- a/patches/server/0855-Add-getDrops-to-BlockState.patch
+++ b/patches/unapplied/server/0855-Add-getDrops-to-BlockState.patch
diff --git a/patches/server/0856-Fix-a-bunch-of-vanilla-bugs.patch b/patches/unapplied/server/0856-Fix-a-bunch-of-vanilla-bugs.patch
index 87541bf4c7..199e551422 100644
--- a/patches/server/0856-Fix-a-bunch-of-vanilla-bugs.patch
+++ b/patches/unapplied/server/0856-Fix-a-bunch-of-vanilla-bugs.patch
@@ -164,7 +164,7 @@ index fdd8ae699ebffcce391321d0c0d48a2bf171de12..0d8d17c03af1ebe033f4e3a4743e018b
              while (!world.noCollision(this, this.getBoundingBox(), true) && this.getY() < (double) (world.getMaxBuildHeight() - 1)) { // Paper - make sure this loads chunks, we default to NOT loading now
                  this.setPos(this.getX(), this.getY() + 1.0D, this.getZ());
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 19573bfb05d7f9641964c76e6670e4a7658a1bbd..25cbbc714e86c11dcf05329430a83bba2cd05364 100644
+index b965df96bd92c0e3ab20f46f5a3712fcb0fb9fce..411215e353d89f49b52c74de7b0ca99c8b776cdb 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -92,7 +92,7 @@ public class ServerPlayerGameMode {
diff --git a/patches/server/0857-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/unapplied/server/0857-Remove-unnecessary-onTrackingStart-during-navigation.patch
index 17bbabc57b..01440eb492 100644
--- a/patches/server/0857-Remove-unnecessary-onTrackingStart-during-navigation.patch
+++ b/patches/unapplied/server/0857-Remove-unnecessary-onTrackingStart-during-navigation.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Remove unnecessary onTrackingStart during navigation warning
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 008b0944dba1622e682ee21637273fb87f93dd37..2ef076900edc35b6a0beac4e6f7ee4a7f255671c 100644
+index c5f0439133f3ab609324f21f68027edebed049c5..45b41d000bae08125ea8e6fb39b9f9fc037a6137 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2588,7 +2588,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0858-Fix-custom-piglin-loved-items.patch b/patches/unapplied/server/0858-Fix-custom-piglin-loved-items.patch
index 41c934194f..41c934194f 100644
--- a/patches/server/0858-Fix-custom-piglin-loved-items.patch
+++ b/patches/unapplied/server/0858-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0859-EntityPickupItemEvent-fixes.patch b/patches/unapplied/server/0859-EntityPickupItemEvent-fixes.patch
index ac3383dced..ac3383dced 100644
--- a/patches/server/0859-EntityPickupItemEvent-fixes.patch
+++ b/patches/unapplied/server/0859-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0860-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/unapplied/server/0860-Correctly-handle-interactions-with-items-on-cooldown.patch
index c01b2a2d60..355445bded 100644
--- a/patches/server/0860-Correctly-handle-interactions-with-items-on-cooldown.patch
+++ b/patches/unapplied/server/0860-Correctly-handle-interactions-with-items-on-cooldown.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Correctly handle interactions with items on cooldown
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 25cbbc714e86c11dcf05329430a83bba2cd05364..4b1af7bba3ce10a1247bb61535456510e18da2d9 100644
+index 411215e353d89f49b52c74de7b0ca99c8b776cdb..e8ad6a1e497f399c5d8cd6a6ec192ddc932e3fb9 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -516,6 +516,7 @@ public class ServerPlayerGameMode {
diff --git a/patches/server/0861-Add-PlayerInventorySlotChangeEvent.patch b/patches/unapplied/server/0861-Add-PlayerInventorySlotChangeEvent.patch
index a39e739eaa..b78b0f44e3 100644
--- a/patches/server/0861-Add-PlayerInventorySlotChangeEvent.patch
+++ b/patches/unapplied/server/0861-Add-PlayerInventorySlotChangeEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerInventorySlotChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index fdd8ae699ebffcce391321d0c0d48a2bf171de12..cd0f542a04ba23fc1bc3ac0a5a1910874f9d7c2c 100644
+index 0d8d17c03af1ebe033f4e3a4743e018bd819efdb..04961c33f4d89c491c5b6eb2a53b948feca17807 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -372,6 +372,25 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0862-Elder-Guardian-appearance-API.patch b/patches/unapplied/server/0862-Elder-Guardian-appearance-API.patch
index 902812d23d..902812d23d 100644
--- a/patches/server/0862-Elder-Guardian-appearance-API.patch
+++ b/patches/unapplied/server/0862-Elder-Guardian-appearance-API.patch
diff --git a/patches/server/0863-Allow-changing-bed-s-occupied-property.patch b/patches/unapplied/server/0863-Allow-changing-bed-s-occupied-property.patch
index f1d50caf78..f1d50caf78 100644
--- a/patches/server/0863-Allow-changing-bed-s-occupied-property.patch
+++ b/patches/unapplied/server/0863-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0864-Add-entity-knockback-API.patch b/patches/unapplied/server/0864-Add-entity-knockback-API.patch
index 484fa604b3..725aa8ba1e 100644
--- a/patches/server/0864-Add-entity-knockback-API.patch
+++ b/patches/unapplied/server/0864-Add-entity-knockback-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add entity knockback API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index b6723468156cf500e6ae3def456e1d82589ab4ee..8924dc5c5291fdd8557eca95a5ae7d4a204cd3e7 100644
+index c9396a55fddba47124ad5aebe7f816d99a03659c..1de9516fc3b6decca250b103abf85a4a8dcea6b2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -1032,5 +1032,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0865-Detect-headless-JREs.patch b/patches/unapplied/server/0865-Detect-headless-JREs.patch
index 21cb522e88..21cb522e88 100644
--- a/patches/server/0865-Detect-headless-JREs.patch
+++ b/patches/unapplied/server/0865-Detect-headless-JREs.patch
diff --git a/patches/server/0866-fixed-entity-vehicle-collision-event-not-called.patch b/patches/unapplied/server/0866-fixed-entity-vehicle-collision-event-not-called.patch
index ebd0cc3b2c..ebd0cc3b2c 100644
--- a/patches/server/0866-fixed-entity-vehicle-collision-event-not-called.patch
+++ b/patches/unapplied/server/0866-fixed-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0867-optimized-dirt-and-snow-spreading.patch b/patches/unapplied/server/0867-optimized-dirt-and-snow-spreading.patch
index 08a3761309..08a3761309 100644
--- a/patches/server/0867-optimized-dirt-and-snow-spreading.patch
+++ b/patches/unapplied/server/0867-optimized-dirt-and-snow-spreading.patch
diff --git a/patches/server/0868-Added-EntityToggleSitEvent.patch b/patches/unapplied/server/0868-Added-EntityToggleSitEvent.patch
index 31eaca5429..31eaca5429 100644
--- a/patches/server/0868-Added-EntityToggleSitEvent.patch
+++ b/patches/unapplied/server/0868-Added-EntityToggleSitEvent.patch
diff --git a/patches/server/0869-Add-fire-tick-delay-option.patch b/patches/unapplied/server/0869-Add-fire-tick-delay-option.patch
index 7649d101c9..7649d101c9 100644
--- a/patches/server/0869-Add-fire-tick-delay-option.patch
+++ b/patches/unapplied/server/0869-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0870-Add-Moving-Piston-API.patch b/patches/unapplied/server/0870-Add-Moving-Piston-API.patch
index b0b64257f1..b0b64257f1 100644
--- a/patches/server/0870-Add-Moving-Piston-API.patch
+++ b/patches/unapplied/server/0870-Add-Moving-Piston-API.patch
diff --git a/patches/server/0871-Ignore-impossible-spawn-tick.patch b/patches/unapplied/server/0871-Ignore-impossible-spawn-tick.patch
index 7e2918d8ae..d793df84a4 100644
--- a/patches/server/0871-Ignore-impossible-spawn-tick.patch
+++ b/patches/unapplied/server/0871-Ignore-impossible-spawn-tick.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ignore impossible spawn tick
 
 
 diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-index 9284c550ab2fe21331986a70eac414147662003d..1279132e2fb3e8f64f062df0ac8b8197f9d8f343 100644
+index e4a5871d8f07e2b4c12b94b6372afe3a34b13071..6eca4a9b3cf462a4d18f32619bbcdfda0fa2ebc5 100644
 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
 @@ -96,6 +96,7 @@ public abstract class BaseSpawner {
diff --git a/patches/server/0872-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/unapplied/server/0872-Track-projectile-source-for-fireworks-from-dispenser.patch
index fe9f8e5826..fe9f8e5826 100644
--- a/patches/server/0872-Track-projectile-source-for-fireworks-from-dispenser.patch
+++ b/patches/unapplied/server/0872-Track-projectile-source-for-fireworks-from-dispenser.patch
diff --git a/patches/server/0873-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/unapplied/server/0873-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
index a840f9a576..a840f9a576 100644
--- a/patches/server/0873-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
+++ b/patches/unapplied/server/0873-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0874-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/unapplied/server/0874-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
index 0e7507d0b8..4cdf356e6f 100644
--- a/patches/server/0874-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
+++ b/patches/unapplied/server/0874-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix EntityCombustEvent cancellation cant fully prevent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 45178d204a79eb47b36adf6e4dfa17d71c6b2c3a..f402f9c530b9c98ea6295ba88ed0179ff7670986 100644
+index ce765fbe067d56ce0e5ae0bfade01f3b50e004be..a8750ba7720896685f9956194e43bb83a97670a8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3353,6 +3353,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0875-Prevent-compass-from-loading-chunks.patch b/patches/unapplied/server/0875-Prevent-compass-from-loading-chunks.patch
index fd21636990..fd21636990 100644
--- a/patches/server/0875-Prevent-compass-from-loading-chunks.patch
+++ b/patches/unapplied/server/0875-Prevent-compass-from-loading-chunks.patch
diff --git a/patches/server/0876-Add-PrePlayerAttackEntityEvent.patch b/patches/unapplied/server/0876-Add-PrePlayerAttackEntityEvent.patch
index 59e72b4db1..59e72b4db1 100644
--- a/patches/server/0876-Add-PrePlayerAttackEntityEvent.patch
+++ b/patches/unapplied/server/0876-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/server/0877-ensure-reset-EnderDragon-boss-event-name.patch b/patches/unapplied/server/0877-ensure-reset-EnderDragon-boss-event-name.patch
index 6107fe92f8..6107fe92f8 100644
--- a/patches/server/0877-ensure-reset-EnderDragon-boss-event-name.patch
+++ b/patches/unapplied/server/0877-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0878-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/unapplied/server/0878-fix-MC-252817-green-map-markers-do-not-disappear.patch
index 9780023a35..9780023a35 100644
--- a/patches/server/0878-fix-MC-252817-green-map-markers-do-not-disappear.patch
+++ b/patches/unapplied/server/0878-fix-MC-252817-green-map-markers-do-not-disappear.patch
diff --git a/patches/server/0879-Add-Player-Warden-Warning-API.patch b/patches/unapplied/server/0879-Add-Player-Warden-Warning-API.patch
index deafe191dc..deafe191dc 100644
--- a/patches/server/0879-Add-Player-Warden-Warning-API.patch
+++ b/patches/unapplied/server/0879-Add-Player-Warden-Warning-API.patch
diff --git a/patches/server/0880-More-vanilla-friendly-methods-to-update-trades.patch b/patches/unapplied/server/0880-More-vanilla-friendly-methods-to-update-trades.patch
index 667a65e357..667a65e357 100644
--- a/patches/server/0880-More-vanilla-friendly-methods-to-update-trades.patch
+++ b/patches/unapplied/server/0880-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0881-Add-paper-dumplisteners-command.patch b/patches/unapplied/server/0881-Add-paper-dumplisteners-command.patch
index 9669276c0a..9669276c0a 100644
--- a/patches/server/0881-Add-paper-dumplisteners-command.patch
+++ b/patches/unapplied/server/0881-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0882-check-global-player-list-where-appropriate.patch b/patches/unapplied/server/0882-check-global-player-list-where-appropriate.patch
index 1b18c29415..1d57c0835d 100644
--- a/patches/server/0882-check-global-player-list-where-appropriate.patch
+++ b/patches/unapplied/server/0882-check-global-player-list-where-appropriate.patch
@@ -7,7 +7,7 @@ Makes certain entities check all players when searching for a player
 instead of just checking players in their world.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 2ef076900edc35b6a0beac4e6f7ee4a7f255671c..a1f25978c50b9b924fda0e399ec7eb5a58562c1b 100644
+index 45b41d000bae08125ea8e6fb39b9f9fc037a6137..2ef86ad041d496f2d04b163fde1fa277b990b85e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2710,4 +2710,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0883-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/unapplied/server/0883-Fix-async-entity-add-due-to-fungus-trees.patch
index a2b4a2f003..9328aa3cf5 100644
--- a/patches/server/0883-Fix-async-entity-add-due-to-fungus-trees.patch
+++ b/patches/unapplied/server/0883-Fix-async-entity-add-due-to-fungus-trees.patch
@@ -17,7 +17,7 @@ index 78284a89900e6b3ee0c066d00ba3ddf043b63401..50ed7cfe1ecef6d075ba484804827cec
                  BlockEntity tileentity = iblockdata.hasBlockEntity() ? this.getBlockEntity(pos) : null;
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 254cdf5efe85583c5ef126d46af7c5246daa97c2..6f3598c12ad8f5d35863669c1f85b5581aa82a60 100644
+index 8cc1d7f5c5f8e9b9d6f7ab26025acf7237262959..7ef90fbdbcdb12ae0f3837fb003112115ab7ecfe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -402,10 +402,10 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
diff --git a/patches/server/0884-ItemStack-damage-API.patch b/patches/unapplied/server/0884-ItemStack-damage-API.patch
index 76fc39cc9b..e141be6346 100644
--- a/patches/server/0884-ItemStack-damage-API.patch
+++ b/patches/unapplied/server/0884-ItemStack-damage-API.patch
@@ -11,7 +11,7 @@ the logic associated with damaging them
 public net.minecraft.world.entity.LivingEntity entityEventForEquipmentBreak(Lnet/minecraft/world/entity/EquipmentSlot;)B
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 8924dc5c5291fdd8557eca95a5ae7d4a204cd3e7..c50a98ebfec5d8d708d5a42c77a45a101a3eac1b 100644
+index 1de9516fc3b6decca250b103abf85a4a8dcea6b2..80463de09f649c28bc5a96712b2ea370a62b8baa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -1033,6 +1033,53 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0885-Friction-API.patch b/patches/unapplied/server/0885-Friction-API.patch
index 439a4b7681..0fb6bc63d5 100644
--- a/patches/server/0885-Friction-API.patch
+++ b/patches/unapplied/server/0885-Friction-API.patch
@@ -132,7 +132,7 @@ index 073643d7f83b974509cf2dd4ea41e3dd9cb90a0d..f444e843535ec68ede0f05e7e7ef182c
      public int getHealth() {
          return this.getHandle().health;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index c50a98ebfec5d8d708d5a42c77a45a101a3eac1b..dd11d52ae56b4dabdc4ff461186e91c316be3488 100644
+index 80463de09f649c28bc5a96712b2ea370a62b8baa..4591d57052e2d0499d441efa13e8b43c606665b0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -1080,6 +1080,18 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0886-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/unapplied/server/0886-Ability-to-control-player-s-insomnia-and-phantoms.patch
index a019ee3c47..a019ee3c47 100644
--- a/patches/server/0886-Ability-to-control-player-s-insomnia-and-phantoms.patch
+++ b/patches/unapplied/server/0886-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0887-Fix-player-kick-on-shutdown.patch b/patches/unapplied/server/0887-Fix-player-kick-on-shutdown.patch
index f5de61909f..f5de61909f 100644
--- a/patches/server/0887-Fix-player-kick-on-shutdown.patch
+++ b/patches/unapplied/server/0887-Fix-player-kick-on-shutdown.patch
diff --git a/patches/server/0888-Sync-offhand-slot-in-menus.patch b/patches/unapplied/server/0888-Sync-offhand-slot-in-menus.patch
index d54a5a6e67..e1efbb9c06 100644
--- a/patches/server/0888-Sync-offhand-slot-in-menus.patch
+++ b/patches/unapplied/server/0888-Sync-offhand-slot-in-menus.patch
@@ -8,7 +8,7 @@ offhand slot isn't sent. This is not correct because you *can* put stuff into th
 by pressing the offhand swap item
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index cd0f542a04ba23fc1bc3ac0a5a1910874f9d7c2c..18518aaa8fad4130b7c89e8a36ed5434258d14f6 100644
+index 04961c33f4d89c491c5b6eb2a53b948feca17807..113089a7d087ecb0508b5f05e708dca1c3296735 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -341,6 +341,13 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0889-Player-Entity-Tracking-Events.patch b/patches/unapplied/server/0889-Player-Entity-Tracking-Events.patch
index 7deeb6f655..7deeb6f655 100644
--- a/patches/server/0889-Player-Entity-Tracking-Events.patch
+++ b/patches/unapplied/server/0889-Player-Entity-Tracking-Events.patch
diff --git a/patches/server/0890-Limit-pet-look-distance.patch b/patches/unapplied/server/0890-Limit-pet-look-distance.patch
index 6b827724a3..6b827724a3 100644
--- a/patches/server/0890-Limit-pet-look-distance.patch
+++ b/patches/unapplied/server/0890-Limit-pet-look-distance.patch
diff --git a/patches/server/0891-Properly-resend-entities.patch b/patches/unapplied/server/0891-Properly-resend-entities.patch
index 89573864bd..89573864bd 100644
--- a/patches/server/0891-Properly-resend-entities.patch
+++ b/patches/unapplied/server/0891-Properly-resend-entities.patch
diff --git a/patches/server/0892-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/unapplied/server/0892-Fixes-and-additions-to-the-SpawnReason-API.patch
index 2e8a508b26..2e8a508b26 100644
--- a/patches/server/0892-Fixes-and-additions-to-the-SpawnReason-API.patch
+++ b/patches/unapplied/server/0892-Fixes-and-additions-to-the-SpawnReason-API.patch
diff --git a/patches/server/0893-fix-Instruments.patch b/patches/unapplied/server/0893-fix-Instruments.patch
index ba5053ee6e..ba5053ee6e 100644
--- a/patches/server/0893-fix-Instruments.patch
+++ b/patches/unapplied/server/0893-fix-Instruments.patch
diff --git a/patches/server/0894-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/unapplied/server/0894-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
index 6c0d7471d6..6c0d7471d6 100644
--- a/patches/server/0894-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
+++ b/patches/unapplied/server/0894-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0895-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/unapplied/server/0895-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
index f318df5bb3..f318df5bb3 100644
--- a/patches/server/0895-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
+++ b/patches/unapplied/server/0895-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0896-Add-BlockLockCheckEvent.patch b/patches/unapplied/server/0896-Add-BlockLockCheckEvent.patch
index 860cae73de..860cae73de 100644
--- a/patches/server/0896-Add-BlockLockCheckEvent.patch
+++ b/patches/unapplied/server/0896-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0897-Add-Sneaking-API-for-Entities.patch b/patches/unapplied/server/0897-Add-Sneaking-API-for-Entities.patch
index 9106439646..50bc8ae29c 100644
--- a/patches/server/0897-Add-Sneaking-API-for-Entities.patch
+++ b/patches/unapplied/server/0897-Add-Sneaking-API-for-Entities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Sneaking API for Entities
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index dc1cc4db2195d4f346bdc5f39e2e14dba454f13d..841a007f24c3d9be2e8b6a9d03ba1694544996fd 100644
+index 37b1eb5ba224e4de28c49c04d218c3951b1bbfd1..a42be7d446e7066b5451f58834901672c293a34b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1218,6 +1218,18 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0898-Improve-logging-and-errors.patch b/patches/unapplied/server/0898-Improve-logging-and-errors.patch
index c9d0447c0a..c9d0447c0a 100644
--- a/patches/server/0898-Improve-logging-and-errors.patch
+++ b/patches/unapplied/server/0898-Improve-logging-and-errors.patch
diff --git a/patches/server/0899-Improve-PortalEvents.patch b/patches/unapplied/server/0899-Improve-PortalEvents.patch
index 8c4ad39c14..3bd889f3cd 100644
--- a/patches/server/0899-Improve-PortalEvents.patch
+++ b/patches/unapplied/server/0899-Improve-PortalEvents.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Improve PortalEvents
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f402f9c530b9c98ea6295ba88ed0179ff7670986..83d9487f20f42b678682ccb53b5e20c5932a579f 100644
+index a8750ba7720896685f9956194e43bb83a97670a8..5c9a015401312a7f8bbc2974337a665e5726c41d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3736,7 +3736,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0900-Add-config-option-for-spider-worldborder-climbing.patch b/patches/unapplied/server/0900-Add-config-option-for-spider-worldborder-climbing.patch
index 3eaf67b54a..370838dfe6 100644
--- a/patches/server/0900-Add-config-option-for-spider-worldborder-climbing.patch
+++ b/patches/unapplied/server/0900-Add-config-option-for-spider-worldborder-climbing.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add config option for spider worldborder climbing
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 83d9487f20f42b678682ccb53b5e20c5932a579f..077f786a00b3954f39194eb645d84f9c083ef8fc 100644
+index 5c9a015401312a7f8bbc2974337a665e5726c41d..a71376b5c7a6e59eeac3a4e0b29cac69ed99f8f1 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -403,6 +403,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0901-Add-missing-SpigotConfig-logCommands-check.patch b/patches/unapplied/server/0901-Add-missing-SpigotConfig-logCommands-check.patch
index 6bdf638285..6bdf638285 100644
--- a/patches/server/0901-Add-missing-SpigotConfig-logCommands-check.patch
+++ b/patches/unapplied/server/0901-Add-missing-SpigotConfig-logCommands-check.patch
diff --git a/patches/server/0902-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/unapplied/server/0902-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
index 581ad00ec1..581ad00ec1 100644
--- a/patches/server/0902-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
+++ b/patches/unapplied/server/0902-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0903-Flying-Fall-Damage.patch b/patches/unapplied/server/0903-Flying-Fall-Damage.patch
index 3b2d52c0ba..3b2d52c0ba 100644
--- a/patches/server/0903-Flying-Fall-Damage.patch
+++ b/patches/unapplied/server/0903-Flying-Fall-Damage.patch
diff --git a/patches/server/0904-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/unapplied/server/0904-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
index 3f33ed3a18..3f33ed3a18 100644
--- a/patches/server/0904-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
+++ b/patches/unapplied/server/0904-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
diff --git a/patches/server/0905-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/unapplied/server/0905-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
index 2812274b89..21fec49df9 100644
--- a/patches/server/0905-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
+++ b/patches/unapplied/server/0905-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose pre-collision moving velocity to
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 077f786a00b3954f39194eb645d84f9c083ef8fc..313e59e24701451115fc8a7b7fa1c8c1d5668e89 100644
+index a71376b5c7a6e59eeac3a4e0b29cac69ed99f8f1..6e65b0291f215e1f0295854abffbe63b82117c0c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1156,7 +1156,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0906-config-for-disabling-entity-tag-tags.patch b/patches/unapplied/server/0906-config-for-disabling-entity-tag-tags.patch
index acdda06756..acdda06756 100644
--- a/patches/server/0906-config-for-disabling-entity-tag-tags.patch
+++ b/patches/unapplied/server/0906-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0907-Use-single-player-info-update-packet-on-join.patch b/patches/unapplied/server/0907-Use-single-player-info-update-packet-on-join.patch
index 42b8a145e8..42b8a145e8 100644
--- a/patches/server/0907-Use-single-player-info-update-packet-on-join.patch
+++ b/patches/unapplied/server/0907-Use-single-player-info-update-packet-on-join.patch
diff --git a/patches/server/0908-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/unapplied/server/0908-Correctly-shrink-items-during-EntityResurrectEvent.patch
index 7b2e2d63ae..7b2e2d63ae 100644
--- a/patches/server/0908-Correctly-shrink-items-during-EntityResurrectEvent.patch
+++ b/patches/unapplied/server/0908-Correctly-shrink-items-during-EntityResurrectEvent.patch
diff --git a/patches/server/0909-Win-Screen-API.patch b/patches/unapplied/server/0909-Win-Screen-API.patch
index fc2f014086..fc2f014086 100644
--- a/patches/server/0909-Win-Screen-API.patch
+++ b/patches/unapplied/server/0909-Win-Screen-API.patch
diff --git a/patches/server/0910-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/unapplied/server/0910-Remove-CraftItemStack-setAmount-null-assignment.patch
index 76965d3ef0..76965d3ef0 100644
--- a/patches/server/0910-Remove-CraftItemStack-setAmount-null-assignment.patch
+++ b/patches/unapplied/server/0910-Remove-CraftItemStack-setAmount-null-assignment.patch
diff --git a/patches/server/0911-Fix-force-opening-enchantment-tables.patch b/patches/unapplied/server/0911-Fix-force-opening-enchantment-tables.patch
index 7bdc01b518..7bdc01b518 100644
--- a/patches/server/0911-Fix-force-opening-enchantment-tables.patch
+++ b/patches/unapplied/server/0911-Fix-force-opening-enchantment-tables.patch
diff --git a/patches/server/0912-Add-Entity-Body-Yaw-API.patch b/patches/unapplied/server/0912-Add-Entity-Body-Yaw-API.patch
index 87bac311e4..61b2d6dbdf 100644
--- a/patches/server/0912-Add-Entity-Body-Yaw-API.patch
+++ b/patches/unapplied/server/0912-Add-Entity-Body-Yaw-API.patch
@@ -41,7 +41,7 @@ index a42be7d446e7066b5451f58834901672c293a34b..f02b6803e1fe9f3a18e47cd7b5e6776e
      // Paper Start - Collision API
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index dd11d52ae56b4dabdc4ff461186e91c316be3488..97e77f7e027471ee0074d0103df06baa9a90d1d9 100644
+index 4591d57052e2d0499d441efa13e8b43c606665b0..1ad5a4703f7164bb530262e1459dc73302cc8e48 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -1072,6 +1072,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0913-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/unapplied/server/0913-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
index efaf1a6e90..efaf1a6e90 100644
--- a/patches/server/0913-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
+++ b/patches/unapplied/server/0913-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
diff --git a/patches/server/0914-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/unapplied/server/0914-Update-the-flag-when-a-captured-block-state-is-outda.patch
index 9af995e790..9af995e790 100644
--- a/patches/server/0914-Update-the-flag-when-a-captured-block-state-is-outda.patch
+++ b/patches/unapplied/server/0914-Update-the-flag-when-a-captured-block-state-is-outda.patch
diff --git a/patches/server/0915-Add-EntityFertilizeEggEvent.patch b/patches/unapplied/server/0915-Add-EntityFertilizeEggEvent.patch
index 2e6f8c4c7b..2e6f8c4c7b 100644
--- a/patches/server/0915-Add-EntityFertilizeEggEvent.patch
+++ b/patches/unapplied/server/0915-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/server/0916-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/unapplied/server/0916-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
index 1a7f1ab11a..1a7f1ab11a 100644
--- a/patches/server/0916-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
+++ b/patches/unapplied/server/0916-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
diff --git a/patches/server/0917-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/unapplied/server/0917-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
index 1291727de8..1291727de8 100644
--- a/patches/server/0917-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
+++ b/patches/unapplied/server/0917-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/server/0918-Correctly-handle-ArmorStand-invisibility.patch b/patches/unapplied/server/0918-Correctly-handle-ArmorStand-invisibility.patch
index ea22d29006..ea22d29006 100644
--- a/patches/server/0918-Correctly-handle-ArmorStand-invisibility.patch
+++ b/patches/unapplied/server/0918-Correctly-handle-ArmorStand-invisibility.patch
diff --git a/patches/server/0919-Fix-advancement-triggers-for-entity-damage.patch b/patches/unapplied/server/0919-Fix-advancement-triggers-for-entity-damage.patch
index c55eac7b90..c55eac7b90 100644
--- a/patches/server/0919-Fix-advancement-triggers-for-entity-damage.patch
+++ b/patches/unapplied/server/0919-Fix-advancement-triggers-for-entity-damage.patch
diff --git a/patches/server/0920-Fix-text-display-error-on-spawn.patch b/patches/unapplied/server/0920-Fix-text-display-error-on-spawn.patch
index 43191b58fb..43191b58fb 100644
--- a/patches/server/0920-Fix-text-display-error-on-spawn.patch
+++ b/patches/unapplied/server/0920-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0921-Fix-certain-inventories-returning-null-Locations.patch b/patches/unapplied/server/0921-Fix-certain-inventories-returning-null-Locations.patch
index c5b7ef9a42..c5b7ef9a42 100644
--- a/patches/server/0921-Fix-certain-inventories-returning-null-Locations.patch
+++ b/patches/unapplied/server/0921-Fix-certain-inventories-returning-null-Locations.patch
diff --git a/patches/server/0922-Add-Shearable-API.patch b/patches/unapplied/server/0922-Add-Shearable-API.patch
index 84b99f2b8c..0cd904ff9d 100644
--- a/patches/server/0922-Add-Shearable-API.patch
+++ b/patches/unapplied/server/0922-Add-Shearable-API.patch
@@ -32,7 +32,7 @@ index 0000000000000000000000000000000000000000..bcf254e3c81cf1e401bddc850fb24ad2
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMushroomCow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMushroomCow.java
-index f2d5a34b39c20995243c437a7fb5e0db5ba5420d..219723dd26d600c89cd560b8fdad3783765f6179 100644
+index c20f470bec5292dde7fbdbf3a6562ae12117521d..e5df527d3f0b82327bcd4cb66c12baa439b4cec6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMushroomCow.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMushroomCow.java
 @@ -5,7 +5,7 @@ import org.bukkit.craftbukkit.CraftServer;
diff --git a/patches/server/0923-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/unapplied/server/0923-Fix-SpawnEggMeta-get-setSpawnedType.patch
index 6a85431dfa..6a85431dfa 100644
--- a/patches/server/0923-Fix-SpawnEggMeta-get-setSpawnedType.patch
+++ b/patches/unapplied/server/0923-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0924-Optimize-Hoppers.patch b/patches/unapplied/server/0924-Optimize-Hoppers.patch
index 82b7c42ec0..82b7c42ec0 100644
--- a/patches/server/0924-Optimize-Hoppers.patch
+++ b/patches/unapplied/server/0924-Optimize-Hoppers.patch
diff --git a/patches/server/0925-Fix-beehives-generating-from-using-bonemeal.patch b/patches/unapplied/server/0925-Fix-beehives-generating-from-using-bonemeal.patch
index ebf4eed61e..ebf4eed61e 100644
--- a/patches/server/0925-Fix-beehives-generating-from-using-bonemeal.patch
+++ b/patches/unapplied/server/0925-Fix-beehives-generating-from-using-bonemeal.patch
diff --git a/patches/server/0926-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/unapplied/server/0926-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
index 6bd28ec0d8..6bd28ec0d8 100644
--- a/patches/server/0926-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
+++ b/patches/unapplied/server/0926-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
diff --git a/patches/server/0927-Treat-sequence-violations-like-they-should-be.patch b/patches/unapplied/server/0927-Treat-sequence-violations-like-they-should-be.patch
index 8dc7f3c4f3..8dc7f3c4f3 100644
--- a/patches/server/0927-Treat-sequence-violations-like-they-should-be.patch
+++ b/patches/unapplied/server/0927-Treat-sequence-violations-like-they-should-be.patch
diff --git a/patches/server/0928-remove-duplicate-animate-packet-for-records.patch b/patches/unapplied/server/0928-remove-duplicate-animate-packet-for-records.patch
index 0958982027..0958982027 100644
--- a/patches/server/0928-remove-duplicate-animate-packet-for-records.patch
+++ b/patches/unapplied/server/0928-remove-duplicate-animate-packet-for-records.patch
diff --git a/patches/server/0929-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/unapplied/server/0929-Prevent-causing-expired-keys-from-impacting-new-join.patch
index a5c7f14af4..a5c7f14af4 100644
--- a/patches/server/0929-Prevent-causing-expired-keys-from-impacting-new-join.patch
+++ b/patches/unapplied/server/0929-Prevent-causing-expired-keys-from-impacting-new-join.patch
diff --git a/patches/server/0930-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/unapplied/server/0930-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
index b0bdc70fe9..5e05bf1713 100644
--- a/patches/server/0930-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
+++ b/patches/unapplied/server/0930-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent GameEvents being fired from unloaded chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index a1f25978c50b9b924fda0e399ec7eb5a58562c1b..d38559bd6071e2e37dea46068ead80a24702ff3b 100644
+index 2ef86ad041d496f2d04b163fde1fa277b990b85e..deebfe66d9c0f799043c3458a0108dc18bfdf15f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1696,6 +1696,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0931-Use-array-for-gamerule-storage.patch b/patches/unapplied/server/0931-Use-array-for-gamerule-storage.patch
index 5c50da11c5..5c50da11c5 100644
--- a/patches/server/0931-Use-array-for-gamerule-storage.patch
+++ b/patches/unapplied/server/0931-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0932-Fix-a-couple-of-upstream-bed-issues.patch b/patches/unapplied/server/0932-Fix-a-couple-of-upstream-bed-issues.patch
index f4a4393fa2..f4a4393fa2 100644
--- a/patches/server/0932-Fix-a-couple-of-upstream-bed-issues.patch
+++ b/patches/unapplied/server/0932-Fix-a-couple-of-upstream-bed-issues.patch
diff --git a/patches/server/0933-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/unapplied/server/0933-Fix-demo-flag-not-enabling-demo-mode.patch
index 1c9d5aefe4..1c9d5aefe4 100644
--- a/patches/server/0933-Fix-demo-flag-not-enabling-demo-mode.patch
+++ b/patches/unapplied/server/0933-Fix-demo-flag-not-enabling-demo-mode.patch
diff --git a/patches/server/0934-Add-Mob-Experience-reward-API.patch b/patches/unapplied/server/0934-Add-Mob-Experience-reward-API.patch
index 6df9a52caa..f8e4f5e754 100644
--- a/patches/server/0934-Add-Mob-Experience-reward-API.patch
+++ b/patches/unapplied/server/0934-Add-Mob-Experience-reward-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Mob Experience reward API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-index 40d277f2737f1a060c3047313289c73307948e73..b4e45d8e9851552f30c9c29d3d9671e1e9094c38 100644
+index b8d16e2e91e3bf1c004f887bf37e5502938fdd1d..5f6a1fb323782816f706ccf7df922cb203238302 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 @@ -170,4 +170,11 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {
diff --git a/patches/server/0935-Break-redstone-on-top-of-trap-doors-early.patch b/patches/unapplied/server/0935-Break-redstone-on-top-of-trap-doors-early.patch
index ff295ff960..ff295ff960 100644
--- a/patches/server/0935-Break-redstone-on-top-of-trap-doors-early.patch
+++ b/patches/unapplied/server/0935-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0936-Fix-DamageCause-for-Falling-Blocks.patch b/patches/unapplied/server/0936-Fix-DamageCause-for-Falling-Blocks.patch
index 1c7d33b3e0..1c7d33b3e0 100644
--- a/patches/server/0936-Fix-DamageCause-for-Falling-Blocks.patch
+++ b/patches/unapplied/server/0936-Fix-DamageCause-for-Falling-Blocks.patch
diff --git a/patches/server/0937-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/unapplied/server/0937-Avoid-Lazy-Initialization-for-Enum-Fields.patch
index 809f5d1710..809f5d1710 100644
--- a/patches/server/0937-Avoid-Lazy-Initialization-for-Enum-Fields.patch
+++ b/patches/unapplied/server/0937-Avoid-Lazy-Initialization-for-Enum-Fields.patch
diff --git a/patches/server/0938-More-accurate-isInOpenWater-impl.patch b/patches/unapplied/server/0938-More-accurate-isInOpenWater-impl.patch
index ca26fd9045..ca26fd9045 100644
--- a/patches/server/0938-More-accurate-isInOpenWater-impl.patch
+++ b/patches/unapplied/server/0938-More-accurate-isInOpenWater-impl.patch
diff --git a/patches/server/0939-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/unapplied/server/0939-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
index 2127f28b00..2127f28b00 100644
--- a/patches/server/0939-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
+++ b/patches/unapplied/server/0939-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
diff --git a/patches/server/0940-Optimise-recalcBlockCounts-for-empty-sections.patch b/patches/unapplied/server/0940-Optimise-recalcBlockCounts-for-empty-sections.patch
index 0e23a9a123..0e23a9a123 100644
--- a/patches/server/0940-Optimise-recalcBlockCounts-for-empty-sections.patch
+++ b/patches/unapplied/server/0940-Optimise-recalcBlockCounts-for-empty-sections.patch
diff --git a/patches/server/0941-Expand-PlayerItemMendEvent.patch b/patches/unapplied/server/0941-Expand-PlayerItemMendEvent.patch
index 58b7e2c215..58b7e2c215 100644
--- a/patches/server/0941-Expand-PlayerItemMendEvent.patch
+++ b/patches/unapplied/server/0941-Expand-PlayerItemMendEvent.patch
diff --git a/patches/server/0942-Refresh-ProjectileSource-for-projectiles.patch b/patches/unapplied/server/0942-Refresh-ProjectileSource-for-projectiles.patch
index 01167eb7b1..2332b94d12 100644
--- a/patches/server/0942-Refresh-ProjectileSource-for-projectiles.patch
+++ b/patches/unapplied/server/0942-Refresh-ProjectileSource-for-projectiles.patch
@@ -14,7 +14,7 @@ clearing the owner.
 Co-authored-by: Warrior <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 313e59e24701451115fc8a7b7fa1c8c1d5668e89..1970fa01a6c93f52bbea4874db304c295b3173ba 100644
+index 6e65b0291f215e1f0295854abffbe63b82117c0c..e8a21de2434aa089079827eca16d803993d05c65 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -382,6 +382,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0943-Add-transient-modifier-API.patch b/patches/unapplied/server/0943-Add-transient-modifier-API.patch
index e3b704e242..e3b704e242 100644
--- a/patches/server/0943-Add-transient-modifier-API.patch
+++ b/patches/unapplied/server/0943-Add-transient-modifier-API.patch
diff --git a/patches/server/0944-Fix-block-place-logic.patch b/patches/unapplied/server/0944-Fix-block-place-logic.patch
index 43ff2d8260..43ff2d8260 100644
--- a/patches/server/0944-Fix-block-place-logic.patch
+++ b/patches/unapplied/server/0944-Fix-block-place-logic.patch
diff --git a/patches/server/0945-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/unapplied/server/0945-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
index da9489efd3..da9489efd3 100644
--- a/patches/server/0945-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
+++ b/patches/unapplied/server/0945-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
diff --git a/patches/server/0946-Ignore-inline-definitions-of-trim-material-pattern.patch b/patches/unapplied/server/0946-Ignore-inline-definitions-of-trim-material-pattern.patch
index 2b71534642..2b71534642 100644
--- a/patches/server/0946-Ignore-inline-definitions-of-trim-material-pattern.patch
+++ b/patches/unapplied/server/0946-Ignore-inline-definitions-of-trim-material-pattern.patch
diff --git a/patches/server/0947-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/unapplied/server/0947-Call-BlockGrowEvent-for-missing-blocks.patch
index 69fc87cf3f..69fc87cf3f 100644
--- a/patches/server/0947-Call-BlockGrowEvent-for-missing-blocks.patch
+++ b/patches/unapplied/server/0947-Call-BlockGrowEvent-for-missing-blocks.patch
diff --git a/patches/server/0948-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/unapplied/server/0948-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
index 8fc1d2b4f3..dd20a78c1f 100644
--- a/patches/server/0948-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
+++ b/patches/unapplied/server/0948-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't enforce icanhasbukkit default if alias block exists
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 64c3eafd2b676938017b43bf46ea6a0e0f324fd6..9d86b54a9945d4644f7920e06e5d04faaaa2e8c8 100644
+index 7376d3acb27edd7209916e9e9df4ce9b9514e50c..4d2443f40dc2e1b38b7c80e7b5f9ca7a4f84c107 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -361,7 +361,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0949-fix-MapLike-spam-for-missing-key-selector.patch b/patches/unapplied/server/0949-fix-MapLike-spam-for-missing-key-selector.patch
index 2fee78531f..2fee78531f 100644
--- a/patches/server/0949-fix-MapLike-spam-for-missing-key-selector.patch
+++ b/patches/unapplied/server/0949-fix-MapLike-spam-for-missing-key-selector.patch
diff --git a/patches/server/0950-Fix-sniffer-removeExploredLocation.patch b/patches/unapplied/server/0950-Fix-sniffer-removeExploredLocation.patch
index e8b1703090..e8b1703090 100644
--- a/patches/server/0950-Fix-sniffer-removeExploredLocation.patch
+++ b/patches/unapplied/server/0950-Fix-sniffer-removeExploredLocation.patch
diff --git a/patches/server/0951-Add-method-to-remove-all-active-potion-effects.patch b/patches/unapplied/server/0951-Add-method-to-remove-all-active-potion-effects.patch
index 7b09037690..27b5f10678 100644
--- a/patches/server/0951-Add-method-to-remove-all-active-potion-effects.patch
+++ b/patches/unapplied/server/0951-Add-method-to-remove-all-active-potion-effects.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add method to remove all active potion effects
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 6a4639a4584f3497661f8870d5722e300638e52a..030fd330b13197d752a2d4c48628b9efd2c2c776 100644
+index 1ad5a4703f7164bb530262e1459dc73302cc8e48..6be370a2be88aac6e229210ef625380171504693 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -503,6 +503,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0952-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch b/patches/unapplied/server/0952-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
index d1bb2bb57c..d1bb2bb57c 100644
--- a/patches/server/0952-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
+++ b/patches/unapplied/server/0952-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
diff --git a/patches/server/0953-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/unapplied/server/0953-Fix-incorrect-crafting-result-amount-for-fireworks.patch
index cfcf15909a..cfcf15909a 100644
--- a/patches/server/0953-Fix-incorrect-crafting-result-amount-for-fireworks.patch
+++ b/patches/unapplied/server/0953-Fix-incorrect-crafting-result-amount-for-fireworks.patch
diff --git a/patches/server/0954-Properly-Cancel-Usable-Items.patch b/patches/unapplied/server/0954-Properly-Cancel-Usable-Items.patch
index 7d7430930d..7d7430930d 100644
--- a/patches/server/0954-Properly-Cancel-Usable-Items.patch
+++ b/patches/unapplied/server/0954-Properly-Cancel-Usable-Items.patch
diff --git a/patches/server/0955-Add-event-for-player-editing-sign.patch b/patches/unapplied/server/0955-Add-event-for-player-editing-sign.patch
index d8b7be275f..d8b7be275f 100644
--- a/patches/server/0955-Add-event-for-player-editing-sign.patch
+++ b/patches/unapplied/server/0955-Add-event-for-player-editing-sign.patch
diff --git a/patches/server/0956-Only-tick-item-frames-if-players-can-see-it.patch b/patches/unapplied/server/0956-Only-tick-item-frames-if-players-can-see-it.patch
index b3de8c9a7c..b3de8c9a7c 100644
--- a/patches/server/0956-Only-tick-item-frames-if-players-can-see-it.patch
+++ b/patches/unapplied/server/0956-Only-tick-item-frames-if-players-can-see-it.patch
diff --git a/patches/server/0957-Improve-command-function-perm-level-checks.patch b/patches/unapplied/server/0957-Improve-command-function-perm-level-checks.patch
index 5d912059ff..5d912059ff 100644
--- a/patches/server/0957-Improve-command-function-perm-level-checks.patch
+++ b/patches/unapplied/server/0957-Improve-command-function-perm-level-checks.patch
diff --git a/patches/server/0958-Add-option-to-disable-block-updates.patch b/patches/unapplied/server/0958-Add-option-to-disable-block-updates.patch
index 29e45a4f7d..29e45a4f7d 100644
--- a/patches/server/0958-Add-option-to-disable-block-updates.patch
+++ b/patches/unapplied/server/0958-Add-option-to-disable-block-updates.patch
diff --git a/patches/server/0959-Call-missing-BlockDispenseEvent.patch b/patches/unapplied/server/0959-Call-missing-BlockDispenseEvent.patch
index 8c8cc75def..8c8cc75def 100644
--- a/patches/server/0959-Call-missing-BlockDispenseEvent.patch
+++ b/patches/unapplied/server/0959-Call-missing-BlockDispenseEvent.patch
diff --git a/patches/server/0960-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/unapplied/server/0960-Don-t-load-chunks-for-supporting-block-checks.patch
index d7eda4b553..12f1d28c61 100644
--- a/patches/server/0960-Don-t-load-chunks-for-supporting-block-checks.patch
+++ b/patches/unapplied/server/0960-Don-t-load-chunks-for-supporting-block-checks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't load chunks for supporting block checks
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 1970fa01a6c93f52bbea4874db304c295b3173ba..b28ee70aa98d6a8f3913e11084d0b4a9b09b5e26 100644
+index e8a21de2434aa089079827eca16d803993d05c65..bf77b0dae2ca25437df7386d2196da24d681e2ed 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1356,7 +1356,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0961-Optimize-player-lookups-for-beacons.patch b/patches/unapplied/server/0961-Optimize-player-lookups-for-beacons.patch
index 5245e38833..5245e38833 100644
--- a/patches/server/0961-Optimize-player-lookups-for-beacons.patch
+++ b/patches/unapplied/server/0961-Optimize-player-lookups-for-beacons.patch
diff --git a/patches/server/0962-Add-Sign-getInteractableSideFor.patch b/patches/unapplied/server/0962-Add-Sign-getInteractableSideFor.patch
index 0a4aadfb36..0a4aadfb36 100644
--- a/patches/server/0962-Add-Sign-getInteractableSideFor.patch
+++ b/patches/unapplied/server/0962-Add-Sign-getInteractableSideFor.patch
diff --git a/patches/server/0963-Array-backed-synched-entity-data.patch b/patches/unapplied/server/0963-Array-backed-synched-entity-data.patch
index 84bf2095b4..84bf2095b4 100644
--- a/patches/server/0963-Array-backed-synched-entity-data.patch
+++ b/patches/unapplied/server/0963-Array-backed-synched-entity-data.patch
diff --git a/patches/server/0964-fix-item-meta-for-tadpole-buckets.patch b/patches/unapplied/server/0964-fix-item-meta-for-tadpole-buckets.patch
index b8d4f28c59..b8d4f28c59 100644
--- a/patches/server/0964-fix-item-meta-for-tadpole-buckets.patch
+++ b/patches/unapplied/server/0964-fix-item-meta-for-tadpole-buckets.patch
diff --git a/patches/server/0965-Suppress-Item-Meta-Validation-Checks.patch b/patches/unapplied/server/0965-Suppress-Item-Meta-Validation-Checks.patch
index 660669617a..feaea33cab 100644
--- a/patches/server/0965-Suppress-Item-Meta-Validation-Checks.patch
+++ b/patches/unapplied/server/0965-Suppress-Item-Meta-Validation-Checks.patch
@@ -67,7 +67,7 @@ index f6d2785b05b4c0a4393be706a90d7cc4388399bf..2510297df2f6ca80672c1dcbd35c0b1e
                  continue;
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-index b6550a8c52122747668f9f0e93c2c2cbd2e86d94..77a789ada9c76c40aabfda358e0752db63a63da9 100644
+index b2bab2d79c969bc81b160312a996fb9cd87d0f95..173d2ae0b4fd6677250ded24576c5420a93e73bf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 @@ -71,11 +71,13 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
diff --git a/patches/server/0966-Fix-BanList-API.patch b/patches/unapplied/server/0966-Fix-BanList-API.patch
index 35256cb2e9..35256cb2e9 100644
--- a/patches/server/0966-Fix-BanList-API.patch
+++ b/patches/unapplied/server/0966-Fix-BanList-API.patch
diff --git a/patches/server/0967-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/unapplied/server/0967-Determine-lava-and-water-fluid-explosion-resistance-.patch
index 05fb1ac2ac..05fb1ac2ac 100644
--- a/patches/server/0967-Determine-lava-and-water-fluid-explosion-resistance-.patch
+++ b/patches/unapplied/server/0967-Determine-lava-and-water-fluid-explosion-resistance-.patch
diff --git a/patches/server/0968-Fix-possible-NPE-on-painting-creation.patch b/patches/unapplied/server/0968-Fix-possible-NPE-on-painting-creation.patch
index 8485ab1255..65c5275ad6 100644
--- a/patches/server/0968-Fix-possible-NPE-on-painting-creation.patch
+++ b/patches/unapplied/server/0968-Fix-possible-NPE-on-painting-creation.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix possible NPE on painting creation
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 6f3598c12ad8f5d35863669c1f85b5581aa82a60..3de391034dc8367c538008893615514c628d948e 100644
+index 7ef90fbdbcdb12ae0f3837fb003112115ab7ecfe..4289cce80f9861b809062a29c0d89b9dbd0ba8cd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -917,6 +917,7 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
diff --git a/patches/server/0969-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/unapplied/server/0969-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
index d72ec05289..d72ec05289 100644
--- a/patches/server/0969-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
+++ b/patches/unapplied/server/0969-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0970-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/unapplied/server/0970-ExperienceOrb-should-call-EntitySpawnEvent.patch
index fea6aa1a5f..fea6aa1a5f 100644
--- a/patches/server/0970-ExperienceOrb-should-call-EntitySpawnEvent.patch
+++ b/patches/unapplied/server/0970-ExperienceOrb-should-call-EntitySpawnEvent.patch
diff --git a/patches/server/0971-Don-t-tick-signs.patch b/patches/unapplied/server/0971-Don-t-tick-signs.patch
index 759f4ef4d2..759f4ef4d2 100644
--- a/patches/server/0971-Don-t-tick-signs.patch
+++ b/patches/unapplied/server/0971-Don-t-tick-signs.patch
diff --git a/patches/server/0972-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/unapplied/server/0972-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
index 45166cba2a..45166cba2a 100644
--- a/patches/server/0972-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
+++ b/patches/unapplied/server/0972-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
diff --git a/patches/server/0973-Add-whitelist-events.patch b/patches/unapplied/server/0973-Add-whitelist-events.patch
index 42eff5bfe1..42eff5bfe1 100644
--- a/patches/server/0973-Add-whitelist-events.patch
+++ b/patches/unapplied/server/0973-Add-whitelist-events.patch
diff --git a/patches/server/0974-Implement-PlayerFailMoveEvent.patch b/patches/unapplied/server/0974-Implement-PlayerFailMoveEvent.patch
index 05065fe7c6..05065fe7c6 100644
--- a/patches/server/0974-Implement-PlayerFailMoveEvent.patch
+++ b/patches/unapplied/server/0974-Implement-PlayerFailMoveEvent.patch
diff --git a/patches/server/0975-Folia-scheduler-and-owned-region-API.patch b/patches/unapplied/server/0975-Folia-scheduler-and-owned-region-API.patch
index e06d6a5751..0c1306f2d5 100644
--- a/patches/server/0975-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/unapplied/server/0975-Folia-scheduler-and-owned-region-API.patch
@@ -1224,7 +1224,7 @@ index bf77b0dae2ca25437df7386d2196da24d681e2ed..4516991a4d1299d7e93019a4b9bc227b
      public void setLevelCallback(EntityInLevelCallback changeListener) {
          this.levelCallback = changeListener;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9d86b54a9945d4644f7920e06e5d04faaaa2e8c8..16906e8ba7d05275561d465a08b792137d284c4e 100644
+index 4d2443f40dc2e1b38b7c80e7b5f9ca7a4f84c107..3363ac5f0b2c059e0794fe22194c7fc1006806f4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -310,6 +310,76 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0976-Only-erase-allay-memory-on-non-item-targets.patch b/patches/unapplied/server/0976-Only-erase-allay-memory-on-non-item-targets.patch
index 4afac36fc3..4afac36fc3 100644
--- a/patches/server/0976-Only-erase-allay-memory-on-non-item-targets.patch
+++ b/patches/unapplied/server/0976-Only-erase-allay-memory-on-non-item-targets.patch
diff --git a/patches/server/0977-API-for-updating-recipes-on-clients.patch b/patches/unapplied/server/0977-API-for-updating-recipes-on-clients.patch
index b900631d71..413b949c0d 100644
--- a/patches/server/0977-API-for-updating-recipes-on-clients.patch
+++ b/patches/unapplied/server/0977-API-for-updating-recipes-on-clients.patch
@@ -39,7 +39,7 @@ index 80919d247a9204ebf8d0e55df7fc6a2443ed91aa..3a70b7e1319c3ecab9eb720f8a1a34c0
          Iterator iterator1 = this.players.iterator();
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 16906e8ba7d05275561d465a08b792137d284c4e..6a8f954f38007f47139da348a611e4eb2bc09289 100644
+index 3363ac5f0b2c059e0794fe22194c7fc1006806f4..991e22b7e7484db638c3d46ddac7625b1f9a805d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1133,6 +1133,18 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0978-Fix-rotation-when-spawning-display-entities.patch b/patches/unapplied/server/0978-Fix-rotation-when-spawning-display-entities.patch
index d0ab343b2d..19fb23baa0 100644
--- a/patches/server/0978-Fix-rotation-when-spawning-display-entities.patch
+++ b/patches/unapplied/server/0978-Fix-rotation-when-spawning-display-entities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix rotation when spawning display entities
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 3de391034dc8367c538008893615514c628d948e..7673e6c8a16455366d46a64df00c97663089c2ce 100644
+index 4289cce80f9861b809062a29c0d89b9dbd0ba8cd..38a66bc89afa63db42273459415ace9629603744 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -987,6 +987,7 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
diff --git a/patches/server/0979-Only-capture-actual-tree-growth.patch b/patches/unapplied/server/0979-Only-capture-actual-tree-growth.patch
index 7035d46e7a..7035d46e7a 100644
--- a/patches/server/0979-Only-capture-actual-tree-growth.patch
+++ b/patches/unapplied/server/0979-Only-capture-actual-tree-growth.patch
diff --git a/patches/server/0980-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/unapplied/server/0980-Use-correct-source-for-mushroom-block-spread-event.patch
index 6eb9ff2e4c..6eb9ff2e4c 100644
--- a/patches/server/0980-Use-correct-source-for-mushroom-block-spread-event.patch
+++ b/patches/unapplied/server/0980-Use-correct-source-for-mushroom-block-spread-event.patch
diff --git a/patches/server/0981-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/unapplied/server/0981-Respect-randomizeData-on-more-entities-when-spawning.patch
index dd08dc14b0..1cd864572a 100644
--- a/patches/server/0981-Respect-randomizeData-on-more-entities-when-spawning.patch
+++ b/patches/unapplied/server/0981-Respect-randomizeData-on-more-entities-when-spawning.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] Respect randomizeData on more entities when spawning
 * ExperienceOrb
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 7673e6c8a16455366d46a64df00c97663089c2ce..1a17875426468b287c8ea3f559ea516d0218f7a0 100644
+index 38a66bc89afa63db42273459415ace9629603744..1e35f4c27250075dee74958a4c08cfb57a666bae 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -604,6 +604,11 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
diff --git a/patches/server/0982-Use-correct-seed-on-api-world-load.patch b/patches/unapplied/server/0982-Use-correct-seed-on-api-world-load.patch
index 4d50d8dc21..64812ab8e8 100644
--- a/patches/server/0982-Use-correct-seed-on-api-world-load.patch
+++ b/patches/unapplied/server/0982-Use-correct-seed-on-api-world-load.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use correct seed on api world load
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6a8f954f38007f47139da348a611e4eb2bc09289..1cad49d031580a7d5a2c8085ce44a0b0b4a5383f 100644
+index 991e22b7e7484db638c3d46ddac7625b1f9a805d..8de06dd9fb058c5b02f4ffe0d14d0bd7205dbdeb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1314,7 +1314,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0983-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/unapplied/server/0983-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
index 56ce0b4a41..56ce0b4a41 100644
--- a/patches/server/0983-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
+++ b/patches/unapplied/server/0983-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
diff --git a/patches/server/0984-Cache-map-ids-on-item-frames.patch b/patches/unapplied/server/0984-Cache-map-ids-on-item-frames.patch
index 9b22a5bbd5..9b22a5bbd5 100644
--- a/patches/server/0984-Cache-map-ids-on-item-frames.patch
+++ b/patches/unapplied/server/0984-Cache-map-ids-on-item-frames.patch
diff --git a/patches/server/0985-Fix-custom-statistic-criteria-creation.patch b/patches/unapplied/server/0985-Fix-custom-statistic-criteria-creation.patch
index d027126175..d027126175 100644
--- a/patches/server/0985-Fix-custom-statistic-criteria-creation.patch
+++ b/patches/unapplied/server/0985-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/server/0986-Bandaid-fix-for-Effect.patch b/patches/unapplied/server/0986-Bandaid-fix-for-Effect.patch
index 3954656da2..3954656da2 100644
--- a/patches/server/0986-Bandaid-fix-for-Effect.patch
+++ b/patches/unapplied/server/0986-Bandaid-fix-for-Effect.patch
diff --git a/patches/server/0987-SculkCatalyst-bloom-API.patch b/patches/unapplied/server/0987-SculkCatalyst-bloom-API.patch
index 77742addde..77742addde 100644
--- a/patches/server/0987-SculkCatalyst-bloom-API.patch
+++ b/patches/unapplied/server/0987-SculkCatalyst-bloom-API.patch
diff --git a/patches/server/0988-API-for-an-entity-s-scoreboard-name.patch b/patches/unapplied/server/0988-API-for-an-entity-s-scoreboard-name.patch
index 76ac7b4d9a..aa9667e2e3 100644
--- a/patches/server/0988-API-for-an-entity-s-scoreboard-name.patch
+++ b/patches/unapplied/server/0988-API-for-an-entity-s-scoreboard-name.patch
@@ -7,7 +7,7 @@ Was obtainable through different methods, but you had to use different
 methods depending on the implementation of Entity you were working with.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 8472b566bac933d2982683b01dac7eb5e3172192..d57856bee23cd0fd22d0c2141c77c978dae7f8c6 100644
+index acdac5b9b9990b1f8c25effe6b8882746284d9d9..fb7f5d8a7a691de04cf1525b356621688fd6af54 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1506,4 +1506,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0989-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/unapplied/server/0989-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
index 2c00652021..42d9c41142 100644
--- a/patches/server/0989-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
+++ b/patches/unapplied/server/0989-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
@@ -61,7 +61,7 @@ index 8907396dc21dbfb31ff15286a7daa2110f6e34c0..8ef4b33c09c64c417e9b0d259550d7f7
                  spawnercreature_d = NaturalSpawner.createState(l, this.level.getAllEntities(), this::getFullChunk, null, true);
              } else {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 18518aaa8fad4130b7c89e8a36ed5434258d14f6..7838c7e051b1c4966e5a10289577d60a58ab16dd 100644
+index 113089a7d087ecb0508b5f05e708dca1c3296735..47eb7f632c71714903c8bac45ef6080fb58cd6d2 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -253,6 +253,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0990-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/unapplied/server/0990-Deprecate-and-replace-methods-with-old-StructureType.patch
index bb2f52c01e..7845dd4959 100644
--- a/patches/server/0990-Deprecate-and-replace-methods-with-old-StructureType.patch
+++ b/patches/unapplied/server/0990-Deprecate-and-replace-methods-with-old-StructureType.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Deprecate and replace methods with old StructureType
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1cad49d031580a7d5a2c8085ce44a0b0b4a5383f..770bfdc6ce75e85e2ec94f62e2545e1bc47244ef 100644
+index 8de06dd9fb058c5b02f4ffe0d14d0bd7205dbdeb..356107688a5d40d1c462b164f61af82f4dfd3926 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1918,6 +1918,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0991-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/unapplied/server/0991-Don-t-tab-complete-namespaced-commands-if-send-names.patch
index 93fe609c51..93fe609c51 100644
--- a/patches/server/0991-Don-t-tab-complete-namespaced-commands-if-send-names.patch
+++ b/patches/unapplied/server/0991-Don-t-tab-complete-namespaced-commands-if-send-names.patch
diff --git a/patches/server/0992-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/unapplied/server/0992-Properly-handle-BlockBreakEvent-isDropItems.patch
index 27c381efc3..27c381efc3 100644
--- a/patches/server/0992-Properly-handle-BlockBreakEvent-isDropItems.patch
+++ b/patches/unapplied/server/0992-Properly-handle-BlockBreakEvent-isDropItems.patch
diff --git a/patches/server/0993-Fire-entity-death-event-for-ender-dragon.patch b/patches/unapplied/server/0993-Fire-entity-death-event-for-ender-dragon.patch
index 3c23429d1c..3c23429d1c 100644
--- a/patches/server/0993-Fire-entity-death-event-for-ender-dragon.patch
+++ b/patches/unapplied/server/0993-Fire-entity-death-event-for-ender-dragon.patch
diff --git a/patches/server/0994-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/unapplied/server/0994-Configurable-entity-tracking-range-by-Y-coordinate.patch
index 74202812a3..74202812a3 100644
--- a/patches/server/0994-Configurable-entity-tracking-range-by-Y-coordinate.patch
+++ b/patches/unapplied/server/0994-Configurable-entity-tracking-range-by-Y-coordinate.patch
diff --git a/patches/server/0995-Add-Listing-API-for-Player.patch b/patches/unapplied/server/0995-Add-Listing-API-for-Player.patch
index 41685b12d0..41685b12d0 100644
--- a/patches/server/0995-Add-Listing-API-for-Player.patch
+++ b/patches/unapplied/server/0995-Add-Listing-API-for-Player.patch
diff --git a/patches/server/0996-Configurable-Region-Compression-Format.patch b/patches/unapplied/server/0996-Configurable-Region-Compression-Format.patch
index 08de696dde..08de696dde 100644
--- a/patches/server/0996-Configurable-Region-Compression-Format.patch
+++ b/patches/unapplied/server/0996-Configurable-Region-Compression-Format.patch
diff --git a/patches/server/0997-Expose-clicked-BlockFace-during-BlockDamageEvent.patch b/patches/unapplied/server/0997-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
index ad3be36883..ad3be36883 100644
--- a/patches/server/0997-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
+++ b/patches/unapplied/server/0997-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
diff --git a/patches/server/0998-Fix-NPE-on-Boat-getStatus.patch b/patches/unapplied/server/0998-Fix-NPE-on-Boat-getStatus.patch
index f2b53faa13..f2b53faa13 100644
--- a/patches/server/0998-Fix-NPE-on-Boat-getStatus.patch
+++ b/patches/unapplied/server/0998-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/server/0999-Expand-Pose-API.patch b/patches/unapplied/server/0999-Expand-Pose-API.patch
index f55d8956e5..d93c899f29 100644
--- a/patches/server/0999-Expand-Pose-API.patch
+++ b/patches/unapplied/server/0999-Expand-Pose-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expand Pose API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 80882abd35199f95610af16698aeb0fe61f8f455..1e05fca2a2ba6e2c0b641b6e27585520889cd8a6 100644
+index 4516991a4d1299d7e93019a4b9bc227b4844e9ef..c655c6fee393c62ba79301f76baa72f9b1154a9a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -417,6 +417,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -25,7 +25,7 @@ index 80882abd35199f95610af16698aeb0fe61f8f455..1e05fca2a2ba6e2c0b641b6e27585520
          if (pose == this.getPose()) {
              return;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index d57856bee23cd0fd22d0c2141c77c978dae7f8c6..90b04377088fcaf128cb35843702d2f5ead4b7f6 100644
+index fb7f5d8a7a691de04cf1525b356621688fd6af54..0e6c7284b9aee6c5f2454a3a095ebf349f887740 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1243,6 +1243,20 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/1000-More-DragonBattle-API.patch b/patches/unapplied/server/1000-More-DragonBattle-API.patch
index d14bf53224..d14bf53224 100644
--- a/patches/server/1000-More-DragonBattle-API.patch
+++ b/patches/unapplied/server/1000-More-DragonBattle-API.patch
diff --git a/patches/server/1001-Deep-clone-unhandled-nbt-tags.patch b/patches/unapplied/server/1001-Deep-clone-unhandled-nbt-tags.patch
index a3b749dd22..a3b749dd22 100644
--- a/patches/server/1001-Deep-clone-unhandled-nbt-tags.patch
+++ b/patches/unapplied/server/1001-Deep-clone-unhandled-nbt-tags.patch
diff --git a/patches/server/1002-Add-PlayerPickItemEvent.patch b/patches/unapplied/server/1002-Add-PlayerPickItemEvent.patch
index 2a800c9ef9..2a800c9ef9 100644
--- a/patches/server/1002-Add-PlayerPickItemEvent.patch
+++ b/patches/unapplied/server/1002-Add-PlayerPickItemEvent.patch
diff --git a/patches/server/1003-Improve-performance-of-mass-crafts.patch b/patches/unapplied/server/1003-Improve-performance-of-mass-crafts.patch
index 183698b5c5..cc705923b1 100644
--- a/patches/server/1003-Improve-performance-of-mass-crafts.patch
+++ b/patches/unapplied/server/1003-Improve-performance-of-mass-crafts.patch
@@ -47,7 +47,7 @@ index 525ba0bdc4c6782480930bea94f73a72efe6fc4c..2554f7b1d687f83f42d69bf8ab54336b
          for(int i = 0; i < nonNullList.size(); ++i) {
              ItemStack itemStack = this.craftSlots.getItem(i);
 diff --git a/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java b/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
-index bf16c44e2d61dccb662eceeef89a143a25ba40b0..666fc85bc2079cb367b340f2605f29fe002f4d22 100644
+index 43aacadcf8be10432a61c83f69ee86580c86d0a3..388363948595247471fa4c3c6801fc493d61c0d0 100644
 --- a/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
 +++ b/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
 @@ -122,13 +122,16 @@ public class RecipeManager extends SimpleJsonResourceReloadListener {
diff --git a/patches/server/1004-Allow-trident-custom-damage.patch b/patches/unapplied/server/1004-Allow-trident-custom-damage.patch
index dcbcba2af5..dcbcba2af5 100644
--- a/patches/server/1004-Allow-trident-custom-damage.patch
+++ b/patches/unapplied/server/1004-Allow-trident-custom-damage.patch
diff --git a/patches/server/1005-Expose-hand-during-BlockCanBuildEvent.patch b/patches/unapplied/server/1005-Expose-hand-during-BlockCanBuildEvent.patch
index dc68b12fb2..dc68b12fb2 100644
--- a/patches/server/1005-Expose-hand-during-BlockCanBuildEvent.patch
+++ b/patches/unapplied/server/1005-Expose-hand-during-BlockCanBuildEvent.patch
diff --git a/patches/server/1006-Optimize-nearest-structure-border-iteration.patch b/patches/unapplied/server/1006-Optimize-nearest-structure-border-iteration.patch
index 07d0358cbb..07d0358cbb 100644
--- a/patches/server/1006-Optimize-nearest-structure-border-iteration.patch
+++ b/patches/unapplied/server/1006-Optimize-nearest-structure-border-iteration.patch
diff --git a/patches/server/1007-Implement-OfflinePlayer-isConnected.patch b/patches/unapplied/server/1007-Implement-OfflinePlayer-isConnected.patch
index c8b2b10504..360f560710 100644
--- a/patches/server/1007-Implement-OfflinePlayer-isConnected.patch
+++ b/patches/unapplied/server/1007-Implement-OfflinePlayer-isConnected.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement OfflinePlayer#isConnected
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-index f9b2d773449fa5d332e0c37454ba6ea731982e85..bb794638a990488afc8d9d245dd203269c2b38b2 100644
+index 9daec0782774ab51ea8091cb8ed9d0a106e34cfa..2bbc39c257965ad91ee360cdfcd3538a0f041c7e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 @@ -53,6 +53,13 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
@@ -23,7 +23,7 @@ index f9b2d773449fa5d332e0c37454ba6ea731982e85..bb794638a990488afc8d9d245dd20326
      public String getName() {
          Player player = this.getPlayer();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 97ef38f744908a09e4d24c445a5cc39db0e6ee7e..f6bc3a4af1bffe6abf5a93e975848de44965cbe3 100644
+index 3b6b89954d30908ff5ed23acfacbb3ef9b8a6f03..e593e0bc9d207325a9e9d38296b29230a353077e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -274,6 +274,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/1008-Fix-inventory-desync.patch b/patches/unapplied/server/1008-Fix-inventory-desync.patch
index 6da7d78b43..6da7d78b43 100644
--- a/patches/server/1008-Fix-inventory-desync.patch
+++ b/patches/unapplied/server/1008-Fix-inventory-desync.patch
diff --git a/patches/server/1009-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/unapplied/server/1009-Add-titleOverride-to-InventoryOpenEvent.patch
index c56b28040b..08c433b261 100644
--- a/patches/server/1009-Add-titleOverride-to-InventoryOpenEvent.patch
+++ b/patches/unapplied/server/1009-Add-titleOverride-to-InventoryOpenEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add titleOverride to InventoryOpenEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 7838c7e051b1c4966e5a10289577d60a58ab16dd..872bd74b581249a8132ec5c37dfdd9e699bfbafa 100644
+index 47eb7f632c71714903c8bac45ef6080fb58cd6d2..67f03dd59ebcf74fae476b79a367778a9e942ed3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1560,12 +1560,17 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/1010-Configure-sniffer-egg-hatch-time.patch b/patches/unapplied/server/1010-Configure-sniffer-egg-hatch-time.patch
index 6c035ed11f..6c035ed11f 100644
--- a/patches/server/1010-Configure-sniffer-egg-hatch-time.patch
+++ b/patches/unapplied/server/1010-Configure-sniffer-egg-hatch-time.patch
diff --git a/patches/server/1011-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/unapplied/server/1011-Do-crystal-portal-proximity-check-before-entity-look.patch
index 0244f274f5..0244f274f5 100644
--- a/patches/server/1011-Do-crystal-portal-proximity-check-before-entity-look.patch
+++ b/patches/unapplied/server/1011-Do-crystal-portal-proximity-check-before-entity-look.patch
diff --git a/patches/server/1012-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/unapplied/server/1012-Skip-POI-finding-if-stuck-in-vehicle.patch
index e45ced771d..e45ced771d 100644
--- a/patches/server/1012-Skip-POI-finding-if-stuck-in-vehicle.patch
+++ b/patches/unapplied/server/1012-Skip-POI-finding-if-stuck-in-vehicle.patch
diff --git a/patches/server/1013-Add-slot-sanity-checks-in-container-clicks.patch b/patches/unapplied/server/1013-Add-slot-sanity-checks-in-container-clicks.patch
index 5aeb035c14..5aeb035c14 100644
--- a/patches/server/1013-Add-slot-sanity-checks-in-container-clicks.patch
+++ b/patches/unapplied/server/1013-Add-slot-sanity-checks-in-container-clicks.patch
diff --git a/patches/server/1014-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/unapplied/server/1014-Call-BlockRedstoneEvents-for-lecterns.patch
index dcb22051b6..dcb22051b6 100644
--- a/patches/server/1014-Call-BlockRedstoneEvents-for-lecterns.patch
+++ b/patches/unapplied/server/1014-Call-BlockRedstoneEvents-for-lecterns.patch
diff --git a/patches/server/1015-Allow-proper-checking-of-empty-item-stacks.patch b/patches/unapplied/server/1015-Allow-proper-checking-of-empty-item-stacks.patch
index e6510b371c..e6510b371c 100644
--- a/patches/server/1015-Allow-proper-checking-of-empty-item-stacks.patch
+++ b/patches/unapplied/server/1015-Allow-proper-checking-of-empty-item-stacks.patch
diff --git a/patches/server/1016-Fix-silent-equipment-change-for-mobs.patch b/patches/unapplied/server/1016-Fix-silent-equipment-change-for-mobs.patch
index 69b6c41e6e..69b6c41e6e 100644
--- a/patches/server/1016-Fix-silent-equipment-change-for-mobs.patch
+++ b/patches/unapplied/server/1016-Fix-silent-equipment-change-for-mobs.patch
diff --git a/patches/server/1017-Fix-spigot-s-Forced-Stats.patch b/patches/unapplied/server/1017-Fix-spigot-s-Forced-Stats.patch
index 8e012f221e..8e012f221e 100644
--- a/patches/server/1017-Fix-spigot-s-Forced-Stats.patch
+++ b/patches/unapplied/server/1017-Fix-spigot-s-Forced-Stats.patch
diff --git a/patches/server/1018-Add-missing-InventoryHolders-to-inventories.patch b/patches/unapplied/server/1018-Add-missing-InventoryHolders-to-inventories.patch
index b171f93a3c..c265ded09f 100644
--- a/patches/server/1018-Add-missing-InventoryHolders-to-inventories.patch
+++ b/patches/unapplied/server/1018-Add-missing-InventoryHolders-to-inventories.patch
@@ -57,7 +57,7 @@ index 9d1ee40456a8d7001eee654a62e62cab2626305a..ecd6cb02ef326c8e1d7fba8138d806f3
      public SimpleContainer(int i, org.bukkit.inventory.InventoryHolder owner) {
          this.bukkitOwner = owner;
 diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-index 5d298b11f74cd2da47e6613ced621ab62aa73a7b..f664da5a8413bb13cc95d2cf1604f11a5d285dae 100644
+index aea228ea9fee51c25a03ce1c54bf9dff0741e053..82f18790b9dc55b039ae03600a80a46d56a87521 100644
 --- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 @@ -1025,4 +1025,15 @@ public abstract class AbstractContainerMenu {
diff --git a/patches/server/1019-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/unapplied/server/1019-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
index 738c4d4886..738c4d4886 100644
--- a/patches/server/1019-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
+++ b/patches/unapplied/server/1019-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
diff --git a/patches/server/1020-Actually-optimise-explosions.patch b/patches/unapplied/server/1020-Actually-optimise-explosions.patch
index a835a68c02..a835a68c02 100644
--- a/patches/server/1020-Actually-optimise-explosions.patch
+++ b/patches/unapplied/server/1020-Actually-optimise-explosions.patch
diff --git a/patches/server/1021-Add-missing-logs-for-log-ips-config-option.patch b/patches/unapplied/server/1021-Add-missing-logs-for-log-ips-config-option.patch
index 604b80916e..604b80916e 100644
--- a/patches/server/1021-Add-missing-logs-for-log-ips-config-option.patch
+++ b/patches/unapplied/server/1021-Add-missing-logs-for-log-ips-config-option.patch
diff --git a/patches/server/1022-Remove-Spigot-Bug-Fix-for-MC-109346.patch b/patches/unapplied/server/1022-Remove-Spigot-Bug-Fix-for-MC-109346.patch
index d3ecc69301..d3ecc69301 100644
--- a/patches/server/1022-Remove-Spigot-Bug-Fix-for-MC-109346.patch
+++ b/patches/unapplied/server/1022-Remove-Spigot-Bug-Fix-for-MC-109346.patch
diff --git a/patches/server/1023-Fix-SuspiciousStewMeta.patch b/patches/unapplied/server/1023-Fix-SuspiciousStewMeta.patch
index 834deff5db..834deff5db 100644
--- a/patches/server/1023-Fix-SuspiciousStewMeta.patch
+++ b/patches/unapplied/server/1023-Fix-SuspiciousStewMeta.patch
diff --git a/patches/server/1024-Optimise-chunk-tick-iteration.patch b/patches/unapplied/server/1024-Optimise-chunk-tick-iteration.patch
index 43a42f52d9..68277250ec 100644
--- a/patches/server/1024-Optimise-chunk-tick-iteration.patch
+++ b/patches/unapplied/server/1024-Optimise-chunk-tick-iteration.patch
@@ -9,7 +9,7 @@ class to quickly retrieve nearby players instead of possible
 searching all players on the server.
 
 diff --git a/src/main/java/io/papermc/paper/util/player/NearbyPlayers.java b/src/main/java/io/papermc/paper/util/player/NearbyPlayers.java
-index a5bd0845a2445fa02561b16fb54a7cf49c114915..380fd05abe191025e12bdd6811e1df90c96e4667 100644
+index c3ce8a42dddd76b7189ad5685b23f9d9f8ccadb3..17ba07cbd4792f63d88ce29d00da280f30c4abff 100644
 --- a/src/main/java/io/papermc/paper/util/player/NearbyPlayers.java
 +++ b/src/main/java/io/papermc/paper/util/player/NearbyPlayers.java
 @@ -17,7 +17,8 @@ public final class NearbyPlayers {
@@ -359,7 +359,7 @@ index 8ef4b33c09c64c417e9b0d259550d7f78d1cec14..8c33a12ca879c46893150d6adfb8aa4d
              gameprofilerfiller.pop();
              this.chunkMap.tick();
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 872bd74b581249a8132ec5c37dfdd9e699bfbafa..f71a4a8307fb092d33545e12d253e0b80c884168 100644
+index 67f03dd59ebcf74fae476b79a367778a9e942ed3..08980763020a13ab49dc7d637625a4fba56da8c9 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -318,6 +318,9 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/1025-Lag-compensation-ticks.patch b/patches/unapplied/server/1025-Lag-compensation-ticks.patch
index ae178899ed..216f069a66 100644
--- a/patches/server/1025-Lag-compensation-ticks.patch
+++ b/patches/unapplied/server/1025-Lag-compensation-ticks.patch
@@ -30,7 +30,7 @@ index 1bac9f7894321b5710f5475f6598ec9f3ccd94d3..8f31413c939cc2b0454ad3d9a1b618db
              net.minecraft.world.level.block.entity.HopperBlockEntity.skipHopperEvents = worldserver.paperConfig().hopper.disableMoveEvent || org.bukkit.event.inventory.InventoryMoveItemEvent.getHandlerList().getRegisteredListeners().length == 0; // Paper
              worldserver.hasEntityMoveEvent =  io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index d38559bd6071e2e37dea46068ead80a24702ff3b..ee6d9c19dbc01d46c60d0067664266c203087d8e 100644
+index deebfe66d9c0f799043c3458a0108dc18bfdf15f..4296e0fec900ac0be4f1ebbc539e60f28f96a9cc 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -564,6 +564,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -52,7 +52,7 @@ index d38559bd6071e2e37dea46068ead80a24702ff3b..ee6d9c19dbc01d46c60d0067664266c2
      // Add env and gen to constructor, IWorldDataServer -> WorldDataServer
      public ServerLevel(MinecraftServer minecraftserver, Executor executor, LevelStorageSource.LevelStorageAccess convertable_conversionsession, PrimaryLevelData iworlddataserver, ResourceKey<Level> resourcekey, LevelStem worlddimension, ChunkProgressListener worldloadlistener, boolean flag, long i, List<CustomSpawner> list, boolean flag1, @Nullable RandomSequences randomsequences, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index cd57234a5f1131f48c9726f89262f253e61b9811..106a312aba249d1e83e4b535fc6e741e04ccfd14 100644
+index 25f7adf194a165fa28488f80b87382c08111f896..346912d854a176a410920e69d063919f5d34626a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -124,7 +124,7 @@ public class ServerPlayerGameMode {
diff --git a/patches/server/1026-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/unapplied/server/1026-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
index 34c0a06240..34c0a06240 100644
--- a/patches/server/1026-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
+++ b/patches/unapplied/server/1026-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
diff --git a/patches/server/1027-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/unapplied/server/1027-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
index 7ccf4c0f03..7ccf4c0f03 100644
--- a/patches/server/1027-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
+++ b/patches/unapplied/server/1027-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
diff --git a/patches/server/1028-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/unapplied/server/1028-Fix-team-sidebar-objectives-not-being-cleared.patch
index 6aa46a84f6..6aa46a84f6 100644
--- a/patches/server/1028-Fix-team-sidebar-objectives-not-being-cleared.patch
+++ b/patches/unapplied/server/1028-Fix-team-sidebar-objectives-not-being-cleared.patch
diff --git a/patches/server/1029-Optimise-nearby-player-retrieval.patch b/patches/unapplied/server/1029-Optimise-nearby-player-retrieval.patch
index 114dfb6f4d..ae6467b232 100644
--- a/patches/server/1029-Optimise-nearby-player-retrieval.patch
+++ b/patches/unapplied/server/1029-Optimise-nearby-player-retrieval.patch
@@ -8,7 +8,7 @@ we can instead use the nearby player tracking system to reduce
 the number of tests per search.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index ee6d9c19dbc01d46c60d0067664266c203087d8e..19ffb121934e9249d18fa53cae1ae892dfd7f8d4 100644
+index 4296e0fec900ac0be4f1ebbc539e60f28f96a9cc..e33c8a4d8027329a71777e9734c79068b48672f4 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -575,6 +575,115 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/1030-Remove-streams-for-villager-AI.patch b/patches/unapplied/server/1030-Remove-streams-for-villager-AI.patch
index a2538da4d0..a2538da4d0 100644
--- a/patches/server/1030-Remove-streams-for-villager-AI.patch
+++ b/patches/unapplied/server/1030-Remove-streams-for-villager-AI.patch
diff --git a/patches/server/1031-Fix-missing-map-initialize-event-call.patch b/patches/unapplied/server/1031-Fix-missing-map-initialize-event-call.patch
index 76a90f7aec..18934b68b2 100644
--- a/patches/server/1031-Fix-missing-map-initialize-event-call.patch
+++ b/patches/unapplied/server/1031-Fix-missing-map-initialize-event-call.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix missing map initialize event call
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 19ffb121934e9249d18fa53cae1ae892dfd7f8d4..584a768f2ce1c98a1de7749060c47f21721f9055 100644
+index e33c8a4d8027329a71777e9734c79068b48672f4..c88d5b9125f6ee43bf2be60fd1745d836f271b78 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2100,7 +2100,23 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/1032-Update-entity-data-when-attaching-firework-to-entity.patch b/patches/unapplied/server/1032-Update-entity-data-when-attaching-firework-to-entity.patch
index 40c89bc2cc..40c89bc2cc 100644
--- a/patches/server/1032-Update-entity-data-when-attaching-firework-to-entity.patch
+++ b/patches/unapplied/server/1032-Update-entity-data-when-attaching-firework-to-entity.patch
diff --git a/patches/server/1033-Use-correct-variable-for-initializing-CraftLootTable.patch b/patches/unapplied/server/1033-Use-correct-variable-for-initializing-CraftLootTable.patch
index bffc71910b..bffc71910b 100644
--- a/patches/server/1033-Use-correct-variable-for-initializing-CraftLootTable.patch
+++ b/patches/unapplied/server/1033-Use-correct-variable-for-initializing-CraftLootTable.patch
diff --git a/patches/server/1034-Make-setVelocity-method-of-Fireballs-change-the-trav.patch b/patches/unapplied/server/1034-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
index b36b8cf1f6..b36b8cf1f6 100644
--- a/patches/server/1034-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
+++ b/patches/unapplied/server/1034-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
diff --git a/patches/server/1035-Fix-UnsafeValues-loadAdvancement.patch b/patches/unapplied/server/1035-Fix-UnsafeValues-loadAdvancement.patch
index 2b7c0f8110..2b7c0f8110 100644
--- a/patches/server/1035-Fix-UnsafeValues-loadAdvancement.patch
+++ b/patches/unapplied/server/1035-Fix-UnsafeValues-loadAdvancement.patch
diff --git a/patches/server/1036-Add-player-idle-duration-API.patch b/patches/unapplied/server/1036-Add-player-idle-duration-API.patch
index 7f8e3a5ac8..7f8e3a5ac8 100644
--- a/patches/server/1036-Add-player-idle-duration-API.patch
+++ b/patches/unapplied/server/1036-Add-player-idle-duration-API.patch
diff --git a/patches/server/1037-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/unapplied/server/1037-Don-t-check-if-we-can-see-non-visible-entities.patch
index 81712ec1a3..81712ec1a3 100644
--- a/patches/server/1037-Don-t-check-if-we-can-see-non-visible-entities.patch
+++ b/patches/unapplied/server/1037-Don-t-check-if-we-can-see-non-visible-entities.patch
diff --git a/patches/server/1038-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/unapplied/server/1038-Fix-NPE-in-SculkBloomEvent-world-access.patch
index f4db24ce29..f4db24ce29 100644
--- a/patches/server/1038-Fix-NPE-in-SculkBloomEvent-world-access.patch
+++ b/patches/unapplied/server/1038-Fix-NPE-in-SculkBloomEvent-world-access.patch
diff --git a/patches/server/1039-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/unapplied/server/1039-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
index 39becf9031..39becf9031 100644
--- a/patches/server/1039-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
+++ b/patches/unapplied/server/1039-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
diff --git a/patches/server/1040-Optimize-VarInts.patch b/patches/unapplied/server/1040-Optimize-VarInts.patch
index 19e7fc574a..19e7fc574a 100644
--- a/patches/server/1040-Optimize-VarInts.patch
+++ b/patches/unapplied/server/1040-Optimize-VarInts.patch
diff --git a/patches/server/1041-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/unapplied/server/1041-Add-API-to-get-the-collision-shape-of-a-block-before.patch
index 1db7a2132f..1db7a2132f 100644
--- a/patches/server/1041-Add-API-to-get-the-collision-shape-of-a-block-before.patch
+++ b/patches/unapplied/server/1041-Add-API-to-get-the-collision-shape-of-a-block-before.patch
diff --git a/patches/server/1042-Add-predicate-for-blocks-when-raytracing.patch b/patches/unapplied/server/1042-Add-predicate-for-blocks-when-raytracing.patch
index 470fc8b21f..470fc8b21f 100644
--- a/patches/server/1042-Add-predicate-for-blocks-when-raytracing.patch
+++ b/patches/unapplied/server/1042-Add-predicate-for-blocks-when-raytracing.patch
diff --git a/patches/server/1043-Broadcast-take-item-packets-with-collector-as-source.patch b/patches/unapplied/server/1043-Broadcast-take-item-packets-with-collector-as-source.patch
index 49d87853e2..49d87853e2 100644
--- a/patches/server/1043-Broadcast-take-item-packets-with-collector-as-source.patch
+++ b/patches/unapplied/server/1043-Broadcast-take-item-packets-with-collector-as-source.patch
diff --git a/patches/server/1044-fix-secure-profile-with-proxy-online-mode.patch b/patches/unapplied/server/1044-fix-secure-profile-with-proxy-online-mode.patch
index d4821bb7bf..3013abe82a 100644
--- a/patches/server/1044-fix-secure-profile-with-proxy-online-mode.patch
+++ b/patches/unapplied/server/1044-fix-secure-profile-with-proxy-online-mode.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] fix secure profile with proxy online mode
 
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 2b5d82fbf4e7ec32d0c53dd3e8207b1dba708bbd..cf605aa56adf7f80d3b409f60a92a5ca7ae8fd07 100644
+index 4454944ba851216c8c88fe76ee910a2da52a2292..1c9742ad81f04052d2c3bc18c7636f45b2fc5160 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -637,8 +637,11 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/1045-Expand-LingeringPotion-API.patch b/patches/unapplied/server/1045-Expand-LingeringPotion-API.patch
index 9939920a04..9939920a04 100644
--- a/patches/server/1045-Expand-LingeringPotion-API.patch
+++ b/patches/unapplied/server/1045-Expand-LingeringPotion-API.patch
diff --git a/patches/server/1046-Add-MaterialTagsTest.patch b/patches/unapplied/server/1046-Add-MaterialTagsTest.patch
index 34233ba1ca..34233ba1ca 100644
--- a/patches/server/1046-Add-MaterialTagsTest.patch
+++ b/patches/unapplied/server/1046-Add-MaterialTagsTest.patch
diff --git a/patches/server/1047-Don-t-unpack-loot-table-for-TEs-not-in-world.patch b/patches/unapplied/server/1047-Don-t-unpack-loot-table-for-TEs-not-in-world.patch
index 2c7310b079..2c7310b079 100644
--- a/patches/server/1047-Don-t-unpack-loot-table-for-TEs-not-in-world.patch
+++ b/patches/unapplied/server/1047-Don-t-unpack-loot-table-for-TEs-not-in-world.patch
diff --git a/patches/server/1048-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch b/patches/unapplied/server/1048-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
index ae6546e43d..ae6546e43d 100644
--- a/patches/server/1048-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
+++ b/patches/unapplied/server/1048-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
diff --git a/patches/server/1049-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/unapplied/server/1049-Add-hand-to-fish-event-for-all-player-interactions.patch
index 6fef553fc5..6fef553fc5 100644
--- a/patches/server/1049-Add-hand-to-fish-event-for-all-player-interactions.patch
+++ b/patches/unapplied/server/1049-Add-hand-to-fish-event-for-all-player-interactions.patch
diff --git a/patches/server/1050-Fix-several-issues-with-EntityBreedEvent.patch b/patches/unapplied/server/1050-Fix-several-issues-with-EntityBreedEvent.patch
index 40875fb77f..40875fb77f 100644
--- a/patches/server/1050-Fix-several-issues-with-EntityBreedEvent.patch
+++ b/patches/unapplied/server/1050-Fix-several-issues-with-EntityBreedEvent.patch
diff --git a/patches/server/1051-Add-UUID-attribute-modifier-API.patch b/patches/unapplied/server/1051-Add-UUID-attribute-modifier-API.patch
index 62d8cf7c98..62d8cf7c98 100644
--- a/patches/server/1051-Add-UUID-attribute-modifier-API.patch
+++ b/patches/unapplied/server/1051-Add-UUID-attribute-modifier-API.patch
diff --git a/patches/server/1052-Fix-missing-event-call-for-entity-teleport-API.patch b/patches/unapplied/server/1052-Fix-missing-event-call-for-entity-teleport-API.patch
index 188fe7cb44..188fe7cb44 100644
--- a/patches/server/1052-Fix-missing-event-call-for-entity-teleport-API.patch
+++ b/patches/unapplied/server/1052-Fix-missing-event-call-for-entity-teleport-API.patch
diff --git a/patches/server/1053-Lazily-create-LootContext-for-criterions.patch b/patches/unapplied/server/1053-Lazily-create-LootContext-for-criterions.patch
index ef6c752ac2..ef6c752ac2 100644
--- a/patches/server/1053-Lazily-create-LootContext-for-criterions.patch
+++ b/patches/unapplied/server/1053-Lazily-create-LootContext-for-criterions.patch
diff --git a/patches/server/1054-Don-t-fire-EntityPotionEffectEvent-during-worldgen.patch b/patches/unapplied/server/1054-Don-t-fire-EntityPotionEffectEvent-during-worldgen.patch
index eab8166c90..eab8166c90 100644
--- a/patches/server/1054-Don-t-fire-EntityPotionEffectEvent-during-worldgen.patch
+++ b/patches/unapplied/server/1054-Don-t-fire-EntityPotionEffectEvent-during-worldgen.patch
diff --git a/patches/server/1055-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch b/patches/unapplied/server/1055-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
index 4ede0eb9e6..4ede0eb9e6 100644
--- a/patches/server/1055-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
+++ b/patches/unapplied/server/1055-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
diff --git a/patches/server/1056-Restore-vanilla-entity-drops-behavior.patch b/patches/unapplied/server/1056-Restore-vanilla-entity-drops-behavior.patch
index 4b72d8152a..4b72d8152a 100644
--- a/patches/server/1056-Restore-vanilla-entity-drops-behavior.patch
+++ b/patches/unapplied/server/1056-Restore-vanilla-entity-drops-behavior.patch
diff --git a/patches/server/1057-Add-Structure-check-API.patch b/patches/unapplied/server/1057-Add-Structure-check-API.patch
index e5d4b0637c..e5d4b0637c 100644
--- a/patches/server/1057-Add-Structure-check-API.patch
+++ b/patches/unapplied/server/1057-Add-Structure-check-API.patch
diff --git a/patches/server/1058-Dont-resend-blocks-on-interactions.patch b/patches/unapplied/server/1058-Dont-resend-blocks-on-interactions.patch
index 881ff8d21a..881ff8d21a 100644
--- a/patches/server/1058-Dont-resend-blocks-on-interactions.patch
+++ b/patches/unapplied/server/1058-Dont-resend-blocks-on-interactions.patch
diff --git a/work/BuildData b/work/BuildData
-Subproject 172197ceb99364701937947ea7fc424ecf1bb69
+Subproject 58819a3c2a15e6e47ad89d32fb60d44c253491f
diff --git a/work/Bukkit b/work/Bukkit
-Subproject 96340858187334c2f24f6acdc904561655c6cba
+Subproject adcf6347c520b143677b2380edfb228661facf0
diff --git a/work/CraftBukkit b/work/CraftBukkit
-Subproject 8e162d0083aa05bd3b4ec8972093fe7e9e9b53b
+Subproject 8232a74cf8d32bce37c33ff6d0cd9b688a1ef8e
diff --git a/work/Spigot b/work/Spigot
-Subproject 7de1049b2a99eaca8090596e3b8e2ba8431f27e
+Subproject 9d728858d26d780a91aa8e3541bcfda9de7f76d