diff --git a/patches/server/0013-AntiXray-Bypass.patch b/patches/server/0013-AntiXray-Bypass.patch
index 1d3e43590..fdff9b092 100644
--- a/patches/server/0013-AntiXray-Bypass.patch
+++ b/patches/server/0013-AntiXray-Bypass.patch
@@ -17,7 +17,7 @@ index e7fe98ea30ae6d0baea3ec1f9f98a89502a49a12..7e2651aa63cc9ddbe28fb9ecbc518835
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 16734cf6cb5203a9d40be56672a698b761f8ce8a..7af85d92f87a645b35ffcb1ebf934b7fcfe0ec7b 100644
+index 4166b68e495fa47093af1b1afc360529a1a15b8d..2d52154d6e6ac586f4d38186347958e0f6d35361 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -193,6 +193,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -28,7 +28,7 @@ index 16734cf6cb5203a9d40be56672a698b761f8ce8a..7af85d92f87a645b35ffcb1ebf934b7f
  
      public CraftPlayer(CraftServer server, ServerPlayer entity) {
          super(server, entity);
-@@ -2924,6 +2925,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2930,6 +2931,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
      // Paper end
  
diff --git a/patches/server/0028-Packet-obfuscation-and-reduction.patch b/patches/server/0028-Packet-obfuscation-and-reduction.patch
index a55b57416..d22184a9c 100644
--- a/patches/server/0028-Packet-obfuscation-and-reduction.patch
+++ b/patches/server/0028-Packet-obfuscation-and-reduction.patch
@@ -183,10 +183,10 @@ index 64df32011e94cb68cfa32a3a236a70cfc1da7c05..6a642996eb149a71585ef8f6b74b567a
  
      public void startAutoSpinAttack(int riptideTicks) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7af85d92f87a645b35ffcb1ebf934b7fcfe0ec7b..c46cb9bbc1b7e8f6febb2ea93082d7d90ed78867 100644
+index 2d52154d6e6ac586f4d38186347958e0f6d35361..6cbfbd81d93d7db8798b3eb3849fe2de07913992 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2727,7 +2727,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2733,7 +2733,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
                  this.sendHealthUpdate();
              }
          }
diff --git a/patches/server/0032-Save-DimensionDataStorage-async.patch b/patches/server/0032-Save-DimensionDataStorage-async.patch
index f3bba0b8d..c2e95200c 100644
--- a/patches/server/0032-Save-DimensionDataStorage-async.patch
+++ b/patches/server/0032-Save-DimensionDataStorage-async.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Save DimensionDataStorage async
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index a530dd1b15093803ffb87848f4c28dcf5da6476c..cd6c890c1f1084759d4e75f9c2d869541b974435 100644
+index ad868de68ecc5eee9701f8fe3d48e9fb3ed422d8..ef2d88765dbcc36ca3a1f36101e389799241bcde 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2137,8 +2137,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2142,8 +2142,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
          if (existing == null && !storage.cache.containsKey(id)) {
              final net.minecraft.world.level.saveddata.SavedData.Factory<MapItemSavedData> factory = MapItemSavedData.factory();
              final MapItemSavedData map = storage.readSavedData(factory.deserializer(), factory.type(), id);