diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch
index e8a7e796..3734a7d3 100644
--- a/patches/server/0001-Build-changes.patch
+++ b/patches/server/0001-Build-changes.patch
@@ -71,10 +71,10 @@ index 218f5bafeed8551b55b91c7fccaf6935c8b631ca..6105f3bdc6e698b07181b10aec588225
                  metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
                      Map<String, Map<String, Integer>> map = new HashMap<>();
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 39b7c78b032ed6fc29ac765020d5a38858bf2a3a..68963bdbae1f550e5ff69947be942701565bf574 100644
+index c8d56947305c981a3268ce4ae3e975db350ceff2..0706891d8b042675eb67b367324925c52b6d8ddc 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1697,7 +1697,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1693,7 +1693,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @DontObfuscate
      public String getServerModName() {
@@ -84,7 +84,7 @@ index 39b7c78b032ed6fc29ac765020d5a38858bf2a3a..68963bdbae1f550e5ff69947be942701
  
      public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 55c981f2c8070fc1bd9ecd4f4df140d9d0c68319..a554fbe3db6030084029839fdfe9a3d955b10d26 100644
+index 5be9e73dc0314831bbaa6301fc704295dd8ed2bc..8b924e2da5bc18e00aecfad3e6a96072f3a7d2a5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -248,7 +248,7 @@ import javax.annotation.Nullable; // Paper
@@ -97,10 +97,10 @@ index 55c981f2c8070fc1bd9ecd4f4df140d9d0c68319..a554fbe3db6030084029839fdfe9a3d9
      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 afcc80d1f79d1743b0940c69858eacec88fec889..34c2ca3571438d84c13fd5a4562ee49ecceb95cb 100644
+index fbe68bd4739d9a0e7d9bc4c3d5ba8ecfd2d13954..e12d2710c5d7481c740434e483637b6d8d4ff8a1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -269,7 +269,7 @@ public class Main {
+@@ -265,7 +265,7 @@ public class Main {
                      if (buildDate.before(deadline.getTime())) {
                          // Paper start - This is some stupid bullshit
                          System.err.println("*** Warning, you've not updated in a while! ***");
diff --git a/patches/server/0003-Leaves-Server-Config.patch b/patches/server/0003-Leaves-Server-Config.patch
index e3970436..71e28030 100644
--- a/patches/server/0003-Leaves-Server-Config.patch
+++ b/patches/server/0003-Leaves-Server-Config.patch
@@ -19,10 +19,10 @@ index 5ba64e1083b7cb1eec64d1925095c6ca5865ff07..51bdcc4c597b7704bb2449fa80e7fea4
  
          new TimingsExport(listeners, parent, history).start();
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 68963bdbae1f550e5ff69947be942701565bf574..85e130ccb84875cc0008df1e7545f1b6e550f807 100644
+index 0706891d8b042675eb67b367324925c52b6d8ddc..07f3ac18b83357bfc75aa6b6d3ee0bfeb6bb83e4 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1179,7 +1179,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1177,7 +1177,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  String doneTime = String.format(java.util.Locale.ROOT, "%.3fs", (double) (Util.getNanos() - serverStartTime) / 1.0E9D);
                  LOGGER.info("Done ({})! For help, type \"help\"", doneTime);
                  // Paper end
@@ -67,7 +67,7 @@ index 160c0f37aa3aaf7598f852acf9bd444f79444c97..53409a2c7cf2143e085c724a6e96e8ea
          this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a554fbe3db6030084029839fdfe9a3d955b10d26..3fb3fc5b30d3cb171047cfb9caebf064a83f02bc 100644
+index 8b924e2da5bc18e00aecfad3e6a96072f3a7d2a5..407f7c269680eb4234d7562614005d322d5cb454 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -955,6 +955,7 @@ public final class CraftServer implements Server {
@@ -102,7 +102,7 @@ index a554fbe3db6030084029839fdfe9a3d955b10d26..3fb3fc5b30d3cb171047cfb9caebf064
          @Override
          public void restart() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 34c2ca3571438d84c13fd5a4562ee49ecceb95cb..909f0e1ff837bac4d3213214adee01a11098f77c 100644
+index e12d2710c5d7481c740434e483637b6d8d4ff8a1..fc3946d6243e72184773a45bc1eca640ba4595ae 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -145,6 +145,14 @@ public class Main {
diff --git a/patches/server/0004-Fix-gravity-block-duper.patch b/patches/server/0004-Fix-gravity-block-duper.patch
index c4b7186f..05810223 100644
--- a/patches/server/0004-Fix-gravity-block-duper.patch
+++ b/patches/server/0004-Fix-gravity-block-duper.patch
@@ -56,10 +56,10 @@ index 84fce7dccf9232209f939a32acfc3131e62eb27c..cbe48b0add7134100c3da87c07ecee36
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-index c267bc75a5a2a410d941accbe8c41e3422a634a5..dd03e377d03d82dff4719da23dacc3878b8b94ea 100644
+index e234373432f34f237f884f7054c0d80829228522..2892fbc37fae0291e321093a2dbf09b64e934505 100644
 --- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-@@ -119,11 +119,7 @@ public class FallingBlockEntity extends Entity {
+@@ -120,11 +120,7 @@ public class FallingBlockEntity extends Entity {
  
      @Override
      public void tick() {
@@ -72,7 +72,7 @@ index c267bc75a5a2a410d941accbe8c41e3422a634a5..dd03e377d03d82dff4719da23dacc387
          if (this.blockState.isAir()) {
              this.discard();
          } else {
-@@ -136,11 +132,7 @@ public class FallingBlockEntity extends Entity {
+@@ -137,11 +133,7 @@ public class FallingBlockEntity extends Entity {
  
              this.move(MoverType.SELF, this.getDeltaMovement());
  
diff --git a/patches/server/0005-Fix-trading-with-the-void.patch b/patches/server/0005-Fix-trading-with-the-void.patch
index abe2b1a1..42b84bc0 100644
--- a/patches/server/0005-Fix-trading-with-the-void.patch
+++ b/patches/server/0005-Fix-trading-with-the-void.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix trading with the void
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 9696bb71921824dc8a0b25a44b803db03296f4fc..07a4a9290cf06c6c55f6551be896d3364e01e954 100644
+index 3b1a34b34979ab436ccd33f0a85bfae537cbecb4..4abef526bac519f4f4d0ce1c42c3eec4f440eb59 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2500,11 +2500,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2503,11 +2503,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              // Spigot end
              // Spigot Start
              if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message
diff --git a/patches/server/0009-Allow-vanilla-properties-def.patch b/patches/server/0009-Allow-vanilla-properties-def.patch
index 312514aa..d62bedb7 100644
--- a/patches/server/0009-Allow-vanilla-properties-def.patch
+++ b/patches/server/0009-Allow-vanilla-properties-def.patch
@@ -5,11 +5,11 @@ Subject: [PATCH] Allow vanilla properties def
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 73bc7a82254114ab8a5cddaac02322438517d8a3..d53a85a0a86d6394a0fdef5a7ab892b478393246 100644
+index 88a4dda44e59fbe6215d7ac2e5af0c54527a2fc7..0a65617d5804636ee8c7a739d21b886ec635e075 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -470,10 +470,10 @@ public class PaperConfig {
-         deobfuscateStacktraces = getBoolean("settings.loggers.deobfuscate-stacktraces", deobfuscateStacktraces);
+@@ -472,10 +472,10 @@ public class PaperConfig {
+         useRgbForNamedTextColors = getBoolean("settings.loggers.use-rgb-for-named-text-colors", useRgbForNamedTextColors);
      }
  
 -    public static boolean allowBlockPermanentBreakingExploits = false;
@@ -21,7 +21,7 @@ index 73bc7a82254114ab8a5cddaac02322438517d8a3..d53a85a0a86d6394a0fdef5a7ab892b4
              config.set("allow-perm-block-break-exploits", null);
          }
  
-@@ -486,10 +486,10 @@ public class PaperConfig {
+@@ -488,10 +488,10 @@ public class PaperConfig {
          consoleHasAllPermissions = getBoolean("settings.console-has-all-permissions", consoleHasAllPermissions);
      }
  
@@ -34,7 +34,7 @@ index 73bc7a82254114ab8a5cddaac02322438517d8a3..d53a85a0a86d6394a0fdef5a7ab892b4
          set("settings.unsupported-settings.allow-tnt-duplication", null);
      }
  
-@@ -510,10 +510,10 @@ public class PaperConfig {
+@@ -512,10 +512,10 @@ public class PaperConfig {
          }
      }
  
diff --git a/patches/server/0011-Add-fakeplayer-action-support.patch b/patches/server/0011-Add-fakeplayer-action-support.patch
index 5fb7868a..83d0eddc 100644
--- a/patches/server/0011-Add-fakeplayer-action-support.patch
+++ b/patches/server/0011-Add-fakeplayer-action-support.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add fakeplayer action support
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 9c767096ca950d55d6002282c7a3fe2884bcd630..dcae420f13a03c6ec0f8d8cb414dc283bb3d1e88 100644
+index 2483d7df7f1bf94344afd38b37602c645a4a2dff..4ef275139b0f1340238fbc48e9f522dd87067435 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -1244,7 +1244,7 @@ public abstract class Player extends LivingEntity {
+@@ -1247,7 +1247,7 @@ public abstract class Player extends LivingEntity {
                      boolean flag3 = false;
                      double d0 = (double) (this.walkDist - this.walkDistO);