diff --git a/patches/server/0006-Component-related-conveniences.patch b/patches/server/0006-Component-related-conveniences.patch
index f6b36d711..fbf58a2b6 100644
--- a/patches/server/0006-Component-related-conveniences.patch
+++ b/patches/server/0006-Component-related-conveniences.patch
@@ -36,10 +36,10 @@ index 54dc872b1d448c8895313b216d6cd1c9836a5160..c1091ab7069fa3dd934409da23d404a7
      public void displayClientMessage(Component message, boolean actionBar) {
          this.sendMessage(message, actionBar ? ChatType.GAME_INFO : ChatType.CHAT, Util.NIL_UUID);
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index ea1f7c8bf220982a086d4ae1663ae445b8c6cebd..dc5492b45bfa97c0e1237096764b79c88e846e4e 100644
+index eaa005c1c9b4386bcdbe1d6eb28c3eca7635066c..b0ff18e420d064db81f4e8f3a383e1d208abf783 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1395,6 +1395,62 @@ public abstract class PlayerList {
+@@ -1396,6 +1396,62 @@ public abstract class PlayerList {
      }
      // CraftBukkit end
  
diff --git a/patches/server/0021-Player-invulnerabilities.patch b/patches/server/0021-Player-invulnerabilities.patch
index 322e1cb16..49e727d78 100644
--- a/patches/server/0021-Player-invulnerabilities.patch
+++ b/patches/server/0021-Player-invulnerabilities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Player invulnerabilities
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 20f62a092eb4d37c2502125002fe61d768a65b8a..70c45cc80f1a884edcccf5a104988b196bf35a8c 100644
+index a414d11f9bdf1d3432bcbecb6574f8fafd4478bb..724e5975758f3055b210f96fcc208c81b7ff24a4 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -259,6 +259,7 @@ public class ServerPlayer extends Player {
@@ -108,10 +108,10 @@ index 86d77f244e0abd97480048e28f7bfa5293994086..89b64a54cb05e341db415c95aaeecf2e
          this.cserver.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(this.getCraftPlayer(), packStatus)); // CraftBukkit
          // Paper end
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 1c1602f839828252748e1acacfe42c7cac194332..5b1641eae57b974997803fbc42710032ba914b21 100644
+index b0ff18e420d064db81f4e8f3a383e1d208abf783..8e4c01a9b8994c3467bbb64661d457ce64ba3a6b 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -997,6 +997,8 @@ public abstract class PlayerList {
+@@ -998,6 +998,8 @@ public abstract class PlayerList {
          }
          // Paper end
  
@@ -143,7 +143,7 @@ index 996171e7271e62e72c0b2b213c21caf53c815e97..8e9ba3a8582c8e5d1e14bf3bfa8ecfce
  
      public boolean babiesAreRidable = true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 34f93861d296fd66758286129be0fb7eebb59011..f8366b1b86d468728a875439bbe3eb4c69639376 100644
+index e28ad069f6f4aef78810171ef56448497849c6bc..f2ba626bb16d3b94b28e6d5cffc257caf8875195 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2611,5 +2611,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0056-Add-permission-for-F3-N-debug.patch b/patches/server/0056-Add-permission-for-F3-N-debug.patch
index ac96154ef..e64f24946 100644
--- a/patches/server/0056-Add-permission-for-F3-N-debug.patch
+++ b/patches/server/0056-Add-permission-for-F3-N-debug.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add permission for F3+N debug
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 5b1641eae57b974997803fbc42710032ba914b21..bd5ab259d37f13542c2510530fdf5fc5d6496975 100644
+index 8e4c01a9b8994c3467bbb64661d457ce64ba3a6b..7880893c132f95df4dcfea564b4c40c2b8256ea4 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1162,6 +1162,7 @@ public abstract class PlayerList {
+@@ -1163,6 +1163,7 @@ public abstract class PlayerList {
              } else {
                  b0 = (byte) (24 + permissionLevel);
              }
diff --git a/patches/server/0070-Mending-mends-most-damages-equipment-first.patch b/patches/server/0070-Mending-mends-most-damages-equipment-first.patch
index b118be630..b415f60d5 100644
--- a/patches/server/0070-Mending-mends-most-damages-equipment-first.patch
+++ b/patches/server/0070-Mending-mends-most-damages-equipment-first.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Mending mends most damages equipment first
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-index 1caf10ecf949e0f465ffe573f3bed1a3c5733a7f..8b6614bde99b17db2e161f3fe4ab2491ff7b679c 100644
+index ec7d011fa5df0b4775bedc01632ba549d3803693..bc2000c27395618d1816719a862aa9829128d863 100644
 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 @@ -319,7 +319,7 @@ public class ExperienceOrb extends Entity {
@@ -18,10 +18,10 @@ index 1caf10ecf949e0f465ffe573f3bed1a3c5733a7f..8b6614bde99b17db2e161f3fe4ab2491
          if (entry != null) {
              ItemStack itemstack = (ItemStack) entry.getValue();
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 3e5e358e24bd84a05785a9391526f316475e95ff..7b1393f3c1acf29318de8222ef54032a449b03f3 100644
+index 7695a5ec88023720d873f81fc36f78ad60fb9589..47b8b3df98eb775f7e642924fd36005d542a10c6 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -511,6 +511,16 @@ public final class ItemStack {
+@@ -513,6 +513,16 @@ public final class ItemStack {
          return this.isDamageableItem() && this.getDamageValue() > 0;
      }
  
@@ -73,7 +73,7 @@ index d439e8ce87bf7da03683a336941c7673b8b166e4..955e482e4bc83f2b777cd2e4254c40be
          Entry<EquipmentSlot, ItemStack> entry = getRandomItemWith(enchantment, entityliving);
          return entry != null ? entry.getValue() : ItemStack.EMPTY;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 270ce40a4e81037196a9df8fe21790682b917ce4..8c7d9c15732e0223030a8c868b3d4f42f1226854 100644
+index 4894b0654a81950ec926e448757a2fb379f70daa..42e4c17030054fa75619c3db7c5f4db113b8f6e8 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -219,6 +219,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0072-Implement-elytra-settings.patch b/patches/server/0072-Implement-elytra-settings.patch
index eb93bd7bd..08e78783d 100644
--- a/patches/server/0072-Implement-elytra-settings.patch
+++ b/patches/server/0072-Implement-elytra-settings.patch
@@ -54,10 +54,10 @@ index 543a08f920319a2547258640bafebb1e70af65c4..dd211aa7c4ef1e158933a89898b9e5bc
                      itemStack.shrink(1);
                      } else ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory();
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 7b1393f3c1acf29318de8222ef54032a449b03f3..d1b4fe830170ddee2b6f39eba29e7068e6ae37a3 100644
+index 47b8b3df98eb775f7e642924fd36005d542a10c6..3bd63474205bf7982af291d973a2a71a8490f20b 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -540,7 +540,7 @@ public final class ItemStack {
+@@ -542,7 +542,7 @@ public final class ItemStack {
              int j;
  
              if (amount > 0) {
@@ -66,7 +66,7 @@ index 7b1393f3c1acf29318de8222ef54032a449b03f3..d1b4fe830170ddee2b6f39eba29e7068
                  int k = 0;
  
                  for (int l = 0; j > 0 && l < amount; ++l) {
-@@ -594,6 +594,12 @@ public final class ItemStack {
+@@ -596,6 +596,12 @@ public final class ItemStack {
                  if (this.hurt(amount, entity.getRandom(), entity /*instanceof ServerPlayer ? (ServerPlayer) entity : null*/)) { // Paper - pass LivingEntity for EntityItemDamageEvent
                      breakCallback.accept(entity);
                      Item item = this.getItem();
diff --git a/patches/server/0135-Spread-out-and-optimise-player-list-ticksSpread-out-.patch b/patches/server/0135-Spread-out-and-optimise-player-list-ticksSpread-out-.patch
index 3d8f7a522..d22484d2b 100644
--- a/patches/server/0135-Spread-out-and-optimise-player-list-ticksSpread-out-.patch
+++ b/patches/server/0135-Spread-out-and-optimise-player-list-ticksSpread-out-.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Spread out and optimise player list ticksSpread out and
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index a6846a4553bf00379c54d1b77d30d25389a389ca..c53acfd01eac8c64f068a3c2a2a458b0c1b033a1 100644
+index 7880893c132f95df4dcfea564b4c40c2b8256ea4..5655282578018c00a60d7ddc3fb48393da9cc2ee 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1011,22 +1011,22 @@ public abstract class PlayerList {
+@@ -1012,22 +1012,22 @@ public abstract class PlayerList {
      }
  
      public void tick() {
diff --git a/patches/server/0139-Option-for-chests-to-open-even-with-a-solid-block-on.patch b/patches/server/0139-Option-for-chests-to-open-even-with-a-solid-block-on.patch
index 66d03e134..d64c4ee0c 100644
--- a/patches/server/0139-Option-for-chests-to-open-even-with-a-solid-block-on.patch
+++ b/patches/server/0139-Option-for-chests-to-open-even-with-a-solid-block-on.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Option for chests to open even with a solid block on top
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/ChestBlock.java b/src/main/java/net/minecraft/world/level/block/ChestBlock.java
-index eecb8c089b5f426b1395b47f714af32c210555ef..ac82e2b0f4ca1232cc7ec6e4c7dd261308f61aaf 100644
+index 1891cfb8f7ebae5a95a55f706bb04f8206121d32..5d4c26ca9db5f36626f64ba4b0965a43823c81d3 100644
 --- a/src/main/java/net/minecraft/world/level/block/ChestBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/ChestBlock.java
-@@ -349,6 +349,7 @@ public class ChestBlock extends AbstractChestBlock<ChestBlockEntity> implements
+@@ -356,6 +356,7 @@ public class ChestBlock extends AbstractChestBlock<ChestBlockEntity> implements
      }
  
      private static boolean isBlockedChestByBlock(BlockGetter world, BlockPos pos) {
diff --git a/patches/server/0178-Config-to-allow-for-unsafe-enchants.patch b/patches/server/0178-Config-to-allow-for-unsafe-enchants.patch
index 52c8214c9..6d9cfe4e5 100644
--- a/patches/server/0178-Config-to-allow-for-unsafe-enchants.patch
+++ b/patches/server/0178-Config-to-allow-for-unsafe-enchants.patch
@@ -58,10 +58,10 @@ index 81ffe2c1597487188cfcce09c5e160d81529c710..bb80328af5051cc01609dfd79b749d9a
                  ((ServerPlayer) player).connection.send(new ClientboundContainerSetDataPacket(containerId, 0, cost.get()));
              }
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index d1b4fe830170ddee2b6f39eba29e7068e6ae37a3..115f8eb919e90bc4a79db1d0f7875a31cc962f07 100644
+index 3bd63474205bf7982af291d973a2a71a8490f20b..342e229fc0039510fdf2fc56998ee0891dda7380 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -1145,6 +1145,12 @@ public final class ItemStack {
+@@ -1147,6 +1147,12 @@ public final class ItemStack {
          return this.tag != null && this.tag.contains("Enchantments", 9) ? !this.tag.getList("Enchantments", 10).isEmpty() : false;
      }
  
diff --git a/patches/server/0223-SPIGOT-5988-Fix-bed-respawn-location-not-resetting.patch b/patches/server/0223-SPIGOT-5988-Fix-bed-respawn-location-not-resetting.patch
deleted file mode 100644
index fb10b61b6..000000000
--- a/patches/server/0223-SPIGOT-5988-Fix-bed-respawn-location-not-resetting.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sat, 3 Jul 2021 16:57:27 -0500
-Subject: [PATCH] SPIGOT-5988 Fix bed respawn location not resetting
-
-
-diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 98040579a8ce4ce0e6828840700a3e528e434741..7934c65d9282fd7a542896750af7abae483ba0ca 100644
---- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -902,6 +902,7 @@ public abstract class PlayerList {
-                     location = new Location(worldserver1.getWorld(), vec3d.x, vec3d.y, vec3d.z, f1, 0.0F);
-                 } else if (blockposition != null) {
-                     entityplayer1.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.NO_RESPAWN_BLOCK_AVAILABLE, 0.0F));
-+                    if (net.pl3x.purpur.PurpurConfig.fixBedRespawns) entityplayer1.setRespawnPosition(worldserver1.dimension(), null, 0.0F, false, false); // Purpur - fix SPIGOT-5988
-                 }
-             }
- 
-diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index a68f8efb7ad6de35d9703417cc6d65c7b99efa23..90599b9022fc1a1e79652f948cdf8ad3a32a2588 100644
---- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
-+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -290,6 +290,7 @@ public class PurpurConfig {
-     public static int beeInsideBeeHive = 3;
-     public static boolean anvilCumulativeCost = true;
-     public static int lightningRodRange = 128;
-+    public static boolean fixBedRespawns = false;
-     private static void blockSettings() {
-         if (version < 3) {
-             boolean oldValue = getBoolean("settings.barrel.packed-barrels", true);
-@@ -324,6 +325,7 @@ public class PurpurConfig {
-         beeInsideBeeHive = getInt("settings.blocks.beehive.max-bees-inside", beeInsideBeeHive);
-         anvilCumulativeCost = getBoolean("settings.blocks.anvil.cumulative-cost", anvilCumulativeCost);
-         lightningRodRange = getInt("settings.blocks.lightning_rod.range", lightningRodRange);
-+        fixBedRespawns = getBoolean("settings.blocks.bed.fix-spigot-5988", fixBedRespawns);
-     }
- 
-     public static boolean allowInfinityMending = false;
diff --git a/patches/server/0224-Store-placer-on-Block-when-placed.patch b/patches/server/0223-Store-placer-on-Block-when-placed.patch
similarity index 92%
rename from patches/server/0224-Store-placer-on-Block-when-placed.patch
rename to patches/server/0223-Store-placer-on-Block-when-placed.patch
index ab597766f..8accd5080 100644
--- a/patches/server/0224-Store-placer-on-Block-when-placed.patch
+++ b/patches/server/0223-Store-placer-on-Block-when-placed.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Store placer on Block when placed
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 115f8eb919e90bc4a79db1d0f7875a31cc962f07..d8df4457c28225508d9cb53ed6ea12d2f58648b8 100644
+index 342e229fc0039510fdf2fc56998ee0891dda7380..98b4d5321c7d3023021045bf22b640d2a0744323 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -381,6 +381,7 @@ public final class ItemStack {
+@@ -382,6 +382,7 @@ public final class ItemStack {
                      world.preventPoiUpdated = true; // CraftBukkit - SPIGOT-5710
                      for (BlockState blockstate : blocks) {
                          blockstate.update(true, false);
@@ -16,7 +16,7 @@ index 115f8eb919e90bc4a79db1d0f7875a31cc962f07..d8df4457c28225508d9cb53ed6ea12d2
                      }
                      world.preventPoiUpdated = false;
  
-@@ -409,6 +410,7 @@ public final class ItemStack {
+@@ -411,6 +412,7 @@ public final class ItemStack {
                          if (!(block.getBlock() instanceof BaseEntityBlock)) { // Containers get placed automatically
                              block.getBlock().onPlace(block, world, newblockposition, oldBlock, true, itemactioncontext); // Paper - pass itemactioncontext
                          }
diff --git a/patches/server/0225-Summoner-API.patch b/patches/server/0224-Summoner-API.patch
similarity index 100%
rename from patches/server/0225-Summoner-API.patch
rename to patches/server/0224-Summoner-API.patch
diff --git a/patches/server/0226-Customizable-sleeping-actionbar-messages.patch b/patches/server/0225-Customizable-sleeping-actionbar-messages.patch
similarity index 95%
rename from patches/server/0226-Customizable-sleeping-actionbar-messages.patch
rename to patches/server/0225-Customizable-sleeping-actionbar-messages.patch
index 3e80e0cd3..06105ae81 100644
--- a/patches/server/0226-Customizable-sleeping-actionbar-messages.patch
+++ b/patches/server/0225-Customizable-sleeping-actionbar-messages.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Customizable sleeping actionbar messages
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 984dd58c368595157e51c4c843512803bc8dfd02..74a748f988b08139edc67dcac43686680ebd97aa 100644
+index 05a52fd9540e725b1b6feb2c472ae38a9da0ec1a..54c80d7ebb67598cc1b77d259f3b3fcaa35eca7e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1061,11 +1061,29 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -40,7 +40,7 @@ index 984dd58c368595157e51c4c843512803bc8dfd02..74a748f988b08139edc67dcac4368668
                  }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 90599b9022fc1a1e79652f948cdf8ad3a32a2588..1c27d959bb4caeb6af331f4e240d9ef10454b475 100644
+index a68f8efb7ad6de35d9703417cc6d65c7b99efa23..151f3022a190a30da60b2ea60ee925ecca8a4b4a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -168,6 +168,8 @@ public class PurpurConfig {
diff --git a/patches/server/0227-option-to-disable-shulker-box-items-from-dropping-co.patch b/patches/server/0226-option-to-disable-shulker-box-items-from-dropping-co.patch
similarity index 100%
rename from patches/server/0227-option-to-disable-shulker-box-items-from-dropping-co.patch
rename to patches/server/0226-option-to-disable-shulker-box-items-from-dropping-co.patch
diff --git a/patches/server/0228-Silk-touchable-budding-amethyst.patch b/patches/server/0227-Silk-touchable-budding-amethyst.patch
similarity index 100%
rename from patches/server/0228-Silk-touchable-budding-amethyst.patch
rename to patches/server/0227-Silk-touchable-budding-amethyst.patch
diff --git a/patches/server/0229-Big-dripleaf-tilt-delay.patch b/patches/server/0228-Big-dripleaf-tilt-delay.patch
similarity index 100%
rename from patches/server/0229-Big-dripleaf-tilt-delay.patch
rename to patches/server/0228-Big-dripleaf-tilt-delay.patch
diff --git a/patches/server/0230-Player-ridable-in-water-option.patch b/patches/server/0229-Player-ridable-in-water-option.patch
similarity index 100%
rename from patches/server/0230-Player-ridable-in-water-option.patch
rename to patches/server/0229-Player-ridable-in-water-option.patch
diff --git a/patches/server/0231-Config-to-disable-Enderman-teleport-on-projectile-hi.patch b/patches/server/0230-Config-to-disable-Enderman-teleport-on-projectile-hi.patch
similarity index 100%
rename from patches/server/0231-Config-to-disable-Enderman-teleport-on-projectile-hi.patch
rename to patches/server/0230-Config-to-disable-Enderman-teleport-on-projectile-hi.patch
diff --git a/patches/server/0232-Fix-Important-Issue-Crash-with-Plugin-or-Datapack-Ge.patch b/patches/server/0231-Fix-Important-Issue-Crash-with-Plugin-or-Datapack-Ge.patch
similarity index 100%
rename from patches/server/0232-Fix-Important-Issue-Crash-with-Plugin-or-Datapack-Ge.patch
rename to patches/server/0231-Fix-Important-Issue-Crash-with-Plugin-or-Datapack-Ge.patch
diff --git a/patches/server/0233-Add-compass-command.patch b/patches/server/0232-Add-compass-command.patch
similarity index 99%
rename from patches/server/0233-Add-compass-command.patch
rename to patches/server/0232-Add-compass-command.patch
index 0fedfc6a4..f75adc955 100644
--- a/patches/server/0233-Add-compass-command.patch
+++ b/patches/server/0232-Add-compass-command.patch
@@ -81,7 +81,7 @@ index 9d541c9e53f3f8db871f01f8d083e4cfc0de0de1..046bf9cbf02b002e89f7d39b616dd0f5
                  CompoundTag compoundTag = stack.getOrCreateTag();
                  if (compoundTag.contains("LodestoneTracked") && !compoundTag.getBoolean("LodestoneTracked")) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 1c27d959bb4caeb6af331f4e240d9ef10454b475..15963a7d4d721f3a8b665c1917cd5f2860814a62 100644
+index 151f3022a190a30da60b2ea60ee925ecca8a4b4a..82c7694de79094f4d944cdaba8d06572147dfd34 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -252,6 +252,11 @@ public class PurpurConfig {
diff --git a/patches/server/0234-Config-to-prevent-horses-from-standing-with-riders.patch b/patches/server/0233-Config-to-prevent-horses-from-standing-with-riders.patch
similarity index 100%
rename from patches/server/0234-Config-to-prevent-horses-from-standing-with-riders.patch
rename to patches/server/0233-Config-to-prevent-horses-from-standing-with-riders.patch
diff --git a/patches/server/0235-Toggle-for-kinetic-damage.patch b/patches/server/0234-Toggle-for-kinetic-damage.patch
similarity index 100%
rename from patches/server/0235-Toggle-for-kinetic-damage.patch
rename to patches/server/0234-Toggle-for-kinetic-damage.patch
diff --git a/patches/server/0236-Add-Option-for-disable-observer-clocks.patch b/patches/server/0235-Add-Option-for-disable-observer-clocks.patch
similarity index 100%
rename from patches/server/0236-Add-Option-for-disable-observer-clocks.patch
rename to patches/server/0235-Add-Option-for-disable-observer-clocks.patch
diff --git a/patches/server/0237-Customizeable-Zombie-Villager-curing-times.patch b/patches/server/0236-Customizeable-Zombie-Villager-curing-times.patch
similarity index 100%
rename from patches/server/0237-Customizeable-Zombie-Villager-curing-times.patch
rename to patches/server/0236-Customizeable-Zombie-Villager-curing-times.patch
diff --git a/patches/server/0238-Option-for-sponges-to-work-on-lava.patch b/patches/server/0237-Option-for-sponges-to-work-on-lava.patch
similarity index 100%
rename from patches/server/0238-Option-for-sponges-to-work-on-lava.patch
rename to patches/server/0237-Option-for-sponges-to-work-on-lava.patch
diff --git a/patches/server/0239-Toggle-for-Wither-s-spawn-sound.patch b/patches/server/0238-Toggle-for-Wither-s-spawn-sound.patch
similarity index 100%
rename from patches/server/0239-Toggle-for-Wither-s-spawn-sound.patch
rename to patches/server/0238-Toggle-for-Wither-s-spawn-sound.patch
diff --git a/patches/server/0240-Cactus-breaks-from-solid-neighbors-config.patch b/patches/server/0239-Cactus-breaks-from-solid-neighbors-config.patch
similarity index 100%
rename from patches/server/0240-Cactus-breaks-from-solid-neighbors-config.patch
rename to patches/server/0239-Cactus-breaks-from-solid-neighbors-config.patch
diff --git a/patches/server/0241-Config-to-remove-curse-of-binding-with-weakness.patch b/patches/server/0240-Config-to-remove-curse-of-binding-with-weakness.patch
similarity index 100%
rename from patches/server/0241-Config-to-remove-curse-of-binding-with-weakness.patch
rename to patches/server/0240-Config-to-remove-curse-of-binding-with-weakness.patch
diff --git a/patches/server/0242-Conduit-behavior-configuration.patch b/patches/server/0241-Conduit-behavior-configuration.patch
similarity index 100%
rename from patches/server/0242-Conduit-behavior-configuration.patch
rename to patches/server/0241-Conduit-behavior-configuration.patch
diff --git a/patches/server/0243-Cauldron-fill-chances.patch b/patches/server/0242-Cauldron-fill-chances.patch
similarity index 100%
rename from patches/server/0243-Cauldron-fill-chances.patch
rename to patches/server/0242-Cauldron-fill-chances.patch
diff --git a/patches/server/0244-Config-to-allow-mobs-to-pathfind-over-rails.patch b/patches/server/0243-Config-to-allow-mobs-to-pathfind-over-rails.patch
similarity index 100%
rename from patches/server/0244-Config-to-allow-mobs-to-pathfind-over-rails.patch
rename to patches/server/0243-Config-to-allow-mobs-to-pathfind-over-rails.patch
diff --git a/patches/server/0245-Add-force-and-prompt-parameters-to-resource-pack-api.patch b/patches/server/0244-Add-force-and-prompt-parameters-to-resource-pack-api.patch
similarity index 100%
rename from patches/server/0245-Add-force-and-prompt-parameters-to-resource-pack-api.patch
rename to patches/server/0244-Add-force-and-prompt-parameters-to-resource-pack-api.patch
diff --git a/patches/server/0246-Shulker-change-color-with-dye.patch b/patches/server/0245-Shulker-change-color-with-dye.patch
similarity index 100%
rename from patches/server/0246-Shulker-change-color-with-dye.patch
rename to patches/server/0245-Shulker-change-color-with-dye.patch
diff --git a/patches/server/0247-Extended-OfflinePlayer-API.patch b/patches/server/0246-Extended-OfflinePlayer-API.patch
similarity index 100%
rename from patches/server/0247-Extended-OfflinePlayer-API.patch
rename to patches/server/0246-Extended-OfflinePlayer-API.patch
diff --git a/patches/server/0248-Added-the-ability-to-add-combustible-items.patch b/patches/server/0247-Added-the-ability-to-add-combustible-items.patch
similarity index 100%
rename from patches/server/0248-Added-the-ability-to-add-combustible-items.patch
rename to patches/server/0247-Added-the-ability-to-add-combustible-items.patch
diff --git a/patches/server/0249-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch b/patches/server/0248-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch
similarity index 97%
rename from patches/server/0249-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch
rename to patches/server/0248-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch
index 9b54977b4..93dd0a704 100644
--- a/patches/server/0249-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch
+++ b/patches/server/0248-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Option for if rain and thunder should stop on sleep
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 74a748f988b08139edc67dcac43686680ebd97aa..056716734eb83bf73e6d5b016d545f2c82fb51aa 100644
+index 54c80d7ebb67598cc1b77d259f3b3fcaa35eca7e..87875413ba3781d3e100bd735afaa16ccf686027 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1113,6 +1113,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0250-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch b/patches/server/0249-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch
similarity index 100%
rename from patches/server/0250-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch
rename to patches/server/0249-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch
diff --git a/patches/server/0251-Shift-right-click-to-use-exp-for-mending.patch b/patches/server/0250-Shift-right-click-to-use-exp-for-mending.patch
similarity index 100%
rename from patches/server/0251-Shift-right-click-to-use-exp-for-mending.patch
rename to patches/server/0250-Shift-right-click-to-use-exp-for-mending.patch
diff --git a/patches/server/0252-Dolphins-naturally-aggressive-to-players-chance.patch b/patches/server/0251-Dolphins-naturally-aggressive-to-players-chance.patch
similarity index 100%
rename from patches/server/0252-Dolphins-naturally-aggressive-to-players-chance.patch
rename to patches/server/0251-Dolphins-naturally-aggressive-to-players-chance.patch
diff --git a/patches/server/0253-Cows-naturally-aggressive-to-players-chance.patch b/patches/server/0252-Cows-naturally-aggressive-to-players-chance.patch
similarity index 100%
rename from patches/server/0253-Cows-naturally-aggressive-to-players-chance.patch
rename to patches/server/0252-Cows-naturally-aggressive-to-players-chance.patch
diff --git a/patches/server/0254-Option-for-beds-to-explode-on-villager-sleep.patch b/patches/server/0253-Option-for-beds-to-explode-on-villager-sleep.patch
similarity index 100%
rename from patches/server/0254-Option-for-beds-to-explode-on-villager-sleep.patch
rename to patches/server/0253-Option-for-beds-to-explode-on-villager-sleep.patch
diff --git a/patches/server/0255-horses-tempted-by-gold-config.patch b/patches/server/0254-horses-tempted-by-gold-config.patch
similarity index 100%
rename from patches/server/0255-horses-tempted-by-gold-config.patch
rename to patches/server/0254-horses-tempted-by-gold-config.patch
diff --git a/patches/server/0256-llama-tempted-by-hay-config.patch b/patches/server/0255-llama-tempted-by-hay-config.patch
similarity index 100%
rename from patches/server/0256-llama-tempted-by-hay-config.patch
rename to patches/server/0255-llama-tempted-by-hay-config.patch
diff --git a/patches/server/0257-Halloween-options-and-optimizations.patch b/patches/server/0256-Halloween-options-and-optimizations.patch
similarity index 100%
rename from patches/server/0257-Halloween-options-and-optimizations.patch
rename to patches/server/0256-Halloween-options-and-optimizations.patch
diff --git a/patches/server/0258-Config-for-Grindstones-ignoring-curses.patch b/patches/server/0257-Config-for-Grindstones-ignoring-curses.patch
similarity index 90%
rename from patches/server/0258-Config-for-Grindstones-ignoring-curses.patch
rename to patches/server/0257-Config-for-Grindstones-ignoring-curses.patch
index ae313c0e6..a5a669ad7 100644
--- a/patches/server/0258-Config-for-Grindstones-ignoring-curses.patch
+++ b/patches/server/0257-Config-for-Grindstones-ignoring-curses.patch
@@ -36,21 +36,21 @@ index 51f3650bc19bddc71731c0cb36e600cc8d16a495..12f6a8cb3df14a457d6618ed02237391
  
          EnchantmentHelper.setEnchantments(map, itemstack1);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 15963a7d4d721f3a8b665c1917cd5f2860814a62..df12c714aaa2817b653a5fe6278e0dc39aada34d 100644
+index 82c7694de79094f4d944cdaba8d06572147dfd34..1134bc154cb3d83b510e48bd78851a93cfecbbe3 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -307,6 +307,7 @@ public class PurpurConfig {
+@@ -306,6 +306,7 @@ public class PurpurConfig {
+     public static int beeInsideBeeHive = 3;
      public static boolean anvilCumulativeCost = true;
      public static int lightningRodRange = 128;
-     public static boolean fixBedRespawns = false;
 +    public static boolean grindstoneIgnoreCurses = true;
      private static void blockSettings() {
          if (version < 3) {
              boolean oldValue = getBoolean("settings.barrel.packed-barrels", true);
-@@ -342,6 +343,7 @@ public class PurpurConfig {
+@@ -340,6 +341,7 @@ public class PurpurConfig {
+         beeInsideBeeHive = getInt("settings.blocks.beehive.max-bees-inside", beeInsideBeeHive);
          anvilCumulativeCost = getBoolean("settings.blocks.anvil.cumulative-cost", anvilCumulativeCost);
          lightningRodRange = getInt("settings.blocks.lightning_rod.range", lightningRodRange);
-         fixBedRespawns = getBoolean("settings.blocks.bed.fix-spigot-5988", fixBedRespawns);
 +        grindstoneIgnoreCurses = getBoolean("settings.blocks.grindstone.ignore-curses", grindstoneIgnoreCurses);
      }
  
diff --git a/patches/server/0259-UPnP-Port-Forwarding.patch b/patches/server/0258-UPnP-Port-Forwarding.patch
similarity index 96%
rename from patches/server/0259-UPnP-Port-Forwarding.patch
rename to patches/server/0258-UPnP-Port-Forwarding.patch
index df34933bb..8059fb3de 100644
--- a/patches/server/0259-UPnP-Port-Forwarding.patch
+++ b/patches/server/0258-UPnP-Port-Forwarding.patch
@@ -67,10 +67,10 @@ index 61877f5ba0e54bbf046dabc067c79bf4df588278..d5c61053f6af91aa5d0894750ab86372
          // CraftBukkit start
          // this.a((PlayerList) (new DedicatedPlayerList(this, this.customRegistry, this.worldNBTStorage))); // Spigot - moved up
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index df12c714aaa2817b653a5fe6278e0dc39aada34d..646cab345fc96d3ebaae49bb61925b8094dc68d9 100644
+index b55c464928dc246c962d5056ad6b99bdad94d3bc..02c6bb6be09130a3920581e14356075780dae104 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -398,4 +398,9 @@ public class PurpurConfig {
+@@ -396,4 +396,9 @@ public class PurpurConfig {
      private static void tpsCatchup() {
          tpsCatchup = getBoolean("settings.tps-catchup", tpsCatchup);
      }
diff --git a/patches/server/0260-Campfire-option-for-lit-when-placed.patch b/patches/server/0259-Campfire-option-for-lit-when-placed.patch
similarity index 100%
rename from patches/server/0260-Campfire-option-for-lit-when-placed.patch
rename to patches/server/0259-Campfire-option-for-lit-when-placed.patch
diff --git a/patches/server/0261-options-to-extinguish-fire-blocks-with-snowballs.patch b/patches/server/0260-options-to-extinguish-fire-blocks-with-snowballs.patch
similarity index 98%
rename from patches/server/0261-options-to-extinguish-fire-blocks-with-snowballs.patch
rename to patches/server/0260-options-to-extinguish-fire-blocks-with-snowballs.patch
index 74be9f29d..9fbf4dcf7 100644
--- a/patches/server/0261-options-to-extinguish-fire-blocks-with-snowballs.patch
+++ b/patches/server/0260-options-to-extinguish-fire-blocks-with-snowballs.patch
@@ -46,7 +46,7 @@ index d5d84893c77b4e60a19032d765d76bfd24cbbb2b..ef265cec066ef3b84c2b3a4929af5183
      protected void onHit(HitResult hitResult) {
          super.onHit(hitResult);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 3fefe9ef5ee110e82c174250bf6b4c90d0a7f28f..92f76de3d6ba9b3d777e8e8e149b5aa5ef01c9e3 100644
+index 0f7e1de894b10d109a7ce020995128cfda3fa7be..d31fba4f062e9fe4e3f52827936edbb3f81f234b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -179,6 +179,9 @@ public class PurpurWorldConfig {