diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch
index f729841..5be28d1 100644
--- a/patches/server/0001-Build-changes.patch
+++ b/patches/server/0001-Build-changes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Build changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 299b7b029384c58fed80d53cc0b77c420d62eed7..2e1ac152fc3706fb2b585b5ca9da31a53bfa4251 100644
+index 421f6b3dc8890d63d2e7aa774d0bf8f7e15890ab..da5b65786a9fde73b5d4be5d89e4fbad3d3faa87 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -1,6 +1,8 @@
@@ -28,7 +28,7 @@ index 299b7b029384c58fed80d53cc0b77c420d62eed7..2e1ac152fc3706fb2b585b5ca9da31a5
      // Paper start
      implementation("org.jline:jline-terminal-jansi:3.21.0")
      implementation("net.minecrell:terminalconsoleappender:1.3.0")
-@@ -80,14 +84,14 @@ tasks.jar {
+@@ -84,14 +88,14 @@ tasks.jar {
          val gitBranch = git("rev-parse", "--abbrev-ref", "HEAD").getText().trim() // Paper
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
@@ -48,7 +48,7 @@ index 299b7b029384c58fed80d53cc0b77c420d62eed7..2e1ac152fc3706fb2b585b5ca9da31a5
              "Build-Number" to (build ?: ""),
              "Build-Time" to Instant.now().toString(),
              "Git-Branch" to gitBranch, // Paper
-@@ -108,6 +112,27 @@ tasks.compileTestJava {
+@@ -112,6 +116,27 @@ tasks.compileTestJava {
  
  publishing {
      publications.create<MavenPublication>("maven") {
@@ -76,7 +76,7 @@ index 299b7b029384c58fed80d53cc0b77c420d62eed7..2e1ac152fc3706fb2b585b5ca9da31a5
      }
  }
  
-@@ -144,7 +169,7 @@ fun TaskContainer.registerRunTask(
+@@ -148,7 +173,7 @@ fun TaskContainer.registerRunTask(
      name: String,
      block: JavaExec.() -> Unit
  ): TaskProvider<JavaExec> = register<JavaExec>(name) {
@@ -112,7 +112,7 @@ index 532306cacd52579cdf37e4aca25887b1ed3ba6a1..87db580c74d20714e2ebe01df23811c7
          final @Nullable Component history = this.getHistory();
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 6e1f92b45504cef0c4dcbbebf3df339ef4cad0a1..19ccccb3b7e6ab81504923717ecf5a8e88ca5757 100644
+index 618f4b2e1d012b647b3e7bf359c8ecdd7f159e63..a14c5c2d7f55b7336c2327cfe71d46dc7fb3e726 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -273,7 +273,7 @@ public class Main {
@@ -138,10 +138,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 e5e41dc2d4f7a8c3fea704212507ca0b951664db..3561e409bc05a97e05216ef10efb800ece42ff67 100644
+index f7a4fee9bb25ff256dc2e5ea26bfbceca6a49167..ec8552ed502b6628ea723f5667097f01fddbc5e5 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
-@@ -90,7 +90,7 @@ public class WatchdogThread extends Thread
+@@ -162,7 +162,7 @@ public class WatchdogThread extends ca.spottedleaf.moonrise.common.util.TickThre
                  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 d339767..84a6057 100644
--- a/patches/server/0003-Add-SoundEvent.patch
+++ b/patches/server/0003-Add-SoundEvent.patch
@@ -84,10 +84,10 @@ index 22fe529890f34f66534c01248f654dc911b44c3b..dfa777529d3eb3cc0a6713c58b91b74c
          final ResourceLocation name = asVanilla(sound.name());
          final Optional<SoundEvent> soundEvent = BuiltInRegistries.SOUND_EVENT.getOptional(name);
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 798016774df02c3f7ebf909c9cc125f8427a39be..59fbbfc4fbb7501be62935c1aa466c5bec21b358 100644
+index 2766ec28f028c0bd672009928bf64c1a6e5d07d6..b012ef12b6ec89ed8281d8b475c87f53fee196c2 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1551,12 +1551,46 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+@@ -1688,12 +1688,46 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
  
      @Override
      public void playSeededSound(@Nullable Player source, double x, double y, double z, Holder<SoundEvent> sound, SoundSource category, float volume, float pitch, long seed) {
@@ -137,10 +137,10 @@ index 798016774df02c3f7ebf909c9cc125f8427a39be..59fbbfc4fbb7501be62935c1aa466c5b
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 89ed20e9c629cf39a24c7a0ce5c4fee41fc64fd5..071e38a48114b6cb0155c1dbd60628cdc81189e8 100644
+index 5980b70e2d7273239245237189b2debcbccfbac3..5174b23c6e04da7a3d833ea3fd191b5956a49809 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2559,7 +2559,20 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
+@@ -2560,7 +2560,20 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
  
      @Override
      public void playNotifySound(SoundEvent sound, SoundSource category, float volume, float pitch) {
@@ -163,10 +163,10 @@ index 89ed20e9c629cf39a24c7a0ce5c4fee41fc64fd5..071e38a48114b6cb0155c1dbd60628cd
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index ef177f21d654d69c128f3f39ea58f2d8ee598628..a97b890311e42433b71137e4b8dafdcdac656116 100644
+index 43eeb8ce4bc350c2b524ade11ca25d8d4d21bea5..e37555cf68b6c7108297d98cd84616bad9009bd7 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -905,6 +905,9 @@ public abstract class PlayerList {
+@@ -907,6 +907,9 @@ public abstract class PlayerList {
                  isBedSpawn = true;
              }
              // Paper end - Add PlayerPostRespawnEvent
@@ -177,10 +177,10 @@ index ef177f21d654d69c128f3f39ea58f2d8ee598628..a97b890311e42433b71137e4b8dafdcd
          // Added from changeDimension
          this.sendAllPlayerInfo(entityplayer); // Update health, etc...
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 54ba25632c2a9e1c93a5b3a0b92e5280864c49d6..d9604fb92476f61f618e2ef6a8aeefe4e9fe7653 100644
+index 09bcbc0ae36e4e69fee87a7e0c49acf496117a39..a4b7229f0de89c315fcf0ecdeeb0ff743d1b05fa 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -1891,9 +1891,23 @@ public abstract class Player extends LivingEntity {
+@@ -1894,9 +1894,23 @@ public abstract class Player extends LivingEntity {
      }
      // Paper start - send while respecting visibility
      private static void sendSoundEffect(Player fromEntity, double x, double y, double z, SoundEvent soundEffect, SoundSource soundCategory, float volume, float pitch) {
@@ -221,10 +221,10 @@ index dcbef04bbaab988096bf416163264833e84d1967..4117f12172d1d67283fab21851bf2d1c
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index bd6fee3e3ad9116802ff8bb57bfa741b881c4057..43ae279d4d7be8b2addd62178189d14f183cdcfb 100644
+index 0ab53d46f0b8f3f3791dd01766738522c86932e8..3cb229ba85057aa6cf9a723695935472f0a1c876 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -2204,4 +2204,42 @@ public class CraftEventFactory {
+@@ -2238,4 +2238,42 @@ public class CraftEventFactory {
          return event;
      }
      // Paper end - add EntityFertilizeEggEvent
diff --git a/patches/server/0005-Add-origin-location-to-EntityDamageByBlockEvent.patch b/patches/server/0005-Add-origin-location-to-EntityDamageByBlockEvent.patch
index 8ab79d8..240da8e 100644
--- a/patches/server/0005-Add-origin-location-to-EntityDamageByBlockEvent.patch
+++ b/patches/server/0005-Add-origin-location-to-EntityDamageByBlockEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add origin location to EntityDamageByBlockEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 43ae279d4d7be8b2addd62178189d14f183cdcfb..ab3387231bd81d692bb508e7f0144f884e7b4c9f 100644
+index 3cb229ba85057aa6cf9a723695935472f0a1c876..9b599304667deecb53ca4140d90965784fa30e7c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1191,7 +1191,7 @@ public class CraftEventFactory {
+@@ -1194,7 +1194,7 @@ public class CraftEventFactory {
      }
  
      private static EntityDamageEvent callEntityDamageEvent(Block damager, BlockState damagerState, Entity damagee, DamageCause cause, org.bukkit.damage.DamageSource bukkitDamageSource, Map<DamageModifier, Double> modifiers, Map<DamageModifier, Function<? super Double, Double>> modifierFunctions, boolean cancelled) {
diff --git a/patches/server/0006-Add-UnsafeValues-canPlaceItemOn.patch b/patches/server/0006-Add-UnsafeValues-canPlaceItemOn.patch
index bdb3717..f08f607 100644
--- a/patches/server/0006-Add-UnsafeValues-canPlaceItemOn.patch
+++ b/patches/server/0006-Add-UnsafeValues-canPlaceItemOn.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add UnsafeValues#canPlaceItemOn
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index d70c5546c8bd6f364fad9b24880b6867efdab644..acddf6e14be66531afb68109d130bc5ccb096471 100644
+index 41c34ffdf9d95a04ed55a1e09ebc78e8cf946777..b43be3c60dc46cd11b652f315d641f16b44b13f2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -707,6 +707,55 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -690,6 +690,55 @@ public final class CraftMagicNumbers implements UnsafeValues {
      }
      // Paper end - proxy ItemStack
  
diff --git a/patches/server/0007-Add-Player-setGameProfile.patch b/patches/server/0007-Add-Player-setGameProfile.patch
index b118583..f26c668 100644
--- a/patches/server/0007-Add-Player-setGameProfile.patch
+++ b/patches/server/0007-Add-Player-setGameProfile.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add Player#setGameProfile
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index d9604fb92476f61f618e2ef6a8aeefe4e9fe7653..2e224f2d9d271eec84171c316aa13472c14e52bc 100644
+index a4b7229f0de89c315fcf0ecdeeb0ff743d1b05fa..0acb4ef6d4ea60d7e4bc17534e84a7a9b477f04e 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -1563,6 +1563,12 @@ public abstract class Player extends LivingEntity {
+@@ -1566,6 +1566,12 @@ public abstract class Player extends LivingEntity {
          return this.gameProfile;
      }
  
diff --git a/patches/server/0008-Expose-MCUtil-Executors.patch b/patches/server/0008-Expose-MCUtil-Executors.patch
index 0972ad5..be228bd 100644
--- a/patches/server/0008-Expose-MCUtil-Executors.patch
+++ b/patches/server/0008-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 caf6ff33b42472d30f28629470e12889f50490cc..534e48db353fae98880bce454c5a843740f96436 100644
+index c8b82bc41f2042bb4b067f06265a3a22e51f7629..6ee706a17443cd53d6f3d768df07e6e5b51db670 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -3205,4 +3205,16 @@ public final class CraftServer implements Server {
+@@ -3218,4 +3218,16 @@ public final class CraftServer implements Server {
          return this.potionBrewer;
      }
      // Paper end
diff --git a/patches/server/0009-Add-BlockDropResourcesEvent.patch b/patches/server/0009-Add-BlockDropResourcesEvent.patch
index ae46a33..7c6f820 100644
--- a/patches/server/0009-Add-BlockDropResourcesEvent.patch
+++ b/patches/server/0009-Add-BlockDropResourcesEvent.patch
@@ -8,10 +8,10 @@ to easily get the items being dropped by any
 block instead of only blocks broken by players.
 
 diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java
-index 45704653310efe9cb755a644674b54b8722c2c84..f388ff2ba19f25e24de4b7dac5fbdb6e82d7c3c3 100644
+index a7108b2be0746aa1f0e574d8c6f5ffad6d369835..d9aff85fce2a65794dd57cf790f878b4fc4ec54e 100644
 --- a/src/main/java/net/minecraft/world/level/block/Block.java
 +++ b/src/main/java/net/minecraft/world/level/block/Block.java
-@@ -300,7 +300,7 @@ public class Block extends BlockBehaviour implements ItemLike {
+@@ -301,7 +301,7 @@ public class Block extends BlockBehaviour implements ItemLike {
  
      public static void dropResources(BlockState state, Level world, BlockPos pos) {
          if (world instanceof ServerLevel) {
@@ -20,7 +20,7 @@ index 45704653310efe9cb755a644674b54b8722c2c84..f388ff2ba19f25e24de4b7dac5fbdb6e
                  Block.popResource(world, pos, itemstack);
              });
              state.spawnAfterBreak((ServerLevel) world, pos, ItemStack.EMPTY, true);
-@@ -310,7 +310,7 @@ public class Block extends BlockBehaviour implements ItemLike {
+@@ -311,7 +311,7 @@ public class Block extends BlockBehaviour implements ItemLike {
  
      public static void dropResources(BlockState state, LevelAccessor world, BlockPos pos, @Nullable BlockEntity blockEntity) {
          if (world instanceof ServerLevel) {
@@ -29,7 +29,7 @@ index 45704653310efe9cb755a644674b54b8722c2c84..f388ff2ba19f25e24de4b7dac5fbdb6e
                  Block.popResource((ServerLevel) world, pos, itemstack);
              });
              state.spawnAfterBreak((ServerLevel) world, pos, ItemStack.EMPTY, true);
-@@ -346,7 +346,7 @@ public class Block extends BlockBehaviour implements ItemLike {
+@@ -347,7 +347,7 @@ public class Block extends BlockBehaviour implements ItemLike {
      public static void dropResources(BlockState state, Level world, BlockPos pos, @Nullable BlockEntity blockEntity, @Nullable Entity entity, ItemStack tool, boolean dropExperience) {
      // Paper end - Properly handle xp dropping
          if (world instanceof ServerLevel) {
@@ -39,10 +39,10 @@ index 45704653310efe9cb755a644674b54b8722c2c84..f388ff2ba19f25e24de4b7dac5fbdb6e
              });
              state.spawnAfterBreak((ServerLevel) world, pos, tool, dropExperience); // Paper - Properly handle xp dropping
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index ab3387231bd81d692bb508e7f0144f884e7b4c9f..5f3e58115b1a25c6915661847dcb8ae6e90bb3fc 100644
+index 9b599304667deecb53ca4140d90965784fa30e7c..30dce14ff7a1bc3264fdc41d50c5e44f68210a6d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -2241,5 +2241,19 @@ public class CraftEventFactory {
+@@ -2275,5 +2275,19 @@ public class CraftEventFactory {
              }
          });
      }
diff --git a/patches/server/0011-Disable-sleep-status-announcements.patch b/patches/server/0011-Disable-sleep-status-announcements.patch
index c6522c9..c77a7e0 100644
--- a/patches/server/0011-Disable-sleep-status-announcements.patch
+++ b/patches/server/0011-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 59fbbfc4fbb7501be62935c1aa466c5bec21b358..79296c2b2907360c37d071a56afcb614a0dc4b29 100644
+index b012ef12b6ec89ed8281d8b475c87f53fee196c2..8079f25e2830b73b48d32b2abecf6052c3005dea 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -973,7 +973,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+@@ -1046,7 +1046,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
      }
  
      private void announceSleepStatus() {
diff --git a/patches/server/0012-Add-config-for-ticking-TIME_SINCE_REST.patch b/patches/server/0012-Add-config-for-ticking-TIME_SINCE_REST.patch
index cd9e5d2..382fe43 100644
--- a/patches/server/0012-Add-config-for-ticking-TIME_SINCE_REST.patch
+++ b/patches/server/0012-Add-config-for-ticking-TIME_SINCE_REST.patch
@@ -17,10 +17,10 @@ index 7509b17414f836e8b53fc62b02b386ba4e8c5ca9..6e50da6a2fa63b44166b4e52fc4f6530
              public PillagerPatrols pillagerPatrols;
  
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 2e224f2d9d271eec84171c316aa13472c14e52bc..9339c0de87e52402d70af810ad1274c75b81ce8b 100644
+index 0acb4ef6d4ea60d7e4bc17534e84a7a9b477f04e..dae72e66a976701c0cb1fc26e6c37657b79da423 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -303,7 +303,7 @@ public abstract class Player extends LivingEntity {
+@@ -304,7 +304,7 @@ public abstract class Player extends LivingEntity {
                  this.awardStat(Stats.CROUCH_TIME);
              }
  
diff --git a/patches/server/0014-Add-Player-getHiddenEntities-API.patch b/patches/server/0014-Add-Player-getHiddenEntities-API.patch
index fc6c118..aef0ba3 100644
--- a/patches/server/0014-Add-Player-getHiddenEntities-API.patch
+++ b/patches/server/0014-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 7eea190ce8a62960ecc42ff56a4ef71b754184fb..b06595a7e247806fbc145ee941e0886fc3f0266d 100644
+index 992437a6e838f653f32d33b5b3f702c484640a97..49d5cdd931de7c28faadd211a52109f28a9df6e5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2164,6 +2164,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2165,6 +2165,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.server.getPluginManager().callEvent(new PlayerShowEntityEvent(this, entity));
      }
      // Paper start
diff --git a/patches/server/0017-Expanded-Insomnia-API.patch b/patches/server/0017-Expanded-Insomnia-API.patch
index dfee518..5ab50aa 100644
--- a/patches/server/0017-Expanded-Insomnia-API.patch
+++ b/patches/server/0017-Expanded-Insomnia-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expanded Insomnia API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b06595a7e247806fbc145ee941e0886fc3f0266d..a6ea5a1b665af5c3dcf9337d5e3f235ea72c5d7f 100644
+index 49d5cdd931de7c28faadd211a52109f28a9df6e5..1dc933a1b8a5d731de0d1a1e9754eafb8460224d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -213,6 +213,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -17,7 +17,7 @@ index b06595a7e247806fbc145ee941e0886fc3f0266d..a6ea5a1b665af5c3dcf9337d5e3f235e
      public CraftPlayer(CraftServer server, ServerPlayer entity) {
          super(server, entity);
  
-@@ -3564,4 +3566,31 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3565,4 +3567,31 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          ((ca.spottedleaf.moonrise.patches.chunk_system.player.ChunkSystemServerPlayer)this.getHandle())
              .moonrise$getViewDistanceHolder().setSendViewDistance(viewDistance);
      }
diff --git a/patches/server/0019-Disable-set-respawn-message.patch b/patches/server/0019-Disable-set-respawn-message.patch
index a092d4f..6a53cd4 100644
--- a/patches/server/0019-Disable-set-respawn-message.patch
+++ b/patches/server/0019-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 071e38a48114b6cb0155c1dbd60628cdc81189e8..0297c95ca67f5f113b696b4cbd149119b92eca2f 100644
+index 5174b23c6e04da7a3d833ea3fd191b5956a49809..323330172fde196c6e992484d22479d9f8b041db 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2523,9 +2523,10 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
+@@ -2524,9 +2524,10 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
              forced = event.isForced();
              // Paper end - Add PlayerSetSpawnEvent
  
diff --git a/patches/server/0022-Return-Displays-in-getTargetEntity.patch b/patches/server/0022-Return-Displays-in-getTargetEntity.patch
index 7a1bc80..bd4189b 100644
--- a/patches/server/0022-Return-Displays-in-getTargetEntity.patch
+++ b/patches/server/0022-Return-Displays-in-getTargetEntity.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Return Displays in getTargetEntity
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index e980c8c356b30d25e2fc5a73b91ad2c6edd4fe05..690a5ec3b28198690fc085d4b71c18f3707234a5 100644
+index fe435d4a387bb28be6831cec0c8bb0a7c8b603a4..b5c5294a59aad34e21da88bb9d7a6fc70d1a959b 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -4110,7 +4110,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -4183,7 +4183,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
          Vec3 direction = this.getLookAngle();
          Vec3 end = start.add(direction.x * maxDistance, direction.y * maxDistance, direction.z * maxDistance);
  
diff --git a/patches/server/0024-Entity-Data-Storage.patch b/patches/server/0024-Entity-Data-Storage.patch
index dfa8f67..cd4c7b1 100644
--- a/patches/server/0024-Entity-Data-Storage.patch
+++ b/patches/server/0024-Entity-Data-Storage.patch
@@ -27,10 +27,10 @@ index 0000000000000000000000000000000000000000..30f8fd154136d05267e8737ff04a0be4
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 7d82cc6b847124cf4225428ba310309544928148..7b229e405877e31fbe5e292b236febbc5de8dd5c 100644
+index dd56c8e041116ef3602a9f89c998c8208ab89b51..9197be4019ddbe16e09c781a74809d15f569e0f3 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -285,6 +285,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -287,6 +287,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
              return false;
          }
  
@@ -40,12 +40,12 @@ index 7d82cc6b847124cf4225428ba310309544928148..7b229e405877e31fbe5e292b236febbc
          // this.setPlayerList(new DedicatedPlayerList(this, this.registries(), this.playerDataStorage)); // Spigot - moved up
          this.server.loadPlugins();
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 1a40128b06e70e39a82f170fc16dcae1e22c745c..962b84516be0ccd28ff7cab11bcdae6269abe3cb 100644
+index 1f7594e22f0f08ae110ef9b42f15119358aa5723..577a6cc50cf41dc3e590edb955a372c4c2a83fe2 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -169,6 +169,31 @@ import org.bukkit.plugin.PluginManager;
  
- public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess, CommandSource, ScoreHolder, ca.spottedleaf.moonrise.patches.chunk_system.entity.ChunkSystemEntity { // Paper - rewrite chunk system
+ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess, CommandSource, ScoreHolder, ca.spottedleaf.moonrise.patches.chunk_system.entity.ChunkSystemEntity, ca.spottedleaf.moonrise.patches.entity_tracker.EntityTrackerEntity { // Paper - rewrite chunk system // Paper - optimise entity tracker
  
 +    @javax.annotation.Nullable
 +    private gg.projecteden.parchment.entity.EntityData storedEntityData;
diff --git a/patches/server/0026-Add-Block-BreakNaturally-Overload.patch b/patches/server/0026-Add-Block-BreakNaturally-Overload.patch
index 7909ce2..ef14cf3 100644
--- a/patches/server/0026-Add-Block-BreakNaturally-Overload.patch
+++ b/patches/server/0026-Add-Block-BreakNaturally-Overload.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add Block BreakNaturally Overload
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java
-index f388ff2ba19f25e24de4b7dac5fbdb6e82d7c3c3..23a7206f8195a178cd9ef11a0b9ffa9b64148dfd 100644
+index d9aff85fce2a65794dd57cf790f878b4fc4ec54e..4ed92f149be39929a874678bdfa049694270d3b5 100644
 --- a/src/main/java/net/minecraft/world/level/block/Block.java
 +++ b/src/main/java/net/minecraft/world/level/block/Block.java
-@@ -298,24 +298,28 @@ public class Block extends BlockBehaviour implements ItemLike {
+@@ -299,24 +299,28 @@ public class Block extends BlockBehaviour implements ItemLike {
          return state.getDrops(lootparams_a);
      }
  
@@ -43,7 +43,7 @@ index f388ff2ba19f25e24de4b7dac5fbdb6e82d7c3c3..23a7206f8195a178cd9ef11a0b9ffa9b
      }
  
      // Paper start - Add BlockBreakBlockEvent
-@@ -343,15 +347,17 @@ public class Block extends BlockBehaviour implements ItemLike {
+@@ -344,15 +348,17 @@ public class Block extends BlockBehaviour implements ItemLike {
      // Paper start - Properly handle xp dropping
          dropResources(state, world, pos, blockEntity, entity, tool, true);
      }
@@ -64,7 +64,7 @@ index f388ff2ba19f25e24de4b7dac5fbdb6e82d7c3c3..23a7206f8195a178cd9ef11a0b9ffa9b
      }
  
      public static void popResource(Level world, BlockPos pos, ItemStack stack) {
-@@ -365,6 +371,17 @@ public class Block extends BlockBehaviour implements ItemLike {
+@@ -366,6 +372,17 @@ public class Block extends BlockBehaviour implements ItemLike {
          }, stack);
      }