Updated Upstream (Bukkit/CraftBukkit)

Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
465c4964 PR-843: Add damage methods to FallingBlock
46ba7c9f SPIGOT-7335: Fix typo in TextDisplay#TextAlignment enum name

CraftBukkit Changes:
818582f40 PR-1169: Add damage methods to FallingBlock
15a3eac66 SPIGOT-7335: Fix typo in TextDisplay#TextAlignment enum name
f01fb4979 SPIGOT-7336: Fix typo in internal method name

42 files changed, 114 insertions, 114 deletions

diff --git a/patches/server/0010-Adventure.patch b/patches/server/0010-Adventure.patch
index f04adfc2bc..377da5f324 100644
--- a/patches/server/0010-Adventure.patch
+++ b/patches/server/0010-Adventure.patch
@@ -3471,10 +3471,10 @@ index 446fdca49a5a6999626a7ee3a1d5c168b15a09dd..f9863e138994f6c7a7975a852f106faa
      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 e108a2b346c5f8b87165a5d1b259784f23fef2b7..9ee53533095259c9af9ce31840c9039dc456dafa 100644
+index f00a6d38609d38ea51153997ba526963d734c372..8fcd46bef75b3d48356445575c4a6c1b93b61072 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -280,14 +280,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -279,14 +279,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public String getDisplayName() {
@@ -3514,7 +3514,7 @@ index e108a2b346c5f8b87165a5d1b259784f23fef2b7..9ee53533095259c9af9ce31840c9039d
      @Override
      public String getPlayerListName() {
          return this.getHandle().listName == null ? getName() : CraftChatMessage.fromComponent(this.getHandle().listName);
-@@ -306,42 +331,42 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -305,42 +330,42 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
      }
  
@@ -3566,7 +3566,7 @@ index e108a2b346c5f8b87165a5d1b259784f23fef2b7..9ee53533095259c9af9ce31840c9039d
          this.getHandle().connection.send(packet);
      }
  
-@@ -373,6 +398,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -372,6 +397,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.getHandle().connection.disconnect(message == null ? "" : message);
      }
  
@@ -3590,7 +3590,7 @@ index e108a2b346c5f8b87165a5d1b259784f23fef2b7..9ee53533095259c9af9ce31840c9039d
      @Override
      public void setCompassTarget(Location loc) {
          if (this.getHandle().connection == null) return;
-@@ -701,6 +743,35 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -700,6 +742,35 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.getHandle().connection.send(packet);
      }
  
@@ -3626,7 +3626,7 @@ index e108a2b346c5f8b87165a5d1b259784f23fef2b7..9ee53533095259c9af9ce31840c9039d
      @Override
      public void sendSignChange(Location loc, String[] lines) {
          this.sendSignChange(loc, lines, DyeColor.BLACK);
-@@ -728,14 +799,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -727,14 +798,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
  
          Component[] components = CraftSign.sanitizeLines(lines);
@@ -3644,7 +3644,7 @@ index e108a2b346c5f8b87165a5d1b259784f23fef2b7..9ee53533095259c9af9ce31840c9039d
      }
  
      @Override
-@@ -1618,7 +1690,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1617,7 +1689,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void setResourcePack(String url) {
@@ -3653,7 +3653,7 @@ index e108a2b346c5f8b87165a5d1b259784f23fef2b7..9ee53533095259c9af9ce31840c9039d
      }
  
      @Override
-@@ -1633,7 +1705,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1632,7 +1704,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void setResourcePack(String url, byte[] hash, boolean force) {
@@ -3662,7 +3662,7 @@ index e108a2b346c5f8b87165a5d1b259784f23fef2b7..9ee53533095259c9af9ce31840c9039d
      }
  
      @Override
-@@ -1649,6 +1721,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1648,6 +1720,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
      }
  
@@ -3684,7 +3684,7 @@ index e108a2b346c5f8b87165a5d1b259784f23fef2b7..9ee53533095259c9af9ce31840c9039d
      public void addChannel(String channel) {
          Preconditions.checkState(this.channels.size() < 128, "Cannot register channel '%s'. Too many channels registered!", channel);
          channel = StandardMessenger.validateAndCorrectChannel(channel);
-@@ -2053,6 +2140,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2052,6 +2139,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return (this.getHandle().clientViewDistance == null) ? Bukkit.getViewDistance() : this.getHandle().clientViewDistance;
      }
  
@@ -3697,7 +3697,7 @@ index e108a2b346c5f8b87165a5d1b259784f23fef2b7..9ee53533095259c9af9ce31840c9039d
      @Override
      public int getPing() {
          return this.getHandle().latency;
-@@ -2098,6 +2191,254 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2097,6 +2190,254 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.getHandle().allowsListing();
      }
  
@@ -3953,7 +3953,7 @@ index e108a2b346c5f8b87165a5d1b259784f23fef2b7..9ee53533095259c9af9ce31840c9039d
      private final Player.Spigot spigot = new Player.Spigot()
      {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTextDisplay.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTextDisplay.java
-index b7f54a7d90a2a34e641f152eb8f5c3c62033e511..2d04443a9efd6e4b5eb1e360a727d8492323724b 100644
+index 2becf197a5c2d94f23f72a9b20cb2cd05a0807df..99096c1e3f045e4a99335faedfb8e77e99690299 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTextDisplay.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTextDisplay.java
 @@ -38,6 +38,17 @@ public class CraftTextDisplay extends CraftDisplay implements TextDisplay {
diff --git a/patches/server/0014-Timings-v2.patch b/patches/server/0014-Timings-v2.patch
index 918a37f4b7..ce32914b7e 100644
--- a/patches/server/0014-Timings-v2.patch
+++ b/patches/server/0014-Timings-v2.patch
@@ -1846,10 +1846,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 9ee53533095259c9af9ce31840c9039dc456dafa..97a8c43ff3f32d929de117ff608a69221b1ab571 100644
+index 8fcd46bef75b3d48356445575c4a6c1b93b61072..039f9b594bc7e3848b7f7a8ab66283baa78f28fa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2524,6 +2524,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2523,6 +2523,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/0018-Rewrite-chunk-system.patch b/patches/server/0018-Rewrite-chunk-system.patch
index fa15df0b79..6c00ac7753 100644
--- a/patches/server/0018-Rewrite-chunk-system.patch
+++ b/patches/server/0018-Rewrite-chunk-system.patch
@@ -17997,10 +17997,10 @@ index 4186943ba9e94758d579477e8fadaf8e05ef93f3..1684b3ee1b51597e799486bbe129b344
      // Spigot start
      private final org.bukkit.World.Spigot spigot = new org.bukkit.World.Spigot()
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 97a8c43ff3f32d929de117ff608a69221b1ab571..6d14414d7ee86dcb176ad46c564d6823b0bd16a3 100644
+index 039f9b594bc7e3848b7f7a8ab66283baa78f28fa..62709a16dc1c55a026bfbd049f07c29479cb3940 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -179,6 +179,81 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -178,6 +178,81 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.firstPlayed = System.currentTimeMillis();
      }
  
diff --git a/patches/server/0030-Player-affects-spawning-API.patch b/patches/server/0030-Player-affects-spawning-API.patch
index 31ba328ffe..b7edcd5b0f 100644
--- a/patches/server/0030-Player-affects-spawning-API.patch
+++ b/patches/server/0030-Player-affects-spawning-API.patch
@@ -137,10 +137,10 @@ index be6e3e21ad62da01e5e2dd78e300cbc8efdbeb42..ea98625fe7c00743b8df74a24e6d4b75
          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 6d14414d7ee86dcb176ad46c564d6823b0bd16a3..889ef0d01fd8d6c77e5721beceb9b911a793ab3e 100644
+index 62709a16dc1c55a026bfbd049f07c29479cb3940..98fafd85a08338cf621fd9d0da40dab7b883c7d6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2229,8 +2229,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2228,8 +2228,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      @Override
      public String getLocale() {
          return this.getHandle().locale;
diff --git a/patches/server/0032-Only-refresh-abilities-if-needed.patch b/patches/server/0032-Only-refresh-abilities-if-needed.patch
index 59909e5b04..021d5e43c1 100644
--- a/patches/server/0032-Only-refresh-abilities-if-needed.patch
+++ b/patches/server/0032-Only-refresh-abilities-if-needed.patch
@@ -5,10 +5,10 @@ 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 889ef0d01fd8d6c77e5721beceb9b911a793ab3e..d5f8446aeb34cc3e6102907ce3f7fff3eef4a6ff 100644
+index 98fafd85a08338cf621fd9d0da40dab7b883c7d6..932dddf8f761efde723b27e9d86c326b7fc5b4da 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1898,12 +1898,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1897,12 +1897,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void setFlying(boolean value) {
diff --git a/patches/server/0045-Implement-PlayerLocaleChangeEvent.patch b/patches/server/0045-Implement-PlayerLocaleChangeEvent.patch
index 87342ee302..d0301b277e 100644
--- a/patches/server/0045-Implement-PlayerLocaleChangeEvent.patch
+++ b/patches/server/0045-Implement-PlayerLocaleChangeEvent.patch
@@ -30,10 +30,10 @@ index edb8537e4fdd82991eda914a7d5c3ff6ef773fe0..e1b545cda20f5f165497b751044ff323
          this.locale = packet.language;
          // Paper start
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d5f8446aeb34cc3e6102907ce3f7fff3eef4a6ff..af749f1cc8555140c248f5539ae3db03db3be1fb 100644
+index 932dddf8f761efde723b27e9d86c326b7fc5b4da..1e809180b8d06c01eeeb98cbe738ad1cc41b7a18 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2229,8 +2229,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2228,8 +2228,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public String getLocale() {
diff --git a/patches/server/0052-Ensure-commands-are-not-ran-async.patch b/patches/server/0052-Ensure-commands-are-not-ran-async.patch
index f60113469c..71c3cd93b1 100644
--- a/patches/server/0052-Ensure-commands-are-not-ran-async.patch
+++ b/patches/server/0052-Ensure-commands-are-not-ran-async.patch
@@ -107,10 +107,10 @@ index 77b8b4d56883dcf672af82189da75ddef7c935a2..af2d401c3faa14664732c001a1ea59f6
              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 af749f1cc8555140c248f5539ae3db03db3be1fb..5db676928fc9a13e58cfd5d633ec5c9a69cb986e 100644
+index 1e809180b8d06c01eeeb98cbe738ad1cc41b7a18..83407b6149507709d92396f285ac348af95f9034 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -507,7 +507,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -506,7 +506,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void chat(String msg) {
          if (this.getHandle().connection == null) return;
  
diff --git a/patches/server/0056-Player-Tab-List-and-Title-APIs.patch b/patches/server/0056-Player-Tab-List-and-Title-APIs.patch
index 7991cd810d..4f97d1936a 100644
--- a/patches/server/0056-Player-Tab-List-and-Title-APIs.patch
+++ b/patches/server/0056-Player-Tab-List-and-Title-APIs.patch
@@ -63,7 +63,7 @@ index bd808eb312ade7122973a47f4b96505829511da5..bf0f9cab7c66c089f35b851e799ba4a4
          // Paper end
          buf.writeComponent(this.text);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 5db676928fc9a13e58cfd5d633ec5c9a69cb986e..e7f31e33efe2ae33beca4f46f34d77fbcf2bb0b4 100644
+index 83407b6149507709d92396f285ac348af95f9034..1f6bb1e5a277174e299d548daf7f6798ff7b7f35 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1,5 +1,6 @@
@@ -73,7 +73,7 @@ index 5db676928fc9a13e58cfd5d633ec5c9a69cb986e..e7f31e33efe2ae33beca4f46f34d77fb
  import com.google.common.base.Preconditions;
  import com.google.common.collect.ImmutableSet;
  import com.google.common.io.BaseEncoding;
-@@ -353,6 +354,100 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -352,6 +353,100 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
      }
  
diff --git a/patches/server/0059-Configurable-inter-world-teleportation-safety.patch b/patches/server/0059-Configurable-inter-world-teleportation-safety.patch
index 61307a9522..533e6ff98f 100644
--- a/patches/server/0059-Configurable-inter-world-teleportation-safety.patch
+++ b/patches/server/0059-Configurable-inter-world-teleportation-safety.patch
@@ -16,10 +16,10 @@ 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 e7f31e33efe2ae33beca4f46f34d77fbcf2bb0b4..51c953432e4055962afda5c5cdb24f33ac0502a1 100644
+index 1f6bb1e5a277174e299d548daf7f6798ff7b7f35..7d1e27f07694588fde273580a517c48ec7dd8d87 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1210,7 +1210,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1209,7 +1209,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              entity.connection.teleport(to);
          } else {
              // The respawn reason should never be used if the passed location is non null.
diff --git a/patches/server/0065-Complete-resource-pack-API.patch b/patches/server/0065-Complete-resource-pack-API.patch
index 7b89c86741..7d09649d63 100644
--- a/patches/server/0065-Complete-resource-pack-API.patch
+++ b/patches/server/0065-Complete-resource-pack-API.patch
@@ -23,10 +23,10 @@ index 0da739370a9cbbde1f2bec8d04a6ab6f6971017d..19733418e80d49f65290ba898caf71aa
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 51c953432e4055962afda5c5cdb24f33ac0502a1..618e0f885089223596c290c9a42f67d24f43e3be 100644
+index 7d1e27f07694588fde273580a517c48ec7dd8d87..d25c57f25af6d521c471535e8e9ea3e2bc914e9b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -155,6 +155,7 @@ import org.bukkit.plugin.Plugin;
+@@ -154,6 +154,7 @@ import org.bukkit.plugin.Plugin;
  import org.bukkit.plugin.messaging.StandardMessenger;
  import org.bukkit.profile.PlayerProfile;
  import org.bukkit.scoreboard.Scoreboard;
@@ -34,7 +34,7 @@ index 51c953432e4055962afda5c5cdb24f33ac0502a1..618e0f885089223596c290c9a42f67d2
  
  import net.md_5.bungee.api.chat.BaseComponent; // Spigot
  
-@@ -173,6 +174,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -172,6 +173,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      private double healthScale = 20;
      private CraftWorldBorder clientWorldBorder = null;
      private BorderChangeListener clientWorldBorderListener = this.createWorldBorderListener();
@@ -45,7 +45,7 @@ index 51c953432e4055962afda5c5cdb24f33ac0502a1..618e0f885089223596c290c9a42f67d2
  
      public CraftPlayer(CraftServer server, ServerPlayer entity) {
          super(server, entity);
-@@ -2352,6 +2357,45 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2351,6 +2356,45 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public boolean getAffectsSpawning() {
          return this.getHandle().affectsSpawning;
      }
diff --git a/patches/server/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/patches/server/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch
index 8507b67721..5fbc59ae98 100644
--- a/patches/server/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch
+++ b/patches/server/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch
@@ -44,10 +44,10 @@ index 9936fb67766dedba71b582316dd2bddd6567c342..2f161145789890fcd9bfd893b099f25a
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 618e0f885089223596c290c9a42f67d24f43e3be..532b62d9cbfd9e7586b4df84fb0f1598a5e19e02 100644
+index d25c57f25af6d521c471535e8e9ea3e2bc914e9b..c7bc16d568199226885e4cd39c6835feb30bd532 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2157,6 +2157,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2156,6 +2156,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      public void setRealHealth(double health) {
diff --git a/patches/server/0122-String-based-Action-Bar-API.patch b/patches/server/0122-String-based-Action-Bar-API.patch
index 757358bbb2..b17ec6dcfc 100644
--- a/patches/server/0122-String-based-Action-Bar-API.patch
+++ b/patches/server/0122-String-based-Action-Bar-API.patch
@@ -26,10 +26,10 @@ index 32ef3edebe94a2014168b7e438752a80b2687e5f..ab6c58eed6707ab7b0aa3e7549a871ad
          // Paper end
          buf.writeComponent(this.text);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 532b62d9cbfd9e7586b4df84fb0f1598a5e19e02..9fab9903b8902aa5bfa6d5224de7f36750ee40b7 100644
+index c7bc16d568199226885e4cd39c6835feb30bd532..6a12f14f7433ee13605f8dd8b7e0e8d127b915bd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -360,6 +360,29 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -359,6 +359,29 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      // Paper start
diff --git a/patches/server/0161-Expose-client-protocol-version-and-virtual-host.patch b/patches/server/0161-Expose-client-protocol-version-and-virtual-host.patch
index 939e67e16a..ff41ce3631 100644
--- a/patches/server/0161-Expose-client-protocol-version-and-virtual-host.patch
+++ b/patches/server/0161-Expose-client-protocol-version-and-virtual-host.patch
@@ -90,10 +90,10 @@ index 2be1bd39ee1341128f02e38afe5698b837735827..cca08b8c6e1e15f13326a2a7e33e7f32
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 9fab9903b8902aa5bfa6d5224de7f36750ee40b7..509376cd1d9b11e85395ee1da20dae3a1c4b9aee 100644
+index 6a12f14f7433ee13605f8dd8b7e0e8d127b915bd..e08cc548950b3ff14a720da693edc45981a4e964 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -304,6 +304,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -303,6 +303,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
      }
  
diff --git a/patches/server/0171-Ability-to-apply-mending-to-XP-API.patch b/patches/server/0171-Ability-to-apply-mending-to-XP-API.patch
index a6a0dd26f7..e5c35fdcdf 100644
--- a/patches/server/0171-Ability-to-apply-mending-to-XP-API.patch
+++ b/patches/server/0171-Ability-to-apply-mending-to-XP-API.patch
@@ -14,10 +14,10 @@ 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 509376cd1d9b11e85395ee1da20dae3a1c4b9aee..ffe926d4347832f28335f723f9f5a253d1a4c15a 100644
+index e08cc548950b3ff14a720da693edc45981a4e964..6ad571cfab355ed4684661c4c8b77415865747e8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1528,7 +1528,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1527,7 +1527,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      @Override
diff --git a/patches/server/0184-Player.setPlayerProfile-API.patch b/patches/server/0184-Player.setPlayerProfile-API.patch
index ee645cac5f..ed2c493064 100644
--- a/patches/server/0184-Player.setPlayerProfile-API.patch
+++ b/patches/server/0184-Player.setPlayerProfile-API.patch
@@ -55,10 +55,10 @@ index e7442952ef1f03969949014492a7ddc6d0796ba5..69a1852905dd4724c30ac8ab88c14251
  
      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 ffe926d4347832f28335f723f9f5a253d1a4c15a..8199b3a2f457b3212078bf610899a6e0ca33f292 100644
+index 6ad571cfab355ed4684661c4c8b77415865747e8..38d4f7f99cdd7707033f65c5c875368cce422867 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -83,6 +83,7 @@ import net.minecraft.world.entity.ai.attributes.Attributes;
+@@ -82,6 +82,7 @@ import net.minecraft.world.entity.ai.attributes.Attributes;
  import net.minecraft.world.inventory.AbstractContainerMenu;
  import net.minecraft.world.level.GameType;
  import net.minecraft.world.level.block.Blocks;
@@ -66,7 +66,7 @@ index ffe926d4347832f28335f723f9f5a253d1a4c15a..8199b3a2f457b3212078bf610899a6e0
  import net.minecraft.world.level.block.entity.SignBlockEntity;
  import net.minecraft.world.level.border.BorderChangeListener;
  import net.minecraft.world.level.saveddata.maps.MapDecoration;
-@@ -287,11 +288,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -286,11 +287,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return server.getPlayer(getUniqueId()) != null;
      }
  
@@ -78,7 +78,7 @@ index ffe926d4347832f28335f723f9f5a253d1a4c15a..8199b3a2f457b3212078bf610899a6e0
      @Override
      public InetSocketAddress getAddress() {
          if (this.getHandle().connection == null) return null;
-@@ -1678,8 +1674,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1677,8 +1673,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      private void untrackAndHideEntity(org.bukkit.entity.Entity entity) {
          // Remove this entity from the hidden player's EntityTrackerEntry
@@ -95,7 +95,7 @@ index ffe926d4347832f28335f723f9f5a253d1a4c15a..8199b3a2f457b3212078bf610899a6e0
          ChunkMap.TrackedEntity entry = tracker.entityMap.get(other.getId());
          if (entry != null) {
              entry.removePlayer(this.getHandle());
-@@ -1692,8 +1695,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1691,8 +1694,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
                  this.getHandle().connection.send(new ClientboundPlayerInfoRemovePacket(List.of(otherPlayer.getUUID())));
              }
          }
@@ -104,7 +104,7 @@ index ffe926d4347832f28335f723f9f5a253d1a4c15a..8199b3a2f457b3212078bf610899a6e0
      }
  
      void resetAndHideEntity(org.bukkit.entity.Entity entity) {
-@@ -1770,8 +1771,38 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1769,8 +1770,38 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          if (entry != null && !entry.seenBy.contains(this.getHandle().connection)) {
              entry.updatePlayer(this.getHandle());
          }
@@ -144,7 +144,7 @@ index ffe926d4347832f28335f723f9f5a253d1a4c15a..8199b3a2f457b3212078bf610899a6e0
      }
  
      void resetAndShowEntity(org.bukkit.entity.Entity entity) {
-@@ -1784,6 +1815,36 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1783,6 +1814,36 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              this.trackAndShowEntity(entity);
          }
      }
@@ -182,10 +182,10 @@ index ffe926d4347832f28335f723f9f5a253d1a4c15a..8199b3a2f457b3212078bf610899a6e0
      public void onEntityRemove(Entity entity) {
          this.invertedVisibilityEntities.remove(entity.getUUID());
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
-index a679133a3de51e26eb19932ece9ade292879aefd..e342ea27a8a689ea080c7881711a5dcd6322c914 100644
+index 173a2832f029e3d568208a1b56419c1b8501483c..48cdd483c25825571043800f3cfa41a4d723f649 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
-@@ -306,6 +306,12 @@ public class Commodore
+@@ -329,6 +329,12 @@ public class Commodore
                              return;
                          }
  
diff --git a/patches/server/0189-Flag-to-disable-the-channel-limit.patch b/patches/server/0189-Flag-to-disable-the-channel-limit.patch
index 7928e8aa6a..e007826261 100644
--- a/patches/server/0189-Flag-to-disable-the-channel-limit.patch
+++ b/patches/server/0189-Flag-to-disable-the-channel-limit.patch
@@ -9,10 +9,10 @@ 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 8199b3a2f457b3212078bf610899a6e0ca33f292..5ac7d5a83e154f405b77f99d3534844b25dcbc4f 100644
+index 38d4f7f99cdd7707033f65c5c875368cce422867..dd0eec95e1a5ba17cb11607ef632fe156e6fad72 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -178,6 +178,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -177,6 +177,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      // Paper start
      private org.bukkit.event.player.PlayerResourcePackStatusEvent.Status resourcePackStatus;
      private String resourcePackHash;
@@ -20,7 +20,7 @@ index 8199b3a2f457b3212078bf610899a6e0ca33f292..5ac7d5a83e154f405b77f99d3534844b
      // Paper end
  
      public CraftPlayer(CraftServer server, ServerPlayer entity) {
-@@ -2053,7 +2054,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2052,7 +2053,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      // Paper end
  
      public void addChannel(String channel) {
diff --git a/patches/server/0218-InventoryCloseEvent-Reason-API.patch b/patches/server/0218-InventoryCloseEvent-Reason-API.patch
index 42530e13eb..c7685e75a6 100644
--- a/patches/server/0218-InventoryCloseEvent-Reason-API.patch
+++ b/patches/server/0218-InventoryCloseEvent-Reason-API.patch
@@ -173,10 +173,10 @@ index 787ccb37a39bb506cf9fd8d54cf772b346981f85..f5b3190ffb9e9f92977afc9e40ddfa15
      @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 5ac7d5a83e154f405b77f99d3534844b25dcbc4f..bd2f49c8c6271497f5e54da5a3975ef632701e74 100644
+index dd0eec95e1a5ba17cb11607ef632fe156e6fad72..1ce97fdbe5ac2d13ded50493865eff4d7919b66a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1241,7 +1241,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1240,7 +1240,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
          // Close any foreign inventory
          if (this.getHandle().containerMenu != this.getHandle().inventoryMenu) {
diff --git a/patches/server/0254-Expose-attack-cooldown-methods-for-Player.patch b/patches/server/0254-Expose-attack-cooldown-methods-for-Player.patch
index 49e30634f8..707e01b828 100644
--- a/patches/server/0254-Expose-attack-cooldown-methods-for-Player.patch
+++ b/patches/server/0254-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 bd2f49c8c6271497f5e54da5a3975ef632701e74..cb9352ac83107e61fe5cd3882f3e5ca558b87eaa 100644
+index 1ce97fdbe5ac2d13ded50493865eff4d7919b66a..95bb1282395f18758ee167c2fa4d28aa90a03ca0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2810,6 +2810,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2809,6 +2809,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
          return this.adventure$pointers;
      }
diff --git a/patches/server/0255-Improve-death-events.patch b/patches/server/0255-Improve-death-events.patch
index e9b760c771..a6517c2af3 100644
--- a/patches/server/0255-Improve-death-events.patch
+++ b/patches/server/0255-Improve-death-events.patch
@@ -352,10 +352,10 @@ index e38cbdff34479673f1640c46d727f1a807a609c7..dbb4bfb3d1f1ce2e435ca531be36ea44
          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 cb9352ac83107e61fe5cd3882f3e5ca558b87eaa..d8ca06e72a5534dcc7315f9e90d0806f05c14f7e 100644
+index 95bb1282395f18758ee167c2fa4d28aa90a03ca0..3a962f836bc60d6262d813da53bd474d8541ff81 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2313,7 +2313,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2312,7 +2312,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      public void sendHealthUpdate() {
diff --git a/patches/server/0266-Hook-into-CB-plugin-rewrites.patch b/patches/server/0266-Hook-into-CB-plugin-rewrites.patch
index c6808e91c1..d40c5ed17b 100644
--- a/patches/server/0266-Hook-into-CB-plugin-rewrites.patch
+++ b/patches/server/0266-Hook-into-CB-plugin-rewrites.patch
@@ -8,7 +8,7 @@ our own relocation. Also lets us rewrite NMS calls for when we're
 debugging in an IDE pre-relocate.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
-index e342ea27a8a689ea080c7881711a5dcd6322c914..2eb62af25076b7160b0159ec382baebe5162b024 100644
+index 48cdd483c25825571043800f3cfa41a4d723f649..fe5d3b60ad740b7f1cce040f9c8d96ac51245ef6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
 @@ -6,7 +6,9 @@ import java.io.FileOutputStream;
@@ -166,7 +166,7 @@ index e342ea27a8a689ea080c7881711a5dcd6322c914..2eb62af25076b7160b0159ec382baebe
                          if ( owner.equals( "org/bukkit/block/Biome" ) )
                          {
                              switch ( name )
-@@ -307,6 +420,11 @@ public class Commodore
+@@ -330,6 +443,11 @@ public class Commodore
                          }
  
                          // Paper start - Rewrite plugins
@@ -178,7 +178,7 @@ index e342ea27a8a689ea080c7881711a5dcd6322c914..2eb62af25076b7160b0159ec382baebe
                          if ((owner.equals("org/bukkit/OfflinePlayer") || owner.equals("org/bukkit/entity/Player")) && name.equals("getPlayerProfile") && desc.equals("()Lorg/bukkit/profile/PlayerProfile;")) {
                              super.visitMethodInsn(opcode, owner, name, "()Lcom/destroystokyo/paper/profile/PlayerProfile;", itf);
                              return;
-@@ -401,6 +519,13 @@ public class Commodore
+@@ -424,6 +542,13 @@ public class Commodore
                      @Override
                      public void visitLdcInsn(Object value)
                      {
diff --git a/patches/server/0292-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/server/0292-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index 83ac2e5030..2b6d3a900c 100644
--- a/patches/server/0292-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/patches/server/0292-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
@@ -106,10 +106,10 @@ index 69a1852905dd4724c30ac8ab88c14251eee2c371..17b3d5de58a9ef3acc67624c46cd6bbd
      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 d8ca06e72a5534dcc7315f9e90d0806f05c14f7e..9d9f889ef1f35122066bdf68631eabf6e5757435 100644
+index 3a962f836bc60d6262d813da53bd474d8541ff81..6255e20cfc19835b2bee098678b09b89d0b9a147 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -179,6 +179,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -178,6 +178,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      private org.bukkit.event.player.PlayerResourcePackStatusEvent.Status resourcePackStatus;
      private String resourcePackHash;
      private static final boolean DISABLE_CHANNEL_LIMIT = System.getProperty("paper.disableChannelLimit") != null; // Paper - add a flag to disable the channel limit
@@ -117,7 +117,7 @@ index d8ca06e72a5534dcc7315f9e90d0806f05c14f7e..9d9f889ef1f35122066bdf68631eabf6
      // Paper end
  
      public CraftPlayer(CraftServer server, ServerPlayer entity) {
-@@ -1925,6 +1926,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1924,6 +1925,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.firstPlayed = firstPlayed;
      }
  
@@ -136,7 +136,7 @@ index d8ca06e72a5534dcc7315f9e90d0806f05c14f7e..9d9f889ef1f35122066bdf68631eabf6
      public void readExtraData(CompoundTag nbttagcompound) {
          this.hasPlayedBefore = true;
          if (nbttagcompound.contains("bukkit")) {
-@@ -1947,6 +1960,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1946,6 +1959,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      public void setExtraData(CompoundTag nbttagcompound) {
@@ -145,7 +145,7 @@ index d8ca06e72a5534dcc7315f9e90d0806f05c14f7e..9d9f889ef1f35122066bdf68631eabf6
          if (!nbttagcompound.contains("bukkit")) {
              nbttagcompound.put("bukkit", new CompoundTag());
          }
-@@ -1961,6 +1976,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1960,6 +1975,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          data.putLong("firstPlayed", this.getFirstPlayed());
          data.putLong("lastPlayed", System.currentTimeMillis());
          data.putString("lastKnownName", handle.getScoreboardName());
diff --git a/patches/server/0294-Block-Entity-remove-from-being-called-on-Players.patch b/patches/server/0294-Block-Entity-remove-from-being-called-on-Players.patch
index 791cf9901b..23a5e04415 100644
--- a/patches/server/0294-Block-Entity-remove-from-being-called-on-Players.patch
+++ b/patches/server/0294-Block-Entity-remove-from-being-called-on-Players.patch
@@ -12,10 +12,10 @@ Player we will look at limiting the scope of this change. It appears to
 be unintentional in the few cases we've seen so far.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 9d9f889ef1f35122066bdf68631eabf6e5757435..c5ee8eadf9966a7077c7790673a1a0582cf355f6 100644
+index 6255e20cfc19835b2bee098678b09b89d0b9a147..f21bbbc7ff8aee29e0eb35e779bf02dbba703950 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2857,6 +2857,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2856,6 +2856,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void resetCooldown() {
          getHandle().resetAttackStrengthTicker();
      }
diff --git a/patches/server/0381-Implement-Player-Client-Options-API.patch b/patches/server/0381-Implement-Player-Client-Options-API.patch
index 040a041908..2fe03d3c1b 100644
--- a/patches/server/0381-Implement-Player-Client-Options-API.patch
+++ b/patches/server/0381-Implement-Player-Client-Options-API.patch
@@ -116,10 +116,10 @@ index 71fac1a579b375759462b843d9ef7c8a2a463db5..2d54f2abae82521fbd34aa046f26ec8e
          if (getMainArm() != packet.mainHand()) {
              PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(this.getBukkitEntity(), getMainArm() == HumanoidArm.LEFT ? MainHand.LEFT : MainHand.RIGHT);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index c5ee8eadf9966a7077c7790673a1a0582cf355f6..23c489dc297073acb4e119c97c0eb5e0871a1359 100644
+index f21bbbc7ff8aee29e0eb35e779bf02dbba703950..16cc7cfd39158cfb4045375d8be664b91d4a57d4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -623,6 +623,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -622,6 +622,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              connection.disconnect(message == null ? net.kyori.adventure.text.Component.empty() : message);
          }
      }
diff --git a/patches/server/0456-Brand-support.patch b/patches/server/0456-Brand-support.patch
index ddcc150c59..3173c7bf9b 100644
--- a/patches/server/0456-Brand-support.patch
+++ b/patches/server/0456-Brand-support.patch
@@ -56,10 +56,10 @@ index 807cbeb8cc6700e5f740b554c7f1893ec9110714..f6733db4d81c8dda5650f067b56354ae
          return (!this.player.joining && !this.connection.isConnected()) || this.processedDisconnect; // Paper
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 23c489dc297073acb4e119c97c0eb5e0871a1359..7e367fe3b5fd6bf91906eb32a162fbf44c1db43f 100644
+index 16cc7cfd39158cfb4045375d8be664b91d4a57d4..1c29a51b66ae19ec208cc55fe94facff5f961c72 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2984,6 +2984,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2983,6 +2983,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          // Paper end
      };
  
diff --git a/patches/server/0490-Player-elytra-boost-API.patch b/patches/server/0490-Player-elytra-boost-API.patch
index bf3a1f11ae..401e417658 100644
--- a/patches/server/0490-Player-elytra-boost-API.patch
+++ b/patches/server/0490-Player-elytra-boost-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Player elytra boost API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7e367fe3b5fd6bf91906eb32a162fbf44c1db43f..18a68cff843175f6ab1db3028ec80ef64c9128aa 100644
+index 1c29a51b66ae19ec208cc55fe94facff5f961c72..bd36b43018f52bdfeca7b4cd49030dc46fb6eaf5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -645,6 +645,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -644,6 +644,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
          throw new RuntimeException("Unknown settings type");
      }
diff --git a/patches/server/0504-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0504-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
index 5e4bab51f9..0c252d029d 100644
--- a/patches/server/0504-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
+++ b/patches/server/0504-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
@@ -5,10 +5,10 @@ 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 18a68cff843175f6ab1db3028ec80ef64c9128aa..82214da046992ce5aafb3e005068952fe57664f7 100644
+index bd36b43018f52bdfeca7b4cd49030dc46fb6eaf5..db183a5b2bcd25d66e3386f89598d2f943c7ffc0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2506,7 +2506,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2505,7 +2505,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          if (data != null && !particle.getDataType().isInstance(data)) {
              throw new IllegalArgumentException("data should be " + particle.getDataType() + " got " + data.getClass());
          }
diff --git a/patches/server/0545-Add-sendOpLevel-API.patch b/patches/server/0545-Add-sendOpLevel-API.patch
index ad17fdc03f..130c5b995c 100644
--- a/patches/server/0545-Add-sendOpLevel-API.patch
+++ b/patches/server/0545-Add-sendOpLevel-API.patch
@@ -32,10 +32,10 @@ index 8184c987ecb91a11b260d89a4807ddfcb1f9aaf8..a6a58b9f9c3ae4acac374e4a29b41178
  
      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 82214da046992ce5aafb3e005068952fe57664f7..0ec560d6b9d96055591019397a45c2885d6ca2ec 100644
+index db183a5b2bcd25d66e3386f89598d2f943c7ffc0..9b32c0d6a8e2a744957378acb562f4e321f0f0b7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -659,6 +659,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -658,6 +658,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              ? (org.bukkit.entity.Firework) entity.getBukkitEntity()
              : null;
      }
diff --git a/patches/server/0617-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0617-additions-to-PlayerGameModeChangeEvent.patch
index 6238c16343..215313fdb1 100644
--- a/patches/server/0617-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0617-additions-to-PlayerGameModeChangeEvent.patch
@@ -142,10 +142,10 @@ index 4df88bd988c2e4d0b6d4d09e6c897b1d1f4e6682..454fb5def57fa2fbc62f530020d579d4
                      }
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0ec560d6b9d96055591019397a45c2885d6ca2ec..acc02c75819eabc73be1afef7cb86ebfdbf2f6e5 100644
+index 9b32c0d6a8e2a744957378acb562f4e321f0f0b7..66c61c0f59efe2c3f0ae2d07ef7f1dfcfd1e0e64 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1553,7 +1553,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1552,7 +1552,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              throw new IllegalArgumentException("Mode cannot be null");
          }
  
diff --git a/patches/server/0629-Add-PlayerKickEvent-causes.patch b/patches/server/0629-Add-PlayerKickEvent-causes.patch
index 107dc1f88e..2a2312eb20 100644
--- a/patches/server/0629-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0629-Add-PlayerKickEvent-causes.patch
@@ -491,10 +491,10 @@ index a24e7a66d52eddbdad8db71cf5e45f1a458c389f..e1c13ac7b11fb0080435fc34502208c8
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index acc02c75819eabc73be1afef7cb86ebfdbf2f6e5..05f128ebc156729cacd8321e2140c15971e5977a 100644
+index 66c61c0f59efe2c3f0ae2d07ef7f1dfcfd1e0e64..ba3a7ad955c44c1f89d03fd7e45a407d524e9105 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -605,7 +605,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -604,7 +604,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          org.spigotmc.AsyncCatcher.catchOp("player kick"); // Spigot
          if (this.getHandle().connection == null) return;
  
@@ -503,7 +503,7 @@ index acc02c75819eabc73be1afef7cb86ebfdbf2f6e5..05f128ebc156729cacd8321e2140c159
      }
  
      // Paper start
-@@ -617,10 +617,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -616,10 +616,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void kick(final net.kyori.adventure.text.Component message) {
diff --git a/patches/server/0665-Add-PlayerSetSpawnEvent.patch b/patches/server/0665-Add-PlayerSetSpawnEvent.patch
index f858c02002..b61b927a28 100644
--- a/patches/server/0665-Add-PlayerSetSpawnEvent.patch
+++ b/patches/server/0665-Add-PlayerSetSpawnEvent.patch
@@ -129,10 +129,10 @@ index a64cd3b54840af9a9c946b3e4e4f91d1c5f4bc97..16f23ecffa52925904d585f3fed76aa6
              }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 05f128ebc156729cacd8321e2140c15971e5977a..657b7d30c1f84dfad3af3eb0b94ad82591652316 100644
+index ba3a7ad955c44c1f89d03fd7e45a407d524e9105..855b20e198983470b83ebbb38ebe5cba580cecd6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1373,9 +1373,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1372,9 +1372,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      @Override
      public void setBedSpawnLocation(Location location, boolean override) {
          if (location == null) {
diff --git a/patches/server/0683-Add-more-advancement-API.patch b/patches/server/0683-Add-more-advancement-API.patch
index 776e29d3b7..388b714e6d 100644
--- a/patches/server/0683-Add-more-advancement-API.patch
+++ b/patches/server/0683-Add-more-advancement-API.patch
@@ -189,7 +189,7 @@ index 4aa8cda2bf72627b153e636a408fb3971caf2309..e29d7c6e1cef10a76c8630855fada11c
  
      private final DisplayInfo handle;
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
-index 0ef20dc6a43dc973183854a638d5f9f770583ec1..d7c1077f2eb2846a17a5872f01ebb8aabf0cb181 100644
+index 43ffc4180b1ef2d2000991ad58b0706141470d08..cacd9b59741c31e70e898e7af91a1a6ed3f87f07 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
 @@ -54,6 +54,7 @@ public class Commodore
@@ -200,7 +200,7 @@ index 0ef20dc6a43dc973183854a638d5f9f770583ec1..d7c1077f2eb2846a17a5872f01ebb8aa
      private static final Map<String, String> SEARCH_AND_REMOVE = initReplacementsMap();
      private static Map<String, String> initReplacementsMap()
      {
-@@ -437,6 +438,11 @@ public class Commodore
+@@ -460,6 +461,11 @@ public class Commodore
                              super.visitMethodInsn(opcode, owner, name, "()Lcom/destroystokyo/paper/profile/PlayerProfile;", itf);
                              return;
                          }
diff --git a/patches/server/0753-Add-player-health-update-API.patch b/patches/server/0753-Add-player-health-update-API.patch
index 547ad40392..f9eb37137d 100644
--- a/patches/server/0753-Add-player-health-update-API.patch
+++ b/patches/server/0753-Add-player-health-update-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add player health update API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 657b7d30c1f84dfad3af3eb0b94ad82591652316..ee85c2f718c01c91e8fd850f448f189d42687900 100644
+index 855b20e198983470b83ebbb38ebe5cba580cecd6..9329bd7ace628fef7734fbae263a9bc1a4faa8c4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2385,9 +2385,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2384,9 +2384,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.getHandle().maxHealthCache = getMaxHealth();
      }
  
@@ -22,7 +22,7 @@ index 657b7d30c1f84dfad3af3eb0b94ad82591652316..ee85c2f718c01c91e8fd850f448f189d
          if (this.getHandle().queueHealthUpdatePacket) {
              this.getHandle().queuedHealthUpdatePacket = packet;
          } else {
-@@ -2396,6 +2398,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2395,6 +2397,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          // Paper end
      }
  
diff --git a/patches/server/0784-Multi-Block-Change-API-Implementation.patch b/patches/server/0784-Multi-Block-Change-API-Implementation.patch
index 8e6f15290e..2cb0fc6f73 100644
--- a/patches/server/0784-Multi-Block-Change-API-Implementation.patch
+++ b/patches/server/0784-Multi-Block-Change-API-Implementation.patch
@@ -25,10 +25,10 @@ index c96e75456c2f8564d3bc75993cc6e03ba605597d..7c6a6693760638a07b7c7c330aaeffd9
      public void write(FriendlyByteBuf buf) {
          buf.writeLong(this.sectionPos.asLong());
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ee85c2f718c01c91e8fd850f448f189d42687900..0ff7ffecbca4ba3f57e3dab8bfe4a6c77576d7d0 100644
+index 9329bd7ace628fef7734fbae263a9bc1a4faa8c4..93388dbf5768ee622374bc1247aaee9324bfaf9a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -949,6 +949,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -948,6 +948,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.getHandle().connection.send(packet);
      }
  
diff --git a/patches/server/0837-FallingBlock-auto-expire-setting.patch b/patches/server/0837-FallingBlock-auto-expire-setting.patch
index ae646e3fe6..b2efc50d06 100644
--- a/patches/server/0837-FallingBlock-auto-expire-setting.patch
+++ b/patches/server/0837-FallingBlock-auto-expire-setting.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] FallingBlock auto expire setting
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-index 5967e5093af785b5ad33e0b0da2044b3a4065107..ce2c3c146ef64400e00084bd2245d2b87a67fbc2 100644
+index 02ea0298c6dc6ed3d4350e562c255e748ca141ae..536856300da929c101f50da5827677bada5feb50 100644
 --- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 @@ -64,6 +64,7 @@ public class FallingBlockEntity extends Entity {
@@ -45,10 +45,10 @@ index 5967e5093af785b5ad33e0b0da2044b3a4065107..ce2c3c146ef64400e00084bd2245d2b8
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingBlock.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingBlock.java
-index 0de415236fe9997fc3ffedba20b8df68647cb822..87c413c2f3b59ae9ef36e5becc10b29a81348022 100644
+index 4a4fe85abb4ddd62e04f348e5be8b98ca4d4fbdc..05778023c3b2809c52c148efdfc8677dcc087a7b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingBlock.java
-@@ -58,6 +58,17 @@ public class CraftFallingBlock extends CraftEntity implements FallingBlock {
+@@ -59,6 +59,17 @@ public class CraftFallingBlock extends CraftEntity implements FallingBlock {
      public void setHurtEntities(boolean hurtEntities) {
          this.getHandle().hurtEntities = hurtEntities;
      }
diff --git a/patches/server/0863-More-Teleport-API.patch b/patches/server/0863-More-Teleport-API.patch
index 91cb2c2c3f..fcba19ed6f 100644
--- a/patches/server/0863-More-Teleport-API.patch
+++ b/patches/server/0863-More-Teleport-API.patch
@@ -74,10 +74,10 @@ index 7df1eebce5b62214943e55314e9ec98f056fa330..2aee8aacd50431c18ff28af678348ec2
          // Let the server handle cross world teleports
          if (location.getWorld() != null && !location.getWorld().equals(this.getWorld())) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0ff7ffecbca4ba3f57e3dab8bfe4a6c77576d7d0..f47cb81c640810a7401e7ad78e9e0153ae7b2e01 100644
+index 93388dbf5768ee622374bc1247aaee9324bfaf9a..1b9c9e8e0a3c94022360b789e87c7a104da08995 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1262,13 +1262,100 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1261,13 +1261,100 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void setRotation(float yaw, float pitch) {
@@ -179,7 +179,7 @@ index 0ff7ffecbca4ba3f57e3dab8bfe4a6c77576d7d0..f47cb81c640810a7401e7ad78e9e0153
          location.checkFinite();
  
          ServerPlayer entity = this.getHandle();
-@@ -1281,7 +1368,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1280,7 +1367,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
             return false;
          }
  
@@ -188,7 +188,7 @@ index 0ff7ffecbca4ba3f57e3dab8bfe4a6c77576d7d0..f47cb81c640810a7401e7ad78e9e0153
              return false;
          }
  
-@@ -1299,7 +1386,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1298,7 +1385,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
  
          // If this player is riding another entity, we must dismount before teleporting.
@@ -197,7 +197,7 @@ index 0ff7ffecbca4ba3f57e3dab8bfe4a6c77576d7d0..f47cb81c640810a7401e7ad78e9e0153
  
          // SPIGOT-5509: Wakeup, similar to riding
          if (this.isSleeping()) {
-@@ -1315,13 +1402,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1314,13 +1401,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          ServerLevel toWorld = ((CraftWorld) to.getWorld()).getHandle();
  
          // Close any foreign inventory
diff --git a/patches/server/0868-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0868-Custom-Chat-Completion-Suggestions-API.patch
index c6400ed5bc..a2a02a5464 100644
--- a/patches/server/0868-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/server/0868-Custom-Chat-Completion-Suggestions-API.patch
@@ -5,10 +5,10 @@ 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 f47cb81c640810a7401e7ad78e9e0153ae7b2e01..7cc84b6ee26e011cc445f5347bb2a6f0a75343fc 100644
+index 1b9c9e8e0a3c94022360b789e87c7a104da08995..18e8fb6c16cac2b45de3e42a5f9dcd098e5633e6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -671,6 +671,22 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -670,6 +670,22 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
          this.getHandle().getServer().getPlayerList().sendPlayerPermissionLevel(this.getHandle(), level, false);
      }
diff --git a/patches/server/0888-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0888-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
index 5894565e16..793883a2f4 100644
--- a/patches/server/0888-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
+++ b/patches/server/0888-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] Mitigate effects of WorldCreator#keepSpawnLoaded ret type
 TODO: Remove in 1.21?
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
-index d7c1077f2eb2846a17a5872f01ebb8aabf0cb181..ebbbfc318439fec33331d71563e528cd3429e541 100644
+index cacd9b59741c31e70e898e7af91a1a6ed3f87f07..2ee82c316c3a6a79e1d722dfd00c22baa83c0299 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
-@@ -443,6 +443,12 @@ public class Commodore
+@@ -466,6 +466,12 @@ public class Commodore
                              super.visitMethodInsn(Opcodes.INVOKEVIRTUAL, CB_PACKAGE + "/advancement/CraftAdvancement", "getDisplay0", desc, false);
                              return;
                          }
diff --git a/patches/server/0899-Elder-Guardian-appearance-API.patch b/patches/server/0899-Elder-Guardian-appearance-API.patch
index 13271eca7e..8c3d09bf7e 100644
--- a/patches/server/0899-Elder-Guardian-appearance-API.patch
+++ b/patches/server/0899-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 7cc84b6ee26e011cc445f5347bb2a6f0a75343fc..5cab74f4ae272cf730392cb143d45df737e641f2 100644
+index 18e8fb6c16cac2b45de3e42a5f9dcd098e5633e6..30c1cd3b0c1f5382ace76c1a2c5461fe8cc61339 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3154,6 +3154,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3153,6 +3153,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
      // Paper end
  
diff --git a/patches/server/0916-Add-Player-Warden-Warning-API.patch b/patches/server/0916-Add-Player-Warden-Warning-API.patch
index 28ee51a855..9f3ffd7383 100644
--- a/patches/server/0916-Add-Player-Warden-Warning-API.patch
+++ b/patches/server/0916-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 5cab74f4ae272cf730392cb143d45df737e641f2..59a7c5eb74b9ca7108d6fa9a1335e4a9816f6cf3 100644
+index 30c1cd3b0c1f5382ace76c1a2c5461fe8cc61339..794c5b92e435f95f56f6d629fd21819de79f26cf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3159,6 +3159,41 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3158,6 +3158,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/0930-fix-Instruments.patch b/patches/server/0930-fix-Instruments.patch
index 9634eb10ac..40e8dff1e3 100644
--- a/patches/server/0930-fix-Instruments.patch
+++ b/patches/server/0930-fix-Instruments.patch
@@ -6,10 +6,10 @@ 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 59a7c5eb74b9ca7108d6fa9a1335e4a9816f6cf3..88ac838be9aff2f2190032a1bf9d85e8d360ec42 100644
+index 794c5b92e435f95f56f6d629fd21819de79f26cf..939ef35852ee0fdad1759d3fc7f70409811d14ea 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -773,62 +773,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -772,62 +772,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void playNote(Location loc, Instrument instrument, Note note) {
          if (this.getHandle().connection == null) return;
  
diff --git a/patches/server/0941-Flying-Fall-Damage.patch b/patches/server/0941-Flying-Fall-Damage.patch
index d3e1eaf878..e40401cc10 100644
--- a/patches/server/0941-Flying-Fall-Damage.patch
+++ b/patches/server/0941-Flying-Fall-Damage.patch
@@ -26,10 +26,10 @@ index 5b772b3caeafe98aa45a01bffe215a5dd33323b6..0629c471d38a77c44fc1c86ccdfcb069
          } 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 88ac838be9aff2f2190032a1bf9d85e8d360ec42..305badea8121494968f6c32ec8d6eb17d2b1fd97 100644
+index 939ef35852ee0fdad1759d3fc7f70409811d14ea..3ddd8c42ea1d2bdfc5b62d8fae6ce51b34a8e89b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2322,6 +2322,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2321,6 +2321,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.getHandle().onUpdateAbilities();
      }
  
diff --git a/patches/server/0947-Win-Screen-API.patch b/patches/server/0947-Win-Screen-API.patch
index 7967e50e36..a7acc7f8dc 100644
--- a/patches/server/0947-Win-Screen-API.patch
+++ b/patches/server/0947-Win-Screen-API.patch
@@ -7,10 +7,10 @@ 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 305badea8121494968f6c32ec8d6eb17d2b1fd97..ca22b7de2dd05a0bdcdcd3bffb9ec991d196abde 100644
+index 3ddd8c42ea1d2bdfc5b62d8fae6ce51b34a8e89b..c8d8ab8e5d8d0a986ff023ce1e195667472d7798 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1232,6 +1232,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1231,6 +1231,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.getHandle().connection.send(packet);
      }