diff --git a/patches/server/0006-Add-last-tick-time-API.patch b/patches/server/0006-Add-last-tick-time-API.patch
index f042b90..63b37ad 100644
--- a/patches/server/0006-Add-last-tick-time-API.patch
+++ b/patches/server/0006-Add-last-tick-time-API.patch
@@ -29,10 +29,10 @@ index 0fd92d123fd5e068a5304204e86fbdcbcbb150f6..60ce593f25bdd90d53407c1281f580ef
                  this.mayHaveDelayedTasks = true;
                  this.delayedTasksMaxNextTickTime = Math.max(Util.getMillis() + 50L, this.nextTickTime);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5f45d080854879db61ef12048e04ad605944605a..11d1c18ddaac1df75ff33bf5e3c3ebad447d86cb 100644
+index e4769be44d7bad3fcb8f06b940aa538d63804f01..6931211b1cbc5eb6e8d489ba72006915a831a3cb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2938,6 +2938,12 @@ public final class CraftServer implements Server {
+@@ -2941,6 +2941,12 @@ public final class CraftServer implements Server {
      public CraftPotionBrewer getPotionBrewer() {
          return this.potionBrewer;
      }
diff --git a/patches/server/0009-Stop-wasting-resources-on-JsonList-get.patch b/patches/server/0009-Stop-wasting-resources-on-JsonList-get.patch
index cdd2766..e995022 100644
--- a/patches/server/0009-Stop-wasting-resources-on-JsonList-get.patch
+++ b/patches/server/0009-Stop-wasting-resources-on-JsonList-get.patch
@@ -7,10 +7,10 @@ Original code by YatopiaMC, licensed under MIT
 You can find the original code on https://github.com/YatopiaMC/Yatopia
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index b348d33726b2b14ea2d12ce3430df2c0b94295f4..fc73d0ea9f74412db0831f92c3d6904eecf6d014 100644
+index c0b599b1835d28ddda3690b29f29bd8c6f03e215..0c491a991d329569f1372ea431640513172fdfeb 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -766,13 +766,19 @@ public abstract class PlayerList {
+@@ -689,13 +689,19 @@ public abstract class PlayerList {
          if (getBans().isBanned(gameprofile) && (gameprofilebanentry = getBans().get(gameprofile)) != null) {
              // Paper end
  
diff --git a/patches/server/0012-Don-t-create-new-random-instance.patch b/patches/server/0012-Don-t-create-new-random-instance.patch
index 3296ec1..646d213 100644
--- a/patches/server/0012-Don-t-create-new-random-instance.patch
+++ b/patches/server/0012-Don-t-create-new-random-instance.patch
@@ -7,10 +7,10 @@ Original code by PatinaMC, licensed under GNU General Public License v3.0
 You can find the original code on https://github.com/PatinaMC/Patina
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index c0b0a7fdb75266a7064d54bda6441953184ecc64..56f0d2b52719bd9cd6a77ab7782a678c123e768e 100644
+index 7d6d3c8556033d289fdadc489e73fba478fce41a..180e189fb657453fd395ed0e845d3d90d883d08c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -392,7 +392,7 @@ public class ServerPlayer extends Player {
+@@ -390,7 +390,7 @@ public class ServerPlayer extends Player {
              long l = k * k;
              int i1 = l > 2147483647L ? Integer.MAX_VALUE : (int) l;
              int j1 = this.getCoprime(i1);
@@ -19,7 +19,7 @@ index c0b0a7fdb75266a7064d54bda6441953184ecc64..56f0d2b52719bd9cd6a77ab7782a678c
  
              for (int l1 = 0; l1 < i1; ++l1) {
                  int i2 = (k1 + j1 * l1) % i1;
-@@ -429,7 +429,7 @@ public class ServerPlayer extends Player {
+@@ -427,7 +427,7 @@ public class ServerPlayer extends Player {
              long l = k * k;
              int i1 = l > 2147483647L ? Integer.MAX_VALUE : (int) l;
              int j1 = this.getCoprime(i1);
diff --git a/patches/server/0032-vmp-skip-entity-move-if-movement-is-zero.patch b/patches/server/0032-vmp-skip-entity-move-if-movement-is-zero.patch
index 3eba44a..9a4d415 100644
--- a/patches/server/0032-vmp-skip-entity-move-if-movement-is-zero.patch
+++ b/patches/server/0032-vmp-skip-entity-move-if-movement-is-zero.patch
@@ -9,7 +9,7 @@ Original code by RelativityMC, licensed under MIT
 You can find the original code on https://github.com/RelativityMC/VMP-fabric (Yarn mappings)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index caa4d38d620717e78df9ad29fe9752213f1cda1b..d4d4d49d2a9eb065415f0c5ff5d5a9bc0c2bb25b 100644
+index 374b46c344ca868cab7c47be69cb005eb90319e8..f2cf7fefc53b9f203e0722b9f1afeb161aa3d70d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -299,6 +299,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -33,7 +33,7 @@ index caa4d38d620717e78df9ad29fe9752213f1cda1b..d4d4d49d2a9eb065415f0c5ff5d5a9bc
          // Paper start - detailed watchdog information
          io.papermc.paper.util.TickThread.ensureTickThread("Cannot move an entity off-main");
          synchronized (this.posLock) {
-@@ -3800,6 +3807,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3807,6 +3814,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public final void setBoundingBox(AABB boundingBox) {