diff --git a/gradle.properties b/gradle.properties
index a8ea93d2..e559bd06 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,5 +4,5 @@ version=1.20.2-R0.1-SNAPSHOT
 mcVersion=1.20.2
 packageVersion=1_20_R2
 org.gradle.jvmargs=-Xmx2G
-paperRef=f6134370195d24e249237c89e54cb8d87f80164a
+paperRef=e57af7d01e509c747520cc1037169029256289bf
 preVersion=false
diff --git a/patches/api/0009-Force-peaceful-mode-switch.patch b/patches/api/0009-Force-peaceful-mode-switch.patch
index fe4d2e8d..c2c957ec 100644
--- a/patches/api/0009-Force-peaceful-mode-switch.patch
+++ b/patches/api/0009-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 da524a71af74b02515b037f7fe09ba6988e2c8bf..649a80fc7cb12c4d2fe2c472178b6ca3b16372f7 100644
+index 8d861f5522a33669f67b3e41dfbc5234637114b4..54fb966467cf2aa13bbc39b6360517ff6541980d 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -4016,6 +4016,12 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -4018,6 +4018,12 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
      @NotNull
      public Set<FeatureFlag> getFeatureFlags();
  
diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch
index 772c9070..61982d2b 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 c187641f0ec6444a10e0e1583e1697d07e8f0267..b54e07850c3eb8120a8d70d7b4192db7e5ac24a7 100644
+index a79461457ea19339f47572c70705d655ebc55276..e3ef85b9556b93453d6e4b07a3416ffa3f1029a0 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -13,8 +13,12 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
@@ -23,7 +23,7 @@ index c187641f0ec6444a10e0e1583e1697d07e8f0267..b54e07850c3eb8120a8d70d7b4192db7
      // Paper start
      implementation("org.jline:jline-terminal-jansi:3.21.0")
      implementation("net.minecrell:terminalconsoleappender:1.3.0")
-@@ -60,19 +64,29 @@ dependencies {
+@@ -58,19 +62,29 @@ dependencies {
  }
  
  val craftbukkitPackageVersion = "1_20_R2" // Paper
@@ -55,7 +55,7 @@ index c187641f0ec6444a10e0e1583e1697d07e8f0267..b54e07850c3eb8120a8d70d7b4192db7
              "Implementation-Vendor" to date, // Paper
              "Specification-Title" to "Bukkit",
              "Specification-Version" to project.version,
-@@ -156,7 +170,7 @@ fun TaskContainer.registerRunTask(
+@@ -154,7 +168,7 @@ fun TaskContainer.registerRunTask(
      name: String,
      block: JavaExec.() -> Unit
  ): TaskProvider<JavaExec> = register<JavaExec>(name) {
diff --git a/patches/server/0013-Add-isShrink-to-EntityResurrectEvent.patch b/patches/server/0013-Add-isShrink-to-EntityResurrectEvent.patch
index 8a7cbbcd..1aeedb80 100644
--- a/patches/server/0013-Add-isShrink-to-EntityResurrectEvent.patch
+++ b/patches/server/0013-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 7b395528b8e0853c6b3e040526edad07e54c02ba..79f56995e30dd0091a514d3f90603a83de0e754f 100644
+index d54b91c8227c2e89e56d56ea3260d27ff93ff3e7..a7ba416e6f5ad58b29e51066036eeaaeea016d11 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1608,12 +1608,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -23,7 +23,7 @@ index 7b395528b8e0853c6b3e040526edad07e54c02ba..79f56995e30dd0091a514d3f90603a83
                      itemstack1.shrink(1);
                  }
                  if (itemstack != null && this instanceof ServerPlayer) {
-@@ -4527,3 +4527,4 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -4534,3 +4534,4 @@ public abstract class LivingEntity extends Entity implements Attackable {
  
      }
  }
diff --git a/patches/server/0047-Player-operation-limiter.patch b/patches/server/0047-Player-operation-limiter.patch
index 3db9da0c..9b1c2ee5 100644
--- a/patches/server/0047-Player-operation-limiter.patch
+++ b/patches/server/0047-Player-operation-limiter.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Player operation limiter
 This patch is Powered by plusls-carpet-addition(https://github.com/plusls/plusls-carpet-addition)
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 5c2aa7dc056a3597afded89d493ac7188228d4d1..08ea2ca7586bb4fb7f8257b900035b0a4e1b261f 100644
+index fd785af7ede0afa0214899ba43ae155fe6db6c6a..7395ceda71f1123577b99ab48d13b7fd07ae17f8 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -274,6 +274,10 @@ public class ServerPlayer extends Player {
@@ -28,7 +28,7 @@ index 5c2aa7dc056a3597afded89d493ac7188228d4d1..08ea2ca7586bb4fb7f8257b900035b0a
          this.gameMode.tick();
          this.wardenSpawnTracker.tick();
          --this.spawnInvulnerableTime;
-@@ -2658,5 +2663,32 @@ public class ServerPlayer extends Player {
+@@ -2663,5 +2668,32 @@ public class ServerPlayer extends Player {
      public CraftPlayer getBukkitEntity() {
          return (CraftPlayer) super.getBukkitEntity();
      }
diff --git a/patches/server/0074-Fix-Paper-9372.patch b/patches/server/0074-Fix-Paper-9372.patch
index b5f6fee4..de8f9b16 100644
--- a/patches/server/0074-Fix-Paper-9372.patch
+++ b/patches/server/0074-Fix-Paper-9372.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix Paper#9372
 This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 26584359959f3d809760be4b0a8983f48a197882..0ab5a5622b2687a6f5da2ac4d4457878a0b439fb 100644
+index b460bff1bc67c50f3f369bb93081b292384a193c..409c3aee7a48df3ac3fbe61e0648c7610f20b73d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1260,6 +1260,7 @@ public class ServerPlayer extends Player {
@@ -25,7 +25,7 @@ index 26584359959f3d809760be4b0a8983f48a197882..0ab5a5622b2687a6f5da2ac4d4457878
      }
  
      @Override
-@@ -2215,6 +2217,7 @@ public class ServerPlayer extends Player {
+@@ -2220,6 +2222,7 @@ public class ServerPlayer extends Player {
  
              this.connection.send(new ClientboundSetCameraPacket(this.camera));
              this.connection.resetPosition();
@@ -33,7 +33,7 @@ index 26584359959f3d809760be4b0a8983f48a197882..0ab5a5622b2687a6f5da2ac4d4457878
          }
      }
  
-@@ -2653,6 +2656,7 @@ public class ServerPlayer extends Player {
+@@ -2658,6 +2661,7 @@ public class ServerPlayer extends Player {
      public void forceSetPositionRotation(double x, double y, double z, float yaw, float pitch) {
          this.moveTo(x, y, z, yaw, pitch);
          this.connection.resetPosition();
diff --git a/patches/server/0082-SIMD-support.patch b/patches/server/0082-SIMD-support.patch
index 43d2f8c2..334c4883 100644
--- a/patches/server/0082-SIMD-support.patch
+++ b/patches/server/0082-SIMD-support.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] SIMD support
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index b54e07850c3eb8120a8d70d7b4192db7e5ac24a7..80b8c7d2a34614b0e4dfc88c2555199bcbd2ae24 100644
+index e3ef85b9556b93453d6e4b07a3416ffa3f1029a0..879f8163d820cfe5b0581e80622f530587748127 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -71,6 +71,7 @@ tasks.withType<JavaCompile> {
+@@ -69,6 +69,7 @@ tasks.withType<JavaCompile> {
      compilerArgs.add("-Xlint:-module")
      compilerArgs.add("-Xlint:-removal")
      compilerArgs.add("-Xlint:-dep-ann")
@@ -16,7 +16,7 @@ index b54e07850c3eb8120a8d70d7b4192db7e5ac24a7..80b8c7d2a34614b0e4dfc88c2555199b
  }
  // Leaves end - hide irrelevant compilation warnings
  
-@@ -195,6 +196,8 @@ fun TaskContainer.registerRunTask(
+@@ -193,6 +194,8 @@ fun TaskContainer.registerRunTask(
      minHeapSize = "${memoryGb}G"
      maxHeapSize = "${memoryGb}G"
  
diff --git a/patches/server/0093-Reduce-array-allocations.patch b/patches/server/0093-Reduce-array-allocations.patch
index 9276a1bb..fef53d9d 100644
--- a/patches/server/0093-Reduce-array-allocations.patch
+++ b/patches/server/0093-Reduce-array-allocations.patch
@@ -257,7 +257,7 @@ index c0ebba04b41628f691ab55853498df258549e939..8ce9c990d9db973ea2bb80a58fa9002a
          return ret;
      }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6d03da4fee0e53ffffe12a36efe0e095498eac6f..18e1845f3919d988d51ab7ba0a6eec6cd3a38df8 100644
+index d697624df09cc485b5e8c680153f78f03195dbe7..49296a14d6b1471fa0b92c7bfbb715a434af33b8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -239,6 +239,7 @@ import org.bukkit.inventory.EquipmentSlot;
@@ -284,7 +284,7 @@ index 6d03da4fee0e53ffffe12a36efe0e095498eac6f..18e1845f3919d988d51ab7ba0a6eec6c
              return;
          }
          // Paper end
-@@ -3194,7 +3195,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3193,7 +3194,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          // Paper start
          if (!org.bukkit.Bukkit.isPrimaryThread()) {
              if (this.recipeSpamPackets.addAndGet(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamIncrement) > io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamLimit) {
@@ -398,7 +398,7 @@ index 2e324276ea4cd9e528c6a3f9a9ba394b378fe075..8d949983a30f27a60982f6b406151408
      private EquipmentSlot(EquipmentSlot.Type type, int entityId, int armorStandId, String name) {
          this.type = type;
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 257ad724f02a2b5e6ec84cde6339f18fb95d7a6d..61379db810c84a6044dee6d1a0457442d41cb407 100644
+index 77efccddeb270de69083a1dd5fc1c8abbece7f0d..109861edf227f88b2dfc1baa8ff494fc1fb5a8d6 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3141,7 +3141,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0112-Leaves-tick-command.patch b/patches/server/0112-Leaves-tick-command.patch
index 236376d8..1423ab4a 100644
--- a/patches/server/0112-Leaves-tick-command.patch
+++ b/patches/server/0112-Leaves-tick-command.patch
@@ -109,10 +109,10 @@ index fccb76a8dfa6a0c5d704a0a8f7392beedea320c9..781a0fc1988f950ca85c05614fec0a8e
          ReportedException reportedexception = null;
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 0ab5a5622b2687a6f5da2ac4d4457878a0b439fb..1e54816b487922d380941aa5f5d0e35ec91ec014 100644
+index 409c3aee7a48df3ac3fbe61e0648c7610f20b73d..b7e5b744e955396b2c8ba3aed14ecd886e88a9b6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2734,7 +2734,7 @@ public class ServerPlayer extends Player {
+@@ -2739,7 +2739,7 @@ public class ServerPlayer extends Player {
      }
  
      public boolean allowOperation() {