diff --git a/patches/server/0011-Adventure.patch b/patches/server/0011-Adventure.patch
index 73a8f6696..7f5458fe9 100644
--- a/patches/server/0011-Adventure.patch
+++ b/patches/server/0011-Adventure.patch
@@ -1312,7 +1312,7 @@ index 89c718e5b975a83b07a114b2b2c6fe31c75cb580..d1efa7b3fb2b22bd77fd01ffd137ddc9
          // CraftBukkit end
          this.chatVisibility = packet.getChatVisibility();
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 401520c47e63c3d2055e320daaeb1e74b1f627e1..da9f4b3337b49597c17b50964656457cd629a0b7 100644
+index 80b3757f9326ce8fb77384501e8f10a64a8442a2..9e8c2c7a5df76a4b14b2d368f5c61c2b138656d9 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -161,6 +161,8 @@ import org.apache.logging.log4j.LogManager;
@@ -2247,7 +2247,7 @@ index cf69a45f038c2b8336010f5fe277313fd0513b5b..eb99e0c2462a2d1ab4508a5c3f1580b6
      public net.minecraft.world.item.enchantment.Enchantment getHandle() {
          return this.target;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index f13410c3376c7c5b666c803666ba23a40fbea8a0..a527e4e04babfaf6f324e4aa3b93a86009664166 100644
+index a9f02b8246c27936b6260fc4e9c83c474ef85fd1..b80b834fc35201746f5bba079aff6d95874f8f57 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -189,6 +189,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -2884,10 +2884,10 @@ index 6a64fbb8b4937f39d5fdc2e2cbec26c83c74c486..7d6b5fdb00a5c1614849735634262a36
      public String getTitle() {
          return CraftChatMessage.fromComponent(this.container.getTitle());
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index e3c49a85e24340ecc84225bac8f79492801dc48c..4b038b7f4176dc1a1a47d7694d95ce0e4ec38a2d 100644
+index ddcd4f2f1442d9e1b4d04c88f0f96841c4d5650d..69af359e0160480b77886ca35d8f8f3135f06455 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-@@ -340,4 +340,17 @@ public final class CraftItemFactory implements ItemFactory {
+@@ -344,4 +344,17 @@ public final class CraftItemFactory implements ItemFactory {
      public Material updateMaterial(ItemMeta meta, Material material) throws IllegalArgumentException {
          return ((CraftMetaItem) meta).updateMaterial(material);
      }
diff --git a/patches/server/0149-Implement-ensureServerConversions-API.patch b/patches/server/0149-Implement-ensureServerConversions-API.patch
index 193f6ef80..94b99fef7 100644
--- a/patches/server/0149-Implement-ensureServerConversions-API.patch
+++ b/patches/server/0149-Implement-ensureServerConversions-API.patch
@@ -7,10 +7,10 @@ This will take a Bukkit ItemStack and run it through any conversions a server pr
 to ensure it meets latest minecraft expectations.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index 4b038b7f4176dc1a1a47d7694d95ce0e4ec38a2d..10c09dc9228b1eec784a508c6c0e7a229aab7924 100644
+index 69af359e0160480b77886ca35d8f8f3135f06455..73da393b26a7afd766b23716da454b0b68c26d5b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-@@ -352,5 +352,11 @@ public final class CraftItemFactory implements ItemFactory {
+@@ -356,5 +356,11 @@ public final class CraftItemFactory implements ItemFactory {
      public net.kyori.adventure.text.@org.jetbrains.annotations.NotNull Component displayName(@org.jetbrains.annotations.NotNull ItemStack itemStack) {
          return io.papermc.paper.adventure.PaperAdventure.asAdventure(CraftItemStack.asNMSCopy(itemStack).getDisplayName());
      }
diff --git a/patches/server/0150-Implement-getI18NDisplayName.patch b/patches/server/0150-Implement-getI18NDisplayName.patch
index 06cb04702..faa80f60e 100644
--- a/patches/server/0150-Implement-getI18NDisplayName.patch
+++ b/patches/server/0150-Implement-getI18NDisplayName.patch
@@ -8,10 +8,10 @@ Currently the server only supports the English language. To override this,
 You must replace the language file embedded in the server jar.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index 10c09dc9228b1eec784a508c6c0e7a229aab7924..8f5d71463616e519c2e183af1c2909fd55a3f93a 100644
+index 73da393b26a7afd766b23716da454b0b68c26d5b..c50d3cee3dfebb62ad30f8d4efe23b5c7c9f2b57 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-@@ -358,5 +358,18 @@ public final class CraftItemFactory implements ItemFactory {
+@@ -362,5 +362,18 @@ public final class CraftItemFactory implements ItemFactory {
      public ItemStack ensureServerConversions(ItemStack item) {
          return CraftItemStack.asCraftMirror(CraftItemStack.asNMSCopy(item));
      }
diff --git a/patches/server/0236-Don-t-call-getItemMeta-on-hasItemMeta.patch b/patches/server/0236-Don-t-call-getItemMeta-on-hasItemMeta.patch
index 0366b007b..6327eec23 100644
--- a/patches/server/0236-Don-t-call-getItemMeta-on-hasItemMeta.patch
+++ b/patches/server/0236-Don-t-call-getItemMeta-on-hasItemMeta.patch
@@ -11,10 +11,10 @@ Returns true if getDamage() == 0 or has damage tag or other tag is set.
 Check the `ItemMetaTest#testTaggedButNotMeta` method to see how this method behaves.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 4b43e6a1b628e2060d1095dab892efd9d1dfc485..e9fa60755da0bc358020266ff4e450e1b31da595 100644
+index 967555b6a3ef833ca75215391b20744ab6f04359..14da2997b5fff4434b1fe8d5a1b3109dde143740 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-@@ -576,7 +576,7 @@ public final class CraftItemStack extends ItemStack {
+@@ -580,7 +580,7 @@ public final class CraftItemStack extends ItemStack {
  
      @Override
      public boolean hasItemMeta() {
diff --git a/patches/server/0520-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0520-Create-HoverEvent-from-ItemStack-Entity.patch
index fb9f275ac..3a415bc68 100644
--- a/patches/server/0520-Create-HoverEvent-from-ItemStack-Entity.patch
+++ b/patches/server/0520-Create-HoverEvent-from-ItemStack-Entity.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Create HoverEvent from ItemStack Entity
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index 8f5d71463616e519c2e183af1c2909fd55a3f93a..1a8ff7339c58a4fffb051a090a7b8c34cb346a61 100644
+index c50d3cee3dfebb62ad30f8d4efe23b5c7c9f2b57..fcbd28fdeab4815c005c7dca547aee246f52fd26 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-@@ -371,5 +371,40 @@ public final class CraftItemFactory implements ItemFactory {
+@@ -375,5 +375,40 @@ public final class CraftItemFactory implements ItemFactory {
  
          return nms != null ? net.minecraft.locale.Language.getInstance().getOrDefault(nms.getItem().getDescriptionId()) : null;
      }
diff --git a/patches/server/0817-Fix-CraftCriteria-defaults-map.patch b/patches/server/0816-Fix-CraftCriteria-defaults-map.patch
similarity index 100%
rename from patches/server/0817-Fix-CraftCriteria-defaults-map.patch
rename to patches/server/0816-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0816-Register-spawn-egg-meta-for-1.17-mobs.patch b/patches/server/0816-Register-spawn-egg-meta-for-1.17-mobs.patch
deleted file mode 100644
index 88becb81d..000000000
--- a/patches/server/0816-Register-spawn-egg-meta-for-1.17-mobs.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: chickeneer <emcchickeneer@gmail.com>
-Date: Sat, 2 Oct 2021 10:14:04 -0500
-Subject: [PATCH] Register spawn egg meta for 1.17 mobs
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index 1a8ff7339c58a4fffb051a090a7b8c34cb346a61..aa7fd5c80712fecca1110341a234f60e8607b809 100644
---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-@@ -122,6 +122,7 @@ public final class CraftItemFactory implements ItemFactory {
-         case YELLOW_BANNER:
-         case YELLOW_WALL_BANNER:
-             return meta instanceof CraftMetaBanner ? meta : new CraftMetaBanner(meta);
-+        case AXOLOTL_SPAWN_EGG: // Paper
-         case BAT_SPAWN_EGG:
-         case BEE_SPAWN_EGG:
-         case BLAZE_SPAWN_EGG:
-@@ -140,6 +141,8 @@ public final class CraftItemFactory implements ItemFactory {
-         case EVOKER_SPAWN_EGG:
-         case FOX_SPAWN_EGG:
-         case GHAST_SPAWN_EGG:
-+        case GLOW_SQUID_SPAWN_EGG: // Paper
-+        case GOAT_SPAWN_EGG: // Paper
-         case GUARDIAN_SPAWN_EGG:
-         case HOGLIN_SPAWN_EGG:
-         case HORSE_SPAWN_EGG:
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index e9fa60755da0bc358020266ff4e450e1b31da595..f6a820e2456c66b8db4140984e0306bea3ee4e9b 100644
---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-@@ -349,6 +349,7 @@ public final class CraftItemStack extends ItemStack {
-             case YELLOW_BANNER:
-             case YELLOW_WALL_BANNER:
-                 return new CraftMetaBanner(item.getTag());
-+            case AXOLOTL_SPAWN_EGG: // Paper
-             case BAT_SPAWN_EGG:
-             case BEE_SPAWN_EGG:
-             case BLAZE_SPAWN_EGG:
-@@ -367,6 +368,8 @@ public final class CraftItemStack extends ItemStack {
-             case EVOKER_SPAWN_EGG:
-             case FOX_SPAWN_EGG:
-             case GHAST_SPAWN_EGG:
-+            case GLOW_SQUID_SPAWN_EGG: // Paper
-+            case GOAT_SPAWN_EGG: // Paper
-             case GUARDIAN_SPAWN_EGG:
-             case HOGLIN_SPAWN_EGG:
-             case HORSE_SPAWN_EGG:
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java
-index 31d649ad03fb80374155a3a276066a4c668d02f4..c485f2cb13cdaae2afdd047c55ae0c7d3fab3d49 100644
---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java
-@@ -112,6 +112,7 @@ public class CraftMetaSpawnEgg extends CraftMetaItem implements SpawnEggMeta {
-     @Override
-     boolean applicableTo(Material type) {
-         switch (type) {
-+            case AXOLOTL_SPAWN_EGG: // Paper
-             case BAT_SPAWN_EGG:
-             case BEE_SPAWN_EGG:
-             case BLAZE_SPAWN_EGG:
-@@ -130,6 +131,8 @@ public class CraftMetaSpawnEgg extends CraftMetaItem implements SpawnEggMeta {
-             case EVOKER_SPAWN_EGG:
-             case FOX_SPAWN_EGG:
-             case GHAST_SPAWN_EGG:
-+            case GLOW_SQUID_SPAWN_EGG: // Paper
-+            case GOAT_SPAWN_EGG: // Paper
-             case GUARDIAN_SPAWN_EGG:
-             case HOGLIN_SPAWN_EGG:
-             case HORSE_SPAWN_EGG:
diff --git a/patches/server/0818-Add-back-EntityPortalExitEvent.patch b/patches/server/0817-Add-back-EntityPortalExitEvent.patch
similarity index 100%
rename from patches/server/0818-Add-back-EntityPortalExitEvent.patch
rename to patches/server/0817-Add-back-EntityPortalExitEvent.patch
diff --git a/patches/server/0819-Fix-upstreams-block-state-factories.patch b/patches/server/0818-Fix-upstreams-block-state-factories.patch
similarity index 100%
rename from patches/server/0819-Fix-upstreams-block-state-factories.patch
rename to patches/server/0818-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0820-Add-config-option-for-logging-player-ip-addresses.patch b/patches/server/0819-Add-config-option-for-logging-player-ip-addresses.patch
similarity index 97%
rename from patches/server/0820-Add-config-option-for-logging-player-ip-addresses.patch
rename to patches/server/0819-Add-config-option-for-logging-player-ip-addresses.patch
index 5a1474c00..dfc59ef97 100644
--- a/patches/server/0820-Add-config-option-for-logging-player-ip-addresses.patch
+++ b/patches/server/0819-Add-config-option-for-logging-player-ip-addresses.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add config option for logging player ip addresses
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index f421e6a2e43e0a673dbb8a9a2b4331387e523e02..e143e4514789f707938a67fab4d313d5c55dc870 100644
+index b3f4ac2ce6f515e406d2f31b1d2429729c9e2b60..0277627e97b51e20470ccf578cee48470e06a34b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -486,6 +486,11 @@ public class PaperConfig {
@@ -81,7 +81,7 @@ index 01fee879c946b6640da34d5890d686f0152437dc..494ca8fa8c742d4eac9fb11878d3b317
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index ad9fb50791779a5fe7d22268b71bd10d9c9ff3f0..ea1f7c8bf220982a086d4ae1663ae445b8c6cebd 100644
+index 99aa8f2ba2f10578f37de621d1a5a8e222cd70b1..eaa005c1c9b4386bcdbe1d6eb28c3eca7635066c 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -237,7 +237,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0821-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0820-Add-methods-to-find-targets-for-lightning-strikes.patch
similarity index 96%
rename from patches/server/0821-Add-methods-to-find-targets-for-lightning-strikes.patch
rename to patches/server/0820-Add-methods-to-find-targets-for-lightning-strikes.patch
index 00b003bd6..19fded74b 100644
--- a/patches/server/0821-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/server/0820-Add-methods-to-find-targets-for-lightning-strikes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add methods to find targets for lightning strikes
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 6911fbbd3a0b2aed7257e31433fc01fe8fade5ec..96ccf894519fc892e35fbd13ab97fe289236caca 100644
+index 08c6ea9f19fa9218af089ed3bd2dcda1e83591ed..710a1064cec9c7ec93e1258b0786e74ab9af0c12 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -956,6 +956,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0822-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/server/0821-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
similarity index 100%
rename from patches/server/0822-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
rename to patches/server/0821-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
diff --git a/patches/server/0823-Add-root-admin-user-detection.patch b/patches/server/0822-Add-root-admin-user-detection.patch
similarity index 100%
rename from patches/server/0823-Add-root-admin-user-detection.patch
rename to patches/server/0822-Add-root-admin-user-detection.patch
diff --git a/patches/server/0824-Always-allow-item-changing-in-Fireball.patch b/patches/server/0823-Always-allow-item-changing-in-Fireball.patch
similarity index 100%
rename from patches/server/0824-Always-allow-item-changing-in-Fireball.patch
rename to patches/server/0823-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0825-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0824-Fix-merchant-inventory-not-closing-on-entity-removal.patch
similarity index 93%
rename from patches/server/0825-Fix-merchant-inventory-not-closing-on-entity-removal.patch
rename to patches/server/0824-Fix-merchant-inventory-not-closing-on-entity-removal.patch
index 322591b9c..f2ef36d72 100644
--- a/patches/server/0825-Fix-merchant-inventory-not-closing-on-entity-removal.patch
+++ b/patches/server/0824-Fix-merchant-inventory-not-closing-on-entity-removal.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix merchant inventory not closing on entity removal
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 96ccf894519fc892e35fbd13ab97fe289236caca..a62abcb2e05198001516cf2402dc7ead09761905 100644
+index 710a1064cec9c7ec93e1258b0786e74ab9af0c12..d572a0883938cd117d11a2bb0ee4e0d5b5e65361 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2421,6 +2421,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0826-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch b/patches/server/0825-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
similarity index 100%
rename from patches/server/0826-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
rename to patches/server/0825-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
diff --git a/patches/server/0827-Use-correct-LevelStem-registry-when-loading-default-.patch b/patches/server/0826-Use-correct-LevelStem-registry-when-loading-default-.patch
similarity index 100%
rename from patches/server/0827-Use-correct-LevelStem-registry-when-loading-default-.patch
rename to patches/server/0826-Use-correct-LevelStem-registry-when-loading-default-.patch
diff --git a/patches/server/0828-Get-entity-default-attributes.patch b/patches/server/0827-Get-entity-default-attributes.patch
similarity index 100%
rename from patches/server/0828-Get-entity-default-attributes.patch
rename to patches/server/0827-Get-entity-default-attributes.patch
diff --git a/patches/server/0829-Left-handed-API.patch b/patches/server/0828-Left-handed-API.patch
similarity index 100%
rename from patches/server/0829-Left-handed-API.patch
rename to patches/server/0828-Left-handed-API.patch
diff --git a/patches/server/0830-Add-advancement-display-API.patch b/patches/server/0829-Add-advancement-display-API.patch
similarity index 100%
rename from patches/server/0830-Add-advancement-display-API.patch
rename to patches/server/0829-Add-advancement-display-API.patch
diff --git a/patches/server/0831-Add-ItemFactory-getMonsterEgg-API.patch b/patches/server/0830-Add-ItemFactory-getMonsterEgg-API.patch
similarity index 89%
rename from patches/server/0831-Add-ItemFactory-getMonsterEgg-API.patch
rename to patches/server/0830-Add-ItemFactory-getMonsterEgg-API.patch
index ac53f4fe5..a7a82e297 100644
--- a/patches/server/0831-Add-ItemFactory-getMonsterEgg-API.patch
+++ b/patches/server/0830-Add-ItemFactory-getMonsterEgg-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add ItemFactory#getMonsterEgg API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index aa7fd5c80712fecca1110341a234f60e8607b809..a30bb0a1dde5b5a7980331914a5f852e6bcd19dc 100644
+index fcbd28fdeab4815c005c7dca547aee246f52fd26..1c0ecd8bb3156a8e1718e84455dd9af667adaf7a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-@@ -409,5 +409,17 @@ public final class CraftItemFactory implements ItemFactory {
+@@ -410,5 +410,17 @@ public final class CraftItemFactory implements ItemFactory {
              entity.getUniqueId().toString(),
              new net.md_5.bungee.api.chat.TextComponent(customName));
      }
diff --git a/patches/server/0832-Add-critical-damage-API.patch b/patches/server/0831-Add-critical-damage-API.patch
similarity index 98%
rename from patches/server/0832-Add-critical-damage-API.patch
rename to patches/server/0831-Add-critical-damage-API.patch
index 1fb38728d..549054d68 100644
--- a/patches/server/0832-Add-critical-damage-API.patch
+++ b/patches/server/0831-Add-critical-damage-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add critical damage API
 
 
 diff --git a/src/main/java/net/minecraft/world/damagesource/DamageSource.java b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
-index 80d19af2ad423bd3de0e039c5bb8f97af536aaa9..57bf7dba266b4df7b36bab2d58a609a1ce8948ef 100644
+index 80d19af2ad423bd3de0e039c5bb8f97af536aaa9..a828cad27fcd39f8bfbaefa97052a2a3b6650ee7 100644
 --- a/src/main/java/net/minecraft/world/damagesource/DamageSource.java
 +++ b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
 @@ -64,6 +64,19 @@ public class DamageSource {
@@ -105,7 +105,7 @@ index 6636845ea044c3810e1880aad8b679134cd33668..52e4948fd1657fa1776ac6b0142e8c21
          int k = entity.getRemainingFireTicks();
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 2b2654ec04e8abca9db09d6257edf11099bb0d9b..771a00ae7f467660b0c39ffeee05281e114df378 100644
+index 2b2654ec04e8abca9db09d6257edf11099bb0d9b..c0b46ff81994e037e734b75afadcce372c2ddd7f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -964,7 +964,7 @@ public class CraftEventFactory {
diff --git a/patches/server/0833-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0832-Check-requirement-before-suggesting-root-nodes.patch
similarity index 100%
rename from patches/server/0833-Check-requirement-before-suggesting-root-nodes.patch
rename to patches/server/0832-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0834-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0833-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
similarity index 91%
rename from patches/server/0834-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
rename to patches/server/0833-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index 61da4b889..4fc21d4b2 100644
--- a/patches/server/0834-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/server/0833-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Don't respond to ServerboundCommandSuggestionPacket when
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 5d7c47b0a302f7db95a0b2bb811c5656c6b02beb..7bf03b78a26b6a697a8d10e8832703421f96b2bb 100644
+index 71b4d5f7bbccf56cb519333ad2751d6a953f2c68..029c21d9416520469548293f9a2ec0c056507d05 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -796,6 +796,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0835-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0834-don-t-attempt-to-teleport-dead-entities.patch
similarity index 100%
rename from patches/server/0835-don-t-attempt-to-teleport-dead-entities.patch
rename to patches/server/0834-don-t-attempt-to-teleport-dead-entities.patch
diff --git a/work/Bukkit b/work/Bukkit
index 58c2d3c7b..9b45fa2fa 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 58c2d3c7b845e2db9476e5e76e4b7f7d376f05e8
+Subproject commit 9b45fa2fab08e654962ed0ca5f85f6d22bea40c2
diff --git a/work/CraftBukkit b/work/CraftBukkit
index fd50041d3..cef1fda37 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit fd50041d32495444c229c63a6adf691c93b135e1
+Subproject commit cef1fda37b872df7f6c2f401c669a78fd2de5d70