diff --git a/patches/server/0621-misc-debugging-dumps.patch b/patches/server/0428-misc-debugging-dumps.patch
similarity index 87%
rename from patches/server/0621-misc-debugging-dumps.patch
rename to patches/server/0428-misc-debugging-dumps.patch
index 7fb9875e7c..686f2ba8f2 100644
--- a/patches/server/0621-misc-debugging-dumps.patch
+++ b/patches/server/0428-misc-debugging-dumps.patch
@@ -29,10 +29,10 @@ index 0000000000000000000000000000000000000000..2d5494d2813b773e60ddba6790b750a9
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 9111d3fb84ca4a7dc881e1326ac0c93a81ec7f58..f15cb87d96b3f5028ab6ceba1e9026525cdecbee 100644
+index 2e8892211dd3eb4cac27bcb3b302a25d833e2626..99555bb8b6f5b8c2bb9a15ee469fe2dd3b980f67 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -937,6 +937,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -936,6 +936,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      // CraftBukkit start
      private boolean hasStopped = false;
      public volatile boolean hasFullyShutdown = false; // Paper
@@ -40,7 +40,7 @@ index 9111d3fb84ca4a7dc881e1326ac0c93a81ec7f58..f15cb87d96b3f5028ab6ceba1e902652
      private final Object stopLock = new Object();
      public final boolean hasStopped() {
          synchronized (this.stopLock) {
-@@ -951,6 +952,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -950,6 +951,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              if (this.hasStopped) return;
              this.hasStopped = true;
          }
@@ -48,7 +48,7 @@ index 9111d3fb84ca4a7dc881e1326ac0c93a81ec7f58..f15cb87d96b3f5028ab6ceba1e902652
          // Paper start - kill main thread, and kill it hard
          shutdownThread = Thread.currentThread();
          org.spigotmc.WatchdogThread.doStop(); // Paper
-@@ -1061,6 +1063,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1060,6 +1062,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
      public void safeShutdown(boolean flag, boolean isRestarting) {
          this.isRestarting = isRestarting;
@@ -58,10 +58,10 @@ index 9111d3fb84ca4a7dc881e1326ac0c93a81ec7f58..f15cb87d96b3f5028ab6ceba1e902652
          this.running = false;
          if (flag) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 7da88bc52161dc32da22451077a4dfd8facb2de1..f4cff18afa816aa7efb2f80e0af51216129963a4 100644
+index bd1203a5b58bac7cccf1f81337fa2967a0e9eb40..6468a675862ee2956308b760012fe25cf505563f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -200,6 +200,11 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
+@@ -207,6 +207,11 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
                  }
              } catch (Exception exception) {
                  TranslatableComponent chatmessage = new TranslatableComponent("multiplayer.disconnect.invalid_player_data");
@@ -74,10 +74,10 @@ index 7da88bc52161dc32da22451077a4dfd8facb2de1..f4cff18afa816aa7efb2f80e0af51216
                  this.connection.send(new ClientboundDisconnectPacket(chatmessage));
                  this.connection.disconnect(chatmessage);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5cda9f21219decf6e4b9e5cc6e83b4749066f20f..5b95bb1d1361740f5605873fb707980bb911e6a3 100644
+index 72640c2dd945a22e8e562ee6901c9f70ae786816..59a12fe5d4d2504d99e26c6faaa095d5227cf446 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -946,6 +946,7 @@ public final class CraftServer implements Server {
+@@ -939,6 +939,7 @@ public final class CraftServer implements Server {
                  plugin.getDescription().getName(),
                  "This plugin is not properly shutting down its async tasks when it is being reloaded.  This may cause conflicts with the newly loaded version of the plugin"
              ));
diff --git a/patches/server/0708-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0429-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
similarity index 94%
rename from patches/server/0708-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
rename to patches/server/0429-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
index 79efe90ebf..1d4818606f 100644
--- a/patches/server/0708-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
+++ b/patches/server/0429-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Deobfuscate stacktraces in log messages, crash reports, and
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 5ee1e44647cfd7dff08ba7ce17d4b04246b7ab57..dc17410ac88e9f069a48ce7eb94b7cbec8e61c74 100644
+index eea412347cef390555166a988058ae877afdfa4a..b35e54380cb23758a813fa24d13b888f36906c23 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -1,8 +1,12 @@
@@ -37,16 +37,16 @@ index 5ee1e44647cfd7dff08ba7ce17d4b04246b7ab57..dc17410ac88e9f069a48ce7eb94b7cbe
  }
  
  dependencies {
-@@ -49,6 +61,8 @@ dependencies {
+@@ -48,6 +60,8 @@ dependencies {
      implementation("co.aikar:cleaner:1.0-SNAPSHOT") // Paper
      implementation("io.netty:netty-all:4.1.65.Final") // Paper
  
 +    implementation("org.quiltmc:tiny-mappings-parser:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation
 +
-     testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
      testImplementation("junit:junit:4.13.1")
      testImplementation("org.hamcrest:hamcrest-library:1.3")
-@@ -143,6 +157,44 @@ tasks.shadowJar {
+ }
+@@ -141,6 +155,44 @@ tasks.shadowJar {
      transform(ModifiedLog4j2PluginsCacheFileTransformer::class.java)
  }
  
@@ -92,21 +92,19 @@ index 5ee1e44647cfd7dff08ba7ce17d4b04246b7ab57..dc17410ac88e9f069a48ce7eb94b7cbe
      exclude("org/bukkit/craftbukkit/inventory/ItemStack*Test.class")
  }
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 14841f1df5fa8970b132eb5e8fc24069f687dd6a..9d31f1f1a224d1442cb7915df514c0522a4b876b 100644
+index f1034cfb63ea37c22e67b5d4a18214774f208de2..a8740f03a7feef40490e9f5be610c2c835114f08 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -504,6 +504,11 @@ public class PaperConfig {
-         enableBrigadierConsoleCompletions = getBoolean("settings.console.enable-brigadier-completions", enableBrigadierConsoleCompletions);
+@@ -433,4 +433,9 @@ public class PaperConfig {
+             log("Async Chunks: Enabled - Chunks will be loaded much faster, without lag.");
+         }
      }
- 
++
 +    public static boolean deobfuscateStacktraces = true;
 +    private static void loggerSettings() {
 +        deobfuscateStacktraces = getBoolean("settings.loggers.deobfuscate-stacktraces", deobfuscateStacktraces);
 +    }
-+
-     public static int itemValidationDisplayNameLength = 8192;
-     public static int itemValidationLocNameLength = 8192;
-     public static int itemValidationLoreLineLength = 8192;
+ }
 diff --git a/src/main/java/com/destroystokyo/paper/io/SyncLoadFinder.java b/src/main/java/com/destroystokyo/paper/io/SyncLoadFinder.java
 index 0bb4aaa546939b67a5d22865190f30478a9337c1..d3e619655382e50e9ac9323ed942502d85c9599c 100644
 --- a/src/main/java/com/destroystokyo/paper/io/SyncLoadFinder.java
@@ -159,7 +157,7 @@ index 0000000000000000000000000000000000000000..d019802a36dbaca4bf299a55d28381e4
 +}
 diff --git a/src/main/java/io/papermc/paper/util/ObfHelper.java b/src/main/java/io/papermc/paper/util/ObfHelper.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..e9082fa4e04c88fe53429af77b1c23a03aeafc2d
+index 0000000000000000000000000000000000000000..5ee513c0e2436e6afa3432f9f835d4028b37aed0
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/util/ObfHelper.java
 @@ -0,0 +1,141 @@
@@ -253,7 +251,7 @@ index 0000000000000000000000000000000000000000..e9082fa4e04c88fe53429af77b1c23a0
 +    }
 +
 +    private static @Nullable Set<ClassMapping> loadMappingsIfPresent() {
-+        try (final @Nullable InputStream mappingsInputStream = StacktraceDeobfuscator.class.getClassLoader().getResourceAsStream("META-INF/mappings/reobf.tiny")) {
++        try (final @Nullable InputStream mappingsInputStream = ObfHelper.class.getClassLoader().getResourceAsStream("META-INF/mappings/reobf.tiny")) {
 +            if (mappingsInputStream == null) {
 +                return null;
 +            }
@@ -513,13 +511,13 @@ index 3941e14d1c3e6e688e28904948039c8b2200de5f..a4fda4a3bae9ce600e778b44cd3ef432
          }
      }
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index db0110120f88bc06954fa8c44b2a45f0c8229574..7b6c547e71230fbb3733f99a4597b3f5b51547b8 100644
+index a335d48467d1730bfed25eb5fd9046e115f23ed0..8098875a5c4146dec81f5daed0e34ddfe17a26c6 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -221,6 +221,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -214,6 +214,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+         }
          com.destroystokyo.paper.PaperConfig.registerCommands();
          com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now
-         io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider
 +        io.papermc.paper.util.ObfHelper.INSTANCE.getClass(); // load mappings for stacktrace deobf and etc.
          // Paper end
  
@@ -547,7 +545,7 @@ index 4d271cae88c16ed2419f896c728fdff612540500..dcfbe77bdb25d9c58ffb7b75c48bdb58
              log.log( Level.SEVERE, "\t\t" + stack );
          }
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 7484c52761d4d8da827cd7693cf8e14519c35a9b..2e421eaac80cf251b32e0bb504dd54a73edf4986 100644
+index d285dbec16272db6b8a71865e05924ad66087407..1a05d23ff886b015fb9396f119822c678a47ec6f 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
 @@ -30,10 +30,14 @@
diff --git a/patches/server/0428-Implement-Mob-Goal-API.patch b/patches/server/0430-Implement-Mob-Goal-API.patch
similarity index 84%
rename from patches/server/0428-Implement-Mob-Goal-API.patch
rename to patches/server/0430-Implement-Mob-Goal-API.patch
index 821c9a7631..c9d193f050 100644
--- a/patches/server/0428-Implement-Mob-Goal-API.patch
+++ b/patches/server/0430-Implement-Mob-Goal-API.patch
@@ -5,12 +5,12 @@ Subject: [PATCH] Implement Mob Goal API
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index eea412347cef390555166a988058ae877afdfa4a..81d507895572e9c0ec3c87d3745f95067922093a 100644
+index b35e54380cb23758a813fa24d13b888f36906c23..12c2681e0abef8ea4981deec431a9269df6cea54 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -48,6 +48,7 @@ dependencies {
-     implementation("co.aikar:cleaner:1.0-SNAPSHOT") // Paper
-     implementation("io.netty:netty-all:4.1.65.Final") // Paper
+@@ -62,6 +62,7 @@ dependencies {
+ 
+     implementation("org.quiltmc:tiny-mappings-parser:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation
  
 +    testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
      testImplementation("junit:junit:4.13.1")
@@ -18,16 +18,17 @@ index eea412347cef390555166a988058ae877afdfa4a..81d507895572e9c0ec3c87d3745f9506
  }
 diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..79006251a707dd94099db26fbb503f8699b7a8b5
+index 0000000000000000000000000000000000000000..181abe014baba9ac51064c003381281a8fa43fe4
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
-@@ -0,0 +1,467 @@
+@@ -0,0 +1,367 @@
 +package com.destroystokyo.paper.entity.ai;
 +
 +import com.destroystokyo.paper.entity.RangedEntity;
 +import com.destroystokyo.paper.util.set.OptimizedSmallEnumSet;
 +import com.google.common.collect.BiMap;
 +import com.google.common.collect.HashBiMap;
++import io.papermc.paper.util.ObfHelper;
 +import java.lang.reflect.Constructor;
 +import java.util.EnumSet;
 +import java.util.HashMap;
@@ -157,107 +158,7 @@ index 0000000000000000000000000000000000000000..79006251a707dd94099db26fbb503f86
 +
 +    static {
 +        // TODO these kinda should be checked on each release, in case obfuscation changes
-+        deobfuscationMap.put("bee_b", "bee_attack");
-+        deobfuscationMap.put("bee_c", "bee_become_angry");
-+        deobfuscationMap.put("bee_d", "bee_enter_hive");
-+        deobfuscationMap.put("bee_e", "bee_go_to_hive");
-+        deobfuscationMap.put("bee_f", "bee_go_to_known_flower");
-+        deobfuscationMap.put("bee_g", "bee_grow_crop");
-+        deobfuscationMap.put("bee_h", "bee_hurt_by_other");
-+        deobfuscationMap.put("bee_i", "bee_locate_hive");
-+        deobfuscationMap.put("bee_k", "bee_pollinate");
-+        deobfuscationMap.put("bee_l", "bee_wander");
-+        deobfuscationMap.put("cat_a", "cat_avoid_entity");
-+        deobfuscationMap.put("cat_b", "cat_relax_on_owner");
-+        deobfuscationMap.put("dolphin_b", "dolphin_swim_to_treasure");
-+        deobfuscationMap.put("dolphin_c", "dolphin_swim_with_player");
-+        deobfuscationMap.put("dolphin_d", "dolphin_play_with_items");
-+        deobfuscationMap.put("drowned_a", "drowned_attack");
-+        deobfuscationMap.put("drowned_b", "drowned_goto_beach");
-+        deobfuscationMap.put("drowned_c", "drowned_goto_water");
-+        deobfuscationMap.put("drowned_e", "drowned_swim_up");
-+        deobfuscationMap.put("drowned_f", "drowned_trident_attack");
-+        deobfuscationMap.put("enderman_a", "enderman_freeze_when_looked_at");
-+        deobfuscationMap.put("evoker_a", "evoker_attack_spell");
-+        deobfuscationMap.put("evoker_b", "evoker_cast_spell");
-+        deobfuscationMap.put("evoker_c", "evoker_summon_spell");
-+        deobfuscationMap.put("evoker_d", "evoker_wololo_spell");
-+        deobfuscationMap.put("fish_b", "fish_swim");
-+        deobfuscationMap.put("fox_a", "fox_defend_trusted");
-+        deobfuscationMap.put("fox_b", "fox_faceplant");
-+        deobfuscationMap.put("fox_e", "fox_breed");
-+        deobfuscationMap.put("fox_f", "fox_eat_berries");
-+        deobfuscationMap.put("fox_g", "fox_float");
-+        deobfuscationMap.put("fox_h", "fox_follow_parent");
-+        deobfuscationMap.put("fox_j", "fox_look_at_player");
-+        deobfuscationMap.put("fox_l", "fox_melee_attack");
-+        deobfuscationMap.put("fox_n", "fox_panic");
-+        deobfuscationMap.put("fox_o", "fox_pounce");
-+        deobfuscationMap.put("fox_p", "fox_search_for_items");
-+        deobfuscationMap.put("fox_q", "fox_stroll_through_village");
-+        deobfuscationMap.put("fox_r", "fox_perch_and_search");
-+        deobfuscationMap.put("fox_s", "fox_seek_shelter");
-+        deobfuscationMap.put("fox_t", "fox_sleep");
-+        deobfuscationMap.put("fox_u", "fox_stalk_prey");
-+        deobfuscationMap.put("illager_abstract_b", "raider_open_door");
-+        deobfuscationMap.put("illager_illusioner_a", "illusioner_blindness_spell");
-+        deobfuscationMap.put("illager_illusioner_b", "illusioner_mirror_spell");
-+        deobfuscationMap.put("illager_wizard_b", "spellcaster_cast_spell");
-+        deobfuscationMap.put("llama_a", "llama_attack_wolf");
-+        deobfuscationMap.put("llama_c", "llama_hurt_by");
-+        deobfuscationMap.put("llama_trader_a", "llamatrader_defended_wandering_trader");
-+        deobfuscationMap.put("monster_patrolling_a", "long_distance_patrol");
-+        deobfuscationMap.put("ocelot_a", "ocelot_avoid_entity");
-+        deobfuscationMap.put("ocelot_b", "ocelot_tempt");
-+        deobfuscationMap.put("panda_b", "panda_attack");
-+        deobfuscationMap.put("panda_c", "panda_avoid");
-+        deobfuscationMap.put("panda_d", "panda_breed");
-+        deobfuscationMap.put("panda_e", "panda_hurt_by_target");
-+        deobfuscationMap.put("panda_f", "panda_lie_on_back");
-+        deobfuscationMap.put("panda_g", "panda_look_at_player");
-+        deobfuscationMap.put("panda_i", "panda_panic");
-+        deobfuscationMap.put("panda_j", "panda_roll");
-+        deobfuscationMap.put("panda_k", "panda_sit");
-+        deobfuscationMap.put("panda_l", "panda_sneeze");
-+        deobfuscationMap.put("phantom_b", "phantom_attack_player");
-+        deobfuscationMap.put("phantom_c", "phantom_attack_strategy");
-+        deobfuscationMap.put("phantom_e", "phantom_circle_around_anchor");
-+        deobfuscationMap.put("phantom_i", "phantom_sweep_attack");
-+        deobfuscationMap.put("polar_bear_a", "polarbear_attack_players");
-+        deobfuscationMap.put("polar_bear_b", "polarbear_hurt_by");
-+        deobfuscationMap.put("polar_bear_c", "polarbear_melee");
-+        deobfuscationMap.put("polar_bear_d", "polarbear_panic");
-+        deobfuscationMap.put("puffer_fish_a", "pufferfish_puff");
-+        deobfuscationMap.put("raider_a", "raider_hold_ground");
-+        deobfuscationMap.put("raider_b", "raider_obtain_banner");
-+        deobfuscationMap.put("raider_c", "raider_celebration");
-+        deobfuscationMap.put("raider_d", "raider_move_through_village");
-+        deobfuscationMap.put("ravager_a", "ravager_melee_attack");
-+        deobfuscationMap.put("shulker_a", "shulker_attack");
-+        deobfuscationMap.put("shulker_c", "shulker_defense");
-+        deobfuscationMap.put("shulker_d", "shulker_nearest");
-+        deobfuscationMap.put("shulker_e", "shulker_peek");
-+        deobfuscationMap.put("squid_a", "squid_flee");
 +        deobfuscationMap.put("abstract_skeleton_1", "abstract_skeleton_melee");
-+        deobfuscationMap.put("strider_a", "strider_go_to_lava");
-+        deobfuscationMap.put("turtle_a", "turtle_breed");
-+        deobfuscationMap.put("turtle_b", "turtle_go_home");
-+        deobfuscationMap.put("turtle_c", "turtle_goto_water");
-+        deobfuscationMap.put("turtle_d", "turtle_lay_egg");
-+        deobfuscationMap.put("turtle_f", "turtle_panic");
-+        deobfuscationMap.put("turtle_h", "turtle_random_stroll");
-+        deobfuscationMap.put("turtle_i", "turtle_tempt");
-+        deobfuscationMap.put("turtle_j", "turtle_travel");
-+        deobfuscationMap.put("vex_a", "vex_charge_attack");
-+        deobfuscationMap.put("vex_b", "vex_copy_target_of_owner");
-+        deobfuscationMap.put("vex_d", "vex_random_move");
-+        deobfuscationMap.put("villager_trader_a", "villagertrader_wander_to_position");
-+        deobfuscationMap.put("vindicator_a", "vindicator_break_door");
-+        deobfuscationMap.put("vindicator_b", "vindicator_johnny_attack");
-+        deobfuscationMap.put("vindicator_c", "vindicator_melee_attack");
-+        deobfuscationMap.put("wither_a", "wither_do_nothing");
-+        deobfuscationMap.put("wolf_a", "wolf_avoid_entity");
-+        deobfuscationMap.put("zombie_a", "zombie_attack_turtle_egg");
 +
 +        ignored.add("goal_selector_1");
 +        ignored.add("goal_selector_2");
@@ -362,9 +263,8 @@ index 0000000000000000000000000000000000000000..79006251a707dd94099db26fbb503f86
 +        bukkitMap.put(net.minecraft.world.entity.animal.goat.Goat.class, org.bukkit.entity.Goat.class);
 +    }
 +
-+    // TODO: FIX THIS
 +    public static String getUsableName(Class<?> clazz) {
-+        String name = clazz.getName();
++        String name = ObfHelper.INSTANCE.deobfClassName(clazz.getName());
 +        name = name.substring(name.lastIndexOf(".") + 1);
 +        boolean flag = false;
 +        // inner classes
@@ -899,10 +799,10 @@ index 8c2ec30a35e86f2b30863045b586a67e485c624b..848cac4426346b6d2ed575f33bf01c0e
          LOOK,
          JUMP,
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 72640c2dd945a22e8e562ee6901c9f70ae786816..f4c055e7e2d10756262386c8fb34996c4a38ee3f 100644
+index 59a12fe5d4d2504d99e26c6faaa095d5227cf446..63c20c0364b39bef033ed1df4278a64dc739995e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2533,5 +2533,11 @@ public final class CraftServer implements Server {
+@@ -2534,5 +2534,11 @@ public final class CraftServer implements Server {
      public boolean isStopping() {
          return net.minecraft.server.MinecraftServer.getServer().hasStopped();
      }
diff --git a/patches/server/0429-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/0431-Use-distance-map-to-optimise-entity-tracker.patch
similarity index 100%
rename from patches/server/0429-Use-distance-map-to-optimise-entity-tracker.patch
rename to patches/server/0431-Use-distance-map-to-optimise-entity-tracker.patch
diff --git a/patches/server/0430-Optimize-isOutsideRange-to-use-distance-maps.patch b/patches/server/0432-Optimize-isOutsideRange-to-use-distance-maps.patch
similarity index 100%
rename from patches/server/0430-Optimize-isOutsideRange-to-use-distance-maps.patch
rename to patches/server/0432-Optimize-isOutsideRange-to-use-distance-maps.patch
diff --git a/patches/server/0431-Add-villager-reputation-API.patch b/patches/server/0433-Add-villager-reputation-API.patch
similarity index 100%
rename from patches/server/0431-Add-villager-reputation-API.patch
rename to patches/server/0433-Add-villager-reputation-API.patch
diff --git a/patches/server/0432-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0434-Option-for-maximum-exp-value-when-merging-orbs.patch
similarity index 100%
rename from patches/server/0432-Option-for-maximum-exp-value-when-merging-orbs.patch
rename to patches/server/0434-Option-for-maximum-exp-value-when-merging-orbs.patch
diff --git a/patches/server/0433-ExperienceOrbMergeEvent.patch b/patches/server/0435-ExperienceOrbMergeEvent.patch
similarity index 100%
rename from patches/server/0433-ExperienceOrbMergeEvent.patch
rename to patches/server/0435-ExperienceOrbMergeEvent.patch
diff --git a/patches/server/0434-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0436-Fix-PotionEffect-ignores-icon-flag.patch
similarity index 100%
rename from patches/server/0434-Fix-PotionEffect-ignores-icon-flag.patch
rename to patches/server/0436-Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/patches/server/0435-Optimize-brigadier-child-sorting-performance.patch b/patches/server/0437-Optimize-brigadier-child-sorting-performance.patch
similarity index 100%
rename from patches/server/0435-Optimize-brigadier-child-sorting-performance.patch
rename to patches/server/0437-Optimize-brigadier-child-sorting-performance.patch
diff --git a/patches/server/0436-Potential-bed-API.patch b/patches/server/0438-Potential-bed-API.patch
similarity index 100%
rename from patches/server/0436-Potential-bed-API.patch
rename to patches/server/0438-Potential-bed-API.patch
diff --git a/patches/server/0437-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0439-Wait-for-Async-Tasks-during-shutdown.patch
similarity index 89%
rename from patches/server/0437-Wait-for-Async-Tasks-during-shutdown.patch
rename to patches/server/0439-Wait-for-Async-Tasks-during-shutdown.patch
index 6d140320d0..9a38989479 100644
--- a/patches/server/0437-Wait-for-Async-Tasks-during-shutdown.patch
+++ b/patches/server/0439-Wait-for-Async-Tasks-during-shutdown.patch
@@ -10,10 +10,10 @@ Adds a 5 second grace period for any async tasks to finish and warns
 if any are still running after that delay just as reload does.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 2e8892211dd3eb4cac27bcb3b302a25d833e2626..8e6938b76ff62f81f868ca0f6badce081263a300 100644
+index 99555bb8b6f5b8c2bb9a15ee469fe2dd3b980f67..f5ef6219b20d5b7af81537dab8d9815d74d1560a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -969,6 +969,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -971,6 +971,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          // CraftBukkit start
          if (this.server != null) {
              this.server.disablePlugins();
@@ -22,10 +22,10 @@ index 2e8892211dd3eb4cac27bcb3b302a25d833e2626..8e6938b76ff62f81f868ca0f6badce08
          // CraftBukkit end
          if (this.getConnection() != null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f4c055e7e2d10756262386c8fb34996c4a38ee3f..5aeca3ab0c28b4d8b174d1376dc76cc1704fd169 100644
+index 63c20c0364b39bef033ed1df4278a64dc739995e..b39db457d459e048962712aa2173b3e8b608b37f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -947,6 +947,35 @@ public final class CraftServer implements Server {
+@@ -948,6 +948,35 @@ public final class CraftServer implements Server {
          org.spigotmc.WatchdogThread.hasStarted = true; // Paper - Disable watchdog early timeout on reload
      }
  
diff --git a/patches/server/0438-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0440-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
similarity index 100%
rename from patches/server/0438-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
rename to patches/server/0440-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/patches/server/0439-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0441-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
similarity index 97%
rename from patches/server/0439-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
rename to patches/server/0441-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index 31d644b1de..02334f635a 100644
--- a/patches/server/0439-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/patches/server/0441-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
@@ -13,12 +13,12 @@ A config is provided if you rather let players use these exploits, and let
 them destroy the worlds End Portals and get on top of the nether easy.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index f1034cfb63ea37c22e67b5d4a18214774f208de2..eea3035bcc7f10480beccb6b090b3624b3dbbec3 100644
+index a8740f03a7feef40490e9f5be610c2c835114f08..155fa55eb859da90d59d01b21ae422bf99ccfa87 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -433,4 +433,16 @@ public class PaperConfig {
-             log("Async Chunks: Enabled - Chunks will be loaded much faster, without lag.");
-         }
+@@ -438,4 +438,15 @@ public class PaperConfig {
+     private static void loggerSettings() {
+         deobfuscateStacktraces = getBoolean("settings.loggers.deobfuscate-stacktraces", deobfuscateStacktraces);
      }
 +
 +    public static boolean allowBlockPermanentBreakingExploits = false;
@@ -30,7 +30,6 @@ index f1034cfb63ea37c22e67b5d4a18214774f208de2..eea3035bcc7f10480beccb6b090b3624
 +
 +        config.set("settings.unsupported-settings.allow-permanent-block-break-exploits-readme", "This setting controls if players should be able to break bedrock, end portals and other intended to be permanent blocks.");
 +        allowBlockPermanentBreakingExploits = getBoolean("settings.unsupported-settings.allow-permanent-block-break-exploits", allowBlockPermanentBreakingExploits);
-+
 +    }
  }
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
diff --git a/patches/server/0440-Reduce-MutableInt-allocations-from-light-engine.patch b/patches/server/0442-Reduce-MutableInt-allocations-from-light-engine.patch
similarity index 100%
rename from patches/server/0440-Reduce-MutableInt-allocations-from-light-engine.patch
rename to patches/server/0442-Reduce-MutableInt-allocations-from-light-engine.patch
diff --git a/patches/server/0441-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0443-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
similarity index 100%
rename from patches/server/0441-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
rename to patches/server/0443-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
diff --git a/patches/server/0442-Ensure-safe-gateway-teleport.patch b/patches/server/0444-Ensure-safe-gateway-teleport.patch
similarity index 100%
rename from patches/server/0442-Ensure-safe-gateway-teleport.patch
rename to patches/server/0444-Ensure-safe-gateway-teleport.patch
diff --git a/patches/server/0443-Add-option-for-console-having-all-permissions.patch b/patches/server/0445-Add-option-for-console-having-all-permissions.patch
similarity index 89%
rename from patches/server/0443-Add-option-for-console-having-all-permissions.patch
rename to patches/server/0445-Add-option-for-console-having-all-permissions.patch
index e819e4ca12..f0f516c739 100644
--- a/patches/server/0443-Add-option-for-console-having-all-permissions.patch
+++ b/patches/server/0445-Add-option-for-console-having-all-permissions.patch
@@ -5,12 +5,12 @@ Subject: [PATCH] Add option for console having all permissions
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index eea3035bcc7f10480beccb6b090b3624b3dbbec3..203834e28309387f04314b97da078ae1e0ed0638 100644
+index 155fa55eb859da90d59d01b21ae422bf99ccfa87..ddf9b5592e2203315d239ab28a338633600c69fc 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -445,4 +445,9 @@ public class PaperConfig {
+@@ -449,4 +449,9 @@ public class PaperConfig {
+         config.set("settings.unsupported-settings.allow-permanent-block-break-exploits-readme", "This setting controls if players should be able to break bedrock, end portals and other intended to be permanent blocks.");
          allowBlockPermanentBreakingExploits = getBoolean("settings.unsupported-settings.allow-permanent-block-break-exploits", allowBlockPermanentBreakingExploits);
- 
      }
 +
 +    public static boolean consoleHasAllPermissions = false;
diff --git a/patches/server/0444-Optimize-ServerLevels-chunk-level-checking-methods.patch b/patches/server/0446-Optimize-ServerLevels-chunk-level-checking-methods.patch
similarity index 100%
rename from patches/server/0444-Optimize-ServerLevels-chunk-level-checking-methods.patch
rename to patches/server/0446-Optimize-ServerLevels-chunk-level-checking-methods.patch
diff --git a/patches/server/0445-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch b/patches/server/0447-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
similarity index 100%
rename from patches/server/0445-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
rename to patches/server/0447-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
diff --git a/patches/server/0446-Optimize-sending-packets-to-nearby-locations-sounds-.patch b/patches/server/0448-Optimize-sending-packets-to-nearby-locations-sounds-.patch
similarity index 100%
rename from patches/server/0446-Optimize-sending-packets-to-nearby-locations-sounds-.patch
rename to patches/server/0448-Optimize-sending-packets-to-nearby-locations-sounds-.patch
diff --git a/patches/server/0447-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0449-Fix-villager-trading-demand-MC-163962.patch
similarity index 100%
rename from patches/server/0447-Fix-villager-trading-demand-MC-163962.patch
rename to patches/server/0449-Fix-villager-trading-demand-MC-163962.patch
diff --git a/patches/server/0448-Maps-shouldn-t-load-chunks.patch b/patches/server/0450-Maps-shouldn-t-load-chunks.patch
similarity index 100%
rename from patches/server/0448-Maps-shouldn-t-load-chunks.patch
rename to patches/server/0450-Maps-shouldn-t-load-chunks.patch
diff --git a/patches/server/0449-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0451-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
similarity index 100%
rename from patches/server/0449-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
rename to patches/server/0451-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/patches/server/0450-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/patches/server/0452-Delay-Chunk-Unloads-based-on-Player-Movement.patch
similarity index 100%
rename from patches/server/0450-Delay-Chunk-Unloads-based-on-Player-Movement.patch
rename to patches/server/0452-Delay-Chunk-Unloads-based-on-Player-Movement.patch
diff --git a/patches/server/0451-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0453-Optimize-Bit-Operations-by-inlining.patch
similarity index 100%
rename from patches/server/0451-Optimize-Bit-Operations-by-inlining.patch
rename to patches/server/0453-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/0452-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0454-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
similarity index 98%
rename from patches/server/0452-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
rename to patches/server/0454-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
index cfdfa3a4f8..003a1c8b58 100644
--- a/patches/server/0452-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
+++ b/patches/server/0454-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
@@ -22,7 +22,7 @@ wants it to collect even faster, they can restore that setting back to 1 instead
 Not adding it to .getType() though to keep behavior consistent with vanilla for performance reasons.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5aeca3ab0c28b4d8b174d1376dc76cc1704fd169..c5fdc37664b748d3daa8d29c57121fe5a2bf7e07 100644
+index b39db457d459e048962712aa2173b3e8b608b37f..3a0338f3f02686f6497b5bf7156131c54d8fd2cd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -360,7 +360,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0453-incremental-chunk-saving.patch b/patches/server/0455-incremental-chunk-saving.patch
similarity index 99%
rename from patches/server/0453-incremental-chunk-saving.patch
rename to patches/server/0455-incremental-chunk-saving.patch
index 0aece1a9c9..fb6d1da542 100644
--- a/patches/server/0453-incremental-chunk-saving.patch
+++ b/patches/server/0455-incremental-chunk-saving.patch
@@ -31,7 +31,7 @@ index 3984d85f1e1833ec199fde1ba64d9c83376b1819..144a8d424cd4f953b1471f20d1521ed1
          config.addDefault("world-settings.default." + path, def);
          return config.getBoolean("world-settings." + worldName + "." + path, config.getBoolean("world-settings.default." + path));
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 8e6938b76ff62f81f868ca0f6badce081263a300..5beed1f7a96df3dfcee236077c34a56c57d78c51 100644
+index f5ef6219b20d5b7af81537dab8d9815d74d1560a..f3a1af9299f3c0b03309b838b00d3eca7caf5966 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -298,6 +298,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -42,7 +42,7 @@ index 8e6938b76ff62f81f868ca0f6badce081263a300..5beed1f7a96df3dfcee236077c34a56c
      public Commands vanillaCommandDispatcher;
      public boolean forceTicks; // Paper
      // CraftBukkit end
-@@ -1411,14 +1412,23 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1415,14 +1416,23 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.status.getPlayers().setSample(agameprofile);
          }
  
diff --git a/patches/server/0454-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0456-Fix-missing-chunks-due-to-integer-overflow.patch
similarity index 100%
rename from patches/server/0454-Fix-missing-chunks-due-to-integer-overflow.patch
rename to patches/server/0456-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/patches/server/0455-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0457-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
similarity index 100%
rename from patches/server/0455-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
rename to patches/server/0457-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/patches/server/0456-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0458-Fix-piston-physics-inconsistency-MC-188840.patch
similarity index 97%
rename from patches/server/0456-Fix-piston-physics-inconsistency-MC-188840.patch
rename to patches/server/0458-Fix-piston-physics-inconsistency-MC-188840.patch
index a4347dfe63..43c48c3579 100644
--- a/patches/server/0456-Fix-piston-physics-inconsistency-MC-188840.patch
+++ b/patches/server/0458-Fix-piston-physics-inconsistency-MC-188840.patch
@@ -32,10 +32,10 @@ This patch fixes https://bugs.mojang.com/browse/MC-188840
 This patch also fixes rail duping and carpet duping.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 203834e28309387f04314b97da078ae1e0ed0638..9a17483c4c44e5022fccfe42845e4060c1703119 100644
+index ddf9b5592e2203315d239ab28a338633600c69fc..0ff0a71fe5dc53fa5fb81edffabc69790e3bcd1e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -450,4 +450,12 @@ public class PaperConfig {
+@@ -454,4 +454,12 @@ public class PaperConfig {
      private static void consoleHasAllPermissions() {
          consoleHasAllPermissions = getBoolean("settings.console-has-all-permissions", consoleHasAllPermissions);
      }
diff --git a/patches/server/0457-Fix-sand-duping.patch b/patches/server/0459-Fix-sand-duping.patch
similarity index 100%
rename from patches/server/0457-Fix-sand-duping.patch
rename to patches/server/0459-Fix-sand-duping.patch
diff --git a/patches/server/0458-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/server/0460-Prevent-position-desync-in-playerconnection-causing-.patch
similarity index 100%
rename from patches/server/0458-Prevent-position-desync-in-playerconnection-causing-.patch
rename to patches/server/0460-Prevent-position-desync-in-playerconnection-causing-.patch
diff --git a/patches/server/0459-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0461-Inventory-getHolder-method-without-block-snapshot.patch
similarity index 100%
rename from patches/server/0459-Inventory-getHolder-method-without-block-snapshot.patch
rename to patches/server/0461-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/server/0460-Expose-Arrow-getItemStack.patch b/patches/server/0462-Expose-Arrow-getItemStack.patch
similarity index 100%
rename from patches/server/0460-Expose-Arrow-getItemStack.patch
rename to patches/server/0462-Expose-Arrow-getItemStack.patch
diff --git a/patches/server/0461-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/server/0463-Add-and-implement-PlayerRecipeBookClickEvent.patch
similarity index 100%
rename from patches/server/0461-Add-and-implement-PlayerRecipeBookClickEvent.patch
rename to patches/server/0463-Add-and-implement-PlayerRecipeBookClickEvent.patch
diff --git a/patches/server/0462-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0464-Hide-sync-chunk-writes-behind-flag.patch
similarity index 100%
rename from patches/server/0462-Hide-sync-chunk-writes-behind-flag.patch
rename to patches/server/0464-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/0463-Add-permission-for-command-blocks.patch b/patches/server/0465-Add-permission-for-command-blocks.patch
similarity index 100%
rename from patches/server/0463-Add-permission-for-command-blocks.patch
rename to patches/server/0465-Add-permission-for-command-blocks.patch
diff --git a/patches/server/0464-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/0466-Ensure-Entity-AABB-s-are-never-invalid.patch
similarity index 100%
rename from patches/server/0464-Ensure-Entity-AABB-s-are-never-invalid.patch
rename to patches/server/0466-Ensure-Entity-AABB-s-are-never-invalid.patch
diff --git a/patches/server/0465-Optimize-WorldBorder-collision-checks-and-air.patch b/patches/server/0467-Optimize-WorldBorder-collision-checks-and-air.patch
similarity index 100%
rename from patches/server/0465-Optimize-WorldBorder-collision-checks-and-air.patch
rename to patches/server/0467-Optimize-WorldBorder-collision-checks-and-air.patch
diff --git a/patches/server/0466-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0468-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
similarity index 93%
rename from patches/server/0466-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
rename to patches/server/0468-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index 3a1e56c645..5f47fb0958 100644
--- a/patches/server/0466-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/patches/server/0468-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
@@ -8,10 +8,10 @@ makes it so that the server keeps the last difficulty used instead
 of restoring the server.properties every single load.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5beed1f7a96df3dfcee236077c34a56c57d78c51..c5f7510056cf4f0889d5470b1f1a444555c6ed75 100644
+index f3a1af9299f3c0b03309b838b00d3eca7caf5966..186193d1d652876e9ad7cdf5223ec2c6f5c65779 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1722,11 +1722,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1726,11 +1726,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
      }
  
@@ -50,10 +50,10 @@ index 33c859df0b669d0c3e97ccba29f17c1ba2166a27..9f03b738aea623fe409ca176397f48be
              return 0;
          }
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index a335d48467d1730bfed25eb5fd9046e115f23ed0..0a930147663850dc2ea7ffe9ced5611d5bab7c6d 100644
+index 8098875a5c4146dec81f5daed0e34ddfe17a26c6..286863b7eb9ee0389154304e61942dd68f978ff1 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -369,7 +369,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -370,7 +370,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
  
      @Override
      public void forceDifficulty() {
diff --git a/patches/server/0467-Paper-dumpitem-command.patch b/patches/server/0469-Paper-dumpitem-command.patch
similarity index 100%
rename from patches/server/0467-Paper-dumpitem-command.patch
rename to patches/server/0469-Paper-dumpitem-command.patch
diff --git a/patches/server/0468-Don-t-allow-null-UUID-s-for-chat.patch b/patches/server/0470-Don-t-allow-null-UUID-s-for-chat.patch
similarity index 100%
rename from patches/server/0468-Don-t-allow-null-UUID-s-for-chat.patch
rename to patches/server/0470-Don-t-allow-null-UUID-s-for-chat.patch
diff --git a/patches/server/0469-Improve-Legacy-Component-serialization-size.patch b/patches/server/0471-Improve-Legacy-Component-serialization-size.patch
similarity index 100%
rename from patches/server/0469-Improve-Legacy-Component-serialization-size.patch
rename to patches/server/0471-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/0470-Stop-copy-on-write-operations-for-updating-light-dat.patch b/patches/server/0472-Stop-copy-on-write-operations-for-updating-light-dat.patch
similarity index 100%
rename from patches/server/0470-Stop-copy-on-write-operations-for-updating-light-dat.patch
rename to patches/server/0472-Stop-copy-on-write-operations-for-updating-light-dat.patch
diff --git a/patches/server/0471-Support-old-UUID-format-for-NBT.patch b/patches/server/0473-Support-old-UUID-format-for-NBT.patch
similarity index 100%
rename from patches/server/0471-Support-old-UUID-format-for-NBT.patch
rename to patches/server/0473-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0472-Clean-up-duplicated-GameProfile-Properties.patch b/patches/server/0474-Clean-up-duplicated-GameProfile-Properties.patch
similarity index 100%
rename from patches/server/0472-Clean-up-duplicated-GameProfile-Properties.patch
rename to patches/server/0474-Clean-up-duplicated-GameProfile-Properties.patch
diff --git a/patches/server/0473-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0475-Convert-legacy-attributes-in-Item-Meta.patch
similarity index 100%
rename from patches/server/0473-Convert-legacy-attributes-in-Item-Meta.patch
rename to patches/server/0475-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/patches/server/0474-Remove-some-streams-from-structures.patch b/patches/server/0476-Remove-some-streams-from-structures.patch
similarity index 100%
rename from patches/server/0474-Remove-some-streams-from-structures.patch
rename to patches/server/0476-Remove-some-streams-from-structures.patch
diff --git a/patches/server/0475-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0477-Remove-streams-from-classes-related-villager-gossip.patch
similarity index 100%
rename from patches/server/0475-Remove-streams-from-classes-related-villager-gossip.patch
rename to patches/server/0477-Remove-streams-from-classes-related-villager-gossip.patch
diff --git a/patches/server/0476-Optimize-NibbleArray-to-use-pooled-buffers.patch b/patches/server/0478-Optimize-NibbleArray-to-use-pooled-buffers.patch
similarity index 100%
rename from patches/server/0476-Optimize-NibbleArray-to-use-pooled-buffers.patch
rename to patches/server/0478-Optimize-NibbleArray-to-use-pooled-buffers.patch
diff --git a/patches/server/0477-Support-components-in-ItemMeta.patch b/patches/server/0479-Support-components-in-ItemMeta.patch
similarity index 100%
rename from patches/server/0477-Support-components-in-ItemMeta.patch
rename to patches/server/0479-Support-components-in-ItemMeta.patch
diff --git a/patches/server/0478-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch b/patches/server/0480-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
similarity index 100%
rename from patches/server/0478-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
rename to patches/server/0480-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
diff --git a/patches/server/0479-Add-entity-liquid-API.patch b/patches/server/0481-Add-entity-liquid-API.patch
similarity index 100%
rename from patches/server/0479-Add-entity-liquid-API.patch
rename to patches/server/0481-Add-entity-liquid-API.patch
diff --git a/patches/server/0480-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0482-Update-itemstack-legacy-name-and-lore.patch
similarity index 100%
rename from patches/server/0480-Update-itemstack-legacy-name-and-lore.patch
rename to patches/server/0482-Update-itemstack-legacy-name-and-lore.patch
diff --git a/patches/server/0481-Spawn-player-in-correct-world-on-login.patch b/patches/server/0483-Spawn-player-in-correct-world-on-login.patch
similarity index 100%
rename from patches/server/0481-Spawn-player-in-correct-world-on-login.patch
rename to patches/server/0483-Spawn-player-in-correct-world-on-login.patch
diff --git a/patches/server/0482-Add-PrepareResultEvent.patch b/patches/server/0484-Add-PrepareResultEvent.patch
similarity index 100%
rename from patches/server/0482-Add-PrepareResultEvent.patch
rename to patches/server/0484-Add-PrepareResultEvent.patch
diff --git a/patches/server/0483-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0485-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 95%
rename from patches/server/0483-Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/server/0485-Allow-delegation-to-vanilla-chunk-gen.patch
index 8261870bd4..a66a5da5ee 100644
--- a/patches/server/0483-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/server/0485-Allow-delegation-to-vanilla-chunk-gen.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Allow delegation to vanilla chunk gen
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c5fdc37664b748d3daa8d29c57121fe5a2bf7e07..bfdfbc550306484290989329878e33adbf3f37cd 100644
+index 3a0338f3f02686f6497b5bf7156131c54d8fd2cd..31007c49f0fd627024307fd67b121e9a1f657aa2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2175,6 +2175,32 @@ public final class CraftServer implements Server {
+@@ -2176,6 +2176,32 @@ public final class CraftServer implements Server {
          return new OldCraftChunkData(world);
      }
  
diff --git a/patches/server/0484-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0486-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
similarity index 100%
rename from patches/server/0484-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
rename to patches/server/0486-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
diff --git a/patches/server/0485-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch b/patches/server/0487-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
similarity index 100%
rename from patches/server/0485-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
rename to patches/server/0487-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
diff --git a/patches/server/0486-Improve-Chunk-Status-Transition-Speed.patch b/patches/server/0488-Improve-Chunk-Status-Transition-Speed.patch
similarity index 100%
rename from patches/server/0486-Improve-Chunk-Status-Transition-Speed.patch
rename to patches/server/0488-Improve-Chunk-Status-Transition-Speed.patch
diff --git a/patches/server/0487-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0489-Optimize-NetworkManager-Exception-Handling.patch
similarity index 100%
rename from patches/server/0487-Optimize-NetworkManager-Exception-Handling.patch
rename to patches/server/0489-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0488-Optimize-the-advancement-data-player-iteration-to-be.patch b/patches/server/0490-Optimize-the-advancement-data-player-iteration-to-be.patch
similarity index 100%
rename from patches/server/0488-Optimize-the-advancement-data-player-iteration-to-be.patch
rename to patches/server/0490-Optimize-the-advancement-data-player-iteration-to-be.patch
diff --git a/patches/server/0489-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0491-Fix-arrows-never-despawning-MC-125757.patch
similarity index 100%
rename from patches/server/0489-Fix-arrows-never-despawning-MC-125757.patch
rename to patches/server/0491-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0490-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0492-Thread-Safe-Vanilla-Command-permission-checking.patch
similarity index 100%
rename from patches/server/0490-Thread-Safe-Vanilla-Command-permission-checking.patch
rename to patches/server/0492-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0491-Move-range-check-for-block-placing-up.patch b/patches/server/0493-Move-range-check-for-block-placing-up.patch
similarity index 100%
rename from patches/server/0491-Move-range-check-for-block-placing-up.patch
rename to patches/server/0493-Move-range-check-for-block-placing-up.patch
diff --git a/patches/server/0492-Fix-SPIGOT-5989.patch b/patches/server/0494-Fix-SPIGOT-5989.patch
similarity index 100%
rename from patches/server/0492-Fix-SPIGOT-5989.patch
rename to patches/server/0494-Fix-SPIGOT-5989.patch
diff --git a/patches/server/0493-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0495-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
similarity index 100%
rename from patches/server/0493-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
rename to patches/server/0495-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0494-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0496-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
similarity index 100%
rename from patches/server/0494-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
rename to patches/server/0496-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0495-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0497-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
similarity index 100%
rename from patches/server/0495-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
rename to patches/server/0497-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0496-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/patches/server/0498-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
similarity index 100%
rename from patches/server/0496-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
rename to patches/server/0498-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
diff --git a/patches/server/0497-Incremental-player-saving.patch b/patches/server/0499-Incremental-player-saving.patch
similarity index 94%
rename from patches/server/0497-Incremental-player-saving.patch
rename to patches/server/0499-Incremental-player-saving.patch
index 7a7af4b7b2..2c49fb7794 100644
--- a/patches/server/0497-Incremental-player-saving.patch
+++ b/patches/server/0499-Incremental-player-saving.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Incremental player saving
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 9a17483c4c44e5022fccfe42845e4060c1703119..154222698ba1855283f8378b996cbfcc8bbdf81c 100644
+index 0ff0a71fe5dc53fa5fb81edffabc69790e3bcd1e..d74f0bdabd64976bf8608f2a5d8f2dc6118a35f2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -458,4 +458,14 @@ public class PaperConfig {
+@@ -462,4 +462,14 @@ public class PaperConfig {
          set("settings.unsupported-settings.allow-tnt-duplication", null);
      }
  
@@ -24,10 +24,10 @@ index 9a17483c4c44e5022fccfe42845e4060c1703119..154222698ba1855283f8378b996cbfcc
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c5f7510056cf4f0889d5470b1f1a444555c6ed75..47fbfe7cc1261d65264bb1897c57f72a7b4df46e 100644
+index 186193d1d652876e9ad7cdf5223ec2c6f5c65779..5595fc75df984b3d21f78759cb76f5b4018ff550 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -979,7 +979,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -981,7 +981,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
          if (this.playerList != null) {
              MinecraftServer.LOGGER.info("Saving players");
@@ -35,7 +35,7 @@ index c5f7510056cf4f0889d5470b1f1a444555c6ed75..47fbfe7cc1261d65264bb1897c57f72a
              this.playerList.removeAll(this.isRestarting); // Paper
              try { Thread.sleep(100); } catch (InterruptedException ex) {} // CraftBukkit - SPIGOT-625 - give server at least a chance to send packets
          }
-@@ -1415,9 +1414,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1419,9 +1418,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          // if (this.autosavePeriod > 0 && this.tickCount % this.autosavePeriod == 0) { // CraftBukkit // Paper - move down
          //     MinecraftServer.LOGGER.debug("Autosave started"); // Paper
          serverAutoSave = (autosavePeriod > 0 && this.tickCount % autosavePeriod == 0); // Paper
diff --git a/patches/server/0498-Fix-some-rails-connecting-improperly.patch b/patches/server/0500-Fix-some-rails-connecting-improperly.patch
similarity index 100%
rename from patches/server/0498-Fix-some-rails-connecting-improperly.patch
rename to patches/server/0500-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0499-Fix-MC-187716-Use-configured-height.patch b/patches/server/0501-Fix-MC-187716-Use-configured-height.patch
similarity index 100%
rename from patches/server/0499-Fix-MC-187716-Use-configured-height.patch
rename to patches/server/0501-Fix-MC-187716-Use-configured-height.patch
diff --git a/patches/server/0500-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0502-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
similarity index 100%
rename from patches/server/0500-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
rename to patches/server/0502-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0501-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0503-Do-not-let-the-server-load-chunks-from-newer-version.patch
similarity index 100%
rename from patches/server/0501-Do-not-let-the-server-load-chunks-from-newer-version.patch
rename to patches/server/0503-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0502-Brand-support.patch b/patches/server/0504-Brand-support.patch
similarity index 100%
rename from patches/server/0502-Brand-support.patch
rename to patches/server/0504-Brand-support.patch
diff --git a/patches/server/0503-Add-setMaxPlayers-API.patch b/patches/server/0505-Add-setMaxPlayers-API.patch
similarity index 94%
rename from patches/server/0503-Add-setMaxPlayers-API.patch
rename to patches/server/0505-Add-setMaxPlayers-API.patch
index 10f7dfe062..0ba5412666 100644
--- a/patches/server/0503-Add-setMaxPlayers-API.patch
+++ b/patches/server/0505-Add-setMaxPlayers-API.patch
@@ -18,7 +18,7 @@ index 9a73364f4d56f3a7cecb27bc8034166b8f5731b9..4d1d5dacb175e7059a6af036432ef891
      private boolean allowCheatsForAllPlayers;
      private static final boolean ALLOW_LOGOUTIVATOR = false;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index bfdfbc550306484290989329878e33adbf3f37cd..c1ea62a2c65fb2cbb79c967cfb8fd2bb9cbba7a2 100644
+index 31007c49f0fd627024307fd67b121e9a1f657aa2..ff10c186939e4d77e7efdbd469531a1b00698508 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -627,6 +627,13 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0504-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0506-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 100%
rename from patches/server/0504-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to patches/server/0506-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0505-Don-t-require-FACING-data.patch b/patches/server/0507-Don-t-require-FACING-data.patch
similarity index 100%
rename from patches/server/0505-Don-t-require-FACING-data.patch
rename to patches/server/0507-Don-t-require-FACING-data.patch
diff --git a/patches/server/0506-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0508-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
similarity index 100%
rename from patches/server/0506-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
rename to patches/server/0508-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
diff --git a/patches/server/0507-Add-moon-phase-API.patch b/patches/server/0509-Add-moon-phase-API.patch
similarity index 100%
rename from patches/server/0507-Add-moon-phase-API.patch
rename to patches/server/0509-Add-moon-phase-API.patch
diff --git a/patches/server/0508-Prevent-headless-pistons-from-being-created.patch b/patches/server/0510-Prevent-headless-pistons-from-being-created.patch
similarity index 96%
rename from patches/server/0508-Prevent-headless-pistons-from-being-created.patch
rename to patches/server/0510-Prevent-headless-pistons-from-being-created.patch
index da7b8b87be..105b070cd5 100644
--- a/patches/server/0508-Prevent-headless-pistons-from-being-created.patch
+++ b/patches/server/0510-Prevent-headless-pistons-from-being-created.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Prevent headless pistons from being created
 Prevent headless pistons from being created by explosions or tree/mushroom growth.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 154222698ba1855283f8378b996cbfcc8bbdf81c..7fb9135d35ff8746044d1e94915c1cc9b11af86f 100644
+index d74f0bdabd64976bf8608f2a5d8f2dc6118a35f2..c59a881632810da1408e74493bafcd4e6b01d975 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -458,6 +458,12 @@ public class PaperConfig {
+@@ -462,6 +462,12 @@ public class PaperConfig {
          set("settings.unsupported-settings.allow-tnt-duplication", null);
      }
  
diff --git a/patches/server/0509-Add-BellRingEvent.patch b/patches/server/0511-Add-BellRingEvent.patch
similarity index 100%
rename from patches/server/0509-Add-BellRingEvent.patch
rename to patches/server/0511-Add-BellRingEvent.patch
diff --git a/patches/server/0510-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0512-Add-zombie-targets-turtle-egg-config.patch
similarity index 100%
rename from patches/server/0510-Add-zombie-targets-turtle-egg-config.patch
rename to patches/server/0512-Add-zombie-targets-turtle-egg-config.patch
diff --git a/patches/server/0511-Buffer-joins-to-world.patch b/patches/server/0513-Buffer-joins-to-world.patch
similarity index 95%
rename from patches/server/0511-Buffer-joins-to-world.patch
rename to patches/server/0513-Buffer-joins-to-world.patch
index 907932540a..f7d606bc3e 100644
--- a/patches/server/0511-Buffer-joins-to-world.patch
+++ b/patches/server/0513-Buffer-joins-to-world.patch
@@ -8,10 +8,10 @@ the world per tick, this attempts to reduce the impact that join floods
 has on the server
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 7fb9135d35ff8746044d1e94915c1cc9b11af86f..40b93af871b66bae3498c6e9738eaa5debe90d42 100644
+index c59a881632810da1408e74493bafcd4e6b01d975..07eeb01c95a04299fab2daddfdaf5d1a96495ef0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -474,4 +474,9 @@ public class PaperConfig {
+@@ -478,4 +478,9 @@ public class PaperConfig {
              maxPlayerAutoSavePerTick = (playerAutoSaveRate == -1 || playerAutoSaveRate > 100) ? 10 : 20;
          }
      }
diff --git a/patches/server/0512-Optimize-redstone-algorithm.patch b/patches/server/0514-Optimize-redstone-algorithm.patch
similarity index 100%
rename from patches/server/0512-Optimize-redstone-algorithm.patch
rename to patches/server/0514-Optimize-redstone-algorithm.patch
diff --git a/patches/server/0513-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0515-Fix-hex-colors-not-working-in-some-kick-messages.patch
similarity index 98%
rename from patches/server/0513-Fix-hex-colors-not-working-in-some-kick-messages.patch
rename to patches/server/0515-Fix-hex-colors-not-working-in-some-kick-messages.patch
index 07e2514385..ae103d20a7 100644
--- a/patches/server/0513-Fix-hex-colors-not-working-in-some-kick-messages.patch
+++ b/patches/server/0515-Fix-hex-colors-not-working-in-some-kick-messages.patch
@@ -43,7 +43,7 @@ index c09d3cdb3acb04b6a833c30a619ff2af5e8b6b18..2384ae5082afd01c4f28fe2f3f782cdc
                              this.connection.disconnect(chatmessage);
                              return;
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index bd1203a5b58bac7cccf1f81337fa2967a0e9eb40..7da88bc52161dc32da22451077a4dfd8facb2de1 100644
+index 6468a675862ee2956308b760012fe25cf505563f..f4cff18afa816aa7efb2f80e0af51216129963a4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -106,14 +106,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
diff --git a/patches/server/0514-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0516-PortalCreateEvent-needs-to-know-its-entity.patch
similarity index 100%
rename from patches/server/0514-PortalCreateEvent-needs-to-know-its-entity.patch
rename to patches/server/0516-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/patches/server/0515-Fix-CraftTeam-null-check.patch b/patches/server/0517-Fix-CraftTeam-null-check.patch
similarity index 100%
rename from patches/server/0515-Fix-CraftTeam-null-check.patch
rename to patches/server/0517-Fix-CraftTeam-null-check.patch
diff --git a/patches/server/0516-Add-more-Evoker-API.patch b/patches/server/0518-Add-more-Evoker-API.patch
similarity index 100%
rename from patches/server/0516-Add-more-Evoker-API.patch
rename to patches/server/0518-Add-more-Evoker-API.patch
diff --git a/patches/server/0517-Add-methods-to-get-translation-keys.patch b/patches/server/0519-Add-methods-to-get-translation-keys.patch
similarity index 100%
rename from patches/server/0517-Add-methods-to-get-translation-keys.patch
rename to patches/server/0519-Add-methods-to-get-translation-keys.patch
diff --git a/patches/server/0518-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0520-Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from patches/server/0518-Create-HoverEvent-from-ItemStack-Entity.patch
rename to patches/server/0520-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0519-Cache-block-data-strings.patch b/patches/server/0521-Cache-block-data-strings.patch
similarity index 95%
rename from patches/server/0519-Cache-block-data-strings.patch
rename to patches/server/0521-Cache-block-data-strings.patch
index 706d0a6ad0..7bb44626b1 100644
--- a/patches/server/0519-Cache-block-data-strings.patch
+++ b/patches/server/0521-Cache-block-data-strings.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Cache block data strings
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 47fbfe7cc1261d65264bb1897c57f72a7b4df46e..79975b851f73ab308e9f5b295a85327bb62dee29 100644
+index 5595fc75df984b3d21f78759cb76f5b4018ff550..3116ecf53e801347cde74753f0edb8d37ee1c117 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2038,6 +2038,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2042,6 +2042,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.getPlayerList().reloadResources();
              this.functionManager.replaceLibrary(this.resources.getFunctionLibrary());
              this.structureManager.onResourceManagerReload(this.resources.getResourceManager());
diff --git a/patches/server/0520-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0522-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
similarity index 100%
rename from patches/server/0520-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
rename to patches/server/0522-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
diff --git a/patches/server/0521-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0523-Add-additional-open-container-api-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0521-Add-additional-open-container-api-to-HumanEntity.patch
rename to patches/server/0523-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0522-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0524-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
similarity index 100%
rename from patches/server/0522-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
rename to patches/server/0524-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0523-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0525-Extend-block-drop-capture-to-capture-all-items-added.patch
similarity index 100%
rename from patches/server/0523-Extend-block-drop-capture-to-capture-all-items-added.patch
rename to patches/server/0525-Extend-block-drop-capture-to-capture-all-items-added.patch
diff --git a/patches/server/0524-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch b/patches/server/0526-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
similarity index 100%
rename from patches/server/0524-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
rename to patches/server/0526-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
diff --git a/patches/server/0525-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0527-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 100%
rename from patches/server/0525-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to patches/server/0527-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/patches/server/0526-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0528-Lazily-track-plugin-scoreboards-by-default.patch
similarity index 97%
rename from patches/server/0526-Lazily-track-plugin-scoreboards-by-default.patch
rename to patches/server/0528-Lazily-track-plugin-scoreboards-by-default.patch
index c85f35a620..3e1f9d058d 100644
--- a/patches/server/0526-Lazily-track-plugin-scoreboards-by-default.patch
+++ b/patches/server/0528-Lazily-track-plugin-scoreboards-by-default.patch
@@ -14,10 +14,10 @@ this breaks your workflow you can always force all scoreboards to be tracked wit
 settings.track-plugin-scoreboards in paper.yml.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 40b93af871b66bae3498c6e9738eaa5debe90d42..75fbffa9628072d2ebb0035bc057924eb6ed31e1 100644
+index 07eeb01c95a04299fab2daddfdaf5d1a96495ef0..4747eb55decd797c7872028997f4e22d15c5a661 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -479,4 +479,9 @@ public class PaperConfig {
+@@ -483,4 +483,9 @@ public class PaperConfig {
      private static void maxJoinsPerTick() {
          maxJoinsPerTick = getInt("settings.max-joins-per-tick", 3);
      }
diff --git a/patches/server/0527-Entity-isTicking.patch b/patches/server/0529-Entity-isTicking.patch
similarity index 100%
rename from patches/server/0527-Entity-isTicking.patch
rename to patches/server/0529-Entity-isTicking.patch
diff --git a/patches/server/0528-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0530-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
similarity index 86%
rename from patches/server/0528-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
rename to patches/server/0530-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
index e94815d333..42f7e2ea85 100644
--- a/patches/server/0528-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
+++ b/patches/server/0530-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix deop kicking non-whitelisted player when white list is
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 79975b851f73ab308e9f5b295a85327bb62dee29..1a8ef9cca2c855937087a18b30fbd4c116f5ec1e 100644
+index 3116ecf53e801347cde74753f0edb8d37ee1c117..50e7af2a9f9dd92575da64fa6d6469bdf5599c81 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2104,6 +2104,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2108,6 +2108,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          if (this.isEnforceWhitelist()) {
              PlayerList playerlist = source.getServer().getPlayerList();
              UserWhiteList whitelist = playerlist.getWhiteList();
diff --git a/patches/server/0529-Fix-Concurrency-issue-in-WeightedList.patch b/patches/server/0531-Fix-Concurrency-issue-in-WeightedList.patch
similarity index 100%
rename from patches/server/0529-Fix-Concurrency-issue-in-WeightedList.patch
rename to patches/server/0531-Fix-Concurrency-issue-in-WeightedList.patch
diff --git a/patches/server/0530-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0532-Reset-Ender-Crystals-on-Dragon-Spawn.patch
similarity index 100%
rename from patches/server/0530-Reset-Ender-Crystals-on-Dragon-Spawn.patch
rename to patches/server/0532-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0531-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0533-Fix-for-large-move-vectors-crashing-server.patch
similarity index 100%
rename from patches/server/0531-Fix-for-large-move-vectors-crashing-server.patch
rename to patches/server/0533-Fix-for-large-move-vectors-crashing-server.patch
diff --git a/patches/server/0532-Optimise-getType-calls.patch b/patches/server/0534-Optimise-getType-calls.patch
similarity index 100%
rename from patches/server/0532-Optimise-getType-calls.patch
rename to patches/server/0534-Optimise-getType-calls.patch
diff --git a/patches/server/0533-Villager-resetOffers.patch b/patches/server/0535-Villager-resetOffers.patch
similarity index 100%
rename from patches/server/0533-Villager-resetOffers.patch
rename to patches/server/0535-Villager-resetOffers.patch
diff --git a/patches/server/0534-Improve-inlinig-for-some-hot-IBlockData-methods.patch b/patches/server/0536-Improve-inlinig-for-some-hot-IBlockData-methods.patch
similarity index 100%
rename from patches/server/0534-Improve-inlinig-for-some-hot-IBlockData-methods.patch
rename to patches/server/0536-Improve-inlinig-for-some-hot-IBlockData-methods.patch
diff --git a/patches/server/0535-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0537-Retain-block-place-order-when-capturing-blockstates.patch
similarity index 100%
rename from patches/server/0535-Retain-block-place-order-when-capturing-blockstates.patch
rename to patches/server/0537-Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/patches/server/0536-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0538-Reduce-blockpos-allocation-from-pathfinding.patch
similarity index 100%
rename from patches/server/0536-Reduce-blockpos-allocation-from-pathfinding.patch
rename to patches/server/0538-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/patches/server/0537-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0539-Fix-item-locations-dropped-from-campfires.patch
similarity index 100%
rename from patches/server/0537-Fix-item-locations-dropped-from-campfires.patch
rename to patches/server/0539-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0538-Player-elytra-boost-API.patch b/patches/server/0540-Player-elytra-boost-API.patch
similarity index 100%
rename from patches/server/0538-Player-elytra-boost-API.patch
rename to patches/server/0540-Player-elytra-boost-API.patch
diff --git a/patches/server/0539-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0541-Fixed-TileEntityBell-memory-leak.patch
similarity index 100%
rename from patches/server/0539-Fixed-TileEntityBell-memory-leak.patch
rename to patches/server/0541-Fixed-TileEntityBell-memory-leak.patch
diff --git a/patches/server/0540-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0542-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
similarity index 100%
rename from patches/server/0540-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
rename to patches/server/0542-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0541-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0543-Add-getOfflinePlayerIfCached-String.patch
similarity index 88%
rename from patches/server/0541-Add-getOfflinePlayerIfCached-String.patch
rename to patches/server/0543-Add-getOfflinePlayerIfCached-String.patch
index 5ed473e648..7906064288 100644
--- a/patches/server/0541-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/server/0543-Add-getOfflinePlayerIfCached-String.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add getOfflinePlayerIfCached(String)
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c1ea62a2c65fb2cbb79c967cfb8fd2bb9cbba7a2..af988f828e9f1ec3f6f317d907611e950665c17f 100644
+index ff10c186939e4d77e7efdbd469531a1b00698508..7084349cf214e150c610c991bfcbafdced59da56 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1745,6 +1745,28 @@ public final class CraftServer implements Server {
+@@ -1746,6 +1746,28 @@ public final class CraftServer implements Server {
          return result;
      }
  
diff --git a/patches/server/0542-Add-ignore-discounts-API.patch b/patches/server/0544-Add-ignore-discounts-API.patch
similarity index 100%
rename from patches/server/0542-Add-ignore-discounts-API.patch
rename to patches/server/0544-Add-ignore-discounts-API.patch
diff --git a/patches/server/0543-Toggle-for-removing-existing-dragon.patch b/patches/server/0545-Toggle-for-removing-existing-dragon.patch
similarity index 100%
rename from patches/server/0543-Toggle-for-removing-existing-dragon.patch
rename to patches/server/0545-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/0544-Fix-client-lag-on-advancement-loading.patch b/patches/server/0546-Fix-client-lag-on-advancement-loading.patch
similarity index 100%
rename from patches/server/0544-Fix-client-lag-on-advancement-loading.patch
rename to patches/server/0546-Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/server/0545-Item-no-age-no-player-pickup.patch b/patches/server/0547-Item-no-age-no-player-pickup.patch
similarity index 100%
rename from patches/server/0545-Item-no-age-no-player-pickup.patch
rename to patches/server/0547-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0546-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0548-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
similarity index 100%
rename from patches/server/0546-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
rename to patches/server/0548-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/0547-Beacon-API-custom-effect-ranges.patch b/patches/server/0549-Beacon-API-custom-effect-ranges.patch
similarity index 100%
rename from patches/server/0547-Beacon-API-custom-effect-ranges.patch
rename to patches/server/0549-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0548-Add-API-for-quit-reason.patch b/patches/server/0550-Add-API-for-quit-reason.patch
similarity index 100%
rename from patches/server/0548-Add-API-for-quit-reason.patch
rename to patches/server/0550-Add-API-for-quit-reason.patch
diff --git a/patches/server/0549-Seed-based-feature-search.patch b/patches/server/0551-Seed-based-feature-search.patch
similarity index 100%
rename from patches/server/0549-Seed-based-feature-search.patch
rename to patches/server/0551-Seed-based-feature-search.patch
diff --git a/patches/server/0550-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0552-Add-Wandering-Trader-spawn-rate-config-options.patch
similarity index 100%
rename from patches/server/0550-Add-Wandering-Trader-spawn-rate-config-options.patch
rename to patches/server/0552-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0551-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0553-Significantly-improve-performance-of-the-end-generat.patch
similarity index 100%
rename from patches/server/0551-Significantly-improve-performance-of-the-end-generat.patch
rename to patches/server/0553-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0552-Expose-world-spawn-angle.patch b/patches/server/0554-Expose-world-spawn-angle.patch
similarity index 100%
rename from patches/server/0552-Expose-world-spawn-angle.patch
rename to patches/server/0554-Expose-world-spawn-angle.patch
diff --git a/patches/server/0553-Add-Destroy-Speed-API.patch b/patches/server/0555-Add-Destroy-Speed-API.patch
similarity index 100%
rename from patches/server/0553-Add-Destroy-Speed-API.patch
rename to patches/server/0555-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0554-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0556-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
similarity index 100%
rename from patches/server/0554-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
rename to patches/server/0556-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
diff --git a/patches/server/0555-Add-LivingEntity-clearActiveItem.patch b/patches/server/0557-Add-LivingEntity-clearActiveItem.patch
similarity index 100%
rename from patches/server/0555-Add-LivingEntity-clearActiveItem.patch
rename to patches/server/0557-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0556-Add-PlayerItemCooldownEvent.patch b/patches/server/0558-Add-PlayerItemCooldownEvent.patch
similarity index 100%
rename from patches/server/0556-Add-PlayerItemCooldownEvent.patch
rename to patches/server/0558-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0557-More-lightning-API.patch b/patches/server/0559-More-lightning-API.patch
similarity index 100%
rename from patches/server/0557-More-lightning-API.patch
rename to patches/server/0559-More-lightning-API.patch
diff --git a/patches/server/0558-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0560-Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 100%
rename from patches/server/0558-Climbing-should-not-bypass-cramming-gamerule.patch
rename to patches/server/0560-Climbing-should-not-bypass-cramming-gamerule.patch
diff --git a/patches/server/0559-Added-missing-default-perms-for-commands.patch b/patches/server/0561-Added-missing-default-perms-for-commands.patch
similarity index 100%
rename from patches/server/0559-Added-missing-default-perms-for-commands.patch
rename to patches/server/0561-Added-missing-default-perms-for-commands.patch
diff --git a/patches/server/0560-Add-PlayerShearBlockEvent.patch b/patches/server/0562-Add-PlayerShearBlockEvent.patch
similarity index 100%
rename from patches/server/0560-Add-PlayerShearBlockEvent.patch
rename to patches/server/0562-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0561-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0563-Set-spigots-verbose-world-setting-to-false-by-def.patch
similarity index 100%
rename from patches/server/0561-Set-spigots-verbose-world-setting-to-false-by-def.patch
rename to patches/server/0563-Set-spigots-verbose-world-setting-to-false-by-def.patch
diff --git a/patches/server/0562-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0564-Fix-curing-zombie-villager-discount-exploit.patch
similarity index 100%
rename from patches/server/0562-Fix-curing-zombie-villager-discount-exploit.patch
rename to patches/server/0564-Fix-curing-zombie-villager-discount-exploit.patch
diff --git a/patches/server/0563-Limit-recipe-packets.patch b/patches/server/0565-Limit-recipe-packets.patch
similarity index 97%
rename from patches/server/0563-Limit-recipe-packets.patch
rename to patches/server/0565-Limit-recipe-packets.patch
index 3dfc824b69..09d8e0726c 100644
--- a/patches/server/0563-Limit-recipe-packets.patch
+++ b/patches/server/0565-Limit-recipe-packets.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Limit recipe packets
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 75fbffa9628072d2ebb0035bc057924eb6ed31e1..8889d727a0531d4ac65f01959ed68b57344b7ef2 100644
+index 4747eb55decd797c7872028997f4e22d15c5a661..ff337f7f5317f30b65e1b40c11c1783421f1a89d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -352,6 +352,13 @@ public class PaperConfig {
diff --git a/patches/server/0564-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0566-Fix-CraftSound-backwards-compatibility.patch
similarity index 100%
rename from patches/server/0564-Fix-CraftSound-backwards-compatibility.patch
rename to patches/server/0566-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0565-MC-4-Fix-item-position-desync.patch b/patches/server/0567-MC-4-Fix-item-position-desync.patch
similarity index 95%
rename from patches/server/0565-MC-4-Fix-item-position-desync.patch
rename to patches/server/0567-MC-4-Fix-item-position-desync.patch
index 42648f8874..ad2e489186 100644
--- a/patches/server/0565-MC-4-Fix-item-position-desync.patch
+++ b/patches/server/0567-MC-4-Fix-item-position-desync.patch
@@ -9,10 +9,10 @@ loss, which forces the server to lose the same precision as the client
 keeping them in sync.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 8889d727a0531d4ac65f01959ed68b57344b7ef2..bcd01736e91c126d655a0a71090e9dadf22e79b9 100644
+index ff337f7f5317f30b65e1b40c11c1783421f1a89d..5af9d91e15b0c10da79fa935cc884cd2766edfae 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -491,4 +491,9 @@ public class PaperConfig {
+@@ -495,4 +495,9 @@ public class PaperConfig {
      private static void trackPluginScoreboards() {
          trackPluginScoreboards = getBoolean("settings.track-plugin-scoreboards", false);
      }
diff --git a/patches/server/0566-Player-Chunk-Load-Unload-Events.patch b/patches/server/0568-Player-Chunk-Load-Unload-Events.patch
similarity index 100%
rename from patches/server/0566-Player-Chunk-Load-Unload-Events.patch
rename to patches/server/0568-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0567-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0569-Optimize-Dynamic-get-Missing-Keys.patch
similarity index 100%
rename from patches/server/0567-Optimize-Dynamic-get-Missing-Keys.patch
rename to patches/server/0569-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0568-Expose-LivingEntity-hurt-direction.patch b/patches/server/0570-Expose-LivingEntity-hurt-direction.patch
similarity index 100%
rename from patches/server/0568-Expose-LivingEntity-hurt-direction.patch
rename to patches/server/0570-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0569-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0571-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 100%
rename from patches/server/0569-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to patches/server/0571-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/server/0570-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0572-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
similarity index 100%
rename from patches/server/0570-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
rename to patches/server/0572-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/patches/server/0571-added-PlayerTradeEvent.patch b/patches/server/0573-added-PlayerTradeEvent.patch
similarity index 100%
rename from patches/server/0571-added-PlayerTradeEvent.patch
rename to patches/server/0573-added-PlayerTradeEvent.patch
diff --git a/patches/server/0572-Implement-TargetHitEvent.patch b/patches/server/0574-Implement-TargetHitEvent.patch
similarity index 100%
rename from patches/server/0572-Implement-TargetHitEvent.patch
rename to patches/server/0574-Implement-TargetHitEvent.patch
diff --git a/patches/server/0573-Additional-Block-Material-API-s.patch b/patches/server/0575-Additional-Block-Material-API-s.patch
similarity index 100%
rename from patches/server/0573-Additional-Block-Material-API-s.patch
rename to patches/server/0575-Additional-Block-Material-API-s.patch
diff --git a/patches/server/0574-Fix-harming-potion-dupe.patch b/patches/server/0576-Fix-harming-potion-dupe.patch
similarity index 100%
rename from patches/server/0574-Fix-harming-potion-dupe.patch
rename to patches/server/0576-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0575-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0577-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
similarity index 100%
rename from patches/server/0575-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
rename to patches/server/0577-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/patches/server/0576-Cache-burn-durations.patch b/patches/server/0578-Cache-burn-durations.patch
similarity index 100%
rename from patches/server/0576-Cache-burn-durations.patch
rename to patches/server/0578-Cache-burn-durations.patch
diff --git a/patches/server/0577-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0579-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
similarity index 100%
rename from patches/server/0577-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
rename to patches/server/0579-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0578-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0580-Fix-Not-a-string-Map-Conversion-spam.patch
similarity index 100%
rename from patches/server/0578-Fix-Not-a-string-Map-Conversion-spam.patch
rename to patches/server/0580-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0579-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0581-Implement-PlayerFlowerPotManipulateEvent.patch
similarity index 100%
rename from patches/server/0579-Implement-PlayerFlowerPotManipulateEvent.patch
rename to patches/server/0581-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0580-Fix-interact-event-not-being-called-in-adventure.patch b/patches/server/0582-Fix-interact-event-not-being-called-in-adventure.patch
similarity index 100%
rename from patches/server/0580-Fix-interact-event-not-being-called-in-adventure.patch
rename to patches/server/0582-Fix-interact-event-not-being-called-in-adventure.patch
diff --git a/patches/server/0581-Zombie-API-breaking-doors.patch b/patches/server/0583-Zombie-API-breaking-doors.patch
similarity index 100%
rename from patches/server/0581-Zombie-API-breaking-doors.patch
rename to patches/server/0583-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0582-Fix-nerfed-slime-when-splitting.patch b/patches/server/0584-Fix-nerfed-slime-when-splitting.patch
similarity index 100%
rename from patches/server/0582-Fix-nerfed-slime-when-splitting.patch
rename to patches/server/0584-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0583-Add-EntityLoadCrossbowEvent.patch b/patches/server/0585-Add-EntityLoadCrossbowEvent.patch
similarity index 100%
rename from patches/server/0583-Add-EntityLoadCrossbowEvent.patch
rename to patches/server/0585-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0584-Guardian-beam-workaround.patch b/patches/server/0586-Guardian-beam-workaround.patch
similarity index 100%
rename from patches/server/0584-Guardian-beam-workaround.patch
rename to patches/server/0586-Guardian-beam-workaround.patch
diff --git a/patches/server/0585-Added-WorldGameRuleChangeEvent.patch b/patches/server/0587-Added-WorldGameRuleChangeEvent.patch
similarity index 100%
rename from patches/server/0585-Added-WorldGameRuleChangeEvent.patch
rename to patches/server/0587-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0586-Added-ServerResourcesReloadedEvent.patch b/patches/server/0588-Added-ServerResourcesReloadedEvent.patch
similarity index 93%
rename from patches/server/0586-Added-ServerResourcesReloadedEvent.patch
rename to patches/server/0588-Added-ServerResourcesReloadedEvent.patch
index b7450ef6fd..9e94ef83ef 100644
--- a/patches/server/0586-Added-ServerResourcesReloadedEvent.patch
+++ b/patches/server/0588-Added-ServerResourcesReloadedEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Added ServerResourcesReloadedEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1a8ef9cca2c855937087a18b30fbd4c116f5ec1e..c848ec7a39ac18cd622b681298200769c78b5ae5 100644
+index 50e7af2a9f9dd92575da64fa6d6469bdf5599c81..3150128a9bdabe902b18ebb7aadbc8a50f686a5b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2017,7 +2017,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2021,7 +2021,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          return this.functionManager;
      }
  
@@ -22,7 +22,7 @@ index 1a8ef9cca2c855937087a18b30fbd4c116f5ec1e..c848ec7a39ac18cd622b681298200769
          CompletableFuture<Void> completablefuture = CompletableFuture.supplyAsync(() -> {
              Stream<String> stream = datapacks.stream(); // CraftBukkit - decompile error
              PackRepository resourcepackrepository = this.packRepository;
-@@ -2033,6 +2039,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2037,6 +2043,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.packRepository.setSelected(datapacks);
              this.worldData.setDataPackConfig(MinecraftServer.getSelectedPacks(this.packRepository));
              datapackresources.updateGlobals();
diff --git a/patches/server/0587-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0589-Added-world-settings-for-mobs-picking-up-loot.patch
similarity index 100%
rename from patches/server/0587-Added-world-settings-for-mobs-picking-up-loot.patch
rename to patches/server/0589-Added-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0588-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0590-Implemented-BlockFailedDispenseEvent.patch
similarity index 100%
rename from patches/server/0588-Implemented-BlockFailedDispenseEvent.patch
rename to patches/server/0590-Implemented-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0589-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0591-Added-PlayerLecternPageChangeEvent.patch
similarity index 100%
rename from patches/server/0589-Added-PlayerLecternPageChangeEvent.patch
rename to patches/server/0591-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0590-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0592-Added-PlayerLoomPatternSelectEvent.patch
similarity index 100%
rename from patches/server/0590-Added-PlayerLoomPatternSelectEvent.patch
rename to patches/server/0592-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0591-Configurable-door-breaking-difficulty.patch b/patches/server/0593-Configurable-door-breaking-difficulty.patch
similarity index 100%
rename from patches/server/0591-Configurable-door-breaking-difficulty.patch
rename to patches/server/0593-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0592-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0594-Empty-commands-shall-not-be-dispatched.patch
similarity index 100%
rename from patches/server/0592-Empty-commands-shall-not-be-dispatched.patch
rename to patches/server/0594-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0593-Implement-API-to-expose-exact-interaction-point.patch b/patches/server/0595-Implement-API-to-expose-exact-interaction-point.patch
similarity index 100%
rename from patches/server/0593-Implement-API-to-expose-exact-interaction-point.patch
rename to patches/server/0595-Implement-API-to-expose-exact-interaction-point.patch
diff --git a/patches/server/0594-Remove-stale-POIs.patch b/patches/server/0596-Remove-stale-POIs.patch
similarity index 100%
rename from patches/server/0594-Remove-stale-POIs.patch
rename to patches/server/0596-Remove-stale-POIs.patch
diff --git a/patches/server/0595-Fix-villager-boat-exploit.patch b/patches/server/0597-Fix-villager-boat-exploit.patch
similarity index 100%
rename from patches/server/0595-Fix-villager-boat-exploit.patch
rename to patches/server/0597-Fix-villager-boat-exploit.patch
diff --git a/patches/server/0596-Add-sendOpLevel-API.patch b/patches/server/0598-Add-sendOpLevel-API.patch
similarity index 100%
rename from patches/server/0596-Add-sendOpLevel-API.patch
rename to patches/server/0598-Add-sendOpLevel-API.patch
diff --git a/patches/server/0597-Add-StructureLocateEvent.patch b/patches/server/0599-Add-StructureLocateEvent.patch
similarity index 100%
rename from patches/server/0597-Add-StructureLocateEvent.patch
rename to patches/server/0599-Add-StructureLocateEvent.patch
diff --git a/patches/server/0598-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0600-Collision-option-for-requiring-a-player-participant.patch
similarity index 100%
rename from patches/server/0598-Collision-option-for-requiring-a-player-participant.patch
rename to patches/server/0600-Collision-option-for-requiring-a-player-participant.patch
diff --git a/patches/server/0599-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0601-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
similarity index 100%
rename from patches/server/0599-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
rename to patches/server/0601-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0600-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0602-Return-chat-component-with-empty-text-instead-of-thr.patch
similarity index 100%
rename from patches/server/0600-Return-chat-component-with-empty-text-instead-of-thr.patch
rename to patches/server/0602-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0601-Make-schedule-command-per-world.patch b/patches/server/0603-Make-schedule-command-per-world.patch
similarity index 100%
rename from patches/server/0601-Make-schedule-command-per-world.patch
rename to patches/server/0603-Make-schedule-command-per-world.patch
diff --git a/patches/server/0602-Configurable-max-leash-distance.patch b/patches/server/0604-Configurable-max-leash-distance.patch
similarity index 100%
rename from patches/server/0602-Configurable-max-leash-distance.patch
rename to patches/server/0604-Configurable-max-leash-distance.patch
diff --git a/patches/server/0603-Implement-BlockPreDispenseEvent.patch b/patches/server/0605-Implement-BlockPreDispenseEvent.patch
similarity index 100%
rename from patches/server/0603-Implement-BlockPreDispenseEvent.patch
rename to patches/server/0605-Implement-BlockPreDispenseEvent.patch
diff --git a/patches/server/0604-Added-Vanilla-Entity-Tags.patch b/patches/server/0606-Added-Vanilla-Entity-Tags.patch
similarity index 96%
rename from patches/server/0604-Added-Vanilla-Entity-Tags.patch
rename to patches/server/0606-Added-Vanilla-Entity-Tags.patch
index 8a038fd953..390732b11b 100644
--- a/patches/server/0604-Added-Vanilla-Entity-Tags.patch
+++ b/patches/server/0606-Added-Vanilla-Entity-Tags.patch
@@ -39,10 +39,10 @@ index 0000000000000000000000000000000000000000..6271586368c65250c887739d04c5fccf
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index af988f828e9f1ec3f6f317d907611e950665c17f..5cda9f21219decf6e4b9e5cc6e83b4749066f20f 100644
+index 7084349cf214e150c610c991bfcbafdced59da56..5b95bb1d1361740f5605873fb707980bb911e6a3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2364,6 +2364,11 @@ public final class CraftServer implements Server {
+@@ -2365,6 +2365,11 @@ public final class CraftServer implements Server {
                  Preconditions.checkArgument(clazz == org.bukkit.Fluid.class, "Fluid namespace must have fluid type");
  
                  return (org.bukkit.Tag<T>) new CraftFluidTag(FluidTags.getAllTags(), key);
diff --git a/patches/server/0605-added-Wither-API.patch b/patches/server/0607-added-Wither-API.patch
similarity index 100%
rename from patches/server/0605-added-Wither-API.patch
rename to patches/server/0607-added-Wither-API.patch
diff --git a/patches/server/0606-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0608-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
similarity index 100%
rename from patches/server/0606-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
rename to patches/server/0608-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0607-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0609-Add-toggle-for-always-placing-the-dragon-egg.patch
similarity index 100%
rename from patches/server/0607-Add-toggle-for-always-placing-the-dragon-egg.patch
rename to patches/server/0609-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0608-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0610-Added-PlayerStonecutterRecipeSelectEvent.patch
similarity index 100%
rename from patches/server/0608-Added-PlayerStonecutterRecipeSelectEvent.patch
rename to patches/server/0610-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0609-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0611-Add-dropLeash-variable-to-EntityUnleashEvent.patch
similarity index 100%
rename from patches/server/0609-Add-dropLeash-variable-to-EntityUnleashEvent.patch
rename to patches/server/0611-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/server/0610-Skip-distance-map-update-when-spawning-disabled.patch b/patches/server/0612-Skip-distance-map-update-when-spawning-disabled.patch
similarity index 100%
rename from patches/server/0610-Skip-distance-map-update-when-spawning-disabled.patch
rename to patches/server/0612-Skip-distance-map-update-when-spawning-disabled.patch
diff --git a/patches/server/0611-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0613-Reset-shield-blocking-on-dimension-change.patch
similarity index 100%
rename from patches/server/0611-Reset-shield-blocking-on-dimension-change.patch
rename to patches/server/0613-Reset-shield-blocking-on-dimension-change.patch
diff --git a/patches/server/0612-add-DragonEggFormEvent.patch b/patches/server/0614-add-DragonEggFormEvent.patch
similarity index 100%
rename from patches/server/0612-add-DragonEggFormEvent.patch
rename to patches/server/0614-add-DragonEggFormEvent.patch
diff --git a/patches/server/0613-EntityMoveEvent.patch b/patches/server/0615-EntityMoveEvent.patch
similarity index 95%
rename from patches/server/0613-EntityMoveEvent.patch
rename to patches/server/0615-EntityMoveEvent.patch
index 2a5dc133b7..93675c6f06 100644
--- a/patches/server/0613-EntityMoveEvent.patch
+++ b/patches/server/0615-EntityMoveEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] EntityMoveEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c848ec7a39ac18cd622b681298200769c78b5ae5..9111d3fb84ca4a7dc881e1326ac0c93a81ec7f58 100644
+index 3150128a9bdabe902b18ebb7aadbc8a50f686a5b..f15cb87d96b3f5028ab6ceba1e9026525cdecbee 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1522,6 +1522,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1526,6 +1526,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          while (iterator.hasNext()) {
              ServerLevel worldserver = (ServerLevel) iterator.next();
              worldserver.hasPhysicsEvent =  org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
diff --git a/patches/server/0614-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0616-added-option-to-disable-pathfinding-updates-on-block.patch
similarity index 100%
rename from patches/server/0614-added-option-to-disable-pathfinding-updates-on-block.patch
rename to patches/server/0616-added-option-to-disable-pathfinding-updates-on-block.patch
diff --git a/patches/server/0615-Inline-shift-direction-fields.patch b/patches/server/0617-Inline-shift-direction-fields.patch
similarity index 100%
rename from patches/server/0615-Inline-shift-direction-fields.patch
rename to patches/server/0617-Inline-shift-direction-fields.patch
diff --git a/patches/server/0616-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0618-Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 100%
rename from patches/server/0616-Allow-adding-items-to-BlockDropItemEvent.patch
rename to patches/server/0618-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0617-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0619-Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from patches/server/0617-Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to patches/server/0619-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0618-living-entity-allow-attribute-registration.patch b/patches/server/0620-living-entity-allow-attribute-registration.patch
similarity index 100%
rename from patches/server/0618-living-entity-allow-attribute-registration.patch
rename to patches/server/0620-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0619-fix-dead-slime-setSize-invincibility.patch b/patches/server/0621-fix-dead-slime-setSize-invincibility.patch
similarity index 100%
rename from patches/server/0619-fix-dead-slime-setSize-invincibility.patch
rename to patches/server/0621-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0620-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0622-Merchant-getRecipes-should-return-an-immutable-list.patch
similarity index 100%
rename from patches/server/0620-Merchant-getRecipes-should-return-an-immutable-list.patch
rename to patches/server/0622-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0622-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0623-Add-support-for-hex-color-codes-in-console.patch
similarity index 97%
rename from patches/server/0622-Add-support-for-hex-color-codes-in-console.patch
rename to patches/server/0623-Add-support-for-hex-color-codes-in-console.patch
index c5f63cd550..bcd20a6201 100644
--- a/patches/server/0622-Add-support-for-hex-color-codes-in-console.patch
+++ b/patches/server/0623-Add-support-for-hex-color-codes-in-console.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add support for hex color codes in console
 Converts upstream's hex color code legacy format into actual hex color codes in the console.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 81d507895572e9c0ec3c87d3745f95067922093a..5ee1e44647cfd7dff08ba7ce17d4b04246b7ab57 100644
+index 3cffe7e7a09595f7aa200d146c68207946544bc7..77754f4de68ca0e5acf6252ae0b1210d7ce79ec8 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -28,6 +28,7 @@ dependencies {
+@@ -40,6 +40,7 @@ dependencies {
            Scanning takes about 1-2 seconds so adding this speeds up the server start.
       */
      implementation("org.apache.logging.log4j:log4j-core:2.14.1") // Paper - implementation
@@ -202,7 +202,7 @@ index 0000000000000000000000000000000000000000..a4315961b7a465fb4872a4d67e7c26d4
 +
 +}
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index d285dbec16272db6b8a71865e05924ad66087407..7484c52761d4d8da827cd7693cf8e14519c35a9b 100644
+index 1a05d23ff886b015fb9396f119822c678a47ec6f..2e421eaac80cf251b32e0bb504dd54a73edf4986 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
 @@ -6,21 +6,21 @@
diff --git a/patches/server/0623-Expose-Tracked-Players.patch b/patches/server/0624-Expose-Tracked-Players.patch
similarity index 100%
rename from patches/server/0623-Expose-Tracked-Players.patch
rename to patches/server/0624-Expose-Tracked-Players.patch
diff --git a/patches/server/0624-Remove-streams-from-SensorNearest.patch b/patches/server/0625-Remove-streams-from-SensorNearest.patch
similarity index 100%
rename from patches/server/0624-Remove-streams-from-SensorNearest.patch
rename to patches/server/0625-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0625-MC-29274-Fix-Wither-hostility-towards-players.patch b/patches/server/0626-MC-29274-Fix-Wither-hostility-towards-players.patch
similarity index 100%
rename from patches/server/0625-MC-29274-Fix-Wither-hostility-towards-players.patch
rename to patches/server/0626-MC-29274-Fix-Wither-hostility-towards-players.patch
diff --git a/patches/server/0626-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0627-Throw-proper-exception-on-empty-JsonList-file.patch
similarity index 100%
rename from patches/server/0626-Throw-proper-exception-on-empty-JsonList-file.patch
rename to patches/server/0627-Throw-proper-exception-on-empty-JsonList-file.patch
diff --git a/patches/server/0627-Improve-ServerGUI.patch b/patches/server/0628-Improve-ServerGUI.patch
similarity index 100%
rename from patches/server/0627-Improve-ServerGUI.patch
rename to patches/server/0628-Improve-ServerGUI.patch
diff --git a/patches/server/0628-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/server/0629-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
similarity index 100%
rename from patches/server/0628-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
rename to patches/server/0629-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
diff --git a/patches/server/0629-fix-converting-txt-to-json-file.patch b/patches/server/0630-fix-converting-txt-to-json-file.patch
similarity index 95%
rename from patches/server/0629-fix-converting-txt-to-json-file.patch
rename to patches/server/0630-fix-converting-txt-to-json-file.patch
index 4aee6511f0..e9cc3d0fc4 100644
--- a/patches/server/0629-fix-converting-txt-to-json-file.patch
+++ b/patches/server/0630-fix-converting-txt-to-json-file.patch
@@ -21,7 +21,7 @@ index aeb91eefa0949b2a53d77f1e4a48a29b9d1bc3fe..918f5221e94cbc867349c69c83563e22
          this.saveUserBanList();
          this.loadIpBanList();
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 0a930147663850dc2ea7ffe9ced5611d5bab7c6d..41d1816543d0b98bd6a3ff5600cdd26257c7497a 100644
+index 286863b7eb9ee0389154304e61942dd68f978ff1..67afb97e6cb545d319202f3eca771015065089f6 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -205,6 +205,12 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -37,7 +37,7 @@ index 0a930147663850dc2ea7ffe9ced5611d5bab7c6d..41d1816543d0b98bd6a3ff5600cdd262
          // Paper start
          try {
              com.destroystokyo.paper.PaperConfig.init((java.io.File) options.valueOf("paper-settings"));
-@@ -266,9 +272,6 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -267,9 +273,6 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
              DedicatedServer.LOGGER.warn("To change this, set \"online-mode\" to \"true\" in the server.properties file.");
          }
  
diff --git a/patches/server/0630-Add-worldborder-events.patch b/patches/server/0631-Add-worldborder-events.patch
similarity index 100%
rename from patches/server/0630-Add-worldborder-events.patch
rename to patches/server/0631-Add-worldborder-events.patch
diff --git a/patches/server/0631-added-PlayerNameEntityEvent.patch b/patches/server/0632-added-PlayerNameEntityEvent.patch
similarity index 100%
rename from patches/server/0631-added-PlayerNameEntityEvent.patch
rename to patches/server/0632-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0632-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0633-Prevent-grindstones-from-overstacking-items.patch
similarity index 100%
rename from patches/server/0632-Prevent-grindstones-from-overstacking-items.patch
rename to patches/server/0633-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0633-Add-recipe-to-cook-events.patch b/patches/server/0634-Add-recipe-to-cook-events.patch
similarity index 100%
rename from patches/server/0633-Add-recipe-to-cook-events.patch
rename to patches/server/0634-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0634-Add-Block-isValidTool.patch b/patches/server/0635-Add-Block-isValidTool.patch
similarity index 100%
rename from patches/server/0634-Add-Block-isValidTool.patch
rename to patches/server/0635-Add-Block-isValidTool.patch
diff --git a/patches/server/0635-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0636-Allow-using-signs-inside-spawn-protection.patch
similarity index 100%
rename from patches/server/0635-Allow-using-signs-inside-spawn-protection.patch
rename to patches/server/0636-Allow-using-signs-inside-spawn-protection.patch
diff --git a/patches/server/0636-Implement-Keyed-on-World.patch b/patches/server/0637-Implement-Keyed-on-World.patch
similarity index 100%
rename from patches/server/0636-Implement-Keyed-on-World.patch
rename to patches/server/0637-Implement-Keyed-on-World.patch
diff --git a/patches/server/0637-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0638-Add-fast-alternative-constructor-for-Rotations.patch
similarity index 100%
rename from patches/server/0637-Add-fast-alternative-constructor-for-Rotations.patch
rename to patches/server/0638-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0638-Item-Rarity-API.patch b/patches/server/0639-Item-Rarity-API.patch
similarity index 100%
rename from patches/server/0638-Item-Rarity-API.patch
rename to patches/server/0639-Item-Rarity-API.patch
diff --git a/patches/server/0639-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0640-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
similarity index 100%
rename from patches/server/0639-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
rename to patches/server/0640-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0640-copy-TESign-isEditable-from-snapshots.patch b/patches/server/0641-copy-TESign-isEditable-from-snapshots.patch
similarity index 100%
rename from patches/server/0640-copy-TESign-isEditable-from-snapshots.patch
rename to patches/server/0641-copy-TESign-isEditable-from-snapshots.patch
diff --git a/patches/server/0641-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0642-Drop-carried-item-when-player-has-disconnected.patch
similarity index 100%
rename from patches/server/0641-Drop-carried-item-when-player-has-disconnected.patch
rename to patches/server/0642-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0642-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0643-forced-whitelist-use-configurable-kick-message.patch
similarity index 100%
rename from patches/server/0642-forced-whitelist-use-configurable-kick-message.patch
rename to patches/server/0643-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0643-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0644-Don-t-ignore-result-of-PlayerEditBookEvent.patch
similarity index 100%
rename from patches/server/0643-Don-t-ignore-result-of-PlayerEditBookEvent.patch
rename to patches/server/0644-Don-t-ignore-result-of-PlayerEditBookEvent.patch
diff --git a/patches/server/0644-Entity-load-save-limit-per-chunk.patch b/patches/server/0645-Entity-load-save-limit-per-chunk.patch
similarity index 100%
rename from patches/server/0644-Entity-load-save-limit-per-chunk.patch
rename to patches/server/0645-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/0645-fix-cancelling-block-falling-causing-client-desync.patch b/patches/server/0646-fix-cancelling-block-falling-causing-client-desync.patch
similarity index 100%
rename from patches/server/0645-fix-cancelling-block-falling-causing-client-desync.patch
rename to patches/server/0646-fix-cancelling-block-falling-causing-client-desync.patch
diff --git a/patches/server/0646-Expose-protocol-version.patch b/patches/server/0647-Expose-protocol-version.patch
similarity index 100%
rename from patches/server/0646-Expose-protocol-version.patch
rename to patches/server/0647-Expose-protocol-version.patch
diff --git a/patches/server/0647-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/server/0648-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
similarity index 100%
rename from patches/server/0647-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
rename to patches/server/0648-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
diff --git a/patches/server/0648-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0649-Enhance-console-tab-completions-for-brigadier-comman.patch
similarity index 98%
rename from patches/server/0648-Enhance-console-tab-completions-for-brigadier-comman.patch
rename to patches/server/0649-Enhance-console-tab-completions-for-brigadier-comman.patch
index 9d5ff7e33f..b0c49ebde0 100644
--- a/patches/server/0648-Enhance-console-tab-completions-for-brigadier-comman.patch
+++ b/patches/server/0649-Enhance-console-tab-completions-for-brigadier-comman.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Enhance console tab completions for brigadier commands
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index bcd01736e91c126d655a0a71090e9dadf22e79b9..78078e7ee04f9c46f98b7e5829a620730358c233 100644
+index 5af9d91e15b0c10da79fa935cc884cd2766edfae..6c4bb838792c779da7b2d84831f6e67779695993 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -496,4 +496,11 @@ public class PaperConfig {
+@@ -500,4 +500,11 @@ public class PaperConfig {
      private static void fixEntityPositionDesync() {
          fixEntityPositionDesync = getBoolean("settings.fix-entity-position-desync", fixEntityPositionDesync);
      }
diff --git a/patches/server/0649-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0650-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
similarity index 100%
rename from patches/server/0649-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
rename to patches/server/0650-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0650-Add-bypass-host-check.patch b/patches/server/0651-Add-bypass-host-check.patch
similarity index 100%
rename from patches/server/0650-Add-bypass-host-check.patch
rename to patches/server/0651-Add-bypass-host-check.patch
diff --git a/patches/server/0651-Set-area-affect-cloud-rotation.patch b/patches/server/0652-Set-area-affect-cloud-rotation.patch
similarity index 100%
rename from patches/server/0651-Set-area-affect-cloud-rotation.patch
rename to patches/server/0652-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0652-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0653-add-isDeeplySleeping-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0652-add-isDeeplySleeping-to-HumanEntity.patch
rename to patches/server/0653-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0653-Fix-duplicating-give-items-on-item-drop-cancel.patch b/patches/server/0654-Fix-duplicating-give-items-on-item-drop-cancel.patch
similarity index 100%
rename from patches/server/0653-Fix-duplicating-give-items-on-item-drop-cancel.patch
rename to patches/server/0654-Fix-duplicating-give-items-on-item-drop-cancel.patch
diff --git a/patches/server/0654-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0655-add-consumeFuel-to-FurnaceBurnEvent.patch
similarity index 100%
rename from patches/server/0654-add-consumeFuel-to-FurnaceBurnEvent.patch
rename to patches/server/0655-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0655-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0656-add-get-set-drop-chance-to-EntityEquipment.patch
similarity index 100%
rename from patches/server/0655-add-get-set-drop-chance-to-EntityEquipment.patch
rename to patches/server/0656-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0656-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0657-fix-PigZombieAngerEvent-cancellation.patch
similarity index 100%
rename from patches/server/0656-fix-PigZombieAngerEvent-cancellation.patch
rename to patches/server/0657-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0657-Fix-checkReach-check-for-Shulker-boxes.patch b/patches/server/0658-Fix-checkReach-check-for-Shulker-boxes.patch
similarity index 100%
rename from patches/server/0657-Fix-checkReach-check-for-Shulker-boxes.patch
rename to patches/server/0658-Fix-checkReach-check-for-Shulker-boxes.patch
diff --git a/patches/server/0658-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0659-fix-PlayerItemHeldEvent-firing-twice.patch
similarity index 100%
rename from patches/server/0658-fix-PlayerItemHeldEvent-firing-twice.patch
rename to patches/server/0659-fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/patches/server/0659-Added-PlayerDeepSleepEvent.patch b/patches/server/0660-Added-PlayerDeepSleepEvent.patch
similarity index 100%
rename from patches/server/0659-Added-PlayerDeepSleepEvent.patch
rename to patches/server/0660-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0660-More-World-API.patch b/patches/server/0661-More-World-API.patch
similarity index 100%
rename from patches/server/0660-More-World-API.patch
rename to patches/server/0661-More-World-API.patch
diff --git a/patches/server/0661-Added-PlayerBedFailEnterEvent.patch b/patches/server/0662-Added-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from patches/server/0661-Added-PlayerBedFailEnterEvent.patch
rename to patches/server/0662-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0662-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0663-Implement-methods-to-convert-between-Component-and-B.patch
similarity index 89%
rename from patches/server/0662-Implement-methods-to-convert-between-Component-and-B.patch
rename to patches/server/0663-Implement-methods-to-convert-between-Component-and-B.patch
index 2db6bccc49..b4ddba8f8d 100644
--- a/patches/server/0662-Implement-methods-to-convert-between-Component-and-B.patch
+++ b/patches/server/0663-Implement-methods-to-convert-between-Component-and-B.patch
@@ -42,13 +42,13 @@ index 0000000000000000000000000000000000000000..dd6012b6a097575b2d1471be5069ecce
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 41d1816543d0b98bd6a3ff5600cdd26257c7497a..9b5430bae4a863004aaa0fc41e7b75a7d5797b92 100644
+index 67afb97e6cb545d319202f3eca771015065089f6..472d0635719c0a8f495ce474bd4a268d4e9071c8 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -220,6 +220,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-         }
+@@ -221,6 +221,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
          com.destroystokyo.paper.PaperConfig.registerCommands();
          com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now
+         io.papermc.paper.util.ObfHelper.INSTANCE.getClass(); // load mappings for stacktrace deobf and etc.
 +        io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider
          // Paper end
  
diff --git a/patches/server/0663-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0664-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
similarity index 100%
rename from patches/server/0663-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
rename to patches/server/0664-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
diff --git a/patches/server/0664-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0665-Introduce-beacon-activation-deactivation-events.patch
similarity index 100%
rename from patches/server/0664-Introduce-beacon-activation-deactivation-events.patch
rename to patches/server/0665-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0665-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0666-add-RespawnFlags-to-PlayerRespawnEvent.patch
similarity index 100%
rename from patches/server/0665-add-RespawnFlags-to-PlayerRespawnEvent.patch
rename to patches/server/0666-add-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/patches/server/0666-Add-Channel-initialization-listeners.patch b/patches/server/0667-Add-Channel-initialization-listeners.patch
similarity index 100%
rename from patches/server/0666-Add-Channel-initialization-listeners.patch
rename to patches/server/0667-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0667-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0668-Send-empty-commands-if-tab-completion-is-disabled.patch
similarity index 100%
rename from patches/server/0667-Send-empty-commands-if-tab-completion-is-disabled.patch
rename to patches/server/0668-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0668-Add-more-WanderingTrader-API.patch b/patches/server/0669-Add-more-WanderingTrader-API.patch
similarity index 100%
rename from patches/server/0668-Add-more-WanderingTrader-API.patch
rename to patches/server/0669-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0669-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0670-Add-EntityBlockStorage-clearEntities.patch
similarity index 100%
rename from patches/server/0669-Add-EntityBlockStorage-clearEntities.patch
rename to patches/server/0670-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0670-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0671-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 100%
rename from patches/server/0670-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/server/0671-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0671-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0672-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0671-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0672-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0672-Inventory-close.patch b/patches/server/0673-Inventory-close.patch
similarity index 100%
rename from patches/server/0672-Inventory-close.patch
rename to patches/server/0673-Inventory-close.patch
diff --git a/patches/server/0673-call-PortalCreateEvent-players-and-end-platform.patch b/patches/server/0674-call-PortalCreateEvent-players-and-end-platform.patch
similarity index 100%
rename from patches/server/0673-call-PortalCreateEvent-players-and-end-platform.patch
rename to patches/server/0674-call-PortalCreateEvent-players-and-end-platform.patch
diff --git a/patches/server/0674-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0675-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from patches/server/0674-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/server/0675-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0675-Fix-CraftPotionBrewer-cache.patch b/patches/server/0676-Fix-CraftPotionBrewer-cache.patch
similarity index 100%
rename from patches/server/0675-Fix-CraftPotionBrewer-cache.patch
rename to patches/server/0676-Fix-CraftPotionBrewer-cache.patch
diff --git a/patches/server/0676-Add-basic-Datapack-API.patch b/patches/server/0677-Add-basic-Datapack-API.patch
similarity index 100%
rename from patches/server/0676-Add-basic-Datapack-API.patch
rename to patches/server/0677-Add-basic-Datapack-API.patch
diff --git a/patches/server/0677-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0678-Add-environment-variable-to-disable-server-gui.patch
similarity index 100%
rename from patches/server/0677-Add-environment-variable-to-disable-server-gui.patch
rename to patches/server/0678-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0678-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0679-additions-to-PlayerGameModeChangeEvent.patch
similarity index 100%
rename from patches/server/0678-additions-to-PlayerGameModeChangeEvent.patch
rename to patches/server/0679-additions-to-PlayerGameModeChangeEvent.patch
diff --git a/patches/server/0679-ItemStack-repair-check-API.patch b/patches/server/0680-ItemStack-repair-check-API.patch
similarity index 100%
rename from patches/server/0679-ItemStack-repair-check-API.patch
rename to patches/server/0680-ItemStack-repair-check-API.patch
diff --git a/patches/server/0680-More-Enchantment-API.patch b/patches/server/0681-More-Enchantment-API.patch
similarity index 100%
rename from patches/server/0680-More-Enchantment-API.patch
rename to patches/server/0681-More-Enchantment-API.patch
diff --git a/patches/server/0681-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/server/0682-Add-command-line-option-to-load-extra-plugin-jars-no.patch
similarity index 100%
rename from patches/server/0681-Add-command-line-option-to-load-extra-plugin-jars-no.patch
rename to patches/server/0682-Add-command-line-option-to-load-extra-plugin-jars-no.patch
diff --git a/patches/server/0682-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0683-Fix-and-optimise-world-force-upgrading.patch
similarity index 100%
rename from patches/server/0682-Fix-and-optimise-world-force-upgrading.patch
rename to patches/server/0683-Fix-and-optimise-world-force-upgrading.patch
diff --git a/patches/server/0683-Add-Mob-lookAt-API.patch b/patches/server/0684-Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/server/0683-Add-Mob-lookAt-API.patch
rename to patches/server/0684-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0684-Add-Unix-domain-socket-support.patch b/patches/server/0685-Add-Unix-domain-socket-support.patch
similarity index 97%
rename from patches/server/0684-Add-Unix-domain-socket-support.patch
rename to patches/server/0685-Add-Unix-domain-socket-support.patch
index 33845a8fe1..0c58ff2007 100644
--- a/patches/server/0684-Add-Unix-domain-socket-support.patch
+++ b/patches/server/0685-Add-Unix-domain-socket-support.patch
@@ -27,10 +27,10 @@ index bdd4f4db9849d9107b5c62d5e83b1277621f49f1..9d09ec3b127e3440bef6b248578dec10
      }
      // Spigot End
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 9b5430bae4a863004aaa0fc41e7b75a7d5797b92..db0110120f88bc06954fa8c44b2a45f0c8229574 100644
+index 472d0635719c0a8f495ce474bd4a268d4e9071c8..1bf19965d12514dee34545235bfbadc0b74ddc8b 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -231,6 +231,20 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -232,6 +232,20 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
          this.setEnforceWhitelist(dedicatedserverproperties.enforceWhitelist);
          // this.worldData.setGameType(dedicatedserverproperties.gamemode); // CraftBukkit - moved to world loading
          DedicatedServer.LOGGER.info("Default game type: {}", dedicatedserverproperties.gamemode);
@@ -51,7 +51,7 @@ index 9b5430bae4a863004aaa0fc41e7b75a7d5797b92..db0110120f88bc06954fa8c44b2a45f0
          InetAddress inetaddress = null;
  
          if (!this.getLocalIp().isEmpty()) {
-@@ -240,12 +254,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -241,12 +255,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
          if (this.getPort() < 0) {
              this.setPort(dedicatedserverproperties.serverPort);
          }
diff --git a/patches/server/0685-Add-EntityInsideBlockEvent.patch b/patches/server/0686-Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/server/0685-Add-EntityInsideBlockEvent.patch
rename to patches/server/0686-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0686-Attributes-API-for-item-defaults.patch b/patches/server/0687-Attributes-API-for-item-defaults.patch
similarity index 100%
rename from patches/server/0686-Attributes-API-for-item-defaults.patch
rename to patches/server/0687-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0687-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch b/patches/server/0688-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch
similarity index 100%
rename from patches/server/0687-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch
rename to patches/server/0688-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch
diff --git a/patches/server/0688-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0689-Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 100%
rename from patches/server/0688-Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/server/0689-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/server/0689-More-Lidded-Block-API.patch b/patches/server/0690-More-Lidded-Block-API.patch
similarity index 100%
rename from patches/server/0689-More-Lidded-Block-API.patch
rename to patches/server/0690-More-Lidded-Block-API.patch
diff --git a/patches/server/0690-Limit-item-frame-cursors-on-maps.patch b/patches/server/0691-Limit-item-frame-cursors-on-maps.patch
similarity index 100%
rename from patches/server/0690-Limit-item-frame-cursors-on-maps.patch
rename to patches/server/0691-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0691-Add-PufferFishStateChangeEvent.patch b/patches/server/0692-Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/server/0691-Add-PufferFishStateChangeEvent.patch
rename to patches/server/0692-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0692-Add-PlayerKickEvent-causes.patch b/patches/server/0693-Add-PlayerKickEvent-causes.patch
similarity index 100%
rename from patches/server/0692-Add-PlayerKickEvent-causes.patch
rename to patches/server/0693-Add-PlayerKickEvent-causes.patch
diff --git a/patches/server/0693-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0694-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
similarity index 100%
rename from patches/server/0693-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
rename to patches/server/0694-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0694-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch b/patches/server/0695-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
similarity index 100%
rename from patches/server/0694-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
rename to patches/server/0695-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
diff --git a/patches/server/0695-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0696-Add-option-to-fix-items-merging-through-walls.patch
similarity index 100%
rename from patches/server/0695-Add-option-to-fix-items-merging-through-walls.patch
rename to patches/server/0696-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0696-Add-BellRevealRaiderEvent.patch b/patches/server/0697-Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/server/0696-Add-BellRevealRaiderEvent.patch
rename to patches/server/0697-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0697-Fix-invulnerable-end-crystals.patch b/patches/server/0698-Fix-invulnerable-end-crystals.patch
similarity index 100%
rename from patches/server/0697-Fix-invulnerable-end-crystals.patch
rename to patches/server/0698-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0698-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0699-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/server/0698-Add-ElderGuardianAppearanceEvent.patch
rename to patches/server/0699-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0699-Fix-dangerous-end-portal-logic.patch b/patches/server/0700-Fix-dangerous-end-portal-logic.patch
similarity index 100%
rename from patches/server/0699-Fix-dangerous-end-portal-logic.patch
rename to patches/server/0700-Fix-dangerous-end-portal-logic.patch
diff --git a/patches/server/0700-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0701-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from patches/server/0700-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to patches/server/0701-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0701-Make-item-validations-configurable.patch b/patches/server/0702-Make-item-validations-configurable.patch
similarity index 97%
rename from patches/server/0701-Make-item-validations-configurable.patch
rename to patches/server/0702-Make-item-validations-configurable.patch
index 8eaaa016f4..67ca693f79 100644
--- a/patches/server/0701-Make-item-validations-configurable.patch
+++ b/patches/server/0702-Make-item-validations-configurable.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Make item validations configurable
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 78078e7ee04f9c46f98b7e5829a620730358c233..14841f1df5fa8970b132eb5e8fc24069f687dd6a 100644
+index 6c4bb838792c779da7b2d84831f6e67779695993..bc4081483a228aa275511d28231d615fe0f36d4e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -503,4 +503,19 @@ public class PaperConfig {
+@@ -507,4 +507,19 @@ public class PaperConfig {
          enableBrigadierConsoleHighlighting = getBoolean("settings.console.enable-brigadier-highlighting", enableBrigadierConsoleHighlighting);
          enableBrigadierConsoleCompletions = getBoolean("settings.console.enable-brigadier-completions", enableBrigadierConsoleCompletions);
      }
diff --git a/patches/server/0702-Line-Of-Sight-Changes.patch b/patches/server/0703-Line-Of-Sight-Changes.patch
similarity index 100%
rename from patches/server/0702-Line-Of-Sight-Changes.patch
rename to patches/server/0703-Line-Of-Sight-Changes.patch
diff --git a/patches/server/0703-add-per-world-spawn-limits.patch b/patches/server/0704-add-per-world-spawn-limits.patch
similarity index 100%
rename from patches/server/0703-add-per-world-spawn-limits.patch
rename to patches/server/0704-add-per-world-spawn-limits.patch
diff --git a/patches/server/0704-Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/server/0705-Fix-PotionSplashEvent-for-water-splash-potions.patch
similarity index 100%
rename from patches/server/0704-Fix-PotionSplashEvent-for-water-splash-potions.patch
rename to patches/server/0705-Fix-PotionSplashEvent-for-water-splash-potions.patch
diff --git a/patches/server/0705-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch b/patches/server/0706-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch
similarity index 100%
rename from patches/server/0705-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch
rename to patches/server/0706-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch
diff --git a/patches/server/0706-Add-more-LimitedRegion-API.patch b/patches/server/0707-Add-more-LimitedRegion-API.patch
similarity index 100%
rename from patches/server/0706-Add-more-LimitedRegion-API.patch
rename to patches/server/0707-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0707-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0708-Fix-PlayerDropItemEvent-using-wrong-item.patch
similarity index 100%
rename from patches/server/0707-Fix-PlayerDropItemEvent-using-wrong-item.patch
rename to patches/server/0708-Fix-PlayerDropItemEvent-using-wrong-item.patch
diff --git a/patches/server/0770-Replace-player-chunk-loader-system.patch b/patches/server/0770-Replace-player-chunk-loader-system.patch
index 9384ad147e..72cab5e81b 100644
--- a/patches/server/0770-Replace-player-chunk-loader-system.patch
+++ b/patches/server/0770-Replace-player-chunk-loader-system.patch
@@ -80,10 +80,10 @@ index cfe293881f68c8db337c3a48948362bb7b3e3522..7d44abcb4fff9717a1af55879deb7eb9
          }));
  
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 9d31f1f1a224d1442cb7915df514c0522a4b876b..fc07a8454f80c22bc3776a42b2c31f8793543f5c 100644
+index bc4081483a228aa275511d28231d615fe0f36d4e..be132f9d683767002a3e7f5641cb3cc3db74464c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -523,4 +523,26 @@ public class PaperConfig {
+@@ -522,4 +522,26 @@ public class PaperConfig {
          itemValidationBookAuthorLength = getInt("settings.item-validation.book.author", itemValidationBookAuthorLength);
          itemValidationBookPageLength = getInt("settings.item-validation.book.page", itemValidationBookPageLength);
      }
diff --git a/patches/server/0780-Add-packet-limiter-config.patch b/patches/server/0780-Add-packet-limiter-config.patch
index cc815c78b0..1be4619989 100644
--- a/patches/server/0780-Add-packet-limiter-config.patch
+++ b/patches/server/0780-Add-packet-limiter-config.patch
@@ -24,10 +24,10 @@ and an action can be defined: DROP or KICK
 If interval or rate are less-than 0, the limit is ignored
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index fc07a8454f80c22bc3776a42b2c31f8793543f5c..7f5cd91b60a4527a915772cd4c7c7024e1e8aa2c 100644
+index be132f9d683767002a3e7f5641cb3cc3db74464c..4d6d07627bd3cbb7041f5c1e19fa03cb0a301268 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -545,4 +545,102 @@ public class PaperConfig {
+@@ -544,4 +544,102 @@ public class PaperConfig {
          playerMaxConcurrentChunkLoads = getDouble("settings.chunk-loading.player-max-concurrent-loads", 4.0);
          globalMaxConcurrentChunkLoads = getDouble("settings.chunk-loading.global-max-concurrent-loads", 500.0);
      }
diff --git a/patches/server/0781-Lag-compensate-block-breaking.patch b/patches/server/0781-Lag-compensate-block-breaking.patch
index b2f1cec3a1..6b7a96f98d 100644
--- a/patches/server/0781-Lag-compensate-block-breaking.patch
+++ b/patches/server/0781-Lag-compensate-block-breaking.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Lag compensate block breaking
 Use time instead of ticks if ticks fall behind
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 7f5cd91b60a4527a915772cd4c7c7024e1e8aa2c..1560ffc5d70b7185b4dd1ada7351a75cec893918 100644
+index 4d6d07627bd3cbb7041f5c1e19fa03cb0a301268..b0ea9aefb6e652388becb79d4b19433fe3717c87 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -643,4 +643,10 @@ public class PaperConfig {
+@@ -642,4 +642,10 @@ public class PaperConfig {
              }
          }
      }
diff --git a/patches/server/0786-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0786-Send-full-pos-packets-for-hard-colliding-entities.patch
index 8825572e72..011aa79341 100644
--- a/patches/server/0786-Send-full-pos-packets-for-hard-colliding-entities.patch
+++ b/patches/server/0786-Send-full-pos-packets-for-hard-colliding-entities.patch
@@ -9,10 +9,10 @@ Configurable under
 `send-full-pos-for-hard-colliding-entities`
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 1560ffc5d70b7185b4dd1ada7351a75cec893918..dcae40fde8087ce09ec8b9360f2abc860b88c975 100644
+index b0ea9aefb6e652388becb79d4b19433fe3717c87..f421e6a2e43e0a673dbb8a9a2b4331387e523e02 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -649,4 +649,10 @@ public class PaperConfig {
+@@ -648,4 +648,10 @@ public class PaperConfig {
      private static void lagCompensateBlockBreaking() {
          lagCompensateBlockBreaking = getBoolean("settings.lag-compensate-block-breaking", true);
      }