compile fixes

50 files changed, 89 insertions, 90 deletions

diff --git a/patches/server/0010-Adventure.patch b/patches/server/0010-Adventure.patch
index 7244322ca5..b924660ae0 100644
--- a/patches/server/0010-Adventure.patch
+++ b/patches/server/0010-Adventure.patch
@@ -4069,7 +4069,7 @@ index 55945b83a5426b352bad9507cc9e94afb1278032..9ea1537408ff2d790747b6e5a681d917
      public boolean isOp() {
          return true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 9d2af8b74e33888df33425627b286d32c95753d6..1f0f7498cc33d2035d627d63a69ae7d3fd5dbb91 100644
+index 9d2af8b74e33888df33425627b286d32c95753d6..fab8d670ed8fcd26bf25dabac207b563de0d37e9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -385,14 +385,40 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -4279,7 +4279,7 @@ index 9d2af8b74e33888df33425627b286d32c95753d6..1f0f7498cc33d2035d627d63a69ae7d3
 +            hash = "";
 +        }
 +        this.getHandle().connection.send(new ClientboundResourcePackPopPacket(Optional.empty()));
-+        this.getHandle().connection.send(new ClientboundResourcePackPushPacket(uuid, url, hash, force, io.papermc.paper.adventure.PaperAdventure.asVanilla(prompt)));
++        this.getHandle().connection.send(new ClientboundResourcePackPushPacket(uuid, url, hash, force, Optional.ofNullable(prompt).map(io.papermc.paper.adventure.PaperAdventure::asVanilla)));
 +    }
 +
 +    @SuppressWarnings({"unchecked", "rawtypes"})
@@ -4335,7 +4335,7 @@ index 9d2af8b74e33888df33425627b286d32c95753d6..1f0f7498cc33d2035d627d63a69ae7d3
      @Override
      public int getPing() {
          return this.getHandle().connection.latency();
-@@ -2322,6 +2449,252 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2322,6 +2449,249 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.getHandle().allowsListing();
      }
  
@@ -4439,9 +4439,10 @@ index 9d2af8b74e33888df33425627b286d32c95753d6..1f0f7498cc33d2035d627d63a69ae7d3
 +    private void adventure$sendPlayerListHeaderAndFooter() {
 +        final ServerGamePacketListenerImpl connection = this.getHandle().connection;
 +        if (connection == null) return;
-+        final ClientboundTabListPacket packet = new ClientboundTabListPacket(null, null);
-+        packet.adventure$header = (this.playerListHeader == null) ? net.kyori.adventure.text.Component.empty() : this.playerListHeader;
-+        packet.adventure$footer = (this.playerListFooter == null) ? net.kyori.adventure.text.Component.empty() : this.playerListFooter;
++        final ClientboundTabListPacket packet = new ClientboundTabListPacket(
++            io.papermc.paper.adventure.PaperAdventure.asVanilla((this.playerListHeader == null) ? net.kyori.adventure.text.Component.empty() : this.playerListHeader),
++            io.papermc.paper.adventure.PaperAdventure.asVanilla((this.playerListFooter == null) ? net.kyori.adventure.text.Component.empty() : this.playerListFooter)
++        );
 +        connection.send(packet);
 +    }
 +
@@ -4452,11 +4453,9 @@ index 9d2af8b74e33888df33425627b286d32c95753d6..1f0f7498cc33d2035d627d63a69ae7d3
 +        if (times != null) {
 +            connection.send(new ClientboundSetTitlesAnimationPacket(ticks(times.fadeIn()), ticks(times.stay()), ticks(times.fadeOut())));
 +        }
-+        final ClientboundSetSubtitleTextPacket sp = new ClientboundSetSubtitleTextPacket((net.minecraft.network.chat.Component) null);
-+        sp.adventure$text = title.subtitle();
++        final ClientboundSetSubtitleTextPacket sp = new ClientboundSetSubtitleTextPacket(io.papermc.paper.adventure.PaperAdventure.asVanilla(title.subtitle()));
 +        connection.send(sp);
-+        final ClientboundSetTitleTextPacket tp = new ClientboundSetTitleTextPacket((net.minecraft.network.chat.Component) null);
-+        tp.adventure$text = title.title();
++        final ClientboundSetTitleTextPacket tp = new ClientboundSetTitleTextPacket(io.papermc.paper.adventure.PaperAdventure.asVanilla(title.title()));
 +        connection.send(tp);
 +    }
 +
@@ -4465,12 +4464,10 @@ index 9d2af8b74e33888df33425627b286d32c95753d6..1f0f7498cc33d2035d627d63a69ae7d3
 +        java.util.Objects.requireNonNull(part, "part");
 +        java.util.Objects.requireNonNull(value, "value");
 +        if (part == net.kyori.adventure.title.TitlePart.TITLE) {
-+            final ClientboundSetTitleTextPacket tp = new ClientboundSetTitleTextPacket((net.minecraft.network.chat.Component) null);
-+            tp.adventure$text = (net.kyori.adventure.text.Component) value;
++            final ClientboundSetTitleTextPacket tp = new ClientboundSetTitleTextPacket(io.papermc.paper.adventure.PaperAdventure.asVanilla((net.kyori.adventure.text.Component)value));
 +            this.getHandle().connection.send(tp);
 +        } else if (part == net.kyori.adventure.title.TitlePart.SUBTITLE) {
-+            final ClientboundSetSubtitleTextPacket sp = new ClientboundSetSubtitleTextPacket((net.minecraft.network.chat.Component) null);
-+            sp.adventure$text = (net.kyori.adventure.text.Component) value;
++            final ClientboundSetSubtitleTextPacket sp = new ClientboundSetSubtitleTextPacket(io.papermc.paper.adventure.PaperAdventure.asVanilla((net.kyori.adventure.text.Component)value));
 +            this.getHandle().connection.send(sp);
 +        } else if (part == net.kyori.adventure.title.TitlePart.TIMES) {
 +            final net.kyori.adventure.title.Title.Times times = (net.kyori.adventure.title.Title.Times) value;
diff --git a/patches/server/0025-Timings-v2.patch b/patches/server/0025-Timings-v2.patch
index b7fca0b15f..01b7908125 100644
--- a/patches/server/0025-Timings-v2.patch
+++ b/patches/server/0025-Timings-v2.patch
@@ -1805,10 +1805,10 @@ index b0ffa23faf62629043dfd613315eaf9c5fcc2cfe..00000000000000000000000000000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1f0f7498cc33d2035d627d63a69ae7d3fd5dbb91..3c105e67cfe3e7492895bbe829f9c6dd75bd18f6 100644
+index fab8d670ed8fcd26bf25dabac207b563de0d37e9..57444d3cb1e7d7c1871ade8da9189c349c31f574 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2770,6 +2770,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2767,6 +2767,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
              CraftPlayer.this.getHandle().connection.send(new net.minecraft.network.protocol.game.ClientboundSystemChatPacket(components, position == net.md_5.bungee.api.ChatMessageType.ACTION_BAR));
          }
diff --git a/patches/server/0040-Player-affects-spawning-API.patch b/patches/server/0040-Player-affects-spawning-API.patch
index b8f9586580..cfa4e6f29d 100644
--- a/patches/server/0040-Player-affects-spawning-API.patch
+++ b/patches/server/0040-Player-affects-spawning-API.patch
@@ -135,7 +135,7 @@ index f38f62e777d88a783e1e3b7e1a48da921cc67cf4..77ae7882a08441d9a80b50492be5e484
          for (Player player : this.players()) {
              if (EntitySelector.NO_SPECTATORS.test(player) && EntitySelector.LIVING_ENTITY_STILL_ALIVE.test(player)) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3c105e67cfe3e7492895bbe829f9c6dd75bd18f6..3b08e3b0e8ec566ecb437619bf64ee5d3a96fc1f 100644
+index 57444d3cb1e7d7c1871ade8da9189c349c31f574..bbd68165b8215dfe221a2ad78cb994093831ce8e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2409,6 +2409,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0041-Only-refresh-abilities-if-needed.patch b/patches/server/0041-Only-refresh-abilities-if-needed.patch
index ac18c22452..3f507021fd 100644
--- a/patches/server/0041-Only-refresh-abilities-if-needed.patch
+++ b/patches/server/0041-Only-refresh-abilities-if-needed.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Only refresh abilities if needed
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3b08e3b0e8ec566ecb437619bf64ee5d3a96fc1f..63d00413d331cd012bac151052a579355d46c690 100644
+index bbd68165b8215dfe221a2ad78cb994093831ce8e..bcfcd382d630525c887e2b3945bdd81a5f13bc2f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2082,12 +2082,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0054-Implement-PlayerLocaleChangeEvent.patch b/patches/server/0054-Implement-PlayerLocaleChangeEvent.patch
index dc33fc0534..36fdd11cb7 100644
--- a/patches/server/0054-Implement-PlayerLocaleChangeEvent.patch
+++ b/patches/server/0054-Implement-PlayerLocaleChangeEvent.patch
@@ -39,7 +39,7 @@ index d75c3c10dcbd777796e479b9538e5254857ac07c..ab2336a30c1ffc1698c327c031a648d4
          // CraftBukkit end
          this.language = clientOptions.language();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 63d00413d331cd012bac151052a579355d46c690..07bfb5014d82262b0c96fc0c8cf52bfa0f67add1 100644
+index bcfcd382d630525c887e2b3945bdd81a5f13bc2f..58b2e368cd5c5664f65bad9a3025d9813730b184 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2407,7 +2407,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0061-Improve-Player-chat-API-handling.patch b/patches/server/0061-Improve-Player-chat-API-handling.patch
index 1ab7f0117e..a8f03a9659 100644
--- a/patches/server/0061-Improve-Player-chat-API-handling.patch
+++ b/patches/server/0061-Improve-Player-chat-API-handling.patch
@@ -53,7 +53,7 @@ index b43dae6ed6ebdd1978e35e9d43e07591f90dcb09..4a1305df41c42be65dbb0438066e148e
          if (this.commandMap.dispatch(sender, commandLine)) {
              return true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 07bfb5014d82262b0c96fc0c8cf52bfa0f67add1..921d43307f9b8a3c0ff211cf8c20b93b8431af15 100644
+index 58b2e368cd5c5664f65bad9a3025d9813730b184..ac9fb5862d08cdc9bdc9c10db562e72adec5b942 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -543,7 +543,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0065-Player-Tab-List-and-Title-APIs.patch b/patches/server/0065-Player-Tab-List-and-Title-APIs.patch
index be9bc42470..94ec7c3c62 100644
--- a/patches/server/0065-Player-Tab-List-and-Title-APIs.patch
+++ b/patches/server/0065-Player-Tab-List-and-Title-APIs.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Player Tab List and Title APIs
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 921d43307f9b8a3c0ff211cf8c20b93b8431af15..808c6f9c22893eee2b297f354ea2906f22915389 100644
+index ac9fb5862d08cdc9bdc9c10db562e72adec5b942..6ff1535a945ca46a7d73718758581dd1e66e5304 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -383,6 +383,98 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0068-Configurable-inter-world-teleportation-safety.patch b/patches/server/0068-Configurable-inter-world-teleportation-safety.patch
index 0c197f221b..ad43ff1e69 100644
--- a/patches/server/0068-Configurable-inter-world-teleportation-safety.patch
+++ b/patches/server/0068-Configurable-inter-world-teleportation-safety.patch
@@ -16,7 +16,7 @@ The wanted destination was on top of the emerald block however the player ended
 This only is the case if the player is teleporting between worlds.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 808c6f9c22893eee2b297f354ea2906f22915389..6ea9ff476b49a778a767336b7650bf3525605fc0 100644
+index 6ff1535a945ca46a7d73718758581dd1e66e5304..6d4740ee59709ef6bf414c77c2ee322a97a0e63b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1235,7 +1235,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0073-Complete-resource-pack-API.patch b/patches/server/0073-Complete-resource-pack-API.patch
index f7d51505a0..9cedaf1ec3 100644
--- a/patches/server/0073-Complete-resource-pack-API.patch
+++ b/patches/server/0073-Complete-resource-pack-API.patch
@@ -22,7 +22,7 @@ index 70a22e140050273ae420e8dc414eab6d08e78617..d0178fc884b57cda9090a80716685994
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 6ea9ff476b49a778a767336b7650bf3525605fc0..3d145fb11fa1598b3f31e82445cdc2bbef205dec 100644
+index 6d4740ee59709ef6bf414c77c2ee322a97a0e63b..de4f80b7b5b573228cc3bbdcbca784368ee4cc81 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -205,6 +205,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0081-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/patches/server/0081-handle-NaN-health-absorb-values-and-repair-bad-data.patch
index c8abe59db5..bdb70bec1b 100644
--- a/patches/server/0081-handle-NaN-health-absorb-values-and-repair-bad-data.patch
+++ b/patches/server/0081-handle-NaN-health-absorb-values-and-repair-bad-data.patch
@@ -44,7 +44,7 @@ index 53da8935e076d56f0a5423e5c1bdcdddc7cbd882..f02b12f3853bf4bf29b59a505f06cb98
  
      protected void internalSetAbsorptionAmount(float absorptionAmount) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3d145fb11fa1598b3f31e82445cdc2bbef205dec..37bf685ee6a01a32d369f0154e7b2446c58efd4c 100644
+index de4f80b7b5b573228cc3bbdcbca784368ee4cc81..ad995762fa30262486eecba83bdb9c463bd23001 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2327,6 +2327,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0126-String-based-Action-Bar-API.patch b/patches/server/0126-String-based-Action-Bar-API.patch
index 84f235f504..fb0945c53e 100644
--- a/patches/server/0126-String-based-Action-Bar-API.patch
+++ b/patches/server/0126-String-based-Action-Bar-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] String based Action Bar API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 37bf685ee6a01a32d369f0154e7b2446c58efd4c..880fb42eb3bf43638b5a6a544aacd8b6a93d4cd9 100644
+index ad995762fa30262486eecba83bdb9c463bd23001..ec5cf5a08bce3c1b89f009a236a26946477bbf8a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -385,6 +385,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0160-Expose-client-protocol-version-and-virtual-host.patch b/patches/server/0160-Expose-client-protocol-version-and-virtual-host.patch
index 47f54345ad..68d58973cc 100644
--- a/patches/server/0160-Expose-client-protocol-version-and-virtual-host.patch
+++ b/patches/server/0160-Expose-client-protocol-version-and-virtual-host.patch
@@ -90,7 +90,7 @@ index 9214fb6b8e21ff6aee8be0691f1fe6e41c901ba3..644214cc3a3c8e560b6ce470fe5997e3
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 880fb42eb3bf43638b5a6a544aacd8b6a93d4cd9..aa08ba311a28af0806d5432423325723afb9f711 100644
+index ec5cf5a08bce3c1b89f009a236a26946477bbf8a..7e9e2895aebb53c00fb3f4d3e284d52ab7e9724b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -331,6 +331,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0170-Ability-to-apply-mending-to-XP-API.patch b/patches/server/0170-Ability-to-apply-mending-to-XP-API.patch
index 2f59046c01..b0247f34dd 100644
--- a/patches/server/0170-Ability-to-apply-mending-to-XP-API.patch
+++ b/patches/server/0170-Ability-to-apply-mending-to-XP-API.patch
@@ -14,7 +14,7 @@ public net.minecraft.world.entity.ExperienceOrb durabilityToXp(I)I
 public net.minecraft.world.entity.ExperienceOrb xpToDurability(I)I
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index aa08ba311a28af0806d5432423325723afb9f711..5cb5ec6cdbc71be2c3ef6b87b76b5f6007b65ea2 100644
+index 7e9e2895aebb53c00fb3f4d3e284d52ab7e9724b..c95b553a751e99b37ea340fcf5e1417bb147ae2d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1624,7 +1624,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0183-Player.setPlayerProfile-API.patch b/patches/server/0183-Player.setPlayerProfile-API.patch
index 9b897be2a6..a67bfe272b 100644
--- a/patches/server/0183-Player.setPlayerProfile-API.patch
+++ b/patches/server/0183-Player.setPlayerProfile-API.patch
@@ -77,7 +77,7 @@ index 818df09e9245b5d89b4180b1eaa51470b7539341..461656e1cb095243bfe7a9ee2906e5b0
  
      public Server getServer() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 5cb5ec6cdbc71be2c3ef6b87b76b5f6007b65ea2..ccc18ed8dec330743c01c4123281a0531509a902 100644
+index c95b553a751e99b37ea340fcf5e1417bb147ae2d..5a6ce9733da2bb58499a27d96ad0cfd8ae380520 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -246,11 +246,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0188-Flag-to-disable-the-channel-limit.patch b/patches/server/0188-Flag-to-disable-the-channel-limit.patch
index 7d9bb788f1..558abfdbc8 100644
--- a/patches/server/0188-Flag-to-disable-the-channel-limit.patch
+++ b/patches/server/0188-Flag-to-disable-the-channel-limit.patch
@@ -9,7 +9,7 @@ e.g. servers which allow and support the usage of mod packs.
 provide an optional flag to disable this check, at your own risk.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ccc18ed8dec330743c01c4123281a0531509a902..b85c23fe5bfff51c1b37b5aecda4a29f14f25f80 100644
+index 5a6ce9733da2bb58499a27d96ad0cfd8ae380520..113c766abb12c24811bf6b8587e25762b6a2aa47 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -206,6 +206,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0215-InventoryCloseEvent-Reason-API.patch b/patches/server/0215-InventoryCloseEvent-Reason-API.patch
index 1d72a18b37..621b259413 100644
--- a/patches/server/0215-InventoryCloseEvent-Reason-API.patch
+++ b/patches/server/0215-InventoryCloseEvent-Reason-API.patch
@@ -165,7 +165,7 @@ index dd3377a4f69e5ac10905e52d0eecc2427e72d856..c79607a2f45b7a487a95cf98b9b0eb6b
      @Override
      public boolean isBlocking() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b85c23fe5bfff51c1b37b5aecda4a29f14f25f80..87e3eeb126284eab6d3391ae11d3bf2a8edfcb61 100644
+index 113c766abb12c24811bf6b8587e25762b6a2aa47..23ba43bedb773addd5ba7a24845c7c0ad195ef0a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1260,7 +1260,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0250-Expose-attack-cooldown-methods-for-Player.patch b/patches/server/0250-Expose-attack-cooldown-methods-for-Player.patch
index 7f7776773c..db7803b5a0 100644
--- a/patches/server/0250-Expose-attack-cooldown-methods-for-Player.patch
+++ b/patches/server/0250-Expose-attack-cooldown-methods-for-Player.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose attack cooldown methods for Player
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 87e3eeb126284eab6d3391ae11d3bf2a8edfcb61..b3f6e1277c7afc77ff34ac14d3d16d1501abe14e 100644
+index 23ba43bedb773addd5ba7a24845c7c0ad195ef0a..7bb1a488a1f7eb40a88a70c2245fa86fafd02145 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2964,6 +2964,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2961,6 +2961,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
          return this.adventure$pointers;
      }
diff --git a/patches/server/0251-Improve-death-events.patch b/patches/server/0251-Improve-death-events.patch
index 33b628f3d7..911adb4244 100644
--- a/patches/server/0251-Improve-death-events.patch
+++ b/patches/server/0251-Improve-death-events.patch
@@ -427,7 +427,7 @@ index 042968ff848da74be0c9fcf9bac3d0adfb135802..cb3729509e50fed64b17f16797825c1d
          this.gameEvent(GameEvent.ENTITY_DIE);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b3f6e1277c7afc77ff34ac14d3d16d1501abe14e..32bd55d8853cd1be12e910fc6626b96a6f3ea558 100644
+index 7bb1a488a1f7eb40a88a70c2245fa86fafd02145..886c6595c9f621a910a931fa1dcc23edf173c14d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2502,7 +2502,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0281-Replace-OfflinePlayer-getLastPlayed.patch b/patches/server/0281-Replace-OfflinePlayer-getLastPlayed.patch
index a741b07141..cfbe975959 100644
--- a/patches/server/0281-Replace-OfflinePlayer-getLastPlayed.patch
+++ b/patches/server/0281-Replace-OfflinePlayer-getLastPlayed.patch
@@ -106,7 +106,7 @@ index 461656e1cb095243bfe7a9ee2906e5b00574ae78..411b280ac3e27e72091db813c0c9b69b
      public Location getLastDeathLocation() {
          if (this.getData().contains("LastDeathLocation", 10)) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 32bd55d8853cd1be12e910fc6626b96a6f3ea558..3ef95c7fb6bac4d79ecefd1f8591824258f84342 100644
+index 886c6595c9f621a910a931fa1dcc23edf173c14d..faa3f44d1fbf8b401503b9c3391794c23a35e8ff 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -207,6 +207,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0283-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch b/patches/server/0283-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
index 61009910db..ca3892240a 100644
--- a/patches/server/0283-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
+++ b/patches/server/0283-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
@@ -8,7 +8,7 @@ We just add a check to ensure that the CraftPlayer's handle
 is a ServerPlayer
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3ef95c7fb6bac4d79ecefd1f8591824258f84342..356d814e09c4804dc32e320c01c26f4a059693da 100644
+index faa3f44d1fbf8b401503b9c3391794c23a35e8ff..c0dfc799c0945bf5dc949ab505bc0db3853af557 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -221,8 +221,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0352-Implement-Player-Client-Options-API.patch b/patches/server/0352-Implement-Player-Client-Options-API.patch
index e321a0daa9..f5cdd1b91b 100644
--- a/patches/server/0352-Implement-Player-Client-Options-API.patch
+++ b/patches/server/0352-Implement-Player-Client-Options-API.patch
@@ -136,7 +136,7 @@ index f6e4172f1c7ad38128e77e53f099e67a4c4be620..62bdc3016120271da2ca3a1f6ac46757
          this.adventure$locale = java.util.Objects.requireNonNullElse(net.kyori.adventure.translation.Translator.parseLocale(this.language), java.util.Locale.US); // Paper
          this.requestedViewDistance = clientOptions.viewDistance();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 356d814e09c4804dc32e320c01c26f4a059693da..665ba6c4b2f6968b1311217dad9c3306c0895c07 100644
+index c0dfc799c0945bf5dc949ab505bc0db3853af557..1c1fdeec5e27720290509ad2480fe18c320b4453 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -650,6 +650,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0408-Brand-support.patch b/patches/server/0408-Brand-support.patch
index 0f0b83f32e..afbe80819b 100644
--- a/patches/server/0408-Brand-support.patch
+++ b/patches/server/0408-Brand-support.patch
@@ -57,10 +57,10 @@ index 96b5e033aab4e1ee090af77a871e643dbf6300a4..215da3c52dc7b9e92c23f352fa7cffc2
              } catch (Exception ex) {
                  ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 665ba6c4b2f6968b1311217dad9c3306c0895c07..777f48d31b8b1d3a47471caba00ffb77a335c03b 100644
+index 1c1fdeec5e27720290509ad2480fe18c320b4453..c6898363e67a21851f7a33e280e3b2e7a69e480c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3123,6 +3123,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3120,6 +3120,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          // Paper end
      };
  
diff --git a/patches/server/0451-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0451-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
index eac02d8a00..f10ae01fe2 100644
--- a/patches/server/0451-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
+++ b/patches/server/0451-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix Player spawnParticle x/y/z precision loss
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 777f48d31b8b1d3a47471caba00ffb77a335c03b..8f437587d8989f3aa709ce36d1a10f237d28f0fa 100644
+index c6898363e67a21851f7a33e280e3b2e7a69e480c..2192548c9f69b12bc14ef7fb5799d0bbe1e109d1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2686,7 +2686,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0488-Add-sendOpLevel-API.patch b/patches/server/0488-Add-sendOpLevel-API.patch
index b34764a2cf..b8879f392f 100644
--- a/patches/server/0488-Add-sendOpLevel-API.patch
+++ b/patches/server/0488-Add-sendOpLevel-API.patch
@@ -32,7 +32,7 @@ index c9f4d50834d8544bafe973258b59105b2b83bf1d..dd360250ca784421e0f8fffe786bec88
  
      public boolean isWhiteListed(GameProfile profile) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 8f437587d8989f3aa709ce36d1a10f237d28f0fa..0cfc8b5faa56ae2a3dd94c5dbcb22a7e208b38bd 100644
+index 2192548c9f69b12bc14ef7fb5799d0bbe1e109d1..627f5560fa7e958193f7a6e60edd78a3775195ab 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -674,6 +674,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0551-Expand-PlayerGameModeChangeEvent.patch b/patches/server/0551-Expand-PlayerGameModeChangeEvent.patch
index 215b8f50a3..8d80ec4633 100644
--- a/patches/server/0551-Expand-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0551-Expand-PlayerGameModeChangeEvent.patch
@@ -145,7 +145,7 @@ index 70d5f1202c38d2b73510a8e1fe0863492384cf20..f34960b459b9dd7340fd0b8b19739f08
                      }
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0cfc8b5faa56ae2a3dd94c5dbcb22a7e208b38bd..e38d8d7e4c114fa00dbc30ce409991d8ec8c8975 100644
+index 627f5560fa7e958193f7a6e60edd78a3775195ab..996563514996ba63f5c61c9e7d15db9d6a3cde26 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1640,7 +1640,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0563-Add-PlayerKickEvent-causes.patch b/patches/server/0563-Add-PlayerKickEvent-causes.patch
index 97d6695a99..4112b265f9 100644
--- a/patches/server/0563-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0563-Add-PlayerKickEvent-causes.patch
@@ -477,7 +477,7 @@ index f472dea0bd4f834c0c8f0aa59ae7cdae082b14af..2fa51c3a70f43cd23b8f494fc643d66c
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e38d8d7e4c114fa00dbc30ce409991d8ec8c8975..5a1d8386e12842f36c07dac6211f961c95ecd8ee 100644
+index 996563514996ba63f5c61c9e7d15db9d6a3cde26..c498ba250838ece5e6dacd1b0a27e3d65c402e9e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -632,7 +632,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0592-Add-PlayerSetSpawnEvent.patch b/patches/server/0592-Add-PlayerSetSpawnEvent.patch
index 201172cb84..d8f8d51272 100644
--- a/patches/server/0592-Add-PlayerSetSpawnEvent.patch
+++ b/patches/server/0592-Add-PlayerSetSpawnEvent.patch
@@ -187,7 +187,7 @@ index e18726915d1491d74084827afd9978800aecb644..a4a90df0b500fb440226b07462faaa87
              }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 5a1d8386e12842f36c07dac6211f961c95ecd8ee..81060ef3c9ba90a5bd3ecda65a0e1ac02ce5a9ce 100644
+index c498ba250838ece5e6dacd1b0a27e3d65c402e9e..6e88a6b47be886b715f1d97adb0dd0e14cdb6a51 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1399,9 +1399,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0677-Multi-Block-Change-API-Implementation.patch b/patches/server/0677-Multi-Block-Change-API-Implementation.patch
index e8074defa0..1d19c4579c 100644
--- a/patches/server/0677-Multi-Block-Change-API-Implementation.patch
+++ b/patches/server/0677-Multi-Block-Change-API-Implementation.patch
@@ -24,7 +24,7 @@ index 926ff9be3d9e3f5d620e4c7ccb22b9f64865ff8c..1a37654aff9a9c86c9f7af10a1cf7213
          buf.writeLong(this.sectionPos.asLong());
          buf.writeVarInt(this.positions.length);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 81060ef3c9ba90a5bd3ecda65a0e1ac02ce5a9ce..d2f98aeb4a209e9ed4a7b6bddba8a299fc21d002 100644
+index 6e88a6b47be886b715f1d97adb0dd0e14cdb6a51..2bed20fe4e8d28c806a9ede40498e300212b047a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -927,6 +927,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0684-Implement-regenerateChunk.patch b/patches/server/0684-Implement-regenerateChunk.patch
index 9067660fe1..f9045a1c20 100644
--- a/patches/server/0684-Implement-regenerateChunk.patch
+++ b/patches/server/0684-Implement-regenerateChunk.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement regenerateChunk
 Co-authored-by: Jason Penilla <[email protected]>
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 98d87f29f111029b11409e6f4230e53119bd8711..377582da016ed510d1dfd53805b13456fe04b28f 100644
+index 98d87f29f111029b11409e6f4230e53119bd8711..9aa26056e0056dedaf86d19f71eb0c6e9ab956d3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -151,6 +151,7 @@ import org.jetbrains.annotations.Nullable;
@@ -17,7 +17,7 @@ index 98d87f29f111029b11409e6f4230e53119bd8711..377582da016ed510d1dfd53805b13456
  
      private final ServerLevel world;
      private WorldBorder worldBorder;
-@@ -421,27 +422,68 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -421,27 +422,70 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      @Override
      public boolean regenerateChunk(int x, int z) {
          org.spigotmc.AsyncCatcher.catchOp("chunk regenerate"); // Spigot
@@ -50,12 +50,14 @@ index 98d87f29f111029b11409e6f4230e53119bd8711..377582da016ed510d1dfd53805b13456
 +                }
 +            }
 +
-+            final java.util.concurrent.CompletableFuture<com.mojang.datafixers.util.Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>> future = chunkStatus.generate(
++            final java.util.concurrent.CompletableFuture<ChunkAccess> future = chunkStatus.generate(
++                new net.minecraft.world.level.chunk.status.WorldGenContext(
++                    serverLevel,
++                    serverChunkCache.getGenerator(),
++                    serverLevel.getStructureManager(),
++                    serverChunkCache.getLightEngine()
++                ),
 +                Runnable::run,
-+                serverLevel,
-+                serverChunkCache.getGenerator(),
-+                serverLevel.getStructureManager(),
-+                serverChunkCache.getLightEngine(),
 +                chunk -> {
 +                    throw new UnsupportedOperationException("Not creating full chunks here");
 +                },
@@ -63,7 +65,7 @@ index 98d87f29f111029b11409e6f4230e53119bd8711..377582da016ed510d1dfd53805b13456
 +            );
 +            serverChunkCache.mainThreadProcessor.managedBlock(future::isDone);
 +            if (chunkStatus == ChunkStatus.NOISE) {
-+                future.join().left().ifPresent(chunk -> net.minecraft.world.level.levelgen.Heightmap.primeHeightmaps(chunk, ChunkStatus.POST_FEATURES));
++                net.minecraft.world.level.levelgen.Heightmap.primeHeightmaps(future.join(), ChunkStatus.POST_FEATURES);
 +            }
          }
  
diff --git a/patches/server/0697-Fix-falling-block-spawn-methods.patch b/patches/server/0697-Fix-falling-block-spawn-methods.patch
index c79cbcd947..d83720726e 100644
--- a/patches/server/0697-Fix-falling-block-spawn-methods.patch
+++ b/patches/server/0697-Fix-falling-block-spawn-methods.patch
@@ -11,10 +11,10 @@ Restores the API behavior from previous versions of the server
 public net.minecraft.world.entity.item.FallingBlockEntity <init>(Lnet/minecraft/world/level/Level;DDDLnet/minecraft/world/level/block/state/BlockState;)V
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 377582da016ed510d1dfd53805b13456fe04b28f..9218a7a69d581c236f6ce798c890419d30327940 100644
+index 9aa26056e0056dedaf86d19f71eb0c6e9ab956d3..df722b6bb5ee5d81d95e61e6eaf35bc44f350d5f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1423,7 +1423,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1425,7 +1425,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          Preconditions.checkArgument(material != null, "Material cannot be null");
          Preconditions.checkArgument(material.isBlock(), "Material.%s must be a block", material);
  
@@ -28,7 +28,7 @@ index 377582da016ed510d1dfd53805b13456fe04b28f..9218a7a69d581c236f6ce798c890419d
          return (FallingBlock) entity.getBukkitEntity();
      }
  
-@@ -1432,7 +1437,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1434,7 +1439,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          Preconditions.checkArgument(location != null, "Location cannot be null");
          Preconditions.checkArgument(data != null, "BlockData cannot be null");
  
diff --git a/patches/server/0747-More-Teleport-API.patch b/patches/server/0747-More-Teleport-API.patch
index 5673811ca1..a35be9a744 100644
--- a/patches/server/0747-More-Teleport-API.patch
+++ b/patches/server/0747-More-Teleport-API.patch
@@ -112,7 +112,7 @@ index 113ca1d16cb7650d72f488cdaa9e670d51dc85f0..b6fef2ca5b564c293cb602cb8e300d35
      private final org.bukkit.entity.Entity.Spigot spigot = new org.bukkit.entity.Entity.Spigot()
      {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d2f98aeb4a209e9ed4a7b6bddba8a299fc21d002..15f2dec16042c79303b88b6dfb1ba17ec13a5f56 100644
+index 2bed20fe4e8d28c806a9ede40498e300212b047a..95e47bc902fa7a67408235f006f66182a06777f6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1273,13 +1273,101 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0751-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0751-Warn-on-plugins-accessing-faraway-chunks.patch
index 6daaef9980..d2a128badd 100644
--- a/patches/server/0751-Warn-on-plugins-accessing-faraway-chunks.patch
+++ b/patches/server/0751-Warn-on-plugins-accessing-faraway-chunks.patch
@@ -18,7 +18,7 @@ index 12a104fd9aa6c02a4e983f9651e07804a8df606e..37c81d6c95efaab12a05075e6397ab25
  
      private static boolean isOutsideSpawnableHeight(int y) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 9218a7a69d581c236f6ce798c890419d30327940..334025d77ec9ff3f2afa8b69e9b62b6ed2415e67 100644
+index df722b6bb5ee5d81d95e61e6eaf35bc44f350d5f..80aa2aebc490e763d2b9dfd56bcaff94cb13cd91 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -319,9 +319,24 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -54,7 +54,7 @@ index 9218a7a69d581c236f6ce798c890419d30327940..334025d77ec9ff3f2afa8b69e9b62b6e
          // Paper start - implement regenerateChunk method
          final ServerLevel serverLevel = this.world;
          final net.minecraft.server.level.ServerChunkCache serverChunkCache = serverLevel.getChunkSource();
-@@ -516,6 +532,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -518,6 +534,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      @Override
      public boolean loadChunk(int x, int z, boolean generate) {
          org.spigotmc.AsyncCatcher.catchOp("chunk load"); // Spigot
@@ -62,7 +62,7 @@ index 9218a7a69d581c236f6ce798c890419d30327940..334025d77ec9ff3f2afa8b69e9b62b6e
          ChunkAccess chunk = this.world.getChunkSource().getChunk(x, z, generate || isChunkGenerated(x, z) ? ChunkStatus.FULL : ChunkStatus.EMPTY, true); // Paper
  
          // If generate = false, but the chunk already exists, we will get this back.
-@@ -548,6 +565,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -550,6 +567,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public boolean addPluginChunkTicket(int x, int z, Plugin plugin) {
@@ -70,7 +70,7 @@ index 9218a7a69d581c236f6ce798c890419d30327940..334025d77ec9ff3f2afa8b69e9b62b6e
          Preconditions.checkArgument(plugin != null, "null plugin");
          Preconditions.checkArgument(plugin.isEnabled(), "plugin is not enabled");
  
-@@ -648,6 +666,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -650,6 +668,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public void setChunkForceLoaded(int x, int z, boolean forced) {
@@ -78,7 +78,7 @@ index 9218a7a69d581c236f6ce798c890419d30327940..334025d77ec9ff3f2afa8b69e9b62b6e
          this.getHandle().setChunkForced(x, z, forced);
      }
  
-@@ -976,6 +995,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -978,6 +997,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public int getHighestBlockYAt(int x, int z, org.bukkit.HeightMap heightMap) {
@@ -86,7 +86,7 @@ index 9218a7a69d581c236f6ce798c890419d30327940..334025d77ec9ff3f2afa8b69e9b62b6e
          // Transient load for this tick
          return this.world.getChunk(x >> 4, z >> 4).getHeight(CraftHeightMap.toNMS(heightMap), x, z);
      }
-@@ -2398,6 +2418,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2400,6 +2420,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      // Spigot end
      // Paper start
      public java.util.concurrent.CompletableFuture<Chunk> getChunkAtAsync(int x, int z, boolean gen, boolean urgent) {
diff --git a/patches/server/0752-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0752-Custom-Chat-Completion-Suggestions-API.patch
index 366dba13d9..3354525bdd 100644
--- a/patches/server/0752-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/server/0752-Custom-Chat-Completion-Suggestions-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Custom Chat Completion Suggestions API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 15f2dec16042c79303b88b6dfb1ba17ec13a5f56..7d0cf5cba735b3726d8d9594ce0ac88360149680 100644
+index 95e47bc902fa7a67408235f006f66182a06777f6..06eabbd237c3a86ec984c7193204bc80dfed15c0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -688,6 +688,24 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0778-Elder-Guardian-appearance-API.patch b/patches/server/0778-Elder-Guardian-appearance-API.patch
index 70c1cf7fdf..7c932b1df6 100644
--- a/patches/server/0778-Elder-Guardian-appearance-API.patch
+++ b/patches/server/0778-Elder-Guardian-appearance-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Elder Guardian appearance API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7d0cf5cba735b3726d8d9594ce0ac88360149680..175c49c6b8fa4e00e8a6205f27ee06467f069960 100644
+index 06eabbd237c3a86ec984c7193204bc80dfed15c0..40a0c86aeaf7c3d6b506a6110669b2d7ea86314a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3282,6 +3282,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3279,6 +3279,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
      // Paper end
  
diff --git a/patches/server/0792-Add-Player-Warden-Warning-API.patch b/patches/server/0792-Add-Player-Warden-Warning-API.patch
index 79c9547177..58ff3f782c 100644
--- a/patches/server/0792-Add-Player-Warden-Warning-API.patch
+++ b/patches/server/0792-Add-Player-Warden-Warning-API.patch
@@ -10,10 +10,10 @@ public net.minecraft.world.entity.monster.warden.WardenSpawnTracker cooldownTick
 public net.minecraft.world.entity.monster.warden.WardenSpawnTracker increaseWarningLevel()V
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 175c49c6b8fa4e00e8a6205f27ee06467f069960..0262e0cd3ad5f4ab3a264aa110b946f81e9e92c1 100644
+index 40a0c86aeaf7c3d6b506a6110669b2d7ea86314a..6cd6fb2ee452ebfe4cced55fa9e341c8087578b5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3287,6 +3287,41 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3284,6 +3284,41 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void showElderGuardian(boolean silent) {
          if (getHandle().connection != null) getHandle().connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.GUARDIAN_ELDER_EFFECT, silent ? 0F : 1F));
      }
diff --git a/patches/server/0805-fix-Instruments.patch b/patches/server/0805-fix-Instruments.patch
index 3786ebde05..9bcf944422 100644
--- a/patches/server/0805-fix-Instruments.patch
+++ b/patches/server/0805-fix-Instruments.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] fix Instruments
 properly handle Player#playNote
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0262e0cd3ad5f4ab3a264aa110b946f81e9e92c1..af6713dc949cce945f3625092a01f04ad41120e7 100644
+index 6cd6fb2ee452ebfe4cced55fa9e341c8087578b5..40b38fdb0d4183e90fba48eb6c1f011a45bd593e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -765,7 +765,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0815-Flying-Fall-Damage.patch b/patches/server/0815-Flying-Fall-Damage.patch
index 774420bd94..af27af44cb 100644
--- a/patches/server/0815-Flying-Fall-Damage.patch
+++ b/patches/server/0815-Flying-Fall-Damage.patch
@@ -26,7 +26,7 @@ index 761e8a0c4e1db465c18892999e86885f27ca8075..230ffd3c4541ef8979605d733b6463e3
          } else {
              if (fallDistance >= 2.0F) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index af6713dc949cce945f3625092a01f04ad41120e7..1925d55ffb0fbf554fc3d6f6d75f119146f60dca 100644
+index 40b38fdb0d4183e90fba48eb6c1f011a45bd593e..874f65b1ad268cb3eecdbb13ae4b67d81e58f9b4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2566,6 +2566,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0821-Win-Screen-API.patch b/patches/server/0821-Win-Screen-API.patch
index 5844bd44ec..be99de7e3c 100644
--- a/patches/server/0821-Win-Screen-API.patch
+++ b/patches/server/0821-Win-Screen-API.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Win Screen API
 public net.minecraft.server.level.ServerPlayer seenCredits
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1925d55ffb0fbf554fc3d6f6d75f119146f60dca..1519220d02dfeb14fded5687b77a85306faf6dcd 100644
+index 874f65b1ad268cb3eecdbb13ae4b67d81e58f9b4..f4b377fe63fe4d21e5d3ec7146f68860828215fd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1292,6 +1292,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0847-Expand-PlayerItemMendEvent.patch b/patches/server/0847-Expand-PlayerItemMendEvent.patch
index 9e637574bb..5175d16983 100644
--- a/patches/server/0847-Expand-PlayerItemMendEvent.patch
+++ b/patches/server/0847-Expand-PlayerItemMendEvent.patch
@@ -33,7 +33,7 @@ index adc3e6298a1946fdea029c82a9954fb5b6e24497..a207a31d80a302dbdfe80f8727222542
              return k > 0 ? this.repairPlayerItems(player, k) : 0;
          } else {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1519220d02dfeb14fded5687b77a85306faf6dcd..722c69e0149a9bf35159a7ffbb338fbc42600f0e 100644
+index f4b377fe63fe4d21e5d3ec7146f68860828215fd..7ce4a1706c5d0d0e7990e4b50bdab2486a074dea 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1835,11 +1835,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0867-Fix-BanList-API.patch b/patches/server/0867-Fix-BanList-API.patch
index 9ea9cba115..8977891bc1 100644
--- a/patches/server/0867-Fix-BanList-API.patch
+++ b/patches/server/0867-Fix-BanList-API.patch
@@ -208,7 +208,7 @@ index 172202accf4448a933fcf1ff820316c7910dd7f7..50ee7656580d386db473c054f5c5ec57
              return null;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 722c69e0149a9bf35159a7ffbb338fbc42600f0e..1c6fdad145d81a25ccd2b1193ebe4b5ad96bfb9c 100644
+index 7ce4a1706c5d0d0e7990e4b50bdab2486a074dea..4db40044c0ac4fefe315c1ee52ff19e300f30629 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1733,23 +1733,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0886-Bandaid-fix-for-Effect.patch b/patches/server/0886-Bandaid-fix-for-Effect.patch
index 14abf0354b..e8c568cc7a 100644
--- a/patches/server/0886-Bandaid-fix-for-Effect.patch
+++ b/patches/server/0886-Bandaid-fix-for-Effect.patch
@@ -52,10 +52,10 @@ index 71733f918ed84b9879ac1b142ef6205c5e768a9c..7ee13c0a0cd12979c7f8cc2e403baf93
          case COMPOSTER_FILL_ATTEMPT:
              datavalue = ((Boolean) data) ? 1 : 0;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 334025d77ec9ff3f2afa8b69e9b62b6ed2415e67..fa0e61503b35c227ad1216cbde3312942f04ae18 100644
+index 80aa2aebc490e763d2b9dfd56bcaff94cb13cd91..e99ebf806f955a7c0c163ef546b884c794be8a2a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1400,7 +1400,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1402,7 +1402,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      public <T> void playEffect(Location loc, Effect effect, T data, int radius) {
          if (data != null) {
              Preconditions.checkArgument(effect.getData() != null, "Effect.%s does not have a valid Data", effect);
@@ -65,7 +65,7 @@ index 334025d77ec9ff3f2afa8b69e9b62b6ed2415e67..fa0e61503b35c227ad1216cbde331294
              // Special case: the axis is optional for ELECTRIC_SPARK
              Preconditions.checkArgument(effect.getData() == null || effect == Effect.ELECTRIC_SPARK, "Wrong kind of data for the %s effect", effect);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1c6fdad145d81a25ccd2b1193ebe4b5ad96bfb9c..0fe81e58541dbc46ac493897aa190ebf9ddbc805 100644
+index 4db40044c0ac4fefe315c1ee52ff19e300f30629..ed6612311d1f5db95b47bd9883745ce3ebc01cd8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -914,7 +914,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0894-Add-Listing-API-for-Player.patch b/patches/server/0894-Add-Listing-API-for-Player.patch
index 45468d2ffb..9707d97c7d 100644
--- a/patches/server/0894-Add-Listing-API-for-Player.patch
+++ b/patches/server/0894-Add-Listing-API-for-Player.patch
@@ -119,7 +119,7 @@ index 2f62af670441d422133b18d00d9e5e5e58e4afe7..db1279f780e905e5b29fd4db0440d29f
          // Paper end - Use single player info update packet on join
          player.sentListPacket = true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0fe81e58541dbc46ac493897aa190ebf9ddbc805..1d6ea70c8039b7dcae3742ce7ef6a52015d6bc52 100644
+index ed6612311d1f5db95b47bd9883745ce3ebc01cd8..b21fe1ec658628f7de37d87a1f45557d2e4ddef1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -198,6 +198,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0904-Implement-OfflinePlayer-isConnected.patch b/patches/server/0904-Implement-OfflinePlayer-isConnected.patch
index ceef01055c..d347d40043 100644
--- a/patches/server/0904-Implement-OfflinePlayer-isConnected.patch
+++ b/patches/server/0904-Implement-OfflinePlayer-isConnected.patch
@@ -23,7 +23,7 @@ index 4d654c4f0b6210a9841427789ba70ce5d1d308be..9d93130f23addb18b97d7f5ec013faef
      public String getName() {
          Player player = this.getPlayer();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1d6ea70c8039b7dcae3742ce7ef6a52015d6bc52..b8999852f132ac25da3ddb5164c73c886a3fa572 100644
+index b21fe1ec658628f7de37d87a1f45557d2e4ddef1..0a3178562909514dc43d5987d789782df4ae59fa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -253,6 +253,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0924-Add-player-idle-duration-API.patch b/patches/server/0924-Add-player-idle-duration-API.patch
index bbc033f10c..202ff62c7e 100644
--- a/patches/server/0924-Add-player-idle-duration-API.patch
+++ b/patches/server/0924-Add-player-idle-duration-API.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add player idle duration API
 Implements API for getting and resetting a player's idle duration.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b8999852f132ac25da3ddb5164c73c886a3fa572..cbe2edee5503386bbd0ef02cc90d1685ae4a5121 100644
+index 0a3178562909514dc43d5987d789782df4ae59fa..f9e4b3e4a4f5a4d607f3b26749bac15fe3dde43b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3402,6 +3402,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3399,6 +3399,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
      // Paper end
  
diff --git a/patches/server/0927-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/0927-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
index 4fe9c9b755..169a2a7cfb 100644
--- a/patches/server/0927-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
+++ b/patches/server/0927-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow null itemstack for Player#sendEquipmentChange
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index cbe2edee5503386bbd0ef02cc90d1685ae4a5121..843e1d61b4bfa2be48e26e4ca95cbf757c0da736 100644
+index f9e4b3e4a4f5a4d607f3b26749bac15fe3dde43b..a0d4da6338232d4bdffbd58ebcc9c6e379f3f4d9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1125,7 +1125,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0930-Add-predicate-for-blocks-when-raytracing.patch b/patches/server/0930-Add-predicate-for-blocks-when-raytracing.patch
index 58ba9e469b..e41b3d1a5e 100644
--- a/patches/server/0930-Add-predicate-for-blocks-when-raytracing.patch
+++ b/patches/server/0930-Add-predicate-for-blocks-when-raytracing.patch
@@ -47,10 +47,10 @@ index c978f3b2d42f512e982f289e76c2422e41b7eec6..bb8e962e63c7a2d931f9bd7f7c002aa3
              Vec3 vec3d = raytrace1.getFrom().subtract(raytrace1.getTo());
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index fa0e61503b35c227ad1216cbde3312942f04ae18..e9ab753680cc1ef3f935200ca4a13fc7b8eb88ef 100644
+index e99ebf806f955a7c0c163ef546b884c794be8a2a..420af35719f1e8b13cb848f94ca5f084057354af 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1134,9 +1134,15 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1136,9 +1136,15 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public RayTraceResult rayTraceEntities(Location start, Vector direction, double maxDistance, double raySize, Predicate<? super Entity> filter) {
@@ -68,7 +68,7 @@ index fa0e61503b35c227ad1216cbde3312942f04ae18..e9ab753680cc1ef3f935200ca4a13fc7
  
          Preconditions.checkArgument(direction != null, "Vector direction cannot be null");
          direction.checkFinite();
-@@ -1186,9 +1192,16 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1188,9 +1194,16 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public RayTraceResult rayTraceBlocks(Location start, Vector direction, double maxDistance, FluidCollisionMode fluidCollisionMode, boolean ignorePassableBlocks) {
@@ -87,7 +87,7 @@ index fa0e61503b35c227ad1216cbde3312942f04ae18..e9ab753680cc1ef3f935200ca4a13fc7
  
          Preconditions.checkArgument(direction != null, "Vector direction cannot be null");
          direction.checkFinite();
-@@ -1201,16 +1214,23 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1203,16 +1216,23 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          }
  
          Vector dir = direction.clone().normalize().multiply(maxDistance);
diff --git a/patches/server/0934-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch b/patches/server/0934-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
index 68f90abae7..b51a75d52a 100644
--- a/patches/server/0934-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
+++ b/patches/server/0934-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
@@ -45,10 +45,10 @@ index 0471d9c85af02133f99cca4e181b83b58a3f1abc..4f701788bd21b61cad251a3a88f9bc41
              BlockState iblockdata = BaseFireBlock.getState(this.level(), blockposition);
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index e9ab753680cc1ef3f935200ca4a13fc7b8eb88ef..8bcac6699fdafaca0c077efe85ef8319bba63621 100644
+index 420af35719f1e8b13cb848f94ca5f084057354af..c479fcf24025ba2c8a48dbc2b9b3c47d398be486 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -766,7 +766,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -768,7 +768,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
          LightningBolt lightning = EntityType.LIGHTNING_BOLT.create(this.world);
          lightning.moveTo(loc.getX(), loc.getY(), loc.getZ());
diff --git a/patches/server/0941-Add-Structure-check-API.patch b/patches/server/0941-Add-Structure-check-API.patch
index 970b7900ce..327aca6183 100644
--- a/patches/server/0941-Add-Structure-check-API.patch
+++ b/patches/server/0941-Add-Structure-check-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Structure check API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 8bcac6699fdafaca0c077efe85ef8319bba63621..ecd97223cdabe92dee0d43f8e02f2b084d6f981d 100644
+index c479fcf24025ba2c8a48dbc2b9b3c47d398be486..66efa8a5f70c63f07bfeb0088e6745ca4420cc0a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -237,6 +237,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0948-Add-experience-points-API.patch b/patches/server/0948-Add-experience-points-API.patch
index 50874346db..a0c049ad73 100644
--- a/patches/server/0948-Add-experience-points-API.patch
+++ b/patches/server/0948-Add-experience-points-API.patch
@@ -18,7 +18,7 @@ index 230ffd3c4541ef8979605d733b6463e39cd00206..446556028028b25c35dbf3d099bf14a5
      // Paper start - send while respecting visibility
      private static void sendSoundEffect(Player fromEntity, double x, double y, double z, SoundEvent soundEffect, SoundSource soundCategory, float volume, float pitch) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 843e1d61b4bfa2be48e26e4ca95cbf757c0da736..7a79b723766cef478cd6c2214261253693d4f35f 100644
+index a0d4da6338232d4bdffbd58ebcc9c6e379f3f4d9..21bd0ee68fa3785fdb1d9b30f0d55bb2b5d2a3ec 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1902,6 +1902,49 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0969-More-Raid-API.patch b/patches/server/0969-More-Raid-API.patch
index 737124f720..5cf34618a5 100644
--- a/patches/server/0969-More-Raid-API.patch
+++ b/patches/server/0969-More-Raid-API.patch
@@ -86,10 +86,10 @@ index b8ce1c1c2447f9cff1717bfcfd6eb911ade0d4b3..51f21af9d75769abdcba713b9aa33392
 +    // Paper end - more Raid API
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index ecd97223cdabe92dee0d43f8e02f2b084d6f981d..461201fd6468be50eaa33889558ffd0514d910f7 100644
+index 66efa8a5f70c63f07bfeb0088e6745ca4420cc0a..cb48090de2f9912ed5abd03a543a33452fc83f8e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2363,6 +2363,14 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2365,6 +2365,14 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          return (raid == null) ? null : new CraftRaid(raid);
      }