diff --git a/gradle.properties b/gradle.properties
index a36881a8..556050db 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 group=org.leavesmc.leaves
 version=1.21.1-R0.1-SNAPSHOT
 mcVersion=1.21.1
-paperRef=6d7a438faddfbea99d6af7f99f99a480883cef8a
+paperRef=57c75a4b67a8b3b3c607126130b7503658b5e98a
 preVersion=false
 updatingMinecraft=false
 org.gradle.jvmargs=-Xmx2G
diff --git a/patches/api/0005-Hide-irrelevant-compilation-warnings.patch b/patches/api/0005-Hide-irrelevant-compilation-warnings.patch
index a9e5b589..6882fbca 100644
--- a/patches/api/0005-Hide-irrelevant-compilation-warnings.patch
+++ b/patches/api/0005-Hide-irrelevant-compilation-warnings.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Hide irrelevant compilation warnings
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 540fe7e2c110e79c3742f229b3ed8c54b101d260..c070e3d308b14cc020475c2644955e7546ef6cef 100644
+index ab84a1405acc1f0d5f267892243b82b8dab03e21..beee863333fa8ebb31cd83d6a1451b51c770bf2d 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -130,6 +130,15 @@ val generateApiVersioningFile by tasks.registering {
+@@ -131,6 +131,15 @@ val generateApiVersioningFile by tasks.registering {
      }
  }
  
@@ -24,7 +24,7 @@ index 540fe7e2c110e79c3742f229b3ed8c54b101d260..c070e3d308b14cc020475c2644955e75
  tasks.jar {
      from(generateApiVersioningFile.map { it.outputs.files.singleFile }) {
          into("META-INF/maven/${project.group}/${project.name}")
-@@ -188,6 +197,8 @@ tasks.withType<Javadoc> {
+@@ -190,6 +199,8 @@ tasks.withType<Javadoc> {
              into("build/docs/javadoc")
          }
      }
diff --git a/patches/api/0006-SIMD-support.patch b/patches/api/0006-SIMD-support.patch
index 9cdd8251..43c089fe 100644
--- a/patches/api/0006-SIMD-support.patch
+++ b/patches/api/0006-SIMD-support.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] SIMD support
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index c070e3d308b14cc020475c2644955e7546ef6cef..286349a28b06eddebbf103def9bd33bcc224f090 100644
+index beee863333fa8ebb31cd83d6a1451b51c770bf2d..1491188671ce741afbbc4006c03510a328e92dbd 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -136,6 +136,7 @@ tasks.withType<JavaCompile> {
+@@ -137,6 +137,7 @@ tasks.withType<JavaCompile> {
      compilerArgs.add("-Xlint:-module")
      compilerArgs.add("-Xlint:-removal")
      compilerArgs.add("-Xlint:-dep-ann")
@@ -16,7 +16,7 @@ index c070e3d308b14cc020475c2644955e7546ef6cef..286349a28b06eddebbf103def9bd33bc
  }
  // Leaves end - hide irrelevant compilation warnings
  
-@@ -199,6 +200,7 @@ tasks.withType<Javadoc> {
+@@ -201,6 +202,7 @@ tasks.withType<Javadoc> {
      }
  
      options.addStringOption("Xdoclint:none", "-quiet") // Leaves - hide irrelevant compilation warnings
diff --git a/patches/api/0008-Force-peaceful-mode-switch.patch b/patches/api/0008-Force-peaceful-mode-switch.patch
index 17a75455..7e50606d 100644
--- a/patches/api/0008-Force-peaceful-mode-switch.patch
+++ b/patches/api/0008-Force-peaceful-mode-switch.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Force peaceful mode switch
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index adcd8161846b06fd1a7895750f98b629204a8406..30285b70f3fb6b63b41c052e86ff9a61594ea1ec 100644
+index ef32a937e6faf1e8a5d6b1207986715bae5a246c..29343b0f5c5b91e66e13c2d8d5e1952762af8526 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -4229,6 +4229,12 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -4277,6 +4277,12 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
      void setSendViewDistance(int viewDistance);
      // Paper end - view distance api
  
diff --git a/patches/server/0003-Delete-Timings.patch b/patches/server/0003-Delete-Timings.patch
index feff2311..fbb3a0bd 100644
--- a/patches/server/0003-Delete-Timings.patch
+++ b/patches/server/0003-Delete-Timings.patch
@@ -1136,7 +1136,7 @@ index dcb5651d1d9b10b40430fb2f713beedf68336704..68e445c21e0acbdf6bb74d50ddd32e0e
              gameprofilerfiller.pop();
              gameprofilerfiller.pop();
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index c96f3dcd365bc140b1f4680ef6bd770c80f8eda1..2c509f2c5e6e6824392f1f90dde524ad2c0fc2cc 100644
+index f9abf63e12ea930275121b470e4e4906cff0fc12..14e9140c9a18906c249e8cef39988ed7f81738f7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1,7 +1,6 @@
@@ -1331,7 +1331,7 @@ index c96f3dcd365bc140b1f4680ef6bd770c80f8eda1..2c509f2c5e6e6824392f1f90dde524ad
          // Paper start - add close param
          if (close) {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index c13922d2fb1c15f895b14d4cb6d5379b59ea1ef8..9bb0dde8c3e6b3d17b3798a408658a8ffefd831f 100644
+index 5e2c4969e77c669acbb4a13c07033cb267c3d586..79237a490d7572eae95384f32e0ebc1a0a005c00 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1,6 +1,5 @@
@@ -1341,7 +1341,7 @@ index c13922d2fb1c15f895b14d4cb6d5379b59ea1ef8..9bb0dde8c3e6b3d17b3798a408658a8f
  import com.google.common.collect.Lists;
  import com.google.common.collect.Maps;
  import com.google.common.collect.Sets;
-@@ -1199,7 +1198,6 @@ public abstract class PlayerList {
+@@ -1200,7 +1199,6 @@ public abstract class PlayerList {
  
      public void saveAll(int interval) {
          io.papermc.paper.util.MCUtil.ensureMain("Save Players" , () -> { // Paper - Ensure main
@@ -1349,7 +1349,7 @@ index c13922d2fb1c15f895b14d4cb6d5379b59ea1ef8..9bb0dde8c3e6b3d17b3798a408658a8f
          int numSaved = 0;
          long now = MinecraftServer.currentTick;
          for (int i = 0; i < this.players.size(); ++i) {
-@@ -1210,7 +1208,6 @@ public abstract class PlayerList {
+@@ -1211,7 +1209,6 @@ public abstract class PlayerList {
              }
              // Paper end - Incremental chunk and player saving
          }
@@ -1386,7 +1386,7 @@ index cb61462d4691a055a4b25f7b953609d8a154fdfe..b2b97c4c61ea5b6f7ec199fabbd1bd1c
          return this != EntityType.PLAYER && this != EntityType.LLAMA_SPIT && this != EntityType.WITHER && this != EntityType.BAT && this != EntityType.ITEM_FRAME && this != EntityType.GLOW_ITEM_FRAME && this != EntityType.LEASH_KNOT && this != EntityType.PAINTING && this != EntityType.END_CRYSTAL && this != EntityType.EVOKER_FANGS;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 30f4f1254fc295442d72d50479e8af635f2fe983..a0f6d383b430c8e320f041fe2221943830b021eb 100644
+index 2aa6374cd4a96efd85899be8cd3172a8257bfe6b..03e424afddbdcdcb6ea88ab9ee4e0bbcc05f983d 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -157,7 +157,6 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -1473,7 +1473,7 @@ index 85b4b24361e785acf75571ff98f924c00ae80748..1f3e0392f88a7cb3fb5c0767cdd1b4bc
      }
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index e2a0487089eb5a7bdc1433e4c75f69d8e9f9d5f9..33a5137b1057fe6203e10f9e7e0cb7c4251466e9 100644
+index 507671476c3d2d92a2fdb05be24443af27d26dcf..73b1b5b8b3723f068e45874eb251f08ef0a93017 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -173,7 +173,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
@@ -1740,7 +1740,7 @@ index b3e1adeb932da9b3bed16acd94e2f16da48a7c72..e9798517b9211c50a20ea5c69603aab3
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index f78744b6d6075f584d9a88612661854f3f04aed1..6cfecd797d3cd7f9ff84755eea6dea5888ecd4f9 100644
+index cdeb340cad6d650300bfb5e62a121449094e3ec1..1d2a8521ff45e212cd545953df730f278a05412c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -200,7 +200,6 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0004-Leaves-Server-Utils.patch b/patches/server/0004-Leaves-Server-Utils.patch
index e28f17f3..ab1f933a 100644
--- a/patches/server/0004-Leaves-Server-Utils.patch
+++ b/patches/server/0004-Leaves-Server-Utils.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Leaves Server Utils
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index bc45c74987974b4828201e06fc8b1f3fbc0af8b4..7ea72dcc310a363246eb7d77c49ed25a7f14d2fa 100644
+index 4b54d0ea31062972e68ee8fafe3cfaf68f65a5cd..b5283b7a59c76e75ba9a822f315ba0d813df8cfb 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -429,6 +429,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -16,7 +16,7 @@ index bc45c74987974b4828201e06fc8b1f3fbc0af8b4..7ea72dcc310a363246eb7d77c49ed25a
  
      public void setOrigin(@javax.annotation.Nonnull Location location) {
          this.origin = location.toVector();
-@@ -2556,6 +2557,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -2558,6 +2559,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                  nbttagcompound.putBoolean("Paper.FreezeLock", true);
              }
              // Paper end
@@ -24,7 +24,7 @@ index bc45c74987974b4828201e06fc8b1f3fbc0af8b4..7ea72dcc310a363246eb7d77c49ed25a
              return nbttagcompound;
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT");
-@@ -2703,6 +2705,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -2705,6 +2707,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                  freezeLocked = nbt.getBoolean("Paper.FreezeLock");
              }
              // Paper end
@@ -36,7 +36,7 @@ index bc45c74987974b4828201e06fc8b1f3fbc0af8b4..7ea72dcc310a363246eb7d77c49ed25a
  
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.forThrowable(throwable, "Loading entity NBT");
-@@ -4990,4 +4997,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4992,4 +4999,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          return ((net.minecraft.server.level.ServerChunkCache) level.getChunkSource()).isPositionTicking(this);
      }
      // Paper end - Expose entity id counter
diff --git a/patches/server/0010-Fakeplayer-support.patch b/patches/server/0010-Fakeplayer-support.patch
index 39fa8944..7b73420c 100644
--- a/patches/server/0010-Fakeplayer-support.patch
+++ b/patches/server/0010-Fakeplayer-support.patch
@@ -270,7 +270,7 @@ index c396580a9cfd86ff261bed439bb4662ae88010b5..c2263ef7fb67db7c01bac7aecf218ee8
                  PlayerChangedWorldEvent changeEvent = new PlayerChangedWorldEvent(this.getBukkitEntity(), worldserver1.getWorld());
                  this.level().getCraftServer().getPluginManager().callEvent(changeEvent);
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index e6a1942d44c589d6815824646b5517a5938385c3..e53e5011af49da4222f4c38e31f1500158c5a5a7 100644
+index d0190f633e99e2a5b5dc130def10c562ffc4e52e..31a55145bf2ed0e5a23fd07d1c14e93572d5ef5a 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -123,6 +123,8 @@ import org.bukkit.event.player.PlayerRespawnEvent.RespawnReason;
@@ -333,7 +333,7 @@ index e6a1942d44c589d6815824646b5517a5938385c3..e53e5011af49da4222f4c38e31f15001
  
          return astring;
      }
-@@ -1168,7 +1194,13 @@ public abstract class PlayerList {
+@@ -1169,7 +1195,13 @@ public abstract class PlayerList {
  
      @Nullable
      public ServerPlayer getPlayerByName(String name) {
@@ -348,7 +348,7 @@ index e6a1942d44c589d6815824646b5517a5938385c3..e53e5011af49da4222f4c38e31f15001
      }
  
      public void broadcast(@Nullable net.minecraft.world.entity.player.Player player, double x, double y, double z, double distance, ResourceKey<Level> worldKey, Packet<?> packet) {
-@@ -1508,7 +1540,13 @@ public abstract class PlayerList {
+@@ -1509,7 +1541,13 @@ public abstract class PlayerList {
  
      @Nullable
      public ServerPlayer getPlayer(UUID uuid) {
@@ -364,10 +364,10 @@ index e6a1942d44c589d6815824646b5517a5938385c3..e53e5011af49da4222f4c38e31f15001
  
      public boolean canBypassPlayerLimit(GameProfile profile) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 7ea72dcc310a363246eb7d77c49ed25a7f14d2fa..03fdcd134179d41c84ad38fbdf108acb36fee01e 100644
+index b5283b7a59c76e75ba9a822f315ba0d813df8cfb..35eafbfa719c9ac3e235df0728650e1ed1c23fcd 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1455,7 +1455,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -1457,7 +1457,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          return offsetFactor;
      }
  
@@ -544,10 +544,10 @@ index 275704db5b984584504749437e8ecdc60d4aa871..51365bf3a487725c79a8a3adae0821ce
 +    // Leaves end - Bot API
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 38b046da5acac8633db8618a2957187d291f5e73..ea49d32a728fafe1dbd8b6c4f60b552550e78cd2 100644
+index 33e4818ba5a90d78d69baad9f6b1be1b1382e9f3..db2c1139f8471d12d6b80aab630b1426a084e47c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -210,7 +210,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -245,7 +245,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public int getPlayerCount() {
@@ -556,7 +556,7 @@ index 38b046da5acac8633db8618a2957187d291f5e73..ea49d32a728fafe1dbd8b6c4f60b5525
      }
  
      @Override
-@@ -1254,9 +1254,9 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1295,9 +1295,9 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public List<Player> getPlayers() {
@@ -568,7 +568,7 @@ index 38b046da5acac8633db8618a2957187d291f5e73..ea49d32a728fafe1dbd8b6c4f60b5525
              HumanEntity bukkitEntity = human.getBukkitEntity();
  
              if ((bukkitEntity != null) && (bukkitEntity instanceof Player)) {
-@@ -1941,7 +1941,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1982,7 +1982,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      public void playSound(final net.kyori.adventure.sound.Sound sound) {
          org.spigotmc.AsyncCatcher.catchOp("play sound"); // Paper
          final long seed = sound.seed().orElseGet(this.world.getRandom()::nextLong);
@@ -577,7 +577,7 @@ index 38b046da5acac8633db8618a2957187d291f5e73..ea49d32a728fafe1dbd8b6c4f60b5525
              player.connection.send(io.papermc.paper.adventure.PaperAdventure.asSoundPacket(sound, player.getX(), player.getY(), player.getZ(), seed, null));
          }
      }
-@@ -1957,7 +1957,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1998,7 +1998,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          org.spigotmc.AsyncCatcher.catchOp("play sound"); // Paper
          final long seed = sound.seed().orElseGet(this.getHandle().getRandom()::nextLong);
          if (emitter == net.kyori.adventure.sound.Sound.Emitter.self()) {
@@ -586,7 +586,7 @@ index 38b046da5acac8633db8618a2957187d291f5e73..ea49d32a728fafe1dbd8b6c4f60b5525
                  player.connection.send(io.papermc.paper.adventure.PaperAdventure.asSoundPacket(sound, player, seed, null));
              }
          } else if (emitter instanceof CraftEntity craftEntity) {
-@@ -2178,7 +2178,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2219,7 +2219,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
              Preconditions.checkArgument(particle.getDataType().isInstance(data), "data (%s) should be %s", data.getClass(), particle.getDataType());
          }
          this.getHandle().sendParticles(
diff --git a/patches/server/0018-No-chat-sign.patch b/patches/server/0018-No-chat-sign.patch
index d548085b..2643f497 100644
--- a/patches/server/0018-No-chat-sign.patch
+++ b/patches/server/0018-No-chat-sign.patch
@@ -149,10 +149,10 @@ index 7bcadf3b793fd4c5d58e0e3e01a373b2e1a7a628..427dede2feca3350c45c4e70fe8efcbb
          if (packet == null || this.processedDisconnect) { // Spigot
              return;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index e53e5011af49da4222f4c38e31f1500158c5a5a7..b690a584c156c5d1a7b8818e73a8e616fb373ce5 100644
+index 31a55145bf2ed0e5a23fd07d1c14e93572d5ef5a..5221ab490fcbc11434c1209f654e5731fa15487e 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1455,7 +1455,7 @@ public abstract class PlayerList {
+@@ -1456,7 +1456,7 @@ public abstract class PlayerList {
      }
  
      public boolean verifyChatTrusted(PlayerChatMessage message) { // Paper - private -> public
diff --git a/patches/server/0034-BBOR-Protocol.patch b/patches/server/0034-BBOR-Protocol.patch
index baac864b..e446fec3 100644
--- a/patches/server/0034-BBOR-Protocol.patch
+++ b/patches/server/0034-BBOR-Protocol.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] BBOR Protocol
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index b690a584c156c5d1a7b8818e73a8e616fb373ce5..2fc4d42619611a2724aff9bc114c9118212ad974 100644
+index 5221ab490fcbc11434c1209f654e5731fa15487e..7ba6579cfe925ef40940cce29ebc0abb6458f13d 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1595,6 +1595,7 @@ public abstract class PlayerList {
+@@ -1596,6 +1596,7 @@ public abstract class PlayerList {
              entityplayer.getRecipeBook().sendInitialRecipeBook(entityplayer);
          }
  
diff --git a/patches/server/0045-Xaero-Map-Protocol.patch b/patches/server/0045-Xaero-Map-Protocol.patch
index 6bdf5edd..adebd201 100644
--- a/patches/server/0045-Xaero-Map-Protocol.patch
+++ b/patches/server/0045-Xaero-Map-Protocol.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Xaero Map Protocol
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 8bcb3ceab7089224d93b73ab5dbafb0b77c4c317..0ba56ea6ca96cd7adb47dad756c8ed2972a2d587 100644
+index 69323d0889a0c9cd243441c42c8f454457421cfe..e62a27431bb2872bdf7dcc34366249dbfe8add17 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1288,6 +1288,7 @@ public abstract class PlayerList {
+@@ -1289,6 +1289,7 @@ public abstract class PlayerList {
          player.connection.send(new ClientboundInitializeBorderPacket(worldborder));
          player.connection.send(new ClientboundSetTimePacket(world.getGameTime(), world.getDayTime(), world.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT)));
          player.connection.send(new ClientboundSetDefaultSpawnPositionPacket(world.getSharedSpawnPos(), world.getSharedSpawnAngle()));
diff --git a/patches/server/0063-Elytra-aeronautics-no-chunk-load.patch b/patches/server/0063-Elytra-aeronautics-no-chunk-load.patch
index 4843579a..fd50851e 100644
--- a/patches/server/0063-Elytra-aeronautics-no-chunk-load.patch
+++ b/patches/server/0063-Elytra-aeronautics-no-chunk-load.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Elytra aeronautics no chunk load
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 5fe7ae8b873f71a0caf886e6036a4f58c835c4c2..0905615b8961793d57e5a3009e653f7af46e2007 100644
+index e0650881a3f90532fc446607cf5ae34da4a2a1dc..07d75d8d518456387393ecf371bc1947e1ea4bb5 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -749,7 +749,8 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -27,7 +27,7 @@ index 5fe7ae8b873f71a0caf886e6036a4f58c835c4c2..0905615b8961793d57e5a3009e653f7a
  
          SectionPos sectionposition = player.getLastSectionPos();
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f893f841509017d61b496e712c12b578d4d69345..e3b150807c04a487b9165f71ba9923e17568ba61 100644
+index 88e15a2a90485e461df242a1071ecb5b567c46aa..1e4364e4dbc35064fe06a92b7c2c3baae07b0326 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -559,7 +559,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -40,10 +40,10 @@ index f893f841509017d61b496e712c12b578d4d69345..e3b150807c04a487b9165f71ba9923e1
                          !worldserver.areChunksLoadedForMove(entity.getBoundingBox().expandTowards(new Vec3(toX, toY, toZ).subtract(entity.position())))
                      )) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 012c638335ac54ffe1f780d2cd1e3a50243e33e9..5a882339c89e55f29369ee013babf89afc5194ce 100644
+index 6d97b1be9192d237e5ed2cef94ec9bd72881e156..c7e3772a031c997d43120c3ec95b30093b3ea7eb 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1136,7 +1136,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -1138,7 +1138,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                      return;
                  }
              }
@@ -58,7 +58,7 @@ index 012c638335ac54ffe1f780d2cd1e3a50243e33e9..5a882339c89e55f29369ee013babf89a
              this.level().getProfiler().push("move");
              if (this.stuckSpeedMultiplier.lengthSqr() > 1.0E-7D) {
                  movement = movement.multiply(this.stuckSpeedMultiplier);
-@@ -2096,6 +2102,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -2098,6 +2104,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          this.yo = y;
          this.zo = d4;
          this.setPos(d3, y, d4);
@@ -67,7 +67,7 @@ index 012c638335ac54ffe1f780d2cd1e3a50243e33e9..5a882339c89e55f29369ee013babf89a
      }
  
 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 c566031782c4e1401e1c9f5223c62420c4fba87a..0ee227c0f7d54ed7c686a830873fab6c0cdd2ab5 100644
+index a570e9ef4b2b767af3ebb2b33230eb7877553a85..b737848442843b4d7decc140f51f77ed6f7c5f4b 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -197,6 +197,7 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0081-Optimize-sun-burn-tick.patch b/patches/server/0081-Optimize-sun-burn-tick.patch
index a8b3fc6c..fdfc88b3 100644
--- a/patches/server/0081-Optimize-sun-burn-tick.patch
+++ b/patches/server/0081-Optimize-sun-burn-tick.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Optimize sun burn tick
 This patch is Powered by Gale(https://github.com/GaleMC/Gale)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 0c4c7d6145e46077b2ae56aafe6688d7c2496d3a..837c89bfecdadecb05598bc4c7fd058012188688 100644
+index c7e3772a031c997d43120c3ec95b30093b3ea7eb..8c6f9911c3ec32909a0830dc5eee6442ff42d41c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2078,8 +2078,22 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -2080,8 +2080,22 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      /** @deprecated */
      @Deprecated
      public float getLightLevelDependentMagicValue() {
diff --git a/patches/server/0086-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0086-Skip-entity-move-if-movement-is-zero.patch
index 2efcd6b0..e6ab6b4a 100644
--- a/patches/server/0086-Skip-entity-move-if-movement-is-zero.patch
+++ b/patches/server/0086-Skip-entity-move-if-movement-is-zero.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Skip entity move if movement is zero
 This patch is Powered by Gale(https://github.com/GaleMC/Gale)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 715f61b7715502aec948bd0bde02a2e45350421f..d27ec46cd0980ab8b554452300b4eb2dd3c92492 100644
+index 8c6f9911c3ec32909a0830dc5eee6442ff42d41c..5f4dd9b08638d8a28dfdce2cc5a320099b72055b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -323,6 +323,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -17,7 +17,7 @@ index 715f61b7715502aec948bd0bde02a2e45350421f..d27ec46cd0980ab8b554452300b4eb2d
      public boolean onGround;
      public boolean horizontalCollision;
      public boolean verticalCollision;
-@@ -1113,6 +1114,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -1115,6 +1116,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      // Paper end - detailed watchdog information
  
      public void move(MoverType movementType, Vec3 movement) {
@@ -31,7 +31,7 @@ index 715f61b7715502aec948bd0bde02a2e45350421f..d27ec46cd0980ab8b554452300b4eb2d
          final Vec3 originalMovement = movement; // Paper - Expose pre-collision velocity
          // Paper start - detailed watchdog information
          ca.spottedleaf.moonrise.common.util.TickThread.ensureTickThread("Cannot move an entity off-main");
-@@ -4164,6 +4172,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4166,6 +4174,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      }
  
      public final void setBoundingBox(AABB boundingBox) {
diff --git a/patches/server/0088-Skip-negligible-planar-movement-multiplication.patch b/patches/server/0088-Skip-negligible-planar-movement-multiplication.patch
index 426c76f3..8695e320 100644
--- a/patches/server/0088-Skip-negligible-planar-movement-multiplication.patch
+++ b/patches/server/0088-Skip-negligible-planar-movement-multiplication.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Skip negligible planar movement multiplication
 This patch is Powered by Gale(https://github.com/GaleMC/Gale)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c19bd6fbf050f7552acd80fa0381a5b2a89dd433..22f1ccd7f0055cc6d68803111666e2df59a54aa4 100644
+index 5f4dd9b08638d8a28dfdce2cc5a320099b72055b..9cb6528935879bb88659100417c96a1b3748668c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1285,9 +1285,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -1287,9 +1287,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                  }
  
                  this.tryCheckInsideBlocks();
diff --git a/patches/server/0094-Force-peaceful-mode-switch.patch b/patches/server/0094-Force-peaceful-mode-switch.patch
index 8388d6ee..5433e1a9 100644
--- a/patches/server/0094-Force-peaceful-mode-switch.patch
+++ b/patches/server/0094-Force-peaceful-mode-switch.patch
@@ -99,10 +99,10 @@ index 7cb97b7623b603aa5469c92f5a6816673c994540..adc3169fb375f03c532d0abdaf336bab
              boolean spawnThisTick = true;
              int limit = enumcreaturetype.getMaxInstancesPerChunk();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index ea49d32a728fafe1dbd8b6c4f60b552550e78cd2..4d1bdc0cea3e1ea52e293d509f4a25cadd1fac1a 100644
+index db2c1139f8471d12d6b80aab630b1426a084e47c..e08019b2191bf648a0a95ba0ef78d484ee4ff4ad 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2376,6 +2376,18 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2417,6 +2417,18 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      // Paper - replace feature flag API
  
diff --git a/patches/server/0121-Fix-falling-block-s-block-location.patch b/patches/server/0121-Fix-falling-block-s-block-location.patch
index 140e2a37..945910cd 100644
--- a/patches/server/0121-Fix-falling-block-s-block-location.patch
+++ b/patches/server/0121-Fix-falling-block-s-block-location.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix falling block's block location
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 56f2aee62eb61346c8d3abe3214f9b91b7489417..46210910797a0fe5795196124e25dee6bdd56b56 100644
+index 9cb6528935879bb88659100417c96a1b3748668c..799df7c72e0d4c4ccd4d33a94681ff440ff81d08 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4753,6 +4753,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4755,6 +4755,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
              int j = Mth.floor(y);
              int k = Mth.floor(z);
  
diff --git a/patches/server/0125-Configurable-MC-67.patch b/patches/server/0125-Configurable-MC-67.patch
index e935df37..4cc34bb8 100644
--- a/patches/server/0125-Configurable-MC-67.patch
+++ b/patches/server/0125-Configurable-MC-67.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable MC-67
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 46210910797a0fe5795196124e25dee6bdd56b56..930f87bfb72736cefbad3d8d0dacb6a942cc129f 100644
+index 799df7c72e0d4c4ccd4d33a94681ff440ff81d08..4e3bc9334af6b8d3131edb6ce2abffc165a82bb6 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3916,7 +3916,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -3918,7 +3918,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      }
  
      public boolean canChangeDimensions(Level from, Level to) {
diff --git a/patches/server/0132-Old-BlockEntity-behaviour.patch b/patches/server/0132-Old-BlockEntity-behaviour.patch
index 1f9ce2f6..5aa42751 100644
--- a/patches/server/0132-Old-BlockEntity-behaviour.patch
+++ b/patches/server/0132-Old-BlockEntity-behaviour.patch
@@ -23,10 +23,10 @@ index ca3a8ead09cf0d3c1352ac266b749bc0bca2ff9a..b705ee10371e77d027b88afc790f346f
                      break label32;
                  }
 diff --git a/src/main/java/net/minecraft/world/level/block/LecternBlock.java b/src/main/java/net/minecraft/world/level/block/LecternBlock.java
-index ebb79907391fe3128d3d16fbe9d8cb0b22bcc9f7..a16f165f7cbf4795b8e5cea6df0b1775058a4474 100644
+index 3a1e2f62b297f384cc0dcfb828e523a37c703d6f..c45a636f8c3542f7a073d6b76a7bf23a91b8c7dc 100644
 --- a/src/main/java/net/minecraft/world/level/block/LecternBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/LecternBlock.java
-@@ -209,10 +209,11 @@ public class LecternBlock extends BaseEntityBlock {
+@@ -226,10 +226,11 @@ public class LecternBlock extends BaseEntityBlock {
                  this.popBook(state, world, pos);
              }