From d5216d858879eb467e6f878c7a620ecf72286f7b Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Wed, 8 Jun 2022 07:36:43 -0700
Subject: [PATCH] Add back Fix NotePlayEvent patch
---
.../0834-Fix-NotePlayEvent.patch} | 22 +++++++++++--------
....patch => 0835-Freeze-Tick-Lock-API.patch} | 0
...lphin-API.patch => 0836-Dolphin-API.patch} | 0
...h => 0837-More-PotionEffectType-API.patch} | 0
...for-StructureTemplate.Pallete-cache.patch} | 0
...command-sender-which-forwards-feedb.patch} | 0
...0840-Add-config-for-stronghold-seed.patch} | 0
...h => 0841-Implement-regenerateChunk.patch} | 0
...tions-thrown-during-chat-processing.patch} | 0
...lled-powdered-snow-bucket-placement.patch} | 0
...ate-calls-to-CraftServer-getSpawnLi.patch} | 0
...gs.patch => 0845-Add-GameEvent-tags.patch} | 0
...ks-fairly-for-worlds-while-waiting-.patch} | 0
...847-Replace-ticket-level-propagator.patch} | 0
...tch => 0848-Furnace-RecipesUsed-API.patch} | 0
...gurable-sculk-sensor-listener-range.patch} | 0
...d-missing-block-data-mins-and-maxes.patch} | 0
...fault-CustomSpawners-in-custom-worl.patch} | 0
...-worldlist-before-initing-the-world.patch} | 0
... => 0853-Fix-Entity-Position-Desync.patch} | 0
...s.patch => 0854-Custom-Potion-Mixes.patch} | 0
...0855-Fix-Fluid-tags-isTagged-method.patch} | 0
...56-Force-close-world-loading-screen.patch} | 0
...857-Fix-falling-block-spawn-methods.patch} | 0
...Expose-furnace-minecart-push-values.patch} | 0
...ojectileHitEvent-for-piercing-arrow.patch} | 0
... 0860-Fix-save-problems-on-shutdown.patch} | 0
...I.patch => 0861-More-Projectile-API.patch} | 0
...le-movement-from-players-while-tele.patch} | 0
...0863-Implement-getComputedBiome-API.patch} | 0
...> 0864-Make-some-itemstacks-nonnull.patch} | 0
...alid-GameProfiles-on-skull-blocks-i.patch} | 0
...866-Implement-enchantWithLevels-API.patch} | 0
...h => 0867-Fix-saving-in-unloadWorld.patch} | 0
...h => 0868-Buffer-OOB-setBlock-calls.patch} | 0
... 0869-Add-TameableDeathMessageEvent.patch} | 0
...a-for-EntityChangeBlockEvent-when-s.patch} | 0
...bles-running-when-mob-loot-gamerule.patch} | 0
...ssenger-world-matches-ridden-entity.patch} | 0
...rd-against-invalid-entity-positions.patch} | 0
...s.patch => 0874-cache-resource-keys.patch} | 0
...ange-the-podium-for-the-EnderDragon.patch} | 0
...erriding-a-block-entity-during-worl.patch} | 0
...eGrowEvent-species-for-RED_MUSHROOM.patch} | 0
...t-tile-entity-copies-loading-chunks.patch} | 0
...ead-of-display-name-in-PlayerList-g.patch} | 0
...s-not-spawning-outside-slime-chunks.patch} | 0
...-ServerLevel-for-gamerule-callbacks.patch} | 0
...ing-amount-to-PlayerItemDamageEvent.patch} | 0
...> 0883-WorldCreator-keepSpawnLoaded.patch} | 0
...-NPE-for-BlockDataMeta-getBlockData.patch} | 0
...destroyed-trigger-in-the-correct-pl.patch} | 0
...Event-and-CollarColorable-interface.patch} | 0
...CauldronLevelChange-on-initial-fill.patch} | 0
...snow-cauldrons-not-turning-to-water.patch} | 0
...atch => 0889-Sign-cleanup-filtering.patch} | 0
...> 0890-Add-PlayerStopUsingItemEvent.patch} | 0
...91-FallingBlock-auto-expire-setting.patch} | 0
...rs.patch => 0892-Don-t-tick-markers.patch} | 0
...-not-accept-invalid-client-settings.patch} | 0
...0894-Add-support-for-Proxy-Protocol.patch} | 0
...x-OfflinePlayer-getBedSpawnLocation.patch} | 0
...tory-for-smokers-and-blast-furnaces.patch} | 0
... 0897-Sanitize-Sent-BlockEntity-NBT.patch} | 0
...ntity-loading-causing-async-lookups.patch} | 0
...-selector-resolving-in-books-by-def.patch} | 0
...-on-world-create-while-being-ticked.patch} | 0
67 files changed, 13 insertions(+), 9 deletions(-)
rename patches/{removed/1.19/0842-Fix-NotePlayEvent.patch => server/0834-Fix-NotePlayEvent.patch} (67%)
rename patches/server/{0834-Freeze-Tick-Lock-API.patch => 0835-Freeze-Tick-Lock-API.patch} (100%)
rename patches/server/{0835-Dolphin-API.patch => 0836-Dolphin-API.patch} (100%)
rename patches/server/{0836-More-PotionEffectType-API.patch => 0837-More-PotionEffectType-API.patch} (100%)
rename patches/server/{0837-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch => 0838-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch} (100%)
rename patches/server/{0838-API-for-creating-command-sender-which-forwards-feedb.patch => 0839-API-for-creating-command-sender-which-forwards-feedb.patch} (100%)
rename patches/server/{0839-Add-config-for-stronghold-seed.patch => 0840-Add-config-for-stronghold-seed.patch} (100%)
rename patches/server/{0840-Implement-regenerateChunk.patch => 0841-Implement-regenerateChunk.patch} (100%)
rename patches/server/{0841-Log-exceptions-thrown-during-chat-processing.patch => 0842-Log-exceptions-thrown-during-chat-processing.patch} (100%)
rename patches/server/{0842-Fix-cancelled-powdered-snow-bucket-placement.patch => 0843-Fix-cancelled-powdered-snow-bucket-placement.patch} (100%)
rename patches/server/{0843-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch => 0844-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch} (100%)
rename patches/server/{0844-Add-GameEvent-tags.patch => 0845-Add-GameEvent-tags.patch} (100%)
rename patches/server/{0845-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch => 0846-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch} (100%)
rename patches/server/{0846-Replace-ticket-level-propagator.patch => 0847-Replace-ticket-level-propagator.patch} (100%)
rename patches/server/{0847-Furnace-RecipesUsed-API.patch => 0848-Furnace-RecipesUsed-API.patch} (100%)
rename patches/server/{0848-Configurable-sculk-sensor-listener-range.patch => 0849-Configurable-sculk-sensor-listener-range.patch} (100%)
rename patches/server/{0849-Add-missing-block-data-mins-and-maxes.patch => 0850-Add-missing-block-data-mins-and-maxes.patch} (100%)
rename patches/server/{0850-Option-to-have-default-CustomSpawners-in-custom-worl.patch => 0851-Option-to-have-default-CustomSpawners-in-custom-worl.patch} (100%)
rename patches/server/{0851-Put-world-into-worldlist-before-initing-the-world.patch => 0852-Put-world-into-worldlist-before-initing-the-world.patch} (100%)
rename patches/server/{0852-Fix-Entity-Position-Desync.patch => 0853-Fix-Entity-Position-Desync.patch} (100%)
rename patches/server/{0853-Custom-Potion-Mixes.patch => 0854-Custom-Potion-Mixes.patch} (100%)
rename patches/server/{0854-Fix-Fluid-tags-isTagged-method.patch => 0855-Fix-Fluid-tags-isTagged-method.patch} (100%)
rename patches/server/{0855-Force-close-world-loading-screen.patch => 0856-Force-close-world-loading-screen.patch} (100%)
rename patches/server/{0856-Fix-falling-block-spawn-methods.patch => 0857-Fix-falling-block-spawn-methods.patch} (100%)
rename patches/server/{0857-Expose-furnace-minecart-push-values.patch => 0858-Expose-furnace-minecart-push-values.patch} (100%)
rename patches/server/{0858-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch => 0859-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch} (100%)
rename patches/server/{0859-Fix-save-problems-on-shutdown.patch => 0860-Fix-save-problems-on-shutdown.patch} (100%)
rename patches/server/{0860-More-Projectile-API.patch => 0861-More-Projectile-API.patch} (100%)
rename patches/server/{0861-Don-t-allow-vehicle-movement-from-players-while-tele.patch => 0862-Don-t-allow-vehicle-movement-from-players-while-tele.patch} (100%)
rename patches/server/{0862-Implement-getComputedBiome-API.patch => 0863-Implement-getComputedBiome-API.patch} (100%)
rename patches/server/{0863-Make-some-itemstacks-nonnull.patch => 0864-Make-some-itemstacks-nonnull.patch} (100%)
rename patches/server/{0864-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch => 0865-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch} (100%)
rename patches/server/{0865-Implement-enchantWithLevels-API.patch => 0866-Implement-enchantWithLevels-API.patch} (100%)
rename patches/server/{0866-Fix-saving-in-unloadWorld.patch => 0867-Fix-saving-in-unloadWorld.patch} (100%)
rename patches/server/{0867-Buffer-OOB-setBlock-calls.patch => 0868-Buffer-OOB-setBlock-calls.patch} (100%)
rename patches/server/{0868-Add-TameableDeathMessageEvent.patch => 0869-Add-TameableDeathMessageEvent.patch} (100%)
rename patches/server/{0869-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch => 0870-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch} (100%)
rename patches/server/{0870-fix-player-loottables-running-when-mob-loot-gamerule.patch => 0871-fix-player-loottables-running-when-mob-loot-gamerule.patch} (100%)
rename patches/server/{0871-Ensure-entity-passenger-world-matches-ridden-entity.patch => 0872-Ensure-entity-passenger-world-matches-ridden-entity.patch} (100%)
rename patches/server/{0872-Guard-against-invalid-entity-positions.patch => 0873-Guard-against-invalid-entity-positions.patch} (100%)
rename patches/server/{0873-cache-resource-keys.patch => 0874-cache-resource-keys.patch} (100%)
rename patches/server/{0874-Allow-to-change-the-podium-for-the-EnderDragon.patch => 0875-Allow-to-change-the-podium-for-the-EnderDragon.patch} (100%)
rename patches/server/{0875-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch => 0876-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch} (100%)
rename patches/server/{0876-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch => 0877-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch} (100%)
rename patches/server/{0877-Prevent-tile-entity-copies-loading-chunks.patch => 0878-Prevent-tile-entity-copies-loading-chunks.patch} (100%)
rename patches/server/{0878-Use-username-instead-of-display-name-in-PlayerList-g.patch => 0879-Use-username-instead-of-display-name-in-PlayerList-g.patch} (100%)
rename patches/server/{0879-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch => 0880-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch} (100%)
rename patches/server/{0880-Pass-ServerLevel-for-gamerule-callbacks.patch => 0881-Pass-ServerLevel-for-gamerule-callbacks.patch} (100%)
rename patches/server/{0881-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch => 0882-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch} (100%)
rename patches/server/{0882-WorldCreator-keepSpawnLoaded.patch => 0883-WorldCreator-keepSpawnLoaded.patch} (100%)
rename patches/server/{0883-Fix-NPE-for-BlockDataMeta-getBlockData.patch => 0884-Fix-NPE-for-BlockDataMeta-getBlockData.patch} (100%)
rename patches/server/{0884-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch => 0885-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch} (100%)
rename patches/server/{0885-Add-EntityDyeEvent-and-CollarColorable-interface.patch => 0886-Add-EntityDyeEvent-and-CollarColorable-interface.patch} (100%)
rename patches/server/{0886-Fire-CauldronLevelChange-on-initial-fill.patch => 0887-Fire-CauldronLevelChange-on-initial-fill.patch} (100%)
rename patches/server/{0887-fix-powder-snow-cauldrons-not-turning-to-water.patch => 0888-fix-powder-snow-cauldrons-not-turning-to-water.patch} (100%)
rename patches/server/{0888-Sign-cleanup-filtering.patch => 0889-Sign-cleanup-filtering.patch} (100%)
rename patches/server/{0889-Add-PlayerStopUsingItemEvent.patch => 0890-Add-PlayerStopUsingItemEvent.patch} (100%)
rename patches/server/{0890-FallingBlock-auto-expire-setting.patch => 0891-FallingBlock-auto-expire-setting.patch} (100%)
rename patches/server/{0891-Don-t-tick-markers.patch => 0892-Don-t-tick-markers.patch} (100%)
rename patches/server/{0892-Do-not-accept-invalid-client-settings.patch => 0893-Do-not-accept-invalid-client-settings.patch} (100%)
rename patches/server/{0893-Add-support-for-Proxy-Protocol.patch => 0894-Add-support-for-Proxy-Protocol.patch} (100%)
rename patches/server/{0894-Fix-OfflinePlayer-getBedSpawnLocation.patch => 0895-Fix-OfflinePlayer-getBedSpawnLocation.patch} (100%)
rename patches/server/{0895-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch => 0896-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch} (100%)
rename patches/server/{0896-Sanitize-Sent-BlockEntity-NBT.patch => 0897-Sanitize-Sent-BlockEntity-NBT.patch} (100%)
rename patches/server/{0897-Prevent-entity-loading-causing-async-lookups.patch => 0898-Prevent-entity-loading-causing-async-lookups.patch} (100%)
rename patches/server/{0898-Disable-component-selector-resolving-in-books-by-def.patch => 0899-Disable-component-selector-resolving-in-books-by-def.patch} (100%)
rename patches/server/{0899-Throw-exception-on-world-create-while-being-ticked.patch => 0900-Throw-exception-on-world-create-while-being-ticked.patch} (100%)
diff --git a/patches/removed/1.19/0842-Fix-NotePlayEvent.patch b/patches/server/0834-Fix-NotePlayEvent.patch
similarity index 67%
rename from patches/removed/1.19/0842-Fix-NotePlayEvent.patch
rename to patches/server/0834-Fix-NotePlayEvent.patch
index 3d7aa4d732..83040e523a 100644
--- a/patches/removed/1.19/0842-Fix-NotePlayEvent.patch
+++ b/patches/server/0834-Fix-NotePlayEvent.patch
@@ -5,23 +5,27 @@ Subject: [PATCH] Fix NotePlayEvent
diff --git a/src/main/java/net/minecraft/world/level/block/NoteBlock.java b/src/main/java/net/minecraft/world/level/block/NoteBlock.java
-index 16e11e31077f160198e0b04abdfeabb97ed20c6f..0e106bcc1f882877a5e444a2621466c6e4696d42 100644
+index 293affa9821bcf7c6f4c2d57818958ae2765c5de..c14eb4f7decdbcd6176d3bff95d595a947d4ec95 100644
--- a/src/main/java/net/minecraft/world/level/block/NoteBlock.java
+++ b/src/main/java/net/minecraft/world/level/block/NoteBlock.java
-@@ -60,10 +60,9 @@ public class NoteBlock extends Block {
- private void playNote(Level world, BlockPos blockposition, BlockState data) { // CraftBukkit
+@@ -63,11 +63,12 @@ public class NoteBlock extends Block {
+ private void playNote(@Nullable Entity entity, Level world, BlockPos blockposition, BlockState data) { // CraftBukkit
if (world.getBlockState(blockposition.above()).isAir()) {
// CraftBukkit start
- org.bukkit.event.block.NotePlayEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callNotePlayEvent(world, blockposition, data.getValue(NoteBlock.INSTRUMENT), data.getValue(NoteBlock.NOTE));
-- if (!event.isCancelled()) {
-+ // Paper start - move NotePlayEvent call to fix instrument/note changes
- world.blockEvent(blockposition, this, 0, 0);
+- if (event.isCancelled()) {
+- return;
- }
-+ // Paper end
++ // org.bukkit.event.block.NotePlayEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callNotePlayEvent(world, blockposition, data.getValue(NoteBlock.INSTRUMENT), data.getValue(NoteBlock.NOTE)); // Paper - move event into block event handler
++ // if (event.isCancelled()) {
++ // return;
++ // }
// CraftBukkit end
++ // Paper - TODO any way to cancel the game event?
+ world.blockEvent(blockposition, this, 0, 0);
+ world.gameEvent(entity, GameEvent.NOTE_BLOCK_PLAY, blockposition);
}
-
-@@ -92,10 +91,14 @@ public class NoteBlock extends Block {
+@@ -97,10 +98,14 @@ public class NoteBlock extends Block {
@Override
public boolean triggerEvent(BlockState state, Level world, BlockPos pos, int type, int data) {
diff --git a/patches/server/0834-Freeze-Tick-Lock-API.patch b/patches/server/0835-Freeze-Tick-Lock-API.patch
similarity index 100%
rename from patches/server/0834-Freeze-Tick-Lock-API.patch
rename to patches/server/0835-Freeze-Tick-Lock-API.patch
diff --git a/patches/server/0835-Dolphin-API.patch b/patches/server/0836-Dolphin-API.patch
similarity index 100%
rename from patches/server/0835-Dolphin-API.patch
rename to patches/server/0836-Dolphin-API.patch
diff --git a/patches/server/0836-More-PotionEffectType-API.patch b/patches/server/0837-More-PotionEffectType-API.patch
similarity index 100%
rename from patches/server/0836-More-PotionEffectType-API.patch
rename to patches/server/0837-More-PotionEffectType-API.patch
diff --git a/patches/server/0837-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0838-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
similarity index 100%
rename from patches/server/0837-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
rename to patches/server/0838-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0838-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0839-API-for-creating-command-sender-which-forwards-feedb.patch
similarity index 100%
rename from patches/server/0838-API-for-creating-command-sender-which-forwards-feedb.patch
rename to patches/server/0839-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/server/0839-Add-config-for-stronghold-seed.patch b/patches/server/0840-Add-config-for-stronghold-seed.patch
similarity index 100%
rename from patches/server/0839-Add-config-for-stronghold-seed.patch
rename to patches/server/0840-Add-config-for-stronghold-seed.patch
diff --git a/patches/server/0840-Implement-regenerateChunk.patch b/patches/server/0841-Implement-regenerateChunk.patch
similarity index 100%
rename from patches/server/0840-Implement-regenerateChunk.patch
rename to patches/server/0841-Implement-regenerateChunk.patch
diff --git a/patches/server/0841-Log-exceptions-thrown-during-chat-processing.patch b/patches/server/0842-Log-exceptions-thrown-during-chat-processing.patch
similarity index 100%
rename from patches/server/0841-Log-exceptions-thrown-during-chat-processing.patch
rename to patches/server/0842-Log-exceptions-thrown-during-chat-processing.patch
diff --git a/patches/server/0842-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0843-Fix-cancelled-powdered-snow-bucket-placement.patch
similarity index 100%
rename from patches/server/0842-Fix-cancelled-powdered-snow-bucket-placement.patch
rename to patches/server/0843-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0843-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0844-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
similarity index 100%
rename from patches/server/0843-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
rename to patches/server/0844-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0844-Add-GameEvent-tags.patch b/patches/server/0845-Add-GameEvent-tags.patch
similarity index 100%
rename from patches/server/0844-Add-GameEvent-tags.patch
rename to patches/server/0845-Add-GameEvent-tags.patch
diff --git a/patches/server/0845-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0846-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
similarity index 100%
rename from patches/server/0845-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
rename to patches/server/0846-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0846-Replace-ticket-level-propagator.patch b/patches/server/0847-Replace-ticket-level-propagator.patch
similarity index 100%
rename from patches/server/0846-Replace-ticket-level-propagator.patch
rename to patches/server/0847-Replace-ticket-level-propagator.patch
diff --git a/patches/server/0847-Furnace-RecipesUsed-API.patch b/patches/server/0848-Furnace-RecipesUsed-API.patch
similarity index 100%
rename from patches/server/0847-Furnace-RecipesUsed-API.patch
rename to patches/server/0848-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0848-Configurable-sculk-sensor-listener-range.patch b/patches/server/0849-Configurable-sculk-sensor-listener-range.patch
similarity index 100%
rename from patches/server/0848-Configurable-sculk-sensor-listener-range.patch
rename to patches/server/0849-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0849-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0850-Add-missing-block-data-mins-and-maxes.patch
similarity index 100%
rename from patches/server/0849-Add-missing-block-data-mins-and-maxes.patch
rename to patches/server/0850-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0850-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0851-Option-to-have-default-CustomSpawners-in-custom-worl.patch
similarity index 100%
rename from patches/server/0850-Option-to-have-default-CustomSpawners-in-custom-worl.patch
rename to patches/server/0851-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0851-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0852-Put-world-into-worldlist-before-initing-the-world.patch
similarity index 100%
rename from patches/server/0851-Put-world-into-worldlist-before-initing-the-world.patch
rename to patches/server/0852-Put-world-into-worldlist-before-initing-the-world.patch
diff --git a/patches/server/0852-Fix-Entity-Position-Desync.patch b/patches/server/0853-Fix-Entity-Position-Desync.patch
similarity index 100%
rename from patches/server/0852-Fix-Entity-Position-Desync.patch
rename to patches/server/0853-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0853-Custom-Potion-Mixes.patch b/patches/server/0854-Custom-Potion-Mixes.patch
similarity index 100%
rename from patches/server/0853-Custom-Potion-Mixes.patch
rename to patches/server/0854-Custom-Potion-Mixes.patch
diff --git a/patches/server/0854-Fix-Fluid-tags-isTagged-method.patch b/patches/server/0855-Fix-Fluid-tags-isTagged-method.patch
similarity index 100%
rename from patches/server/0854-Fix-Fluid-tags-isTagged-method.patch
rename to patches/server/0855-Fix-Fluid-tags-isTagged-method.patch
diff --git a/patches/server/0855-Force-close-world-loading-screen.patch b/patches/server/0856-Force-close-world-loading-screen.patch
similarity index 100%
rename from patches/server/0855-Force-close-world-loading-screen.patch
rename to patches/server/0856-Force-close-world-loading-screen.patch
diff --git a/patches/server/0856-Fix-falling-block-spawn-methods.patch b/patches/server/0857-Fix-falling-block-spawn-methods.patch
similarity index 100%
rename from patches/server/0856-Fix-falling-block-spawn-methods.patch
rename to patches/server/0857-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0857-Expose-furnace-minecart-push-values.patch b/patches/server/0858-Expose-furnace-minecart-push-values.patch
similarity index 100%
rename from patches/server/0857-Expose-furnace-minecart-push-values.patch
rename to patches/server/0858-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0858-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0859-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
similarity index 100%
rename from patches/server/0858-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
rename to patches/server/0859-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0859-Fix-save-problems-on-shutdown.patch b/patches/server/0860-Fix-save-problems-on-shutdown.patch
similarity index 100%
rename from patches/server/0859-Fix-save-problems-on-shutdown.patch
rename to patches/server/0860-Fix-save-problems-on-shutdown.patch
diff --git a/patches/server/0860-More-Projectile-API.patch b/patches/server/0861-More-Projectile-API.patch
similarity index 100%
rename from patches/server/0860-More-Projectile-API.patch
rename to patches/server/0861-More-Projectile-API.patch
diff --git a/patches/server/0861-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0862-Don-t-allow-vehicle-movement-from-players-while-tele.patch
similarity index 100%
rename from patches/server/0861-Don-t-allow-vehicle-movement-from-players-while-tele.patch
rename to patches/server/0862-Don-t-allow-vehicle-movement-from-players-while-tele.patch
diff --git a/patches/server/0862-Implement-getComputedBiome-API.patch b/patches/server/0863-Implement-getComputedBiome-API.patch
similarity index 100%
rename from patches/server/0862-Implement-getComputedBiome-API.patch
rename to patches/server/0863-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0863-Make-some-itemstacks-nonnull.patch b/patches/server/0864-Make-some-itemstacks-nonnull.patch
similarity index 100%
rename from patches/server/0863-Make-some-itemstacks-nonnull.patch
rename to patches/server/0864-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0864-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch b/patches/server/0865-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
similarity index 100%
rename from patches/server/0864-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
rename to patches/server/0865-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
diff --git a/patches/server/0865-Implement-enchantWithLevels-API.patch b/patches/server/0866-Implement-enchantWithLevels-API.patch
similarity index 100%
rename from patches/server/0865-Implement-enchantWithLevels-API.patch
rename to patches/server/0866-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0866-Fix-saving-in-unloadWorld.patch b/patches/server/0867-Fix-saving-in-unloadWorld.patch
similarity index 100%
rename from patches/server/0866-Fix-saving-in-unloadWorld.patch
rename to patches/server/0867-Fix-saving-in-unloadWorld.patch
diff --git a/patches/server/0867-Buffer-OOB-setBlock-calls.patch b/patches/server/0868-Buffer-OOB-setBlock-calls.patch
similarity index 100%
rename from patches/server/0867-Buffer-OOB-setBlock-calls.patch
rename to patches/server/0868-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0868-Add-TameableDeathMessageEvent.patch b/patches/server/0869-Add-TameableDeathMessageEvent.patch
similarity index 100%
rename from patches/server/0868-Add-TameableDeathMessageEvent.patch
rename to patches/server/0869-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0869-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch b/patches/server/0870-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch
similarity index 100%
rename from patches/server/0869-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch
rename to patches/server/0870-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch
diff --git a/patches/server/0870-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0871-fix-player-loottables-running-when-mob-loot-gamerule.patch
similarity index 100%
rename from patches/server/0870-fix-player-loottables-running-when-mob-loot-gamerule.patch
rename to patches/server/0871-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff --git a/patches/server/0871-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0872-Ensure-entity-passenger-world-matches-ridden-entity.patch
similarity index 100%
rename from patches/server/0871-Ensure-entity-passenger-world-matches-ridden-entity.patch
rename to patches/server/0872-Ensure-entity-passenger-world-matches-ridden-entity.patch
diff --git a/patches/server/0872-Guard-against-invalid-entity-positions.patch b/patches/server/0873-Guard-against-invalid-entity-positions.patch
similarity index 100%
rename from patches/server/0872-Guard-against-invalid-entity-positions.patch
rename to patches/server/0873-Guard-against-invalid-entity-positions.patch
diff --git a/patches/server/0873-cache-resource-keys.patch b/patches/server/0874-cache-resource-keys.patch
similarity index 100%
rename from patches/server/0873-cache-resource-keys.patch
rename to patches/server/0874-cache-resource-keys.patch
diff --git a/patches/server/0874-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0875-Allow-to-change-the-podium-for-the-EnderDragon.patch
similarity index 100%
rename from patches/server/0874-Allow-to-change-the-podium-for-the-EnderDragon.patch
rename to patches/server/0875-Allow-to-change-the-podium-for-the-EnderDragon.patch
diff --git a/patches/server/0875-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0876-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
similarity index 100%
rename from patches/server/0875-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
rename to patches/server/0876-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0876-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0877-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
similarity index 100%
rename from patches/server/0876-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
rename to patches/server/0877-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
diff --git a/patches/server/0877-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0878-Prevent-tile-entity-copies-loading-chunks.patch
similarity index 100%
rename from patches/server/0877-Prevent-tile-entity-copies-loading-chunks.patch
rename to patches/server/0878-Prevent-tile-entity-copies-loading-chunks.patch
diff --git a/patches/server/0878-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0879-Use-username-instead-of-display-name-in-PlayerList-g.patch
similarity index 100%
rename from patches/server/0878-Use-username-instead-of-display-name-in-PlayerList-g.patch
rename to patches/server/0879-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0879-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/server/0880-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
similarity index 100%
rename from patches/server/0879-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
rename to patches/server/0880-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
diff --git a/patches/server/0880-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0881-Pass-ServerLevel-for-gamerule-callbacks.patch
similarity index 100%
rename from patches/server/0880-Pass-ServerLevel-for-gamerule-callbacks.patch
rename to patches/server/0881-Pass-ServerLevel-for-gamerule-callbacks.patch
diff --git a/patches/server/0881-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0882-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
similarity index 100%
rename from patches/server/0881-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
rename to patches/server/0882-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/server/0882-WorldCreator-keepSpawnLoaded.patch b/patches/server/0883-WorldCreator-keepSpawnLoaded.patch
similarity index 100%
rename from patches/server/0882-WorldCreator-keepSpawnLoaded.patch
rename to patches/server/0883-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/server/0883-Fix-NPE-for-BlockDataMeta-getBlockData.patch b/patches/server/0884-Fix-NPE-for-BlockDataMeta-getBlockData.patch
similarity index 100%
rename from patches/server/0883-Fix-NPE-for-BlockDataMeta-getBlockData.patch
rename to patches/server/0884-Fix-NPE-for-BlockDataMeta-getBlockData.patch
diff --git a/patches/server/0884-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0885-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
similarity index 100%
rename from patches/server/0884-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
rename to patches/server/0885-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0885-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0886-Add-EntityDyeEvent-and-CollarColorable-interface.patch
similarity index 100%
rename from patches/server/0885-Add-EntityDyeEvent-and-CollarColorable-interface.patch
rename to patches/server/0886-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0886-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0887-Fire-CauldronLevelChange-on-initial-fill.patch
similarity index 100%
rename from patches/server/0886-Fire-CauldronLevelChange-on-initial-fill.patch
rename to patches/server/0887-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0887-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0888-fix-powder-snow-cauldrons-not-turning-to-water.patch
similarity index 100%
rename from patches/server/0887-fix-powder-snow-cauldrons-not-turning-to-water.patch
rename to patches/server/0888-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0888-Sign-cleanup-filtering.patch b/patches/server/0889-Sign-cleanup-filtering.patch
similarity index 100%
rename from patches/server/0888-Sign-cleanup-filtering.patch
rename to patches/server/0889-Sign-cleanup-filtering.patch
diff --git a/patches/server/0889-Add-PlayerStopUsingItemEvent.patch b/patches/server/0890-Add-PlayerStopUsingItemEvent.patch
similarity index 100%
rename from patches/server/0889-Add-PlayerStopUsingItemEvent.patch
rename to patches/server/0890-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0890-FallingBlock-auto-expire-setting.patch b/patches/server/0891-FallingBlock-auto-expire-setting.patch
similarity index 100%
rename from patches/server/0890-FallingBlock-auto-expire-setting.patch
rename to patches/server/0891-FallingBlock-auto-expire-setting.patch
diff --git a/patches/server/0891-Don-t-tick-markers.patch b/patches/server/0892-Don-t-tick-markers.patch
similarity index 100%
rename from patches/server/0891-Don-t-tick-markers.patch
rename to patches/server/0892-Don-t-tick-markers.patch
diff --git a/patches/server/0892-Do-not-accept-invalid-client-settings.patch b/patches/server/0893-Do-not-accept-invalid-client-settings.patch
similarity index 100%
rename from patches/server/0892-Do-not-accept-invalid-client-settings.patch
rename to patches/server/0893-Do-not-accept-invalid-client-settings.patch
diff --git a/patches/server/0893-Add-support-for-Proxy-Protocol.patch b/patches/server/0894-Add-support-for-Proxy-Protocol.patch
similarity index 100%
rename from patches/server/0893-Add-support-for-Proxy-Protocol.patch
rename to patches/server/0894-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0894-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0895-Fix-OfflinePlayer-getBedSpawnLocation.patch
similarity index 100%
rename from patches/server/0894-Fix-OfflinePlayer-getBedSpawnLocation.patch
rename to patches/server/0895-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0895-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0896-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
similarity index 100%
rename from patches/server/0895-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
rename to patches/server/0896-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0896-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0897-Sanitize-Sent-BlockEntity-NBT.patch
similarity index 100%
rename from patches/server/0896-Sanitize-Sent-BlockEntity-NBT.patch
rename to patches/server/0897-Sanitize-Sent-BlockEntity-NBT.patch
diff --git a/patches/server/0897-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0898-Prevent-entity-loading-causing-async-lookups.patch
similarity index 100%
rename from patches/server/0897-Prevent-entity-loading-causing-async-lookups.patch
rename to patches/server/0898-Prevent-entity-loading-causing-async-lookups.patch
diff --git a/patches/server/0898-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0899-Disable-component-selector-resolving-in-books-by-def.patch
similarity index 100%
rename from patches/server/0898-Disable-component-selector-resolving-in-books-by-def.patch
rename to patches/server/0899-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0899-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0900-Throw-exception-on-world-create-while-being-ticked.patch
similarity index 100%
rename from patches/server/0899-Throw-exception-on-world-create-while-being-ticked.patch
rename to patches/server/0900-Throw-exception-on-world-create-while-being-ticked.patch