diff --git a/gradle.properties b/gradle.properties
index 00b7cc74..c6c8b33a 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=b42a1da8737895f4fcacfae9b4d49a96b1445972
+paperRef=28abbaa7bda4a072711315cdbe9bd992eaf63c93
 preVersion=true
 updatingMinecraft=true
\ No newline at end of file
diff --git a/patches/api/0005-Hide-irrelevant-compilation-warnings.patch b/patches/api/0005-Hide-irrelevant-compilation-warnings.patch
index 6469a331..8b95e284 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 e827ee211e3c65dc68ac5867fd8476639df63645..c8a301080389ac54ba4911faec709b0663c3507f 100644
+index 9d817bf3f26ffd484945a00a6538970eca22ee20..a4baf13537c24b9c49fc35cf8f0fad09d14c9863 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -106,6 +106,15 @@ val generateApiVersioningFile by tasks.registering {
+@@ -109,6 +109,15 @@ val generateApiVersioningFile by tasks.registering {
      }
  }
  
@@ -24,7 +24,7 @@ index e827ee211e3c65dc68ac5867fd8476639df63645..c8a301080389ac54ba4911faec709b06
  tasks.jar {
      from(generateApiVersioningFile.map { it.outputs.files.singleFile }) {
          into("META-INF/maven/${project.group}/${project.name}")
-@@ -163,6 +172,8 @@ tasks.withType<Javadoc> {
+@@ -166,6 +175,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 98711500..2eb2e161 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 c8a301080389ac54ba4911faec709b0663c3507f..03c8e56ba97badce267b3e882dfba5d97708baae 100644
+index a4baf13537c24b9c49fc35cf8f0fad09d14c9863..311a3134cf4b60d48c3096aebe500106dd4bd267 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -112,6 +112,7 @@ tasks.withType<JavaCompile> {
+@@ -115,6 +115,7 @@ tasks.withType<JavaCompile> {
      compilerArgs.add("-Xlint:-module")
      compilerArgs.add("-Xlint:-removal")
      compilerArgs.add("-Xlint:-dep-ann")
@@ -16,7 +16,7 @@ index c8a301080389ac54ba4911faec709b0663c3507f..03c8e56ba97badce267b3e882dfba5d9
  }
  // Leaves end - hide irrelevant compilation warnings
  
-@@ -174,6 +175,7 @@ tasks.withType<Javadoc> {
+@@ -177,6 +178,7 @@ tasks.withType<Javadoc> {
      }
  
      options.addStringOption("Xdoclint:none", "-quiet") // Leaves - hide irrelevant compilation warnings
diff --git a/patches/api/0007-Leaves-API-publish.patch b/patches/api/0007-Leaves-API-publish.patch
index f1abfac0..0aadce93 100644
--- a/patches/api/0007-Leaves-API-publish.patch
+++ b/patches/api/0007-Leaves-API-publish.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Leaves API publish
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 03c8e56ba97badce267b3e882dfba5d97708baae..37195381168ddf116a722924323f694479dfbbdf 100644
+index 311a3134cf4b60d48c3096aebe500106dd4bd267..c124ac034906a065514f5a1af53b88e550ba37eb 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -209,3 +209,14 @@ tasks.check {
+@@ -212,3 +212,14 @@ tasks.check {
      dependsOn(scanJarForOldGeneratedCode)
  }
  // Paper end
diff --git a/patches/server/0002-Delete-Timings.patch b/patches/server/0002-Delete-Timings.patch
index 87fd0a26..2b198c53 100644
--- a/patches/server/0002-Delete-Timings.patch
+++ b/patches/server/0002-Delete-Timings.patch
@@ -1583,7 +1583,7 @@ index b78a9628a88f2a495ef6de74446a02a14d41a1f6..bfd670484fc58f8b6edd8d6d1065fe80
  
          } else if (close) { chunkproviderserver.close(false); } // Paper - rewrite chunk system
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 9073db9ad3627633f46314ae936d584fa400a9ce..b0455f7afc1b35102ec85d3c8557433946fe5cf3 100644
+index 30ccbab1586a656e0ae41d7406525fb02d9e025b..0046043408e5ec5737857d833f0a43f91d418df0 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2391,7 +2391,6 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0010-Fakeplayer-support.patch b/patches/server/0010-Fakeplayer-support.patch
index 79e2c5a3..98aa3b77 100644
--- a/patches/server/0010-Fakeplayer-support.patch
+++ b/patches/server/0010-Fakeplayer-support.patch
@@ -179,7 +179,7 @@ index 8efbbd379244e3ed54d4aba199037cc20ccd096a..5ae4f2a4138611ef4428719f27b99161
                  PlayerChangedWorldEvent changeEvent = new PlayerChangedWorldEvent(this.getBukkitEntity(), worldserver1.getWorld());
                  this.level().getCraftServer().getPluginManager().callEvent(changeEvent);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b0455f7afc1b35102ec85d3c8557433946fe5cf3..e018fb8d2649e1e07289f12421ac0ddcf05e1c72 100644
+index 0046043408e5ec5737857d833f0a43f91d418df0..68cc14ef2176dd20ede46af3d62ef0797169b87e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -298,7 +298,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0023-Optimize-entity-coordinate-key.patch b/patches/server/0023-Optimize-entity-coordinate-key.patch
index 7611624e..9c1e309b 100644
--- a/patches/server/0023-Optimize-entity-coordinate-key.patch
+++ b/patches/server/0023-Optimize-entity-coordinate-key.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Optimize entity coordinate key
 This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
 
 diff --git a/src/main/java/io/papermc/paper/util/MCUtil.java b/src/main/java/io/papermc/paper/util/MCUtil.java
-index 8240bb085b619f257f8c0a25775e0b15068e440f..5af6b3ce20afa75e1510fb70c238204533a47142 100644
+index 200ed770b57e1a9240abf0473968d4b85cbefe3c..bf16715db2424f0b05854ae7665b4448e036cd0b 100644
 --- a/src/main/java/io/papermc/paper/util/MCUtil.java
 +++ b/src/main/java/io/papermc/paper/util/MCUtil.java
-@@ -213,7 +213,13 @@ public final class MCUtil {
+@@ -212,7 +212,13 @@ public final class MCUtil {
      }
  
      public static long getCoordinateKey(final Entity entity) {
diff --git a/patches/server/0060-Syncmatica-Protocol.patch b/patches/server/0060-Syncmatica-Protocol.patch
index 3ed7d5de..b213feee 100644
--- a/patches/server/0060-Syncmatica-Protocol.patch
+++ b/patches/server/0060-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 e018fb8d2649e1e07289f12421ac0ddcf05e1c72..0ebedd4f2e37b7f07cc4f3e32aaa7e79204f3440 100644
+index 68cc14ef2176dd20ede46af3d62ef0797169b87e..507285757ed8c3997748647947b16b7db62ff5f1 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -313,6 +313,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0061-Disable-distance-check-for-UseItemOnPacket.patch b/patches/server/0061-Disable-distance-check-for-UseItemOnPacket.patch
index a3aad73a..84eebc4a 100644
--- a/patches/server/0061-Disable-distance-check-for-UseItemOnPacket.patch
+++ b/patches/server/0061-Disable-distance-check-for-UseItemOnPacket.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Disable distance check for UseItemOnPacket
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 0ebedd4f2e37b7f07cc4f3e32aaa7e79204f3440..ab2f40d35baddb0c850a427a5ae226eb3898bf3f 100644
+index 507285757ed8c3997748647947b16b7db62ff5f1..ab64a28775d3b5b57a103e2bedaf6af30e62bca7 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1932,7 +1932,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0073-Elytra-aeronautics-no-chunk-load.patch b/patches/server/0073-Elytra-aeronautics-no-chunk-load.patch
index 3bdd8207..3d18db0b 100644
--- a/patches/server/0073-Elytra-aeronautics-no-chunk-load.patch
+++ b/patches/server/0073-Elytra-aeronautics-no-chunk-load.patch
@@ -45,7 +45,7 @@ index e82fd89dc613381e5ed8079b96901b338a8b5aa5..ea617a5695db07d58f9115d85a06e6c0
  
          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 ab2f40d35baddb0c850a427a5ae226eb3898bf3f..6ecfad2ef86a6d2cd280c847e159977285999134 100644
+index ab64a28775d3b5b57a103e2bedaf6af30e62bca7..c70597690364e044a0d4231eb2895cc5bf35820a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -543,7 +543,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0093-Reduce-array-allocations.patch b/patches/server/0093-Reduce-array-allocations.patch
index 7907a827..9be16d07 100644
--- a/patches/server/0093-Reduce-array-allocations.patch
+++ b/patches/server/0093-Reduce-array-allocations.patch
@@ -257,7 +257,7 @@ index 49bed177db75c73f09dfd6b48dc88ae3432f5e84..4b3c4e8b404ee8fca48ceb333438a1ec
          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 6ecfad2ef86a6d2cd280c847e159977285999134..9e1e99a5afa972527d036a32339b571816b325fe 100644
+index c70597690364e044a0d4231eb2895cc5bf35820a..6950e1d1eef91141190db83b82debcd11dd220e8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -243,6 +243,7 @@ import org.bukkit.inventory.EquipmentSlot;
diff --git a/patches/server/0111-Replay-Mod-API.patch b/patches/server/0111-Replay-Mod-API.patch
index 88f05cd3..3b11157b 100644
--- a/patches/server/0111-Replay-Mod-API.patch
+++ b/patches/server/0111-Replay-Mod-API.patch
@@ -107,7 +107,7 @@ index f941e7add46e690e21d39111bed520df9156f154..5ea28c20b34b46eb68fb8a2d468ea009
          }
          // Leaves end - bot can't get advancement
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 9e1e99a5afa972527d036a32339b571816b325fe..a2f3d0d77dd7e07451af4b33f63bae55634f02f0 100644
+index 6950e1d1eef91141190db83b82debcd11dd220e8..a6a579a98b5cd814223b3ba32f699573d97a9255 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -300,7 +300,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0124-Disable-moved-wrongly-threshold.patch b/patches/server/0124-Disable-moved-wrongly-threshold.patch
index 5477467c..523d9b91 100644
--- a/patches/server/0124-Disable-moved-wrongly-threshold.patch
+++ b/patches/server/0124-Disable-moved-wrongly-threshold.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Disable moved wrongly threshold
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a2f3d0d77dd7e07451af4b33f63bae55634f02f0..76043154cb073a9ed4b3f15969f7d02cac46443b 100644
+index a6a579a98b5cd814223b3ba32f699573d97a9255..3043871aeb140725006de68b4663c2425511f1dc 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -589,7 +589,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl