diff --git a/gradle.properties b/gradle.properties
index a954dfe..4cfcfb1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group = gg.projecteden.parchment
 version = 1.19.2-R0.1-SNAPSHOT
 
 mcVersion = 1.19.2
-paperRef = a76998d2354e0fb3ff91cd817c3162a2bc878ce0
+paperRef = 01a13871deefa50e186a10b63f71c5e0459e7d30
 
 org.gradle.caching=true
 org.gradle.parallel=true
diff --git a/patches/api/0001-Add-Getter-interfaces.patch b/patches/api/0001-Add-Getter-interfaces.patch
index 09f1cca..ad823f7 100644
--- a/patches/api/0001-Add-Getter-interfaces.patch
+++ b/patches/api/0001-Add-Getter-interfaces.patch
@@ -34,7 +34,7 @@ index f530a3d9314e17d1da896cac633f6a422258d9a9..08897d13a8af33ed1cd40c46b0f168e0
  
      public EndermanAttackPlayerEvent(@NotNull Enderman entity, @NotNull Player player) {
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java
-index a315c5185cd465dcf63c0ababef195da76dfc786..a65eae92b9f369f0864d872817d9ce96679256bc 100644
+index bcc8dba50e3a3df0206c4827bb468bf884837b8b..83b23884d67e7600a3a3cc33050606e397106020 100644
 --- a/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java
 @@ -10,7 +10,7 @@ import org.jetbrains.annotations.NotNull;
@@ -494,7 +494,7 @@ index 983a8c20a06d2b509602b27f49c090598b8ecc42..46dd8496f5a2c792ee7811e33c424e88
      /**
       * Get whether this raid started.
 diff --git a/src/main/java/org/bukkit/Vibration.java b/src/main/java/org/bukkit/Vibration.java
-index 209a302c3a2ed333780ed760314a6ed352fc0767..9d29f1c5af56954bc452fa251d6bc0215ab3fe79 100644
+index bbc01e7c192ae6689c301670047ff114306c57cb..2a83ba61686caffb247f17a67af474299dae6be4 100644
 --- a/src/main/java/org/bukkit/Vibration.java
 +++ b/src/main/java/org/bukkit/Vibration.java
 @@ -74,7 +74,7 @@ public class Vibration {
@@ -520,7 +520,7 @@ index d124768378d6f0c5573f28ee815ea3886fe74868..11a00998b1cb5ee582e225553f15b1b7
      private final UUID uuid;
      private final String name;
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index e405c279f6135c94c775a856ab88fd3cace6bd5c..359cad4528e0c9b45ac3447655f24e7925bff7d2 100644
+index 9930ebe7a23d306c602840fd43652fbdaba481b3..531b8090a224c448c7316d77663d2cc2787ee621 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
 @@ -31,7 +31,7 @@ import org.jetbrains.annotations.Nullable;
@@ -572,10 +572,10 @@ index 2e17b2d4f759531fbe9ee8e9b00c839186af09ca..8f4a293c131cb8b63c31b410ffa211bd
      /**
       * This is the name of the specified AnimalTamer.
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 8bc6876c82935988436597161fa0ec94c032174b..b27576e9c7f22e203251487334288239be0dcb9e 100644
+index 6dd81f07ef4d6993187987d3352a01771ffb715e..8e79cdd0435dc7ec42566af24670f29ff78adb4e 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -26,7 +26,7 @@ import org.jetbrains.annotations.Nullable;
+@@ -27,7 +27,7 @@ import org.jetbrains.annotations.Nullable;
  /**
   * Represents a base entity in the world
   */
@@ -585,10 +585,10 @@ index 8bc6876c82935988436597161fa0ec94c032174b..b27576e9c7f22e203251487334288239
      /**
       * Gets the entity's current position
 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index 5dbbeb92aec212d2e849d16320ed9c084b99fc35..32e5150b14f5d7d19d82d15631065db376814e25 100644
+index 3b204144e2d245098b3dc23b8779f9ed817bb6d1..2d5a09bb8f31d6234ca8a3f343d45eee81cc1dd4 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
-@@ -19,7 +19,15 @@ import org.jetbrains.annotations.Nullable;
+@@ -20,7 +20,15 @@ import org.jetbrains.annotations.Nullable;
  /**
   * Represents a human entity, such as an NPC or a player
   */
@@ -606,10 +606,10 @@ index 5dbbeb92aec212d2e849d16320ed9c084b99fc35..32e5150b14f5d7d19d82d15631065db3
      // Paper start
      @Override
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 6cd0b10d1dc4506cfb1e4db5e1260cb705566cec..a3ff1cb4b2754900879c67638a3488cd9d76cdb1 100644
+index 1d98abff1ad0116f7a2599f078aa730cb84843c1..cea29fd3c3ea6b3f2e6d2f89022cc4f4fdab93b2 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -40,7 +40,17 @@ import org.jetbrains.annotations.Nullable;
+@@ -42,7 +42,17 @@ import org.jetbrains.annotations.Nullable;
  /**
   * Represents a player, connected or not
   */
@@ -1009,7 +1009,7 @@ index 7af8d6e51c824cf0592b722b834f1d4986e3cc08..c28d62fc3dc359f9ebcf926094198ee3
      private boolean cancelled = false;
      private final Location location;
 diff --git a/src/main/java/org/bukkit/inventory/Inventory.java b/src/main/java/org/bukkit/inventory/Inventory.java
-index 1b577c03c3152d22b70f8bdb321b28ad8fbbc3af..b3449a874666bcd67950ec12da41738f7c24ddee 100644
+index c574bb94b21eb27974b40c839fce52c6ac4b54b4..0172bed7917ea1199c34438385be4bceac9cfaa4 100644
 --- a/src/main/java/org/bukkit/inventory/Inventory.java
 +++ b/src/main/java/org/bukkit/inventory/Inventory.java
 @@ -25,7 +25,7 @@ import org.jetbrains.annotations.Nullable;
diff --git a/patches/api/0008-Expose-MCUtil-Executors.patch b/patches/api/0008-Expose-MCUtil-Executors.patch
index 5f84204..cd8b462 100644
--- a/patches/api/0008-Expose-MCUtil-Executors.patch
+++ b/patches/api/0008-Expose-MCUtil-Executors.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose MCUtil Executors
 
 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index da5cab4246bd253fcc4e4d9574bdae1867ebb5ab..448a11ffd1e21e00388fd895d934ac55bf189cb1 100644
+index e43fef0152468944d8a33036344a43e95fe58476..3e46e1c329eb19851ae78025237e70083d815879 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2116,4 +2116,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2137,4 +2137,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull org.bukkit.potion.PotionBrewer getPotionBrewer();
      // Paper end
diff --git a/patches/api/0012-Add-Player-getHiddenEntities-API.patch b/patches/api/0012-Add-Player-getHiddenEntities-API.patch
index 0c8ecce..6c4a893 100644
--- a/patches/api/0012-Add-Player-getHiddenEntities-API.patch
+++ b/patches/api/0012-Add-Player-getHiddenEntities-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add Player#getHiddenEntities API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index e07cf092c4a02e6a76cb9e4805203c72ae01580c..a8da42ea485bd213e0572acd688921aa0092530c 100644
+index cea29fd3c3ea6b3f2e6d2f89022cc4f4fdab93b2..7f4827819fc241866edb571f05e9b14d0955c0c4 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1440,6 +1440,17 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1476,6 +1476,17 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @org.jetbrains.annotations.ApiStatus.Experimental // Paper
      public boolean canSee(@NotNull Entity entity);
  
diff --git a/patches/api/0014-Expanded-Insomnia-API-methods.patch b/patches/api/0014-Expanded-Insomnia-API-methods.patch
index dcbee89..44e7cde 100644
--- a/patches/api/0014-Expanded-Insomnia-API-methods.patch
+++ b/patches/api/0014-Expanded-Insomnia-API-methods.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expanded Insomnia API methods
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 1c42b484882a5e6f2c8276c428824b2cbf6a39e3..bce607d829c3ba45388ed31ef251bf19e2048ab4 100644
+index 7f4827819fc241866edb571f05e9b14d0955c0c4..1e7c5b991939e984d3448a5f9e0859857d04ce63 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -50,6 +50,45 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -52,6 +52,45 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      @Override
      @NotNull Player getPlayer();
diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch
index 1199d23..39f71d5 100644
--- a/patches/server/0001-Build-changes.patch
+++ b/patches/server/0001-Build-changes.patch
@@ -104,10 +104,10 @@ index bf42969859545a8a520923ef1836ffa4a5cc24a0..2532e265c5dade55f71c34fcab6d1e74
                  org.bukkit.Bukkit.getLogger().warning("Version: " + org.bukkit.Bukkit.getBukkitVersion());
              }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d2161a3c3b9a2b2d463ac778656c95167c10a49d..f73116c89a5bd3ab0110c162784bc4e44b6b3827 100644
+index ce81ba5345c8d2fde8a2534b9673275c7e86af8b..c4dc28dcc26e98d8252ee975ca0e192668617382 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1673,7 +1673,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1654,7 +1654,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @DontObfuscate
      public String getServerModName() {
@@ -117,7 +117,7 @@ index d2161a3c3b9a2b2d463ac778656c95167c10a49d..f73116c89a5bd3ab0110c162784bc4e4
  
      public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b777c1294370bdc68bc6265b039e2a405d89f2f5..4efa1bfe6638b29825ab040e1705f623624ccfd6 100644
+index 111f8276f26350a5c62a7b8577b4598978b5355d..fb05258065969fef081f18d8eb4e3eadca785931 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -248,7 +248,7 @@ import javax.annotation.Nullable; // Paper
@@ -130,10 +130,10 @@ index b777c1294370bdc68bc6265b039e2a405d89f2f5..4efa1bfe6638b29825ab040e1705f623
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 56a784e943cb5d8b15b41e3e66545ebf166c221c..e03ad8765c96e2ddb2622ca8483933648555e673 100644
+index f30621be24c6c3a4f173436fce1ad1c13507c84f..f448ca4a3d789e301063888655ccb4275e3c32ed 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -276,7 +276,7 @@ public class Main {
+@@ -278,7 +278,7 @@ public class Main {
                      if (buildDate.before(deadline.getTime())) {
                          // Paper start - This is some stupid bullshit
                          System.err.println("*** Warning, you've not updated in a while! ***");
@@ -156,10 +156,10 @@ index 774556a62eb240da42e84db4502e2ed43495be17..6f1b3fa6ebeabc7596034663ed06686f
  
          if (stream != null) {
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index d568fc92d03c313a782796cc720a1ebb1a5ad8be..024d8884ac8a7d2322a7db2901b7ecff31a0154a 100644
+index e9fa7faaa4451e36b3908cbcbbe0baf213abde96..3bddb7d19e46ef774e15b0f865779f5a1198f3b7 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
-@@ -162,7 +162,7 @@ public class WatchdogThread extends Thread
+@@ -162,7 +162,7 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
                  log.log( Level.SEVERE, "\t If this is the case, consider increasing timeout-time in spigot.yml but note that this will replace the crash with LARGE lag spikes" );
                  log.log( Level.SEVERE, "If you are unsure or still think this is a Paper bug, please report this to https://github.com/PaperMC/Paper/issues" );
                  log.log( Level.SEVERE, "Be sure to include ALL relevant console errors and Minecraft crash reports" );
diff --git a/patches/server/0003-Add-SoundEvent.patch b/patches/server/0003-Add-SoundEvent.patch
index e94ef04..d71df7a 100644
--- a/patches/server/0003-Add-SoundEvent.patch
+++ b/patches/server/0003-Add-SoundEvent.patch
@@ -76,10 +76,10 @@ index 6679038054796b9bdfeb6fb4b29e50aa63052101..0ba919d0e8ae347c6db4813d59adaec9
  
      public static @Nullable BinaryTagHolder asBinaryTagHolder(final @Nullable CompoundTag tag) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 083349794d5ceb50322c5a645dd33fbfcc1c8155..12c27ed2ed3a31a26663d78b6429146d384ec0b1 100644
+index b396e9b35f315db37ba070ad4baeec1f098d0cb8..532c32dbec9b3e33adaf49aec8a96a3705376ce4 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1542,12 +1542,40 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1572,12 +1572,40 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
      @Override
      public void playSeededSound(@Nullable Player except, double x, double y, double z, SoundEvent sound, SoundSource category, float volume, float pitch, long seed) {
@@ -123,10 +123,10 @@ index 083349794d5ceb50322c5a645dd33fbfcc1c8155..12c27ed2ed3a31a26663d78b6429146d
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 3615576c24d5d6790a6894a91180de25fa0e5a9c..63494f6248e0f339ad6b6418a5103a45be7450e4 100644
+index af7acb628b84539b1ee5ef1934f75f091c4cd91e..9fae1cd71bfe8832a9294ac0f51e667776ba1744 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2222,7 +2222,19 @@ public class ServerPlayer extends Player {
+@@ -2208,7 +2208,19 @@ public class ServerPlayer extends Player {
  
      @Override
      public void playNotifySound(SoundEvent event, SoundSource category, float volume, float pitch) {
@@ -148,10 +148,10 @@ index 3615576c24d5d6790a6894a91180de25fa0e5a9c..63494f6248e0f339ad6b6418a5103a45
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 71623c84a5b15023189c14a6bf36e1b08f935fc1..61e2002dacb84f410cba0be34d921201e0d2ba27 100644
+index 06eda955f96b5fe2d08ed0d39229c7a6ebb88931..6f7261afd306da4f523718a80881ab9d6e4b4b41 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -978,7 +978,7 @@ public abstract class PlayerList {
+@@ -984,7 +984,7 @@ public abstract class PlayerList {
          if (flag2 && !isLocAltered) {
              BlockState data = worldserver1.getBlockState(blockposition);
              worldserver1.setBlock(blockposition, data.setValue(net.minecraft.world.level.block.RespawnAnchorBlock.CHARGE, data.getValue(net.minecraft.world.level.block.RespawnAnchorBlock.CHARGE) - 1), 3);
diff --git a/patches/server/0009-Expose-MCUtil-Executors.patch b/patches/server/0009-Expose-MCUtil-Executors.patch
index 93fa52b..87e791e 100644
--- a/patches/server/0009-Expose-MCUtil-Executors.patch
+++ b/patches/server/0009-Expose-MCUtil-Executors.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose MCUtil Executors
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4efa1bfe6638b29825ab040e1705f623624ccfd6..9cce112550d119c1a8978a75f2bbfb388482bc3e 100644
+index fb05258065969fef081f18d8eb4e3eadca785931..bb443fb4d1bcfc909236fd5b45163c10c803a7a8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2906,4 +2906,16 @@ public final class CraftServer implements Server {
+@@ -2911,4 +2911,16 @@ public final class CraftServer implements Server {
      }
  
      // Paper end
diff --git a/patches/server/0010-Fix-missing-CraftMetaSkull-serializedProfile.patch b/patches/server/0010-Fix-missing-CraftMetaSkull-serializedProfile.patch
index 3ff796b..d91854e 100644
--- a/patches/server/0010-Fix-missing-CraftMetaSkull-serializedProfile.patch
+++ b/patches/server/0010-Fix-missing-CraftMetaSkull-serializedProfile.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix missing CraftMetaSkull serializedProfile
 Plugins (ab)using NMS may change the "profile" field using reflections instead of the "setProfile" method, especially if they are targeted towards old Minecraft versions. This fixes the potential discrepancies and NPEs.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-index 292ae4a68093b7d939a755e1062cee57da186ab1..4afa90cb68aa31820abce6ab051de405daef6562 100644
+index 92b56f16b4d8107ccf206be6b81a98dc58986c10..0882d7271c51d79c4d089ec643d633bb0a81ef07 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-@@ -80,6 +80,11 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
+@@ -96,6 +96,11 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
  
      private void setProfile(GameProfile profile) {
          this.profile = profile;
@@ -21,7 +21,7 @@ index 292ae4a68093b7d939a755e1062cee57da186ab1..4afa90cb68aa31820abce6ab051de405
          this.serializedProfile = (profile == null) ? null : NbtUtils.writeGameProfile(new CompoundTag(), profile);
      }
  
-@@ -88,6 +93,7 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
+@@ -104,6 +109,7 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
          super.applyToItem(tag);
  
          if (this.profile != null) {
diff --git a/patches/server/0012-Add-Furnace-Recipe-API.patch b/patches/server/0012-Add-Furnace-Recipe-API.patch
index c6e0f7a..d469c20 100644
--- a/patches/server/0012-Add-Furnace-Recipe-API.patch
+++ b/patches/server/0012-Add-Furnace-Recipe-API.patch
@@ -215,10 +215,10 @@ index 0000000000000000000000000000000000000000..e7114e456f818d7bdd4081620f4b9b93
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index f0b14914438840bd819fa7da8b76f4fcc13704d0..bb0bbbb42b2d31e7f72c277e57b551fe602c4309 100644
+index 72ed25022d5ea1074304be3c72b23882b8f0f88a..22457dfb3c4a2489f79e2f977f415d2938db0d27 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2410,4 +2410,11 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2376,4 +2376,11 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          return this.adventure$pointers;
      }
      // Paper end
diff --git a/patches/server/0013-Disable-sleep-status-announcements.patch b/patches/server/0013-Disable-sleep-status-announcements.patch
index a9e0e6b..094a9b6 100644
--- a/patches/server/0013-Disable-sleep-status-announcements.patch
+++ b/patches/server/0013-Disable-sleep-status-announcements.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Disable sleep status announcements
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 12c27ed2ed3a31a26663d78b6429146d384ec0b1..85ebc791c0b6b14d93c757392140b4fd8732291a 100644
+index 532c32dbec9b3e33adaf49aec8a96a3705376ce4..b21e88bc4c54c27dd7255b7c4051f78f8e5e7ab6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -919,7 +919,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -954,7 +954,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
      }
  
      private void announceSleepStatus() {
diff --git a/patches/server/0016-Add-Player-getHiddenEntities-API.patch b/patches/server/0016-Add-Player-getHiddenEntities-API.patch
index fba8e01..42b1212 100644
--- a/patches/server/0016-Add-Player-getHiddenEntities-API.patch
+++ b/patches/server/0016-Add-Player-getHiddenEntities-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add Player#getHiddenEntities API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ef9c3a7b15a4901e1662e6d55504b9cbbb804ad3..21a5f34e12af4435982c73fb48c7c9f679c364a6 100644
+index a508619e6855ee0b96a9bf61526b1b88abf0e732..4d2bd557175ed6f91bc93c0b2cf989a4e58bde44 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1794,6 +1794,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1834,6 +1834,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              registerEntity(player);
          }
      }
diff --git a/patches/server/0019-Expanded-Insomnia-API.patch b/patches/server/0019-Expanded-Insomnia-API.patch
index fd50cbc..cd92ca7 100644
--- a/patches/server/0019-Expanded-Insomnia-API.patch
+++ b/patches/server/0019-Expanded-Insomnia-API.patch
@@ -34,10 +34,10 @@ index c41925004c232eb8a5e1e000a9060254f074c3db..2966c5324c19066a5aa8a14183acca21
              }
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 21a5f34e12af4435982c73fb48c7c9f679c364a6..f96c810f0aafb70a2896c576b1ca0daab2cd114e 100644
+index 4d2bd557175ed6f91bc93c0b2cf989a4e58bde44..371693b2f7778555b8c4b1cf8deb6ca08cfb4ed5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -70,6 +70,7 @@ import net.minecraft.server.level.ServerPlayer;
+@@ -73,6 +73,7 @@ import net.minecraft.server.level.ServerPlayer;
  import net.minecraft.server.network.ServerGamePacketListenerImpl;
  import net.minecraft.server.players.UserWhiteListEntry;
  import net.minecraft.world.entity.Entity;
@@ -45,7 +45,7 @@ index 21a5f34e12af4435982c73fb48c7c9f679c364a6..f96c810f0aafb70a2896c576b1ca0daa
  import net.minecraft.world.entity.ai.attributes.AttributeInstance;
  import net.minecraft.world.entity.ai.attributes.AttributeMap;
  import net.minecraft.world.entity.ai.attributes.Attributes;
-@@ -171,6 +172,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -176,6 +177,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      private static final boolean DISABLE_CHANNEL_LIMIT = System.getProperty("paper.disableChannelLimit") != null; // Paper - add a flag to disable the channel limit
      private long lastSaveTime;
      // Paper end
@@ -53,7 +53,7 @@ index 21a5f34e12af4435982c73fb48c7c9f679c364a6..f96c810f0aafb70a2896c576b1ca0daa
  
      public CraftPlayer(CraftServer server, ServerPlayer entity) {
          super(server, entity);
-@@ -1871,6 +1873,33 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1911,6 +1913,33 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this;
      }
  
diff --git a/patches/server/0020-Add-spam-bypass-permission.patch b/patches/server/0020-Add-spam-bypass-permission.patch
index 0a237bd..fd3eb11 100644
--- a/patches/server/0020-Add-spam-bypass-permission.patch
+++ b/patches/server/0020-Add-spam-bypass-permission.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add spam bypass permission
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c3a5aa2cbfeef1d2841ef85d135a2f6e0a7a2f61..da6734c55b333eb7ecd0024f816a52512c96987d 100644
+index 9eb921fec32afa360f3a402e978411fcf3ec618c..44557ac1d655cd7118419072eb34acfdf714a133 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -881,16 +881,19 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -875,16 +875,19 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
      public void handleCustomCommandSuggestions(ServerboundCommandSuggestionPacket packet) {
          // PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel()); // Paper - run this async
          // CraftBukkit start
@@ -29,7 +29,7 @@ index c3a5aa2cbfeef1d2841ef85d135a2f6e0a7a2f61..da6734c55b333eb7ecd0024f816a5251
          // Paper end
          // CraftBukkit end
          // Paper start - Don't suggest if tab-complete is disabled
-@@ -2617,6 +2620,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2615,6 +2618,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
  
      // Spigot start - spam exclusions
      private void detectRateSpam(String s) {
@@ -37,7 +37,7 @@ index c3a5aa2cbfeef1d2841ef85d135a2f6e0a7a2f61..da6734c55b333eb7ecd0024f816a5251
          // CraftBukkit start - replaced with thread safe throttle
          boolean counted = true;
          for ( String exclude : org.spigotmc.SpigotConfig.spamExclusions )
-@@ -3401,10 +3405,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3393,10 +3397,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
      public void handlePlaceRecipe(ServerboundPlaceRecipePacket packet) {
          // Paper start
          if (!org.bukkit.Bukkit.isPrimaryThread()) {
diff --git a/patches/server/0021-Disable-set-spawn-message.patch b/patches/server/0021-Disable-set-respawn-message.patch
similarity index 87%
rename from patches/server/0021-Disable-set-spawn-message.patch
rename to patches/server/0021-Disable-set-respawn-message.patch
index 61fc969..cc5f039 100644
--- a/patches/server/0021-Disable-set-spawn-message.patch
+++ b/patches/server/0021-Disable-set-respawn-message.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Disable set respawn message
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 63494f6248e0f339ad6b6418a5103a45be7450e4..a6735bb4cc9d1fc130947458ea1d04c1cc009435 100644
+index 9fae1cd71bfe8832a9294ac0f51e667776ba1744..dc231a14794b1975c2b845ac558f0cf44de39aeb 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2172,10 +2172,10 @@ public class ServerPlayer extends Player {
+@@ -2158,10 +2158,10 @@ public class ServerPlayer extends Player {
              angle = (float) event.getLocation().getYaw();
              forced = event.isForced();
              // Paper end
diff --git a/patches/server/0022-Make-FixLight-use-action-bar.patch b/patches/server/0022-Make-FixLight-use-action-bar.patch
index 11eb897..cbd29b6 100644
--- a/patches/server/0022-Make-FixLight-use-action-bar.patch
+++ b/patches/server/0022-Make-FixLight-use-action-bar.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Make FixLight use action bar
 
 
 diff --git a/src/main/java/io/papermc/paper/command/subcommands/FixLightCommand.java b/src/main/java/io/papermc/paper/command/subcommands/FixLightCommand.java
-index 68645bbbab9b4225048b647252d8f462028a9c84..db05088a7f0c4a0d9db29a25d250bb28914ec8de 100644
+index 450bd95218852174cfbc88d4517e17daee5ffd5f..794842cb3dfa0732ccecf625b97dbc6c311a8a18 100644
 --- a/src/main/java/io/papermc/paper/command/subcommands/FixLightCommand.java
 +++ b/src/main/java/io/papermc/paper/command/subcommands/FixLightCommand.java
 @@ -24,6 +24,7 @@ import static net.kyori.adventure.text.format.NamedTextColor.BLUE;
@@ -16,9 +16,9 @@ index 68645bbbab9b4225048b647252d8f462028a9c84..db05088a7f0c4a0d9db29a25d250bb28
  
  @DefaultQualifier(NonNull.class)
  public final class FixLightCommand implements PaperSubcommand {
-@@ -103,9 +104,12 @@ public final class FixLightCommand implements PaperSubcommand {
+@@ -93,17 +94,20 @@ public final class FixLightCommand implements PaperSubcommand {
          lightengine.relight(chunks,
-             (ChunkPos chunkPos) -> {
+             (final ChunkPos chunkPos) -> {
                  ++relitChunks[0];
 -                sender.getBukkitEntity().sendMessage(text().color(DARK_AQUA).append(
 -                    text("Relit chunk ", BLUE), text(chunkPos.toString()),
@@ -31,12 +31,7 @@ index 68645bbbab9b4225048b647252d8f462028a9c84..db05088a7f0c4a0d9db29a25d250bb28
 +                    text("(" + (int) (Math.round(100.0 * (double) (relitChunks[0]) / (double) pending[0])) + "%)", YELLOW)
                  ));
              },
-             (int totalRelit) -> {
-diff --git a/src/main/java/io/papermc/paper/command/subcommands/FixLightCommand.java b/src/main/java/io/papermc/paper/command/subcommands/FixLightCommand.java
-index db05088a7f0c4a0d9db29a25d250bb28914ec8de..4999476682ffbcd4d71ae32b172be8351ef905c9 100644
---- a/src/main/java/io/papermc/paper/command/subcommands/FixLightCommand.java
-+++ b/src/main/java/io/papermc/paper/command/subcommands/FixLightCommand.java
-@@ -116,8 +116,8 @@ public final class FixLightCommand implements PaperSubcommand {
+             (final int totalRelit) -> {
                  final long end = System.nanoTime();
                  final long diff = Math.round(1.0e-6 * (end - start));
                  sender.getBukkitEntity().sendMessage(text().color(DARK_AQUA).append(