diff --git a/gradle.properties b/gradle.properties
index 34e4b5d..9cba2be 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group=me.totalfreedom.scissors
 version=1.20.4-R0.1-SNAPSHOT
 
 mcVersion=1.20.4
-paperRef=8d94596e309ed6d8d00c501336b7899b7c53562f
+paperRef=b7004609991dab287b582a1546a1b59c5d90c916
 
 org.gradle.caching=true
 org.gradle.parallel=true
diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch
index cd14447..b866659 100644
--- a/patches/server/0001-Build-changes.patch
+++ b/patches/server/0001-Build-changes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Build changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 444ff797c70b0e285d4272ea2ce3d72453c9bda5..ca719ecf971286def958deef10d4fad8b7f21e81 100644
+index 376e8983fdfdbb6c3e5fd8ad0f6a05e655b622bf..ee0eb76093a60655e364626e87c05df4c43b70dc 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -13,8 +13,12 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
@@ -95,20 +95,20 @@ index c5d5648f4ca603ef2b1df723b58f9caf4dd3c722..21ded7c14c56a40feaa7741131be5166
                  .completer(new ConsoleCommandCompleter(this.server))
                  .option(LineReader.Option.COMPLETE_IN_WORD, true);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c1c1763de0ad0376c504946cbfd7bbd5b0cff0fd..6ac66aad01ff3486f75efdf7e74309abee938467 100644
+index 4e1011dca1081a5246981fabb93f142442dcc92c..75a19ba0863854026c0697a5ede0761e9ae70b56 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1852,7 +1852,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1850,7 +1850,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @DontObfuscate
      public String getServerModName() {
--        return "Paper"; // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
-+        return "Scissors"; // Scissors - Scissors > // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
+-        return "Paper"; // Paper
++        return "Scissors"; // Scissors
      }
  
      public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 70274239aa95d41953291d138cc46e0d7b491a8a..0a5233a777294af3e7ef7844f72d47d11cd05b89 100644
+index 9d00c98ddfa1b9c04e6d587dcdf779822f35964a..99d7d1e760aa4b9eecd20093aca1c23c0683e53a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -264,7 +264,7 @@ import javax.annotation.Nullable; // Paper
@@ -116,7 +116,7 @@ index 70274239aa95d41953291d138cc46e0d7b491a8a..0a5233a777294af3e7ef7844f72d47d1
  
  public final class CraftServer implements Server {
 -    private final String serverName = "Paper"; // Paper
-+    private final String serverName = "Scissors"; // Scissors // Paper
++    private final String serverName = "Scissors"; // Scissors > // Paper
      private final String serverVersion;
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
diff --git a/patches/server/0004-Fixes-log-spam-caused-by-invalid-entities-in-beehive.patch b/patches/server/0003-Fixes-log-spam-caused-by-invalid-entities-in-beehive.patch
similarity index 94%
rename from patches/server/0004-Fixes-log-spam-caused-by-invalid-entities-in-beehive.patch
rename to patches/server/0003-Fixes-log-spam-caused-by-invalid-entities-in-beehive.patch
index fad4cb7..83e3e2f 100644
--- a/patches/server/0004-Fixes-log-spam-caused-by-invalid-entities-in-beehive.patch
+++ b/patches/server/0003-Fixes-log-spam-caused-by-invalid-entities-in-beehive.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fixes log spam caused by invalid entities in beehives
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
-index dfd364ac4b7551a13c4c6c100b5e62c0dfb10595..e0b0dec10dfc5d8e336a4c0f7005e7186f925c1a 100644
+index 56b328c64bea0ffd51930d8ba15fb87a36e6d8a1..d9bdebca610d070453a83b7639207fedaeffa639 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
 @@ -11,6 +11,7 @@ import net.minecraft.nbt.CompoundTag;
diff --git a/patches/server/0003-ResourceLocation-validation.patch b/patches/server/0004-ResourceLocation-validation.patch
similarity index 96%
rename from patches/server/0003-ResourceLocation-validation.patch
rename to patches/server/0004-ResourceLocation-validation.patch
index 2b8d6f4..1695b94 100644
--- a/patches/server/0003-ResourceLocation-validation.patch
+++ b/patches/server/0004-ResourceLocation-validation.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Telesphoreo <me@telesphoreo.me>
-Date: Sun, 10 Dec 2023 13:40:21 -0600
+Date: Wed, 24 Jan 2024 16:28:16 -0600
 Subject: [PATCH] ResourceLocation validation
 
 
@@ -44,7 +44,7 @@ index 1f55185814125c691288294d18bf1580461c8066..259d65f8e21f9cf99585d416eafdc967
          }
  
 diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
-index 081937597a8984b52a1e92d4c6032c04c942116e..9a540393339e85a06ac9e29d6539517b663ed312 100644
+index edc723ea5ca3a325106e7af38c60dbf9f0f5fb77..1b5305c4ac7881c76d4fd326c4547d7e242b8ea4 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityType.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityType.java
 @@ -599,7 +599,7 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
@@ -57,7 +57,7 @@ index 081937597a8984b52a1e92d4c6032c04c942116e..9a540393339e85a06ac9e29d6539517b
      }
  
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-index 5eaab97a0c3b93a44a45e2ed11033fe01c0c95c2..5edca8cdad2c3e3e8d2dd9f6ab02b3d63beb768d 100644
+index d04fc84eef11adb5ea64077f48794b6ed7fb3ada..c4b972846200b1e3fb84c75c200122906f84a245 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
 @@ -290,7 +290,12 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
@@ -73,7 +73,7 @@ index 5eaab97a0c3b93a44a45e2ed11033fe01c0c95c2..5edca8cdad2c3e3e8d2dd9f6ab02b3d6
 +            // Scissors end
          }
  
-         // Paper start - cook speed API
+         // Paper start - cook speed multiplier API
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BrushableBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BrushableBlockEntity.java
 index b5b1831631e233a96b6fd55972a8862b0f420da8..a086f12c09a5e38f63c8de118fcb5a6a30e40b52 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BrushableBlockEntity.java
@@ -144,7 +144,7 @@ index 313ee5c8737b2e57f9b5db6512c1871766b2ccd4..a115a13ec911884a804800fc13f0347b
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-index 5f6a1fb323782816f706ccf7df922cb203238302..21b4594379a5e904ad60f9c9512ace94e7ed5f68 100644
+index 31f62fbb54ec7b270fbd8afba7bd7c4bfafa09e3..684e69753be0398ebe57172454aba8cc45cf6502 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 @@ -80,8 +80,15 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {
diff --git a/patches/server/0011-Better-handling-of-invalid-JSON-components.patch b/patches/server/0011-Better-handling-of-invalid-JSON-components.patch
index 6e85314..61ae70f 100644
--- a/patches/server/0011-Better-handling-of-invalid-JSON-components.patch
+++ b/patches/server/0011-Better-handling-of-invalid-JSON-components.patch
@@ -93,10 +93,10 @@ index 186547674894fd084bceb478bb6017b747df4173..74c880425964da042ca57c097eb93273
                      }
                  }).reduce((accumulator, current) -> {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ef2ef6f34e2045ccbf93de123785b44886072cee..261c0f577cb88409a4b7dbec477eacde0a27aa79 100644
+index a9649cbd58e22411bfac00580a2c266cd9133802..ec0e041ee2ce4d763859a53221fb75a8da6dc283 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2528,11 +2528,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2525,11 +2525,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
                      if (nbt.contains("CustomName", 8)) {
                          String s = nbt.getString("CustomName");
  
@@ -110,7 +110,7 @@ index ef2ef6f34e2045ccbf93de123785b44886072cee..261c0f577cb88409a4b7dbec477eacde
  
                      this.setCustomNameVisible(nbt.getBoolean("CustomNameVisible"));
 diff --git a/src/main/java/net/minecraft/world/scores/ScoreboardSaveData.java b/src/main/java/net/minecraft/world/scores/ScoreboardSaveData.java
-index b49d60d20d170d16a7daf2bc874e5d8d04552b3e..56ae1fa22bb722f91a06d7344bf879210f4ef8f2 100644
+index 6c3ed29e13ea78ceb1c9bb11ce0d9938bb8b4c62..ab2f9b9a021e05ad66a3701577862fa2acf81f52 100644
 --- a/src/main/java/net/minecraft/world/scores/ScoreboardSaveData.java
 +++ b/src/main/java/net/minecraft/world/scores/ScoreboardSaveData.java
 @@ -41,7 +41,7 @@ public class ScoreboardSaveData extends SavedData {
diff --git a/patches/server/0013-Reject-oversized-components-from-updating.patch b/patches/server/0012-Reject-oversized-components-from-updating.patch
similarity index 100%
rename from patches/server/0013-Reject-oversized-components-from-updating.patch
rename to patches/server/0012-Reject-oversized-components-from-updating.patch
diff --git a/patches/server/0014-Add-Scissors-configuration-file-command.patch b/patches/server/0013-Add-Scissors-configuration-file-command.patch
similarity index 98%
rename from patches/server/0014-Add-Scissors-configuration-file-command.patch
rename to patches/server/0013-Add-Scissors-configuration-file-command.patch
index 5455388..f2957ab 100644
--- a/patches/server/0014-Add-Scissors-configuration-file-command.patch
+++ b/patches/server/0013-Add-Scissors-configuration-file-command.patch
@@ -426,7 +426,7 @@ index 61840cfd64caba6595dfc99c91c76a195638d4ee..9acd9ecac6d72701835e04a17fddade7
  
              if (optionset.has("initSettings")) { // CraftBukkit
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index cc9dff21beae4b2f80dd2db6f4cf4311706eab8b..be500a504fe94ed12c76e26ddee90ffe19857db6 100644
+index 6de6dad36203479677a29ad61e21bc369d4e5513..2aed9abbcb2526a2535099fe8d345d25ec099faa 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -222,6 +222,16 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -447,7 +447,7 @@ index cc9dff21beae4b2f80dd2db6f4cf4311706eab8b..be500a504fe94ed12c76e26ddee90ffe
          this.setFlightAllowed(dedicatedserverproperties.allowFlight);
          this.setMotd(dedicatedserverproperties.motd);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6067c246b3974c54e3c8f0f9178809ea3a9349ed..1f13958e86b98733ea1640bc4a1c16bcc89296df 100644
+index 99d7d1e760aa4b9eecd20093aca1c23c0683e53a..ac2b2664789114b7068abf31be7a619f55a362d0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1036,6 +1036,7 @@ public final class CraftServer implements Server {
@@ -466,7 +466,7 @@ index 6067c246b3974c54e3c8f0f9178809ea3a9349ed..1f13958e86b98733ea1640bc4a1c16bc
          this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -3010,6 +3012,14 @@ public final class CraftServer implements Server {
+@@ -3007,6 +3009,14 @@ public final class CraftServer implements Server {
              return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
          }
  
@@ -482,7 +482,7 @@ index 6067c246b3974c54e3c8f0f9178809ea3a9349ed..1f13958e86b98733ea1640bc4a1c16bc
          public void restart() {
              org.spigotmc.RestartCommand.restart();
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 9faa47caa5712477a9311c1bbeac893a81d25d20..41ffc6977c8e8cbfcb9eba7db202075e2cc8e2bc 100644
+index ce341f42b3a5e17fb6d1f7de8057e73137ae2a6e..058819b39f0e2ba248e0a0c834f462a89263442b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -181,6 +181,20 @@ public class Main {
diff --git a/patches/server/0015-Prevent-attributes-with-invalid-namespaces-from-bein.patch b/patches/server/0014-Prevent-attributes-with-invalid-namespaces-from-bein.patch
similarity index 94%
rename from patches/server/0015-Prevent-attributes-with-invalid-namespaces-from-bein.patch
rename to patches/server/0014-Prevent-attributes-with-invalid-namespaces-from-bein.patch
index 37b2c2e..e4d01e1 100644
--- a/patches/server/0015-Prevent-attributes-with-invalid-namespaces-from-bein.patch
+++ b/patches/server/0014-Prevent-attributes-with-invalid-namespaces-from-bein.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent attributes with invalid namespaces from being applied
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index a3e4ae01dc156dc248f48b8ab6d7dcd26853eb10..97b086571c6a0e8ea829b4b52714b52cc32f9a7b 100644
+index 94155519f6838bb971a6fc50d4dd46d8b21187bf..d9d5c72a46798c0611c99dcf0413f7e47ebd29d5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -47,6 +47,7 @@ import net.minecraft.nbt.NbtIo;
diff --git a/patches/server/0016-Don-t-query-player-data-in-the-nbt-component.patch b/patches/server/0015-Don-t-query-player-data-in-the-nbt-component.patch
similarity index 100%
rename from patches/server/0016-Don-t-query-player-data-in-the-nbt-component.patch
rename to patches/server/0015-Don-t-query-player-data-in-the-nbt-component.patch
diff --git a/patches/server/0017-Limit-string-tag-visitors-to-1024-elements.patch b/patches/server/0016-Limit-string-tag-visitors-to-1024-elements.patch
similarity index 100%
rename from patches/server/0017-Limit-string-tag-visitors-to-1024-elements.patch
rename to patches/server/0016-Limit-string-tag-visitors-to-1024-elements.patch
diff --git a/patches/server/0018-Fixes-creative-killing-potion-effects-and-certain-po.patch b/patches/server/0017-Fixes-creative-killing-potion-effects-and-certain-po.patch
similarity index 100%
rename from patches/server/0018-Fixes-creative-killing-potion-effects-and-certain-po.patch
rename to patches/server/0017-Fixes-creative-killing-potion-effects-and-certain-po.patch
diff --git a/patches/server/0019-Fix-negative-death-times.patch b/patches/server/0018-Fix-negative-death-times.patch
similarity index 90%
rename from patches/server/0019-Fix-negative-death-times.patch
rename to patches/server/0018-Fix-negative-death-times.patch
index 0fca740..f9e944c 100644
--- a/patches/server/0019-Fix-negative-death-times.patch
+++ b/patches/server/0018-Fix-negative-death-times.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix negative death times
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index f0d565ac0b3c8d3c3a200348a16e7db21ff3920a..7976953ff2fcaa52cb2edcbeb686690e6f3c1953 100644
+index 6071451339080bbdd98fb634791a56988984c8bc..702dbcf60ba35a3427353ea27547dab4b4c11ecc 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -628,7 +628,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0020-Limit-amount-of-vehicle-collision-checks-to-3-and-di.patch b/patches/server/0019-Limit-amount-of-vehicle-collision-checks-to-3-and-di.patch
similarity index 100%
rename from patches/server/0020-Limit-amount-of-vehicle-collision-checks-to-3-and-di.patch
rename to patches/server/0019-Limit-amount-of-vehicle-collision-checks-to-3-and-di.patch
diff --git a/patches/server/0021-Add-custom-classes-used-by-Scissors.patch b/patches/server/0020-Add-custom-classes-used-by-Scissors.patch
similarity index 100%
rename from patches/server/0021-Add-custom-classes-used-by-Scissors.patch
rename to patches/server/0020-Add-custom-classes-used-by-Scissors.patch
diff --git a/patches/server/0022-Reset-large-tags.patch b/patches/server/0021-Reset-large-tags.patch
similarity index 97%
rename from patches/server/0022-Reset-large-tags.patch
rename to patches/server/0021-Reset-large-tags.patch
index 1ed6ff4..8a74455 100644
--- a/patches/server/0022-Reset-large-tags.patch
+++ b/patches/server/0021-Reset-large-tags.patch
@@ -59,7 +59,7 @@ index 4092c7a8c2b0d9d26e6f4d97386735236300d132..04c47cf1a920ae6c356449df801227ee
              }
          }
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index d7d51f16396ad5539d39b7914125b559bd7dd2b4..1e161e6ee3f1214600c57f7a7df9117284892927 100644
+index ed27a963223bfe18310ad5adabf461b5e307ef9c..1af25c1e91e1a93c6c6c8445a1d9fbeb4f15916b 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -23,6 +23,7 @@ import java.util.function.Predicate;
@@ -105,7 +105,7 @@ index d7d51f16396ad5539d39b7914125b559bd7dd2b4..1e161e6ee3f1214600c57f7a7df91172
          this.processEnchantOrder(this.tag); // Paper
          if (this.getItem().canBeDepleted()) {
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-index 6c725197846a3715e9e8d124635e908325d37166..366130c00b80cf03367d64ddd86f76eb40c1e997 100644
+index c4b972846200b1e3fb84c75c200122906f84a245..a53b3a3102e5b3e7860bb51f5af4faeecb0474c0 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
 @@ -9,6 +9,7 @@ import java.util.Iterator;
@@ -194,7 +194,7 @@ index bc01481ac5990ad1cfd1def5a16dd0ed2f9de8c9..5948d7f87c2f2021345d58db18ec1c99
      }
  
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/ChestBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/ChestBlockEntity.java
-index a71414397bd45ee7bcacfeef0041d80dfa25f114..f51abf1722e98d7ce9e616d84472d847e597eafb 100644
+index 9b1243d96e0694c62fc9e82e9be540bce0d2b3ad..0f734147d0cb86ff6c8a4c28733cf4cb9b7856d4 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/ChestBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/ChestBlockEntity.java
 @@ -1,5 +1,6 @@
diff --git a/patches/server/0023-Don-t-log-invalid-teams-to-console.patch b/patches/server/0022-Don-t-log-invalid-teams-to-console.patch
similarity index 91%
rename from patches/server/0023-Don-t-log-invalid-teams-to-console.patch
rename to patches/server/0022-Don-t-log-invalid-teams-to-console.patch
index 2ed6b09..a3d0e87 100644
--- a/patches/server/0023-Don-t-log-invalid-teams-to-console.patch
+++ b/patches/server/0022-Don-t-log-invalid-teams-to-console.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't log invalid teams to console
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 7976953ff2fcaa52cb2edcbeb686690e6f3c1953..652c90cb5e051cdc04a3eaf482072304d3ae89ec 100644
+index 702dbcf60ba35a3427353ea27547dab4b4c11ecc..432e9259bb0a4715eb7f30d331f33cc79b632f83 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -861,7 +861,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0024-Fixes-out-of-bounds-HangingEntity-crash-exploit.patch b/patches/server/0023-Fixes-out-of-bounds-HangingEntity-crash-exploit.patch
similarity index 92%
rename from patches/server/0024-Fixes-out-of-bounds-HangingEntity-crash-exploit.patch
rename to patches/server/0023-Fixes-out-of-bounds-HangingEntity-crash-exploit.patch
index dc99386..7ac3660 100644
--- a/patches/server/0024-Fixes-out-of-bounds-HangingEntity-crash-exploit.patch
+++ b/patches/server/0023-Fixes-out-of-bounds-HangingEntity-crash-exploit.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fixes out of bounds HangingEntity crash exploit
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/HangingEntity.java b/src/main/java/net/minecraft/world/entity/decoration/HangingEntity.java
-index 5f4c42c4ba44923cabb873bfad33abc2b1362e73..6608c98d1a517c307e16669e536dda6eb9f1e082 100644
+index f88918b7c15b72f4cb1dd313734f550432fd5858..684c7e3cf58fc3a9cd69b8bbf8c722180bfba62b 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/HangingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/HangingEntity.java
 @@ -279,6 +279,13 @@ public abstract class HangingEntity extends Entity {
diff --git a/patches/server/0025-Add-MasterBlockFireEvent.patch b/patches/server/0024-Add-MasterBlockFireEvent.patch
similarity index 100%
rename from patches/server/0025-Add-MasterBlockFireEvent.patch
rename to patches/server/0024-Add-MasterBlockFireEvent.patch
diff --git a/patches/server/0026-Add-spectator-teleport-event.patch b/patches/server/0025-Add-spectator-teleport-event.patch
similarity index 90%
rename from patches/server/0026-Add-spectator-teleport-event.patch
rename to patches/server/0025-Add-spectator-teleport-event.patch
index e3e4a39..544cd9c 100644
--- a/patches/server/0026-Add-spectator-teleport-event.patch
+++ b/patches/server/0025-Add-spectator-teleport-event.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add spectator teleport event
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6a85b44021df6226b53da478ac6f35dcfb55c3ed..cfc32007447b9eddb3cda9d870838fa330eb9368 100644
+index 6f9ec543185b6f68bb1eaa61a7ebea9d866d688f..cf147f5318cb27571b4b050b92d7df582ddccea2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1,5 +1,6 @@
@@ -15,7 +15,7 @@ index 6a85b44021df6226b53da478ac6f35dcfb55c3ed..cfc32007447b9eddb3cda9d870838fa3
  import com.google.common.collect.Lists;
  import com.google.common.primitives.Floats;
  import com.mojang.authlib.GameProfile;
-@@ -2034,6 +2035,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2019,6 +2020,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                  Entity entity = packet.getEntity(worldserver);
  
                  if (entity != null) {
diff --git a/patches/server/0027-Prevent-invalid-container-events.patch b/patches/server/0026-Prevent-invalid-container-events.patch
similarity index 91%
rename from patches/server/0027-Prevent-invalid-container-events.patch
rename to patches/server/0026-Prevent-invalid-container-events.patch
index 8ea5401..87b4e8a 100644
--- a/patches/server/0027-Prevent-invalid-container-events.patch
+++ b/patches/server/0026-Prevent-invalid-container-events.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent invalid container events
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index cfc32007447b9eddb3cda9d870838fa330eb9368..7297a195c03709028d6a9b61231279a6d8070923 100644
+index cf147f5318cb27571b4b050b92d7df582ddccea2..06fd1a549c9829c250c983861e3a02ed14c21f4f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -29,6 +29,7 @@ import java.util.function.UnaryOperator;
@@ -16,7 +16,7 @@ index cfc32007447b9eddb3cda9d870838fa330eb9368..7297a195c03709028d6a9b61231279a6
  import net.minecraft.ChatFormatting;
  import net.minecraft.SharedConstants;
  import net.minecraft.Util;
-@@ -2906,6 +2907,18 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2891,6 +2892,18 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                          return;
                      }
  
diff --git a/patches/server/0028-Disable-running-commands-in-books-by-default.patch b/patches/server/0027-Disable-running-commands-in-books-by-default.patch
similarity index 100%
rename from patches/server/0028-Disable-running-commands-in-books-by-default.patch
rename to patches/server/0027-Disable-running-commands-in-books-by-default.patch
diff --git a/patches/server/0029-Validate-block-entity-entity-tag-query-positions.patch b/patches/server/0028-Validate-block-entity-entity-tag-query-positions.patch
similarity index 95%
rename from patches/server/0029-Validate-block-entity-entity-tag-query-positions.patch
rename to patches/server/0028-Validate-block-entity-entity-tag-query-positions.patch
index d6fe075..5b69b83 100644
--- a/patches/server/0029-Validate-block-entity-entity-tag-query-positions.patch
+++ b/patches/server/0028-Validate-block-entity-entity-tag-query-positions.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Validate block entity/entity tag query positions
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 7297a195c03709028d6a9b61231279a6d8070923..031afb99994e66f10d327c482cd9fb793ede9c45 100644
+index 06fd1a549c9829c250c983861e3a02ed14c21f4f..af9af2fd22eb9ecaec86888752f177f6ed6ae0b0 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1264,7 +1264,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0030-Refuse-to-convert-legacy-messages-over-1k-characters.patch b/patches/server/0029-Refuse-to-convert-legacy-messages-over-1k-characters.patch
similarity index 100%
rename from patches/server/0030-Refuse-to-convert-legacy-messages-over-1k-characters.patch
rename to patches/server/0029-Refuse-to-convert-legacy-messages-over-1k-characters.patch
diff --git a/patches/server/0031-Fix-ClickEvents-on-Signs-bypassing-permissions.patch b/patches/server/0030-Fix-ClickEvents-on-Signs-bypassing-permissions.patch
similarity index 97%
rename from patches/server/0031-Fix-ClickEvents-on-Signs-bypassing-permissions.patch
rename to patches/server/0030-Fix-ClickEvents-on-Signs-bypassing-permissions.patch
index a5800b2..ee2cd46 100644
--- a/patches/server/0031-Fix-ClickEvents-on-Signs-bypassing-permissions.patch
+++ b/patches/server/0030-Fix-ClickEvents-on-Signs-bypassing-permissions.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix ClickEvents on Signs bypassing permissions
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
-index 6a883c185eb7ae228cb767044f7395ef1d08ab28..4765f141b54cc38cfe4b49b066fe2329274d5443 100644
+index 979a8f472f866130a3abb10f535df757eaa50c20..382350d68ec1f1e24cba3a66aa90962bda42e187 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
 @@ -8,8 +8,10 @@ import java.util.Objects;
diff --git a/patches/server/0032-Prevent-velocity-freeze.patch b/patches/server/0031-Prevent-velocity-freeze.patch
similarity index 100%
rename from patches/server/0032-Prevent-velocity-freeze.patch
rename to patches/server/0031-Prevent-velocity-freeze.patch
diff --git a/patches/server/0033-Add-configuration-option-to-disable-chat-signatures.patch b/patches/server/0032-Add-configuration-option-to-disable-chat-signatures.patch
similarity index 94%
rename from patches/server/0033-Add-configuration-option-to-disable-chat-signatures.patch
rename to patches/server/0032-Add-configuration-option-to-disable-chat-signatures.patch
index b52ef9f..23be75b 100644
--- a/patches/server/0033-Add-configuration-option-to-disable-chat-signatures.patch
+++ b/patches/server/0032-Add-configuration-option-to-disable-chat-signatures.patch
@@ -62,7 +62,7 @@ index ba12919c3f9aec34a9e64993b143ae92be5eb172..bdfa4a7f5b50e80195e79a6dd1204cb7
                      }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 031afb99994e66f10d327c482cd9fb793ede9c45..27b90469b7786eac42a743c346ea0a6576f01fbf 100644
+index af9af2fd22eb9ecaec86888752f177f6ed6ae0b0..551a353e53211ed07b3069f2a82eccb8c35823bf 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1,5 +1,6 @@
@@ -72,7 +72,7 @@ index 031afb99994e66f10d327c482cd9fb793ede9c45..27b90469b7786eac42a743c346ea0a65
  import me.totalfreedom.scissors.event.player.SpectatorTeleportEvent; // Scissors
  import com.google.common.collect.Lists;
  import com.google.common.primitives.Floats;
-@@ -2244,7 +2245,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2229,7 +2230,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
      private void handleMessageDecodeFailure(SignedMessageChain.DecodeException exception) {
          ServerGamePacketListenerImpl.LOGGER.warn("Failed to update secure chat state for {}: '{}'", this.player.getGameProfile().getName(), exception.getComponent().getString());
@@ -81,7 +81,7 @@ index 031afb99994e66f10d327c482cd9fb793ede9c45..27b90469b7786eac42a743c346ea0a65
              this.disconnect(exception.getComponent(), exception.kickCause); // Paper - kick event causes
          } else {
              this.player.sendSystemMessage(exception.getComponent().copy().withStyle(ChatFormatting.RED));
-@@ -2292,6 +2293,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2277,6 +2278,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
              Optional<LastSeenMessages> optional = this.lastSeenMessages.applyUpdate(acknowledgment);
  
              if (optional.isEmpty()) {
@@ -89,7 +89,7 @@ index 031afb99994e66f10d327c482cd9fb793ede9c45..27b90469b7786eac42a743c346ea0a65
                  ServerGamePacketListenerImpl.LOGGER.warn("Failed to validate message acknowledgements from {}", this.player.getName().getString());
                  this.disconnect(ServerGamePacketListenerImpl.CHAT_VALIDATION_FAILED, org.bukkit.event.player.PlayerKickEvent.Cause.CHAT_VALIDATION_FAILED); // Paper - kick event causes
              }
-@@ -2490,6 +2492,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2475,6 +2477,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
          synchronized (this.lastSeenMessages) {
              if (!this.lastSeenMessages.applyOffset(packet.offset())) {
@@ -97,7 +97,7 @@ index 031afb99994e66f10d327c482cd9fb793ede9c45..27b90469b7786eac42a743c346ea0a65
                  ServerGamePacketListenerImpl.LOGGER.warn("Failed to validate message acknowledgements from {}", this.player.getName().getString());
                  this.disconnect(ServerGamePacketListenerImpl.CHAT_VALIDATION_FAILED, org.bukkit.event.player.PlayerKickEvent.Cause.CHAT_VALIDATION_FAILED); // Paper - kick event causes
              }
-@@ -3468,6 +3471,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3453,6 +3456,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
      @Override
      public void handleChatSessionUpdate(ServerboundChatSessionUpdatePacket packet) {
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
diff --git a/patches/server/0034-Patch-large-selector-distance-crash.patch b/patches/server/0033-Patch-large-selector-distance-crash.patch
similarity index 100%
rename from patches/server/0034-Patch-large-selector-distance-crash.patch
rename to patches/server/0033-Patch-large-selector-distance-crash.patch
diff --git a/patches/server/0035-Patch-invalid-entity-rotation-log-spam.patch b/patches/server/0034-Patch-invalid-entity-rotation-log-spam.patch
similarity index 83%
rename from patches/server/0035-Patch-invalid-entity-rotation-log-spam.patch
rename to patches/server/0034-Patch-invalid-entity-rotation-log-spam.patch
index 7382c2e..fc9e1e8 100644
--- a/patches/server/0035-Patch-invalid-entity-rotation-log-spam.patch
+++ b/patches/server/0034-Patch-invalid-entity-rotation-log-spam.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Patch invalid entity rotation log spam
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 261c0f577cb88409a4b7dbec477eacde0a27aa79..1d18d24538d750b2a4e26b49f4625c09f1c97ff3 100644
+index ec0e041ee2ce4d763859a53221fb75a8da6dc283..760c3cdccb4361538bc0c4269ec4a7c9d6fa2db0 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4740,7 +4740,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -4732,7 +4732,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
  
      public void setXRot(float pitch) {
          if (!Float.isFinite(pitch)) {
diff --git a/patches/server/0036-Limit-sculk-catalyst-cursor-positions.patch b/patches/server/0035-Limit-sculk-catalyst-cursor-positions.patch
similarity index 100%
rename from patches/server/0036-Limit-sculk-catalyst-cursor-positions.patch
rename to patches/server/0035-Limit-sculk-catalyst-cursor-positions.patch
diff --git a/patches/server/0037-Limit-map-decorations.patch b/patches/server/0036-Limit-map-decorations.patch
similarity index 100%
rename from patches/server/0037-Limit-map-decorations.patch
rename to patches/server/0036-Limit-map-decorations.patch
diff --git a/patches/server/0038-Prevent-player-banning-using-duplicate-UUIDs.patch b/patches/server/0037-Prevent-player-banning-using-duplicate-UUIDs.patch
similarity index 88%
rename from patches/server/0038-Prevent-player-banning-using-duplicate-UUIDs.patch
rename to patches/server/0037-Prevent-player-banning-using-duplicate-UUIDs.patch
index f1cb093..21c1487 100644
--- a/patches/server/0038-Prevent-player-banning-using-duplicate-UUIDs.patch
+++ b/patches/server/0037-Prevent-player-banning-using-duplicate-UUIDs.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Prevent player banning using duplicate UUIDs
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index fb3f71f9824e522df22c50f55b4d41e70a1d1c63..9940f46aa5a416919f678c87c26307e5f8c309fb 100644
+index 6934e9dac0d69c043b73b7c46d59f2d39b37c67f..41b6df194a452cdf9504e0eab4123974a8c8ec33 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1672,7 +1672,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1667,7 +1667,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
          if (entity != null) {
              ServerLevel.LOGGER.warn("Force-added player with duplicate UUID {}", player.getUUID());
              entity.unRide();
diff --git a/patches/server/0039-Don-t-warn-on-duplicate-entity-UUIDs.patch b/patches/server/0038-Don-t-warn-on-duplicate-entity-UUIDs.patch
similarity index 100%
rename from patches/server/0039-Don-t-warn-on-duplicate-entity-UUIDs.patch
rename to patches/server/0038-Don-t-warn-on-duplicate-entity-UUIDs.patch
diff --git a/patches/server/0040-Implement-command-block-events.patch b/patches/server/0039-Implement-command-block-events.patch
similarity index 97%
rename from patches/server/0040-Implement-command-block-events.patch
rename to patches/server/0039-Implement-command-block-events.patch
index b53eef7..3a37323 100644
--- a/patches/server/0040-Implement-command-block-events.patch
+++ b/patches/server/0039-Implement-command-block-events.patch
@@ -18,7 +18,7 @@ index c99fc118013cb3d4043638e2001a8297e79ddf9c..cdaa81e1f2167b29ec01cc25e51a8400
      private final boolean trackOutput;
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 27b90469b7786eac42a743c346ea0a6576f01fbf..26bc001a8aa4bff5b5328aaa6a311cb6b5361556 100644
+index 551a353e53211ed07b3069f2a82eccb8c35823bf..51e5742e265d4d624eda119e199d6bc0f528b835 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1,6 +1,8 @@
diff --git a/patches/server/0041-Add-depth-limit-to-SNBT.patch b/patches/server/0040-Add-depth-limit-to-SNBT.patch
similarity index 100%
rename from patches/server/0041-Add-depth-limit-to-SNBT.patch
rename to patches/server/0040-Add-depth-limit-to-SNBT.patch
diff --git a/patches/server/0042-Limit-beacon-effectRange.patch b/patches/server/0041-Limit-beacon-effectRange.patch
similarity index 93%
rename from patches/server/0042-Limit-beacon-effectRange.patch
rename to patches/server/0041-Limit-beacon-effectRange.patch
index 1e75d41..110b67c 100644
--- a/patches/server/0042-Limit-beacon-effectRange.patch
+++ b/patches/server/0041-Limit-beacon-effectRange.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Limit beacon effectRange
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
-index 3ccc0a8d2091d45100198f2853c17edf62c27728..2e42fd8a7eb78183ceb38dc6dc9023eedc960ada 100644
+index bfcf9e0c342f255d285b1ef7f88d71efed653ecd..8ebee182002a360a7438938a97834f25da2695fb 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
 @@ -87,7 +87,7 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
diff --git a/patches/server/0043-Improve-validation-of-ResourceLocations.patch b/patches/server/0042-Improve-validation-of-ResourceLocations.patch
similarity index 100%
rename from patches/server/0043-Improve-validation-of-ResourceLocations.patch
rename to patches/server/0042-Improve-validation-of-ResourceLocations.patch
diff --git a/patches/server/0044-Don-t-log-on-too-many-chained-updates.patch b/patches/server/0043-Don-t-log-on-too-many-chained-updates.patch
similarity index 100%
rename from patches/server/0044-Don-t-log-on-too-many-chained-updates.patch
rename to patches/server/0043-Don-t-log-on-too-many-chained-updates.patch
diff --git a/patches/server/0045-Fix-packet-related-lag-exploits.patch b/patches/server/0044-Fix-packet-related-lag-exploits.patch
similarity index 97%
rename from patches/server/0045-Fix-packet-related-lag-exploits.patch
rename to patches/server/0044-Fix-packet-related-lag-exploits.patch
index 3d89094..432a1cc 100644
--- a/patches/server/0045-Fix-packet-related-lag-exploits.patch
+++ b/patches/server/0044-Fix-packet-related-lag-exploits.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix packet-related lag exploits
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 26bc001a8aa4bff5b5328aaa6a311cb6b5361556..d0bb06e7f320766ec27995998137d8d5715f3346 100644
+index 51e5742e265d4d624eda119e199d6bc0f528b835..1865e5219bfb1930b2d01e03c04718b64617522f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -856,7 +856,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0046-Limit-save-data-for-Bees-and-Vexes.patch b/patches/server/0045-Limit-save-data-for-Bees-and-Vexes.patch
similarity index 96%
rename from patches/server/0046-Limit-save-data-for-Bees-and-Vexes.patch
rename to patches/server/0045-Limit-save-data-for-Bees-and-Vexes.patch
index 5ab64da..5a57085 100644
--- a/patches/server/0046-Limit-save-data-for-Bees-and-Vexes.patch
+++ b/patches/server/0045-Limit-save-data-for-Bees-and-Vexes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Limit save data for Bees and Vexes
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-index a87a34b0c4c8e5d0cf079025c230b1434c919b54..7cbcbbed6ec45a32bbfe8118bf186c6580f065ca 100644
+index f9521a6e115f0c975a7885b024c99eae300b63bf..c1598d0caee40a7d73af549b31b61ee7aae77315 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
 @@ -234,8 +234,12 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
diff --git a/patches/server/0047-Mute-invalid-attributes.patch b/patches/server/0046-Mute-invalid-attributes.patch
similarity index 100%
rename from patches/server/0047-Mute-invalid-attributes.patch
rename to patches/server/0046-Mute-invalid-attributes.patch
diff --git a/patches/server/0048-Mute-invalid-Enderdragon-phases.patch b/patches/server/0047-Mute-invalid-Enderdragon-phases.patch
similarity index 96%
rename from patches/server/0048-Mute-invalid-Enderdragon-phases.patch
rename to patches/server/0047-Mute-invalid-Enderdragon-phases.patch
index 5d50163..34d06e8 100644
--- a/patches/server/0048-Mute-invalid-Enderdragon-phases.patch
+++ b/patches/server/0047-Mute-invalid-Enderdragon-phases.patch
@@ -18,7 +18,7 @@ index bca131e9c428e2cb073ae2ef517dda12f73a5dcd..b9d603c82b12299e94c31928b36c9517
          } else if (this.timeSinceCharge > 0 && this.timeSinceCharge++ >= 10) {
              this.dragon.getPhaseManager().setPhase(EnderDragonPhase.HOLDING_PATTERN);
 diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonStrafePlayerPhase.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonStrafePlayerPhase.java
-index a3456b35db4e938f91d6bc32d4d202a011bf13c4..aad0b066e4fd63195aa117c5a03f64846bf46fbd 100644
+index 9bf04f18d37356cdef1ef3a7f1e38a1801ad5713..7a8fd11245c801f1b869357c7244dc6dff8dd5de 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonStrafePlayerPhase.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonStrafePlayerPhase.java
 @@ -32,7 +32,7 @@ public class DragonStrafePlayerPhase extends AbstractDragonPhaseInstance {
diff --git a/patches/server/0049-Add-length-limit-to-note-block-sound.patch b/patches/server/0048-Add-length-limit-to-note-block-sound.patch
similarity index 91%
rename from patches/server/0049-Add-length-limit-to-note-block-sound.patch
rename to patches/server/0048-Add-length-limit-to-note-block-sound.patch
index f09f44f..faaf700 100644
--- a/patches/server/0049-Add-length-limit-to-note-block-sound.patch
+++ b/patches/server/0048-Add-length-limit-to-note-block-sound.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add length limit to note block sound
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/SkullBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SkullBlockEntity.java
-index 4430520d32024d897c93c1d9f8652ccb2c202c01..ceef1a7fd41751f553f21784217f95a210bd24d9 100644
+index 6f52256bfb668aee7fd1628c1c0c7b3434b847a6..74f1227ecf664cf0d4f62d6f9c3e65ffc07b146e 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/SkullBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/SkullBlockEntity.java
 @@ -113,7 +113,7 @@ public class SkullBlockEntity extends BlockEntity {
diff --git a/patches/server/0050-Change-version-fetcher-to-AMG.patch b/patches/server/0049-Change-version-fetcher-to-AMG.patch
similarity index 98%
rename from patches/server/0050-Change-version-fetcher-to-AMG.patch
rename to patches/server/0049-Change-version-fetcher-to-AMG.patch
index fd20c43..1206199 100644
--- a/patches/server/0050-Change-version-fetcher-to-AMG.patch
+++ b/patches/server/0049-Change-version-fetcher-to-AMG.patch
@@ -75,7 +75,7 @@ index 9d687da5bdf398bb3f6c84cdf1249a7213d09f2e..48dd50d0e443a59835e92616874c9856
          switch (distance) {
              case -1:
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 41ffc6977c8e8cbfcb9eba7db202075e2cc8e2bc..5a0ac2025bbed41c207964a28d963dccb41a623e 100644
+index 058819b39f0e2ba248e0a0c834f462a89263442b..f5363e289cdb0b0d71ff6d902acf5ee603ddcf98 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -315,7 +315,7 @@ public class Main {
diff --git a/patches/server/0012-Block-server-side-chunkbans.patch b/patches/skip/0012-Block-server-side-chunkbans.patch
similarity index 100%
rename from patches/server/0012-Block-server-side-chunkbans.patch
rename to patches/skip/0012-Block-server-side-chunkbans.patch