Allow use of TYPE_USE annotations

317 files changed, 56 insertions, 27 deletions

diff --git a/patches/api/0003-Allow-use-of-TYPE_USE-annotations.patch b/patches/api/0003-Allow-use-of-TYPE_USE-annotations.patch
new file mode 100644
index 0000000000..154124ad2d
--- /dev/null
+++ b/patches/api/0003-Allow-use-of-TYPE_USE-annotations.patch
@@ -0,0 +1,38 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Riley Park <[email protected]>
+Date: Mon, 21 Jun 2021 09:51:29 -0700
+Subject: [PATCH] Allow use of TYPE_USE annotations
+
+
+diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
+index 0c7377247ad9251c9e498039511e7220370aba2d..2ef6b56642f792d1a648e76e904e61bf7a662f8c 100644
+--- a/src/test/java/org/bukkit/AnnotationTest.java
++++ b/src/test/java/org/bukkit/AnnotationTest.java
+@@ -66,15 +66,26 @@ public class AnnotationTest {
+                     continue;
+                 }
+ 
+-                if (mustBeAnnotated(Type.getReturnType(method.desc)) && !isWellAnnotated(method.invisibleAnnotations)) {
++                if (mustBeAnnotated(Type.getReturnType(method.desc)) && !isWellAnnotated(method.invisibleAnnotations) && !isWellAnnotated(method.visibleTypeAnnotations) && !isWellAnnotated(method.invisibleTypeAnnotations)) { // Paper - also check (in)visible type annotations
+                     warn(errors, clazz, method, "return value");
+                 }
+ 
+                 Type[] paramTypes = Type.getArgumentTypes(method.desc);
+                 List<ParameterNode> parameters = method.parameters;
+ 
++                dancing: // Paper
+                 for (int i = 0; i < paramTypes.length; i++) {
+                     if (mustBeAnnotated(paramTypes[i]) && !isWellAnnotated(method.invisibleParameterAnnotations == null ? null : method.invisibleParameterAnnotations[i])) {
++                        // Paper start - wheeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
++                        if (method.invisibleTypeAnnotations != null) {
++                            for (final org.objectweb.asm.tree.TypeAnnotationNode invisibleTypeAnnotation : method.invisibleTypeAnnotations) {
++                                final org.objectweb.asm.TypeReference ref = new org.objectweb.asm.TypeReference(invisibleTypeAnnotation.typeRef);
++                                if (ref.getSort() == org.objectweb.asm.TypeReference.METHOD_FORMAL_PARAMETER && ref.getTypeParameterIndex() == i && java.util.Arrays.binarySearch(ACCEPTED_ANNOTATIONS, invisibleTypeAnnotation.desc) >= 0) {
++                                    continue dancing;
++                                }
++                            }
++                        }
++                        // Paper end
+                         ParameterNode paramNode = parameters == null ? null : parameters.get(i);
+                         String paramName = paramNode == null ? null : paramNode.name;
+ 
diff --git a/patches/api/0003-Add-FastUtil-to-Bukkit.patch b/patches/api/0004-Add-FastUtil-to-Bukkit.patch
index c63cf43765..c63cf43765 100644
--- a/patches/api/0003-Add-FastUtil-to-Bukkit.patch
+++ b/patches/api/0004-Add-FastUtil-to-Bukkit.patch
diff --git a/patches/api/0004-Paper-Utils.patch b/patches/api/0005-Paper-Utils.patch
index a647b698ad..a647b698ad 100644
--- a/patches/api/0004-Paper-Utils.patch
+++ b/patches/api/0005-Paper-Utils.patch
diff --git a/patches/api/0005-Timings-v2.patch b/patches/api/0006-Timings-v2.patch
index a79549bfa0..a79549bfa0 100644
--- a/patches/api/0005-Timings-v2.patch
+++ b/patches/api/0006-Timings-v2.patch
diff --git a/patches/api/0006-Adventure.patch b/patches/api/0007-Adventure.patch
index d202369b4b..7fcfad68c6 100644
--- a/patches/api/0006-Adventure.patch
+++ b/patches/api/0007-Adventure.patch
@@ -3706,7 +3706,7 @@ index da01d2926cc8a2485a3349ac1ebb32cad20e287c..f0af10a5b9ad048be197ed5ec6c8ed26
  
      /**
 diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
-index 0c7377247ad9251c9e498039511e7220370aba2d..c62919f18f318fec15a6c364d8b6d562c2b04762 100644
+index 4aee3dd321453009fda10db9c4fbea0ffed6ed69..002677ac589aa88b643c52a883a72a2bdc3696dd 100644
 --- a/src/test/java/org/bukkit/AnnotationTest.java
 +++ b/src/test/java/org/bukkit/AnnotationTest.java
 @@ -26,6 +26,12 @@ import org.objectweb.asm.tree.ParameterNode;
@@ -3722,16 +3722,7 @@ index 0c7377247ad9251c9e498039511e7220370aba2d..c62919f18f318fec15a6c364d8b6d562
          "Lorg/jetbrains/annotations/Nullable;",
          "Lorg/jetbrains/annotations/NotNull;",
          "Lorg/jetbrains/annotations/Contract;",
-@@ -66,7 +72,7 @@ public class AnnotationTest {
-                     continue;
-                 }
- 
--                if (mustBeAnnotated(Type.getReturnType(method.desc)) && !isWellAnnotated(method.invisibleAnnotations)) {
-+                if (mustBeAnnotated(Type.getReturnType(method.desc)) && !isWellAnnotated(method.invisibleAnnotations) && !isWellAnnotated(method.visibleTypeAnnotations)) { // Paper - also check visible type annotations
-                     warn(errors, clazz, method, "return value");
-                 }
- 
-@@ -174,7 +180,7 @@ public class AnnotationTest {
+@@ -185,7 +191,7 @@ public class AnnotationTest {
          return true;
      }
  
diff --git a/patches/api/0007-Player-affects-spawning-API.patch b/patches/api/0008-Player-affects-spawning-API.patch
index 6d27ffd3e8..6d27ffd3e8 100644
--- a/patches/api/0007-Player-affects-spawning-API.patch
+++ b/patches/api/0008-Player-affects-spawning-API.patch
diff --git a/patches/api/0008-Add-getTPS-method.patch b/patches/api/0009-Add-getTPS-method.patch
index fc33d04f13..fc33d04f13 100644
--- a/patches/api/0008-Add-getTPS-method.patch
+++ b/patches/api/0009-Add-getTPS-method.patch
diff --git a/patches/api/0009-Entity-Origin-API.patch b/patches/api/0010-Entity-Origin-API.patch
index 626916f4f7..d34f06d5e7 100644
--- a/patches/api/0009-Entity-Origin-API.patch
+++ b/patches/api/0010-Entity-Origin-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity Origin API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 03e12de470f983e89a473c4e42c21941085b1d37..fdce246aecac775c3ff4a028c307b09762505258 100644
+index d7a4cfed4f46b34f83fb2c07bdab5a71215d26bb..8c93c640dd163ca99df81706715117094fea5738 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -655,5 +655,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
diff --git a/patches/api/0010-Version-Command-2.0.patch b/patches/api/0011-Version-Command-2.0.patch
index c7cc974e1a..c7cc974e1a 100644
--- a/patches/api/0010-Version-Command-2.0.patch
+++ b/patches/api/0011-Version-Command-2.0.patch
diff --git a/patches/api/0011-Add-PlayerLocaleChangeEvent.patch b/patches/api/0012-Add-PlayerLocaleChangeEvent.patch
index 10593168ec..10593168ec 100644
--- a/patches/api/0011-Add-PlayerLocaleChangeEvent.patch
+++ b/patches/api/0012-Add-PlayerLocaleChangeEvent.patch
diff --git a/patches/api/0012-Add-player-view-distance-API.patch b/patches/api/0013-Add-player-view-distance-API.patch
index 51f138cb33..51f138cb33 100644
--- a/patches/api/0012-Add-player-view-distance-API.patch
+++ b/patches/api/0013-Add-player-view-distance-API.patch
diff --git a/patches/api/0013-Add-BeaconEffectEvent.patch b/patches/api/0014-Add-BeaconEffectEvent.patch
index 43af3c3828..43af3c3828 100644
--- a/patches/api/0013-Add-BeaconEffectEvent.patch
+++ b/patches/api/0014-Add-BeaconEffectEvent.patch
diff --git a/patches/api/0014-Add-PlayerInitialSpawnEvent.patch b/patches/api/0015-Add-PlayerInitialSpawnEvent.patch
index c113777bf5..c113777bf5 100644
--- a/patches/api/0014-Add-PlayerInitialSpawnEvent.patch
+++ b/patches/api/0015-Add-PlayerInitialSpawnEvent.patch
diff --git a/patches/api/0015-Automatically-disable-plugins-that-fail-to-load.patch b/patches/api/0016-Automatically-disable-plugins-that-fail-to-load.patch
index 55aeb559ba..55aeb559ba 100644
--- a/patches/api/0015-Automatically-disable-plugins-that-fail-to-load.patch
+++ b/patches/api/0016-Automatically-disable-plugins-that-fail-to-load.patch
diff --git a/patches/api/0016-Expose-server-CommandMap.patch b/patches/api/0017-Expose-server-CommandMap.patch
index 539c236ad6..539c236ad6 100644
--- a/patches/api/0016-Expose-server-CommandMap.patch
+++ b/patches/api/0017-Expose-server-CommandMap.patch
diff --git a/patches/api/0017-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/patches/api/0018-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
index 979adae1a2..979adae1a2 100644
--- a/patches/api/0017-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
+++ b/patches/api/0018-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
diff --git a/patches/api/0018-Add-exception-reporting-event.patch b/patches/api/0019-Add-exception-reporting-event.patch
index 0b5258ca98..0b5258ca98 100644
--- a/patches/api/0018-Add-exception-reporting-event.patch
+++ b/patches/api/0019-Add-exception-reporting-event.patch
diff --git a/patches/api/0019-Player-Tab-List-and-Title-APIs.patch b/patches/api/0020-Player-Tab-List-and-Title-APIs.patch
index 201a65b955..201a65b955 100644
--- a/patches/api/0019-Player-Tab-List-and-Title-APIs.patch
+++ b/patches/api/0020-Player-Tab-List-and-Title-APIs.patch
diff --git a/patches/api/0020-Fix-ServerListPingEvent-flagging-as-Async.patch b/patches/api/0021-Fix-ServerListPingEvent-flagging-as-Async.patch
index 87d3369578..87d3369578 100644
--- a/patches/api/0020-Fix-ServerListPingEvent-flagging-as-Async.patch
+++ b/patches/api/0021-Fix-ServerListPingEvent-flagging-as-Async.patch
diff --git a/patches/api/0021-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch b/patches/api/0022-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
index b8376a9108..b8376a9108 100644
--- a/patches/api/0021-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
+++ b/patches/api/0022-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
diff --git a/patches/api/0022-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/patches/api/0023-Add-methods-for-working-with-arrows-stuck-in-living-.patch
index c2662ea313..c2662ea313 100644
--- a/patches/api/0022-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/patches/api/0023-Add-methods-for-working-with-arrows-stuck-in-living-.patch
diff --git a/patches/api/0023-Complete-resource-pack-API.patch b/patches/api/0024-Complete-resource-pack-API.patch
index 71526451a2..71526451a2 100644
--- a/patches/api/0023-Complete-resource-pack-API.patch
+++ b/patches/api/0024-Complete-resource-pack-API.patch
diff --git a/patches/api/0024-Use-ASM-for-event-executors.patch b/patches/api/0025-Use-ASM-for-event-executors.patch
index b886c8d3d4..0d912355ab 100644
--- a/patches/api/0024-Use-ASM-for-event-executors.patch
+++ b/patches/api/0025-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 3a36b2b7f38e3446177f0883083d30c739f6c9b1..9d0675e2afcd9c0f82b6e993b1185d507b32ed0f 100644
+index 19b55f2c25db81fc352a7ab973b2ca7fefbcb432..d1a3e38012873109709cc6fffdce9d9c5614ec73 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -24,6 +24,8 @@ dependencies {
diff --git a/patches/api/0025-Add-a-call-helper-to-Event.patch b/patches/api/0026-Add-a-call-helper-to-Event.patch
index 4b287bfa56..4b287bfa56 100644
--- a/patches/api/0025-Add-a-call-helper-to-Event.patch
+++ b/patches/api/0026-Add-a-call-helper-to-Event.patch
diff --git a/patches/api/0026-Add-sender-name-to-commands.yml-replacement.patch b/patches/api/0027-Add-sender-name-to-commands.yml-replacement.patch
index 7122fed4a2..7122fed4a2 100644
--- a/patches/api/0026-Add-sender-name-to-commands.yml-replacement.patch
+++ b/patches/api/0027-Add-sender-name-to-commands.yml-replacement.patch
diff --git a/patches/api/0027-Add-command-to-reload-permissions.yml-and-require-co.patch b/patches/api/0028-Add-command-to-reload-permissions.yml-and-require-co.patch
index d7a1bb7514..d7a1bb7514 100644
--- a/patches/api/0027-Add-command-to-reload-permissions.yml-and-require-co.patch
+++ b/patches/api/0028-Add-command-to-reload-permissions.yml-and-require-co.patch
diff --git a/patches/api/0028-Custom-replacement-for-eaten-items.patch b/patches/api/0029-Custom-replacement-for-eaten-items.patch
index 94ff9d88e2..94ff9d88e2 100644
--- a/patches/api/0028-Custom-replacement-for-eaten-items.patch
+++ b/patches/api/0029-Custom-replacement-for-eaten-items.patch
diff --git a/patches/api/0029-Entity-AddTo-RemoveFrom-World-Events.patch b/patches/api/0030-Entity-AddTo-RemoveFrom-World-Events.patch
index 5dc11c88f8..5dc11c88f8 100644
--- a/patches/api/0029-Entity-AddTo-RemoveFrom-World-Events.patch
+++ b/patches/api/0030-Entity-AddTo-RemoveFrom-World-Events.patch
diff --git a/patches/api/0030-EntityPathfindEvent.patch b/patches/api/0031-EntityPathfindEvent.patch
index 697b76661a..697b76661a 100644
--- a/patches/api/0030-EntityPathfindEvent.patch
+++ b/patches/api/0031-EntityPathfindEvent.patch
diff --git a/patches/api/0031-Reduce-thread-synchronization-in-MetadataStoreBase.patch b/patches/api/0032-Reduce-thread-synchronization-in-MetadataStoreBase.patch
index d4674ca2f4..d4674ca2f4 100644
--- a/patches/api/0031-Reduce-thread-synchronization-in-MetadataStoreBase.patch
+++ b/patches/api/0032-Reduce-thread-synchronization-in-MetadataStoreBase.patch
diff --git a/patches/api/0032-Add-MetadataStoreBase.removeAll-Plugin.patch b/patches/api/0033-Add-MetadataStoreBase.removeAll-Plugin.patch
index d15d19b316..d15d19b316 100644
--- a/patches/api/0032-Add-MetadataStoreBase.removeAll-Plugin.patch
+++ b/patches/api/0033-Add-MetadataStoreBase.removeAll-Plugin.patch
diff --git a/patches/api/0033-Add-PlayerUseUnknownEntityEvent.patch b/patches/api/0034-Add-PlayerUseUnknownEntityEvent.patch
index 8fa59475c2..8fa59475c2 100644
--- a/patches/api/0033-Add-PlayerUseUnknownEntityEvent.patch
+++ b/patches/api/0034-Add-PlayerUseUnknownEntityEvent.patch
diff --git a/patches/api/0034-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/patches/api/0035-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
index eb1703e485..eb1703e485 100644
--- a/patches/api/0034-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
+++ b/patches/api/0035-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
diff --git a/patches/api/0035-Arrow-pickup-rule-API.patch b/patches/api/0036-Arrow-pickup-rule-API.patch
index fb3753f0e1..fb3753f0e1 100644
--- a/patches/api/0035-Arrow-pickup-rule-API.patch
+++ b/patches/api/0036-Arrow-pickup-rule-API.patch
diff --git a/patches/api/0036-EntityRegainHealthEvent-isFastRegen-API.patch b/patches/api/0037-EntityRegainHealthEvent-isFastRegen-API.patch
index f06ee13d15..f06ee13d15 100644
--- a/patches/api/0036-EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/patches/api/0037-EntityRegainHealthEvent-isFastRegen-API.patch
diff --git a/patches/api/0037-LootTable-API.patch b/patches/api/0038-LootTable-API.patch
index ed6e56042d..ed6e56042d 100644
--- a/patches/api/0037-LootTable-API.patch
+++ b/patches/api/0038-LootTable-API.patch
diff --git a/patches/api/0038-Add-EntityZapEvent.patch b/patches/api/0039-Add-EntityZapEvent.patch
index 41d603f073..41d603f073 100644
--- a/patches/api/0038-Add-EntityZapEvent.patch
+++ b/patches/api/0039-Add-EntityZapEvent.patch
diff --git a/patches/api/0039-Misc-Utils.patch b/patches/api/0040-Misc-Utils.patch
index fac858b16c..fac858b16c 100644
--- a/patches/api/0039-Misc-Utils.patch
+++ b/patches/api/0040-Misc-Utils.patch
diff --git a/patches/api/0040-Allow-Reloading-of-Command-Aliases.patch b/patches/api/0041-Allow-Reloading-of-Command-Aliases.patch
index f20d46cd20..f20d46cd20 100644
--- a/patches/api/0040-Allow-Reloading-of-Command-Aliases.patch
+++ b/patches/api/0041-Allow-Reloading-of-Command-Aliases.patch
diff --git a/patches/api/0041-Add-source-to-PlayerExpChangeEvent.patch b/patches/api/0042-Add-source-to-PlayerExpChangeEvent.patch
index 675b2be839..675b2be839 100644
--- a/patches/api/0041-Add-source-to-PlayerExpChangeEvent.patch
+++ b/patches/api/0042-Add-source-to-PlayerExpChangeEvent.patch
diff --git a/patches/api/0042-Add-ProjectileCollideEvent.patch b/patches/api/0043-Add-ProjectileCollideEvent.patch
index a5c9df18df..a5c9df18df 100644
--- a/patches/api/0042-Add-ProjectileCollideEvent.patch
+++ b/patches/api/0043-Add-ProjectileCollideEvent.patch
diff --git a/patches/api/0043-Add-String-based-Action-Bar-API.patch b/patches/api/0044-Add-String-based-Action-Bar-API.patch
index 21d38f4153..21d38f4153 100644
--- a/patches/api/0043-Add-String-based-Action-Bar-API.patch
+++ b/patches/api/0044-Add-String-based-Action-Bar-API.patch
diff --git a/patches/api/0044-Add-API-methods-to-control-if-armour-stands-can-move.patch b/patches/api/0045-Add-API-methods-to-control-if-armour-stands-can-move.patch
index 04c2e9c73f..04c2e9c73f 100644
--- a/patches/api/0044-Add-API-methods-to-control-if-armour-stands-can-move.patch
+++ b/patches/api/0045-Add-API-methods-to-control-if-armour-stands-can-move.patch
diff --git a/patches/api/0045-IllegalPacketEvent.patch b/patches/api/0046-IllegalPacketEvent.patch
index 7eb8d61aaa..7eb8d61aaa 100644
--- a/patches/api/0045-IllegalPacketEvent.patch
+++ b/patches/api/0046-IllegalPacketEvent.patch
diff --git a/patches/api/0046-Fireworks-API-s.patch b/patches/api/0047-Fireworks-API-s.patch
index a0ed753ac6..a0ed753ac6 100644
--- a/patches/api/0046-Fireworks-API-s.patch
+++ b/patches/api/0047-Fireworks-API-s.patch
diff --git a/patches/api/0047-PlayerTeleportEndGatewayEvent.patch b/patches/api/0048-PlayerTeleportEndGatewayEvent.patch
index 664edd24cd..664edd24cd 100644
--- a/patches/api/0047-PlayerTeleportEndGatewayEvent.patch
+++ b/patches/api/0048-PlayerTeleportEndGatewayEvent.patch
diff --git a/patches/api/0048-Provide-E-TE-Chunk-count-stat-methods.patch b/patches/api/0049-Provide-E-TE-Chunk-count-stat-methods.patch
index 5cd5541fcb..5cd5541fcb 100644
--- a/patches/api/0048-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/patches/api/0049-Provide-E-TE-Chunk-count-stat-methods.patch
diff --git a/patches/api/0049-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/api/0050-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index 5dadaf640f..5dadaf640f 100644
--- a/patches/api/0049-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/patches/api/0050-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
diff --git a/patches/api/0050-Expose-WorldBorder-isInBounds-Location-check.patch b/patches/api/0051-Expose-WorldBorder-isInBounds-Location-check.patch
index f700226be3..f700226be3 100644
--- a/patches/api/0050-Expose-WorldBorder-isInBounds-Location-check.patch
+++ b/patches/api/0051-Expose-WorldBorder-isInBounds-Location-check.patch
diff --git a/patches/api/0051-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/api/0052-Add-configuration-option-to-prevent-player-names-fro.patch
index c69c46b877..c69c46b877 100644
--- a/patches/api/0051-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/patches/api/0052-Add-configuration-option-to-prevent-player-names-fro.patch
diff --git a/patches/api/0052-Fix-upstream-javadoc-warnings-and-errors.patch b/patches/api/0053-Fix-upstream-javadoc-warnings-and-errors.patch
index 922cd6a288..922cd6a288 100644
--- a/patches/api/0052-Fix-upstream-javadoc-warnings-and-errors.patch
+++ b/patches/api/0053-Fix-upstream-javadoc-warnings-and-errors.patch
diff --git a/patches/api/0053-Item-canEntityPickup.patch b/patches/api/0054-Item-canEntityPickup.patch
index 27894bda93..27894bda93 100644
--- a/patches/api/0053-Item-canEntityPickup.patch
+++ b/patches/api/0054-Item-canEntityPickup.patch
diff --git a/patches/api/0054-PlayerAttemptPickupItemEvent.patch b/patches/api/0055-PlayerAttemptPickupItemEvent.patch
index 6b504ae688..6b504ae688 100644
--- a/patches/api/0054-PlayerAttemptPickupItemEvent.patch
+++ b/patches/api/0055-PlayerAttemptPickupItemEvent.patch
diff --git a/patches/api/0055-Add-UnknownCommandEvent.patch b/patches/api/0056-Add-UnknownCommandEvent.patch
index 9e3d997b0d..9e3d997b0d 100644
--- a/patches/api/0055-Add-UnknownCommandEvent.patch
+++ b/patches/api/0056-Add-UnknownCommandEvent.patch
diff --git a/patches/api/0056-Basic-PlayerProfile-API.patch b/patches/api/0057-Basic-PlayerProfile-API.patch
index e39405a942..e39405a942 100644
--- a/patches/api/0056-Basic-PlayerProfile-API.patch
+++ b/patches/api/0057-Basic-PlayerProfile-API.patch
diff --git a/patches/api/0057-PlayerPickupItemEvent-setFlyAtPlayer.patch b/patches/api/0058-PlayerPickupItemEvent-setFlyAtPlayer.patch
index 353d395911..353d395911 100644
--- a/patches/api/0057-PlayerPickupItemEvent-setFlyAtPlayer.patch
+++ b/patches/api/0058-PlayerPickupItemEvent-setFlyAtPlayer.patch
diff --git a/patches/api/0058-Shoulder-Entities-Release-API.patch b/patches/api/0059-Shoulder-Entities-Release-API.patch
index 0cb4374499..0cb4374499 100644
--- a/patches/api/0058-Shoulder-Entities-Release-API.patch
+++ b/patches/api/0059-Shoulder-Entities-Release-API.patch
diff --git a/patches/api/0059-Entity-fromMobSpawner.patch b/patches/api/0060-Entity-fromMobSpawner.patch
index 73b4016c92..44c4dd6e64 100644
--- a/patches/api/0059-Entity-fromMobSpawner.patch
+++ b/patches/api/0060-Entity-fromMobSpawner.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity#fromMobSpawner()
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index fdce246aecac775c3ff4a028c307b09762505258..fdc95c87a6020bdcaee5b0b8ab5a996c0e241b33 100644
+index 8c93c640dd163ca99df81706715117094fea5738..85478ed185a938aa8e95d450da8197c76f13106b 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -665,5 +665,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
diff --git a/patches/api/0060-Profile-Lookup-Events.patch b/patches/api/0061-Profile-Lookup-Events.patch
index 1cdb35476d..1cdb35476d 100644
--- a/patches/api/0060-Profile-Lookup-Events.patch
+++ b/patches/api/0061-Profile-Lookup-Events.patch
diff --git a/patches/api/0061-Improve-the-Saddle-API-for-Horses.patch b/patches/api/0062-Improve-the-Saddle-API-for-Horses.patch
index 85814456bf..85814456bf 100644
--- a/patches/api/0061-Improve-the-Saddle-API-for-Horses.patch
+++ b/patches/api/0062-Improve-the-Saddle-API-for-Horses.patch
diff --git a/patches/api/0062-Add-getI18NDisplayName-API.patch b/patches/api/0063-Add-getI18NDisplayName-API.patch
index 8af413093e..8af413093e 100644
--- a/patches/api/0062-Add-getI18NDisplayName-API.patch
+++ b/patches/api/0063-Add-getI18NDisplayName-API.patch
diff --git a/patches/api/0063-ensureServerConversions-API.patch b/patches/api/0064-ensureServerConversions-API.patch
index 82e1a82c86..82e1a82c86 100644
--- a/patches/api/0063-ensureServerConversions-API.patch
+++ b/patches/api/0064-ensureServerConversions-API.patch
diff --git a/patches/api/0064-Make-plugins-list-alphabetical.patch b/patches/api/0065-Make-plugins-list-alphabetical.patch
index ec1fc9814a..ec1fc9814a 100644
--- a/patches/api/0064-Make-plugins-list-alphabetical.patch
+++ b/patches/api/0065-Make-plugins-list-alphabetical.patch
diff --git a/patches/api/0065-LivingEntity-setKiller.patch b/patches/api/0066-LivingEntity-setKiller.patch
index b7b93870eb..37cb713a6e 100644
--- a/patches/api/0065-LivingEntity-setKiller.patch
+++ b/patches/api/0066-LivingEntity-setKiller.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] LivingEntity#setKiller
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 45e9f585c3e522ecf94a6bc42cdc190e1a191a5c..33fffda7c8b05cde3c95623937e7eb6c8b628ec6 100644
+index b41133f23d25f90fc0993499056c4eeaf003a701..bfc90a3569abc717f37c064e3068c55ef323edab 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -279,6 +279,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0066-ProfileWhitelistVerifyEvent.patch b/patches/api/0067-ProfileWhitelistVerifyEvent.patch
index ff996377f4..ff996377f4 100644
--- a/patches/api/0066-ProfileWhitelistVerifyEvent.patch
+++ b/patches/api/0067-ProfileWhitelistVerifyEvent.patch
diff --git a/patches/api/0067-Allow-plugins-to-use-SLF4J-for-logging.patch b/patches/api/0068-Allow-plugins-to-use-SLF4J-for-logging.patch
index 0ee190ea33..bf10b2b795 100644
--- a/patches/api/0067-Allow-plugins-to-use-SLF4J-for-logging.patch
+++ b/patches/api/0068-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 c10c9f86db276b42d8b7c21c353970691990f125..6d04816e22f44a33c001d2b7e080402fba6af86c 100644
+index d1a3e38012873109709cc6fffdce9d9c5614ec73..e142072f31a41b25ac637970f79e71ab70c2f28c 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -26,6 +26,7 @@ dependencies {
diff --git a/patches/api/0068-Handle-plugin-prefixes-in-implementation-logging-con.patch b/patches/api/0069-Handle-plugin-prefixes-in-implementation-logging-con.patch
index a1273c87c6..a1273c87c6 100644
--- a/patches/api/0068-Handle-plugin-prefixes-in-implementation-logging-con.patch
+++ b/patches/api/0069-Handle-plugin-prefixes-in-implementation-logging-con.patch
diff --git a/patches/api/0069-Add-PlayerJumpEvent.patch b/patches/api/0070-Add-PlayerJumpEvent.patch
index 18f2c35b4d..18f2c35b4d 100644
--- a/patches/api/0069-Add-PlayerJumpEvent.patch
+++ b/patches/api/0070-Add-PlayerJumpEvent.patch
diff --git a/patches/api/0070-Add-workaround-for-plugins-modifying-the-parent-of-t.patch b/patches/api/0071-Add-workaround-for-plugins-modifying-the-parent-of-t.patch
index c4f874c6ed..c4f874c6ed 100644
--- a/patches/api/0070-Add-workaround-for-plugins-modifying-the-parent-of-t.patch
+++ b/patches/api/0071-Add-workaround-for-plugins-modifying-the-parent-of-t.patch
diff --git a/patches/api/0071-Add-PlayerArmorChangeEvent.patch b/patches/api/0072-Add-PlayerArmorChangeEvent.patch
index 4e9d795db3..4e9d795db3 100644
--- a/patches/api/0071-Add-PlayerArmorChangeEvent.patch
+++ b/patches/api/0072-Add-PlayerArmorChangeEvent.patch
diff --git a/patches/api/0072-API-to-get-a-BlockState-without-a-snapshot.patch b/patches/api/0073-API-to-get-a-BlockState-without-a-snapshot.patch
index 26c4c4cc18..26c4c4cc18 100644
--- a/patches/api/0072-API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/patches/api/0073-API-to-get-a-BlockState-without-a-snapshot.patch
diff --git a/patches/api/0073-AsyncTabCompleteEvent.patch b/patches/api/0074-AsyncTabCompleteEvent.patch
index e86dd9b401..e86dd9b401 100644
--- a/patches/api/0073-AsyncTabCompleteEvent.patch
+++ b/patches/api/0074-AsyncTabCompleteEvent.patch
diff --git a/patches/api/0074-Expose-client-protocol-version-and-virtual-host.patch b/patches/api/0075-Expose-client-protocol-version-and-virtual-host.patch
index cb2d2ad985..cb2d2ad985 100644
--- a/patches/api/0074-Expose-client-protocol-version-and-virtual-host.patch
+++ b/patches/api/0075-Expose-client-protocol-version-and-virtual-host.patch
diff --git a/patches/api/0075-Display-warning-on-deprecated-recipe-API.patch b/patches/api/0076-Display-warning-on-deprecated-recipe-API.patch
index 2b6c78a2c4..2b6c78a2c4 100644
--- a/patches/api/0075-Display-warning-on-deprecated-recipe-API.patch
+++ b/patches/api/0076-Display-warning-on-deprecated-recipe-API.patch
diff --git a/patches/api/0076-PlayerPickupExperienceEvent.patch b/patches/api/0077-PlayerPickupExperienceEvent.patch
index 906a8ec7c3..906a8ec7c3 100644
--- a/patches/api/0076-PlayerPickupExperienceEvent.patch
+++ b/patches/api/0077-PlayerPickupExperienceEvent.patch
diff --git a/patches/api/0077-ExperienceOrbMergeEvent.patch b/patches/api/0078-ExperienceOrbMergeEvent.patch
index 3a4722a776..3a4722a776 100644
--- a/patches/api/0077-ExperienceOrbMergeEvent.patch
+++ b/patches/api/0078-ExperienceOrbMergeEvent.patch
diff --git a/patches/api/0078-Ability-to-apply-mending-to-XP-API.patch b/patches/api/0079-Ability-to-apply-mending-to-XP-API.patch
index 61434cd97c..61434cd97c 100644
--- a/patches/api/0078-Ability-to-apply-mending-to-XP-API.patch
+++ b/patches/api/0079-Ability-to-apply-mending-to-XP-API.patch
diff --git a/patches/api/0079-PreCreatureSpawnEvent.patch b/patches/api/0080-PreCreatureSpawnEvent.patch
index 0090330de9..0090330de9 100644
--- a/patches/api/0079-PreCreatureSpawnEvent.patch
+++ b/patches/api/0080-PreCreatureSpawnEvent.patch
diff --git a/patches/api/0080-PlayerNaturallySpawnCreaturesEvent.patch b/patches/api/0081-PlayerNaturallySpawnCreaturesEvent.patch
index a6fa8a9b72..a6fa8a9b72 100644
--- a/patches/api/0080-PlayerNaturallySpawnCreaturesEvent.patch
+++ b/patches/api/0081-PlayerNaturallySpawnCreaturesEvent.patch
diff --git a/patches/api/0081-Add-setPlayerProfile-API-for-Skulls.patch b/patches/api/0082-Add-setPlayerProfile-API-for-Skulls.patch
index 42ffd3f948..42ffd3f948 100644
--- a/patches/api/0081-Add-setPlayerProfile-API-for-Skulls.patch
+++ b/patches/api/0082-Add-setPlayerProfile-API-for-Skulls.patch
diff --git a/patches/api/0082-Fill-Profile-Property-Events.patch b/patches/api/0083-Fill-Profile-Property-Events.patch
index 5511f6449a..5511f6449a 100644
--- a/patches/api/0082-Fill-Profile-Property-Events.patch
+++ b/patches/api/0083-Fill-Profile-Property-Events.patch
diff --git a/patches/api/0083-PlayerAdvancementCriterionGrantEvent.patch b/patches/api/0084-PlayerAdvancementCriterionGrantEvent.patch
index 5e8eaca58a..5e8eaca58a 100644
--- a/patches/api/0083-PlayerAdvancementCriterionGrantEvent.patch
+++ b/patches/api/0084-PlayerAdvancementCriterionGrantEvent.patch
diff --git a/patches/api/0084-Add-ArmorStand-Item-Meta.patch b/patches/api/0085-Add-ArmorStand-Item-Meta.patch
index 6287ef49e7..6287ef49e7 100644
--- a/patches/api/0084-Add-ArmorStand-Item-Meta.patch
+++ b/patches/api/0085-Add-ArmorStand-Item-Meta.patch
diff --git a/patches/api/0085-Optimize-Hoppers.patch b/patches/api/0086-Optimize-Hoppers.patch
index 79c141af55..79c141af55 100644
--- a/patches/api/0085-Optimize-Hoppers.patch
+++ b/patches/api/0086-Optimize-Hoppers.patch
diff --git a/patches/api/0086-Tameable-getOwnerUniqueId-API.patch b/patches/api/0087-Tameable-getOwnerUniqueId-API.patch
index b911542a60..b911542a60 100644
--- a/patches/api/0086-Tameable-getOwnerUniqueId-API.patch
+++ b/patches/api/0087-Tameable-getOwnerUniqueId-API.patch
diff --git a/patches/api/0087-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/patches/api/0088-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
index ca04155516..ca04155516 100644
--- a/patches/api/0087-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
+++ b/patches/api/0088-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
diff --git a/patches/api/0088-Add-extended-PaperServerListPingEvent.patch b/patches/api/0089-Add-extended-PaperServerListPingEvent.patch
index f35ae4323f..f35ae4323f 100644
--- a/patches/api/0088-Add-extended-PaperServerListPingEvent.patch
+++ b/patches/api/0089-Add-extended-PaperServerListPingEvent.patch
diff --git a/patches/api/0089-Player.setPlayerProfile-API.patch b/patches/api/0090-Player.setPlayerProfile-API.patch
index a4de465dce..a4de465dce 100644
--- a/patches/api/0089-Player.setPlayerProfile-API.patch
+++ b/patches/api/0090-Player.setPlayerProfile-API.patch
diff --git a/patches/api/0090-getPlayerUniqueId-API.patch b/patches/api/0091-getPlayerUniqueId-API.patch
index 696884eae1..696884eae1 100644
--- a/patches/api/0090-getPlayerUniqueId-API.patch
+++ b/patches/api/0091-getPlayerUniqueId-API.patch
diff --git a/patches/api/0091-Add-legacy-ping-support-to-PaperServerListPingEvent.patch b/patches/api/0092-Add-legacy-ping-support-to-PaperServerListPingEvent.patch
index f21c766148..f21c766148 100644
--- a/patches/api/0091-Add-legacy-ping-support-to-PaperServerListPingEvent.patch
+++ b/patches/api/0092-Add-legacy-ping-support-to-PaperServerListPingEvent.patch
diff --git a/patches/api/0092-Add-method-to-open-already-placed-sign.patch b/patches/api/0093-Add-method-to-open-already-placed-sign.patch
index bd472de2f2..bd472de2f2 100644
--- a/patches/api/0092-Add-method-to-open-already-placed-sign.patch
+++ b/patches/api/0093-Add-method-to-open-already-placed-sign.patch
diff --git a/patches/api/0093-Add-Ban-Methods-to-Player-Objects.patch b/patches/api/0094-Add-Ban-Methods-to-Player-Objects.patch
index 126f47aac8..126f47aac8 100644
--- a/patches/api/0093-Add-Ban-Methods-to-Player-Objects.patch
+++ b/patches/api/0094-Add-Ban-Methods-to-Player-Objects.patch
diff --git a/patches/api/0094-EndermanEscapeEvent.patch b/patches/api/0095-EndermanEscapeEvent.patch
index 82d22fd0ea..82d22fd0ea 100644
--- a/patches/api/0094-EndermanEscapeEvent.patch
+++ b/patches/api/0095-EndermanEscapeEvent.patch
diff --git a/patches/api/0095-Enderman.teleportRandomly.patch b/patches/api/0096-Enderman.teleportRandomly.patch
index 9c226d009c..9c226d009c 100644
--- a/patches/api/0095-Enderman.teleportRandomly.patch
+++ b/patches/api/0096-Enderman.teleportRandomly.patch
diff --git a/patches/api/0096-Additional-world.getNearbyEntities-API-s.patch b/patches/api/0097-Additional-world.getNearbyEntities-API-s.patch
index 489e0a5c4c..489e0a5c4c 100644
--- a/patches/api/0096-Additional-world.getNearbyEntities-API-s.patch
+++ b/patches/api/0097-Additional-world.getNearbyEntities-API-s.patch
diff --git a/patches/api/0097-Location.isChunkLoaded-API.patch b/patches/api/0098-Location.isChunkLoaded-API.patch
index 1670d20348..1670d20348 100644
--- a/patches/api/0097-Location.isChunkLoaded-API.patch
+++ b/patches/api/0098-Location.isChunkLoaded-API.patch
diff --git a/patches/api/0098-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/api/0099-Expand-World.spawnParticle-API-and-add-Builder.patch
index da01d6d5c3..da01d6d5c3 100644
--- a/patches/api/0098-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/patches/api/0099-Expand-World.spawnParticle-API-and-add-Builder.patch
diff --git a/patches/api/0099-EndermanAttackPlayerEvent.patch b/patches/api/0100-EndermanAttackPlayerEvent.patch
index 9f3e105c9d..9f3e105c9d 100644
--- a/patches/api/0099-EndermanAttackPlayerEvent.patch
+++ b/patches/api/0100-EndermanAttackPlayerEvent.patch
diff --git a/patches/api/0100-Close-Plugin-Class-Loaders-on-Disable.patch b/patches/api/0101-Close-Plugin-Class-Loaders-on-Disable.patch
index e6b629f072..e6b629f072 100644
--- a/patches/api/0100-Close-Plugin-Class-Loaders-on-Disable.patch
+++ b/patches/api/0101-Close-Plugin-Class-Loaders-on-Disable.patch
diff --git a/patches/api/0101-WitchConsumePotionEvent.patch b/patches/api/0102-WitchConsumePotionEvent.patch
index fab6106411..fab6106411 100644
--- a/patches/api/0101-WitchConsumePotionEvent.patch
+++ b/patches/api/0102-WitchConsumePotionEvent.patch
diff --git a/patches/api/0102-WitchThrowPotionEvent.patch b/patches/api/0103-WitchThrowPotionEvent.patch
index a5dfe42f35..a5dfe42f35 100644
--- a/patches/api/0102-WitchThrowPotionEvent.patch
+++ b/patches/api/0103-WitchThrowPotionEvent.patch
diff --git a/patches/api/0103-Location.toBlockLocation-toCenterLocation.patch b/patches/api/0104-Location.toBlockLocation-toCenterLocation.patch
index 1f3ad622a7..1f3ad622a7 100644
--- a/patches/api/0103-Location.toBlockLocation-toCenterLocation.patch
+++ b/patches/api/0104-Location.toBlockLocation-toCenterLocation.patch
diff --git a/patches/api/0104-PotionEffect-clone-methods.patch b/patches/api/0105-PotionEffect-clone-methods.patch
index 7f4e064a78..7f4e064a78 100644
--- a/patches/api/0104-PotionEffect-clone-methods.patch
+++ b/patches/api/0105-PotionEffect-clone-methods.patch
diff --git a/patches/api/0105-WitchReadyPotionEvent.patch b/patches/api/0106-WitchReadyPotionEvent.patch
index 5722426049..5722426049 100644
--- a/patches/api/0105-WitchReadyPotionEvent.patch
+++ b/patches/api/0106-WitchReadyPotionEvent.patch
diff --git a/patches/api/0106-ItemStack-getMaxItemUseDuration.patch b/patches/api/0107-ItemStack-getMaxItemUseDuration.patch
index 5a5b635adb..5a5b635adb 100644
--- a/patches/api/0106-ItemStack-getMaxItemUseDuration.patch
+++ b/patches/api/0107-ItemStack-getMaxItemUseDuration.patch
diff --git a/patches/api/0107-Add-EntityTeleportEndGatewayEvent.patch b/patches/api/0108-Add-EntityTeleportEndGatewayEvent.patch
index 0422ec9858..0422ec9858 100644
--- a/patches/api/0107-Add-EntityTeleportEndGatewayEvent.patch
+++ b/patches/api/0108-Add-EntityTeleportEndGatewayEvent.patch
diff --git a/patches/api/0108-Make-shield-blocking-delay-configurable.patch b/patches/api/0109-Make-shield-blocking-delay-configurable.patch
index 7b6e95c4e8..7b6e95c4e8 100644
--- a/patches/api/0108-Make-shield-blocking-delay-configurable.patch
+++ b/patches/api/0109-Make-shield-blocking-delay-configurable.patch
diff --git a/patches/api/0109-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/patches/api/0110-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
index 71a82a8eae..71a82a8eae 100644
--- a/patches/api/0109-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
+++ b/patches/api/0110-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
diff --git a/patches/api/0110-Add-getNearbyXXX-methods-to-Location.patch b/patches/api/0111-Add-getNearbyXXX-methods-to-Location.patch
index a362af6260..a362af6260 100644
--- a/patches/api/0110-Add-getNearbyXXX-methods-to-Location.patch
+++ b/patches/api/0111-Add-getNearbyXXX-methods-to-Location.patch
diff --git a/patches/api/0111-PlayerReadyArrowEvent.patch b/patches/api/0112-PlayerReadyArrowEvent.patch
index 7ea1740581..7ea1740581 100644
--- a/patches/api/0111-PlayerReadyArrowEvent.patch
+++ b/patches/api/0112-PlayerReadyArrowEvent.patch
diff --git a/patches/api/0112-Add-EntityKnockbackByEntityEvent.patch b/patches/api/0113-Add-EntityKnockbackByEntityEvent.patch
index 1620ab68a6..1620ab68a6 100644
--- a/patches/api/0112-Add-EntityKnockbackByEntityEvent.patch
+++ b/patches/api/0113-Add-EntityKnockbackByEntityEvent.patch
diff --git a/patches/api/0113-Expand-Explosions-API.patch b/patches/api/0114-Expand-Explosions-API.patch
index b26bf20578..b26bf20578 100644
--- a/patches/api/0113-Expand-Explosions-API.patch
+++ b/patches/api/0114-Expand-Explosions-API.patch
diff --git a/patches/api/0114-ItemStack-API-additions-for-quantity-flags-lore.patch b/patches/api/0115-ItemStack-API-additions-for-quantity-flags-lore.patch
index 285bb74979..285bb74979 100644
--- a/patches/api/0114-ItemStack-API-additions-for-quantity-flags-lore.patch
+++ b/patches/api/0115-ItemStack-API-additions-for-quantity-flags-lore.patch
diff --git a/patches/api/0115-LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/api/0116-LivingEntity-Hand-Raised-Item-Use-API.patch
index 85f859eb81..85f859eb81 100644
--- a/patches/api/0115-LivingEntity-Hand-Raised-Item-Use-API.patch
+++ b/patches/api/0116-LivingEntity-Hand-Raised-Item-Use-API.patch
diff --git a/patches/api/0116-RangedEntity-API.patch b/patches/api/0117-RangedEntity-API.patch
index c86139036d..c86139036d 100644
--- a/patches/api/0116-RangedEntity-API.patch
+++ b/patches/api/0117-RangedEntity-API.patch
diff --git a/patches/api/0117-Add-World.getEntity-UUID-API.patch b/patches/api/0118-Add-World.getEntity-UUID-API.patch
index 339775b32f..339775b32f 100644
--- a/patches/api/0117-Add-World.getEntity-UUID-API.patch
+++ b/patches/api/0118-Add-World.getEntity-UUID-API.patch
diff --git a/patches/api/0118-InventoryCloseEvent-Reason-API.patch b/patches/api/0119-InventoryCloseEvent-Reason-API.patch
index cbacde69b0..a674e86b30 100644
--- a/patches/api/0118-InventoryCloseEvent-Reason-API.patch
+++ b/patches/api/0119-InventoryCloseEvent-Reason-API.patch
@@ -7,7 +7,7 @@ Allows you to determine why an inventory was closed, enabling plugin developers
 to "confirm" things based on if it was player triggered close or not.
 
 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index 2e86d4c9ee85cf0f9096472b8c3d131522181215..3cf96a3656d3366952f15744c9970e752e97be9a 100644
+index a46cefbb0508c192fdfefd685c7ad3973bb9c0c9..66f11e9670770e05a164922cc0f2aa863c066203 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
 @@ -153,6 +153,15 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
diff --git a/patches/api/0119-Allow-setting-the-vex-s-summoner.patch b/patches/api/0120-Allow-setting-the-vex-s-summoner.patch
index 68b33503be..68b33503be 100644
--- a/patches/api/0119-Allow-setting-the-vex-s-summoner.patch
+++ b/patches/api/0120-Allow-setting-the-vex-s-summoner.patch
diff --git a/patches/api/0120-Entity-getChunk-API.patch b/patches/api/0121-Entity-getChunk-API.patch
index 8de03dab49..a02bb6d155 100644
--- a/patches/api/0120-Entity-getChunk-API.patch
+++ b/patches/api/0121-Entity-getChunk-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Entity#getChunk API
 Get the chunk the entity is currently registered to
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index fdc95c87a6020bdcaee5b0b8ab5a996c0e241b33..ef95afb92f7a6fea77fe483e26ee3cf6d1bdd041 100644
+index 85478ed185a938aa8e95d450da8197c76f13106b..38d7685063bf47491c55c1911c6f2cb915f64202 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -3,6 +3,7 @@ package org.bukkit.entity;
diff --git a/patches/api/0121-Add-an-asterisk-to-legacy-API-plugins.patch b/patches/api/0122-Add-an-asterisk-to-legacy-API-plugins.patch
index d768a18607..d768a18607 100644
--- a/patches/api/0121-Add-an-asterisk-to-legacy-API-plugins.patch
+++ b/patches/api/0122-Add-an-asterisk-to-legacy-API-plugins.patch
diff --git a/patches/api/0122-EnderDragon-Events.patch b/patches/api/0123-EnderDragon-Events.patch
index 68ed791382..68ed791382 100644
--- a/patches/api/0122-EnderDragon-Events.patch
+++ b/patches/api/0123-EnderDragon-Events.patch
diff --git a/patches/api/0123-PlayerElytraBoostEvent.patch b/patches/api/0124-PlayerElytraBoostEvent.patch
index c5d8e5ddf3..c5d8e5ddf3 100644
--- a/patches/api/0123-PlayerElytraBoostEvent.patch
+++ b/patches/api/0124-PlayerElytraBoostEvent.patch
diff --git a/patches/api/0124-PlayerLaunchProjectileEvent.patch b/patches/api/0125-PlayerLaunchProjectileEvent.patch
index 7524daea92..7524daea92 100644
--- a/patches/api/0124-PlayerLaunchProjectileEvent.patch
+++ b/patches/api/0125-PlayerLaunchProjectileEvent.patch
diff --git a/patches/api/0125-EntityTransformedEvent.patch b/patches/api/0126-EntityTransformedEvent.patch
index c77c4a8ba6..c77c4a8ba6 100644
--- a/patches/api/0125-EntityTransformedEvent.patch
+++ b/patches/api/0126-EntityTransformedEvent.patch
diff --git a/patches/api/0126-Allow-disabling-armour-stand-ticking.patch b/patches/api/0127-Allow-disabling-armour-stand-ticking.patch
index bb053752f5..bb053752f5 100644
--- a/patches/api/0126-Allow-disabling-armour-stand-ticking.patch
+++ b/patches/api/0127-Allow-disabling-armour-stand-ticking.patch
diff --git a/patches/api/0127-SkeletonHorse-Additions.patch b/patches/api/0128-SkeletonHorse-Additions.patch
index 8d4dd478ab..8d4dd478ab 100644
--- a/patches/api/0127-SkeletonHorse-Additions.patch
+++ b/patches/api/0128-SkeletonHorse-Additions.patch
diff --git a/patches/api/0128-Expand-Location-Manipulation-API.patch b/patches/api/0129-Expand-Location-Manipulation-API.patch
index 271041f256..271041f256 100644
--- a/patches/api/0128-Expand-Location-Manipulation-API.patch
+++ b/patches/api/0129-Expand-Location-Manipulation-API.patch
diff --git a/patches/api/0129-Expand-ArmorStand-API.patch b/patches/api/0130-Expand-ArmorStand-API.patch
index c57b85b936..c57b85b936 100644
--- a/patches/api/0129-Expand-ArmorStand-API.patch
+++ b/patches/api/0130-Expand-ArmorStand-API.patch
diff --git a/patches/api/0130-AnvilDamageEvent.patch b/patches/api/0131-AnvilDamageEvent.patch
index 7561b6a9db..7561b6a9db 100644
--- a/patches/api/0130-AnvilDamageEvent.patch
+++ b/patches/api/0131-AnvilDamageEvent.patch
diff --git a/patches/api/0131-Remove-deadlock-risk-in-firing-async-events.patch b/patches/api/0132-Remove-deadlock-risk-in-firing-async-events.patch
index 27e5ca7dfe..27e5ca7dfe 100644
--- a/patches/api/0131-Remove-deadlock-risk-in-firing-async-events.patch
+++ b/patches/api/0132-Remove-deadlock-risk-in-firing-async-events.patch
diff --git a/patches/api/0132-Add-hand-to-bucket-events.patch b/patches/api/0133-Add-hand-to-bucket-events.patch
index 85c5c370f3..85c5c370f3 100644
--- a/patches/api/0132-Add-hand-to-bucket-events.patch
+++ b/patches/api/0133-Add-hand-to-bucket-events.patch
diff --git a/patches/api/0133-Add-TNTPrimeEvent.patch b/patches/api/0134-Add-TNTPrimeEvent.patch
index 2bddc56f13..2bddc56f13 100644
--- a/patches/api/0133-Add-TNTPrimeEvent.patch
+++ b/patches/api/0134-Add-TNTPrimeEvent.patch
diff --git a/patches/api/0134-Provide-Chunk-Coordinates-as-a-Long-API.patch b/patches/api/0135-Provide-Chunk-Coordinates-as-a-Long-API.patch
index 17690209af..17690209af 100644
--- a/patches/api/0134-Provide-Chunk-Coordinates-as-a-Long-API.patch
+++ b/patches/api/0135-Provide-Chunk-Coordinates-as-a-Long-API.patch
diff --git a/patches/api/0135-Make-EnderDragon-extend-Mob.patch b/patches/api/0136-Make-EnderDragon-extend-Mob.patch
index 6779d66171..6779d66171 100644
--- a/patches/api/0135-Make-EnderDragon-extend-Mob.patch
+++ b/patches/api/0136-Make-EnderDragon-extend-Mob.patch
diff --git a/patches/api/0136-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/api/0137-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
index cbe8cd6f69..cbe8cd6f69 100644
--- a/patches/api/0136-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
+++ b/patches/api/0137-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
diff --git a/patches/api/0137-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch b/patches/api/0138-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch
index 536fdc2d06..536fdc2d06 100644
--- a/patches/api/0137-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch
+++ b/patches/api/0138-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch
diff --git a/patches/api/0138-Allow-Blocks-to-be-accessed-via-a-long-key.patch b/patches/api/0139-Allow-Blocks-to-be-accessed-via-a-long-key.patch
index adcfdc2dd2..adcfdc2dd2 100644
--- a/patches/api/0138-Allow-Blocks-to-be-accessed-via-a-long-key.patch
+++ b/patches/api/0139-Allow-Blocks-to-be-accessed-via-a-long-key.patch
diff --git a/patches/api/0139-Slime-Pathfinder-Events.patch b/patches/api/0140-Slime-Pathfinder-Events.patch
index 8d27bd1b14..8d27bd1b14 100644
--- a/patches/api/0139-Slime-Pathfinder-Events.patch
+++ b/patches/api/0140-Slime-Pathfinder-Events.patch
diff --git a/patches/api/0140-Add-PhantomPreSpawnEvent.patch b/patches/api/0141-Add-PhantomPreSpawnEvent.patch
index 5ffdc818cb..5ffdc818cb 100644
--- a/patches/api/0140-Add-PhantomPreSpawnEvent.patch
+++ b/patches/api/0141-Add-PhantomPreSpawnEvent.patch
diff --git a/patches/api/0141-Add-More-Creeper-API.patch b/patches/api/0142-Add-More-Creeper-API.patch
index b45e2fbeba..b45e2fbeba 100644
--- a/patches/api/0141-Add-More-Creeper-API.patch
+++ b/patches/api/0142-Add-More-Creeper-API.patch
diff --git a/patches/api/0142-isChunkGenerated-API.patch b/patches/api/0143-isChunkGenerated-API.patch
index ce9303e154..ce9303e154 100644
--- a/patches/api/0142-isChunkGenerated-API.patch
+++ b/patches/api/0143-isChunkGenerated-API.patch
diff --git a/patches/api/0143-Add-source-block-to-BlockPhysicsEvent.patch b/patches/api/0144-Add-source-block-to-BlockPhysicsEvent.patch
index 965de7c24a..965de7c24a 100644
--- a/patches/api/0143-Add-source-block-to-BlockPhysicsEvent.patch
+++ b/patches/api/0144-Add-source-block-to-BlockPhysicsEvent.patch
diff --git a/patches/api/0144-Inventory-removeItemAnySlot.patch b/patches/api/0145-Inventory-removeItemAnySlot.patch
index 4d6f2e9e57..4d6f2e9e57 100644
--- a/patches/api/0144-Inventory-removeItemAnySlot.patch
+++ b/patches/api/0145-Inventory-removeItemAnySlot.patch
diff --git a/patches/api/0145-Async-Chunks-API.patch b/patches/api/0146-Async-Chunks-API.patch
index 9f8b1b83a4..9f8b1b83a4 100644
--- a/patches/api/0145-Async-Chunks-API.patch
+++ b/patches/api/0146-Async-Chunks-API.patch
diff --git a/patches/api/0146-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/api/0147-Add-ray-tracing-methods-to-LivingEntity.patch
index 8b636c8548..5fe29b7e3b 100644
--- a/patches/api/0146-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/patches/api/0147-Add-ray-tracing-methods-to-LivingEntity.patch
@@ -65,7 +65,7 @@ index 0000000000000000000000000000000000000000..18a96dbb01d3b34476652264b2d6be37
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 4f62a49e7b0538f0ce9cecd2c1b645f40ce17b3d..05992ade1bca42a6233373b44513b89986d89c5a 100644
+index 6d8d96976bcef4e176453fede81a529478f11234..ad885a0775b387e3e8ca6bfae80c18465038056c 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -82,6 +82,77 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0147-Expose-attack-cooldown-methods-for-Player.patch b/patches/api/0148-Expose-attack-cooldown-methods-for-Player.patch
index 8611f83c05..8611f83c05 100644
--- a/patches/api/0147-Expose-attack-cooldown-methods-for-Player.patch
+++ b/patches/api/0148-Expose-attack-cooldown-methods-for-Player.patch
diff --git a/patches/api/0148-Improve-death-events.patch b/patches/api/0149-Improve-death-events.patch
index f42921460c..f42921460c 100644
--- a/patches/api/0148-Improve-death-events.patch
+++ b/patches/api/0149-Improve-death-events.patch
diff --git a/patches/api/0149-Mob-Pathfinding-API.patch b/patches/api/0150-Mob-Pathfinding-API.patch
index 8408100069..8408100069 100644
--- a/patches/api/0149-Mob-Pathfinding-API.patch
+++ b/patches/api/0150-Mob-Pathfinding-API.patch
diff --git a/patches/api/0150-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/patches/api/0151-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
index c5b4ce2e41..c5b4ce2e41 100644
--- a/patches/api/0150-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
+++ b/patches/api/0151-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
diff --git a/patches/api/0151-Performance-Concurrency-Improvements-to-Permissions.patch b/patches/api/0152-Performance-Concurrency-Improvements-to-Permissions.patch
index 4d64579e4a..4d64579e4a 100644
--- a/patches/api/0151-Performance-Concurrency-Improvements-to-Permissions.patch
+++ b/patches/api/0152-Performance-Concurrency-Improvements-to-Permissions.patch
diff --git a/patches/api/0152-Add-ItemStackRecipeChoice-Draft-API.patch b/patches/api/0153-Add-ItemStackRecipeChoice-Draft-API.patch
index 1a4eca8cc0..1a4eca8cc0 100644
--- a/patches/api/0152-Add-ItemStackRecipeChoice-Draft-API.patch
+++ b/patches/api/0153-Add-ItemStackRecipeChoice-Draft-API.patch
diff --git a/patches/api/0153-Implement-furnace-cook-speed-multiplier-API.patch b/patches/api/0154-Implement-furnace-cook-speed-multiplier-API.patch
index cb4250b87c..cb4250b87c 100644
--- a/patches/api/0153-Implement-furnace-cook-speed-multiplier-API.patch
+++ b/patches/api/0154-Implement-furnace-cook-speed-multiplier-API.patch
diff --git a/patches/api/0154-Material-API-additions.patch b/patches/api/0155-Material-API-additions.patch
index c740ab3a44..c740ab3a44 100644
--- a/patches/api/0154-Material-API-additions.patch
+++ b/patches/api/0155-Material-API-additions.patch
diff --git a/patches/api/0155-PreSpawnerSpawnEvent.patch b/patches/api/0156-PreSpawnerSpawnEvent.patch
index dcb362d8bc..dcb362d8bc 100644
--- a/patches/api/0155-PreSpawnerSpawnEvent.patch
+++ b/patches/api/0156-PreSpawnerSpawnEvent.patch
diff --git a/patches/api/0156-Add-Material-Tags.patch b/patches/api/0157-Add-Material-Tags.patch
index 5f99eea69c..5f99eea69c 100644
--- a/patches/api/0156-Add-Material-Tags.patch
+++ b/patches/api/0157-Add-Material-Tags.patch
diff --git a/patches/api/0157-Add-LivingEntity-getTargetEntity.patch b/patches/api/0158-Add-LivingEntity-getTargetEntity.patch
index 5ec536beeb..5ec536beeb 100644
--- a/patches/api/0157-Add-LivingEntity-getTargetEntity.patch
+++ b/patches/api/0158-Add-LivingEntity-getTargetEntity.patch
diff --git a/patches/api/0158-Add-sun-related-API.patch b/patches/api/0159-Add-sun-related-API.patch
index d276f4329a..d276f4329a 100644
--- a/patches/api/0158-Add-sun-related-API.patch
+++ b/patches/api/0159-Add-sun-related-API.patch
diff --git a/patches/api/0159-Here-s-Johnny.patch b/patches/api/0160-Here-s-Johnny.patch
index faaadfb5db..faaadfb5db 100644
--- a/patches/api/0159-Here-s-Johnny.patch
+++ b/patches/api/0160-Here-s-Johnny.patch
diff --git a/patches/api/0160-Turtle-API.patch b/patches/api/0161-Turtle-API.patch
index 06abb703f4..06abb703f4 100644
--- a/patches/api/0160-Turtle-API.patch
+++ b/patches/api/0161-Turtle-API.patch
diff --git a/patches/api/0161-Add-spectator-target-events.patch b/patches/api/0162-Add-spectator-target-events.patch
index c5d4b7c4db..c5d4b7c4db 100644
--- a/patches/api/0161-Add-spectator-target-events.patch
+++ b/patches/api/0162-Add-spectator-target-events.patch
diff --git a/patches/api/0162-Add-more-Witch-API.patch b/patches/api/0163-Add-more-Witch-API.patch
index 8fa1dd1e47..8fa1dd1e47 100644
--- a/patches/api/0162-Add-more-Witch-API.patch
+++ b/patches/api/0163-Add-more-Witch-API.patch
diff --git a/patches/api/0163-Make-the-default-permission-message-configurable.patch b/patches/api/0164-Make-the-default-permission-message-configurable.patch
index 7f1a66054f..7f1a66054f 100644
--- a/patches/api/0163-Make-the-default-permission-message-configurable.patch
+++ b/patches/api/0164-Make-the-default-permission-message-configurable.patch
diff --git a/patches/api/0164-Support-cancellation-supression-of-EntityDismount-Ve.patch b/patches/api/0165-Support-cancellation-supression-of-EntityDismount-Ve.patch
index a36772974a..a36772974a 100644
--- a/patches/api/0164-Support-cancellation-supression-of-EntityDismount-Ve.patch
+++ b/patches/api/0165-Support-cancellation-supression-of-EntityDismount-Ve.patch
diff --git a/patches/api/0165-Add-more-Zombie-API.patch b/patches/api/0166-Add-more-Zombie-API.patch
index ec2c93dc46..ec2c93dc46 100644
--- a/patches/api/0165-Add-more-Zombie-API.patch
+++ b/patches/api/0166-Add-more-Zombie-API.patch
diff --git a/patches/api/0166-Change-the-reserved-channel-check-to-be-sensible.patch b/patches/api/0167-Change-the-reserved-channel-check-to-be-sensible.patch
index fa3de62864..fa3de62864 100644
--- a/patches/api/0166-Change-the-reserved-channel-check-to-be-sensible.patch
+++ b/patches/api/0167-Change-the-reserved-channel-check-to-be-sensible.patch
diff --git a/patches/api/0167-Add-PlayerConnectionCloseEvent.patch b/patches/api/0168-Add-PlayerConnectionCloseEvent.patch
index f1a017f4fb..f1a017f4fb 100644
--- a/patches/api/0167-Add-PlayerConnectionCloseEvent.patch
+++ b/patches/api/0168-Add-PlayerConnectionCloseEvent.patch
diff --git a/patches/api/0168-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/api/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index ec2b79af2d..ec2b79af2d 100644
--- a/patches/api/0168-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/patches/api/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
diff --git a/patches/api/0169-BlockDestroyEvent.patch b/patches/api/0170-BlockDestroyEvent.patch
index 4ad73d8ef1..4ad73d8ef1 100644
--- a/patches/api/0169-BlockDestroyEvent.patch
+++ b/patches/api/0170-BlockDestroyEvent.patch
diff --git a/patches/api/0170-Add-ItemStack-Recipe-API-helper-methods.patch b/patches/api/0171-Add-ItemStack-Recipe-API-helper-methods.patch
index 9b2dfc0c72..9b2dfc0c72 100644
--- a/patches/api/0170-Add-ItemStack-Recipe-API-helper-methods.patch
+++ b/patches/api/0171-Add-ItemStack-Recipe-API-helper-methods.patch
diff --git a/patches/api/0171-Add-WhitelistToggleEvent.patch b/patches/api/0172-Add-WhitelistToggleEvent.patch
index 4bb54b5c92..4bb54b5c92 100644
--- a/patches/api/0171-Add-WhitelistToggleEvent.patch
+++ b/patches/api/0172-Add-WhitelistToggleEvent.patch
diff --git a/patches/api/0172-Annotation-Test-changes.patch b/patches/api/0173-Annotation-Test-changes.patch
index 380b55d775..ec5480f21e 100644
--- a/patches/api/0172-Annotation-Test-changes.patch
+++ b/patches/api/0173-Annotation-Test-changes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Annotation Test changes
 
 
 diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
-index c62919f18f318fec15a6c364d8b6d562c2b04762..2bb75e967d4250476a151599b68de80011d222b2 100644
+index 002677ac589aa88b643c52a883a72a2bdc3696dd..dfd4174c8dca51600c2203e3f4c933507fb827e7 100644
 --- a/src/test/java/org/bukkit/AnnotationTest.java
 +++ b/src/test/java/org/bukkit/AnnotationTest.java
 @@ -46,7 +46,17 @@ public class AnnotationTest {
diff --git a/patches/api/0173-Entity-getEntitySpawnReason.patch b/patches/api/0174-Entity-getEntitySpawnReason.patch
index 0a38cac838..0a38cac838 100644
--- a/patches/api/0173-Entity-getEntitySpawnReason.patch
+++ b/patches/api/0174-Entity-getEntitySpawnReason.patch
diff --git a/patches/api/0174-Add-GS4-Query-event.patch b/patches/api/0175-Add-GS4-Query-event.patch
index ffab49a92a..ffab49a92a 100644
--- a/patches/api/0174-Add-GS4-Query-event.patch
+++ b/patches/api/0175-Add-GS4-Query-event.patch
diff --git a/patches/api/0175-Add-PlayerPostRespawnEvent.patch b/patches/api/0176-Add-PlayerPostRespawnEvent.patch
index 2eb0647eac..2eb0647eac 100644
--- a/patches/api/0175-Add-PlayerPostRespawnEvent.patch
+++ b/patches/api/0176-Add-PlayerPostRespawnEvent.patch
diff --git a/patches/api/0176-Ignore-package-private-methods-for-nullability-annot.patch b/patches/api/0177-Ignore-package-private-methods-for-nullability-annot.patch
index 28d9857af0..9649b22683 100644
--- a/patches/api/0176-Ignore-package-private-methods-for-nullability-annot.patch
+++ b/patches/api/0177-Ignore-package-private-methods-for-nullability-annot.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Ignore package-private methods for nullability annotations
 This isn't API
 
 diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
-index 2bb75e967d4250476a151599b68de80011d222b2..03229d5f4ec36a82197beb391356d791ff67fb2f 100644
+index dfd4174c8dca51600c2203e3f4c933507fb827e7..1c6a41644257cd35ced235af6cc60efc925ebc18 100644
 --- a/src/test/java/org/bukkit/AnnotationTest.java
 +++ b/src/test/java/org/bukkit/AnnotationTest.java
-@@ -168,7 +168,7 @@ public class AnnotationTest {
+@@ -179,7 +179,7 @@ public class AnnotationTest {
  
      private static boolean isMethodIncluded(@NotNull ClassNode clazz, @NotNull MethodNode method, @NotNull Map<String, ClassNode> allClasses) {
          // Exclude private, synthetic and deprecated methods
diff --git a/patches/api/0177-Flip-some-Spigot-API-null-annotations.patch b/patches/api/0178-Flip-some-Spigot-API-null-annotations.patch
index ceb58db8e0..ceb58db8e0 100644
--- a/patches/api/0177-Flip-some-Spigot-API-null-annotations.patch
+++ b/patches/api/0178-Flip-some-Spigot-API-null-annotations.patch
diff --git a/patches/api/0178-Server-Tick-Events.patch b/patches/api/0179-Server-Tick-Events.patch
index 9cb8b9a4c0..9cb8b9a4c0 100644
--- a/patches/api/0178-Server-Tick-Events.patch
+++ b/patches/api/0179-Server-Tick-Events.patch
diff --git a/patches/api/0179-PlayerDeathEvent-getItemsToKeep.patch b/patches/api/0180-PlayerDeathEvent-getItemsToKeep.patch
index e41136bc7f..e41136bc7f 100644
--- a/patches/api/0179-PlayerDeathEvent-getItemsToKeep.patch
+++ b/patches/api/0180-PlayerDeathEvent-getItemsToKeep.patch
diff --git a/patches/api/0180-Add-Heightmap-API.patch b/patches/api/0181-Add-Heightmap-API.patch
index cb8917e375..cb8917e375 100644
--- a/patches/api/0180-Add-Heightmap-API.patch
+++ b/patches/api/0181-Add-Heightmap-API.patch
diff --git a/patches/api/0181-Mob-Spawner-API-Enhancements.patch b/patches/api/0182-Mob-Spawner-API-Enhancements.patch
index 2bbe92cbe9..2bbe92cbe9 100644
--- a/patches/api/0181-Mob-Spawner-API-Enhancements.patch
+++ b/patches/api/0182-Mob-Spawner-API-Enhancements.patch
diff --git a/patches/api/0182-Add-BlockSoundGroup-interface.patch b/patches/api/0183-Add-BlockSoundGroup-interface.patch
index 566c91565a..566c91565a 100644
--- a/patches/api/0182-Add-BlockSoundGroup-interface.patch
+++ b/patches/api/0183-Add-BlockSoundGroup-interface.patch
diff --git a/patches/api/0183-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch b/patches/api/0184-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch
index b5148c5574..b5148c5574 100644
--- a/patches/api/0183-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch
+++ b/patches/api/0184-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch
diff --git a/patches/api/0184-Increase-custom-payload-channel-message-size.patch b/patches/api/0185-Increase-custom-payload-channel-message-size.patch
index 24aacd2b29..24aacd2b29 100644
--- a/patches/api/0184-Increase-custom-payload-channel-message-size.patch
+++ b/patches/api/0185-Increase-custom-payload-channel-message-size.patch
diff --git a/patches/api/0185-Expose-the-internal-current-tick.patch b/patches/api/0186-Expose-the-internal-current-tick.patch
index b83fdf74f7..b83fdf74f7 100644
--- a/patches/api/0185-Expose-the-internal-current-tick.patch
+++ b/patches/api/0186-Expose-the-internal-current-tick.patch
diff --git a/patches/api/0186-PlayerDeathEvent-shouldDropExperience.patch b/patches/api/0187-PlayerDeathEvent-shouldDropExperience.patch
index cc31e67473..cc31e67473 100644
--- a/patches/api/0186-PlayerDeathEvent-shouldDropExperience.patch
+++ b/patches/api/0187-PlayerDeathEvent-shouldDropExperience.patch
diff --git a/patches/api/0187-Add-effect-to-block-break-naturally.patch b/patches/api/0188-Add-effect-to-block-break-naturally.patch
index ce1785047a..ce1785047a 100644
--- a/patches/api/0187-Add-effect-to-block-break-naturally.patch
+++ b/patches/api/0188-Add-effect-to-block-break-naturally.patch
diff --git a/patches/api/0188-World-view-distance-api.patch b/patches/api/0189-World-view-distance-api.patch
index 64845bcaf8..64845bcaf8 100644
--- a/patches/api/0188-World-view-distance-api.patch
+++ b/patches/api/0189-World-view-distance-api.patch
diff --git a/patches/api/0189-Add-ThrownEggHatchEvent.patch b/patches/api/0190-Add-ThrownEggHatchEvent.patch
index f605a2a11b..f605a2a11b 100644
--- a/patches/api/0189-Add-ThrownEggHatchEvent.patch
+++ b/patches/api/0190-Add-ThrownEggHatchEvent.patch
diff --git a/patches/api/0190-Entity-Jump-API.patch b/patches/api/0191-Entity-Jump-API.patch
index 6e14c963f0..6e14c963f0 100644
--- a/patches/api/0190-Entity-Jump-API.patch
+++ b/patches/api/0191-Entity-Jump-API.patch
diff --git a/patches/api/0191-add-hand-to-BlockMultiPlaceEvent.patch b/patches/api/0192-add-hand-to-BlockMultiPlaceEvent.patch
index f61bddb960..f61bddb960 100644
--- a/patches/api/0191-add-hand-to-BlockMultiPlaceEvent.patch
+++ b/patches/api/0192-add-hand-to-BlockMultiPlaceEvent.patch
diff --git a/patches/api/0192-Add-tick-times-API.patch b/patches/api/0193-Add-tick-times-API.patch
index b4d7379b4b..b4d7379b4b 100644
--- a/patches/api/0192-Add-tick-times-API.patch
+++ b/patches/api/0193-Add-tick-times-API.patch
diff --git a/patches/api/0193-Expose-MinecraftServer-isRunning.patch b/patches/api/0194-Expose-MinecraftServer-isRunning.patch
index 4a5c20868f..4a5c20868f 100644
--- a/patches/api/0193-Expose-MinecraftServer-isRunning.patch
+++ b/patches/api/0194-Expose-MinecraftServer-isRunning.patch
diff --git a/patches/api/0194-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/api/0195-Add-Raw-Byte-ItemStack-Serialization.patch
index e88adb86e7..e88adb86e7 100644
--- a/patches/api/0194-Add-Raw-Byte-ItemStack-Serialization.patch
+++ b/patches/api/0195-Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/patches/api/0195-Disable-Sync-Events-firing-Async-errors-during-shutd.patch b/patches/api/0196-Disable-Sync-Events-firing-Async-errors-during-shutd.patch
index 32392efc4e..32392efc4e 100644
--- a/patches/api/0195-Disable-Sync-Events-firing-Async-errors-during-shutd.patch
+++ b/patches/api/0196-Disable-Sync-Events-firing-Async-errors-during-shutd.patch
diff --git a/patches/api/0196-Make-JavaPluginLoader-thread-safe.patch b/patches/api/0197-Make-JavaPluginLoader-thread-safe.patch
index be66a6a695..be66a6a695 100644
--- a/patches/api/0196-Make-JavaPluginLoader-thread-safe.patch
+++ b/patches/api/0197-Make-JavaPluginLoader-thread-safe.patch
diff --git a/patches/api/0197-Add-Player-Client-Options-API.patch b/patches/api/0198-Add-Player-Client-Options-API.patch
index a271a07324..a271a07324 100644
--- a/patches/api/0197-Add-Player-Client-Options-API.patch
+++ b/patches/api/0198-Add-Player-Client-Options-API.patch
diff --git a/patches/api/0198-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/api/0199-Add-PlayerAttackEntityCooldownResetEvent.patch
index 15fa2db392..15fa2db392 100644
--- a/patches/api/0198-Add-PlayerAttackEntityCooldownResetEvent.patch
+++ b/patches/api/0199-Add-PlayerAttackEntityCooldownResetEvent.patch
diff --git a/patches/api/0199-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch b/patches/api/0200-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch
index 800d5364e2..800d5364e2 100644
--- a/patches/api/0199-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch
+++ b/patches/api/0200-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch
diff --git a/patches/api/0200-Add-item-slot-convenience-methods.patch b/patches/api/0201-Add-item-slot-convenience-methods.patch
index 3b3612713f..3b3612713f 100644
--- a/patches/api/0200-Add-item-slot-convenience-methods.patch
+++ b/patches/api/0201-Add-item-slot-convenience-methods.patch
diff --git a/patches/api/0201-Villager-Restocks-API.patch b/patches/api/0202-Villager-Restocks-API.patch
index 689bd35b3c..689bd35b3c 100644
--- a/patches/api/0201-Villager-Restocks-API.patch
+++ b/patches/api/0202-Villager-Restocks-API.patch
diff --git a/patches/api/0202-Add-Mob-Goal-API.patch b/patches/api/0203-Add-Mob-Goal-API.patch
index 48c5f1eb9a..48c5f1eb9a 100644
--- a/patches/api/0202-Add-Mob-Goal-API.patch
+++ b/patches/api/0203-Add-Mob-Goal-API.patch
diff --git a/patches/api/0203-Expose-game-version.patch b/patches/api/0204-Expose-game-version.patch
index cdc766fcf1..cdc766fcf1 100644
--- a/patches/api/0203-Expose-game-version.patch
+++ b/patches/api/0204-Expose-game-version.patch
diff --git a/patches/api/0204-Add-villager-reputation-API.patch b/patches/api/0205-Add-villager-reputation-API.patch
index 44b6a6f422..44b6a6f422 100644
--- a/patches/api/0204-Add-villager-reputation-API.patch
+++ b/patches/api/0205-Add-villager-reputation-API.patch
diff --git a/patches/api/0205-Spawn-Reason-API.patch b/patches/api/0206-Spawn-Reason-API.patch
index 78038ce509..78038ce509 100644
--- a/patches/api/0205-Spawn-Reason-API.patch
+++ b/patches/api/0206-Spawn-Reason-API.patch
diff --git a/patches/api/0206-Potential-bed-API.patch b/patches/api/0207-Potential-bed-API.patch
index 1e630dff90..1e630dff90 100644
--- a/patches/api/0206-Potential-bed-API.patch
+++ b/patches/api/0207-Potential-bed-API.patch
diff --git a/patches/api/0207-Prioritise-own-classes-where-possible.patch b/patches/api/0208-Prioritise-own-classes-where-possible.patch
index 275d1ff4b8..275d1ff4b8 100644
--- a/patches/api/0207-Prioritise-own-classes-where-possible.patch
+++ b/patches/api/0208-Prioritise-own-classes-where-possible.patch
diff --git a/patches/api/0208-Provide-a-useful-PluginClassLoader-toString.patch b/patches/api/0209-Provide-a-useful-PluginClassLoader-toString.patch
index b81a6dacb4..b81a6dacb4 100644
--- a/patches/api/0208-Provide-a-useful-PluginClassLoader-toString.patch
+++ b/patches/api/0209-Provide-a-useful-PluginClassLoader-toString.patch
diff --git a/patches/api/0209-Inventory-getHolder-method-without-block-snapshot.patch b/patches/api/0210-Inventory-getHolder-method-without-block-snapshot.patch
index 5b633e50af..5b633e50af 100644
--- a/patches/api/0209-Inventory-getHolder-method-without-block-snapshot.patch
+++ b/patches/api/0210-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/api/0210-Expose-Arrow-getItemStack.patch b/patches/api/0211-Expose-Arrow-getItemStack.patch
index e718e0e598..e718e0e598 100644
--- a/patches/api/0210-Expose-Arrow-getItemStack.patch
+++ b/patches/api/0211-Expose-Arrow-getItemStack.patch
diff --git a/patches/api/0211-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/api/0212-Add-and-implement-PlayerRecipeBookClickEvent.patch
index 93bd233b85..93bd233b85 100644
--- a/patches/api/0211-Add-and-implement-PlayerRecipeBookClickEvent.patch
+++ b/patches/api/0212-Add-and-implement-PlayerRecipeBookClickEvent.patch
diff --git a/patches/api/0212-Support-components-in-ItemMeta.patch b/patches/api/0213-Support-components-in-ItemMeta.patch
index 1b51f21c69..1b51f21c69 100644
--- a/patches/api/0212-Support-components-in-ItemMeta.patch
+++ b/patches/api/0213-Support-components-in-ItemMeta.patch
diff --git a/patches/api/0213-added-2-new-TargetReasons-for-1.16-mob-behavior.patch b/patches/api/0214-added-2-new-TargetReasons-for-1.16-mob-behavior.patch
index 747470a546..747470a546 100644
--- a/patches/api/0213-added-2-new-TargetReasons-for-1.16-mob-behavior.patch
+++ b/patches/api/0214-added-2-new-TargetReasons-for-1.16-mob-behavior.patch
diff --git a/patches/api/0214-Add-entity-liquid-API.patch b/patches/api/0215-Add-entity-liquid-API.patch
index 2bf531eba3..2bf531eba3 100644
--- a/patches/api/0214-Add-entity-liquid-API.patch
+++ b/patches/api/0215-Add-entity-liquid-API.patch
diff --git a/patches/api/0215-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch b/patches/api/0216-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch
index 5dc61d601d..5dc61d601d 100644
--- a/patches/api/0215-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch
+++ b/patches/api/0216-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch
diff --git a/patches/api/0216-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/api/0217-Allow-delegation-to-vanilla-chunk-gen.patch
index 87622a4f16..87622a4f16 100644
--- a/patches/api/0216-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/api/0217-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/api/0217-Support-hex-colors-in-getLastColors.patch b/patches/api/0218-Support-hex-colors-in-getLastColors.patch
index a3117a4377..a3117a4377 100644
--- a/patches/api/0217-Support-hex-colors-in-getLastColors.patch
+++ b/patches/api/0218-Support-hex-colors-in-getLastColors.patch
diff --git a/patches/api/0218-Add-setMaxPlayers-API.patch b/patches/api/0219-Add-setMaxPlayers-API.patch
index 41c6954954..41c6954954 100644
--- a/patches/api/0218-Add-setMaxPlayers-API.patch
+++ b/patches/api/0219-Add-setMaxPlayers-API.patch
diff --git a/patches/api/0219-Add-moon-phase-API.patch b/patches/api/0220-Add-moon-phase-API.patch
index 364b9c106b..364b9c106b 100644
--- a/patches/api/0219-Add-moon-phase-API.patch
+++ b/patches/api/0220-Add-moon-phase-API.patch
diff --git a/patches/api/0220-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/api/0221-Add-playPickupItemAnimation-to-LivingEntity.patch
index 1416b1373a..1416b1373a 100644
--- a/patches/api/0220-Add-playPickupItemAnimation-to-LivingEntity.patch
+++ b/patches/api/0221-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/api/0221-Add-BellRingEvent.patch b/patches/api/0222-Add-BellRingEvent.patch
index 7862ad8c88..7862ad8c88 100644
--- a/patches/api/0221-Add-BellRingEvent.patch
+++ b/patches/api/0222-Add-BellRingEvent.patch
diff --git a/patches/api/0222-Brand-support.patch b/patches/api/0223-Brand-support.patch
index 4e255c4f7b..4e255c4f7b 100644
--- a/patches/api/0222-Brand-support.patch
+++ b/patches/api/0223-Brand-support.patch
diff --git a/patches/api/0223-Add-more-Evoker-API.patch b/patches/api/0224-Add-more-Evoker-API.patch
index 0d6f0f7328..0d6f0f7328 100644
--- a/patches/api/0223-Add-more-Evoker-API.patch
+++ b/patches/api/0224-Add-more-Evoker-API.patch
diff --git a/patches/api/0224-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch b/patches/api/0225-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
index d9c9d2143a..d9c9d2143a 100644
--- a/patches/api/0224-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
+++ b/patches/api/0225-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
diff --git a/patches/api/0225-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/api/0226-Create-HoverEvent-from-ItemStack-Entity.patch
index 982d892402..982d892402 100644
--- a/patches/api/0225-Create-HoverEvent-from-ItemStack-Entity.patch
+++ b/patches/api/0226-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/api/0226-Add-additional-open-container-api-to-HumanEntity.patch b/patches/api/0227-Add-additional-open-container-api-to-HumanEntity.patch
index 52fe9f1bc3..52fe9f1bc3 100644
--- a/patches/api/0226-Add-additional-open-container-api-to-HumanEntity.patch
+++ b/patches/api/0227-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/api/0227-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/api/0228-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index a92a435f5a..a92a435f5a 100644
--- a/patches/api/0227-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/api/0228-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/patches/api/0228-Entity-isTicking.patch b/patches/api/0229-Entity-isTicking.patch
index c4c93d0fdb..c4c93d0fdb 100644
--- a/patches/api/0228-Entity-isTicking.patch
+++ b/patches/api/0229-Entity-isTicking.patch
diff --git a/patches/api/0229-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch b/patches/api/0230-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch
index 69ed86641c..69ed86641c 100644
--- a/patches/api/0229-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch
+++ b/patches/api/0230-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch
diff --git a/patches/api/0230-Villager-resetOffers.patch b/patches/api/0231-Villager-resetOffers.patch
index 60fedfba0f..60fedfba0f 100644
--- a/patches/api/0230-Villager-resetOffers.patch
+++ b/patches/api/0231-Villager-resetOffers.patch
diff --git a/patches/api/0231-Player-elytra-boost-API.patch b/patches/api/0232-Player-elytra-boost-API.patch
index f89408fba7..f89408fba7 100644
--- a/patches/api/0231-Player-elytra-boost-API.patch
+++ b/patches/api/0232-Player-elytra-boost-API.patch
diff --git a/patches/api/0232-Add-getOfflinePlayerIfCached-String.patch b/patches/api/0233-Add-getOfflinePlayerIfCached-String.patch
index 84d12a5906..84d12a5906 100644
--- a/patches/api/0232-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/api/0233-Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/api/0233-Add-ignore-discounts-API.patch b/patches/api/0234-Add-ignore-discounts-API.patch
index 492c998c91..492c998c91 100644
--- a/patches/api/0233-Add-ignore-discounts-API.patch
+++ b/patches/api/0234-Add-ignore-discounts-API.patch
diff --git a/patches/api/0234-Item-no-age-no-player-pickup.patch b/patches/api/0235-Item-no-age-no-player-pickup.patch
index 142a8b5202..142a8b5202 100644
--- a/patches/api/0234-Item-no-age-no-player-pickup.patch
+++ b/patches/api/0235-Item-no-age-no-player-pickup.patch
diff --git a/patches/api/0235-Beacon-API-custom-effect-ranges.patch b/patches/api/0236-Beacon-API-custom-effect-ranges.patch
index ff56b99ebf..ff56b99ebf 100644
--- a/patches/api/0235-Beacon-API-custom-effect-ranges.patch
+++ b/patches/api/0236-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/api/0236-Add-API-for-quit-reason.patch b/patches/api/0237-Add-API-for-quit-reason.patch
index 63d864224b..63d864224b 100644
--- a/patches/api/0236-Add-API-for-quit-reason.patch
+++ b/patches/api/0237-Add-API-for-quit-reason.patch
diff --git a/patches/api/0237-Add-Destroy-Speed-API.patch b/patches/api/0238-Add-Destroy-Speed-API.patch
index 1b87616b56..1b87616b56 100644
--- a/patches/api/0237-Add-Destroy-Speed-API.patch
+++ b/patches/api/0238-Add-Destroy-Speed-API.patch
diff --git a/patches/api/0238-Add-LivingEntity-clearActiveItem.patch b/patches/api/0239-Add-LivingEntity-clearActiveItem.patch
index 2855c9e780..2855c9e780 100644
--- a/patches/api/0238-Add-LivingEntity-clearActiveItem.patch
+++ b/patches/api/0239-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/api/0239-Add-PlayerItemCooldownEvent.patch b/patches/api/0240-Add-PlayerItemCooldownEvent.patch
index 3bf6084e14..3bf6084e14 100644
--- a/patches/api/0239-Add-PlayerItemCooldownEvent.patch
+++ b/patches/api/0240-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/api/0240-More-lightning-API.patch b/patches/api/0241-More-lightning-API.patch
index 1b6f512299..1b6f512299 100644
--- a/patches/api/0240-More-lightning-API.patch
+++ b/patches/api/0241-More-lightning-API.patch
diff --git a/patches/api/0241-Add-PlayerShearBlockEvent.patch b/patches/api/0242-Add-PlayerShearBlockEvent.patch
index 051544b4a9..051544b4a9 100644
--- a/patches/api/0241-Add-PlayerShearBlockEvent.patch
+++ b/patches/api/0242-Add-PlayerShearBlockEvent.patch
diff --git a/patches/api/0242-Enable-multi-release-plugin-jars.patch b/patches/api/0243-Enable-multi-release-plugin-jars.patch
index 5b6aee4409..5b6aee4409 100644
--- a/patches/api/0242-Enable-multi-release-plugin-jars.patch
+++ b/patches/api/0243-Enable-multi-release-plugin-jars.patch
diff --git a/patches/api/0243-Player-Chunk-Load-Unload-Events.patch b/patches/api/0244-Player-Chunk-Load-Unload-Events.patch
index e2ce87ec9d..e2ce87ec9d 100644
--- a/patches/api/0243-Player-Chunk-Load-Unload-Events.patch
+++ b/patches/api/0244-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/api/0244-Expose-LivingEntity-hurt-direction.patch b/patches/api/0245-Expose-LivingEntity-hurt-direction.patch
index a6f7ce6054..a6f7ce6054 100644
--- a/patches/api/0244-Expose-LivingEntity-hurt-direction.patch
+++ b/patches/api/0245-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/api/0245-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/api/0246-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
index eed087f1f6..eed087f1f6 100644
--- a/patches/api/0245-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
+++ b/patches/api/0246-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/api/0246-Added-PlayerTradeEvent.patch b/patches/api/0247-Added-PlayerTradeEvent.patch
index e09b088160..e09b088160 100644
--- a/patches/api/0246-Added-PlayerTradeEvent.patch
+++ b/patches/api/0247-Added-PlayerTradeEvent.patch
diff --git a/patches/api/0247-Add-TargetHitEvent-API.patch b/patches/api/0248-Add-TargetHitEvent-API.patch
index 247421fb61..247421fb61 100644
--- a/patches/api/0247-Add-TargetHitEvent-API.patch
+++ b/patches/api/0248-Add-TargetHitEvent-API.patch
diff --git a/patches/api/0248-Additional-Block-Material-API-s.patch b/patches/api/0249-Additional-Block-Material-API-s.patch
index c16d0c6a64..c16d0c6a64 100644
--- a/patches/api/0248-Additional-Block-Material-API-s.patch
+++ b/patches/api/0249-Additional-Block-Material-API-s.patch
diff --git a/patches/api/0249-Add-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/api/0250-Add-API-to-get-Material-from-Boats-and-Minecarts.patch
index d6cdb8862b..d6cdb8862b 100644
--- a/patches/api/0249-Add-API-to-get-Material-from-Boats-and-Minecarts.patch
+++ b/patches/api/0250-Add-API-to-get-Material-from-Boats-and-Minecarts.patch
diff --git a/patches/api/0250-Add-PlayerFlowerPotManipulateEvent.patch b/patches/api/0251-Add-PlayerFlowerPotManipulateEvent.patch
index d9cd5a9f01..d9cd5a9f01 100644
--- a/patches/api/0250-Add-PlayerFlowerPotManipulateEvent.patch
+++ b/patches/api/0251-Add-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/api/0251-Zombie-API-breaking-doors.patch b/patches/api/0252-Zombie-API-breaking-doors.patch
index e2a1a8350e..e2a1a8350e 100644
--- a/patches/api/0251-Zombie-API-breaking-doors.patch
+++ b/patches/api/0252-Zombie-API-breaking-doors.patch
diff --git a/patches/api/0252-Add-EntityLoadCrossbowEvent.patch b/patches/api/0253-Add-EntityLoadCrossbowEvent.patch
index f484d40cca..f484d40cca 100644
--- a/patches/api/0252-Add-EntityLoadCrossbowEvent.patch
+++ b/patches/api/0253-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/api/0253-Added-WorldGameRuleChangeEvent.patch b/patches/api/0254-Added-WorldGameRuleChangeEvent.patch
index 8ef5f7efcd..8ef5f7efcd 100644
--- a/patches/api/0253-Added-WorldGameRuleChangeEvent.patch
+++ b/patches/api/0254-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/api/0254-Added-ServerResourcesReloadedEvent.patch b/patches/api/0255-Added-ServerResourcesReloadedEvent.patch
index de081bbae7..de081bbae7 100644
--- a/patches/api/0254-Added-ServerResourcesReloadedEvent.patch
+++ b/patches/api/0255-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/api/0255-Add-BlockFailedDispenseEvent.patch b/patches/api/0256-Add-BlockFailedDispenseEvent.patch
index 126714b965..126714b965 100644
--- a/patches/api/0255-Add-BlockFailedDispenseEvent.patch
+++ b/patches/api/0256-Add-BlockFailedDispenseEvent.patch
diff --git a/patches/api/0256-Added-PlayerLecternPageChangeEvent.patch b/patches/api/0257-Added-PlayerLecternPageChangeEvent.patch
index 2b65c3a245..2b65c3a245 100644
--- a/patches/api/0256-Added-PlayerLecternPageChangeEvent.patch
+++ b/patches/api/0257-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/api/0257-Added-PlayerLoomPatternSelectEvent.patch b/patches/api/0258-Added-PlayerLoomPatternSelectEvent.patch
index 5677026956..5677026956 100644
--- a/patches/api/0257-Added-PlayerLoomPatternSelectEvent.patch
+++ b/patches/api/0258-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/api/0258-Better-AnnotationTest-printout.patch b/patches/api/0259-Better-AnnotationTest-printout.patch
index faa7160d62..a5a0384234 100644
--- a/patches/api/0258-Better-AnnotationTest-printout.patch
+++ b/patches/api/0259-Better-AnnotationTest-printout.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Better AnnotationTest printout
 
 
 diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
-index 03229d5f4ec36a82197beb391356d791ff67fb2f..19271057cf24329757c9419fa6c97848e008a96c 100644
+index 1c6a41644257cd35ced235af6cc60efc925ebc18..b94d87832a271a76a5c8c0c9bf403c35348b31ed 100644
 --- a/src/test/java/org/bukkit/AnnotationTest.java
 +++ b/src/test/java/org/bukkit/AnnotationTest.java
-@@ -107,13 +107,18 @@ public class AnnotationTest {
+@@ -118,13 +118,18 @@ public class AnnotationTest {
  
          Collections.sort(errors);
  
diff --git a/patches/api/0259-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch b/patches/api/0260-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch
index 197d00ca14..197d00ca14 100644
--- a/patches/api/0259-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch
+++ b/patches/api/0260-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch
diff --git a/patches/api/0260-Add-sendOpLevel-API.patch b/patches/api/0261-Add-sendOpLevel-API.patch
index 3271c9ce3e..3271c9ce3e 100644
--- a/patches/api/0260-Add-sendOpLevel-API.patch
+++ b/patches/api/0261-Add-sendOpLevel-API.patch
diff --git a/patches/api/0261-Add-StructureLocateEvent.patch b/patches/api/0262-Add-StructureLocateEvent.patch
index 88c14d8ea6..88c14d8ea6 100644
--- a/patches/api/0261-Add-StructureLocateEvent.patch
+++ b/patches/api/0262-Add-StructureLocateEvent.patch
diff --git a/patches/api/0262-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/api/0263-Return-chat-component-with-empty-text-instead-of-thr.patch
index e7986f5bb1..e7986f5bb1 100644
--- a/patches/api/0262-Return-chat-component-with-empty-text-instead-of-thr.patch
+++ b/patches/api/0263-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/api/0263-Add-BlockPreDispenseEvent.patch b/patches/api/0264-Add-BlockPreDispenseEvent.patch
index 5850391175..5850391175 100644
--- a/patches/api/0263-Add-BlockPreDispenseEvent.patch
+++ b/patches/api/0264-Add-BlockPreDispenseEvent.patch
diff --git a/patches/api/0264-Added-Vanilla-Entity-Tags.patch b/patches/api/0265-Added-Vanilla-Entity-Tags.patch
index 53c933017b..53c933017b 100644
--- a/patches/api/0264-Added-Vanilla-Entity-Tags.patch
+++ b/patches/api/0265-Added-Vanilla-Entity-Tags.patch
diff --git a/patches/api/0265-added-Wither-API.patch b/patches/api/0266-added-Wither-API.patch
index dbfc15a42c..dbfc15a42c 100644
--- a/patches/api/0265-added-Wither-API.patch
+++ b/patches/api/0266-added-Wither-API.patch
diff --git a/patches/api/0266-Added-PlayerChangeBeaconEffectEvent.patch b/patches/api/0267-Added-PlayerChangeBeaconEffectEvent.patch
index 4331e880bb..4331e880bb 100644
--- a/patches/api/0266-Added-PlayerChangeBeaconEffectEvent.patch
+++ b/patches/api/0267-Added-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/api/0267-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/api/0268-Added-PlayerStonecutterRecipeSelectEvent.patch
index ce446c46fe..ce446c46fe 100644
--- a/patches/api/0267-Added-PlayerStonecutterRecipeSelectEvent.patch
+++ b/patches/api/0268-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/api/0268-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/api/0269-Add-dropLeash-variable-to-EntityUnleashEvent.patch
index 1a81930699..1a81930699 100644
--- a/patches/api/0268-Add-dropLeash-variable-to-EntityUnleashEvent.patch
+++ b/patches/api/0269-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/api/0269-EntityMoveEvent.patch b/patches/api/0270-EntityMoveEvent.patch
index 0f5a4c5a81..0f5a4c5a81 100644
--- a/patches/api/0269-EntityMoveEvent.patch
+++ b/patches/api/0270-EntityMoveEvent.patch
diff --git a/patches/api/0270-add-DragonEggFormEvent.patch b/patches/api/0271-add-DragonEggFormEvent.patch
index c465295e88..c465295e88 100644
--- a/patches/api/0270-add-DragonEggFormEvent.patch
+++ b/patches/api/0271-add-DragonEggFormEvent.patch
diff --git a/patches/api/0271-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/api/0272-Allow-adding-items-to-BlockDropItemEvent.patch
index 984da00f52..984da00f52 100644
--- a/patches/api/0271-Allow-adding-items-to-BlockDropItemEvent.patch
+++ b/patches/api/0272-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/api/0272-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/api/0273-Add-getMainThreadExecutor-to-BukkitScheduler.patch
index 6de1a3b396..6de1a3b396 100644
--- a/patches/api/0272-Add-getMainThreadExecutor-to-BukkitScheduler.patch
+++ b/patches/api/0273-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/api/0273-living-entity-allow-attribute-registration.patch b/patches/api/0274-living-entity-allow-attribute-registration.patch
index e7ded6dabb..e7ded6dabb 100644
--- a/patches/api/0273-living-entity-allow-attribute-registration.patch
+++ b/patches/api/0274-living-entity-allow-attribute-registration.patch
diff --git a/patches/api/0274-Add-missing-effects.patch b/patches/api/0275-Add-missing-effects.patch
index 57086bea9c..57086bea9c 100644
--- a/patches/api/0274-Add-missing-effects.patch
+++ b/patches/api/0275-Add-missing-effects.patch
diff --git a/patches/api/0275-Expose-Tracked-Players.patch b/patches/api/0276-Expose-Tracked-Players.patch
index 625e7bd3b7..625e7bd3b7 100644
--- a/patches/api/0275-Expose-Tracked-Players.patch
+++ b/patches/api/0276-Expose-Tracked-Players.patch
diff --git a/patches/api/0276-Cache-the-result-of-Material-isBlock.patch b/patches/api/0277-Cache-the-result-of-Material-isBlock.patch
index 294e16cf31..294e16cf31 100644
--- a/patches/api/0276-Cache-the-result-of-Material-isBlock.patch
+++ b/patches/api/0277-Cache-the-result-of-Material-isBlock.patch
diff --git a/patches/api/0277-Add-worldborder-events.patch b/patches/api/0278-Add-worldborder-events.patch
index 09c3770e16..09c3770e16 100644
--- a/patches/api/0277-Add-worldborder-events.patch
+++ b/patches/api/0278-Add-worldborder-events.patch
diff --git a/patches/api/0278-added-PlayerNameEntityEvent.patch b/patches/api/0279-added-PlayerNameEntityEvent.patch
index a38082f8e8..a38082f8e8 100644
--- a/patches/api/0278-added-PlayerNameEntityEvent.patch
+++ b/patches/api/0279-added-PlayerNameEntityEvent.patch
diff --git a/patches/api/0279-Add-recipe-to-cook-events.patch b/patches/api/0280-Add-recipe-to-cook-events.patch
index b0b34773c0..b0b34773c0 100644
--- a/patches/api/0279-Add-recipe-to-cook-events.patch
+++ b/patches/api/0280-Add-recipe-to-cook-events.patch
diff --git a/patches/api/0280-Add-Block-isValidTool.patch b/patches/api/0281-Add-Block-isValidTool.patch
index 257cf003a8..257cf003a8 100644
--- a/patches/api/0280-Add-Block-isValidTool.patch
+++ b/patches/api/0281-Add-Block-isValidTool.patch
diff --git a/patches/api/0281-Implement-Keyed-on-World.patch b/patches/api/0282-Implement-Keyed-on-World.patch
index b8287b7ba8..b8287b7ba8 100644
--- a/patches/api/0281-Implement-Keyed-on-World.patch
+++ b/patches/api/0282-Implement-Keyed-on-World.patch
diff --git a/patches/api/0282-fix-Inventory-getContents-null-annotations.patch b/patches/api/0283-fix-Inventory-getContents-null-annotations.patch
index 4d216020ec..4d216020ec 100644
--- a/patches/api/0282-fix-Inventory-getContents-null-annotations.patch
+++ b/patches/api/0283-fix-Inventory-getContents-null-annotations.patch
diff --git a/patches/api/0283-Item-Rarity-API.patch b/patches/api/0284-Item-Rarity-API.patch
index 4a41972380..4a41972380 100644
--- a/patches/api/0283-Item-Rarity-API.patch
+++ b/patches/api/0284-Item-Rarity-API.patch
diff --git a/patches/api/0284-Expose-protocol-version.patch b/patches/api/0285-Expose-protocol-version.patch
index f5e20e22d7..f5e20e22d7 100644
--- a/patches/api/0284-Expose-protocol-version.patch
+++ b/patches/api/0285-Expose-protocol-version.patch
diff --git a/patches/api/0285-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/api/0286-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
index c0c5e15a4d..6fa0ad91f9 100644
--- a/patches/api/0285-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
+++ b/patches/api/0286-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
@@ -393,7 +393,7 @@ index 0000000000000000000000000000000000000000..6f560a51277ccbd46a9142cfa057d276
 +    }
 +}
 diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
-index 19271057cf24329757c9419fa6c97848e008a96c..82b2783497947f336b0dd95db61f31f8f77f446c 100644
+index b94d87832a271a76a5c8c0c9bf403c35348b31ed..6f50e5b0422afc905650e5519def8ed403cb9c54 100644
 --- a/src/test/java/org/bukkit/AnnotationTest.java
 +++ b/src/test/java/org/bukkit/AnnotationTest.java
 @@ -48,6 +48,8 @@ public class AnnotationTest {
diff --git a/patches/api/0286-add-isDeeplySleeping-to-HumanEntity.patch b/patches/api/0287-add-isDeeplySleeping-to-HumanEntity.patch
index cc4e80e8a0..cc4e80e8a0 100644
--- a/patches/api/0286-add-isDeeplySleeping-to-HumanEntity.patch
+++ b/patches/api/0287-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/api/0287-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/api/0288-add-consumeFuel-to-FurnaceBurnEvent.patch
index 6c8b681cd9..6c8b681cd9 100644
--- a/patches/api/0287-add-consumeFuel-to-FurnaceBurnEvent.patch
+++ b/patches/api/0288-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/api/0288-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/api/0289-add-get-set-drop-chance-to-EntityEquipment.patch
index 6512a41923..98332c1fa2 100644
--- a/patches/api/0288-add-get-set-drop-chance-to-EntityEquipment.patch
+++ b/patches/api/0289-add-get-set-drop-chance-to-EntityEquipment.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] add get-set drop chance to EntityEquipment
 
 
 diff --git a/src/main/java/org/bukkit/inventory/EntityEquipment.java b/src/main/java/org/bukkit/inventory/EntityEquipment.java
-index e85c4208f3536277fcd0f8a0f0b4841c4e073b2c..d0abfc3211a7ec451d83e59c7e39cfc7cc47f43e 100644
+index e85c4208f3536277fcd0f8a0f0b4841c4e073b2c..04de95d658b5317937f1acdfd1280dcecfd3137f 100644
 --- a/src/main/java/org/bukkit/inventory/EntityEquipment.java
 +++ b/src/main/java/org/bukkit/inventory/EntityEquipment.java
 @@ -406,4 +406,32 @@ public interface EntityEquipment {
diff --git a/patches/api/0289-Added-PlayerDeepSleepEvent.patch b/patches/api/0290-Added-PlayerDeepSleepEvent.patch
index d8dccca755..d8dccca755 100644
--- a/patches/api/0289-Added-PlayerDeepSleepEvent.patch
+++ b/patches/api/0290-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/api/0290-More-World-API.patch b/patches/api/0291-More-World-API.patch
index 0852f78c91..0852f78c91 100644
--- a/patches/api/0290-More-World-API.patch
+++ b/patches/api/0291-More-World-API.patch
diff --git a/patches/api/0291-Added-PlayerBedFailEnterEvent.patch b/patches/api/0292-Added-PlayerBedFailEnterEvent.patch
index a622f2b98f..a622f2b98f 100644
--- a/patches/api/0291-Added-PlayerBedFailEnterEvent.patch
+++ b/patches/api/0292-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/api/0292-Introduce-beacon-activation-deactivation-events.patch b/patches/api/0293-Introduce-beacon-activation-deactivation-events.patch
index c2f0577191..c2f0577191 100644
--- a/patches/api/0292-Introduce-beacon-activation-deactivation-events.patch
+++ b/patches/api/0293-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/api/0293-PlayerMoveEvent-Improvements.patch b/patches/api/0294-PlayerMoveEvent-Improvements.patch
index 33cf16e54b..33cf16e54b 100644
--- a/patches/api/0293-PlayerMoveEvent-Improvements.patch
+++ b/patches/api/0294-PlayerMoveEvent-Improvements.patch
diff --git a/patches/api/0294-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/api/0295-add-RespawnFlags-to-PlayerRespawnEvent.patch
index 41342d0d34..41342d0d34 100644
--- a/patches/api/0294-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/api/0295-add-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/patches/api/0295-Add-more-WanderingTrader-API.patch b/patches/api/0296-Add-more-WanderingTrader-API.patch
index 99045d4949..99045d4949 100644
--- a/patches/api/0295-Add-more-WanderingTrader-API.patch
+++ b/patches/api/0296-Add-more-WanderingTrader-API.patch
diff --git a/patches/api/0296-Add-EntityBlockStorage-clearEntities.patch b/patches/api/0297-Add-EntityBlockStorage-clearEntities.patch
index 7032ba6155..7032ba6155 100644
--- a/patches/api/0296-Add-EntityBlockStorage-clearEntities.patch
+++ b/patches/api/0297-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/api/0297-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/api/0298-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
index 16af3a7728..16af3a7728 100644
--- a/patches/api/0297-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
+++ b/patches/api/0298-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/api/0298-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/api/0299-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
index 58db0a8a2b..58db0a8a2b 100644
--- a/patches/api/0298-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/api/0299-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/api/0299-Inventory-close.patch b/patches/api/0300-Inventory-close.patch
index 550e287fa6..550e287fa6 100644
--- a/patches/api/0299-Inventory-close.patch
+++ b/patches/api/0300-Inventory-close.patch
diff --git a/patches/api/0300-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/api/0301-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
index 1f4bc96b56..1f4bc96b56 100644
--- a/patches/api/0300-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/api/0301-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/api/0301-Add-basic-Datapack-API.patch b/patches/api/0302-Add-basic-Datapack-API.patch
index 9b119b0963..9b119b0963 100644
--- a/patches/api/0301-Add-basic-Datapack-API.patch
+++ b/patches/api/0302-Add-basic-Datapack-API.patch
diff --git a/patches/api/0302-additions-to-PlayerGameModeChangeEvent.patch b/patches/api/0303-additions-to-PlayerGameModeChangeEvent.patch
index 07c662e585..07c662e585 100644
--- a/patches/api/0302-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/api/0303-additions-to-PlayerGameModeChangeEvent.patch
diff --git a/patches/api/0303-ItemStack-repair-check-API.patch b/patches/api/0304-ItemStack-repair-check-API.patch
index d90207b8e3..d90207b8e3 100644
--- a/patches/api/0303-ItemStack-repair-check-API.patch
+++ b/patches/api/0304-ItemStack-repair-check-API.patch
diff --git a/patches/api/0304-More-Enchantment-API.patch b/patches/api/0305-More-Enchantment-API.patch
index dda68575ca..dda68575ca 100644
--- a/patches/api/0304-More-Enchantment-API.patch
+++ b/patches/api/0305-More-Enchantment-API.patch
diff --git a/patches/api/0305-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/api/0306-Add-command-line-option-to-load-extra-plugin-jars-no.patch
index 53c0f4aab0..53c0f4aab0 100644
--- a/patches/api/0305-Add-command-line-option-to-load-extra-plugin-jars-no.patch
+++ b/patches/api/0306-Add-command-line-option-to-load-extra-plugin-jars-no.patch
diff --git a/patches/api/0306-List-all-missing-hard-depends-not-just-first.patch b/patches/api/0307-List-all-missing-hard-depends-not-just-first.patch
index 4d1ba6ef20..4d1ba6ef20 100644
--- a/patches/api/0306-List-all-missing-hard-depends-not-just-first.patch
+++ b/patches/api/0307-List-all-missing-hard-depends-not-just-first.patch
diff --git a/patches/api/0307-Add-Mob-lookAt-API.patch b/patches/api/0308-Add-Mob-lookAt-API.patch
index b1a75288cb..b1a75288cb 100644
--- a/patches/api/0307-Add-Mob-lookAt-API.patch
+++ b/patches/api/0308-Add-Mob-lookAt-API.patch
diff --git a/patches/api/0308-ItemStack-editMeta.patch b/patches/api/0309-ItemStack-editMeta.patch
index d9b90f5c32..d9b90f5c32 100644
--- a/patches/api/0308-ItemStack-editMeta.patch
+++ b/patches/api/0309-ItemStack-editMeta.patch
diff --git a/patches/api/0309-Add-EntityInsideBlockEvent.patch b/patches/api/0310-Add-EntityInsideBlockEvent.patch
index 26c188e7a0..26c188e7a0 100644
--- a/patches/api/0309-Add-EntityInsideBlockEvent.patch
+++ b/patches/api/0310-Add-EntityInsideBlockEvent.patch
diff --git a/patches/api/0310-Attributes-API-for-item-defaults.patch b/patches/api/0311-Attributes-API-for-item-defaults.patch
index f3107ae522..f3107ae522 100644
--- a/patches/api/0310-Attributes-API-for-item-defaults.patch
+++ b/patches/api/0311-Attributes-API-for-item-defaults.patch
diff --git a/patches/api/0311-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/api/0312-Add-cause-to-Weather-ThunderChangeEvents.patch
index 8e5d45d87b..8e5d45d87b 100644
--- a/patches/api/0311-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/api/0312-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/api/0312-More-Lidded-Block-API.patch b/patches/api/0313-More-Lidded-Block-API.patch
index ca6b5ed744..ca6b5ed744 100644
--- a/patches/api/0312-More-Lidded-Block-API.patch
+++ b/patches/api/0313-More-Lidded-Block-API.patch
diff --git a/patches/api/0313-Add-PlayerKickEvent-causes.patch b/patches/api/0314-Add-PlayerKickEvent-causes.patch
index d74f554747..d74f554747 100644
--- a/patches/api/0313-Add-PlayerKickEvent-causes.patch
+++ b/patches/api/0314-Add-PlayerKickEvent-causes.patch
diff --git a/patches/api/0314-Add-PufferFishStateChangeEvent.patch b/patches/api/0315-Add-PufferFishStateChangeEvent.patch
index c3014534d3..c3014534d3 100644
--- a/patches/api/0314-Add-PufferFishStateChangeEvent.patch
+++ b/patches/api/0315-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/api/0315-Add-BellRevealRaiderEvent.patch b/patches/api/0316-Add-BellRevealRaiderEvent.patch
index 8b0ee3e5b4..8b0ee3e5b4 100644
--- a/patches/api/0315-Add-BellRevealRaiderEvent.patch
+++ b/patches/api/0316-Add-BellRevealRaiderEvent.patch
diff --git a/patches/api/0316-Add-ElderGuardianAppearanceEvent.patch b/patches/api/0317-Add-ElderGuardianAppearanceEvent.patch
index 8d925d10ac..8d925d10ac 100644
--- a/patches/api/0316-Add-ElderGuardianAppearanceEvent.patch
+++ b/patches/api/0317-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/api/0317-Add-more-line-of-sight-methods.patch b/patches/api/0318-Add-more-line-of-sight-methods.patch
index b0121b47ab..b0121b47ab 100644
--- a/patches/api/0317-Add-more-line-of-sight-methods.patch
+++ b/patches/api/0318-Add-more-line-of-sight-methods.patch
diff --git a/patches/api/0318-Add-Feature-Stage-API.patch b/patches/api/0319-Add-Feature-Stage-API.patch
index 64f16a83d4..d5b9c3c176 100644
--- a/patches/api/0318-Add-Feature-Stage-API.patch
+++ b/patches/api/0319-Add-Feature-Stage-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add Feature Stage API
 
 diff --git a/src/main/java/io/papermc/paper/world/generation/ProtoWorld.java b/src/main/java/io/papermc/paper/world/generation/ProtoWorld.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..63de080e945dfa0e63e6f3c63e498f20481dab27
+index 0000000000000000000000000000000000000000..cf9443f1cd3039f0e53c645c894483027455465b
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/world/generation/ProtoWorld.java
 @@ -0,0 +1,270 @@