Use mojang item ids for alternative item despawn rate (#6997)

216 files changed, 194 insertions, 173 deletions

diff --git a/patches/server/0004-Paper-config-files.patch b/patches/server/0004-Paper-config-files.patch
index 00aad839fc..50e1a15e22 100644
--- a/patches/server/0004-Paper-config-files.patch
+++ b/patches/server/0004-Paper-config-files.patch
@@ -298,7 +298,7 @@ index 0000000000000000000000000000000000000000..a7182a4c64980aa19b8493ac9c2bb762
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..23410c6ee34fcd9c50c2dbf35d8ff4d0c9ca408c
+index 0000000000000000000000000000000000000000..6f7681d8e03f15bee821b0c053ed64ad3afeb2a4
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -0,0 +1,188 @@
@@ -364,8 +364,8 @@ index 0000000000000000000000000000000000000000..23410c6ee34fcd9c50c2dbf35d8ff4d0
 +        commands = new HashMap<String, Command>();
 +        commands.put("paper", new PaperCommand("paper"));
 +
-+        version = getInt("config-version", 25);
-+        set("config-version", 25);
++        version = getInt("config-version", 26);
++        set("config-version", 26);
 +        readConfig(PaperConfig.class, null);
 +    }
 +
diff --git a/patches/server/0356-Implement-alternative-item-despawn-rate.patch b/patches/server/0356-Implement-alternative-item-despawn-rate.patch
index 13ab53a593..f95e91881e 100644
--- a/patches/server/0356-Implement-alternative-item-despawn-rate.patch
+++ b/patches/server/0356-Implement-alternative-item-despawn-rate.patch
@@ -3,102 +3,142 @@ From: kickash32 <[email protected]>
 Date: Mon, 3 Jun 2019 02:02:39 -0400
 Subject: [PATCH] Implement alternative item-despawn-rate
 
+Co-authored-by: Noah van der Aa <[email protected]>
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index ed976e0582dee32ccf3aad49efb0dd773f5f9d80..e129794e5cbf5155a232966ef4ff534c0007f1d9 100644
+index ed976e0582dee32ccf3aad49efb0dd773f5f9d80..f41e292e78b2c6874ee9f0cb4336263581339ca6 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -560,5 +560,52 @@ public class PaperWorldConfig {
+@@ -560,5 +560,74 @@ public class PaperWorldConfig {
              Bukkit.getLogger().warning("You have enabled permission-based Anti-Xray checking - depending on your permission plugin, this may cause performance issues");
          }
      }
 -}
  
 +    public boolean altItemDespawnRateEnabled;
-+    public java.util.Map<org.bukkit.Material, Integer> altItemDespawnRateMap;
++    public java.util.Map<net.minecraft.resources.ResourceLocation, Integer> altItemDespawnRateMap = new HashMap<>();
 +    private void altItemDespawnRate() {
 +        String path = "alt-item-despawn-rate";
++        // Migrate from bukkit material to Mojang item ids
++        if (PaperConfig.version < 26) {
++            String world = worldName;
++            try {
++                org.bukkit.configuration.ConfigurationSection mapSection = config.getConfigurationSection("world-settings." + world + "." + path + ".items");
++                if (mapSection == null) {
++                    world = "default";
++                    mapSection = config.getConfigurationSection("world-settings." + world + "." + path + ".items");
++                }
++                if (mapSection != null) {
++                    for (String key : mapSection.getKeys(false)) {
++                        int val = mapSection.getInt(key);
++                        try {
++                            // Ignore options that are already valid mojang wise, otherwise we might try to migrate the same config twice and fail.
++                            boolean isMojangMaterial = net.minecraft.core.Registry.ITEM.getOptional(new net.minecraft.resources.ResourceLocation(key.toLowerCase())).isPresent();
++                            mapSection.set(key, null);
++                            String newKey = isMojangMaterial ? key.toLowerCase() : org.bukkit.Material.valueOf(key).getKey().getKey().toLowerCase();
++                            mapSection.set(newKey, val);
++                        } catch (Exception e) {
++                            logError("Could not add item " + key + " to altItemDespawnRateMap: " + e.getMessage());
++                        }
++                    }
++                    config.set("world-settings." + world + "." + path + ".items", mapSection);
++                }
++            } catch (Exception e) {
++                logError("alt-item-despawn-rate was malformatted");
++                return;
++            }
++        }
 +
 +        altItemDespawnRateEnabled = getBoolean(path + ".enabled", false);
 +
-+        java.util.Map<org.bukkit.Material, Integer> altItemDespawnRateMapDefault = new java.util.EnumMap<>(org.bukkit.Material.class);
-+        altItemDespawnRateMapDefault.put(org.bukkit.Material.COBBLESTONE, 300);
-+        for (org.bukkit.Material key : altItemDespawnRateMapDefault.keySet()) {
-+            config.addDefault("world-settings.default." + path + ".items." + key, altItemDespawnRateMapDefault.get(key));
++        if (config.getConfigurationSection("world-settings.default." + path + ".items") == null) {
++            // Initialize default
++            config.addDefault("world-settings.default." + path + ".items.cobblestone", 300);
 +        }
 +
-+        java.util.Map<String, Integer> rawMap = new java.util.HashMap<>();
-+        try {
-+            org.bukkit.configuration.ConfigurationSection mapSection = config.getConfigurationSection("world-settings." + worldName + "." + path + ".items");
-+            if (mapSection == null) {
-+                mapSection = config.getConfigurationSection("world-settings.default." + path + ".items");
-+            }
-+            for (String key : mapSection.getKeys(false)) {
-+                int val = mapSection.getInt(key);
-+                rawMap.put(key, val);
-+            }
-+        }
-+        catch (Exception e) {
-+            logError("alt-item-despawn-rate was malformatted");
-+            altItemDespawnRateEnabled = false;
-+        }
-+
-+        altItemDespawnRateMap = new java.util.EnumMap<>(org.bukkit.Material.class);
 +        if (!altItemDespawnRateEnabled) {
 +            return;
 +        }
 +
-+        for(String key : rawMap.keySet()) {
-+            try {
-+                altItemDespawnRateMap.put(org.bukkit.Material.valueOf(key), rawMap.get(key));
-+            } catch (Exception e) {
-+                logError("Could not add item " + key + " to altItemDespawnRateMap: " + e.getMessage());
-+            }
++        org.bukkit.configuration.ConfigurationSection mapSection = config.getConfigurationSection("world-settings." + worldName + "." + path + ".items");
++        if (mapSection == null) {
++            mapSection = config.getConfigurationSection("world-settings.default." + path + ".items");
 +        }
-+        if(altItemDespawnRateEnabled) {
-+            for(org.bukkit.Material key : altItemDespawnRateMap.keySet()) {
-+                log("Alternative item despawn rate of " + key + ": " + altItemDespawnRateMap.get(key));
++        if (mapSection != null) {
++            for (String key : mapSection.getKeys(false)) {
++                try {
++                    int val = mapSection.getInt(key);
++                    net.minecraft.resources.ResourceLocation keyLocation = new net.minecraft.resources.ResourceLocation(key);
++                    if (net.minecraft.core.Registry.ITEM.getOptional(keyLocation).isPresent()) {
++                        altItemDespawnRateMap.put(keyLocation, val);
++                    } else {
++                        logError("Could not add item " + key + " to altItemDespawnRateMap: not a valid item");
++                    }
++                } catch (Exception e) {
++                    logError("Could not add item " + key + " to altItemDespawnRateMap: " + e.getMessage());
++                }
 +            }
 +        }
++
++        for (net.minecraft.resources.ResourceLocation key : altItemDespawnRateMap.keySet()) {
++            log("Alternative item despawn rate of " + key.getPath() + ": " + altItemDespawnRateMap.get(key));
++        }
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index 87c92e73d23a1ebb0646ba0293e1c0d51bb0e059..7b2ac6920d5f0a8dc7cbb552a0e45e2fe471190e 100644
+index 87c92e73d23a1ebb0646ba0293e1c0d51bb0e059..3938bb6aa82bd02359dede6f6b17b7ba6685579b 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-@@ -174,7 +174,7 @@ public class ItemEntity extends Entity {
+@@ -54,6 +54,7 @@ public class ItemEntity extends Entity {
+     public final float bobOffs;
+     private int lastTick = MinecraftServer.currentTick - 1; // CraftBukkit
+     public boolean canMobPickup = true; // Paper
++    private int despawnRate = -1; // Paper
+ 
+     public ItemEntity(EntityType<? extends ItemEntity> type, Level world) {
+         super(type, world);
+@@ -174,7 +175,7 @@ public class ItemEntity extends Entity {
                  }
              }
  
 -            if (!this.level.isClientSide && this.age >= level.spigotConfig.itemDespawnRate) { // Spigot
-+            if (!this.level.isClientSide && this.age >= this.getDespawnRate()) { // Spigot // Paper
++            if (!this.level.isClientSide && this.age >= this.despawnRate) { // Spigot // Paper
                  // CraftBukkit start - fire ItemDespawnEvent
                  if (org.bukkit.craftbukkit.event.CraftEventFactory.callItemDespawnEvent(this).isCancelled()) {
                      this.age = 0;
-@@ -198,7 +198,7 @@ public class ItemEntity extends Entity {
+@@ -198,7 +199,7 @@ public class ItemEntity extends Entity {
          this.lastTick = MinecraftServer.currentTick;
          // CraftBukkit end
  
 -        if (!this.level.isClientSide && this.age >= level.spigotConfig.itemDespawnRate) { // Spigot
-+        if (!this.level.isClientSide && this.age >= this.getDespawnRate()) { // Spigot // Paper
++        if (!this.level.isClientSide && this.age >= this.despawnRate) { // Spigot // Paper
              // CraftBukkit start - fire ItemDespawnEvent
              if (org.bukkit.craftbukkit.event.CraftEventFactory.callItemDespawnEvent(this).isCancelled()) {
                  this.age = 0;
-@@ -560,9 +560,16 @@ public class ItemEntity extends Entity {
+@@ -253,7 +254,7 @@ public class ItemEntity extends Entity {
+     private boolean isMergable() {
+         ItemStack itemstack = this.getItem();
+ 
+-        return this.isAlive() && this.pickupDelay != 32767 && this.age != -32768 && this.age < 6000 && itemstack.getCount() < itemstack.getMaxStackSize();
++        return this.isAlive() && this.pickupDelay != 32767 && this.age != -32768 && this.age < this.despawnRate && itemstack.getCount() < itemstack.getMaxStackSize(); // Paper - respect despawn rate in pickup check.
+     }
+ 
+     private void tryToMerge(ItemEntity other) {
+@@ -497,6 +498,8 @@ public class ItemEntity extends Entity {
+         com.google.common.base.Preconditions.checkArgument(!stack.isEmpty(), "Cannot drop air"); // CraftBukkit
+         this.getEntityData().set(ItemEntity.DATA_ITEM, stack);
+         this.getEntityData().markDirty(ItemEntity.DATA_ITEM); // CraftBukkit - SPIGOT-4591, must mark dirty
++        net.minecraft.resources.ResourceLocation location = net.minecraft.core.Registry.ITEM.getKey(stack.getItem()); // Paper
++        this.despawnRate = level.paperConfig.altItemDespawnRateMap.getOrDefault(location, level.spigotConfig.itemDespawnRate); // Paper
+     }
+ 
+     @Override
+@@ -560,7 +563,7 @@ public class ItemEntity extends Entity {
  
      public void makeFakeItem() {
          this.setNeverPickUp();
 -        this.age = level.spigotConfig.itemDespawnRate - 1; // Spigot
-+        this.age = this.getDespawnRate() - 1; // Spigot
++        this.age = this.despawnRate - 1; // Spigot
      }
  
-+    // Paper start
-+    public int getDespawnRate(){
-+        org.bukkit.Material material = this.getItem().getBukkitStack().getType();
-+        return level.paperConfig.altItemDespawnRateMap.getOrDefault(material, level.spigotConfig.itemDespawnRate);
-+    }
-+    // Paper end
-+
      public float getSpin(float tickDelta) {
-         return ((float) this.getAge() + tickDelta) / 20.0F + this.bobOffs;
-     }
diff --git a/patches/server/0359-implement-optional-per-player-mob-spawns.patch b/patches/server/0359-implement-optional-per-player-mob-spawns.patch
index 23e0459aad..cbd7c808ec 100644
--- a/patches/server/0359-implement-optional-per-player-mob-spawns.patch
+++ b/patches/server/0359-implement-optional-per-player-mob-spawns.patch
@@ -5,11 +5,11 @@ Subject: [PATCH] implement optional per player mob spawns
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e129794e5cbf5155a232966ef4ff534c0007f1d9..575f277a5d38ade7d70c632712ea895cde3bfaae 100644
+index f41e292e78b2c6874ee9f0cb4336263581339ca6..75d3365fe37dc419138295d2d28f8dfe1153c6c4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -608,4 +608,12 @@ public class PaperWorldConfig {
-             }
+@@ -630,4 +630,12 @@ public class PaperWorldConfig {
+             log("Alternative item despawn rate of " + key.getPath() + ": " + altItemDespawnRateMap.get(key));
          }
      }
 +
diff --git a/patches/server/0375-Add-tick-times-API-and-mspt-command.patch b/patches/server/0375-Add-tick-times-API-and-mspt-command.patch
index ba28fc791d..bcbc78ba95 100644
--- a/patches/server/0375-Add-tick-times-API-and-mspt-command.patch
+++ b/patches/server/0375-Add-tick-times-API-and-mspt-command.patch
@@ -75,7 +75,7 @@ index 0000000000000000000000000000000000000000..d0211d4f39f9d6af1d751ac66342b42c
 +    }
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 83bf428abd3be89e34cf42638bd1357a708ea0e3..fda5a623ec6bba0ed4d230415f7b9779ee2e8ccf 100644
+index 2e7c3fe697ac29807107152ecd916dfe21625f0a..3b0fa01342fba7e05f061d398f2f072f3bde9b31 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -69,6 +69,7 @@ public class PaperConfig {
@@ -84,8 +84,8 @@ index 83bf428abd3be89e34cf42638bd1357a708ea0e3..fda5a623ec6bba0ed4d230415f7b9779
          commands.put("paper", new PaperCommand("paper"));
 +        commands.put("mspt", new MSPTCommand("mspt"));
  
-         version = getInt("config-version", 25);
-         set("config-version", 25);
+         version = getInt("config-version", 26);
+         set("config-version", 26);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
 index 287014feb99c67083a959f2c09213d49ad5f743d..2e08855085a547151140bcb05dce9bc469d81ff6 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -146,7 +146,7 @@ index 287014feb99c67083a959f2c09213d49ad5f743d..2e08855085a547151140bcb05dce9bc4
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 06bfac218c750e3eb8d8a0d52d36ab94ef35ccb1..2d136e8cb25598f610ba114a4e7e1a9f80c08b58 100644
+index a6e7a609344f693cd0f51cfc4b122f45e24d0050..8452e72f669b82acb46ef00a7cdbb4177926ebc9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2461,6 +2461,16 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0403-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0403-Add-phantom-creative-and-insomniac-controls.patch
index 06bbcb1f9b..b3ab98ea95 100644
--- a/patches/server/0403-Add-phantom-creative-and-insomniac-controls.patch
+++ b/patches/server/0403-Add-phantom-creative-and-insomniac-controls.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add phantom creative and insomniac controls
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index feadef47940a1eab3ea79236a40ffd3deb2660b2..e5d0168faf4988b2c033d146a798e6ab90e3b358 100644
+index 844b71128d4a9a926a86797f42288c26deb013a5..a4e4fdb2085616dc1334cfa96aa751250ac35be7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -641,4 +641,11 @@ public class PaperWorldConfig {
+@@ -663,4 +663,11 @@ public class PaperWorldConfig {
          }
          perPlayerMobSpawns = getBoolean("per-player-mob-spawns", true);
      }
diff --git a/patches/server/0415-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0415-Option-for-maximum-exp-value-when-merging-orbs.patch
index 762367d700..305da0515c 100644
--- a/patches/server/0415-Option-for-maximum-exp-value-when-merging-orbs.patch
+++ b/patches/server/0415-Option-for-maximum-exp-value-when-merging-orbs.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Option for maximum exp value when merging orbs
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e5d0168faf4988b2c033d146a798e6ab90e3b358..8a12ad8417458d1ad71664e394f78db6b3770c0b 100644
+index a4e4fdb2085616dc1334cfa96aa751250ac35be7..3a5b6bdd20645c2afc788893dfa33511145deb6d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -648,4 +648,10 @@ public class PaperWorldConfig {
+@@ -670,4 +670,10 @@ public class PaperWorldConfig {
          phantomIgnoreCreative = getBoolean("phantoms-do-not-spawn-on-creative-players", phantomIgnoreCreative);
          phantomOnlyAttackInsomniacs = getBoolean("phantoms-only-attack-insomniacs", phantomOnlyAttackInsomniacs);
      }
diff --git a/patches/server/0430-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/patches/server/0430-Delay-Chunk-Unloads-based-on-Player-Movement.patch
index b36f8e8596..c2aa99dda8 100644
--- a/patches/server/0430-Delay-Chunk-Unloads-based-on-Player-Movement.patch
+++ b/patches/server/0430-Delay-Chunk-Unloads-based-on-Player-Movement.patch
@@ -17,10 +17,10 @@ This allows servers with smaller worlds who do less long distance exploring to s
 wasting cpu cycles on saving/unloading/reloading chunks repeatedly.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 8a12ad8417458d1ad71664e394f78db6b3770c0b..64ceb8609891f59f4cf3b54844a25402bab32c26 100644
+index 3a5b6bdd20645c2afc788893dfa33511145deb6d..fb3023ee557b9c851d613aae0da26a4277d0ecd4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -654,4 +654,13 @@ public class PaperWorldConfig {
+@@ -676,4 +676,13 @@ public class PaperWorldConfig {
          expMergeMaxValue = getInt("experience-merge-max-value", -1);
          log("Experience Merge Max Value: " + expMergeMaxValue);
      }
diff --git a/patches/server/0563-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0563-Added-world-settings-for-mobs-picking-up-loot.patch
index 69ca59fc82..643cc13eaf 100644
--- a/patches/server/0563-Added-world-settings-for-mobs-picking-up-loot.patch
+++ b/patches/server/0563-Added-world-settings-for-mobs-picking-up-loot.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Added world settings for mobs picking up loot
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 9cbff12cdfe7882d90c481496a6e8d96b7f19315..c22b05f9385efb0cb1f6ae3ae6af6e70f42e7506 100644
+index 375c15f672cbc612e4ab967d3519697937e7860e..137e4a16c4013bbbd6fed4f09f076267b2f45707 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -715,6 +715,14 @@ public class PaperWorldConfig {
+@@ -737,6 +737,14 @@ public class PaperWorldConfig {
          phantomOnlyAttackInsomniacs = getBoolean("phantoms-only-attack-insomniacs", phantomOnlyAttackInsomniacs);
      }
  
@@ -37,7 +37,7 @@ index 609380af4de4118a543b6ec94feb176e6f6870ed..ecf12ed5014202181e78af051e4a9ca8
              LocalDate localdate = LocalDate.now();
              int i = localdate.get(ChronoField.DAY_OF_MONTH);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index 3221bac65860801cc3ff8cca73b38669d354ba54..752ef51c7581062879fcc6111cec90828eaea452 100644
+index 5341f65436bb147c8aed5206c5e4515c7517bc2e..92145b35cf9f04afd388dfea8215097a9da7c5a7 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 @@ -503,7 +503,7 @@ public class Zombie extends Monster {
diff --git a/patches/server/0582-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0582-Add-toggle-for-always-placing-the-dragon-egg.patch
index 2e2e3fcc2d..125bbb40ae 100644
--- a/patches/server/0582-Add-toggle-for-always-placing-the-dragon-egg.patch
+++ b/patches/server/0582-Add-toggle-for-always-placing-the-dragon-egg.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add toggle for always placing the dragon egg
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 8a97978f16f8a4c759cb2eba9f408159b3382db6..4ab8e20efc54e7094e3e0f98109c95252d5e7c01 100644
+index 9f30096851601b8b9cecf2de97b32371e39d2e9d..63c5e6547af91e8227124fcc214d4b01a94f3c74 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -745,6 +745,11 @@ public class PaperWorldConfig {
+@@ -767,6 +767,11 @@ public class PaperWorldConfig {
          perPlayerMobSpawns = getBoolean("per-player-mob-spawns", true);
      }
  
diff --git a/patches/server/0588-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0588-added-option-to-disable-pathfinding-updates-on-block.patch
index 044e23afdd..ee3ff7c67a 100644
--- a/patches/server/0588-added-option-to-disable-pathfinding-updates-on-block.patch
+++ b/patches/server/0588-added-option-to-disable-pathfinding-updates-on-block.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] added option to disable pathfinding updates on block changes
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 4ab8e20efc54e7094e3e0f98109c95252d5e7c01..cdcb877e374bcd2dd944c754bfc91e23ef6986ae 100644
+index 63c5e6547af91e8227124fcc214d4b01a94f3c74..a9a3b50750ce612a4648f2c32c943d11ea48207e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -750,6 +750,11 @@ public class PaperWorldConfig {
+@@ -772,6 +772,11 @@ public class PaperWorldConfig {
          enderDragonsDeathAlwaysPlacesDragonEgg = getBoolean("ender-dragons-death-always-places-dragon-egg", enderDragonsDeathAlwaysPlacesDragonEgg);
      }
  
@@ -21,7 +21,7 @@ index 4ab8e20efc54e7094e3e0f98109c95252d5e7c01..cdcb877e374bcd2dd944c754bfc91e23
      public boolean phantomOnlyAttackInsomniacs = true;
      private void phantomSettings() {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 349f92a10e80f091abca6d86b869800d8c5ea787..773c7b0fe682fa17363f0a7841a77010b0b38b71 100644
+index af99e51d26d3c80ec14d78646f8c672e20f57f5f..a1df04f14fb149315e73307a81514b805ef3cb0d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1406,6 +1406,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0607-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0607-Allow-using-signs-inside-spawn-protection.patch
index cc8911911c..6e179cb7cc 100644
--- a/patches/server/0607-Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/server/0607-Allow-using-signs-inside-spawn-protection.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Allow using signs inside spawn protection
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index cdcb877e374bcd2dd944c754bfc91e23ef6986ae..3ea410faba8412fa5aa1c1b6bcdd3aeddc982f59 100644
+index a9a3b50750ce612a4648f2c32c943d11ea48207e..e18b2e1470f03994facd6c471361e425791b7b19 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -784,4 +784,9 @@ public class PaperWorldConfig {
+@@ -806,4 +806,9 @@ public class PaperWorldConfig {
              delayChunkUnloadsBy *= 20;
          }
      }
@@ -19,7 +19,7 @@ index cdcb877e374bcd2dd944c754bfc91e23ef6986ae..3ea410faba8412fa5aa1c1b6bcdd3aed
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c58a01989e1aa9999534fbf4b718244778dd9497..efee98799e5196c9f1adf73a0f4ff0590ed96b5f 100644
+index 345d25950406d4c0567a3ac41cd00586f4241a0f..bcc83f35ef838cb043ec4fb98c6a4af86fba3f85 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1756,7 +1756,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0658-Limit-item-frame-cursors-on-maps.patch b/patches/server/0658-Limit-item-frame-cursors-on-maps.patch
index 97ce04c935..11982b7767 100644
--- a/patches/server/0658-Limit-item-frame-cursors-on-maps.patch
+++ b/patches/server/0658-Limit-item-frame-cursors-on-maps.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Limit item frame cursors on maps
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index f06c9b615079b8200b45c4cea7aeacaf789159f3..489c81493ecae59c5d02572b447ed2696959c947 100644
+index 1a59a636a8b1fa52d5af42e24512814ed9b00173..dde252b3884a79aeec17bb3ae6c3b8bd7bd5a28c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -823,4 +823,9 @@ public class PaperWorldConfig {
+@@ -845,4 +845,9 @@ public class PaperWorldConfig {
      private void allowUsingSignsInsideSpawnProtection() {
          allowUsingSignsInsideSpawnProtection = getBoolean("allow-using-signs-inside-spawn-protection", allowUsingSignsInsideSpawnProtection);
      }
diff --git a/patches/server/0663-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0663-Add-option-to-fix-items-merging-through-walls.patch
index 3855ef8543..a8c689a9bf 100644
--- a/patches/server/0663-Add-option-to-fix-items-merging-through-walls.patch
+++ b/patches/server/0663-Add-option-to-fix-items-merging-through-walls.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add option to fix items merging through walls
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 489c81493ecae59c5d02572b447ed2696959c947..56d0c34446a962b46143a43a179b7c3307481296 100644
+index dde252b3884a79aeec17bb3ae6c3b8bd7bd5a28c..2cab53fce9a3fe875d7e7c7c9fb7b59f74b361b9 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -828,4 +828,9 @@ public class PaperWorldConfig {
+@@ -850,4 +850,9 @@ public class PaperWorldConfig {
      private void mapItemFrameCursorLimit() {
          mapItemFrameCursorLimit = getInt("map-item-frame-cursor-limit", mapItemFrameCursorLimit);
      }
@@ -19,10 +19,10 @@ index 489c81493ecae59c5d02572b447ed2696959c947..56d0c34446a962b46143a43a179b7c33
 +    }
  }
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index 7b2ac6920d5f0a8dc7cbb552a0e45e2fe471190e..47b946f7b761a318780b7c1973d0450faf7e8b62 100644
+index 3938bb6aa82bd02359dede6f6b17b7ba6685579b..9ca37cbf829ff4240ae79fc283bcf9e7f2c728d2 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-@@ -240,6 +240,14 @@ public class ItemEntity extends Entity {
+@@ -241,6 +241,14 @@ public class ItemEntity extends Entity {
                  ItemEntity entityitem = (ItemEntity) iterator.next();
  
                  if (entityitem.isMergable()) {
diff --git a/patches/server/0665-Fix-invulnerable-end-crystals.patch b/patches/server/0665-Fix-invulnerable-end-crystals.patch
index e4866ecc06..53644aafbe 100644
--- a/patches/server/0665-Fix-invulnerable-end-crystals.patch
+++ b/patches/server/0665-Fix-invulnerable-end-crystals.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix invulnerable end crystals
 MC-108513
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 56d0c34446a962b46143a43a179b7c3307481296..db4aed53ce28393ac34c06753647cbe1322e89c6 100644
+index 2cab53fce9a3fe875d7e7c7c9fb7b59f74b361b9..36e5f8e8634271b63fbbdf0b4ba171dd8ee12ef0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -833,4 +833,9 @@ public class PaperWorldConfig {
+@@ -855,4 +855,9 @@ public class PaperWorldConfig {
      private void fixItemsMergingThroughWalls() {
          fixItemsMergingThroughWalls = getBoolean("fix-items-merging-through-walls", fixItemsMergingThroughWalls);
      }
diff --git a/patches/server/0679-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0679-Fix-commands-from-signs-not-firing-command-events.patch
index 386073e2a7..8b91651e49 100644
--- a/patches/server/0679-Fix-commands-from-signs-not-firing-command-events.patch
+++ b/patches/server/0679-Fix-commands-from-signs-not-firing-command-events.patch
@@ -10,10 +10,10 @@ This patch changes sign command logic so that `run_command` click events:
   - sends failure messages to the player who clicked the sign
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 54a2f43e568b0104571abcb5d84aac35ddde3cd7..ee5479b0b168f230ec4f29db56cf481706bbfeb6 100644
+index 59c6a11c48ae4ad985a12113087eb8cdc72f5c15..ed358b9904ed67e232930469185ba973a792e525 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -858,4 +858,9 @@ public class PaperWorldConfig {
+@@ -880,4 +880,9 @@ public class PaperWorldConfig {
      private void fixInvulnerableEndCrystalExploit() {
          fixInvulnerableEndCrystalExploit = getBoolean("unsupported-settings.fix-invulnerable-end-crystal-exploit", fixInvulnerableEndCrystalExploit);
      }
diff --git a/patches/server/0684-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0684-Don-t-apply-cramming-damage-to-players.patch
index 3dfa3dca34..10f080bcab 100644
--- a/patches/server/0684-Don-t-apply-cramming-damage-to-players.patch
+++ b/patches/server/0684-Don-t-apply-cramming-damage-to-players.patch
@@ -11,10 +11,10 @@ It does not make a lot of sense to damage players if they get crammed,
 For those who really want it a config option is provided.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index c8e1e1f59a689f60846fa88a4a4e48cb21e9863c..960240240d76d408489f5c0274d56b0496c69928 100644
+index 55265b9f34a2615b6a30b35cbcd3c1e9032708bf..7454e37ef13f9b48dae49915bb100ebaa7d17665 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -878,4 +878,9 @@ public class PaperWorldConfig {
+@@ -900,4 +900,9 @@ public class PaperWorldConfig {
      private void showSignClickCommandFailureMessagesToPlayer() {
          showSignClickCommandFailureMessagesToPlayer = getBoolean("show-sign-click-command-failure-msgs-to-player", showSignClickCommandFailureMessagesToPlayer);
      }
diff --git a/patches/server/0685-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0685-Rate-options-and-timings-for-sensors-and-behaviors.patch
index 74cf0c5264..8b6e2c2c98 100644
--- a/patches/server/0685-Rate-options-and-timings-for-sensors-and-behaviors.patch
+++ b/patches/server/0685-Rate-options-and-timings-for-sensors-and-behaviors.patch
@@ -28,7 +28,7 @@ index b47b7dce26805badd422c1867733ff4bfd00e9f4..b27021a42cbed3f0648a8d0903d00d03
       * Get a named timer for the specified tile entity type to track type specific timings.
       * @param entity
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 960240240d76d408489f5c0274d56b0496c69928..5ad05615e4dc1cc14112ab40e435a72672eedb87 100644
+index 7454e37ef13f9b48dae49915bb100ebaa7d17665..e1d83ca4270f482a567d2ff1d531dae500044d2c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -9,8 +9,10 @@ import it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap;
@@ -42,7 +42,7 @@ index 960240240d76d408489f5c0274d56b0496c69928..5ad05615e4dc1cc14112ab40e435a726
  import org.bukkit.configuration.file.YamlConfiguration;
  import org.spigotmc.SpigotWorldConfig;
  
-@@ -883,4 +885,57 @@ public class PaperWorldConfig {
+@@ -905,4 +907,57 @@ public class PaperWorldConfig {
      private void playerCrammingDamage() {
          allowPlayerCrammingDamage = getBoolean("allow-player-cramming-damage", allowPlayerCrammingDamage);
      }
diff --git a/patches/server/0702-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0702-Configurable-item-frame-map-cursor-update-interval.patch
index ad55f5c5ec..7e39be92d9 100644
--- a/patches/server/0702-Configurable-item-frame-map-cursor-update-interval.patch
+++ b/patches/server/0702-Configurable-item-frame-map-cursor-update-interval.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable item frame map cursor update interval
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 81d47e800b1dc1ae944b12313a8241c1d877e6a4..f5c1de088ff49178aac4b2bea7059b98d5e8d338 100644
+index 7228474782e66d1b7dcebe80e02180545b55a089..5a111ef1aa944500878ac4b2be2a161534894078 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -871,6 +871,11 @@ public class PaperWorldConfig {
+@@ -893,6 +893,11 @@ public class PaperWorldConfig {
          mapItemFrameCursorLimit = getInt("map-item-frame-cursor-limit", mapItemFrameCursorLimit);
      }
  
diff --git a/patches/server/0706-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0705-Change-EnderEye-target-without-changing-other-things.patch
index e4af6267df..e4af6267df 100644
--- a/patches/server/0706-Change-EnderEye-target-without-changing-other-things.patch
+++ b/patches/server/0705-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0705-Respect-despawn-rate-in-item-merge-check.patch b/patches/server/0705-Respect-despawn-rate-in-item-merge-check.patch
deleted file mode 100644
index 8967390e3e..0000000000
--- a/patches/server/0705-Respect-despawn-rate-in-item-merge-check.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Noah van der Aa <[email protected]>
-Date: Wed, 18 Aug 2021 23:01:55 +0200
-Subject: [PATCH] Respect despawn rate in item merge check
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index 47b946f7b761a318780b7c1973d0450faf7e8b62..f7d29950644a5cf12da0d31246d9f5fcbcc201bb 100644
---- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-@@ -261,7 +261,7 @@ public class ItemEntity extends Entity {
-     private boolean isMergable() {
-         ItemStack itemstack = this.getItem();
- 
--        return this.isAlive() && this.pickupDelay != 32767 && this.age != -32768 && this.age < 6000 && itemstack.getCount() < itemstack.getMaxStackSize();
-+        return this.isAlive() && this.pickupDelay != 32767 && this.age != -32768 && this.age < this.getDespawnRate() && itemstack.getCount() < itemstack.getMaxStackSize(); // Paper - respect despawn rate in pickup check.
-     }
- 
-     private void tryToMerge(ItemEntity other) {
diff --git a/patches/server/0707-Add-BlockBreakBlockEvent.patch b/patches/server/0706-Add-BlockBreakBlockEvent.patch
index b7f264d94f..b7f264d94f 100644
--- a/patches/server/0707-Add-BlockBreakBlockEvent.patch
+++ b/patches/server/0706-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0708-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0707-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
index 14e666a79e..14e666a79e 100644
--- a/patches/server/0708-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
+++ b/patches/server/0707-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0709-More-CommandBlock-API.patch b/patches/server/0708-More-CommandBlock-API.patch
index daf682f8a0..daf682f8a0 100644
--- a/patches/server/0709-More-CommandBlock-API.patch
+++ b/patches/server/0708-More-CommandBlock-API.patch
diff --git a/patches/server/0710-Add-missing-team-sidebar-display-slots.patch b/patches/server/0709-Add-missing-team-sidebar-display-slots.patch
index 5581728a48..5581728a48 100644
--- a/patches/server/0710-Add-missing-team-sidebar-display-slots.patch
+++ b/patches/server/0709-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0711-Add-back-EntityPortalExitEvent.patch b/patches/server/0710-Add-back-EntityPortalExitEvent.patch
index f1405ed36f..f1405ed36f 100644
--- a/patches/server/0711-Add-back-EntityPortalExitEvent.patch
+++ b/patches/server/0710-Add-back-EntityPortalExitEvent.patch
diff --git a/patches/server/0712-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0711-Add-methods-to-find-targets-for-lightning-strikes.patch
index 35a2dcf208..1f6b4d1593 100644
--- a/patches/server/0712-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/server/0711-Add-methods-to-find-targets-for-lightning-strikes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add methods to find targets for lightning strikes
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 8fbf0b2f6bd0bdc9eef8e9b950a81e258e1cc552..990c16b52ac80df180086d045d56923bb2d69b1e 100644
+index 384222f321f1678803d62187b76bf3dee1970c0c..b10c0099ba0691cb167e78b8decafe39146caaf2 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -754,6 +754,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -29,7 +29,7 @@ index 8fbf0b2f6bd0bdc9eef8e9b950a81e258e1cc552..990c16b52ac80df180086d045d56923b
                      blockposition1 = blockposition1.above(2);
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 9767b183630965472414a4197b54e1500573c89b..f0e84b0a37a7fc374fb3f11e77a76a627c39b3e8 100644
+index e84f352280fbdbda194f5b151f942d6d6718dc40..eb4c79a902166dd8e89f4de71dcb75c493852af5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -701,6 +701,23 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0713-Get-entity-default-attributes.patch b/patches/server/0712-Get-entity-default-attributes.patch
index 6ae983a717..6ae983a717 100644
--- a/patches/server/0713-Get-entity-default-attributes.patch
+++ b/patches/server/0712-Get-entity-default-attributes.patch
diff --git a/patches/server/0714-Left-handed-API.patch b/patches/server/0713-Left-handed-API.patch
index dd1acc7723..dd1acc7723 100644
--- a/patches/server/0714-Left-handed-API.patch
+++ b/patches/server/0713-Left-handed-API.patch
diff --git a/patches/server/0715-Add-advancement-display-API.patch b/patches/server/0714-Add-advancement-display-API.patch
index c2bd6b94c0..c2bd6b94c0 100644
--- a/patches/server/0715-Add-advancement-display-API.patch
+++ b/patches/server/0714-Add-advancement-display-API.patch
diff --git a/patches/server/0716-Add-ItemFactory-getMonsterEgg-API.patch b/patches/server/0715-Add-ItemFactory-getMonsterEgg-API.patch
index a39b8f22f5..a39b8f22f5 100644
--- a/patches/server/0716-Add-ItemFactory-getMonsterEgg-API.patch
+++ b/patches/server/0715-Add-ItemFactory-getMonsterEgg-API.patch
diff --git a/patches/server/0717-Add-critical-damage-API.patch b/patches/server/0716-Add-critical-damage-API.patch
index 1eb7eeb9dd..1eb7eeb9dd 100644
--- a/patches/server/0717-Add-critical-damage-API.patch
+++ b/patches/server/0716-Add-critical-damage-API.patch
diff --git a/patches/server/0718-Fix-issues-with-mob-conversion.patch b/patches/server/0717-Fix-issues-with-mob-conversion.patch
index 69feb4b3a4..69feb4b3a4 100644
--- a/patches/server/0718-Fix-issues-with-mob-conversion.patch
+++ b/patches/server/0717-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0719-Add-isCollidable-methods-to-various-places.patch b/patches/server/0718-Add-isCollidable-methods-to-various-places.patch
index 1497c827c3..374f139fe4 100644
--- a/patches/server/0719-Add-isCollidable-methods-to-various-places.patch
+++ b/patches/server/0718-Add-isCollidable-methods-to-various-places.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add isCollidable methods to various places
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 6c29efdb641c5d768a8bbf410da2a059e7d3e90a..0b2e33fb16f832e0ddfe5e39a8a16caf98521098 100644
+index b2628b1698ef2a235e7b465f09747cafbb133b7a..2881bcb570dc86a7602309e1f540ecd1c7f00284 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -480,6 +480,11 @@ public class CraftBlock implements Block {
diff --git a/patches/server/0720-Goat-ram-API.patch b/patches/server/0719-Goat-ram-API.patch
index f1fcff3a29..f1fcff3a29 100644
--- a/patches/server/0720-Goat-ram-API.patch
+++ b/patches/server/0719-Goat-ram-API.patch
diff --git a/patches/server/0721-Add-API-for-resetting-a-single-score.patch b/patches/server/0720-Add-API-for-resetting-a-single-score.patch
index c2e1fd93b9..c2e1fd93b9 100644
--- a/patches/server/0721-Add-API-for-resetting-a-single-score.patch
+++ b/patches/server/0720-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0722-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0721-Add-Raw-Byte-Entity-Serialization.patch
index 386d4af369..386d4af369 100644
--- a/patches/server/0722-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/server/0721-Add-Raw-Byte-Entity-Serialization.patch
diff --git a/patches/server/0723-Vanilla-command-permission-fixes.patch b/patches/server/0722-Vanilla-command-permission-fixes.patch
index d9b53520f4..d9b53520f4 100644
--- a/patches/server/0723-Vanilla-command-permission-fixes.patch
+++ b/patches/server/0722-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0724-Make-CallbackExecutor-strict-again.patch b/patches/server/0723-Make-CallbackExecutor-strict-again.patch
index 9360912a3d..9360912a3d 100644
--- a/patches/server/0724-Make-CallbackExecutor-strict-again.patch
+++ b/patches/server/0723-Make-CallbackExecutor-strict-again.patch
diff --git a/patches/server/0725-Do-not-allow-the-server-to-unload-chunks-at-request-.patch b/patches/server/0724-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
index a5d388d197..a5d388d197 100644
--- a/patches/server/0725-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
+++ b/patches/server/0724-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
diff --git a/patches/server/0726-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0725-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index 71110aaeb6..00366a827d 100644
--- a/patches/server/0726-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/server/0725-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
@@ -28,7 +28,7 @@ index b10c0099ba0691cb167e78b8decafe39146caaf2..a7ad8fcbd99b94440803290b7fe7465c
          }
          // Spigot End
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index cb67d57bf4e7f02bf9416e4286612924e9989afc..62ecd1c83e0a11f44d68ede0520b0f678c75dcce 100644
+index 58ece1e30d316a81e347f196d288292154d71bfe..0b567dfbf7c3971858707bcde6909323a7a2634f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1580,6 +1580,18 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0727-Correctly-handle-recursion-for-chunkholder-updates.patch b/patches/server/0726-Correctly-handle-recursion-for-chunkholder-updates.patch
index 3d7be82a0c..3d7be82a0c 100644
--- a/patches/server/0727-Correctly-handle-recursion-for-chunkholder-updates.patch
+++ b/patches/server/0726-Correctly-handle-recursion-for-chunkholder-updates.patch
diff --git a/patches/server/0728-Fix-GameProfileCache-concurrency.patch b/patches/server/0727-Fix-GameProfileCache-concurrency.patch
index 6d3dd691b3..6d3dd691b3 100644
--- a/patches/server/0728-Fix-GameProfileCache-concurrency.patch
+++ b/patches/server/0727-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0729-Fix-chunks-refusing-to-unload-at-low-TPS.patch b/patches/server/0728-Fix-chunks-refusing-to-unload-at-low-TPS.patch
index 9faff94627..9faff94627 100644
--- a/patches/server/0729-Fix-chunks-refusing-to-unload-at-low-TPS.patch
+++ b/patches/server/0728-Fix-chunks-refusing-to-unload-at-low-TPS.patch
diff --git a/patches/server/0730-Do-not-allow-ticket-level-changes-while-unloading-pl.patch b/patches/server/0729-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
index 3dc1dc9d4d..3dc1dc9d4d 100644
--- a/patches/server/0730-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
+++ b/patches/server/0729-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
diff --git a/patches/server/0731-Do-not-allow-ticket-level-changes-when-updating-chun.patch b/patches/server/0730-Do-not-allow-ticket-level-changes-when-updating-chun.patch
index ab433784a5..ab433784a5 100644
--- a/patches/server/0731-Do-not-allow-ticket-level-changes-when-updating-chun.patch
+++ b/patches/server/0730-Do-not-allow-ticket-level-changes-when-updating-chun.patch
diff --git a/patches/server/0732-Do-not-submit-profile-lookups-to-worldgen-threads.patch b/patches/server/0731-Do-not-submit-profile-lookups-to-worldgen-threads.patch
index f1e2a4b83d..f1e2a4b83d 100644
--- a/patches/server/0732-Do-not-submit-profile-lookups-to-worldgen-threads.patch
+++ b/patches/server/0731-Do-not-submit-profile-lookups-to-worldgen-threads.patch
diff --git a/patches/server/0733-Log-when-the-async-catcher-is-tripped.patch b/patches/server/0732-Log-when-the-async-catcher-is-tripped.patch
index bede76faf6..bede76faf6 100644
--- a/patches/server/0733-Log-when-the-async-catcher-is-tripped.patch
+++ b/patches/server/0732-Log-when-the-async-catcher-is-tripped.patch
diff --git a/patches/server/0734-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0733-Add-paper-mobcaps-and-paper-playermobcaps.patch
index e6ef18f9d9..e6ef18f9d9 100644
--- a/patches/server/0734-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/server/0733-Add-paper-mobcaps-and-paper-playermobcaps.patch
diff --git a/patches/server/0735-Prevent-unload-calls-removing-tickets-for-sync-loads.patch b/patches/server/0734-Prevent-unload-calls-removing-tickets-for-sync-loads.patch
index 000406a8b8..000406a8b8 100644
--- a/patches/server/0735-Prevent-unload-calls-removing-tickets-for-sync-loads.patch
+++ b/patches/server/0734-Prevent-unload-calls-removing-tickets-for-sync-loads.patch
diff --git a/patches/server/0736-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0735-Sanitize-ResourceLocation-error-logging.patch
index ff7e0b7826..ff7e0b7826 100644
--- a/patches/server/0736-Sanitize-ResourceLocation-error-logging.patch
+++ b/patches/server/0735-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0737-Optimise-general-POI-access.patch b/patches/server/0736-Optimise-general-POI-access.patch
index 7fa35796de..7fa35796de 100644
--- a/patches/server/0737-Optimise-general-POI-access.patch
+++ b/patches/server/0736-Optimise-general-POI-access.patch
diff --git a/patches/server/0738-Allow-controlled-flushing-for-network-manager.patch b/patches/server/0737-Allow-controlled-flushing-for-network-manager.patch
index 9b061bed55..9b061bed55 100644
--- a/patches/server/0738-Allow-controlled-flushing-for-network-manager.patch
+++ b/patches/server/0737-Allow-controlled-flushing-for-network-manager.patch
diff --git a/patches/server/0739-Add-more-async-catchers.patch b/patches/server/0738-Add-more-async-catchers.patch
index f0813b3370..f0813b3370 100644
--- a/patches/server/0739-Add-more-async-catchers.patch
+++ b/patches/server/0738-Add-more-async-catchers.patch
diff --git a/patches/server/0740-Rewrite-entity-bounding-box-lookup-calls.patch b/patches/server/0739-Rewrite-entity-bounding-box-lookup-calls.patch
index 855a4f6e15..57def490a5 100644
--- a/patches/server/0740-Rewrite-entity-bounding-box-lookup-calls.patch
+++ b/patches/server/0739-Rewrite-entity-bounding-box-lookup-calls.patch
@@ -914,7 +914,7 @@ index 0000000000000000000000000000000000000000..3ba094e640d7fe7803e2bbdab8ff3beb
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 3d00c1bcd5acbeee09f1854076545a1d3628d27e..4800285c5a6262d2f3331a10bb262e37489a47fa 100644
+index a7ad8fcbd99b94440803290b7fe7465c638dc895..848601bf0a5af305a0eef48d5870afc0fcce3af0 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -431,7 +431,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1280,7 +1280,7 @@ index 13e887e9d06c3eb8649613d1ecb3d26de6b9d6ef..34e2e14ebb007cceb8b64d3eb321646e
 +    // Paper end
  }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 88c3022abc5edde312573de4fe499f1f5ee9eeae..8bd8b85445b2b0b6517590baef33bb4234bb2a38 100644
+index c9a032c5331a918453de5e8c6a6d13f5c9f415ee..5bffc9a0f6ef9d54abb359565d07509b177c2b82 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -210,7 +210,13 @@ public class ActivationRange
diff --git a/patches/server/0741-Optimise-chunk-tick-iteration.patch b/patches/server/0740-Optimise-chunk-tick-iteration.patch
index 136af3f2a8..136af3f2a8 100644
--- a/patches/server/0741-Optimise-chunk-tick-iteration.patch
+++ b/patches/server/0740-Optimise-chunk-tick-iteration.patch
diff --git a/patches/server/0742-Execute-chunk-tasks-mid-tick.patch b/patches/server/0741-Execute-chunk-tasks-mid-tick.patch
index 2720681ef9..8f00440e97 100644
--- a/patches/server/0742-Execute-chunk-tasks-mid-tick.patch
+++ b/patches/server/0741-Execute-chunk-tasks-mid-tick.patch
@@ -126,7 +126,7 @@ index d06ad4f2c76eebd3b8191f3de6c0199fa3bb5f22..e14215d538d19838041e3e21a84396c2
                  }
                  // Paper start - optimise chunk tick iteration
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 4800285c5a6262d2f3331a10bb262e37489a47fa..cb872bcd9aba263ec2233aa1555bc99133cc682c 100644
+index 848601bf0a5af305a0eef48d5870afc0fcce3af0..8fc78a0405359e6031e66e988f3ddbf913ca59bd 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -202,7 +202,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0743-Do-not-copy-visible-chunks.patch b/patches/server/0742-Do-not-copy-visible-chunks.patch
index f197972015..639b6229f2 100644
--- a/patches/server/0743-Do-not-copy-visible-chunks.patch
+++ b/patches/server/0742-Do-not-copy-visible-chunks.patch
@@ -186,7 +186,7 @@ index ef28e0f57ba593265a3eca4d3f21d0b1b51e8740..f4c1316ae1cadc1a7a7fed16e0e99704
          while (objectbidirectionaliterator.hasNext()) {
              Entry<ChunkHolder> entry = (Entry) objectbidirectionaliterator.next();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index df986f97b86ba1fa4da15d969c635333abfdba91..6e10ca6dec598032eb8dc20dd88876db2ba2ae9b 100644
+index 6c791db6d010877dcc77acac449720727dda1b57..6baac7411f975b53cd49c15ac8d73c8df54b12bb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -160,7 +160,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0744-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0743-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
index 5459269b64..5459269b64 100644
--- a/patches/server/0744-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
+++ b/patches/server/0743-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/0745-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0744-Custom-table-implementation-for-blockstate-state-loo.patch
index 9b556d7fe8..0a86af9805 100644
--- a/patches/server/0745-Custom-table-implementation-for-blockstate-state-loo.patch
+++ b/patches/server/0744-Custom-table-implementation-for-blockstate-state-loo.patch
@@ -320,7 +320,7 @@ index 72f508321ebffcca31240fbdd068b4d185454cbc..d16156f8a4a2507e114dc651fd0af9cd
          super(name, Integer.class);
          this.min = min;
 diff --git a/src/main/java/net/minecraft/world/level/block/state/properties/Property.java b/src/main/java/net/minecraft/world/level/block/state/properties/Property.java
-index 1d0f0099571e7295f5f83004c45b6e992a4af83a..bf4a39671425b56e7096008a8e43094eebbb2d05 100644
+index a37424bbc6bee02354abaa793aa0865c556c6bbe..f923593bd336dd1a950ba61603d53edb3c9703eb 100644
 --- a/src/main/java/net/minecraft/world/level/block/state/properties/Property.java
 +++ b/src/main/java/net/minecraft/world/level/block/state/properties/Property.java
 @@ -22,6 +22,17 @@ public abstract class Property<T extends Comparable<T>> {
diff --git a/patches/server/0746-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0745-Detail-more-information-in-watchdog-dumps.patch
index aec19cc83c..feab57c3f6 100644
--- a/patches/server/0746-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/server/0745-Detail-more-information-in-watchdog-dumps.patch
@@ -77,7 +77,7 @@ index 97b05b7145c6a3a379de31b8988c909da9b21139..f7bb26e8b7a74a9ae5b469351b2fccc6
              });
              throw RunningOnDifferentThreadException.RUNNING_ON_DIFFERENT_THREAD;
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index cb872bcd9aba263ec2233aa1555bc99133cc682c..8f27ef86cac71e0a0002093f4eded83f8891876f 100644
+index 8fc78a0405359e6031e66e988f3ddbf913ca59bd..32446e874fdad36f9f80d22481a4d990967f38e3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -981,7 +981,26 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0747-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0746-Manually-inline-methods-in-BlockPosition.patch
index 6668339cba..6668339cba 100644
--- a/patches/server/0747-Manually-inline-methods-in-BlockPosition.patch
+++ b/patches/server/0746-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0748-Distance-manager-tick-timings.patch b/patches/server/0747-Distance-manager-tick-timings.patch
index 2ea652c2aa..2ea652c2aa 100644
--- a/patches/server/0748-Distance-manager-tick-timings.patch
+++ b/patches/server/0747-Distance-manager-tick-timings.patch
diff --git a/patches/server/0749-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0748-Name-craft-scheduler-threads-according-to-the-plugin.patch
index 7d081ee195..7d081ee195 100644
--- a/patches/server/0749-Name-craft-scheduler-threads-according-to-the-plugin.patch
+++ b/patches/server/0748-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0750-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0749-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
index c3f6182749..c3f6182749 100644
--- a/patches/server/0750-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
+++ b/patches/server/0749-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0751-Add-packet-limiter-config.patch b/patches/server/0750-Add-packet-limiter-config.patch
index cd072e69e2..feb1bfd26f 100644
--- a/patches/server/0751-Add-packet-limiter-config.patch
+++ b/patches/server/0750-Add-packet-limiter-config.patch
@@ -24,7 +24,7 @@ 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 3d1319af2dbade4234025793303333cb95d9c019..cd601be6604fd81be8d58f6a46d39008fa8ecc20 100644
+index bc91acb8b7e407092102e39037fc6f3fd380a073..da3eca94623a81d178166cc4689bb95a829837cc 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -521,4 +521,102 @@ public class PaperConfig {
diff --git a/patches/server/0752-Lag-compensate-block-breaking.patch b/patches/server/0751-Lag-compensate-block-breaking.patch
index 985f81e240..8efc05d082 100644
--- a/patches/server/0752-Lag-compensate-block-breaking.patch
+++ b/patches/server/0751-Lag-compensate-block-breaking.patch
@@ -6,7 +6,7 @@ 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 cd601be6604fd81be8d58f6a46d39008fa8ecc20..cff9872882f9057ec2bfd44c15c1d66d8cefa721 100644
+index da3eca94623a81d178166cc4689bb95a829837cc..d673f1d051f943c65bceccc2c8d8172e3259abb4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -619,4 +619,10 @@ public class PaperConfig {
diff --git a/patches/server/0753-Use-correct-LevelStem-registry-when-loading-default-.patch b/patches/server/0752-Use-correct-LevelStem-registry-when-loading-default-.patch
index 9f6cbc3948..2ebf02008b 100644
--- a/patches/server/0753-Use-correct-LevelStem-registry-when-loading-default-.patch
+++ b/patches/server/0752-Use-correct-LevelStem-registry-when-loading-default-.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Use correct LevelStem registry when loading default
 Co-authored-by: Jake Potrebic <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/resources/RegistryLoader.java b/src/main/java/net/minecraft/resources/RegistryLoader.java
-index 75f72b568ee2b27c5042da688b62d4e3c5732e09..8c3555842202d67793d818c96feda4daa2f08a0c 100644
+index 0d28a3a7f52174e70e044957b37361043b153e42..cdd2556e0401be0411563b89c6b7456a4778376a 100644
 --- a/src/main/java/net/minecraft/resources/RegistryLoader.java
 +++ b/src/main/java/net/minecraft/resources/RegistryLoader.java
 @@ -42,6 +42,12 @@ public class RegistryLoader {
diff --git a/patches/server/0754-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0753-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
index c5bd6526f7..c5bd6526f7 100644
--- a/patches/server/0754-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
+++ b/patches/server/0753-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0755-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/server/0754-Consolidate-flush-calls-for-entity-tracker-packets.patch
index 73b6417870..73b6417870 100644
--- a/patches/server/0755-Consolidate-flush-calls-for-entity-tracker-packets.patch
+++ b/patches/server/0754-Consolidate-flush-calls-for-entity-tracker-packets.patch
diff --git a/patches/server/0756-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0755-Don-t-lookup-fluid-state-when-raytracing.patch
index eef7de0e32..eef7de0e32 100644
--- a/patches/server/0756-Don-t-lookup-fluid-state-when-raytracing.patch
+++ b/patches/server/0755-Don-t-lookup-fluid-state-when-raytracing.patch
diff --git a/patches/server/0757-Time-scoreboard-search.patch b/patches/server/0756-Time-scoreboard-search.patch
index 48469b83af..48469b83af 100644
--- a/patches/server/0757-Time-scoreboard-search.patch
+++ b/patches/server/0756-Time-scoreboard-search.patch
diff --git a/patches/server/0758-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0757-Send-full-pos-packets-for-hard-colliding-entities.patch
index d9e0872338..af16624ff3 100644
--- a/patches/server/0758-Send-full-pos-packets-for-hard-colliding-entities.patch
+++ b/patches/server/0757-Send-full-pos-packets-for-hard-colliding-entities.patch
@@ -9,7 +9,7 @@ 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 cff9872882f9057ec2bfd44c15c1d66d8cefa721..b8029b11764c67c0fe39bd1a07950f491691c938 100644
+index d673f1d051f943c65bceccc2c8d8172e3259abb4..2e02446ea3d0b3aa4673e9686ed62c14527fabcc 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -625,4 +625,10 @@ public class PaperConfig {
diff --git a/patches/server/0759-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0758-Do-not-run-raytrace-logic-for-AIR.patch
index baedf55a9d..baedf55a9d 100644
--- a/patches/server/0759-Do-not-run-raytrace-logic-for-AIR.patch
+++ b/patches/server/0758-Do-not-run-raytrace-logic-for-AIR.patch
diff --git a/patches/server/0760-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0759-Oprimise-map-impl-for-tracked-players.patch
index 91de4460ec..91de4460ec 100644
--- a/patches/server/0760-Oprimise-map-impl-for-tracked-players.patch
+++ b/patches/server/0759-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0761-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0760-Optimise-BlockSoil-nearby-water-lookup.patch
index f3fe0f0f17..f3fe0f0f17 100644
--- a/patches/server/0761-Optimise-BlockSoil-nearby-water-lookup.patch
+++ b/patches/server/0760-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0762-Allow-removal-addition-of-entities-to-entity-ticklis.patch b/patches/server/0761-Allow-removal-addition-of-entities-to-entity-ticklis.patch
index d68c8524e7..d68c8524e7 100644
--- a/patches/server/0762-Allow-removal-addition-of-entities-to-entity-ticklis.patch
+++ b/patches/server/0761-Allow-removal-addition-of-entities-to-entity-ticklis.patch
diff --git a/patches/server/0763-Optimise-random-block-ticking.patch b/patches/server/0762-Optimise-random-block-ticking.patch
index dc1d3bcac7..871b901f2e 100644
--- a/patches/server/0763-Optimise-random-block-ticking.patch
+++ b/patches/server/0762-Optimise-random-block-ticking.patch
@@ -71,7 +71,7 @@ index 0000000000000000000000000000000000000000..e8b4053babe46999980b926431254050
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 8f27ef86cac71e0a0002093f4eded83f8891876f..6b90582dd0aefccab7e1b5a1718f96854d1cdd81 100644
+index 32446e874fdad36f9f80d22481a4d990967f38e3..8f135c8a4c4fe7cc1b1b8ae8db6f740227b5df50 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -645,6 +645,10 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0764-Optimise-non-flush-packet-sending.patch b/patches/server/0763-Optimise-non-flush-packet-sending.patch
index f4d6e1b6b4..f4d6e1b6b4 100644
--- a/patches/server/0764-Optimise-non-flush-packet-sending.patch
+++ b/patches/server/0763-Optimise-non-flush-packet-sending.patch
diff --git a/patches/server/0765-Optimise-nearby-player-lookups.patch b/patches/server/0764-Optimise-nearby-player-lookups.patch
index 57d0707559..712d75c787 100644
--- a/patches/server/0765-Optimise-nearby-player-lookups.patch
+++ b/patches/server/0764-Optimise-nearby-player-lookups.patch
@@ -105,7 +105,7 @@ index b0aaeb601c8d9df50bf612985bbcbef8a082551f..bc6a4bfe7df804ee22791fb767f059a5
  
      protected ChunkGenerator generator() {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 6b90582dd0aefccab7e1b5a1718f96854d1cdd81..c780af51c50c019e7fa0e5aee3d05e3374f79948 100644
+index 8f135c8a4c4fe7cc1b1b8ae8db6f740227b5df50..6053b7797cc4f6ed1ffbfc35048bab1a96586254 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -400,6 +400,83 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0766-Optimise-WorldServer-notify.patch b/patches/server/0765-Optimise-WorldServer-notify.patch
index c6a1399cae..c6a1399cae 100644
--- a/patches/server/0766-Optimise-WorldServer-notify.patch
+++ b/patches/server/0765-Optimise-WorldServer-notify.patch
diff --git a/patches/server/0767-Remove-streams-for-villager-AI.patch b/patches/server/0766-Remove-streams-for-villager-AI.patch
index 8257c2de40..8257c2de40 100644
--- a/patches/server/0767-Remove-streams-for-villager-AI.patch
+++ b/patches/server/0766-Remove-streams-for-villager-AI.patch
diff --git a/patches/server/0768-Rewrite-dataconverter-system.patch b/patches/server/0767-Rewrite-dataconverter-system.patch
index 0e5060a537..51510f85ea 100644
--- a/patches/server/0768-Rewrite-dataconverter-system.patch
+++ b/patches/server/0767-Rewrite-dataconverter-system.patch
@@ -8337,7 +8337,7 @@ index 0000000000000000000000000000000000000000..711222cd33ee557b7f3d1f6ae73ad45d
 +}
 diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1451.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1451.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..a20d258814b0d2d0fa01d45be43a66987de19598
+index 0000000000000000000000000000000000000000..a1f270f55617e1608bf7821951fa589e611b6f7d
 --- /dev/null
 +++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V1451.java
 @@ -0,0 +1,512 @@
diff --git a/patches/server/0769-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0768-Use-Velocity-compression-and-cipher-natives.patch
index d3ae968812..d3ae968812 100644
--- a/patches/server/0769-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/0768-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/server/0770-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0769-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
index 5103d7a24c..5103d7a24c 100644
--- a/patches/server/0770-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
+++ b/patches/server/0769-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
diff --git a/patches/server/0771-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch b/patches/server/0770-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
index 5c0a433617..5c0a433617 100644
--- a/patches/server/0771-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
+++ b/patches/server/0770-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
diff --git a/patches/server/0772-Async-catch-modifications-to-critical-entity-state.patch b/patches/server/0771-Async-catch-modifications-to-critical-entity-state.patch
index 305329fc53..305329fc53 100644
--- a/patches/server/0772-Async-catch-modifications-to-critical-entity-state.patch
+++ b/patches/server/0771-Async-catch-modifications-to-critical-entity-state.patch
diff --git a/patches/server/0773-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0772-Fix-Bukkit-NamespacedKey-shenanigans.patch
index 8f152dd0e7..8f152dd0e7 100644
--- a/patches/server/0773-Fix-Bukkit-NamespacedKey-shenanigans.patch
+++ b/patches/server/0772-Fix-Bukkit-NamespacedKey-shenanigans.patch
diff --git a/patches/server/0774-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0773-Fix-merchant-inventory-not-closing-on-entity-removal.patch
index 68a4c86bc0..68a4c86bc0 100644
--- a/patches/server/0774-Fix-merchant-inventory-not-closing-on-entity-removal.patch
+++ b/patches/server/0773-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0775-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0774-Check-requirement-before-suggesting-root-nodes.patch
index d824c5f2af..d824c5f2af 100644
--- a/patches/server/0775-Check-requirement-before-suggesting-root-nodes.patch
+++ b/patches/server/0774-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0776-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0775-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index f87bd6c9cd..2bf87847d2 100644
--- a/patches/server/0776-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/server/0775-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Don't respond to ServerboundCommandSuggestionPacket when
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index cfb827f64eaacf9835f950b963b850609347a708..6c50add50f2c6c41806ce08916f3d374fd19827c 100644
+index c7ed9e00ed131f4f438244178ec24f14299c46b8..7be8b98a61c3d92ef7c473983fe620047a137630 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -770,6 +770,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0777-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0776-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
index 81bcca30af..81bcca30af 100644
--- a/patches/server/0777-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
+++ b/patches/server/0776-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0778-Ensure-valid-vehicle-status.patch b/patches/server/0777-Ensure-valid-vehicle-status.patch
index b5ad8a1ccb..8f0a2f2c48 100644
--- a/patches/server/0778-Ensure-valid-vehicle-status.patch
+++ b/patches/server/0777-Ensure-valid-vehicle-status.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ensure valid vehicle status
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 62ecd1c83e0a11f44d68ede0520b0f678c75dcce..d1e56c3cd33ab47c174fd586934682b9c7bccda6 100644
+index 0b567dfbf7c3971858707bcde6909323a7a2634f..ca978f337a7cf443e6918bea2e6cae0ceef30145 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -504,7 +504,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0779-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0778-Prevent-softlocked-end-exit-portal-generation.patch
index 855c2ec833..855c2ec833 100644
--- a/patches/server/0779-Prevent-softlocked-end-exit-portal-generation.patch
+++ b/patches/server/0778-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0780-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0779-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
index 2ce994e362..2ce994e362 100644
--- a/patches/server/0780-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
+++ b/patches/server/0779-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0781-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0780-Don-t-log-debug-logging-being-disabled.patch
index 5bec880eb8..5bec880eb8 100644
--- a/patches/server/0781-Don-t-log-debug-logging-being-disabled.patch
+++ b/patches/server/0780-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0782-Mark-fish-and-axolotls-from-buckets-as-persistent.patch b/patches/server/0781-Mark-fish-and-axolotls-from-buckets-as-persistent.patch
index a29e839964..a29e839964 100644
--- a/patches/server/0782-Mark-fish-and-axolotls-from-buckets-as-persistent.patch
+++ b/patches/server/0781-Mark-fish-and-axolotls-from-buckets-as-persistent.patch
diff --git a/patches/server/0783-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0782-fix-various-menus-with-empty-level-accesses.patch
index 3bda24b9c6..3bda24b9c6 100644
--- a/patches/server/0783-fix-various-menus-with-empty-level-accesses.patch
+++ b/patches/server/0782-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0784-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch b/patches/server/0783-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
index 6e988a6c7e..6e988a6c7e 100644
--- a/patches/server/0784-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
+++ b/patches/server/0783-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
diff --git a/patches/server/0785-Preserve-overstacked-loot.patch b/patches/server/0784-Preserve-overstacked-loot.patch
index 57bfd046f8..eb00c5955b 100644
--- a/patches/server/0785-Preserve-overstacked-loot.patch
+++ b/patches/server/0784-Preserve-overstacked-loot.patch
@@ -10,10 +10,10 @@ chunk bans via the large amount of NBT created by unstacking the items.
 Fixes GH-5140 and GH-4748.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index f5c1de088ff49178aac4b2bea7059b98d5e8d338..5cae8f1c0d1d9642ad6ee53d9897b28eab02c4cd 100644
+index 5a111ef1aa944500878ac4b2be2a161534894078..1df7006e5b6ffbf002acb2307b146f18a4338379 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -896,6 +896,11 @@ public class PaperWorldConfig {
+@@ -918,6 +918,11 @@ public class PaperWorldConfig {
          allowPlayerCrammingDamage = getBoolean("allow-player-cramming-damage", allowPlayerCrammingDamage);
      }
  
diff --git a/patches/server/0786-Update-head-rotation-in-missing-places.patch b/patches/server/0785-Update-head-rotation-in-missing-places.patch
index a50cf119d2..a50cf119d2 100644
--- a/patches/server/0786-Update-head-rotation-in-missing-places.patch
+++ b/patches/server/0785-Update-head-rotation-in-missing-places.patch
diff --git a/patches/server/0787-prevent-unintended-light-block-manipulation.patch b/patches/server/0786-prevent-unintended-light-block-manipulation.patch
index 08bd6164f5..08bd6164f5 100644
--- a/patches/server/0787-prevent-unintended-light-block-manipulation.patch
+++ b/patches/server/0786-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0788-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch b/patches/server/0787-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch
index 89603862f0..89603862f0 100644
--- a/patches/server/0788-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch
+++ b/patches/server/0787-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch
diff --git a/patches/server/0789-Fix-CraftCriteria-defaults-map.patch b/patches/server/0788-Fix-CraftCriteria-defaults-map.patch
index 11fce3ca24..11fce3ca24 100644
--- a/patches/server/0789-Fix-CraftCriteria-defaults-map.patch
+++ b/patches/server/0788-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0790-Fix-upstreams-block-state-factories.patch b/patches/server/0789-Fix-upstreams-block-state-factories.patch
index b5a4b68ac1..b5a4b68ac1 100644
--- a/patches/server/0790-Fix-upstreams-block-state-factories.patch
+++ b/patches/server/0789-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0791-Add-config-option-for-logging-player-ip-addresses.patch b/patches/server/0790-Add-config-option-for-logging-player-ip-addresses.patch
index 270aff873d..1854195a8e 100644
--- a/patches/server/0791-Add-config-option-for-logging-player-ip-addresses.patch
+++ b/patches/server/0790-Add-config-option-for-logging-player-ip-addresses.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add config option for logging player ip addresses
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index b8029b11764c67c0fe39bd1a07950f491691c938..5de84dfb6f18f3a0afdd33bf6bf640f48efc6e6b 100644
+index 2e02446ea3d0b3aa4673e9686ed62c14527fabcc..e1a6a3ca616fc2119604e6edc3570c3a90466966 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -91,6 +91,11 @@ public class PaperConfig {
@@ -81,7 +81,7 @@ index 4cd92875d60c2f1dcce67ac99e9ba257a10f87b1..f5c1dff1d571e89f960f11400edbcbbe
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 81957d99205fcee40752914180f9f4a1158a613f..03d4d4d95e0cf617726a39ebd7191cd2d10ffdb7 100644
+index 1fad95b709bbc755e5906a93c8d2ed09b52154ce..7fd530a901aecc49fa7fbbf3e876b0f56b665212 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -238,7 +238,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0792-Configurable-feature-seeds.patch b/patches/server/0791-Configurable-feature-seeds.patch
index 32151105ed..f876cf4343 100644
--- a/patches/server/0792-Configurable-feature-seeds.patch
+++ b/patches/server/0791-Configurable-feature-seeds.patch
@@ -19,10 +19,10 @@ index ee72086b2dee2bd6415803e77825b2b1cb83cd3d..309dbf5fce3ce940d5e1b57d267b9d6b
              }
              final Object val = config.get(key);
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 5cae8f1c0d1d9642ad6ee53d9897b28eab02c4cd..ed49f70d6a259dcbc72d9fe8addc42c4717a9e59 100644
+index 1df7006e5b6ffbf002acb2307b146f18a4338379..919d941383ccf3c4cb3391141db88c38c4070056 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -941,6 +941,55 @@ public class PaperWorldConfig {
+@@ -963,6 +963,55 @@ public class PaperWorldConfig {
          return table;
      }
  
diff --git a/patches/server/0793-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/server/0792-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
index 6e33709dbe..6e33709dbe 100644
--- a/patches/server/0793-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
+++ b/patches/server/0792-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
diff --git a/patches/server/0794-Add-root-admin-user-detection.patch b/patches/server/0793-Add-root-admin-user-detection.patch
index 86c355de50..86c355de50 100644
--- a/patches/server/0794-Add-root-admin-user-detection.patch
+++ b/patches/server/0793-Add-root-admin-user-detection.patch
diff --git a/patches/server/0795-Always-allow-item-changing-in-Fireball.patch b/patches/server/0794-Always-allow-item-changing-in-Fireball.patch
index fe4cbf2ef1..fe4cbf2ef1 100644
--- a/patches/server/0795-Always-allow-item-changing-in-Fireball.patch
+++ b/patches/server/0794-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0796-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0795-don-t-attempt-to-teleport-dead-entities.patch
index 1a9e09238f..1a9e09238f 100644
--- a/patches/server/0796-don-t-attempt-to-teleport-dead-entities.patch
+++ b/patches/server/0795-don-t-attempt-to-teleport-dead-entities.patch
diff --git a/patches/server/0797-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0796-Prevent-excessive-velocity-through-repeated-crits.patch
index 4304993831..4304993831 100644
--- a/patches/server/0797-Prevent-excessive-velocity-through-repeated-crits.patch
+++ b/patches/server/0796-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0798-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0797-Remove-client-side-code-using-deprecated-for-removal.patch
index a11975f1ad..a11975f1ad 100644
--- a/patches/server/0798-Remove-client-side-code-using-deprecated-for-removal.patch
+++ b/patches/server/0797-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0799-Rewrite-the-light-engine.patch b/patches/server/0798-Rewrite-the-light-engine.patch
index c82dfc25c2..c82dfc25c2 100644
--- a/patches/server/0799-Rewrite-the-light-engine.patch
+++ b/patches/server/0798-Rewrite-the-light-engine.patch
diff --git a/patches/server/0800-Always-parse-protochunk-light-sources-unless-it-is-m.patch b/patches/server/0799-Always-parse-protochunk-light-sources-unless-it-is-m.patch
index a1b655d7c1..a1b655d7c1 100644
--- a/patches/server/0800-Always-parse-protochunk-light-sources-unless-it-is-m.patch
+++ b/patches/server/0799-Always-parse-protochunk-light-sources-unless-it-is-m.patch
diff --git a/patches/server/0801-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0800-Fix-removing-recipes-from-RecipeIterator.patch
index 5784fd4dc3..5784fd4dc3 100644
--- a/patches/server/0801-Fix-removing-recipes-from-RecipeIterator.patch
+++ b/patches/server/0800-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0802-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0801-Prevent-sending-oversized-item-data-in-equipment-and.patch
index e35fbc79b1..e35fbc79b1 100644
--- a/patches/server/0802-Prevent-sending-oversized-item-data-in-equipment-and.patch
+++ b/patches/server/0801-Prevent-sending-oversized-item-data-in-equipment-and.patch
diff --git a/patches/server/0803-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0802-Hide-unnecessary-itemmeta-from-clients.patch
index 400121c799..1504b1c445 100644
--- a/patches/server/0803-Hide-unnecessary-itemmeta-from-clients.patch
+++ b/patches/server/0802-Hide-unnecessary-itemmeta-from-clients.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Hide unnecessary itemmeta from clients
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index ed49f70d6a259dcbc72d9fe8addc42c4717a9e59..1d7d6859531a470eea5d0cf25935250f7cba7d2a 100644
+index 919d941383ccf3c4cb3391141db88c38c4070056..7e83580c5cd7fb834e936f96824f90a6d7f3e007 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -911,6 +911,13 @@ public class PaperWorldConfig {
+@@ -933,6 +933,13 @@ public class PaperWorldConfig {
          behaviorTickRates = loadTickRates("behavior");
      }
  
diff --git a/patches/server/0804-Fix-kelp-modifier-changing-growth-for-other-crops.patch b/patches/server/0803-Fix-kelp-modifier-changing-growth-for-other-crops.patch
index da0f208d4e..da0f208d4e 100644
--- a/patches/server/0804-Fix-kelp-modifier-changing-growth-for-other-crops.patch
+++ b/patches/server/0803-Fix-kelp-modifier-changing-growth-for-other-crops.patch
diff --git a/patches/server/0805-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0804-Prevent-ContainerOpenersCounter-openCount-from-going.patch
index 0e41fd2743..0e41fd2743 100644
--- a/patches/server/0805-Prevent-ContainerOpenersCounter-openCount-from-going.patch
+++ b/patches/server/0804-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0806-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0805-Add-PlayerItemFrameChangeEvent.patch
index 464f2144c1..464f2144c1 100644
--- a/patches/server/0806-Add-PlayerItemFrameChangeEvent.patch
+++ b/patches/server/0805-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0807-Add-player-health-update-API.patch b/patches/server/0806-Add-player-health-update-API.patch
index 24160f8b5e..310d36d2dc 100644
--- a/patches/server/0807-Add-player-health-update-API.patch
+++ b/patches/server/0806-Add-player-health-update-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add player health update API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 415bcb2b53e943fefeaa58c49d901b029bfd2049..1c5be0cb22c568aee4fe6a13be591a123de100f5 100644
+index f110643dd7147f0e95dd5fba8e8506407089ed19..bf90519f04598ccd3f9a1515817524bbf3ab288c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2130,9 +2130,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0808-Optimize-HashMapPalette.patch b/patches/server/0807-Optimize-HashMapPalette.patch
index ef1880895f..ef1880895f 100644
--- a/patches/server/0808-Optimize-HashMapPalette.patch
+++ b/patches/server/0807-Optimize-HashMapPalette.patch
diff --git a/patches/server/0809-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0808-Allow-delegation-to-vanilla-chunk-gen.patch
index 66d7907783..850631ba63 100644
--- a/patches/server/0809-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/server/0808-Allow-delegation-to-vanilla-chunk-gen.patch
@@ -5,7 +5,7 @@ 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 030bb69543f077d5fb80e478efa786c123ff1487..5d41c30254e271a7b0a8e72582f02b462524bb7b 100644
+index 7b1bccfbf44c5b431f52f4ed974f9143c12a8300..72bb60f5bf4cf67bd2951228287693cfc52e2b2b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2311,6 +2311,90 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0810-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0809-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
index 719fe45b87..f4c6027faf 100644
--- a/patches/server/0810-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
+++ b/patches/server/0809-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
@@ -1180,7 +1180,7 @@ index 0000000000000000000000000000000000000000..d67a40e7be030142443680c89e1763fc
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index d1e56c3cd33ab47c174fd586934682b9c7bccda6..e89f18625fd5655087f1ec2992005142c1a5423b 100644
+index ca978f337a7cf443e6918bea2e6cae0ceef30145..6f3dcd6bd19cbd9e4c1d65c17531863b451769de 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -414,7 +414,7 @@ public class ServerPlayer extends Player {
@@ -1202,7 +1202,7 @@ index d1e56c3cd33ab47c174fd586934682b9c7bccda6..e89f18625fd5655087f1ec2992005142
              }
          }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 03d4d4d95e0cf617726a39ebd7191cd2d10ffdb7..6a3d444fcac8c7d561dcadb02f64eaa3c3d7b1cd 100644
+index 7fd530a901aecc49fa7fbbf3e876b0f56b665212..ca5026270a44fef244eb566695702bb3f4729367 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -936,7 +936,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0811-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0810-Optimise-collision-checking-in-player-move-packet-ha.patch
index b77dcf3570..f9c0265289 100644
--- a/patches/server/0811-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/server/0810-Optimise-collision-checking-in-player-move-packet-ha.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimise collision checking in player move packet handling
 Move collision logic to just the hasNewCollision call instead of getCubes + hasNewCollision
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6c50add50f2c6c41806ce08916f3d374fd19827c..f62af0697dbf7d15dfbe064e2eb3ff385ffb3325 100644
+index 7be8b98a61c3d92ef7c473983fe620047a137630..761a87be91e82841632f4f46dec799ae28f05887 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -587,7 +587,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0812-Actually-unload-POI-data.patch b/patches/server/0811-Actually-unload-POI-data.patch
index 8a61aa29f6..8a61aa29f6 100644
--- a/patches/server/0812-Actually-unload-POI-data.patch
+++ b/patches/server/0811-Actually-unload-POI-data.patch
diff --git a/patches/server/0813-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0812-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
index c03eefb28c..c03eefb28c 100644
--- a/patches/server/0813-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
+++ b/patches/server/0812-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0814-Update-Log4j.patch b/patches/server/0813-Update-Log4j.patch
index 61dbac5ec5..61dbac5ec5 100644
--- a/patches/server/0814-Update-Log4j.patch
+++ b/patches/server/0813-Update-Log4j.patch
diff --git a/patches/server/0815-Add-more-Campfire-API.patch b/patches/server/0814-Add-more-Campfire-API.patch
index 75cef9d65b..75cef9d65b 100644
--- a/patches/server/0815-Add-more-Campfire-API.patch
+++ b/patches/server/0814-Add-more-Campfire-API.patch
diff --git a/patches/server/0816-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0815-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
index 324e828c7c..324e828c7c 100644
--- a/patches/server/0816-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
+++ b/patches/server/0815-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0817-Fix-tripwire-state-inconsistency.patch b/patches/server/0816-Fix-tripwire-state-inconsistency.patch
index ef3e8540d4..ef3e8540d4 100644
--- a/patches/server/0817-Fix-tripwire-state-inconsistency.patch
+++ b/patches/server/0816-Fix-tripwire-state-inconsistency.patch
diff --git a/patches/server/0818-Fix-fluid-logging-on-Block-breakNaturally.patch b/patches/server/0817-Fix-fluid-logging-on-Block-breakNaturally.patch
index b87c2849f5..1f9012a293 100644
--- a/patches/server/0818-Fix-fluid-logging-on-Block-breakNaturally.patch
+++ b/patches/server/0817-Fix-fluid-logging-on-Block-breakNaturally.patch
@@ -7,7 +7,7 @@ Leaves fluid if the block broken was fluid-logged which is what
 happens if a player breaks a fluid-logged block
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 0b2e33fb16f832e0ddfe5e39a8a16caf98521098..68eaae018646c541c8553ded80c5cafdfc5ae63f 100644
+index 2881bcb570dc86a7602309e1f540ecd1c7f00284..0030ac394d44acddcd2fc716277ae2b509a378af 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -515,6 +515,7 @@ public class CraftBlock implements Block {
diff --git a/patches/server/0819-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0818-Forward-CraftEntity-in-teleport-command.patch
index f50b4cd529..f50b4cd529 100644
--- a/patches/server/0819-Forward-CraftEntity-in-teleport-command.patch
+++ b/patches/server/0818-Forward-CraftEntity-in-teleport-command.patch
diff --git a/patches/server/0820-Improve-scoreboard-entries.patch b/patches/server/0819-Improve-scoreboard-entries.patch
index 4db7c1f77b..4db7c1f77b 100644
--- a/patches/server/0820-Improve-scoreboard-entries.patch
+++ b/patches/server/0819-Improve-scoreboard-entries.patch
diff --git a/patches/server/0821-Entity-powdered-snow-API.patch b/patches/server/0820-Entity-powdered-snow-API.patch
index 7df19b80b9..7df19b80b9 100644
--- a/patches/server/0821-Entity-powdered-snow-API.patch
+++ b/patches/server/0820-Entity-powdered-snow-API.patch
diff --git a/patches/server/0822-Add-API-for-item-entity-health.patch b/patches/server/0821-Add-API-for-item-entity-health.patch
index d923270a18..d923270a18 100644
--- a/patches/server/0822-Add-API-for-item-entity-health.patch
+++ b/patches/server/0821-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0823-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0822-Fix-entity-type-tags-suggestions-in-selectors.patch
index d3dad4267f..1da285a690 100644
--- a/patches/server/0823-Fix-entity-type-tags-suggestions-in-selectors.patch
+++ b/patches/server/0822-Fix-entity-type-tags-suggestions-in-selectors.patch
@@ -10,7 +10,7 @@ when if this was fixed on the client, that wouldn't be needed.
 Mojira Issue: https://bugs.mojang.com/browse/MC-235045
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 5de84dfb6f18f3a0afdd33bf6bf640f48efc6e6b..24ddf8cfdbe6ed2fb148f57f0d7dd98446b07bbc 100644
+index e1a6a3ca616fc2119604e6edc3570c3a90466966..c6c9ae9c5217b379ea6ed20f46a81b0e47649a3a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -527,6 +527,11 @@ public class PaperConfig {
diff --git a/patches/server/0824-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0823-Configurable-max-block-light-for-monster-spawning.patch
index 9adc6a2a1c..f4559675d9 100644
--- a/patches/server/0824-Configurable-max-block-light-for-monster-spawning.patch
+++ b/patches/server/0823-Configurable-max-block-light-for-monster-spawning.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable max block light for monster spawning
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 1d7d6859531a470eea5d0cf25935250f7cba7d2a..ed56c7b42fa3dc454423a283d058deaacc7bd407 100644
+index 7e83580c5cd7fb834e936f96824f90a6d7f3e007..a41014ae52f668a3d788ee37ed547e12233a4e3b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -1009,4 +1009,9 @@ public class PaperWorldConfig {
+@@ -1031,4 +1031,9 @@ public class PaperWorldConfig {
          Integer rate = table.get(columnKey, rowKey);
          return rate != null && rate > -1 ? rate : def;
      }
diff --git a/patches/server/0825-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0824-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
index 8ed1ba062d..8ed1ba062d 100644
--- a/patches/server/0825-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
+++ b/patches/server/0824-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0826-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0825-Load-effect-amplifiers-greater-than-127-correctly.patch
index 83f5b4740d..83f5b4740d 100644
--- a/patches/server/0826-Load-effect-amplifiers-greater-than-127-correctly.patch
+++ b/patches/server/0825-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0827-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0826-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
index 9f3ee548ee..9f3ee548ee 100644
--- a/patches/server/0827-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
+++ b/patches/server/0826-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0828-Fix-bees-aging-inside-hives.patch b/patches/server/0827-Fix-bees-aging-inside-hives.patch
index c9303da67b..c9303da67b 100644
--- a/patches/server/0828-Fix-bees-aging-inside-hives.patch
+++ b/patches/server/0827-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0829-Bucketable-API.patch b/patches/server/0828-Bucketable-API.patch
index ff1194970a..ff1194970a 100644
--- a/patches/server/0829-Bucketable-API.patch
+++ b/patches/server/0828-Bucketable-API.patch
diff --git a/patches/server/0830-Check-player-world-in-endPortalSoundRadius.patch b/patches/server/0829-Check-player-world-in-endPortalSoundRadius.patch
index a632d3d594..a632d3d594 100644
--- a/patches/server/0830-Check-player-world-in-endPortalSoundRadius.patch
+++ b/patches/server/0829-Check-player-world-in-endPortalSoundRadius.patch
diff --git a/patches/server/0831-Validate-usernames.patch b/patches/server/0830-Validate-usernames.patch
index 91f5741e38..e318fa5451 100644
--- a/patches/server/0831-Validate-usernames.patch
+++ b/patches/server/0830-Validate-usernames.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Validate usernames
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 24ddf8cfdbe6ed2fb148f57f0d7dd98446b07bbc..da6346cacf08e12f7f1fabe2d5b1c66c82fab679 100644
+index c6c9ae9c5217b379ea6ed20f46a81b0e47649a3a..3703e10fe8e33f3d65a38f91b28669de5bc40a5a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -495,6 +495,12 @@ public class PaperConfig {
@@ -74,7 +74,7 @@ index f5c1dff1d571e89f960f11400edbcbbea0620575..7065aa4522431d08018fec8e591ba7c2
              this.state = ServerLoginPacketListenerImpl.State.KEY;
              this.connection.send(new ClientboundHelloPacket("", this.server.getKeyPair().getPublic().getEncoded(), this.nonce));
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 6a3d444fcac8c7d561dcadb02f64eaa3c3d7b1cd..fae67931849eb0c19598def9f538c7971c36c575 100644
+index ca5026270a44fef244eb566695702bb3f4729367..c88f57256e6f784e39fe74c3b7fc7e3d8b3a618a 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -707,7 +707,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0832-Fix-saving-configs-with-more-long-comments.patch b/patches/server/0831-Fix-saving-configs-with-more-long-comments.patch
index 7d52b01085..7d52b01085 100644
--- a/patches/server/0832-Fix-saving-configs-with-more-long-comments.patch
+++ b/patches/server/0831-Fix-saving-configs-with-more-long-comments.patch
diff --git a/patches/server/0833-Make-water-animal-spawn-height-configurable.patch b/patches/server/0832-Make-water-animal-spawn-height-configurable.patch
index 39b751fcef..b4dde44e93 100644
--- a/patches/server/0833-Make-water-animal-spawn-height-configurable.patch
+++ b/patches/server/0832-Make-water-animal-spawn-height-configurable.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Make water animal spawn height configurable
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index ed56c7b42fa3dc454423a283d058deaacc7bd407..12615f12c64c62400ec57fc8930d55251da0ff8c 100644
+index b599b500528de9c501c086788e5ceb8433d904f0..a50665c6f5cf838f327dfeeafffc997f24f91e72 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -385,6 +385,24 @@ public class PaperWorldConfig {
diff --git a/patches/server/0834-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0833-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index 7ab52b75a4..48ad586270 100644
--- a/patches/server/0834-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/server/0833-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
@@ -18,7 +18,7 @@ index df955666723a8cb1e612311f0b8e77fb577d6be5..01aefce226ae82d707b38b0d56d2580d
                  biomeProvider = gen.getDefaultBiomeProvider(worldInfo);
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5d41c30254e271a7b0a8e72582f02b462524bb7b..dfc91a6a5fba23fb5dd4285010ffd4cd240eda98 100644
+index 72bb60f5bf4cf67bd2951228287693cfc52e2b2b..07f5c20d28120acad34d36d371ba7f95f62ff71d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1211,7 +1211,7 @@ public final class CraftServer implements Server {
@@ -31,7 +31,7 @@ index 5d41c30254e271a7b0a8e72582f02b462524bb7b..dfc91a6a5fba23fb5dd4285010ffd4cd
              biomeProvider = generator.getDefaultBiomeProvider(worldInfo);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 6e10ca6dec598032eb8dc20dd88876db2ba2ae9b..fcbde4deb6c3947bd514c9d0bd8a638589941899 100644
+index 6baac7411f975b53cd49c15ac8d73c8df54b12bb..67b6b6e5970aea2e48bcceb42fc62370fa862775 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -211,6 +211,31 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0835-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0834-Add-config-option-for-worlds-affected-by-time-cmd.patch
index 46c8e7935a..1b17c599e7 100644
--- a/patches/server/0835-Add-config-option-for-worlds-affected-by-time-cmd.patch
+++ b/patches/server/0834-Add-config-option-for-worlds-affected-by-time-cmd.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add config option for worlds affected by time cmd
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index da6346cacf08e12f7f1fabe2d5b1c66c82fab679..2e68fe31fc788a3ff1fe4ac52140e5e518f660b1 100644
+index 3703e10fe8e33f3d65a38f91b28669de5bc40a5a..432db841f4b25ab219078501942bcfb586645be1 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -647,4 +647,9 @@ public class PaperConfig {
diff --git a/patches/server/0836-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0835-Add-new-overload-to-PersistentDataContainer-has.patch
index d19f7179e1..d19f7179e1 100644
--- a/patches/server/0836-Add-new-overload-to-PersistentDataContainer-has.patch
+++ b/patches/server/0835-Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/server/0837-Multiple-Entries-with-Scoreboards.patch b/patches/server/0836-Multiple-Entries-with-Scoreboards.patch
index 21fc65abbd..21fc65abbd 100644
--- a/patches/server/0837-Multiple-Entries-with-Scoreboards.patch
+++ b/patches/server/0836-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0838-Reset-placed-block-on-exception.patch b/patches/server/0837-Reset-placed-block-on-exception.patch
index 7666ecdfe1..7666ecdfe1 100644
--- a/patches/server/0838-Reset-placed-block-on-exception.patch
+++ b/patches/server/0837-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0839-Add-configurable-height-for-slime-spawn.patch b/patches/server/0838-Add-configurable-height-for-slime-spawn.patch
index 0e03810577..48ddceb532 100644
--- a/patches/server/0839-Add-configurable-height-for-slime-spawn.patch
+++ b/patches/server/0838-Add-configurable-height-for-slime-spawn.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add configurable height for slime spawn
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 12615f12c64c62400ec57fc8930d55251da0ff8c..ad3f0ff353a0448babde334641d1b1ac94779b07 100644
+index a50665c6f5cf838f327dfeeafffc997f24f91e72..583064f8623c143d381e826fa2c53575367a7bd9 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -423,6 +423,16 @@ public class PaperWorldConfig {
diff --git a/patches/server/0840-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0839-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
index a834180d50..a834180d50 100644
--- a/patches/server/0840-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/server/0839-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0841-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0840-Fix-xp-reward-for-baby-zombies.patch
index 3d42768492..3457e2d221 100644
--- a/patches/server/0841-Fix-xp-reward-for-baby-zombies.patch
+++ b/patches/server/0840-Fix-xp-reward-for-baby-zombies.patch
@@ -9,7 +9,7 @@ so this resets it after each call to
 Zombie#getExperienceReward
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index 2c60b8733741b2fe6504aa4c35907640b59a440a..a6e8f0ddbf17711a10f9853ec4a01291f96f6f06 100644
+index 7de75ae55c391bcc1ceb9e6a9f72ac4dac10ae06..9614fd6191587fc34e5d9d572afc8c6996ec557f 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 @@ -172,11 +172,16 @@ public class Zombie extends Monster {
diff --git a/patches/server/0842-Kick-on-main-for-illegal-chars.patch b/patches/server/0841-Kick-on-main-for-illegal-chars.patch
index 5960bd65d4..af41fa2288 100644
--- a/patches/server/0842-Kick-on-main-for-illegal-chars.patch
+++ b/patches/server/0841-Kick-on-main-for-illegal-chars.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Kick on main for illegal chars
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f62af0697dbf7d15dfbe064e2eb3ff385ffb3325..952debf2fb4abf675e226224909b14c866528e62 100644
+index 761a87be91e82841632f4f46dec799ae28f05887..d18f8972d37dc56a8df786774a4f70b5c3b78ec4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2080,7 +2080,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0843-Multi-Block-Change-API-Implementation.patch b/patches/server/0842-Multi-Block-Change-API-Implementation.patch
index ff6764293f..c76326a9e5 100644
--- a/patches/server/0843-Multi-Block-Change-API-Implementation.patch
+++ b/patches/server/0842-Multi-Block-Change-API-Implementation.patch
@@ -25,7 +25,7 @@ index 82ea4fabd5732052a286d50bcff8bbcc2c4aa7d7..652bea6868a03a5315965f79c76172fb
      public void write(FriendlyByteBuf buf) {
          buf.writeLong(this.sectionPos.asLong());
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d44df73c2fd4481861cd94d34d91b62b2d2c5718..1f53981fb59ab93566d632b3c950a2a629a0b4fd 100644
+index bf90519f04598ccd3f9a1515817524bbf3ab288c..68c3d6bde1e1e25a9032c22a2d5dddb4baf10059 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -30,6 +30,7 @@ import javax.annotation.Nullable;
diff --git a/patches/server/0844-Fix-NotePlayEvent.patch b/patches/server/0843-Fix-NotePlayEvent.patch
index 3d7aa4d732..3d7aa4d732 100644
--- a/patches/server/0844-Fix-NotePlayEvent.patch
+++ b/patches/server/0843-Fix-NotePlayEvent.patch
diff --git a/patches/server/0845-Freeze-Tick-Lock-API.patch b/patches/server/0844-Freeze-Tick-Lock-API.patch
index 9e6c7d1200..9e6c7d1200 100644
--- a/patches/server/0845-Freeze-Tick-Lock-API.patch
+++ b/patches/server/0844-Freeze-Tick-Lock-API.patch
diff --git a/patches/server/0846-Dolphin-API.patch b/patches/server/0845-Dolphin-API.patch
index 4bb12a6785..4bb12a6785 100644
--- a/patches/server/0846-Dolphin-API.patch
+++ b/patches/server/0845-Dolphin-API.patch
diff --git a/patches/server/0847-More-PotionEffectType-API.patch b/patches/server/0846-More-PotionEffectType-API.patch
index 14fb482187..14fb482187 100644
--- a/patches/server/0847-More-PotionEffectType-API.patch
+++ b/patches/server/0846-More-PotionEffectType-API.patch
diff --git a/patches/server/0848-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0847-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
index 3b79f9947c..3b79f9947c 100644
--- a/patches/server/0848-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
+++ b/patches/server/0847-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0849-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0848-API-for-creating-command-sender-which-forwards-feedb.patch
index baf84044ca..fce27165d8 100644
--- a/patches/server/0849-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/server/0848-API-for-creating-command-sender-which-forwards-feedb.patch
@@ -123,7 +123,7 @@ index 0000000000000000000000000000000000000000..f7c86155ce0cfd9b4bf8a2b79d77a656
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index dfc91a6a5fba23fb5dd4285010ffd4cd240eda98..06e2f90c3910f796c9caf5b388e3002e398c48b5 100644
+index 07f5c20d28120acad34d36d371ba7f95f62ff71d..782f9519b942e027de4d51acdb1ef5f994506838 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1982,6 +1982,13 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0850-Add-config-for-stronghold-seed.patch b/patches/server/0849-Add-config-for-stronghold-seed.patch
index 020f8bb43a..020f8bb43a 100644
--- a/patches/server/0850-Add-config-for-stronghold-seed.patch
+++ b/patches/server/0849-Add-config-for-stronghold-seed.patch
diff --git a/patches/server/0851-Implement-regenerateChunk.patch b/patches/server/0850-Implement-regenerateChunk.patch
index ae337550b4..162088fae8 100644
--- a/patches/server/0851-Implement-regenerateChunk.patch
+++ b/patches/server/0850-Implement-regenerateChunk.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement regenerateChunk
 Co-authored-by: Jason Penilla <[email protected]>
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index fcbde4deb6c3947bd514c9d0bd8a638589941899..b3dff7979aeec8ff4eff1233b551023309f580ae 100644
+index 67b6b6e5970aea2e48bcceb42fc62370fa862775..eac1891c8eb073522ea9fb5608a7ef0b809d6a80 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -132,6 +132,7 @@ import org.bukkit.util.Vector;
diff --git a/patches/server/0852-Log-exceptions-thrown-during-chat-processing.patch b/patches/server/0851-Log-exceptions-thrown-during-chat-processing.patch
index 76bdbcdd9c..76bdbcdd9c 100644
--- a/patches/server/0852-Log-exceptions-thrown-during-chat-processing.patch
+++ b/patches/server/0851-Log-exceptions-thrown-during-chat-processing.patch
diff --git a/patches/server/0853-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0852-Fix-cancelled-powdered-snow-bucket-placement.patch
index 9a95fdb1d3..9a95fdb1d3 100644
--- a/patches/server/0853-Fix-cancelled-powdered-snow-bucket-placement.patch
+++ b/patches/server/0852-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0854-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0853-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
index a334a35c9a..a7d117db10 100644
--- a/patches/server/0854-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
+++ b/patches/server/0853-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add missing Validate calls to CraftServer#getSpawnLimit
 Copies appropriate checks from CraftWorld#getSpawnLimit
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 06e2f90c3910f796c9caf5b388e3002e398c48b5..03c640b7567ecc75f396b132acf10cdb8f9863ba 100644
+index 782f9519b942e027de4d51acdb1ef5f994506838..125a150779ee20763383acb53633aa1e2cbce166 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2151,6 +2151,8 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0855-Add-GameEvent-tags.patch b/patches/server/0854-Add-GameEvent-tags.patch
index 0feb71087d..df34060343 100644
--- a/patches/server/0855-Add-GameEvent-tags.patch
+++ b/patches/server/0854-Add-GameEvent-tags.patch
@@ -45,7 +45,7 @@ index 0000000000000000000000000000000000000000..cb78a3d4e21376ea24347187478525d5
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 03c640b7567ecc75f396b132acf10cdb8f9863ba..8a5ad1b95f1fd3d722cb15be48bd752951ed3640 100644
+index 125a150779ee20763383acb53633aa1e2cbce166..95f8685ad1c817ccb195b3124283e5b809ef7dcd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -97,6 +97,7 @@ import net.minecraft.world.level.biome.BiomeSource;
diff --git a/patches/server/0856-Replace-player-chunk-loader-system.patch b/patches/server/0855-Replace-player-chunk-loader-system.patch
index f1df3acbbf..52c3526e22 100644
--- a/patches/server/0856-Replace-player-chunk-loader-system.patch
+++ b/patches/server/0855-Replace-player-chunk-loader-system.patch
@@ -84,7 +84,7 @@ index 309dbf5fce3ce940d5e1b57d267b9d6b2c5ff5b6..5ba64e1083b7cb1eec64d1925095c6ca
          }));
  
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 2e68fe31fc788a3ff1fe4ac52140e5e518f660b1..b7cb07e36c0056dea64dea220a465337f0d5c843 100644
+index 432db841f4b25ab219078501942bcfb586645be1..b6ada92f426c545801b6f0e5b44206f533aca39a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -652,4 +652,35 @@ public class PaperConfig {
diff --git a/patches/server/0857-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0856-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
index acba477db3..acba477db3 100644
--- a/patches/server/0857-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
+++ b/patches/server/0856-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0858-Replace-ticket-level-propagator.patch b/patches/server/0857-Replace-ticket-level-propagator.patch
index 03d6ba0cb1..03d6ba0cb1 100644
--- a/patches/server/0858-Replace-ticket-level-propagator.patch
+++ b/patches/server/0857-Replace-ticket-level-propagator.patch
diff --git a/patches/server/0859-Furnace-RecipesUsed-API.patch b/patches/server/0858-Furnace-RecipesUsed-API.patch
index 2e6cf1c2fe..2e6cf1c2fe 100644
--- a/patches/server/0859-Furnace-RecipesUsed-API.patch
+++ b/patches/server/0858-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0860-Configurable-sculk-sensor-listener-range.patch b/patches/server/0859-Configurable-sculk-sensor-listener-range.patch
index 2e9adfa399..2e9adfa399 100644
--- a/patches/server/0860-Configurable-sculk-sensor-listener-range.patch
+++ b/patches/server/0859-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0861-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0860-Add-missing-block-data-mins-and-maxes.patch
index 6f3d051671..6f3d051671 100644
--- a/patches/server/0861-Add-missing-block-data-mins-and-maxes.patch
+++ b/patches/server/0860-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0862-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0861-Option-to-have-default-CustomSpawners-in-custom-worl.patch
index 5711927a4b..77e53a4ca2 100644
--- a/patches/server/0862-Option-to-have-default-CustomSpawners-in-custom-worl.patch
+++ b/patches/server/0861-Option-to-have-default-CustomSpawners-in-custom-worl.patch
@@ -10,7 +10,7 @@ just looking at the LevelStem key, look at the DimensionType key which
 is one level below that. Defaults to off to keep vanilla behavior.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index b7cb07e36c0056dea64dea220a465337f0d5c843..c9c08e20f729b40b1d90f3ac144f5245f4f35230 100644
+index b6ada92f426c545801b6f0e5b44206f533aca39a..33adaac9449862879724da25f0c138709a536dbe 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -683,4 +683,9 @@ public class PaperConfig {
diff --git a/patches/server/0863-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0862-Put-world-into-worldlist-before-initing-the-world.patch
index 71c2106d6a..de52bb8300 100644
--- a/patches/server/0863-Put-world-into-worldlist-before-initing-the-world.patch
+++ b/patches/server/0862-Put-world-into-worldlist-before-initing-the-world.patch
@@ -23,7 +23,7 @@ index 443fb9cdce8bf542ca6216aa65c3e48c66dde654..e4461fb3485391ec0a9d902d5b896bb9
  
              if (worlddata.getCustomBossEvents() != null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8a5ad1b95f1fd3d722cb15be48bd752951ed3640..65a173c0d99c44679f7db1976fe310c8200bd80e 100644
+index 95f8685ad1c817ccb195b3124283e5b809ef7dcd..7775041c067e17da3d442fb8127f1ed2bba4f78c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1249,10 +1249,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0864-Fix-Entity-Position-Desync.patch b/patches/server/0863-Fix-Entity-Position-Desync.patch
index 8e9bd01077..8e9bd01077 100644
--- a/patches/server/0864-Fix-Entity-Position-Desync.patch
+++ b/patches/server/0863-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0865-Custom-Potion-Mixes.patch b/patches/server/0864-Custom-Potion-Mixes.patch
index d6ba3fdd42..d6ba3fdd42 100644
--- a/patches/server/0865-Custom-Potion-Mixes.patch
+++ b/patches/server/0864-Custom-Potion-Mixes.patch
diff --git a/patches/server/0866-Fix-Fluid-tags-isTagged-method.patch b/patches/server/0865-Fix-Fluid-tags-isTagged-method.patch
index 95eeab8b2f..95eeab8b2f 100644
--- a/patches/server/0866-Fix-Fluid-tags-isTagged-method.patch
+++ b/patches/server/0865-Fix-Fluid-tags-isTagged-method.patch
diff --git a/patches/server/0867-Fix-World-locateNearestStructure.patch b/patches/server/0866-Fix-World-locateNearestStructure.patch
index f53525dc2d..f53525dc2d 100644
--- a/patches/server/0867-Fix-World-locateNearestStructure.patch
+++ b/patches/server/0866-Fix-World-locateNearestStructure.patch
diff --git a/patches/server/0868-Force-close-world-loading-screen.patch b/patches/server/0867-Force-close-world-loading-screen.patch
index 24a6fd821f..6dd8526424 100644
--- a/patches/server/0868-Force-close-world-loading-screen.patch
+++ b/patches/server/0867-Force-close-world-loading-screen.patch
@@ -10,7 +10,7 @@ so we do not need that. The client only needs the chunk it is currently in to
 be loaded to close the loading screen, so we just send an empty one.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index f5852341161b0d632e22af9b3e625ca1e786bd63..02dc93c394d37c9a84aa4a58d80615c403c54fb9 100644
+index 1f221b5451004093af6e46b65b9e60499a12b5ad..8d4b8025a158b71b87682a67fb67e7fcbf0bd6c2 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -422,6 +422,13 @@ public abstract class PlayerList {
diff --git a/patches/server/0869-Fix-falling-block-spawn-methods.patch b/patches/server/0868-Fix-falling-block-spawn-methods.patch
index 00ca42b10f..00ca42b10f 100644
--- a/patches/server/0869-Fix-falling-block-spawn-methods.patch
+++ b/patches/server/0868-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0870-Expose-furnace-minecart-push-values.patch b/patches/server/0869-Expose-furnace-minecart-push-values.patch
index 4086d94249..4086d94249 100644
--- a/patches/server/0870-Expose-furnace-minecart-push-values.patch
+++ b/patches/server/0869-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0871-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0870-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
index b95d6ace5a..b95d6ace5a 100644
--- a/patches/server/0871-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
+++ b/patches/server/0870-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0872-Fix-save-problems-on-shutdown.patch b/patches/server/0871-Fix-save-problems-on-shutdown.patch
index 319a477d4c..319a477d4c 100644
--- a/patches/server/0872-Fix-save-problems-on-shutdown.patch
+++ b/patches/server/0871-Fix-save-problems-on-shutdown.patch
diff --git a/patches/server/0873-More-Projectile-API.patch b/patches/server/0872-More-Projectile-API.patch
index 0b52fff0e5..0b52fff0e5 100644
--- a/patches/server/0873-More-Projectile-API.patch
+++ b/patches/server/0872-More-Projectile-API.patch
diff --git a/patches/server/0874-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0873-Fix-swamp-hut-cat-generation-deadlock.patch
index c928ada21b..c928ada21b 100644
--- a/patches/server/0874-Fix-swamp-hut-cat-generation-deadlock.patch
+++ b/patches/server/0873-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0875-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0874-Don-t-allow-vehicle-movement-from-players-while-tele.patch
index d7c1d836f5..f833f532da 100644
--- a/patches/server/0875-Don-t-allow-vehicle-movement-from-players-while-tele.patch
+++ b/patches/server/0874-Don-t-allow-vehicle-movement-from-players-while-tele.patch
@@ -7,7 +7,7 @@ Bring the vehicle move packet behavior in line with the
 regular player move packet.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 952debf2fb4abf675e226224909b14c866528e62..e4d54fdc28b6161e74626f25299b1081e6605e98 100644
+index d18f8972d37dc56a8df786774a4f70b5c3b78ec4..1d30776997dda6998d793541bde9410030e25db1 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -517,6 +517,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0876-Implement-getComputedBiome-API.patch b/patches/server/0875-Implement-getComputedBiome-API.patch
index 1ca1553fc2..b3053d8904 100644
--- a/patches/server/0876-Implement-getComputedBiome-API.patch
+++ b/patches/server/0875-Implement-getComputedBiome-API.patch
@@ -23,7 +23,7 @@ index 99cb7625d50d5da4ce0999e10fb84403958a7ffe..e231636403a70f28e7e4bf5154260887
      public void setBiome(Location location, Biome biome) {
          this.setBiome(location.getBlockX(), location.getBlockY(), location.getBlockZ(), biome);
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 68eaae018646c541c8553ded80c5cafdfc5ae63f..a52e76c8870b1dd578c4332930c6f2fd3b31d471 100644
+index 0030ac394d44acddcd2fc716277ae2b509a378af..22356c2380741dd811810420127e247e46b0b8e2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -341,6 +341,13 @@ public class CraftBlock implements Block {
diff --git a/patches/server/0877-Make-some-itemstacks-nonnull.patch b/patches/server/0876-Make-some-itemstacks-nonnull.patch
index e2cba95fe4..e2cba95fe4 100644
--- a/patches/server/0877-Make-some-itemstacks-nonnull.patch
+++ b/patches/server/0876-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0878-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch b/patches/server/0877-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
index 78f9466f9f..78f9466f9f 100644
--- a/patches/server/0878-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
+++ b/patches/server/0877-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
diff --git a/patches/server/0879-Implement-enchantWithLevels-API.patch b/patches/server/0878-Implement-enchantWithLevels-API.patch
index f70335da77..f70335da77 100644
--- a/patches/server/0879-Implement-enchantWithLevels-API.patch
+++ b/patches/server/0878-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0880-Fix-saving-in-unloadWorld.patch b/patches/server/0879-Fix-saving-in-unloadWorld.patch
index 690b5b2a90..63a64881d5 100644
--- a/patches/server/0880-Fix-saving-in-unloadWorld.patch
+++ b/patches/server/0879-Fix-saving-in-unloadWorld.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix saving in unloadWorld
 Change savingDisabled to false to ensure ServerLevel's saving logic gets called when unloadWorld is called with save = true
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index cea238696ef83ca8e26812072dfbb45b1915dab9..16d3f2dce44fc374ec3ab5882135d06113681fb6 100644
+index cafef315ccc714afd9c3554cbfb19ca26085b597..fd3d1eb87d613a20458a837371d7df3aadfb94b0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1297,7 +1297,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0881-Buffer-OOB-setBlock-calls.patch b/patches/server/0880-Buffer-OOB-setBlock-calls.patch
index af5f320e73..af5f320e73 100644
--- a/patches/server/0881-Buffer-OOB-setBlock-calls.patch
+++ b/patches/server/0880-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0882-Add-TameableDeathMessageEvent.patch b/patches/server/0881-Add-TameableDeathMessageEvent.patch
index 23302de760..23302de760 100644
--- a/patches/server/0882-Add-TameableDeathMessageEvent.patch
+++ b/patches/server/0881-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0883-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch b/patches/server/0882-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch
index 8a1fc34fd2..8a1fc34fd2 100644
--- a/patches/server/0883-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch
+++ b/patches/server/0882-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch
diff --git a/patches/server/0884-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0883-fix-player-loottables-running-when-mob-loot-gamerule.patch
index a99f215073..6ed1a773e9 100644
--- a/patches/server/0884-fix-player-loottables-running-when-mob-loot-gamerule.patch
+++ b/patches/server/0883-fix-player-loottables-running-when-mob-loot-gamerule.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] fix player loottables running when mob loot gamerule is false
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index f35cd0e7446e7929087b735b3e9351d57dac296d..22452aa7eefa350c3b0d0d19a23c76c8ec811de3 100644
+index 09a64a9b002f0da20cbe19731068837be27d3480..2f5e40437d1865a874c352999edd084226d4e47b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -851,12 +851,14 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0885-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0884-Ensure-entity-passenger-world-matches-ridden-entity.patch
index 7de0352dbb..7de0352dbb 100644
--- a/patches/server/0885-Ensure-entity-passenger-world-matches-ridden-entity.patch
+++ b/patches/server/0884-Ensure-entity-passenger-world-matches-ridden-entity.patch
diff --git a/patches/server/0886-Guard-against-invalid-entity-positions.patch b/patches/server/0885-Guard-against-invalid-entity-positions.patch
index a9bce43337..a9bce43337 100644
--- a/patches/server/0886-Guard-against-invalid-entity-positions.patch
+++ b/patches/server/0885-Guard-against-invalid-entity-positions.patch
diff --git a/patches/server/0887-cache-resource-keys.patch b/patches/server/0886-cache-resource-keys.patch
index 7139beb014..4234b8673f 100644
--- a/patches/server/0887-cache-resource-keys.patch
+++ b/patches/server/0886-cache-resource-keys.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] cache resource keys
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index a52e76c8870b1dd578c4332930c6f2fd3b31d471..ca9904ded51580425f06587b7eed72da7b95d2f1 100644
+index 22356c2380741dd811810420127e247e46b0b8e2..bfe9dc935c87e01fb435d8b46ce413b84ca74856 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -366,12 +366,13 @@ public class CraftBlock implements Block {
diff --git a/patches/server/0888-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0887-Allow-to-change-the-podium-for-the-EnderDragon.patch
index b1db71e97b..b1db71e97b 100644
--- a/patches/server/0888-Allow-to-change-the-podium-for-the-EnderDragon.patch
+++ b/patches/server/0887-Allow-to-change-the-podium-for-the-EnderDragon.patch
diff --git a/patches/server/0889-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0888-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
index c76221ca5a..c76221ca5a 100644
--- a/patches/server/0889-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
+++ b/patches/server/0888-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0890-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0889-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
index fead5e352a..fead5e352a 100644
--- a/patches/server/0890-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
+++ b/patches/server/0889-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
diff --git a/patches/server/0891-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0890-Prevent-tile-entity-copies-loading-chunks.patch
index dbdaee1ca5..520df26df7 100644
--- a/patches/server/0891-Prevent-tile-entity-copies-loading-chunks.patch
+++ b/patches/server/0890-Prevent-tile-entity-copies-loading-chunks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent tile entity copies loading chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e4d54fdc28b6161e74626f25299b1081e6605e98..ca876d0916b7b888e8df58fb6b115fa0ab5b79d3 100644
+index 1d30776997dda6998d793541bde9410030e25db1..c087d7a1f5e560193f87a681101da8be1b60c8b3 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2994,7 +2994,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0892-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0891-Use-username-instead-of-display-name-in-PlayerList-g.patch
index ba25e46cb6..b88c0f857c 100644
--- a/patches/server/0892-Use-username-instead-of-display-name-in-PlayerList-g.patch
+++ b/patches/server/0891-Use-username-instead-of-display-name-in-PlayerList-g.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Use username instead of display name in
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 02dc93c394d37c9a84aa4a58d80615c403c54fb9..188c68d4ae46bc05c6d9c901b5c6ab883fa05ea4 100644
+index 8d4b8025a158b71b87682a67fb67e7fcbf0bd6c2..95fe4240f3e1174ec36598f24d63f0073c13b376 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1414,7 +1414,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0893-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/server/0892-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
index 0cb8d096f9..0cb8d096f9 100644
--- a/patches/server/0893-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
+++ b/patches/server/0892-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
diff --git a/patches/server/0894-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0893-Pass-ServerLevel-for-gamerule-callbacks.patch
index 158b2ebb62..158b2ebb62 100644
--- a/patches/server/0894-Pass-ServerLevel-for-gamerule-callbacks.patch
+++ b/patches/server/0893-Pass-ServerLevel-for-gamerule-callbacks.patch
diff --git a/patches/server/0895-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0894-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
index eb5a640d95..eb5a640d95 100644
--- a/patches/server/0895-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
+++ b/patches/server/0894-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/server/0896-WorldCreator-keepSpawnLoaded.patch b/patches/server/0895-WorldCreator-keepSpawnLoaded.patch
index a1d5ffe013..ff2d26a729 100644
--- a/patches/server/0896-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/server/0895-WorldCreator-keepSpawnLoaded.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] WorldCreator#keepSpawnLoaded
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 16d3f2dce44fc374ec3ab5882135d06113681fb6..ba4578fb4a2d861a6ffbb0ec022db31d9d7cc2be 100644
+index fd3d1eb87d613a20458a837371d7df3aadfb94b0..15278bb897e6169bc5d02bf47b455634baec7be1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1256,6 +1256,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0897-Fix-NPE-for-BlockDataMeta-getBlockData.patch b/patches/server/0896-Fix-NPE-for-BlockDataMeta-getBlockData.patch
index 317d9c3403..317d9c3403 100644
--- a/patches/server/0897-Fix-NPE-for-BlockDataMeta-getBlockData.patch
+++ b/patches/server/0896-Fix-NPE-for-BlockDataMeta-getBlockData.patch
diff --git a/patches/server/0898-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0897-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
index 0c74e37d4f..0c74e37d4f 100644
--- a/patches/server/0898-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
+++ b/patches/server/0897-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0899-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0898-Add-EntityDyeEvent-and-CollarColorable-interface.patch
index 21dd7187d3..21dd7187d3 100644
--- a/patches/server/0899-Add-EntityDyeEvent-and-CollarColorable-interface.patch
+++ b/patches/server/0898-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0900-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0899-Fire-CauldronLevelChange-on-initial-fill.patch
index 14d9c24d20..14d9c24d20 100644
--- a/patches/server/0900-Fire-CauldronLevelChange-on-initial-fill.patch
+++ b/patches/server/0899-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0901-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0900-fix-powder-snow-cauldrons-not-turning-to-water.patch
index c8be521eba..c8be521eba 100644
--- a/patches/server/0901-fix-powder-snow-cauldrons-not-turning-to-water.patch
+++ b/patches/server/0900-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0902-Sign-cleanup-filtering.patch b/patches/server/0901-Sign-cleanup-filtering.patch
index d38a26aedb..d38a26aedb 100644
--- a/patches/server/0902-Sign-cleanup-filtering.patch
+++ b/patches/server/0901-Sign-cleanup-filtering.patch