diff --git a/gradle.properties b/gradle.properties
index 4a952802..130ae028 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,5 +4,5 @@ version=1.20.1-R0.1-SNAPSHOT
 mcVersion=1.20.1
 packageVersion=1_20_R1
 org.gradle.jvmargs=-Xmx2G
-paperRef=38856661c0f10f927b130bdc83c3cc6aafa5cb9a
+paperRef=3756f5bbf566fde4aa619bf8d4215f68567621d3
 preVersion=false
diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch
index c44d309a..f9ea7249 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 19186e436cd6a5f00f0b42ac11f8050ad2ef6713..8b111bf1dc219b2ce9b375363574fe18373b8797 100644
+index 6d3d573ffc118e7f4d76422dc014a7df0384bb49..b688eeae8034128318925ad83d308332dfe043d0 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -7,8 +7,12 @@ plugins {
@@ -79,10 +79,10 @@ index 4b002e8b75d117b726b0de274a76d3596fce015b..0ac8bcb0a4b7d1da3d0e016617db7a81
                  metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
                      Map<String, Map<String, Integer>> map = new HashMap<>();
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 80cf4852e4010eeeadaf920ab927a40df0179b40..36cce6ed01e4953ada9695309d7d85317340cb7c 100644
+index 912affb0ab1c4c40f7a655194e95ec6f0ebf1fcd..57e7f83345afa462d329cea515c96fa2aa48a5e3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1679,7 +1679,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1691,7 +1691,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @DontObfuscate
      public String getServerModName() {
@@ -92,7 +92,7 @@ index 80cf4852e4010eeeadaf920ab927a40df0179b40..36cce6ed01e4953ada9695309d7d8531
  
      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 59984cb8ba9ffb66b59a2c907e4f04b5a51ea8ed..c6be267357a26393e58d7f3a76a425922b8cfa0d 100644
+index 0859f11567aecc8cae993a1409cfac7c53ab3dd5..b1f34ee7a421c35eb3ee7ab112defe48d935c788 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -261,7 +261,7 @@ import javax.annotation.Nullable; // Paper
@@ -105,7 +105,7 @@ index 59984cb8ba9ffb66b59a2c907e4f04b5a51ea8ed..c6be267357a26393e58d7f3a76a42592
      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 717e292040ed7779eb4b6c5fa26665d3df9024e7..5c4bf6d99da409988871465de27e0357af79f37e 100644
+index d4f6935a1bea77e5118bfd538f9b1358c21591a7..a53514f2c510b29f596c361de7bc0b405c27e964 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -292,7 +292,7 @@ public class Main {
diff --git a/patches/server/0002-Leaves-Server-Utils.patch b/patches/server/0002-Leaves-Server-Utils.patch
index e42f22a2..26243080 100644
--- a/patches/server/0002-Leaves-Server-Utils.patch
+++ b/patches/server/0002-Leaves-Server-Utils.patch
@@ -31,10 +31,10 @@ index 46954db7ecd35ac4018fdf476df7c8020d7ce6c8..044c51ebb058fc36074fd178929e3279
      public PlayerAreaMap() {
          super();
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 92202262eff01ae3bbeff0e6ebdcf26ad613c169..ec3f1227ad3cd1469258cabe9a36caaf605151d9 100644
+index 513c34aa02d63f7e3c178eade818e156af4541db..ca82b601e99a64038e71b051510f6d1cc57b2f8f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -405,6 +405,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -417,6 +417,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      private UUID originWorld;
      public boolean freezeLocked = false; // Paper - Freeze Tick Lock API
      public boolean collidingWithWorldBorder; // Paper
@@ -42,7 +42,7 @@ index 92202262eff01ae3bbeff0e6ebdcf26ad613c169..ec3f1227ad3cd1469258cabe9a36caaf
  
      public void setOrigin(@javax.annotation.Nonnull Location location) {
          this.origin = location.toVector();
-@@ -2425,6 +2426,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2438,6 +2439,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  nbt.putBoolean("Paper.FreezeLock", true);
              }
              // Paper end
@@ -50,7 +50,7 @@ index 92202262eff01ae3bbeff0e6ebdcf26ad613c169..ec3f1227ad3cd1469258cabe9a36caaf
              return nbt;
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT");
-@@ -2593,6 +2595,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2606,6 +2608,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  freezeLocked = nbt.getBoolean("Paper.FreezeLock");
              }
              // Paper end
@@ -62,7 +62,7 @@ index 92202262eff01ae3bbeff0e6ebdcf26ad613c169..ec3f1227ad3cd1469258cabe9a36caaf
  
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.forThrowable(throwable, "Loading entity NBT");
-@@ -4776,4 +4783,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4805,4 +4812,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          return ((net.minecraft.server.level.ServerChunkCache) level.getChunkSource()).isPositionTicking(this);
      }
      // Paper end
diff --git a/patches/server/0004-Leaves-Server-Config-And-Command.patch b/patches/server/0004-Leaves-Server-Config-And-Command.patch
index efa2aa1b..d9210876 100644
--- a/patches/server/0004-Leaves-Server-Config-And-Command.patch
+++ b/patches/server/0004-Leaves-Server-Config-And-Command.patch
@@ -19,7 +19,7 @@ index a2f71a6d1a9e98133dff6cd0f625da9435a8af14..45897b81a822b9523c16658ca46a5077
  
          new TimingsExport(listeners, parent, history).start();
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 36cce6ed01e4953ada9695309d7d85317340cb7c..e8f3f007edb8ff68c9ce435efb2793beb3db18c6 100644
+index 57e7f83345afa462d329cea515c96fa2aa48a5e3..2e7850a1e0da1f2978b585312aefb46bf0d039e9 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1118,6 +1118,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -65,10 +65,10 @@ index 147d802d9207e358fdb2d1c7806fc2f634dcfd98..4f0a2c9b352f5824ec0c30d0f0af0fe1
          this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c6be267357a26393e58d7f3a76a425922b8cfa0d..8bbd7539cbd70201bf75ad80cf199b99e5cbd47a 100644
+index b1f34ee7a421c35eb3ee7ab112defe48d935c788..7623ebe3bfc508183f67b84e1f1815697ed98ba8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -983,6 +983,7 @@ public final class CraftServer implements Server {
+@@ -1053,6 +1053,7 @@ public final class CraftServer implements Server {
  
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
          this.console.paperConfigurations.reloadConfigs(this.console);
@@ -76,7 +76,7 @@ index c6be267357a26393e58d7f3a76a425922b8cfa0d..8bbd7539cbd70201bf75ad80cf199b99
          for (ServerLevel world : this.console.getAllLevels()) {
              // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
              world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
-@@ -998,6 +999,7 @@ public final class CraftServer implements Server {
+@@ -1068,6 +1069,7 @@ public final class CraftServer implements Server {
                  }
              }
              world.spigotConfig.init(); // Spigot
@@ -84,7 +84,7 @@ index c6be267357a26393e58d7f3a76a425922b8cfa0d..8bbd7539cbd70201bf75ad80cf199b99
          }
  
          Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
-@@ -1013,6 +1015,7 @@ public final class CraftServer implements Server {
+@@ -1083,6 +1085,7 @@ public final class CraftServer implements Server {
          this.reloadData();
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
          io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
@@ -92,7 +92,7 @@ index c6be267357a26393e58d7f3a76a425922b8cfa0d..8bbd7539cbd70201bf75ad80cf199b99
          this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -2779,6 +2782,14 @@ public final class CraftServer implements Server {
+@@ -2849,6 +2852,14 @@ public final class CraftServer implements Server {
          {
              return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
          }
@@ -108,7 +108,7 @@ index c6be267357a26393e58d7f3a76a425922b8cfa0d..8bbd7539cbd70201bf75ad80cf199b99
          @Override
          public void restart() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 5c4bf6d99da409988871465de27e0357af79f37e..ce9873f216cbb330dee4abbdf8b0459f7e53dbe5 100644
+index a53514f2c510b29f596c361de7bc0b405c27e964..269c7ba0707db4fdc45a70000e0be892b6dfa31d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -165,6 +165,14 @@ public class Main {
diff --git a/patches/server/0005-Fix-gravity-block-duper.patch b/patches/server/0005-Fix-gravity-block-duper.patch
index 78e32d32..dd64d521 100644
--- a/patches/server/0005-Fix-gravity-block-duper.patch
+++ b/patches/server/0005-Fix-gravity-block-duper.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix gravity block duper
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ec3f1227ad3cd1469258cabe9a36caaf605151d9..39a65a784c9051d183a62291c01240034c86dd70 100644
+index ca82b601e99a64038e71b051510f6d1cc57b2f8f..8a30a18a24986f0c54483f69410e5dace4e4ca38 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -519,36 +519,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -531,36 +531,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          return chunkMap.playerEntityTrackerTrackMaps[type.ordinal()].getObjectsInRange(MCUtil.getCoordinateKey(this));
      }
      // Paper end - optimise entity tracking
@@ -46,7 +46,7 @@ index ec3f1227ad3cd1469258cabe9a36caaf605151d9..39a65a784c9051d183a62291c0124003
  
      public Entity(EntityType<?> type, Level world) {
          this.id = Entity.ENTITY_COUNTER.incrementAndGet();
-@@ -3073,7 +3045,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3086,7 +3058,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              }
  
              this.processPortalCooldown();
diff --git a/patches/server/0008-Fakeplayer-support.patch b/patches/server/0008-Fakeplayer-support.patch
index a890c57d..95cdaf29 100644
--- a/patches/server/0008-Fakeplayer-support.patch
+++ b/patches/server/0008-Fakeplayer-support.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fakeplayer support
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e8f3f007edb8ff68c9ce435efb2793beb3db18c6..621706945debe358ce2ee593b2aebd9a1608bd9c 100644
+index 2e7850a1e0da1f2978b585312aefb46bf0d039e9..fbda71a2c200ee3643f035c996c3082447af0bc7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -127,6 +127,7 @@ import net.minecraft.util.profiling.metrics.storage.MetricsPersister;
@@ -84,7 +84,7 @@ index 9d46536f80b5b3e6641fd377c02166a431edfd77..9b0b939d99b7baeb61aaef1d437ebfff
                  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 8547e7ff2f1f5b7701fb0f3c3010c14601a5f83e..014506532812a1723356191a72850000cb1d900d 100644
+index fff7ad7a45f310783ac96b44575ad3db13d537fa..c09c25b6594d4f6a937c6bbb80a75977940865dc 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -81,6 +81,7 @@ import net.minecraft.server.ServerScoreboard;
@@ -123,7 +123,7 @@ index 8547e7ff2f1f5b7701fb0f3c3010c14601a5f83e..014506532812a1723356191a72850000
          final net.kyori.adventure.text.Component jm = playerJoinEvent.joinMessage();
  
          if (jm != null && !jm.equals(net.kyori.adventure.text.Component.empty())) { // Paper - Adventure
-@@ -1086,11 +1101,16 @@ public abstract class PlayerList {
+@@ -1087,11 +1102,16 @@ public abstract class PlayerList {
      }
  
      public String[] getPlayerNamesArray() {
@@ -141,7 +141,7 @@ index 8547e7ff2f1f5b7701fb0f3c3010c14601a5f83e..014506532812a1723356191a72850000
  
          return astring;
      }
-@@ -1554,4 +1574,16 @@ public abstract class PlayerList {
+@@ -1555,4 +1575,16 @@ public abstract class PlayerList {
      public boolean isAllowCheatsForAllPlayers() {
          return this.allowCheatsForAllPlayers;
      }
@@ -209,7 +209,7 @@ index 706b354ac9a1a6a4a1e61b2a109180d1dd22bbbd..f13f21dbd50f63a71276837abbcf82e0
          FeatureFlagSet featureflagset = player.level().enabledFeatures();
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 733158b6f2c2bd03fbe798562ff7bc33280548dc..8075b31c0d34a37e1b73302298d22979279c87e9 100644
+index fc0dc8e607cc24020106ea1af92b4421a5f9393d..81670f76c4d7ccec6f9e95465687c83b37c544bd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -191,6 +191,8 @@ import org.bukkit.plugin.Plugin;
@@ -221,7 +221,7 @@ index 733158b6f2c2bd03fbe798562ff7bc33280548dc..8075b31c0d34a37e1b73302298d22979
  
  import net.md_5.bungee.api.chat.BaseComponent; // Spigot
  
-@@ -217,7 +219,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -226,7 +228,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          if (entity instanceof LivingEntity) {
              // Players
              if (entity instanceof net.minecraft.world.entity.player.Player) {
diff --git a/patches/server/0011-Add-isShrink-to-EntityResurrectEvent.patch b/patches/server/0011-Add-isShrink-to-EntityResurrectEvent.patch
index 8e67058d..018ccab0 100644
--- a/patches/server/0011-Add-isShrink-to-EntityResurrectEvent.patch
+++ b/patches/server/0011-Add-isShrink-to-EntityResurrectEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add isShrink to EntityResurrectEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index a189461330a4d427a7450d504ef13de3605497e3..c154e38b76ba303ec8d5b8503637e131a1508207 100644
+index 064bd3f2615009b3f15f3a5006f0b5f7a7ba6bf5..a8c0b64f86a64b33d3b262c2b3e8b2bc61a4e3dd 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1587,12 +1587,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -23,7 +23,7 @@ index a189461330a4d427a7450d504ef13de3605497e3..c154e38b76ba303ec8d5b8503637e131
                      itemstack1.shrink(1);
                  }
                  if (itemstack != null && this instanceof ServerPlayer) {
-@@ -4455,3 +4455,4 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -4461,3 +4461,4 @@ public abstract class LivingEntity extends Entity implements Attackable {
  
      }
  }
diff --git a/patches/server/0016-No-chat-sign.patch b/patches/server/0016-No-chat-sign.patch
index 98b8aa51..4d6227b2 100644
--- a/patches/server/0016-No-chat-sign.patch
+++ b/patches/server/0016-No-chat-sign.patch
@@ -123,10 +123,10 @@ index 3e3e11d4207172d6c24895cef6c7b5a0b09352ee..9e374eb89e28a5406784a38ec146ee31
  
      protected boolean convertOldUsers() {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d9c2d06ae24dcf80a497e75f4c7f63d401b77f9b..f130fb5f81cd29aa261fb15174732901b8fcdedf 100644
+index 2a609e43370e68943c580083f7f7d8c9b0972955..2aeda591a182896f50edff099b042357f1347a39 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2144,10 +2144,27 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2145,10 +2145,27 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
  
      @Override
      public void send(Packet<?> packet) {
@@ -155,10 +155,10 @@ index d9c2d06ae24dcf80a497e75f4c7f63d401b77f9b..f130fb5f81cd29aa261fb15174732901
          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 014506532812a1723356191a72850000cb1d900d..f1dca35923a6507bd1eeeb2ee57854e794e16c98 100644
+index c09c25b6594d4f6a937c6bbb80a75977940865dc..3088709b9dc3f46ec34f3ad16a43883feb89af16 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1450,7 +1450,7 @@ public abstract class PlayerList {
+@@ -1451,7 +1451,7 @@ public abstract class PlayerList {
      }
  
      public boolean verifyChatTrusted(PlayerChatMessage message) { // Paper - private -> public
diff --git a/patches/server/0021-Optimize-entity-coordinate-key.patch b/patches/server/0021-Optimize-entity-coordinate-key.patch
index 519c23e6..d8d1dbd3 100644
--- a/patches/server/0021-Optimize-entity-coordinate-key.patch
+++ b/patches/server/0021-Optimize-entity-coordinate-key.patch
@@ -25,10 +25,10 @@ index 2d11a67bdc82088abf0b3ca134f352f155c8eb1f..e664a86efd456ca1a2165940df7a984b
  
      public static long getCoordinateKey(final ChunkPos pair) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 39a65a784c9051d183a62291c01240034c86dd70..72b35cbd1840141c7654357c3c3bf446d4fb01d4 100644
+index 8a30a18a24986f0c54483f69410e5dace4e4ca38..e7a5e07deb24d6d9ad0b4aa92fc0bef3249d0845 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -294,7 +294,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -306,7 +306,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      public double yo;
      public double zo;
      private Vec3 position;
diff --git a/patches/server/0030-Config-to-disable-method-profiler.patch b/patches/server/0030-Config-to-disable-method-profiler.patch
index 7295be37..1b972122 100644
--- a/patches/server/0030-Config-to-disable-method-profiler.patch
+++ b/patches/server/0030-Config-to-disable-method-profiler.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Config to disable method profiler
 This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 621706945debe358ce2ee593b2aebd9a1608bd9c..3332066fc16ec9f11fe35cfc3ea077723de2e110 100644
+index fbda71a2c200ee3643f035c996c3082447af0bc7..34c86a70cab204e46c99f714c497c4bc1028196d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2263,6 +2263,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2275,6 +2275,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public ProfilerFiller getProfiler() {
diff --git a/patches/server/0032-Reduce-entity-allocations.patch b/patches/server/0032-Reduce-entity-allocations.patch
index e6bad3eb..b87be1b2 100644
--- a/patches/server/0032-Reduce-entity-allocations.patch
+++ b/patches/server/0032-Reduce-entity-allocations.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Reduce entity allocations
 This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 72b35cbd1840141c7654357c3c3bf446d4fb01d4..c1920e8d571a71cdd9fa18f26d16aabc43f5a88f 100644
+index e7a5e07deb24d6d9ad0b4aa92fc0bef3249d0845..914fa28793005c976a87e643325188f0e89f8b42 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -422,6 +422,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -434,6 +434,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          return this.originWorld;
      }
      // Paper end
diff --git a/patches/server/0035-Remove-streams-from-getting-nearby-players.patch b/patches/server/0035-Remove-streams-from-getting-nearby-players.patch
index 4defacf3..e25c61dc 100644
--- a/patches/server/0035-Remove-streams-from-getting-nearby-players.patch
+++ b/patches/server/0035-Remove-streams-from-getting-nearby-players.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Remove streams from getting nearby players
 This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c1920e8d571a71cdd9fa18f26d16aabc43f5a88f..9f11a60c1856e474227624118d0362aa22af6c2d 100644
+index 914fa28793005c976a87e643325188f0e89f8b42..93fd2397d977b30b56820fff71c01ac1d54d129d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -498,25 +498,50 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -510,25 +510,50 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          this.isLegacyTrackingEntity = isLegacyTrackingEntity;
      }
  
diff --git a/patches/server/0040-Reduce-entity-fluid-lookups-if-no-fluids.patch b/patches/server/0040-Reduce-entity-fluid-lookups-if-no-fluids.patch
index f2455bae..d7b733f4 100644
--- a/patches/server/0040-Reduce-entity-fluid-lookups-if-no-fluids.patch
+++ b/patches/server/0040-Reduce-entity-fluid-lookups-if-no-fluids.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Reduce entity fluid lookups if no fluids
 This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 9f11a60c1856e474227624118d0362aa22af6c2d..185b7686643a5c26c517e16135ead0124ff4ee37 100644
+index 93fd2397d977b30b56820fff71c01ac1d54d129d..6addc14f1c6366da14662c445bc90d3017e7ac72 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4299,16 +4299,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4312,16 +4312,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tag, double speed) {
@@ -35,7 +35,7 @@ index 9f11a60c1856e474227624118d0362aa22af6c2d..185b7686643a5c26c517e16135ead012
              double d1 = 0.0D;
              boolean flag = this.isPushedByFluid();
              boolean flag1 = false;
-@@ -4316,38 +4318,123 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4329,38 +4331,123 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              int k1 = 0;
              BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();
  
diff --git a/patches/server/0043-PCA-sync-protocol.patch b/patches/server/0043-PCA-sync-protocol.patch
index 13019229..363c7f3b 100644
--- a/patches/server/0043-PCA-sync-protocol.patch
+++ b/patches/server/0043-PCA-sync-protocol.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] PCA sync protocol
 This patch is Powered by plusls-carpet-addition(https://github.com/plusls/plusls-carpet-addition)
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f130fb5f81cd29aa261fb15174732901b8fcdedf..0d19bbd8219508db5ce62851c31be8254c7ec417 100644
+index 2aeda591a182896f50edff099b042357f1347a39..adae87a679f8bd6d42d472b56cdc0a7806bc9910 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -245,6 +245,7 @@ import org.bukkit.inventory.CraftingInventory;
@@ -17,7 +17,7 @@ index f130fb5f81cd29aa261fb15174732901b8fcdedf..0d19bbd8219508db5ce62851c31be825
  // CraftBukkit end
  
  public class ServerGamePacketListenerImpl implements ServerPlayerConnection, TickablePacketListener, ServerGamePacketListener {
-@@ -3547,6 +3548,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3548,6 +3549,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                  this.disconnect("Invalid payload UNREGISTER!", org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PAYLOAD); // Paper - kick event cause
              }
          } else {
@@ -35,7 +35,7 @@ index f130fb5f81cd29aa261fb15174732901b8fcdedf..0d19bbd8219508db5ce62851c31be825
                  byte[] data = new byte[packet.data.readableBytes()];
                  packet.data.readBytes(data);
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index f1dca35923a6507bd1eeeb2ee57854e794e16c98..23a20843ef15f10db15f6bba8574149d3978208e 100644
+index 3088709b9dc3f46ec34f3ad16a43883feb89af16..160b58c31ab420ebd7bdc57b87e4dbb1d28e0ef3 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -356,6 +356,7 @@ public abstract class PlayerList {
@@ -343,10 +343,10 @@ index b7686fd63b7c5d88c3a12ec4ee9bc01a17f997e0..25a9c38c60d183bb65b14f4d7550ab98
      public int[] getSlotsForFace(Direction side) {
          return ShulkerBoxBlockEntity.SLOTS;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8bbd7539cbd70201bf75ad80cf199b99e5cbd47a..589ead0bc80f4b778fea790c0537003fb79518f1 100644
+index 7623ebe3bfc508183f67b84e1f1815697ed98ba8..c7f113730842f643b5c764d32e8c30d6df73648d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -392,6 +392,7 @@ public final class CraftServer implements Server {
+@@ -462,6 +462,7 @@ public final class CraftServer implements Server {
              MapPalette.setMapColorCache(new CraftMapColorCache(this.logger));
          }
          datapackManager = new io.papermc.paper.datapack.PaperDatapackManager(console.getPackRepository()); // Paper
@@ -354,7 +354,7 @@ index 8bbd7539cbd70201bf75ad80cf199b99e5cbd47a..589ead0bc80f4b778fea790c0537003f
      }
  
      public boolean getCommandBlockOverride(String command) {
-@@ -984,6 +985,13 @@ public final class CraftServer implements Server {
+@@ -1054,6 +1055,13 @@ public final class CraftServer implements Server {
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
          this.console.paperConfigurations.reloadConfigs(this.console);
  		top.leavesmc.leaves.LeavesConfig.init((File) console.options.valueOf("leaves-settings")); // Leaves - Server Config
diff --git a/patches/server/0044-BBOR-Protocol.patch b/patches/server/0044-BBOR-Protocol.patch
index 2bae1041..d922abbe 100644
--- a/patches/server/0044-BBOR-Protocol.patch
+++ b/patches/server/0044-BBOR-Protocol.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] BBOR Protocol
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 3332066fc16ec9f11fe35cfc3ea077723de2e110..28dea3a47773ea65d92eb427632603d965c03f2c 100644
+index 34c86a70cab204e46c99f714c497c4bc1028196d..e8dcbd9b8bc3e5d456da4499b151c51fc474c4a8 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1587,6 +1587,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1599,6 +1599,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
          this.profiler.popPush("server gui refresh");
  
@@ -18,10 +18,10 @@ index 3332066fc16ec9f11fe35cfc3ea077723de2e110..28dea3a47773ea65d92eb427632603d9
          for (int i = 0; i < this.tickables.size(); ++i) {
              ((Runnable) this.tickables.get(i)).run();
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 0d19bbd8219508db5ce62851c31be8254c7ec417..b06ce9fe26cfec83e4f0509b72f2499da42e6970 100644
+index adae87a679f8bd6d42d472b56cdc0a7806bc9910..551da6f66a319a62c800ea899d27ae7783269136 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3553,6 +3553,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3554,6 +3554,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                  if (top.leavesmc.leaves.LeavesConfig.pcaSyncProtocol && ProtocolUtils.isNamespacePacket(packet, top.leavesmc.leaves.protocol.PcaSyncProtocol.PROTOCOL_ID)) {
                      top.leavesmc.leaves.protocol.PcaSyncProtocol.handlePacket(server, player, packet);
                  }
@@ -32,7 +32,7 @@ index 0d19bbd8219508db5ce62851c31be8254c7ec417..b06ce9fe26cfec83e4f0509b72f2499d
                  ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex);
                  this.disconnect("Invalid custom payload!", org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PAYLOAD);
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 23a20843ef15f10db15f6bba8574149d3978208e..0a75f88b9f00a78cce117d73813498aeca920e6c 100644
+index 160b58c31ab420ebd7bdc57b87e4dbb1d28e0ef3..666d7e33a26bc973fa87561503f032ec7f61bd0b 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -357,6 +357,7 @@ public abstract class PlayerList {
@@ -51,7 +51,7 @@ index 23a20843ef15f10db15f6bba8574149d3978208e..0a75f88b9f00a78cce117d73813498ae
          // Paper end
          ServerLevel worldserver = entityplayer.serverLevel();
  
-@@ -1569,7 +1571,7 @@ public abstract class PlayerList {
+@@ -1570,7 +1572,7 @@ public abstract class PlayerList {
              entityplayer.connection.send(packetplayoutrecipeupdate);
              entityplayer.getRecipeBook().sendInitialRecipeBook(entityplayer);
          }
@@ -77,10 +77,10 @@ index cc224af0139a6e3adefd22cbfa0cd519735b7191..2c3ca05644bc97d505e8ca92e7a5f486
  
      public Level getLevel() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 589ead0bc80f4b778fea790c0537003fb79518f1..89c6141f0568a30b92ec2ba94f635e675f0c61e2 100644
+index c7f113730842f643b5c764d32e8c30d6df73648d..2ef8eac38e5136defacc8904480a21d2bd20b325 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -992,6 +992,13 @@ public final class CraftServer implements Server {
+@@ -1062,6 +1062,13 @@ public final class CraftServer implements Server {
              top.leavesmc.leaves.protocol.PcaSyncProtocol.disablePcaSyncProtocolGlobal();
          }
          // Leaves end - pca
diff --git a/patches/server/0047-Jade-Protocol.patch b/patches/server/0047-Jade-Protocol.patch
index c20e44e5..243c10f7 100644
--- a/patches/server/0047-Jade-Protocol.patch
+++ b/patches/server/0047-Jade-Protocol.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Jade Protocol
 This patch is Powered by Jade(https://github.com/Snownee/Jade)
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b06ce9fe26cfec83e4f0509b72f2499da42e6970..f67f3a1e007ba4d26cb6d12e9aa6893781377071 100644
+index 551da6f66a319a62c800ea899d27ae7783269136..0acb073649a286f9756974e941aa5da7ed09ed0d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3556,6 +3556,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3557,6 +3557,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                  if (top.leavesmc.leaves.LeavesConfig.bborProtocol && packet.identifier.equals(top.leavesmc.leaves.protocol.BBORProtocol.SUBSCRIBE)) {
                      top.leavesmc.leaves.protocol.BBORProtocol.onPlayerSubscribed(player);
                  }
@@ -20,7 +20,7 @@ index b06ce9fe26cfec83e4f0509b72f2499da42e6970..f67f3a1e007ba4d26cb6d12e9aa68937
                  ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex);
                  this.disconnect("Invalid custom payload!", org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PAYLOAD);
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 0a75f88b9f00a78cce117d73813498aeca920e6c..afae0101fe5e71ee4d8b168312c025d5b9465552 100644
+index 666d7e33a26bc973fa87561503f032ec7f61bd0b..52b7d704f1a13e215da586a45da9c554f40f3d86 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -358,6 +358,7 @@ public abstract class PlayerList {
@@ -45,10 +45,10 @@ index 4aeab90e778629c355189dfe79c39c4b21f5f5ac..fe8c9b7e7956837829b4fe3eb449b2c0
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 89c6141f0568a30b92ec2ba94f635e675f0c61e2..d47361166231c5ae3b93ab159632ab77bd35bc64 100644
+index 2ef8eac38e5136defacc8904480a21d2bd20b325..69868f675624ad3b2c4742572a2b2c4970956147 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -393,6 +393,7 @@ public final class CraftServer implements Server {
+@@ -463,6 +463,7 @@ public final class CraftServer implements Server {
          }
          datapackManager = new io.papermc.paper.datapack.PaperDatapackManager(console.getPackRepository()); // Paper
          top.leavesmc.leaves.protocol.PcaSyncProtocol.init(); // Leaves - pca
@@ -56,7 +56,7 @@ index 89c6141f0568a30b92ec2ba94f635e675f0c61e2..d47361166231c5ae3b93ab159632ab77
      }
  
      public boolean getCommandBlockOverride(String command) {
-@@ -999,6 +1000,11 @@ public final class CraftServer implements Server {
+@@ -1069,6 +1070,11 @@ public final class CraftServer implements Server {
              top.leavesmc.leaves.protocol.BBORProtocol.loggedOutAllPlayer();
          }
          // Leaves end - bbor
diff --git a/patches/server/0053-MC-Technical-Survival-Mode.patch b/patches/server/0053-MC-Technical-Survival-Mode.patch
index b21c76b2..74a23587 100644
--- a/patches/server/0053-MC-Technical-Survival-Mode.patch
+++ b/patches/server/0053-MC-Technical-Survival-Mode.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] MC Technical Survival Mode
 Will automatically overwrite some configuration after startup
 
 diff --git a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
-index f6b9d216c24d8858802f85209fe1a869e5a9be31..fc8b373df2a8c9e54e1e80b88f87e3411f4cdb5f 100644
+index ad2177cdbc61a6f41c7e2ed81af262d4ffe7d861..4a0da4436998fc21506996216bd9c094806eb6c9 100644
 --- a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
 +++ b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
-@@ -292,6 +292,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
+@@ -293,6 +293,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
              for (ServerLevel level : server.getAllLevels()) {
                  this.createWorldConfig(createWorldContextMap(level), reloader(this.worldConfigClass, level.paperConfig()));
              }
@@ -70,7 +70,7 @@ index c767257b56acbe2cde391f405c010f5b2f62a17c..4327ec0948fb82939272f2dc1bbde8b1
                          entity.spawnReason == org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.CHUNK_GEN)) {
                      continue;
 diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
-index 77513f66b5d595a3ada956eaaa22fdbf9318f153..2717bd11e449fbc38e886ff7f70b71e55d703e52 100644
+index d92c00454200684b3b27e74d2b53f4eb2e30851a..82277d55e8aa3fb71832192696f97c65341b2016 100644
 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 @@ -2,6 +2,7 @@ package top.leavesmc.leaves;
diff --git a/patches/server/0054-Return-nether-portal-fix.patch b/patches/server/0054-Return-nether-portal-fix.patch
index 951e6600..66e9c8ba 100644
--- a/patches/server/0054-Return-nether-portal-fix.patch
+++ b/patches/server/0054-Return-nether-portal-fix.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Return nether portal fix
 This patch is powered by NetherPortalFix(https://github.com/TwelveIterationMods/NetherPortalFix)
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index afcc518ff50066e846e9b1a79cb99dc25cac4f24..90b6d5e4495526dd8d623443ae8cc3c0ee072734 100644
+index ac1b3ca7a7e0f2563e194650d4df8579abc2569f..246afa286ae66788c45b6c58108ff200bbb92f6b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -186,6 +186,7 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
@@ -74,7 +74,7 @@ index afcc518ff50066e846e9b1a79cb99dc25cac4f24..90b6d5e4495526dd8d623443ae8cc3c0
              return optional;
          } else {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 2bf4e66354f6c4be533e2ff40a767796495c5b14..5c8fa90a620cad3325b772cca3c5ff374737e7d6 100644
+index 52b7d704f1a13e215da586a45da9c554f40f3d86..3994583f24bd558e7b0f7649e27fcea79da32026 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -27,6 +27,8 @@ import java.util.UUID;
@@ -95,7 +95,7 @@ index 2bf4e66354f6c4be533e2ff40a767796495c5b14..5c8fa90a620cad3325b772cca3c5ff37
  public abstract class PlayerList {
  
      public static final File USERBANLIST_FILE = new File("banned-players.json");
-@@ -982,6 +986,24 @@ public abstract class PlayerList {
+@@ -983,6 +987,24 @@ public abstract class PlayerList {
          if (fromWorld != location.getWorld()) {
              PlayerChangedWorldEvent event = new PlayerChangedWorldEvent(entityplayer.getBukkitEntity(), fromWorld);
              server.server.getPluginManager().callEvent(event);
@@ -121,7 +121,7 @@ index 2bf4e66354f6c4be533e2ff40a767796495c5b14..5c8fa90a620cad3325b772cca3c5ff37
  
          // Save player file again if they were disconnected
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index b391fa45df30aa29b58a5aaa2159683314841f90..1a30fab8e52c3b14ae1ba908d7b33873d34ec0f3 100644
+index 92bca97b2c72c8fb58b8c950cf7a775bc675ca55..1a21eb3db3c25b76fdc3f1c568bc57fc2d96cbf1 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -243,7 +243,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0055-Appleskin-Protocol.patch b/patches/server/0055-Appleskin-Protocol.patch
index 3f910cdd..50c2967d 100644
--- a/patches/server/0055-Appleskin-Protocol.patch
+++ b/patches/server/0055-Appleskin-Protocol.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Appleskin Protocol
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 28dea3a47773ea65d92eb427632603d965c03f2c..3b6b2a380b6083b24481812a90fb58becf8d5a1d 100644
+index e8dcbd9b8bc3e5d456da4499b151c51fc474c4a8..3cc3df2d6bbccbd8c477975469a0beadb9ea0c5a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1588,6 +1588,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1600,6 +1600,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.profiler.popPush("server gui refresh");
  
          top.leavesmc.leaves.protocol.BBORProtocol.tick(); // Leaves - bbor
@@ -17,7 +17,7 @@ index 28dea3a47773ea65d92eb427632603d965c03f2c..3b6b2a380b6083b24481812a90fb58be
          MinecraftTimings.tickablesTimer.startTiming(); // Spigot // Paper
          for (int i = 0; i < this.tickables.size(); ++i) {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index e0927206ab4b28ead4ed8eb095695066df384fb6..39e6206a36b2c10764b232cd079fd7b03c0eba3e 100644
+index 3994583f24bd558e7b0f7649e27fcea79da32026..dc1c9c106593aed9ede4ea4a09dc085c89758cde 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -363,6 +363,7 @@ public abstract class PlayerList {
@@ -37,10 +37,10 @@ index e0927206ab4b28ead4ed8eb095695066df384fb6..39e6206a36b2c10764b232cd079fd7b0
          ServerLevel worldserver = entityplayer.serverLevel();
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d47361166231c5ae3b93ab159632ab77bd35bc64..29309971e6e985586cbe68722efe0f2ef9bba528 100644
+index 69868f675624ad3b2c4742572a2b2c4970956147..25681269cc05644c04066bfa8b220af68fecf0a2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1005,6 +1005,13 @@ public final class CraftServer implements Server {
+@@ -1075,6 +1075,13 @@ public final class CraftServer implements Server {
              top.leavesmc.leaves.protocol.JadeProtocol.enableAllPlayer();
          }
          // Leaves end - Jade
diff --git a/patches/server/0056-Xaero-Map-Protocol.patch b/patches/server/0056-Xaero-Map-Protocol.patch
index f4ac795f..46f01c10 100644
--- a/patches/server/0056-Xaero-Map-Protocol.patch
+++ b/patches/server/0056-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 b3315ba92466871fb511980c0348aad80bf5742f..da0e91967fb3b303fa5c3b4cf651fbb28ecf31b8 100644
+index dc1c9c106593aed9ede4ea4a09dc085c89758cde..6c19d9b64830efe4b9d6f17d8ca92f88ad3475d5 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1295,6 +1295,7 @@ public abstract class PlayerList {
+@@ -1296,6 +1296,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/0058-Use-vanilla-random-config.patch b/patches/server/0058-Use-vanilla-random-config.patch
index ebe01d1d..e9d65014 100644
--- a/patches/server/0058-Use-vanilla-random-config.patch
+++ b/patches/server/0058-Use-vanilla-random-config.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Use vanilla random config
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 185b7686643a5c26c517e16135ead0124ff4ee37..593171268f3f3f7cd511b07c2bdef173dc04c1a1 100644
+index 6addc14f1c6366da14662c445bc90d3017e7ac72..9d785bffce91ff709492e24981f8caaa4e7edf0f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -556,7 +556,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -568,7 +568,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          this.bb = Entity.INITIAL_AABB;
          this.stuckSpeedMultiplier = Vec3.ZERO;
          this.nextStep = 1.0F;
diff --git a/patches/server/0059-Fix-update-suppression-crash.patch b/patches/server/0059-Fix-update-suppression-crash.patch
index 6ef9e5c4..5a54dd3f 100644
--- a/patches/server/0059-Fix-update-suppression-crash.patch
+++ b/patches/server/0059-Fix-update-suppression-crash.patch
@@ -20,10 +20,10 @@ index d2f0a0755317f5fa9a1ccf7db346aa77fd287d80..9c7fb1b7c2ff458e72bdcfa80c49252c
                          if (listener.shouldPropagateHandlingExceptions()) {
                              throw exception;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 3b6b2a380b6083b24481812a90fb58becf8d5a1d..d8ba7dfca4eda1d0445c9e297d00a692f4c4ddf3 100644
+index 3cc3df2d6bbccbd8c477975469a0beadb9ea0c5a..72276c66be7ff55fcb28157a77c4ce43c9773aff 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1545,7 +1545,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1557,7 +1557,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
              try {
                  worldserver.timings.doTick.startTiming(); // Spigot
diff --git a/patches/server/0060-Bedrock-break-list.patch b/patches/server/0060-Bedrock-break-list.patch
index 5c50a821..9a6d438d 100644
--- a/patches/server/0060-Bedrock-break-list.patch
+++ b/patches/server/0060-Bedrock-break-list.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Bedrock break list
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e5ac1560a06a80d502b1a39ff75c6fbb9cf5e3f8..e75ba1ce5933450ec69f953fcbebea1b341e6327 100644
+index 72276c66be7ff55fcb28157a77c4ce43c9773aff..b2d381deef64b60ffe7fd4030c8f30c4d40c20aa 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1595,6 +1595,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1607,6 +1607,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
          top.leavesmc.leaves.protocol.BBORProtocol.tick(); // Leaves - bbor
          top.leavesmc.leaves.protocol.AppleSkinProtocol.tick(); // Leaves - appleskin
diff --git a/patches/server/0061-Syncmatica-Protocol.patch b/patches/server/0061-Syncmatica-Protocol.patch
index 247646c9..b2dff631 100644
--- a/patches/server/0061-Syncmatica-Protocol.patch
+++ b/patches/server/0061-Syncmatica-Protocol.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Syncmatica Protocol
 This patch is Powered by Syncmatica(https://github.com/End-Tech/syncmatica)
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f67f3a1e007ba4d26cb6d12e9aa6893781377071..35c04ddb8cacf54ff9d7a2181d44084e0df42ae7 100644
+index 0acb073649a286f9756974e941aa5da7ed09ed0d..b616b819a1434fe76a6fa36e70cdc1c22dc70876 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -322,6 +322,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -31,7 +31,7 @@ index f67f3a1e007ba4d26cb6d12e9aa6893781377071..35c04ddb8cacf54ff9d7a2181d44084e
      @Override
      public void tick() {
          if (this.ackBlockChangesUpTo > -1) {
-@@ -2110,6 +2118,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2111,6 +2119,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
              this.processedDisconnect = true;
          }
          // CraftBukkit end
@@ -43,7 +43,7 @@ index f67f3a1e007ba4d26cb6d12e9aa6893781377071..35c04ddb8cacf54ff9d7a2181d44084e
          this.chatMessageChain.close();
          ServerGamePacketListenerImpl.LOGGER.info("{} lost connection: {}", this.player.getName().getString(), reason.getString());
          // CraftBukkit start - Replace vanilla quit message handling with our own.
-@@ -3559,6 +3572,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3560,6 +3573,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                  if (top.leavesmc.leaves.LeavesConfig.jadeProtocol && ProtocolUtils.isNamespacePacket(packet, top.leavesmc.leaves.protocol.JadeProtocol.PROTOCOL_ID)) {
                      top.leavesmc.leaves.protocol.JadeProtocol.handlePacket(server, player, packet);
                  }
@@ -54,7 +54,7 @@ index f67f3a1e007ba4d26cb6d12e9aa6893781377071..35c04ddb8cacf54ff9d7a2181d44084e
                  ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex);
                  this.disconnect("Invalid custom payload!", org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PAYLOAD);
 diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
-index e520c2e95620db70f9b1881188cb05fcf7ca18e4..6bc585e44105ec939132a0e06e1f429bb8ae126a 100644
+index 86ab00d8b17e6fb5c79b11a4d1b0abe5765e67fe..55d18ef11eacbb6ba0de9a6a6f8ca79a84bac8ce 100644
 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 @@ -13,6 +13,7 @@ import org.bukkit.configuration.file.YamlConfiguration;
diff --git a/patches/server/0068-Disable-check-out-of-order-command.patch b/patches/server/0068-Disable-check-out-of-order-command.patch
index b42d6bfe..aac0db77 100644
--- a/patches/server/0068-Disable-check-out-of-order-command.patch
+++ b/patches/server/0068-Disable-check-out-of-order-command.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Disable check out-of-order command
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 0cc4bd960383759abeabe20c52e9af84228527a1..cfba0e8f527265099679096d1764602a148518aa 100644
+index 4e9ff7a4f2c2283b1f299ad4c23323725ca9a800..9ad3dbb4b376b04ddc9729bf46185d9aafa45891 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2360,7 +2360,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2361,7 +2361,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
      }
  
      private Optional<LastSeenMessages> tryHandleChat(String message, Instant timestamp, LastSeenMessages.Update acknowledgment) {