diff --git a/build.gradle.kts b/build.gradle.kts index 01a67d859923..f787dbc00ee2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -133,7 +133,7 @@ allprojects { tasks.collectAtsFromPatches { // Uncomment while updating for a new Minecraft version - extraPatchDir.set(layout.projectDirectory.dir("patches/unapplied/server")) + // extraPatchDir.set(layout.projectDirectory.dir("patches/unapplied/server")) } // Uncomment while updating for a new Minecraft version diff --git a/patches/server/0928-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch b/patches/server/0928-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch deleted file mode 100644 index 0a5199281578..000000000000 --- a/patches/server/0928-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nassim Jahnke -Date: Sat, 18 Mar 2023 18:51:33 +0100 -Subject: [PATCH] Fix chiseled bookshelf and jukebox setItem with air - - -diff --git a/src/main/java/net/minecraft/world/level/block/entity/ChiseledBookShelfBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/ChiseledBookShelfBlockEntity.java -index 15ef84c39a1a77cd9e33efee670bd0967c52657c..dda68d157d4da6e379567b25810051b652ec122f 100644 ---- a/src/main/java/net/minecraft/world/level/block/entity/ChiseledBookShelfBlockEntity.java -+++ b/src/main/java/net/minecraft/world/level/block/entity/ChiseledBookShelfBlockEntity.java -@@ -149,7 +149,7 @@ public class ChiseledBookShelfBlockEntity extends BlockEntity implements Contain - - @Override - public void setItem(int slot, ItemStack stack) { -- if (stack.is(ItemTags.BOOKSHELF_BOOKS)) { -+ if (stack.isEmpty() || stack.is(ItemTags.BOOKSHELF_BOOKS)) { // Paper - this.items.set(slot, stack); - if (level != null) this.updateState(slot); // CraftBukkit - SPIGOT-7381: check for null world - } else if (stack.isEmpty()) { -diff --git a/src/main/java/net/minecraft/world/level/block/entity/JukeboxBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/JukeboxBlockEntity.java -index 2c1edc6dfc7fd1a8af977919ce31913365cf3ddd..6c9b3fb1a015320da207c6b724cc18fb6b80267a 100644 ---- a/src/main/java/net/minecraft/world/level/block/entity/JukeboxBlockEntity.java -+++ b/src/main/java/net/minecraft/world/level/block/entity/JukeboxBlockEntity.java -@@ -183,6 +183,12 @@ public class JukeboxBlockEntity extends BlockEntity implements Clearable, Contai - - @Override - public void setItem(int slot, ItemStack stack) { -+ // Paper start -+ if (stack.isEmpty()) { -+ this.removeItem(slot, 0); -+ return; -+ } -+ // Paper end - if (stack.is(ItemTags.MUSIC_DISCS) && this.level != null) { - this.items.set(slot, stack); - this.setHasRecordBlockState((Entity) null, true); diff --git a/patches/server/0929-Optimize-Hoppers.patch b/patches/server/0928-Optimize-Hoppers.patch similarity index 100% rename from patches/server/0929-Optimize-Hoppers.patch rename to patches/server/0928-Optimize-Hoppers.patch diff --git a/patches/server/0930-Fix-beehives-generating-from-using-bonemeal.patch b/patches/server/0929-Fix-beehives-generating-from-using-bonemeal.patch similarity index 100% rename from patches/server/0930-Fix-beehives-generating-from-using-bonemeal.patch rename to patches/server/0929-Fix-beehives-generating-from-using-bonemeal.patch diff --git a/patches/server/0931-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0930-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch similarity index 100% rename from patches/server/0931-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch rename to patches/server/0930-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch diff --git a/patches/server/0932-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0931-Treat-sequence-violations-like-they-should-be.patch similarity index 100% rename from patches/server/0932-Treat-sequence-violations-like-they-should-be.patch rename to patches/server/0931-Treat-sequence-violations-like-they-should-be.patch diff --git a/patches/server/0933-remove-duplicate-animate-packet-for-records.patch b/patches/server/0932-remove-duplicate-animate-packet-for-records.patch similarity index 100% rename from patches/server/0933-remove-duplicate-animate-packet-for-records.patch rename to patches/server/0932-remove-duplicate-animate-packet-for-records.patch diff --git a/patches/server/0934-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0933-Prevent-causing-expired-keys-from-impacting-new-join.patch similarity index 100% rename from patches/server/0934-Prevent-causing-expired-keys-from-impacting-new-join.patch rename to patches/server/0933-Prevent-causing-expired-keys-from-impacting-new-join.patch diff --git a/patches/server/0935-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0934-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch similarity index 100% rename from patches/server/0935-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch rename to patches/server/0934-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch diff --git a/patches/server/0936-Use-array-for-gamerule-storage.patch b/patches/server/0935-Use-array-for-gamerule-storage.patch similarity index 100% rename from patches/server/0936-Use-array-for-gamerule-storage.patch rename to patches/server/0935-Use-array-for-gamerule-storage.patch diff --git a/patches/server/0937-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0936-Fix-a-couple-of-upstream-bed-issues.patch similarity index 100% rename from patches/server/0937-Fix-a-couple-of-upstream-bed-issues.patch rename to patches/server/0936-Fix-a-couple-of-upstream-bed-issues.patch diff --git a/patches/server/0938-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0937-Fix-demo-flag-not-enabling-demo-mode.patch similarity index 100% rename from patches/server/0938-Fix-demo-flag-not-enabling-demo-mode.patch rename to patches/server/0937-Fix-demo-flag-not-enabling-demo-mode.patch diff --git a/patches/server/0939-Add-Mob-Experience-reward-API.patch b/patches/server/0938-Add-Mob-Experience-reward-API.patch similarity index 100% rename from patches/server/0939-Add-Mob-Experience-reward-API.patch rename to patches/server/0938-Add-Mob-Experience-reward-API.patch diff --git a/patches/server/0940-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0939-Break-redstone-on-top-of-trap-doors-early.patch similarity index 100% rename from patches/server/0940-Break-redstone-on-top-of-trap-doors-early.patch rename to patches/server/0939-Break-redstone-on-top-of-trap-doors-early.patch diff --git a/patches/server/0941-Fix-DamageCause-for-Falling-Blocks.patch b/patches/server/0940-Fix-DamageCause-for-Falling-Blocks.patch similarity index 100% rename from patches/server/0941-Fix-DamageCause-for-Falling-Blocks.patch rename to patches/server/0940-Fix-DamageCause-for-Falling-Blocks.patch diff --git a/patches/server/0942-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0941-Avoid-Lazy-Initialization-for-Enum-Fields.patch similarity index 100% rename from patches/server/0942-Avoid-Lazy-Initialization-for-Enum-Fields.patch rename to patches/server/0941-Avoid-Lazy-Initialization-for-Enum-Fields.patch diff --git a/patches/server/0943-More-accurate-isInOpenWater-impl.patch b/patches/server/0942-More-accurate-isInOpenWater-impl.patch similarity index 100% rename from patches/server/0943-More-accurate-isInOpenWater-impl.patch rename to patches/server/0942-More-accurate-isInOpenWater-impl.patch diff --git a/patches/server/0944-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/server/0943-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch similarity index 100% rename from patches/server/0944-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch rename to patches/server/0943-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch diff --git a/patches/server/0945-Optimise-recalcBlockCounts-for-empty-sections.patch b/patches/server/0944-Optimise-recalcBlockCounts-for-empty-sections.patch similarity index 100% rename from patches/server/0945-Optimise-recalcBlockCounts-for-empty-sections.patch rename to patches/server/0944-Optimise-recalcBlockCounts-for-empty-sections.patch diff --git a/patches/server/0946-Expand-PlayerItemMendEvent.patch b/patches/server/0945-Expand-PlayerItemMendEvent.patch similarity index 100% rename from patches/server/0946-Expand-PlayerItemMendEvent.patch rename to patches/server/0945-Expand-PlayerItemMendEvent.patch diff --git a/patches/server/0947-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0946-Refresh-ProjectileSource-for-projectiles.patch similarity index 100% rename from patches/server/0947-Refresh-ProjectileSource-for-projectiles.patch rename to patches/server/0946-Refresh-ProjectileSource-for-projectiles.patch diff --git a/patches/server/0948-Add-transient-modifier-API.patch b/patches/server/0947-Add-transient-modifier-API.patch similarity index 100% rename from patches/server/0948-Add-transient-modifier-API.patch rename to patches/server/0947-Add-transient-modifier-API.patch diff --git a/patches/server/0949-Fix-block-place-logic.patch b/patches/server/0948-Fix-block-place-logic.patch similarity index 100% rename from patches/server/0949-Fix-block-place-logic.patch rename to patches/server/0948-Fix-block-place-logic.patch diff --git a/patches/server/0950-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0949-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch similarity index 100% rename from patches/server/0950-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch rename to patches/server/0949-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch diff --git a/patches/server/0951-Ignore-inline-definitions-of-trim-material-pattern.patch b/patches/server/0950-Ignore-inline-definitions-of-trim-material-pattern.patch similarity index 100% rename from patches/server/0951-Ignore-inline-definitions-of-trim-material-pattern.patch rename to patches/server/0950-Ignore-inline-definitions-of-trim-material-pattern.patch diff --git a/patches/server/0952-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0951-Call-BlockGrowEvent-for-missing-blocks.patch similarity index 100% rename from patches/server/0952-Call-BlockGrowEvent-for-missing-blocks.patch rename to patches/server/0951-Call-BlockGrowEvent-for-missing-blocks.patch diff --git a/patches/server/0953-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0952-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch similarity index 100% rename from patches/server/0953-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch rename to patches/server/0952-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch diff --git a/patches/server/0954-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0953-fix-MapLike-spam-for-missing-key-selector.patch similarity index 100% rename from patches/server/0954-fix-MapLike-spam-for-missing-key-selector.patch rename to patches/server/0953-fix-MapLike-spam-for-missing-key-selector.patch diff --git a/patches/server/0955-Fix-sniffer-removeExploredLocation.patch b/patches/server/0954-Fix-sniffer-removeExploredLocation.patch similarity index 100% rename from patches/server/0955-Fix-sniffer-removeExploredLocation.patch rename to patches/server/0954-Fix-sniffer-removeExploredLocation.patch diff --git a/patches/server/0956-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0955-Add-method-to-remove-all-active-potion-effects.patch similarity index 100% rename from patches/server/0956-Add-method-to-remove-all-active-potion-effects.patch rename to patches/server/0955-Add-method-to-remove-all-active-potion-effects.patch diff --git a/patches/server/0957-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch b/patches/server/0956-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch similarity index 100% rename from patches/server/0957-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch rename to patches/server/0956-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch diff --git a/patches/server/0958-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0957-Fix-incorrect-crafting-result-amount-for-fireworks.patch similarity index 100% rename from patches/server/0958-Fix-incorrect-crafting-result-amount-for-fireworks.patch rename to patches/server/0957-Fix-incorrect-crafting-result-amount-for-fireworks.patch diff --git a/patches/server/0959-Properly-Cancel-Usable-Items.patch b/patches/server/0958-Properly-Cancel-Usable-Items.patch similarity index 100% rename from patches/server/0959-Properly-Cancel-Usable-Items.patch rename to patches/server/0958-Properly-Cancel-Usable-Items.patch diff --git a/patches/server/0960-Add-event-for-player-editing-sign.patch b/patches/server/0959-Add-event-for-player-editing-sign.patch similarity index 100% rename from patches/server/0960-Add-event-for-player-editing-sign.patch rename to patches/server/0959-Add-event-for-player-editing-sign.patch diff --git a/patches/server/0961-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0960-Only-tick-item-frames-if-players-can-see-it.patch similarity index 100% rename from patches/server/0961-Only-tick-item-frames-if-players-can-see-it.patch rename to patches/server/0960-Only-tick-item-frames-if-players-can-see-it.patch diff --git a/patches/server/0962-Improve-command-function-perm-level-checks.patch b/patches/server/0961-Improve-command-function-perm-level-checks.patch similarity index 100% rename from patches/server/0962-Improve-command-function-perm-level-checks.patch rename to patches/server/0961-Improve-command-function-perm-level-checks.patch diff --git a/patches/server/0963-Add-option-to-disable-block-updates.patch b/patches/server/0962-Add-option-to-disable-block-updates.patch similarity index 100% rename from patches/server/0963-Add-option-to-disable-block-updates.patch rename to patches/server/0962-Add-option-to-disable-block-updates.patch diff --git a/patches/server/0964-Call-missing-BlockDispenseEvent.patch b/patches/server/0963-Call-missing-BlockDispenseEvent.patch similarity index 100% rename from patches/server/0964-Call-missing-BlockDispenseEvent.patch rename to patches/server/0963-Call-missing-BlockDispenseEvent.patch diff --git a/patches/server/0965-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0964-Don-t-load-chunks-for-supporting-block-checks.patch similarity index 100% rename from patches/server/0965-Don-t-load-chunks-for-supporting-block-checks.patch rename to patches/server/0964-Don-t-load-chunks-for-supporting-block-checks.patch diff --git a/patches/server/0966-Optimize-player-lookups-for-beacons.patch b/patches/server/0965-Optimize-player-lookups-for-beacons.patch similarity index 100% rename from patches/server/0966-Optimize-player-lookups-for-beacons.patch rename to patches/server/0965-Optimize-player-lookups-for-beacons.patch diff --git a/patches/server/0967-Add-Sign-getInteractableSideFor.patch b/patches/server/0966-Add-Sign-getInteractableSideFor.patch similarity index 100% rename from patches/server/0967-Add-Sign-getInteractableSideFor.patch rename to patches/server/0966-Add-Sign-getInteractableSideFor.patch diff --git a/patches/server/0968-Array-backed-synched-entity-data.patch b/patches/server/0967-Array-backed-synched-entity-data.patch similarity index 100% rename from patches/server/0968-Array-backed-synched-entity-data.patch rename to patches/server/0967-Array-backed-synched-entity-data.patch diff --git a/patches/server/0969-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0968-fix-item-meta-for-tadpole-buckets.patch similarity index 100% rename from patches/server/0969-fix-item-meta-for-tadpole-buckets.patch rename to patches/server/0968-fix-item-meta-for-tadpole-buckets.patch diff --git a/patches/server/0970-Suppress-Item-Meta-Validation-Checks.patch b/patches/server/0969-Suppress-Item-Meta-Validation-Checks.patch similarity index 100% rename from patches/server/0970-Suppress-Item-Meta-Validation-Checks.patch rename to patches/server/0969-Suppress-Item-Meta-Validation-Checks.patch diff --git a/patches/server/0971-Fix-BanList-API.patch b/patches/server/0970-Fix-BanList-API.patch similarity index 100% rename from patches/server/0971-Fix-BanList-API.patch rename to patches/server/0970-Fix-BanList-API.patch diff --git a/patches/server/0972-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0971-Determine-lava-and-water-fluid-explosion-resistance-.patch similarity index 100% rename from patches/server/0972-Determine-lava-and-water-fluid-explosion-resistance-.patch rename to patches/server/0971-Determine-lava-and-water-fluid-explosion-resistance-.patch diff --git a/patches/server/0973-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0972-Fix-possible-NPE-on-painting-creation.patch similarity index 100% rename from patches/server/0973-Fix-possible-NPE-on-painting-creation.patch rename to patches/server/0972-Fix-possible-NPE-on-painting-creation.patch diff --git a/patches/server/0974-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0973-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch similarity index 100% rename from patches/server/0974-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch rename to patches/server/0973-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch diff --git a/patches/server/0975-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0974-ExperienceOrb-should-call-EntitySpawnEvent.patch similarity index 100% rename from patches/server/0975-ExperienceOrb-should-call-EntitySpawnEvent.patch rename to patches/server/0974-ExperienceOrb-should-call-EntitySpawnEvent.patch diff --git a/patches/server/0976-Don-t-tick-signs.patch b/patches/server/0975-Don-t-tick-signs.patch similarity index 100% rename from patches/server/0976-Don-t-tick-signs.patch rename to patches/server/0975-Don-t-tick-signs.patch diff --git a/patches/server/0977-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0976-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch similarity index 100% rename from patches/server/0977-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch rename to patches/server/0976-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch diff --git a/patches/server/0978-Add-whitelist-events.patch b/patches/server/0977-Add-whitelist-events.patch similarity index 100% rename from patches/server/0978-Add-whitelist-events.patch rename to patches/server/0977-Add-whitelist-events.patch diff --git a/patches/server/0979-Implement-PlayerFailMoveEvent.patch b/patches/server/0978-Implement-PlayerFailMoveEvent.patch similarity index 100% rename from patches/server/0979-Implement-PlayerFailMoveEvent.patch rename to patches/server/0978-Implement-PlayerFailMoveEvent.patch diff --git a/patches/server/0980-Folia-scheduler-and-owned-region-API.patch b/patches/server/0979-Folia-scheduler-and-owned-region-API.patch similarity index 100% rename from patches/server/0980-Folia-scheduler-and-owned-region-API.patch rename to patches/server/0979-Folia-scheduler-and-owned-region-API.patch diff --git a/patches/server/0981-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0980-Only-erase-allay-memory-on-non-item-targets.patch similarity index 100% rename from patches/server/0981-Only-erase-allay-memory-on-non-item-targets.patch rename to patches/server/0980-Only-erase-allay-memory-on-non-item-targets.patch diff --git a/patches/server/0982-API-for-updating-recipes-on-clients.patch b/patches/server/0981-API-for-updating-recipes-on-clients.patch similarity index 100% rename from patches/server/0982-API-for-updating-recipes-on-clients.patch rename to patches/server/0981-API-for-updating-recipes-on-clients.patch diff --git a/patches/server/0983-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0982-Fix-rotation-when-spawning-display-entities.patch similarity index 100% rename from patches/server/0983-Fix-rotation-when-spawning-display-entities.patch rename to patches/server/0982-Fix-rotation-when-spawning-display-entities.patch diff --git a/patches/server/0984-Only-capture-actual-tree-growth.patch b/patches/server/0983-Only-capture-actual-tree-growth.patch similarity index 100% rename from patches/server/0984-Only-capture-actual-tree-growth.patch rename to patches/server/0983-Only-capture-actual-tree-growth.patch diff --git a/patches/server/0985-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0984-Use-correct-source-for-mushroom-block-spread-event.patch similarity index 100% rename from patches/server/0985-Use-correct-source-for-mushroom-block-spread-event.patch rename to patches/server/0984-Use-correct-source-for-mushroom-block-spread-event.patch diff --git a/patches/server/0986-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0985-Respect-randomizeData-on-more-entities-when-spawning.patch similarity index 100% rename from patches/server/0986-Respect-randomizeData-on-more-entities-when-spawning.patch rename to patches/server/0985-Respect-randomizeData-on-more-entities-when-spawning.patch diff --git a/patches/server/0987-Use-correct-seed-on-api-world-load.patch b/patches/server/0986-Use-correct-seed-on-api-world-load.patch similarity index 100% rename from patches/server/0987-Use-correct-seed-on-api-world-load.patch rename to patches/server/0986-Use-correct-seed-on-api-world-load.patch diff --git a/patches/server/0988-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0987-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch similarity index 100% rename from patches/server/0988-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch rename to patches/server/0987-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch diff --git a/patches/server/0989-Cache-map-ids-on-item-frames.patch b/patches/server/0988-Cache-map-ids-on-item-frames.patch similarity index 100% rename from patches/server/0989-Cache-map-ids-on-item-frames.patch rename to patches/server/0988-Cache-map-ids-on-item-frames.patch diff --git a/patches/server/0990-Fix-custom-statistic-criteria-creation.patch b/patches/server/0989-Fix-custom-statistic-criteria-creation.patch similarity index 100% rename from patches/server/0990-Fix-custom-statistic-criteria-creation.patch rename to patches/server/0989-Fix-custom-statistic-criteria-creation.patch diff --git a/patches/server/0991-Bandaid-fix-for-Effect.patch b/patches/server/0990-Bandaid-fix-for-Effect.patch similarity index 100% rename from patches/server/0991-Bandaid-fix-for-Effect.patch rename to patches/server/0990-Bandaid-fix-for-Effect.patch diff --git a/patches/server/0992-SculkCatalyst-bloom-API.patch b/patches/server/0991-SculkCatalyst-bloom-API.patch similarity index 100% rename from patches/server/0992-SculkCatalyst-bloom-API.patch rename to patches/server/0991-SculkCatalyst-bloom-API.patch diff --git a/patches/server/0993-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0992-API-for-an-entity-s-scoreboard-name.patch similarity index 100% rename from patches/server/0993-API-for-an-entity-s-scoreboard-name.patch rename to patches/server/0992-API-for-an-entity-s-scoreboard-name.patch diff --git a/patches/server/0994-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/0993-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch similarity index 100% rename from patches/server/0994-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch rename to patches/server/0993-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch diff --git a/patches/server/0995-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0994-Deprecate-and-replace-methods-with-old-StructureType.patch similarity index 100% rename from patches/server/0995-Deprecate-and-replace-methods-with-old-StructureType.patch rename to patches/server/0994-Deprecate-and-replace-methods-with-old-StructureType.patch diff --git a/patches/server/0996-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0995-Don-t-tab-complete-namespaced-commands-if-send-names.patch similarity index 100% rename from patches/server/0996-Don-t-tab-complete-namespaced-commands-if-send-names.patch rename to patches/server/0995-Don-t-tab-complete-namespaced-commands-if-send-names.patch diff --git a/patches/server/0997-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0996-Properly-handle-BlockBreakEvent-isDropItems.patch similarity index 100% rename from patches/server/0997-Properly-handle-BlockBreakEvent-isDropItems.patch rename to patches/server/0996-Properly-handle-BlockBreakEvent-isDropItems.patch diff --git a/patches/server/0998-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0997-Fire-entity-death-event-for-ender-dragon.patch similarity index 100% rename from patches/server/0998-Fire-entity-death-event-for-ender-dragon.patch rename to patches/server/0997-Fire-entity-death-event-for-ender-dragon.patch diff --git a/patches/server/0999-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0998-Configurable-entity-tracking-range-by-Y-coordinate.patch similarity index 100% rename from patches/server/0999-Configurable-entity-tracking-range-by-Y-coordinate.patch rename to patches/server/0998-Configurable-entity-tracking-range-by-Y-coordinate.patch diff --git a/patches/server/1000-Add-Listing-API-for-Player.patch b/patches/server/0999-Add-Listing-API-for-Player.patch similarity index 100% rename from patches/server/1000-Add-Listing-API-for-Player.patch rename to patches/server/0999-Add-Listing-API-for-Player.patch diff --git a/patches/server/1001-Configurable-Region-Compression-Format.patch b/patches/server/1000-Configurable-Region-Compression-Format.patch similarity index 100% rename from patches/server/1001-Configurable-Region-Compression-Format.patch rename to patches/server/1000-Configurable-Region-Compression-Format.patch diff --git a/patches/server/1002-Expose-clicked-BlockFace-during-BlockDamageEvent.patch b/patches/server/1001-Expose-clicked-BlockFace-during-BlockDamageEvent.patch similarity index 100% rename from patches/server/1002-Expose-clicked-BlockFace-during-BlockDamageEvent.patch rename to patches/server/1001-Expose-clicked-BlockFace-during-BlockDamageEvent.patch diff --git a/patches/server/1003-Fix-NPE-on-Boat-getStatus.patch b/patches/server/1002-Fix-NPE-on-Boat-getStatus.patch similarity index 100% rename from patches/server/1003-Fix-NPE-on-Boat-getStatus.patch rename to patches/server/1002-Fix-NPE-on-Boat-getStatus.patch diff --git a/patches/server/1004-Expand-Pose-API.patch b/patches/server/1003-Expand-Pose-API.patch similarity index 100% rename from patches/server/1004-Expand-Pose-API.patch rename to patches/server/1003-Expand-Pose-API.patch diff --git a/patches/server/1005-More-DragonBattle-API.patch b/patches/server/1004-More-DragonBattle-API.patch similarity index 100% rename from patches/server/1005-More-DragonBattle-API.patch rename to patches/server/1004-More-DragonBattle-API.patch diff --git a/patches/server/1006-Deep-clone-unhandled-nbt-tags.patch b/patches/server/1005-Deep-clone-unhandled-nbt-tags.patch similarity index 100% rename from patches/server/1006-Deep-clone-unhandled-nbt-tags.patch rename to patches/server/1005-Deep-clone-unhandled-nbt-tags.patch diff --git a/patches/server/1007-Add-PlayerPickItemEvent.patch b/patches/server/1006-Add-PlayerPickItemEvent.patch similarity index 100% rename from patches/server/1007-Add-PlayerPickItemEvent.patch rename to patches/server/1006-Add-PlayerPickItemEvent.patch diff --git a/patches/server/1008-Improve-performance-of-mass-crafts.patch b/patches/server/1007-Improve-performance-of-mass-crafts.patch similarity index 100% rename from patches/server/1008-Improve-performance-of-mass-crafts.patch rename to patches/server/1007-Improve-performance-of-mass-crafts.patch diff --git a/patches/server/1009-Allow-trident-custom-damage.patch b/patches/server/1008-Allow-trident-custom-damage.patch similarity index 100% rename from patches/server/1009-Allow-trident-custom-damage.patch rename to patches/server/1008-Allow-trident-custom-damage.patch diff --git a/patches/server/1010-Expose-hand-during-BlockCanBuildEvent.patch b/patches/server/1009-Expose-hand-during-BlockCanBuildEvent.patch similarity index 100% rename from patches/server/1010-Expose-hand-during-BlockCanBuildEvent.patch rename to patches/server/1009-Expose-hand-during-BlockCanBuildEvent.patch diff --git a/patches/server/1011-Optimize-nearest-structure-border-iteration.patch b/patches/server/1010-Optimize-nearest-structure-border-iteration.patch similarity index 100% rename from patches/server/1011-Optimize-nearest-structure-border-iteration.patch rename to patches/server/1010-Optimize-nearest-structure-border-iteration.patch diff --git a/patches/server/1012-Implement-OfflinePlayer-isConnected.patch b/patches/server/1011-Implement-OfflinePlayer-isConnected.patch similarity index 100% rename from patches/server/1012-Implement-OfflinePlayer-isConnected.patch rename to patches/server/1011-Implement-OfflinePlayer-isConnected.patch diff --git a/patches/server/1013-Fix-inventory-desync.patch b/patches/server/1012-Fix-inventory-desync.patch similarity index 100% rename from patches/server/1013-Fix-inventory-desync.patch rename to patches/server/1012-Fix-inventory-desync.patch diff --git a/patches/server/1014-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/1013-Add-titleOverride-to-InventoryOpenEvent.patch similarity index 100% rename from patches/server/1014-Add-titleOverride-to-InventoryOpenEvent.patch rename to patches/server/1013-Add-titleOverride-to-InventoryOpenEvent.patch diff --git a/patches/server/1015-Configure-sniffer-egg-hatch-time.patch b/patches/server/1014-Configure-sniffer-egg-hatch-time.patch similarity index 100% rename from patches/server/1015-Configure-sniffer-egg-hatch-time.patch rename to patches/server/1014-Configure-sniffer-egg-hatch-time.patch diff --git a/patches/server/1016-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/1015-Do-crystal-portal-proximity-check-before-entity-look.patch similarity index 100% rename from patches/server/1016-Do-crystal-portal-proximity-check-before-entity-look.patch rename to patches/server/1015-Do-crystal-portal-proximity-check-before-entity-look.patch diff --git a/patches/server/1017-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/1016-Skip-POI-finding-if-stuck-in-vehicle.patch similarity index 100% rename from patches/server/1017-Skip-POI-finding-if-stuck-in-vehicle.patch rename to patches/server/1016-Skip-POI-finding-if-stuck-in-vehicle.patch diff --git a/patches/server/1018-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/1017-Add-slot-sanity-checks-in-container-clicks.patch similarity index 100% rename from patches/server/1018-Add-slot-sanity-checks-in-container-clicks.patch rename to patches/server/1017-Add-slot-sanity-checks-in-container-clicks.patch diff --git a/patches/server/1019-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/1018-Call-BlockRedstoneEvents-for-lecterns.patch similarity index 100% rename from patches/server/1019-Call-BlockRedstoneEvents-for-lecterns.patch rename to patches/server/1018-Call-BlockRedstoneEvents-for-lecterns.patch diff --git a/patches/server/1020-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/1019-Allow-proper-checking-of-empty-item-stacks.patch similarity index 100% rename from patches/server/1020-Allow-proper-checking-of-empty-item-stacks.patch rename to patches/server/1019-Allow-proper-checking-of-empty-item-stacks.patch diff --git a/patches/server/1021-Fix-silent-equipment-change-for-mobs.patch b/patches/server/1020-Fix-silent-equipment-change-for-mobs.patch similarity index 100% rename from patches/server/1021-Fix-silent-equipment-change-for-mobs.patch rename to patches/server/1020-Fix-silent-equipment-change-for-mobs.patch diff --git a/patches/server/1022-Fix-spigot-s-Forced-Stats.patch b/patches/server/1021-Fix-spigot-s-Forced-Stats.patch similarity index 100% rename from patches/server/1022-Fix-spigot-s-Forced-Stats.patch rename to patches/server/1021-Fix-spigot-s-Forced-Stats.patch diff --git a/patches/server/1023-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/1022-Add-missing-InventoryHolders-to-inventories.patch similarity index 100% rename from patches/server/1023-Add-missing-InventoryHolders-to-inventories.patch rename to patches/server/1022-Add-missing-InventoryHolders-to-inventories.patch diff --git a/patches/server/1024-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/1023-Do-not-read-tile-entities-in-chunks-that-are-positio.patch similarity index 100% rename from patches/server/1024-Do-not-read-tile-entities-in-chunks-that-are-positio.patch rename to patches/server/1023-Do-not-read-tile-entities-in-chunks-that-are-positio.patch diff --git a/patches/server/1025-Actually-optimise-explosions.patch b/patches/server/1024-Actually-optimise-explosions.patch similarity index 100% rename from patches/server/1025-Actually-optimise-explosions.patch rename to patches/server/1024-Actually-optimise-explosions.patch diff --git a/patches/server/1026-Add-missing-logs-for-log-ips-config-option.patch b/patches/server/1025-Add-missing-logs-for-log-ips-config-option.patch similarity index 100% rename from patches/server/1026-Add-missing-logs-for-log-ips-config-option.patch rename to patches/server/1025-Add-missing-logs-for-log-ips-config-option.patch diff --git a/patches/server/1027-Remove-Spigot-Bug-Fix-for-MC-109346.patch b/patches/server/1026-Remove-Spigot-Bug-Fix-for-MC-109346.patch similarity index 100% rename from patches/server/1027-Remove-Spigot-Bug-Fix-for-MC-109346.patch rename to patches/server/1026-Remove-Spigot-Bug-Fix-for-MC-109346.patch diff --git a/patches/server/1028-Fix-SuspiciousStewMeta.patch b/patches/server/1027-Fix-SuspiciousStewMeta.patch similarity index 100% rename from patches/server/1028-Fix-SuspiciousStewMeta.patch rename to patches/server/1027-Fix-SuspiciousStewMeta.patch