diff --git a/patches/removed/1.18.2/0831-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0831-Fix-entity-type-tags-suggestions-in-selectors.patch
similarity index 85%
rename from patches/removed/1.18.2/0831-Fix-entity-type-tags-suggestions-in-selectors.patch
rename to patches/server/0831-Fix-entity-type-tags-suggestions-in-selectors.patch
index b0e070a477..8e61b0d569 100644
--- a/patches/removed/1.18.2/0831-Fix-entity-type-tags-suggestions-in-selectors.patch
+++ b/patches/server/0831-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 609f7ff543353ede53dc46dafc5a2fd0b0622cd8..d5aa95846e7f52108a03e3731023527281b21d73 100644
+index 3916d3e7773f4a3b6d5c5347d6a12a707bffcdad..04cb8282efae69aa62ae1dad4c39220f658ec575 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -525,6 +525,11 @@ public class PaperConfig {
@@ -26,10 +26,10 @@ index 609f7ff543353ede53dc46dafc5a2fd0b0622cd8..d5aa95846e7f52108a03e37310235272
          public final double packetLimitInterval;
          public final double maxPacketRate;
 diff --git a/src/main/java/net/minecraft/commands/CommandSourceStack.java b/src/main/java/net/minecraft/commands/CommandSourceStack.java
-index cb0045fc4ddd738c45dee89d57b213a633b9a136..098182d2426a25cef0bc285356bc346db0af8172 100644
+index db26d834d9a59c4fd60f99077f0118c08293678f..00bbf33aa44e2d5a4e755a2d7c1a60de9e36674f 100644
 --- a/src/main/java/net/minecraft/commands/CommandSourceStack.java
 +++ b/src/main/java/net/minecraft/commands/CommandSourceStack.java
-@@ -322,4 +322,20 @@ public class CommandSourceStack implements SharedSuggestionProvider, com.destroy
+@@ -330,4 +330,20 @@ public class CommandSourceStack implements SharedSuggestionProvider, com.destroy
          return this.source.getBukkitSender(this);
      }
      // CraftBukkit end
@@ -51,10 +51,10 @@ index cb0045fc4ddd738c45dee89d57b213a633b9a136..098182d2426a25cef0bc285356bc346d
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index f6b73f8c6638ddf79e45042f5c8902ea1f271f5c..1617437515590a32c42687d290dd11bc8fa8edf5 100644
+index 13a0f78abbb00b489b63d88ce14f60cb04402085..b66afde6851ceaeccb84aea00cdc333dfbf3d4b0 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
-@@ -407,6 +407,7 @@ public class Commands {
+@@ -409,6 +409,7 @@ public class Commands {
      private void fillUsableCommands(CommandNode<CommandSourceStack> tree, CommandNode<SharedSuggestionProvider> result, CommandSourceStack source, Map<CommandNode<CommandSourceStack>, CommandNode<SharedSuggestionProvider>> resultNodes) {
          Iterator iterator = tree.getChildren().iterator();
  
@@ -62,7 +62,7 @@ index f6b73f8c6638ddf79e45042f5c8902ea1f271f5c..1617437515590a32c42687d290dd11bc
          while (iterator.hasNext()) {
              CommandNode<CommandSourceStack> commandnode2 = (CommandNode) iterator.next();
              if ( !org.spigotmc.SpigotConfig.sendNamespaced && commandnode2.getName().contains( ":" ) ) continue; // Spigot
-@@ -428,6 +429,12 @@ public class Commands {
+@@ -430,6 +431,12 @@ public class Commands {
  
                      if (requiredargumentbuilder.getSuggestionsProvider() != null) {
                          requiredargumentbuilder.suggests(SuggestionProviders.safelySwap(requiredargumentbuilder.getSuggestionsProvider()));
@@ -89,7 +89,7 @@ index 1f3076e59bac23d428c747ae12619e4b4e5fdd5a..1d23d05d7028c5f820f172cc54153f56
              try {
                  argumentparserselector.parse();
 diff --git a/src/main/java/net/minecraft/commands/arguments/selector/EntitySelectorParser.java b/src/main/java/net/minecraft/commands/arguments/selector/EntitySelectorParser.java
-index 466d1d8d80df028ff842ce21be198be6a1c77b42..015d01242a9e8e7c6ef5b6bbf1b6d6ad0c8f36ca 100644
+index 2816fd4a57fe51689daf1b4850ad3ab3c9749225..cdbe0695a29d0854d7f59c1f63a74bd0c1dbf4d9 100644
 --- a/src/main/java/net/minecraft/commands/arguments/selector/EntitySelectorParser.java
 +++ b/src/main/java/net/minecraft/commands/arguments/selector/EntitySelectorParser.java
 @@ -115,12 +115,19 @@ public class EntitySelectorParser {
@@ -113,7 +113,7 @@ index 466d1d8d80df028ff842ce21be198be6a1c77b42..015d01242a9e8e7c6ef5b6bbf1b6d6ad
          this.level = MinMaxBounds.Ints.ANY;
          this.rotX = WrappedMinMaxBounds.ANY;
 diff --git a/src/main/java/net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.java b/src/main/java/net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.java
-index 061181381e4eabad5fa0122f049c4ce05996ffd2..90e023be5c38a038f1c03141ef4325abb25fd615 100644
+index ff1e8fafe55fec729b3d8da3c2cd0d6c347013dd..5a078a4ee1f5535399f70ddb2bc6559441c3daf0 100644
 --- a/src/main/java/net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.java
 +++ b/src/main/java/net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.java
 @@ -69,6 +69,19 @@ public class EntitySelectorOptions {
@@ -136,25 +136,16 @@ index 061181381e4eabad5fa0122f049c4ce05996ffd2..90e023be5c38a038f1c03141ef4325ab
  
      private static void register(String id, EntitySelectorOptions.Modifier handler, Predicate<EntitySelectorParser> condition, Component description) {
          OPTIONS.put(id, new EntitySelectorOptions.Option(handler, condition, description));
-@@ -316,8 +329,20 @@ public class EntitySelectorOptions {
+@@ -316,6 +329,12 @@ public class EntitySelectorOptions {
  
                      if (reader.isTag()) {
-                         ResourceLocation resourceLocation = ResourceLocation.read(reader.getReader());
+                         TagKey<EntityType<?>> tagKey = TagKey.create(Registry.ENTITY_TYPE_REGISTRY, ResourceLocation.read(reader.getReader()));
 +                        // Paper start - throw error if invalid entity tag (only on suggestions to keep cmd success behavior)
-+                        final net.minecraft.tags.Tag<EntityType<?>> tag;
-+                        if (com.destroystokyo.paper.PaperConfig.fixTargetSelectorTagCompletion && reader.parsingEntityArgumentSuggestions) {
-+                            tag = EntityTypeTags.getAllTags().getTag(resourceLocation);
-+                        } else {
-+                            tag = EntityTypeTags.getAllTags().getTagOrEmpty(resourceLocation);
-+                        }
-+                        if (tag == null) {
++                        if (com.destroystokyo.paper.PaperConfig.fixTargetSelectorTagCompletion && reader.parsingEntityArgumentSuggestions && !Registry.ENTITY_TYPE.isKnownTagName(tagKey)) {
 +                            reader.getReader().setCursor(i);
-+                            throw ERROR_ENTITY_TAG_INVALID.createWithContext(reader.getReader(), resourceLocation.toString());
++                            throw ERROR_ENTITY_TAG_INVALID.createWithContext(reader.getReader(), tagKey);
 +                        }
 +                        // Paper end
                          reader.addPredicate((entity) -> {
--                            return entity.getType().is(entity.getServer().getTags().getOrEmpty(Registry.ENTITY_TYPE_REGISTRY).getTagOrEmpty(resourceLocation)) != bl;
-+                            return entity.getType().is(tag) != bl; // Paper
+                             return entity.getType().is(tagKey) != bl;
                          });
-                     } else {
-                         ResourceLocation resourceLocation2 = ResourceLocation.read(reader.getReader());
diff --git a/patches/server/0831-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0832-Configurable-max-block-light-for-monster-spawning.patch
similarity index 100%
rename from patches/server/0831-Configurable-max-block-light-for-monster-spawning.patch
rename to patches/server/0832-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0832-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0833-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
similarity index 100%
rename from patches/server/0832-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
rename to patches/server/0833-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0833-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0834-Load-effect-amplifiers-greater-than-127-correctly.patch
similarity index 100%
rename from patches/server/0833-Load-effect-amplifiers-greater-than-127-correctly.patch
rename to patches/server/0834-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0834-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0835-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
similarity index 100%
rename from patches/server/0834-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
rename to patches/server/0835-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0835-Fix-bees-aging-inside-hives.patch b/patches/server/0836-Fix-bees-aging-inside-hives.patch
similarity index 100%
rename from patches/server/0835-Fix-bees-aging-inside-hives.patch
rename to patches/server/0836-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0836-Bucketable-API.patch b/patches/server/0837-Bucketable-API.patch
similarity index 100%
rename from patches/server/0836-Bucketable-API.patch
rename to patches/server/0837-Bucketable-API.patch
diff --git a/patches/server/0837-Check-player-world-in-endPortalSoundRadius.patch b/patches/server/0838-Check-player-world-in-endPortalSoundRadius.patch
similarity index 100%
rename from patches/server/0837-Check-player-world-in-endPortalSoundRadius.patch
rename to patches/server/0838-Check-player-world-in-endPortalSoundRadius.patch
diff --git a/patches/server/0838-Validate-usernames.patch b/patches/server/0839-Validate-usernames.patch
similarity index 96%
rename from patches/server/0838-Validate-usernames.patch
rename to patches/server/0839-Validate-usernames.patch
index dec1576cd3..1b417d320d 100644
--- a/patches/server/0838-Validate-usernames.patch
+++ b/patches/server/0839-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 609f7ff543353ede53dc46dafc5a2fd0b0622cd8..32f258997face08c20d787b5a9534cb8f3ae4906 100644
+index 04cb8282efae69aa62ae1dad4c39220f658ec575..48eeeb832127f681f6cb8162cbe3954fc14bb47d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -493,6 +493,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 639670e7570beec3dba24b348bc3da0ce0231393..0766abd7334bc76b57fd509c8890701704aa217c 100644
+index 6a3d444fcac8c7d561dcadb02f64eaa3c3d7b1cd..fae67931849eb0c19598def9f538c7971c36c575 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/0839-Fix-saving-configs-with-more-long-comments.patch b/patches/server/0840-Fix-saving-configs-with-more-long-comments.patch
similarity index 100%
rename from patches/server/0839-Fix-saving-configs-with-more-long-comments.patch
rename to patches/server/0840-Fix-saving-configs-with-more-long-comments.patch
diff --git a/patches/server/0840-Make-water-animal-spawn-height-configurable.patch b/patches/server/0841-Make-water-animal-spawn-height-configurable.patch
similarity index 100%
rename from patches/server/0840-Make-water-animal-spawn-height-configurable.patch
rename to patches/server/0841-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0841-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0842-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
similarity index 96%
rename from patches/server/0841-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
rename to patches/server/0842-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index c9881d72de..225bfa5e01 100644
--- a/patches/server/0841-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/server/0842-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose vanilla BiomeProvider from WorldInfo
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index cdbee0c0d0f6154dc6396be87eeea1db67ad5dbf..7fcc1342245470158da4cc35112649210eacddee 100644
+index d86e74c9363d10428d611cb232243a872abd9d5f..c2ddd9f8bf9dded65a7cd1fa69b30113336cd409 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -584,7 +584,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -18,7 +18,7 @@ index cdbee0c0d0f6154dc6396be87eeea1db67ad5dbf..7fcc1342245470158da4cc3511264921
                  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 14f0b550bdbe42c67456e54d88289f0de56ca04e..d996661dbe9eea5ac2a3505a95f8630f3c81065d 100644
+index fba20c4228a34d4c956ce2a440eb6e495182f8f2..2e803b3b5356c197be05999e9d4749a94041b258 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1210,7 +1210,7 @@ public final class CraftServer implements Server {
@@ -31,7 +31,7 @@ index 14f0b550bdbe42c67456e54d88289f0de56ca04e..d996661dbe9eea5ac2a3505a95f8630f
              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 71eb9d86738db8eb79ec5dc5574ea9afa934da62..d9e883a936bc4b6bb12a4c28f2174994bc3ec710 100644
+index 2420bc805923094d4d7422e69c20ed5de23777de..46b43e515138a2d8b4a30d7007489bf0a7a981fe 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/0842-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0843-Add-config-option-for-worlds-affected-by-time-cmd.patch
similarity index 95%
rename from patches/server/0842-Add-config-option-for-worlds-affected-by-time-cmd.patch
rename to patches/server/0843-Add-config-option-for-worlds-affected-by-time-cmd.patch
index 0107112834..052a280f72 100644
--- a/patches/server/0842-Add-config-option-for-worlds-affected-by-time-cmd.patch
+++ b/patches/server/0843-Add-config-option-for-worlds-affected-by-time-cmd.patch
@@ -5,10 +5,10 @@ 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 32f258997face08c20d787b5a9534cb8f3ae4906..4268533f0571ae40b1e26a6b5b3765ddf6adee60 100644
+index 48eeeb832127f681f6cb8162cbe3954fc14bb47d..66501c3b0eb92d946ef77bbd3f36ebcc0d3023af 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -640,4 +640,9 @@ public class PaperConfig {
+@@ -645,4 +645,9 @@ public class PaperConfig {
      private static void sendFullPosForHardCollidingEntities() {
          sendFullPosForHardCollidingEntities = getBoolean("settings.send-full-pos-for-hard-colliding-entities", true);
      }
diff --git a/patches/server/0843-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0844-Add-new-overload-to-PersistentDataContainer-has.patch
similarity index 100%
rename from patches/server/0843-Add-new-overload-to-PersistentDataContainer-has.patch
rename to patches/server/0844-Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/server/0844-Multiple-Entries-with-Scoreboards.patch b/patches/server/0845-Multiple-Entries-with-Scoreboards.patch
similarity index 100%
rename from patches/server/0844-Multiple-Entries-with-Scoreboards.patch
rename to patches/server/0845-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0845-Reset-placed-block-on-exception.patch b/patches/server/0846-Reset-placed-block-on-exception.patch
similarity index 100%
rename from patches/server/0845-Reset-placed-block-on-exception.patch
rename to patches/server/0846-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0846-Add-configurable-height-for-slime-spawn.patch b/patches/server/0847-Add-configurable-height-for-slime-spawn.patch
similarity index 100%
rename from patches/server/0846-Add-configurable-height-for-slime-spawn.patch
rename to patches/server/0847-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0847-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0848-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0847-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0848-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0848-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0849-Fix-xp-reward-for-baby-zombies.patch
similarity index 100%
rename from patches/server/0848-Fix-xp-reward-for-baby-zombies.patch
rename to patches/server/0849-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0849-Kick-on-main-for-illegal-chars.patch b/patches/server/0850-Kick-on-main-for-illegal-chars.patch
similarity index 92%
rename from patches/server/0849-Kick-on-main-for-illegal-chars.patch
rename to patches/server/0850-Kick-on-main-for-illegal-chars.patch
index 317104c972..f5c7e34afc 100644
--- a/patches/server/0849-Kick-on-main-for-illegal-chars.patch
+++ b/patches/server/0850-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 99ffca8a6c23ccd588695ddaed4f673d52e3aad4..299e25ee472083f7ab8452932f180b5a6650e9a0 100644
+index cb5df601391a05c1c7cfc1c5d86043f89d673407..dea4d455d05945505f9ef33793a61783b521bf11 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2077,7 +2077,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0850-Multi-Block-Change-API-Implementation.patch b/patches/server/0851-Multi-Block-Change-API-Implementation.patch
similarity index 97%
rename from patches/server/0850-Multi-Block-Change-API-Implementation.patch
rename to patches/server/0851-Multi-Block-Change-API-Implementation.patch
index c3c9597517..6b78e14b42 100644
--- a/patches/server/0850-Multi-Block-Change-API-Implementation.patch
+++ b/patches/server/0851-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 7474e607680be7203c87e15550515110d526df68..d309d9f0b54e2a966ccfbb780359bb8e68d15ee3 100644
+index c5112cf56bba523dd6ff5595e09977125275614c..a00f65bd14d242ead4d6460e0cc912a54ea58e63 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/0851-Fix-NotePlayEvent.patch b/patches/server/0852-Fix-NotePlayEvent.patch
similarity index 100%
rename from patches/server/0851-Fix-NotePlayEvent.patch
rename to patches/server/0852-Fix-NotePlayEvent.patch
diff --git a/patches/server/0852-Freeze-Tick-Lock-API.patch b/patches/server/0853-Freeze-Tick-Lock-API.patch
similarity index 95%
rename from patches/server/0852-Freeze-Tick-Lock-API.patch
rename to patches/server/0853-Freeze-Tick-Lock-API.patch
index 1508c03068..e3599f4743 100644
--- a/patches/server/0852-Freeze-Tick-Lock-API.patch
+++ b/patches/server/0853-Freeze-Tick-Lock-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Freeze Tick Lock API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a2cc34d6a81b7278eacbf980ccf7f275377ee2a8..3393816f563b3af95914da2bbd338e542b7c8ec0 100644
+index 27eb30d02d08ff61fb9916961d99e4ce01341290..84fce7dccf9232209f939a32acfc3131e62eb27c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -335,6 +335,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -59,7 +59,7 @@ index a1c43c61ab3a618f864bfefb9e481386d82621e8..fdd76d1a1636f30f519c434b41061d82
              if (this.isInPowderSnow && this.canFreeze()) {
                  this.setTicksFrozen(Math.min(this.getTicksRequiredToFreeze(), i + 1));
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 7490f4127cb9dddf9332a0db7fd4d124e150cd9c..989aaca1d56423729d4f5a491cd4c501342dac7c 100644
+index 0a998832afacb25cbaf39737d14aa33eab6967b7..a92755211e3d42934b5efaa3f201c6c19ab7d2b4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -662,6 +662,17 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0853-Dolphin-API.patch b/patches/server/0854-Dolphin-API.patch
similarity index 100%
rename from patches/server/0853-Dolphin-API.patch
rename to patches/server/0854-Dolphin-API.patch
diff --git a/patches/server/0854-More-PotionEffectType-API.patch b/patches/server/0855-More-PotionEffectType-API.patch
similarity index 100%
rename from patches/server/0854-More-PotionEffectType-API.patch
rename to patches/server/0855-More-PotionEffectType-API.patch
diff --git a/patches/server/0855-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0856-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
similarity index 100%
rename from patches/server/0855-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
rename to patches/server/0856-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0856-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0857-API-for-creating-command-sender-which-forwards-feedb.patch
similarity index 98%
rename from patches/server/0856-API-for-creating-command-sender-which-forwards-feedb.patch
rename to patches/server/0857-API-for-creating-command-sender-which-forwards-feedb.patch
index 898e20bdf9..8123d804ba 100644
--- a/patches/server/0856-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/server/0857-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 d996661dbe9eea5ac2a3505a95f8630f3c81065d..2ebacb84f70c63c304cb709e11fe265a0dfd48db 100644
+index 2e803b3b5356c197be05999e9d4749a94041b258..32bc72e930b5876116a9e7da816ff11d8d44a410 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1976,6 +1976,13 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0857-Implement-regenerateChunk.patch b/patches/server/0858-Implement-regenerateChunk.patch
similarity index 98%
rename from patches/server/0857-Implement-regenerateChunk.patch
rename to patches/server/0858-Implement-regenerateChunk.patch
index c7840812cb..fc95412b04 100644
--- a/patches/server/0857-Implement-regenerateChunk.patch
+++ b/patches/server/0858-Implement-regenerateChunk.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement regenerateChunk
 Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index d9e883a936bc4b6bb12a4c28f2174994bc3ec710..72df27de006121fe21d1cc4c5f50dbc4a23fc505 100644
+index 46b43e515138a2d8b4a30d7007489bf0a7a981fe..2e8e066ca3f57cfb9d11cbc620d038cea9dd2b64 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/0858-Log-exceptions-thrown-during-chat-processing.patch b/patches/server/0859-Log-exceptions-thrown-during-chat-processing.patch
similarity index 100%
rename from patches/server/0858-Log-exceptions-thrown-during-chat-processing.patch
rename to patches/server/0859-Log-exceptions-thrown-during-chat-processing.patch
diff --git a/patches/server/0859-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0860-Fix-cancelled-powdered-snow-bucket-placement.patch
similarity index 100%
rename from patches/server/0859-Fix-cancelled-powdered-snow-bucket-placement.patch
rename to patches/server/0860-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0860-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0861-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
similarity index 91%
rename from patches/server/0860-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
rename to patches/server/0861-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
index ac26ffed5a..b72e1c19b3 100644
--- a/patches/server/0860-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
+++ b/patches/server/0861-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 2ebacb84f70c63c304cb709e11fe265a0dfd48db..640cfb7cf792e2e61417cc93627b43db8dc9bcc9 100644
+index 32bc72e930b5876116a9e7da816ff11d8d44a410..3b7b4a578346a162afbeb5781633c163d0c46177 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2145,6 +2145,8 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0861-Add-GameEvent-tags.patch b/patches/server/0862-Add-GameEvent-tags.patch
similarity index 100%
rename from patches/server/0861-Add-GameEvent-tags.patch
rename to patches/server/0862-Add-GameEvent-tags.patch
diff --git a/patches/server/0862-Replace-player-chunk-loader-system.patch b/patches/server/0863-Replace-player-chunk-loader-system.patch
similarity index 99%
rename from patches/server/0862-Replace-player-chunk-loader-system.patch
rename to patches/server/0863-Replace-player-chunk-loader-system.patch
index 455f27f30c..e4965a4315 100644
--- a/patches/server/0862-Replace-player-chunk-loader-system.patch
+++ b/patches/server/0863-Replace-player-chunk-loader-system.patch
@@ -84,10 +84,10 @@ index 5e3b7fb2e0b7608610555cd23e7ad25a05883181..1cb0aae3e0c619a715766e0fa604dfd9
          }));
  
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 19f93d3bbac34ca40000965ce515e17c2ffe2603..ba8323c62212c8daa10b17af61759ac68856d19c 100644
+index 66501c3b0eb92d946ef77bbd3f36ebcc0d3023af..153f07bac06093b43a1f5b0f8e1a46ffbe6407e5 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -645,4 +645,33 @@ public class PaperConfig {
+@@ -650,4 +650,33 @@ public class PaperConfig {
      private static void timeCommandAffectsAllWorlds() {
          timeCommandAffectsAllWorlds = getBoolean("settings.time-command-affects-all-worlds", timeCommandAffectsAllWorlds);
      }
diff --git a/patches/server/0863-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0864-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
similarity index 94%
rename from patches/server/0863-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
rename to patches/server/0864-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
index cf02a182c9..f36aa20770 100644
--- a/patches/server/0863-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
+++ b/patches/server/0864-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
@@ -9,7 +9,7 @@ This might result in chunks loading far slower in the nether,
 for example.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 7fcc1342245470158da4cc35112649210eacddee..e065c834033af7bc06065f34515ba7d045f345f7 100644
+index c2ddd9f8bf9dded65a7cd1fa69b30113336cd409..d19d816ee511bf5d44151c3e159adb288b60bc03 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1358,6 +1358,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0864-Replace-ticket-level-propagator.patch b/patches/server/0865-Replace-ticket-level-propagator.patch
similarity index 99%
rename from patches/server/0864-Replace-ticket-level-propagator.patch
rename to patches/server/0865-Replace-ticket-level-propagator.patch
index 648070373e..8eedad187e 100644
--- a/patches/server/0864-Replace-ticket-level-propagator.patch
+++ b/patches/server/0865-Replace-ticket-level-propagator.patch
@@ -15,7 +15,7 @@ will be more effective, since more time will be allocated
 to actually processing chunk tasks vs the ticket level updates.
 
 diff --git a/src/main/java/net/minecraft/server/level/DistanceManager.java b/src/main/java/net/minecraft/server/level/DistanceManager.java
-index 1c8020435ab8eb5fec68dc5bf473650f2658bdac..0a0162003830da767a9d49ac62938e8b30d895fd 100644
+index d428da9060693db4e60d456b370d7b4db7bc6792..67dcbf2b8c8c5a700d34027379abe641ad0a6b23 100644
 --- a/src/main/java/net/minecraft/server/level/DistanceManager.java
 +++ b/src/main/java/net/minecraft/server/level/DistanceManager.java
 @@ -38,6 +38,7 @@ import net.minecraft.world.level.chunk.ChunkStatus;
diff --git a/patches/server/0865-Furnace-RecipesUsed-API.patch b/patches/server/0866-Furnace-RecipesUsed-API.patch
similarity index 100%
rename from patches/server/0865-Furnace-RecipesUsed-API.patch
rename to patches/server/0866-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0866-Configurable-sculk-sensor-listener-range.patch b/patches/server/0867-Configurable-sculk-sensor-listener-range.patch
similarity index 100%
rename from patches/server/0866-Configurable-sculk-sensor-listener-range.patch
rename to patches/server/0867-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0867-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0868-Add-missing-block-data-mins-and-maxes.patch
similarity index 100%
rename from patches/server/0867-Add-missing-block-data-mins-and-maxes.patch
rename to patches/server/0868-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0868-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0869-Option-to-have-default-CustomSpawners-in-custom-worl.patch
similarity index 92%
rename from patches/server/0868-Option-to-have-default-CustomSpawners-in-custom-worl.patch
rename to patches/server/0869-Option-to-have-default-CustomSpawners-in-custom-worl.patch
index aa895b4c65..cef52178d6 100644
--- a/patches/server/0868-Option-to-have-default-CustomSpawners-in-custom-worl.patch
+++ b/patches/server/0869-Option-to-have-default-CustomSpawners-in-custom-worl.patch
@@ -10,10 +10,10 @@ 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 ba8323c62212c8daa10b17af61759ac68856d19c..736b6f4db48f3b300b1aaa825e8bd7cadf135e5a 100644
+index 153f07bac06093b43a1f5b0f8e1a46ffbe6407e5..a7ebf6d9f79ce50a90c3c903563e00a10607f9f2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -674,4 +674,9 @@ public class PaperConfig {
+@@ -679,4 +679,9 @@ public class PaperConfig {
          }
          globalMaxConcurrentChunkLoads = getDouble("settings.chunk-loading.global-max-concurrent-loads", 500.0);
      }
@@ -24,7 +24,7 @@ index ba8323c62212c8daa10b17af61759ac68856d19c..736b6f4db48f3b300b1aaa825e8bd7ca
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e065c834033af7bc06065f34515ba7d045f345f7..6010b9cf3337768e3b1cfbe65dc07fb8e6dc900b 100644
+index d19d816ee511bf5d44151c3e159adb288b60bc03..115e06e0c6865f1c04f58a74509332f7c5043d91 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -619,7 +619,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0869-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0870-Put-world-into-worldlist-before-initing-the-world.patch
similarity index 91%
rename from patches/server/0869-Put-world-into-worldlist-before-initing-the-world.patch
rename to patches/server/0870-Put-world-into-worldlist-before-initing-the-world.patch
index a2992d3aca..517ce2e848 100644
--- a/patches/server/0869-Put-world-into-worldlist-before-initing-the-world.patch
+++ b/patches/server/0870-Put-world-into-worldlist-before-initing-the-world.patch
@@ -7,7 +7,7 @@ Some parts of legacy conversion will need the overworld
 to get the legacy structure data storage
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 6010b9cf3337768e3b1cfbe65dc07fb8e6dc900b..3bfc08e309a06b418d5e271747e25b29cbaa97e3 100644
+index 115e06e0c6865f1c04f58a74509332f7c5043d91..f60120f788bdd1e1a159b87c18655d9e00920c89 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -631,9 +631,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -23,7 +23,7 @@ index 6010b9cf3337768e3b1cfbe65dc07fb8e6dc900b..3bfc08e309a06b418d5e271747e25b29
  
              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 b858ac57ff2b802a8eeec731cfd932ee266bff17..44ac06fd08b9cfd8dad330f652dc41030ed3cc5a 100644
+index 197668e1b8487ed5463d457c8738ba70813cace1..557121d00eb47c29779a1a076cbc4ba0f61a548a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1248,10 +1248,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0870-Fix-Entity-Position-Desync.patch b/patches/server/0871-Fix-Entity-Position-Desync.patch
similarity index 100%
rename from patches/server/0870-Fix-Entity-Position-Desync.patch
rename to patches/server/0871-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0871-Custom-Potion-Mixes.patch b/patches/server/0872-Custom-Potion-Mixes.patch
similarity index 100%
rename from patches/server/0871-Custom-Potion-Mixes.patch
rename to patches/server/0872-Custom-Potion-Mixes.patch
diff --git a/patches/server/0872-Fix-missing-Level-LevelStem-in-StructureCheck-from-C.patch b/patches/server/0873-Fix-missing-Level-LevelStem-in-StructureCheck-from-C.patch
similarity index 100%
rename from patches/server/0872-Fix-missing-Level-LevelStem-in-StructureCheck-from-C.patch
rename to patches/server/0873-Fix-missing-Level-LevelStem-in-StructureCheck-from-C.patch