diff --git a/gradle.properties b/gradle.properties
index 7b2493f7..4502e892 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,6 +4,6 @@ version=1.20.4-R0.1-SNAPSHOT
 mcVersion=1.20.4
 packageVersion=1_20_R3
 org.gradle.jvmargs=-Xmx2G
-paperRef=62b220a87f6991c33423346e5f50e64058e7bdd9
+paperRef=88419b207579533646ab011da886030ea9ea4862
 preVersion=false
 updatingMinecraft=false
\ No newline at end of file
diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch
index 93554ea8..06ec3fa7 100644
--- a/patches/server/0001-Build-changes.patch
+++ b/patches/server/0001-Build-changes.patch
@@ -153,10 +153,10 @@ index 4b002e8b75d117b726b0de274a76d3596fce015b..9ce4d3d96d2d5fbde1f0af599209c6c5
      }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d06185566b447c432d4dc2e3ba04d121bcdbc71b..41ae5cccc1388c27a88ab9d142d3e4834c5ab97d 100644
+index 93b661e9cb7743aeff7da3972942cb73049a5e4c..ef44b6dcff8bd67ccadeaae70af163d159a1c562 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1855,7 +1855,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1865,7 +1865,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @DontObfuscate
      public String getServerModName() {
@@ -183,7 +183,7 @@ index 68d268b6fff126e8645b6deec3fb549ea2286b77..1363d76e5546d1bb57f06fceb57196da
          this.setFlightAllowed(dedicatedserverproperties.allowFlight);
          this.setMotd(dedicatedserverproperties.motd);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9f7ed337463cc9bb370a5541d9de5cd8f9c1a78a..b5af2a4608a5871916fe28fff3b040ad7528cfdf 100644
+index c490a29bcf7410bc54959ee71375605964379ed5..367975d5e0c9846e5ce6d9cbdc3a977c8ab26b97 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -266,7 +266,7 @@ import javax.annotation.Nullable; // Paper
@@ -196,7 +196,7 @@ index 9f7ed337463cc9bb370a5541d9de5cd8f9c1a78a..b5af2a4608a5871916fe28fff3b040ad
      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 ce341f42b3a5e17fb6d1f7de8057e73137ae2a6e..3825ba1695ea618fa7470281be5392a847d2dfd8 100644
+index 8d626fadcd4743b6472a2954d2b1b2ec89669814..ea26b89c056b0329d3f0925b023e4bd526ee8efa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -301,7 +301,7 @@ public class Main {
diff --git a/patches/server/0002-Delete-Timings.patch b/patches/server/0002-Delete-Timings.patch
index 5e4d7c85..5cb394ac 100644
--- a/patches/server/0002-Delete-Timings.patch
+++ b/patches/server/0002-Delete-Timings.patch
@@ -779,7 +779,7 @@ index b66a7d4aab887309579154815a0d4abf9de506b0..e4d3f280b35d977f28233b1db1dc855c
          }
  
 diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index b53b6cc4463675096b061b3b65f14a4695c742e2..510b82c3ab8dd04abf50d67892c4e8795f0d2cd1 100644
+index f2e30d8743a97c0541808dc5c03300c0d881b843..77b76c56ceac9ee797e74ffa2eec07a9d987e7bc 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 @@ -1,6 +1,5 @@
@@ -789,7 +789,7 @@ index b53b6cc4463675096b061b3b65f14a4695c742e2..510b82c3ab8dd04abf50d67892c4e879
  import com.mojang.logging.LogUtils;
  import io.papermc.paper.configuration.constraint.Constraints;
  import io.papermc.paper.configuration.type.number.IntOr;
-@@ -109,7 +108,6 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -110,7 +109,6 @@ public class GlobalConfiguration extends ConfigurationPart {
  
          @PostProcess
          private void postProcess() {
@@ -856,7 +856,7 @@ index 3e2d5dcd62775b6ed7c0ce0ba51a71b635b1d644..d0a487f0d563181818c5670749e8dd3a
                      } catch (Exception exception) {
                          label25:
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 41ae5cccc1388c27a88ab9d142d3e4834c5ab97d..61e0e14b74c6585a9d157cae3db9c5c3a69b393f 100644
+index ef44b6dcff8bd67ccadeaae70af163d159a1c562..218cceb9f8f56a2e48718ca8db2101caad803ffb 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -3,9 +3,6 @@ package net.minecraft.server;
@@ -886,7 +886,7 @@ index 41ae5cccc1388c27a88ab9d142d3e4834c5ab97d..61e0e14b74c6585a9d157cae3db9c5c3
          // CraftBukkit start
          if (this.server != null) {
              this.server.disablePlugins();
-@@ -1396,34 +1390,29 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1406,34 +1400,29 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              return;
          }
  
@@ -940,7 +940,7 @@ index 41ae5cccc1388c27a88ab9d142d3e4834c5ab97d..61e0e14b74c6585a9d157cae3db9c5c3
          }
      }
      // Paper end - execute chunk tasks mid tick
-@@ -1498,15 +1487,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1508,15 +1497,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public void tickServer(BooleanSupplier shouldKeepTicking) {
@@ -958,7 +958,7 @@ index 41ae5cccc1388c27a88ab9d142d3e4834c5ab97d..61e0e14b74c6585a9d157cae3db9c5c3
          // Paper end
          new com.destroystokyo.paper.event.server.ServerTickStartEvent(this.tickCount+1).callEvent(); // Paper - Server Tick Events
  
-@@ -1543,9 +1531,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1553,9 +1541,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          // Paper end - Incremental chunk and player saving
          io.papermc.paper.util.CachedLists.reset(); // Paper
          // Paper start - move executeAll() into full server tick timing
@@ -969,7 +969,7 @@ index 41ae5cccc1388c27a88ab9d142d3e4834c5ab97d..61e0e14b74c6585a9d157cae3db9c5c3
          // Paper end
          // Paper start - Server Tick Events
          long endTime = System.nanoTime();
-@@ -1570,7 +1556,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1580,7 +1566,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.logTickTime(l - i);
          this.profiler.pop();
          org.spigotmc.WatchdogThread.tick(); // Spigot
@@ -977,7 +977,7 @@ index 41ae5cccc1388c27a88ab9d142d3e4834c5ab97d..61e0e14b74c6585a9d157cae3db9c5c3
      }
  
      private int computeNextAutosaveInterval() {
-@@ -1632,9 +1617,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1642,9 +1627,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.getPlayerList().getPlayers().forEach((entityplayer) -> {
              entityplayer.connection.suspendFlushing();
          });
@@ -987,7 +987,7 @@ index 41ae5cccc1388c27a88ab9d142d3e4834c5ab97d..61e0e14b74c6585a9d157cae3db9c5c3
          // Paper start - Folia scheduler API
          ((io.papermc.paper.threadedregions.scheduler.FoliaGlobalRegionScheduler) Bukkit.getGlobalRegionScheduler()).tick();
          getAllLevels().forEach(level -> {
-@@ -1651,21 +1634,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1661,21 +1644,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          // Paper end - Folia scheduler API
          io.papermc.paper.adventure.providers.ClickCallbackProviderImpl.CALLBACK_MANAGER.handleQueue(this.tickCount); // Paper
          this.profiler.push("commandFunctions");
@@ -1009,7 +1009,7 @@ index 41ae5cccc1388c27a88ab9d142d3e4834c5ab97d..61e0e14b74c6585a9d157cae3db9c5c3
          // Send time updates to everyone, it will get the right time from the world the player is in.
          // Paper start - Perf: Optimize time updates
          for (final ServerLevel level : this.getAllLevels()) {
-@@ -1685,7 +1663,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1695,7 +1673,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              }
          }
          // Paper end - Perf: Optimize time updates
@@ -1017,7 +1017,7 @@ index 41ae5cccc1388c27a88ab9d142d3e4834c5ab97d..61e0e14b74c6585a9d157cae3db9c5c3
  
          this.isIteratingOverLevels = true; // Paper - Throw exception on world create while being ticked
          Iterator iterator = this.getAllLevels().iterator(); // Paper - Throw exception on world create while being ticked; move down
-@@ -1710,14 +1687,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1720,14 +1697,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.profiler.push("tick");
  
              try {
@@ -1032,7 +1032,7 @@ index 41ae5cccc1388c27a88ab9d142d3e4834c5ab97d..61e0e14b74c6585a9d157cae3db9c5c3
              } catch (Throwable throwable) {
                  CrashReport crashreport = CrashReport.forThrowable(throwable, "Exception ticking world");
  
-@@ -1732,24 +1707,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1742,24 +1717,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.isIteratingOverLevels = false; // Paper - Throw exception on world create while being ticked
  
          this.profiler.popPush("connection");
@@ -1935,7 +1935,7 @@ index 6ec3fc801453fd54c25b642e6fa71c19b463311d..44b9aaa534a4683b2924a2aa61a92218
                  }
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 3825ba1695ea618fa7470281be5392a847d2dfd8..7a266257b1220098a6c829ccf1c597b7e510205a 100644
+index ea26b89c056b0329d3f0925b023e4bd526ee8efa..d993969b4e9920f7db2fec990d7d6568e68745ef 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -344,8 +344,8 @@ public class Main {
diff --git a/patches/server/0006-Leaves-Protocol-Core.patch b/patches/server/0006-Leaves-Protocol-Core.patch
index 3688f891..8a34b886 100644
--- a/patches/server/0006-Leaves-Protocol-Core.patch
+++ b/patches/server/0006-Leaves-Protocol-Core.patch
@@ -23,10 +23,10 @@ index af86f752c33a2990405fea058b7c41c437ba9d46..bada9fae1e7178162429e1f5a1608b9c
      }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 2cf51683978e72d552f9148a610704202d207df5..77e952a502bebfb31311b47ceed0b88118278d4a 100644
+index 9f3a57c0bb687fc867cede617fd95b2f001060e5..21a6a955dde5c13aeb466792b4bca786c2fec722 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1717,6 +1717,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1727,6 +1727,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
          this.profiler.popPush("server gui refresh");
  
@@ -77,7 +77,7 @@ index aa7eb1f037875293b03588f5bc5d2df70237b45e..62d89e49dfcbb00651df7f89be482b9c
          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 1824057ea9b7cf22e4fbb2251154bc415568b3e0..389e8d1f8c218649b622d2e6f24b05a14a1a1d45 100644
+index a50a52b53f66366b3c810bdc2cad22af47a01578..79874b67f7edb9afd41633f5bc4bacee5cb0046b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -465,6 +465,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0017-Fix-tripwire-update.patch b/patches/server/0017-Fix-tripwire-update.patch
index 26bf962c..2fe608c6 100644
--- a/patches/server/0017-Fix-tripwire-update.patch
+++ b/patches/server/0017-Fix-tripwire-update.patch
@@ -5,24 +5,17 @@ Subject: [PATCH] Fix tripwire update
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java b/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java
-index 7f2dcf6a9e69779e6f898284b58fb1e32902000c..32021323101396cd91ed0cf88603c0366032639b 100644
+index 8bf94fcf5c46ffe6d90f8431338b768ef1a2dd61..d9b3877257b31ca1b5acc4a47fbf5b993de69ae0 100644
 --- a/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java
-@@ -162,7 +162,7 @@ public class TripWireHookBlock extends Block {
-                     boolean flag7 = (Boolean) iblockdata2.getValue(TripWireBlock.POWERED);
+@@ -201,8 +201,9 @@ public class TripWireHookBlock extends Block {
+                     BlockState iblockdata4 = aiblockdata[l];
  
-                     flag5 |= flag6 && flag7;
--                    if (k != i || !tripWireBeingRemoved || !flag6) // Paper - fix tripwire state inconsistency; don't update the tripwire again if being removed and not disarmed
-+                    // if (k != i || !tripWireBeingRemoved || !flag6) // Paper - fix tripwire state inconsistency; don't update the tripwire again if being removed and not disarmed - Leaves - vanilla
-                     aiblockdata[k] = iblockdata2;
-                     if (k == i) {
-                         world.scheduleTick(pos, block, 10);
-@@ -195,7 +195,7 @@ public class TripWireHookBlock extends Block {
- 
-             TripWireHookBlock.emitState(world, pos, flag4, flag5, flag2, flag3);
-             if (!beingRemoved) { // Paper - fix tripwire state inconsistency
--                if (world.getBlockState(pos).getBlock() == Blocks.TRIPWIRE_HOOK) // Paper - Validate tripwire hook placement before update
-+                // if (world.getBlockState(pos).getBlock() == Blocks.TRIPWIRE_HOOK) // Paper - Validate tripwire hook placement before update - Leaves - vanilla
-                 world.setBlock(pos, (BlockState) iblockdata3.setValue(TripWireHookBlock.FACING, enumdirection), 3);
-                 if (flag1) {
-                     TripWireHookBlock.notifyNeighbors(block, world, pos, enumdirection);
+                     if (iblockdata4 != null) {
+-                        if (world.getBlockState(blockposition2).is(Blocks.TRIPWIRE)) { // Paper - Fix tripwire disarming not working as intended
+                         world.setBlock(blockposition2, (BlockState) iblockdata4.trySetValue(TripWireHookBlock.ATTACHED, flag4), 3);
++                        if (!world.getBlockState(blockposition2).isAir()) {
++                            ;
+                         }
+                     }
+                 }
diff --git a/patches/server/0027-Config-to-disable-method-profiler.patch b/patches/server/0027-Config-to-disable-method-profiler.patch
index 30871bfa..5a4c19ad 100644
--- a/patches/server/0027-Config-to-disable-method-profiler.patch
+++ b/patches/server/0027-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 91d82c02eb152e3565e52fc1e01ce37855a39bdd..e1ef234f54bc3335c11add788d41db10f2eb1e2d 100644
+index 76a9548becd0a1aeb8889f1e4060a2ac0f546682..e7ce8db1391f96ee648f72b0c8680a24569de334 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2417,6 +2417,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2427,6 +2427,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public ProfilerFiller getProfiler() {
diff --git a/patches/server/0037-PCA-sync-protocol.patch b/patches/server/0037-PCA-sync-protocol.patch
index 01474bf3..9295e529 100644
--- a/patches/server/0037-PCA-sync-protocol.patch
+++ b/patches/server/0037-PCA-sync-protocol.patch
@@ -103,7 +103,7 @@ index 416aa989ebb18a8741cc9d605a1180ab830f6643..213bc3c11ff4ed9bc761e8153aa669d1
      protected Component getDefaultName() {
          return Component.translatable("container.barrel");
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
-index 55b0e2bf98a285cdcd30e40d94192b7a1802efd8..8398c29f992db5070045dc7061e0b5def3d155ed 100644
+index d445ed0895293dd45c36226051f5809be8587ebe..160df5cedf5d04c8a8d5d5375a898edc123684ac 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
 @@ -4,6 +4,7 @@ import com.google.common.collect.Lists;
@@ -139,7 +139,7 @@ index 55b0e2bf98a285cdcd30e40d94192b7a1802efd8..8398c29f992db5070045dc7061e0b5de
              entity.discard(EntityRemoveEvent.Cause.ENTER_BLOCK); // CraftBukkit - add Bukkit remove cause
              super.setChanged();
          }
-@@ -338,6 +350,11 @@ public class BeehiveBlockEntity extends BlockEntity {
+@@ -344,6 +356,11 @@ public class BeehiveBlockEntity extends BlockEntity {
                  if (BeehiveBlockEntity.releaseOccupant(world, pos, state, tileentitybeehive_hivebee, (List) null, tileentitybeehive_releasestatus, flowerPos)) {
                      flag = true;
                      iterator.remove();
@@ -151,7 +151,7 @@ index 55b0e2bf98a285cdcd30e40d94192b7a1802efd8..8398c29f992db5070045dc7061e0b5de
                      // CraftBukkit start
                  } else {
                      tileentitybeehive_hivebee.exitTickCounter = tileentitybeehive_hivebee.minOccupationTicks / 2; // Not strictly Vanilla behaviour in cases where bees cannot spawn but still reasonable // Paper - Fix bees aging inside hives; use exitTickCounter to keep actual bee life
-@@ -389,6 +406,11 @@ public class BeehiveBlockEntity extends BlockEntity {
+@@ -395,6 +412,11 @@ public class BeehiveBlockEntity extends BlockEntity {
              this.maxBees = nbt.getInt("Bukkit.MaxEntities");
          }
          // CraftBukkit end
@@ -248,7 +248,7 @@ index 881379681c39230a00b3a1f11cd87498984396c7..e01eb2025458cf311348c58a15308540
      protected Component getDefaultName() {
          return Component.translatable("container.dispenser");
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
-index 757edf74751dc7183454656fda9cecc4eb601e4c..91b6dcb3e4fb8ae2c76084e93917fb9a89bb8beb 100644
+index cdb739df2a285032d25d84f4464f202a7a3fa578..cffc280655851e18439c9dfcb01ff69aab61e025 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
 @@ -130,6 +130,16 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
diff --git a/patches/server/0053-Fix-update-suppression-crash.patch b/patches/server/0053-Fix-update-suppression-crash.patch
index f1193de9..417a08b1 100644
--- a/patches/server/0053-Fix-update-suppression-crash.patch
+++ b/patches/server/0053-Fix-update-suppression-crash.patch
@@ -20,10 +20,10 @@ index d0a487f0d563181818c5670749e8dd3a9d939265..140a9070fb5859e762e40ddb1e4259f6
                          label25:
                          {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0e241a87f625b9cf952c59f9b0670d60563bdf06..b7f16c3e7b1427fb5a1d2b378a60a47eb9090b9e 100644
+index 943781aacddb859733dc69466b135a9b93717f2b..35433d438e7bcec89363f94ef3903b02b5d02987 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1691,7 +1691,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1701,7 +1701,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.profiler.push("tick");
  
              try {
diff --git a/patches/server/0054-Bedrock-break-list.patch b/patches/server/0054-Bedrock-break-list.patch
index cba90c58..3b5754b0 100644
--- a/patches/server/0054-Bedrock-break-list.patch
+++ b/patches/server/0054-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 b7f16c3e7b1427fb5a1d2b378a60a47eb9090b9e..693e3c15bd3bcba53d162c2cd2a742e29e4798f7 100644
+index 35433d438e7bcec89363f94ef3903b02b5d02987..1684ea38e395af6236e88ebaeb008526de9f1b4e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1727,6 +1727,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1737,6 +1737,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.profiler.popPush("server gui refresh");
  
          top.leavesmc.leaves.protocol.core.LeavesProtocolManager.handleTick(); // Leaves - protocol
diff --git a/patches/server/0087-Disable-packet-limit.patch b/patches/server/0087-Disable-packet-limit.patch
index c12f4fd6..711d2156 100644
--- a/patches/server/0087-Disable-packet-limit.patch
+++ b/patches/server/0087-Disable-packet-limit.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Disable packet limit
 
 
 diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index 510b82c3ab8dd04abf50d67892c4e8795f0d2cd1..6a571aae2173ff020989f6f510ae82449613ac4b 100644
+index 77b76c56ceac9ee797e74ffa2eec07a9d987e7bc..7d78454e890543de7c7ce0ef2c49aef84bd791c6 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-@@ -264,7 +264,7 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -265,7 +265,7 @@ public class GlobalConfiguration extends ConfigurationPart {
              }
  
              public boolean isEnabled() {
diff --git a/patches/server/0106-Replay-Mod-API.patch b/patches/server/0106-Replay-Mod-API.patch
index 6222f217..3c25f290 100644
--- a/patches/server/0106-Replay-Mod-API.patch
+++ b/patches/server/0106-Replay-Mod-API.patch
@@ -94,10 +94,10 @@ index 676a1499747b071515479130875157263d3a8352..e5ef298dc1df9cc42b3d349939a966b7
                              if (((List) object).size() >= i) {
                                  return (List) object;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 693e3c15bd3bcba53d162c2cd2a742e29e4798f7..0f904af56854b8b8da01220bbcca3e044c730848 100644
+index 1684ea38e395af6236e88ebaeb008526de9f1b4e..2cfdc70b62ff1e2ff0d333b22af1e68da2daf6dc 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1596,7 +1596,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1606,7 +1606,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      private ServerStatus.Players buildPlayerStatus() {