From b4ae928db96d916c0ca8db3066e67d2ce40791bd Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Thu, 8 Jun 2023 10:48:28 -0700
Subject: [PATCH] add some more patches back

---
 ...iting-of-comments-to-server.propert.patch} | 29 ++++++++-------
 ...tch => 0651-Add-PlayerSetSpawnEvent.patch} |  0
 ...rs-respect-inventory-max-stack-size.patch} |  0
 ...ize-entity-tracker-passenger-checks.patch} |  0
 ...-option-for-Piglins-guarding-chests.patch} |  0
 ...=> 0655-Added-EntityDamageItemEvent.patch} |  0
 ...timize-indirect-passenger-iteration.patch} |  0
 ...em-frame-map-cursor-update-interval.patch} |  0
 ...Make-EntityUnleashEvent-cancellable.patch} |  0
 ...659-Clear-bucket-NBT-after-dispense.patch} |  0
 ...arget-without-changing-other-things.patch} |  0
 ...ch => 0661-Add-BlockBreakBlockEvent.patch} |  0
 ...revent-NBT-copy-in-smithing-recipes.patch} |  0
 ...patch => 0663-More-CommandBlock-API.patch} |  0
 ...-missing-team-sidebar-display-slots.patch} |  0
 ...0665-Add-back-EntityPortalExitEvent.patch} |  0
 ...-find-targets-for-lightning-strikes.patch} |  0
 ... 0667-Get-entity-default-attributes.patch} |  0
 ...d-API.patch => 0668-Left-handed-API.patch} |  0
 ...ch => 0669-Add-more-advancement-API.patch} |  0
 ...670-Add-ItemFactory-getSpawnEgg-API.patch} |  0
 ...tch => 0671-Add-critical-damage-API.patch} |  0
 ...0672-Fix-issues-with-mob-conversion.patch} |  0
 ...ollidable-methods-to-various-places.patch} |  0
 ...-ram-API.patch => 0674-Goat-ram-API.patch} |  0
 ...dd-API-for-resetting-a-single-score.patch} |  0
 ...6-Add-Raw-Byte-Entity-Serialization.patch} |  0
 ...77-Vanilla-command-permission-fixes.patch} |  0
 ...logic-for-inventories-on-chunk-unlo.patch} |  0
 ...79-Fix-GameProfileCache-concurrency.patch} |  0
 ...680-Improve-and-expand-AsyncCatcher.patch} |  0
 ...per-mobcaps-and-paper-playermobcaps.patch} |  0
 ...tize-ResourceLocation-error-logging.patch} |  0
 ...rolled-flushing-for-network-manager.patch} |  0
 ...=> 0684-Optimise-general-POI-access.patch} |  0
 ...rCloseEnoughForSpawning-to-use-dist.patch} |  0
 ... 0686-Optimise-chunk-tick-iteration.patch} |  0
 ...> 0687-Execute-chunk-tasks-mid-tick.patch} |  0
 ...ulate-regionfile-header-if-it-is-co.patch} |  0
 ...ementation-for-blockstate-state-loo.patch} |  0
 ...-more-information-in-watchdog-dumps.patch} |  0
 ...lly-inline-methods-in-BlockPosition.patch} |  0
 ... 0692-Distance-manager-tick-timings.patch} |  0
 ...ler-threads-according-to-the-plugin.patch} |  0
 ...-getChunkAt-has-inlined-logic-for-l.patch} |  0
 ...h => 0695-Add-packet-limiter-config.patch} |  0
 ...our-chunk-data-off-disk-when-conver.patch} |  0
 ...sh-calls-for-entity-tracker-packets.patch} |  0
 ...-lookup-fluid-state-when-raytracing.patch} |  0
 ...atch => 0699-Time-scoreboard-search.patch} |  0
 ...packets-for-hard-colliding-entities.patch} |  0
 ...1-Do-not-run-raytrace-logic-for-AIR.patch} |  0
 ...rimise-map-impl-for-tracked-players.patch} |  0
 ...imise-BlockSoil-nearby-water-lookup.patch} |  0
 ... 0704-Optimise-random-block-ticking.patch} |  0
 ...5-Optimise-non-flush-packet-sending.patch} |  0
 ...0706-Optimise-nearby-player-lookups.patch} |  0
 ...0707-Remove-streams-for-villager-AI.patch} |  0
 ...city-compression-and-cipher-natives.patch} |  0
 ...hread-worker-count-for-low-core-cou.patch} |  0
 ...ix-Bukkit-NamespacedKey-shenanigans.patch} |  0
 ...ntory-not-closing-on-entity-removal.patch} |  0
 ...rement-before-suggesting-root-nodes.patch} |  0
 ...ServerboundCommandSuggestionPacket-.patch} |  0
 ...nColor-on-tropical-fish-bucket-meta.patch} |  0
 ...=> 0715-Ensure-valid-vehicle-status.patch} |  0
 ...ftlocked-end-exit-portal-generation.patch} |  0
 ...r-causing-a-crash-when-trying-to-ge.patch} |  0
 ...-t-log-debug-logging-being-disabled.patch} |  0
 ...ous-menus-with-empty-level-accesses.patch} |  0
 ...h => 0720-Preserve-overstacked-loot.patch} |  0
 ...ate-head-rotation-in-missing-places.patch} |  0
 ...unintended-light-block-manipulation.patch} |  0
 ...0723-Fix-CraftCriteria-defaults-map.patch} |  0
 ...Fix-upstreams-block-state-factories.patch} |  0
 ...ion-for-logging-player-ip-addresses.patch} |  0
 ... => 0726-Configurable-feature-seeds.patch} |  0
 ...pper-didnt-account-for-entity-sende.patch} |  0
 ... 0728-Add-root-admin-user-detection.patch} |  0
 ...ays-allow-item-changing-in-Fireball.patch} |  0
 ...t-attempt-to-teleport-dead-entities.patch} |  0
 ...ive-velocity-through-repeated-crits.patch} |  0
 ...e-code-using-deprecated-for-removal.patch} |  0
 ...emoving-recipes-from-RecipeIterator.patch} |  0
 ...versized-item-data-in-equipment-and.patch} |  0
 ...e-unnecessary-itemmeta-from-clients.patch} |  0
 ...=> 0736-Fix-Spigot-growth-modifiers.patch} |  0
 ...OpenersCounter-openCount-from-going.patch} |  0
 ...0738-Add-PlayerItemFrameChangeEvent.patch} |  0
 ...> 0739-Add-player-health-update-API.patch} |  0
 ...tch => 0740-Optimize-HashMapPalette.patch} |  0
 ...low-delegation-to-vanilla-chunk-gen.patch} |  0
 ...ingle-and-multi-AABB-VoxelShapes-an.patch} |  0
 ...n-checking-in-player-move-packet-ha.patch} |  0
 ...-isSectionEmpty-int-and-optimize-Pa.patch} |  0
 ...patch => 0745-Add-more-Campfire-API.patch} |  0
 ...data-to-disk-if-it-serializes-witho.patch} |  0
 ...47-Fix-tripwire-state-inconsistency.patch} |  0
 ...ard-CraftEntity-in-teleport-command.patch} |  0
 ... => 0749-Improve-scoreboard-entries.patch} |  0
 ...ch => 0750-Entity-powdered-snow-API.patch} |  0
 ...0751-Add-API-for-item-entity-health.patch} |  0
 ...-type-tags-suggestions-in-selectors.patch} |  0
 ...ax-block-light-for-monster-spawning.patch} |  0
 ...pistons-and-BlockPistonRetractEvent.patch} |  0
 ...plifiers-greater-than-127-correctly.patch} |  0
 ...-canSmelt-methods-to-FurnaceInvento.patch} |  0
 ...=> 0757-Fix-bees-aging-inside-hives.patch} |  0
 ...le-API.patch => 0758-Bucketable-API.patch} |  0
 ...es.patch => 0759-Validate-usernames.patch} |  0
 ...er-animal-spawn-height-configurable.patch} |  0
 ...anilla-BiomeProvider-from-WorldInfo.patch} |  0
 ...ion-for-worlds-affected-by-time-cmd.patch} |  0
 ...load-to-PersistentDataContainer-has.patch} |  0
 ...4-Multiple-Entries-with-Scoreboards.patch} |  0
 ...765-Reset-placed-block-on-exception.patch} |  0
 ...configurable-height-for-slime-spawn.patch} |  0
 ...ostname-to-AsyncPlayerPreLoginEvent.patch} |  0
 ...0768-Fix-xp-reward-for-baby-zombies.patch} |  0
 ... 0769-Kick-on-main-for-illegal-chat.patch} |  0
 ...lti-Block-Change-API-Implementation.patch} |  0
 ...ent.patch => 0771-Fix-NotePlayEvent.patch} |  0
 ....patch => 0772-Freeze-Tick-Lock-API.patch} |  0
 ...lphin-API.patch => 0773-Dolphin-API.patch} |  0
 ...h => 0774-More-PotionEffectType-API.patch} |  0
 ...for-StructureTemplate.Pallete-cache.patch} |  0
 ...command-sender-which-forwards-feedb.patch} |  0
 ...-missing-structure-set-seed-configs.patch} |  0
 ...h => 0778-Implement-regenerateChunk.patch} |  0
 ...lled-powdered-snow-bucket-placement.patch} |  0
 ...ate-calls-to-CraftServer-getSpawnLi.patch} |  0
 ...gs.patch => 0781-Add-GameEvent-tags.patch} |  0
 ...ks-fairly-for-worlds-while-waiting-.patch} |  0
 ...tch => 0783-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
 ... => 0788-Fix-Entity-Position-Desync.patch} |  0
 ...s.patch => 0789-Custom-Potion-Mixes.patch} |  0
 ...90-Force-close-world-loading-screen.patch} |  0
 ...791-Fix-falling-block-spawn-methods.patch} |  0
 ...Expose-furnace-minecart-push-values.patch} |  0
 ...ojectileHitEvent-for-piercing-arrow.patch} |  0
 ...I.patch => 0794-More-Projectile-API.patch} |  0
 ...x-swamp-hut-cat-generation-deadlock.patch} |  0
 ...le-movement-from-players-while-tele.patch} |  0
 ...0797-Implement-getComputedBiome-API.patch} |  0
 ...> 0798-Make-some-itemstacks-nonnull.patch} |  0
 ...799-Implement-enchantWithLevels-API.patch} |  0
 ...h => 0800-Fix-saving-in-unloadWorld.patch} |  0
 ...h => 0801-Buffer-OOB-setBlock-calls.patch} |  0
 ... 0802-Add-TameableDeathMessageEvent.patch} |  0
 ...ock-data-for-EntityChangeBlockEvent.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 => 0807-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
 ...> 0816-WorldCreator-keepSpawnLoaded.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
 ...> 0821-Add-PlayerStopUsingItemEvent.patch} |  0
 ...22-FallingBlock-auto-expire-setting.patch} |  0
 ...rs.patch => 0823-Don-t-tick-markers.patch} |  0
 ...-not-accept-invalid-client-settings.patch} |  0
 ...0825-Add-support-for-Proxy-Protocol.patch} |  0
 ...x-OfflinePlayer-getBedSpawnLocation.patch} |  0
 ...tory-for-smokers-and-blast-furnaces.patch} |  0
 ... 0828-Sanitize-Sent-BlockEntity-NBT.patch} |  0
 ...-selector-resolving-in-books-by-def.patch} |  0
 ...ntity-loading-causing-async-lookups.patch} |  0
 ...-on-world-create-while-being-ticked.patch} |  0
 ...ate-Current-redstone-implementation.patch} |  0
 ...33-Dont-resent-entity-on-art-update.patch} |  0
 ... => 0834-Add-WardenAngerChangeEvent.patch} |  0
 ...strict-advancement-dimension-checks.patch} |  0
 ...tant-BlockStateListPopulator-method.patch} |  0
 ...I.patch => 0837-Nameable-Banner-API.patch} |  0
 ...roadcast-messages-to-command-blocks.patch} |  0
 ...pty-items-from-being-added-to-world.patch} |  0
 ...hPotion-and-LingeringPotion-spawnin.patch} |  0
 ...nent-in-resource-pack-rejection-mes.patch} |  0
 ...atch => 0842-Add-Player-getFishHook.patch} |  0
 ...chunk-for-dynamic-game-event-listen.patch} |  0
 ...s-missing-EntityDropItemEvent-calls.patch} |  0
 ...debug-information-to-chat-packet-er.patch} |  0
 ...PE.patch => 0846-Fix-Bee-flower-NPE.patch} |  0
 ...-not-using-commands.spam-exclusions.patch} |  0
 ...API.patch => 0848-More-Teleport-API.patch} |  0
 ... => 0849-Add-EntityPortalReadyEvent.patch} |  0
 ...level-random-in-entity-constructors.patch} |  0
 ...k-entities-after-destroy-prediction.patch} |  0
 ...on-plugins-accessing-faraway-chunks.patch} |  0
 ...tom-Chat-Completion-Suggestions-API.patch} |  0
 ...=> 0854-Add-missing-BlockFadeEvents.patch} |  0
 ...ion-API.patch => 0855-Collision-API.patch} |  0
 ...nd-message-for-brigadier-syntax-exc.patch} |  0
 ...-invalid-signature-login-stacktrace.patch} |  0
 ...API.patch => 0858-Block-Ticking-API.patch} |  0
 ...-Add-Velocity-IP-Forwarding-Support.patch} |  0
 ...andom-in-ServerLoginPacketListenerI.patch} |  0
 ...861-Add-NamespacedKey-biome-methods.patch} |  0
 ...x-plugin-loggers-on-server-shutdown.patch} |  0
 ...ok-changes-from-crashing-the-server.patch} |  0
 ...tityChangeBlockEvent-in-more-places.patch} |  0
 ...> 0865-Missing-eating-regain-reason.patch} |  0
 ....patch => 0866-Missing-effect-cause.patch} |  0
 ...serialization-deserialization-for-P.patch} |  0
 ...rameter-to-ProjectileSource-launchP.patch} |  0
 ...9-Call-BlockPhysicsEvent-more-often.patch} |  0
 ...0870-Configurable-chat-thread-limit.patch} |  0
 ...of-WorldCreator-keepSpawnLoaded-ret.patch} |  0
 ... 0872-fix-Jigsaw-block-kicking-user.patch} |  0
 ...mEvent-for-mud-converting-into-clay.patch} |  0
 ... => 0874-Add-getDrops-to-BlockState.patch} |  0
 ...=> 0875-Fix-a-bunch-of-vanilla-bugs.patch} |  0
 ...y-onTrackingStart-during-navigation.patch} |  0
 ... 0877-Fix-custom-piglin-loved-items.patch} |  0
 ...=> 0878-EntityPickupItemEvent-fixes.patch} |  0
 ...interactions-with-items-on-cooldown.patch} |  0
 ...-Add-PlayerInventorySlotChangeEvent.patch} |  0
 ... 0881-Elder-Guardian-appearance-API.patch} |  0
 ...ow-changing-bed-s-occupied-property.patch} |  0
 ...ch => 0883-Add-entity-knockback-API.patch} |  0
 ....patch => 0884-Detect-headless-JREs.patch} |  0
 ...-vehicle-collision-event-not-called.patch} |  0
 ...6-optimized-dirt-and-snow-spreading.patch} |  0
 ... => 0887-Added-EntityToggleSitEvent.patch} |  0
 ... => 0888-Add-fire-tick-delay-option.patch} |  0
 ...patch => 0889-Add-Moving-Piston-API.patch} |  0
 ...> 0890-Ignore-impossible-spawn-tick.patch} |  0
 ...source-for-fireworks-from-dispenser.patch} |  0
 ...t-suggestion-permissions-to-align-w.patch} |  0
 ...Event-cancellation-cant-fully-preve.patch} |  0
 ...Prevent-compass-from-loading-chunks.patch} |  0
 ...0895-Add-PrePlayerAttackEntityEvent.patch} |  0
 ...e-reset-EnderDragon-boss-event-name.patch} |  0
 ...-green-map-markers-do-not-disappear.patch} |  0
 ... 0898-Add-Player-Warden-Warning-API.patch} |  0
 ...a-friendly-methods-to-update-trades.patch} |  0
 ...900-Add-paper-dumplisteners-command.patch} |  0
 ...lobal-player-list-where-appropriate.patch} |  0
 ...sync-entity-add-due-to-fungus-trees.patch} |  0
 ....patch => 0903-ItemStack-damage-API.patch} |  0
 ...tion-API.patch => 0904-Friction-API.patch} |  0
 ...trol-player-s-insomnia-and-phantoms.patch} |  0
 ...=> 0906-Fix-player-kick-on-shutdown.patch} |  0
 ... => 0907-Sync-offhand-slot-in-menus.patch} |  0
 ... 0908-Player-Entity-Tracking-Events.patch} |  0
 ...tch => 0909-Limit-pet-look-distance.patch} |  0
 ...ch => 0910-Properly-resend-entities.patch} |  0
 ...nd-additions-to-the-SpawnReason-API.patch} |  0
 ...ments.patch => 0912-fix-Instruments.patch} |  0
 ...for-some-hot-BlockBehavior-and-Flui.patch} |  0
 ...es-in-dispense-events-regarding-sta.patch} |  0
 ... => 0915-Improve-logging-and-errors.patch} |  0
 ...tch => 0916-Add-BlockLockCheckEvent.patch} |  0
 ... 0917-Add-Sneaking-API-for-Entities.patch} |  0
 ....patch => 0918-Improve-PortalEvents.patch} |  0
 ...ion-for-spider-worldborder-climbing.patch} |  0
 ...sing-SpigotConfig-logCommands-check.patch} |  0
 ...Allay-stopDancing-while-not-dancing.patch} |  0
 ...ge.patch => 0922-Flying-Fall-Damage.patch} |  0
 ...ed-block-state-to-BlockExplodeEvent.patch} |  0
 ...ion-moving-velocity-to-VehicleBlock.patch} |  0
 ...onfig-for-disabling-entity-tag-tags.patch} |  0
 ...e-player-info-update-packet-on-join.patch} |  0
 ...k-items-during-EntityResurrectEvent.patch} |  0
 ...en-API.patch => 0928-Win-Screen-API.patch} |  0
 ...ItemStack-setAmount-null-assignment.patch} |  0
 ...ix-force-opening-enchantment-tables.patch} |  0
 ...tch => 0931-Add-Entity-Body-Yaw-API.patch} |  0
 ...vent-sleeping-villagers-moving-towa.patch} |  0
 ...hen-a-captured-block-state-is-outda.patch} |  0
 ...=> 0934-Add-EntityFertilizeEggEvent.patch} |  0
 ...ty-drop-not-updating-the-client-inv.patch} |  0
 ...temEvent-and-EntityCompostItemEvent.patch} |  0
 ...ctly-handle-ArmorStand-invisibility.patch} |  0
 ...ancement-triggers-for-entity-damage.patch} |  0
 ...939-Fix-text-display-error-on-spawn.patch} |  0
 ...nventories-returning-null-Locations.patch} |  0
 ...API.patch => 0941-Add-Shearable-API.patch} |  0
 ...Fix-SpawnEggMeta-get-setSpawnedType.patch} |  0
 ...kshelf-and-jukebox-setItem-with-air.patch} |  0
 ...pers.patch => 0944-Optimize-Hoppers.patch} |  0
 ...ives-generating-from-using-bonemeal.patch} |  0
 ...=> 0946-Fix-api-checking-banned-ips.patch} |  0
 ...g-to-bad-recipes-in-furnace-like-ti.patch} |  0
 ...ence-violations-like-they-should-be.patch} |  0
 ...uplicate-animate-packet-for-records.patch} |  0
 ...xpired-keys-from-impacting-new-join.patch} |  0
 ...ts-being-fired-from-unloaded-chunks.patch} |  0
 ...0952-Use-array-for-gamerule-storage.patch} |  0
 ...Fix-a-couple-of-upstream-bed-issues.patch} |  0
 ...ix-demo-flag-not-enabling-demo-mode.patch} |  0
 ... 0955-Add-Mob-Experience-reward-API.patch} |  0
 ...redstone-on-top-of-trap-doors-early.patch} |  0
 ...-Fix-DamageCause-for-Falling-Blocks.patch} |  0
 ...Lazy-Initialization-for-Enum-Fields.patch} |  0
 ...59-More-accurate-isInOpenWater-impl.patch} |  0
 ...ccess-to-lookups-field-in-RegistryO.patch} |  0
 ...ecalcBlockCounts-for-empty-sections.patch} |  0
 ...ehive-without-any-players-nearby-th.patch} |  0
 ... => 0963-Expand-PlayerItemMendEvent.patch} |  0
 ...sh-ProjectileSource-for-projectiles.patch} |  0
 ... => 0965-Add-transient-modifier-API.patch} |  0
 .../0966-Fix-block-place-logic.patch}         | 35 ++-----------------
 317 files changed, 16 insertions(+), 48 deletions(-)
 rename patches/{removed/1.20/0664-Allow-skipping-writing-of-comments-to-server.propert.patch => server/0650-Allow-skipping-writing-of-comments-to-server.propert.patch} (71%)
 rename patches/server/{0650-Add-PlayerSetSpawnEvent.patch => 0651-Add-PlayerSetSpawnEvent.patch} (100%)
 rename patches/server/{0651-Make-hoppers-respect-inventory-max-stack-size.patch => 0652-Make-hoppers-respect-inventory-max-stack-size.patch} (100%)
 rename patches/server/{0652-Optimize-entity-tracker-passenger-checks.patch => 0653-Optimize-entity-tracker-passenger-checks.patch} (100%)
 rename patches/server/{0653-Config-option-for-Piglins-guarding-chests.patch => 0654-Config-option-for-Piglins-guarding-chests.patch} (100%)
 rename patches/server/{0654-Added-EntityDamageItemEvent.patch => 0655-Added-EntityDamageItemEvent.patch} (100%)
 rename patches/server/{0655-Optimize-indirect-passenger-iteration.patch => 0656-Optimize-indirect-passenger-iteration.patch} (100%)
 rename patches/server/{0656-Configurable-item-frame-map-cursor-update-interval.patch => 0657-Configurable-item-frame-map-cursor-update-interval.patch} (100%)
 rename patches/server/{0657-Make-EntityUnleashEvent-cancellable.patch => 0658-Make-EntityUnleashEvent-cancellable.patch} (100%)
 rename patches/server/{0658-Clear-bucket-NBT-after-dispense.patch => 0659-Clear-bucket-NBT-after-dispense.patch} (100%)
 rename patches/server/{0659-Change-EnderEye-target-without-changing-other-things.patch => 0660-Change-EnderEye-target-without-changing-other-things.patch} (100%)
 rename patches/server/{0660-Add-BlockBreakBlockEvent.patch => 0661-Add-BlockBreakBlockEvent.patch} (100%)
 rename patches/server/{0661-Option-to-prevent-NBT-copy-in-smithing-recipes.patch => 0662-Option-to-prevent-NBT-copy-in-smithing-recipes.patch} (100%)
 rename patches/server/{0662-More-CommandBlock-API.patch => 0663-More-CommandBlock-API.patch} (100%)
 rename patches/server/{0663-Add-missing-team-sidebar-display-slots.patch => 0664-Add-missing-team-sidebar-display-slots.patch} (100%)
 rename patches/server/{0664-Add-back-EntityPortalExitEvent.patch => 0665-Add-back-EntityPortalExitEvent.patch} (100%)
 rename patches/server/{0665-Add-methods-to-find-targets-for-lightning-strikes.patch => 0666-Add-methods-to-find-targets-for-lightning-strikes.patch} (100%)
 rename patches/server/{0666-Get-entity-default-attributes.patch => 0667-Get-entity-default-attributes.patch} (100%)
 rename patches/server/{0667-Left-handed-API.patch => 0668-Left-handed-API.patch} (100%)
 rename patches/server/{0668-Add-more-advancement-API.patch => 0669-Add-more-advancement-API.patch} (100%)
 rename patches/server/{0669-Add-ItemFactory-getSpawnEgg-API.patch => 0670-Add-ItemFactory-getSpawnEgg-API.patch} (100%)
 rename patches/server/{0670-Add-critical-damage-API.patch => 0671-Add-critical-damage-API.patch} (100%)
 rename patches/server/{0671-Fix-issues-with-mob-conversion.patch => 0672-Fix-issues-with-mob-conversion.patch} (100%)
 rename patches/server/{0672-Add-isCollidable-methods-to-various-places.patch => 0673-Add-isCollidable-methods-to-various-places.patch} (100%)
 rename patches/server/{0673-Goat-ram-API.patch => 0674-Goat-ram-API.patch} (100%)
 rename patches/server/{0674-Add-API-for-resetting-a-single-score.patch => 0675-Add-API-for-resetting-a-single-score.patch} (100%)
 rename patches/server/{0675-Add-Raw-Byte-Entity-Serialization.patch => 0676-Add-Raw-Byte-Entity-Serialization.patch} (100%)
 rename patches/server/{0676-Vanilla-command-permission-fixes.patch => 0677-Vanilla-command-permission-fixes.patch} (100%)
 rename patches/server/{0677-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch => 0678-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch} (100%)
 rename patches/server/{0678-Fix-GameProfileCache-concurrency.patch => 0679-Fix-GameProfileCache-concurrency.patch} (100%)
 rename patches/server/{0679-Improve-and-expand-AsyncCatcher.patch => 0680-Improve-and-expand-AsyncCatcher.patch} (100%)
 rename patches/server/{0680-Add-paper-mobcaps-and-paper-playermobcaps.patch => 0681-Add-paper-mobcaps-and-paper-playermobcaps.patch} (100%)
 rename patches/server/{0681-Sanitize-ResourceLocation-error-logging.patch => 0682-Sanitize-ResourceLocation-error-logging.patch} (100%)
 rename patches/server/{0682-Allow-controlled-flushing-for-network-manager.patch => 0683-Allow-controlled-flushing-for-network-manager.patch} (100%)
 rename patches/server/{0683-Optimise-general-POI-access.patch => 0684-Optimise-general-POI-access.patch} (100%)
 rename patches/server/{0684-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch => 0685-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch} (100%)
 rename patches/server/{0685-Optimise-chunk-tick-iteration.patch => 0686-Optimise-chunk-tick-iteration.patch} (100%)
 rename patches/server/{0686-Execute-chunk-tasks-mid-tick.patch => 0687-Execute-chunk-tasks-mid-tick.patch} (100%)
 rename patches/server/{0687-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch => 0688-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch} (100%)
 rename patches/server/{0688-Custom-table-implementation-for-blockstate-state-loo.patch => 0689-Custom-table-implementation-for-blockstate-state-loo.patch} (100%)
 rename patches/server/{0689-Detail-more-information-in-watchdog-dumps.patch => 0690-Detail-more-information-in-watchdog-dumps.patch} (100%)
 rename patches/server/{0690-Manually-inline-methods-in-BlockPosition.patch => 0691-Manually-inline-methods-in-BlockPosition.patch} (100%)
 rename patches/server/{0691-Distance-manager-tick-timings.patch => 0692-Distance-manager-tick-timings.patch} (100%)
 rename patches/server/{0692-Name-craft-scheduler-threads-according-to-the-plugin.patch => 0693-Name-craft-scheduler-threads-according-to-the-plugin.patch} (100%)
 rename patches/server/{0693-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch => 0694-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch} (100%)
 rename patches/server/{0694-Add-packet-limiter-config.patch => 0695-Add-packet-limiter-config.patch} (100%)
 rename patches/server/{0695-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch => 0696-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch} (100%)
 rename patches/server/{0696-Consolidate-flush-calls-for-entity-tracker-packets.patch => 0697-Consolidate-flush-calls-for-entity-tracker-packets.patch} (100%)
 rename patches/server/{0697-Don-t-lookup-fluid-state-when-raytracing.patch => 0698-Don-t-lookup-fluid-state-when-raytracing.patch} (100%)
 rename patches/server/{0698-Time-scoreboard-search.patch => 0699-Time-scoreboard-search.patch} (100%)
 rename patches/server/{0699-Send-full-pos-packets-for-hard-colliding-entities.patch => 0700-Send-full-pos-packets-for-hard-colliding-entities.patch} (100%)
 rename patches/server/{0700-Do-not-run-raytrace-logic-for-AIR.patch => 0701-Do-not-run-raytrace-logic-for-AIR.patch} (100%)
 rename patches/server/{0701-Oprimise-map-impl-for-tracked-players.patch => 0702-Oprimise-map-impl-for-tracked-players.patch} (100%)
 rename patches/server/{0702-Optimise-BlockSoil-nearby-water-lookup.patch => 0703-Optimise-BlockSoil-nearby-water-lookup.patch} (100%)
 rename patches/server/{0703-Optimise-random-block-ticking.patch => 0704-Optimise-random-block-ticking.patch} (100%)
 rename patches/server/{0704-Optimise-non-flush-packet-sending.patch => 0705-Optimise-non-flush-packet-sending.patch} (100%)
 rename patches/server/{0705-Optimise-nearby-player-lookups.patch => 0706-Optimise-nearby-player-lookups.patch} (100%)
 rename patches/server/{0706-Remove-streams-for-villager-AI.patch => 0707-Remove-streams-for-villager-AI.patch} (100%)
 rename patches/server/{0707-Use-Velocity-compression-and-cipher-natives.patch => 0708-Use-Velocity-compression-and-cipher-natives.patch} (100%)
 rename patches/server/{0708-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch => 0709-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch} (100%)
 rename patches/server/{0709-Fix-Bukkit-NamespacedKey-shenanigans.patch => 0710-Fix-Bukkit-NamespacedKey-shenanigans.patch} (100%)
 rename patches/server/{0710-Fix-merchant-inventory-not-closing-on-entity-removal.patch => 0711-Fix-merchant-inventory-not-closing-on-entity-removal.patch} (100%)
 rename patches/server/{0711-Check-requirement-before-suggesting-root-nodes.patch => 0712-Check-requirement-before-suggesting-root-nodes.patch} (100%)
 rename patches/server/{0712-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch => 0713-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch} (100%)
 rename patches/server/{0713-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch => 0714-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch} (100%)
 rename patches/server/{0714-Ensure-valid-vehicle-status.patch => 0715-Ensure-valid-vehicle-status.patch} (100%)
 rename patches/server/{0715-Prevent-softlocked-end-exit-portal-generation.patch => 0716-Prevent-softlocked-end-exit-portal-generation.patch} (100%)
 rename patches/server/{0716-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch => 0717-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch} (100%)
 rename patches/server/{0717-Don-t-log-debug-logging-being-disabled.patch => 0718-Don-t-log-debug-logging-being-disabled.patch} (100%)
 rename patches/server/{0718-fix-various-menus-with-empty-level-accesses.patch => 0719-fix-various-menus-with-empty-level-accesses.patch} (100%)
 rename patches/server/{0719-Preserve-overstacked-loot.patch => 0720-Preserve-overstacked-loot.patch} (100%)
 rename patches/server/{0720-Update-head-rotation-in-missing-places.patch => 0721-Update-head-rotation-in-missing-places.patch} (100%)
 rename patches/server/{0721-prevent-unintended-light-block-manipulation.patch => 0722-prevent-unintended-light-block-manipulation.patch} (100%)
 rename patches/server/{0722-Fix-CraftCriteria-defaults-map.patch => 0723-Fix-CraftCriteria-defaults-map.patch} (100%)
 rename patches/server/{0723-Fix-upstreams-block-state-factories.patch => 0724-Fix-upstreams-block-state-factories.patch} (100%)
 rename patches/server/{0724-Add-config-option-for-logging-player-ip-addresses.patch => 0725-Add-config-option-for-logging-player-ip-addresses.patch} (100%)
 rename patches/server/{0725-Configurable-feature-seeds.patch => 0726-Configurable-feature-seeds.patch} (100%)
 rename patches/server/{0726-VanillaCommandWrapper-didnt-account-for-entity-sende.patch => 0727-VanillaCommandWrapper-didnt-account-for-entity-sende.patch} (100%)
 rename patches/server/{0727-Add-root-admin-user-detection.patch => 0728-Add-root-admin-user-detection.patch} (100%)
 rename patches/server/{0728-Always-allow-item-changing-in-Fireball.patch => 0729-Always-allow-item-changing-in-Fireball.patch} (100%)
 rename patches/server/{0729-don-t-attempt-to-teleport-dead-entities.patch => 0730-don-t-attempt-to-teleport-dead-entities.patch} (100%)
 rename patches/server/{0730-Prevent-excessive-velocity-through-repeated-crits.patch => 0731-Prevent-excessive-velocity-through-repeated-crits.patch} (100%)
 rename patches/server/{0731-Remove-client-side-code-using-deprecated-for-removal.patch => 0732-Remove-client-side-code-using-deprecated-for-removal.patch} (100%)
 rename patches/server/{0732-Fix-removing-recipes-from-RecipeIterator.patch => 0733-Fix-removing-recipes-from-RecipeIterator.patch} (100%)
 rename patches/server/{0733-Prevent-sending-oversized-item-data-in-equipment-and.patch => 0734-Prevent-sending-oversized-item-data-in-equipment-and.patch} (100%)
 rename patches/server/{0734-Hide-unnecessary-itemmeta-from-clients.patch => 0735-Hide-unnecessary-itemmeta-from-clients.patch} (100%)
 rename patches/server/{0735-Fix-Spigot-growth-modifiers.patch => 0736-Fix-Spigot-growth-modifiers.patch} (100%)
 rename patches/server/{0736-Prevent-ContainerOpenersCounter-openCount-from-going.patch => 0737-Prevent-ContainerOpenersCounter-openCount-from-going.patch} (100%)
 rename patches/server/{0737-Add-PlayerItemFrameChangeEvent.patch => 0738-Add-PlayerItemFrameChangeEvent.patch} (100%)
 rename patches/server/{0738-Add-player-health-update-API.patch => 0739-Add-player-health-update-API.patch} (100%)
 rename patches/server/{0739-Optimize-HashMapPalette.patch => 0740-Optimize-HashMapPalette.patch} (100%)
 rename patches/server/{0740-Allow-delegation-to-vanilla-chunk-gen.patch => 0741-Allow-delegation-to-vanilla-chunk-gen.patch} (100%)
 rename patches/server/{0741-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch => 0742-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch} (100%)
 rename patches/server/{0742-Optimise-collision-checking-in-player-move-packet-ha.patch => 0743-Optimise-collision-checking-in-player-move-packet-ha.patch} (100%)
 rename patches/server/{0743-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch => 0744-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch} (100%)
 rename patches/server/{0744-Add-more-Campfire-API.patch => 0745-Add-more-Campfire-API.patch} (100%)
 rename patches/server/{0745-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch => 0746-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch} (100%)
 rename patches/server/{0746-Fix-tripwire-state-inconsistency.patch => 0747-Fix-tripwire-state-inconsistency.patch} (100%)
 rename patches/server/{0747-Forward-CraftEntity-in-teleport-command.patch => 0748-Forward-CraftEntity-in-teleport-command.patch} (100%)
 rename patches/server/{0748-Improve-scoreboard-entries.patch => 0749-Improve-scoreboard-entries.patch} (100%)
 rename patches/server/{0749-Entity-powdered-snow-API.patch => 0750-Entity-powdered-snow-API.patch} (100%)
 rename patches/server/{0750-Add-API-for-item-entity-health.patch => 0751-Add-API-for-item-entity-health.patch} (100%)
 rename patches/server/{0751-Fix-entity-type-tags-suggestions-in-selectors.patch => 0752-Fix-entity-type-tags-suggestions-in-selectors.patch} (100%)
 rename patches/server/{0752-Configurable-max-block-light-for-monster-spawning.patch => 0753-Configurable-max-block-light-for-monster-spawning.patch} (100%)
 rename patches/server/{0753-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch => 0754-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch} (100%)
 rename patches/server/{0754-Load-effect-amplifiers-greater-than-127-correctly.patch => 0755-Load-effect-amplifiers-greater-than-127-correctly.patch} (100%)
 rename patches/server/{0755-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch => 0756-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch} (100%)
 rename patches/server/{0756-Fix-bees-aging-inside-hives.patch => 0757-Fix-bees-aging-inside-hives.patch} (100%)
 rename patches/server/{0757-Bucketable-API.patch => 0758-Bucketable-API.patch} (100%)
 rename patches/server/{0758-Validate-usernames.patch => 0759-Validate-usernames.patch} (100%)
 rename patches/server/{0759-Make-water-animal-spawn-height-configurable.patch => 0760-Make-water-animal-spawn-height-configurable.patch} (100%)
 rename patches/server/{0760-Expose-vanilla-BiomeProvider-from-WorldInfo.patch => 0761-Expose-vanilla-BiomeProvider-from-WorldInfo.patch} (100%)
 rename patches/server/{0761-Add-config-option-for-worlds-affected-by-time-cmd.patch => 0762-Add-config-option-for-worlds-affected-by-time-cmd.patch} (100%)
 rename patches/server/{0762-Add-new-overload-to-PersistentDataContainer-has.patch => 0763-Add-new-overload-to-PersistentDataContainer-has.patch} (100%)
 rename patches/server/{0763-Multiple-Entries-with-Scoreboards.patch => 0764-Multiple-Entries-with-Scoreboards.patch} (100%)
 rename patches/server/{0764-Reset-placed-block-on-exception.patch => 0765-Reset-placed-block-on-exception.patch} (100%)
 rename patches/server/{0765-Add-configurable-height-for-slime-spawn.patch => 0766-Add-configurable-height-for-slime-spawn.patch} (100%)
 rename patches/server/{0766-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch => 0767-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch} (100%)
 rename patches/server/{0767-Fix-xp-reward-for-baby-zombies.patch => 0768-Fix-xp-reward-for-baby-zombies.patch} (100%)
 rename patches/server/{0768-Kick-on-main-for-illegal-chat.patch => 0769-Kick-on-main-for-illegal-chat.patch} (100%)
 rename patches/server/{0769-Multi-Block-Change-API-Implementation.patch => 0770-Multi-Block-Change-API-Implementation.patch} (100%)
 rename patches/server/{0770-Fix-NotePlayEvent.patch => 0771-Fix-NotePlayEvent.patch} (100%)
 rename patches/server/{0771-Freeze-Tick-Lock-API.patch => 0772-Freeze-Tick-Lock-API.patch} (100%)
 rename patches/server/{0772-Dolphin-API.patch => 0773-Dolphin-API.patch} (100%)
 rename patches/server/{0773-More-PotionEffectType-API.patch => 0774-More-PotionEffectType-API.patch} (100%)
 rename patches/server/{0774-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch => 0775-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch} (100%)
 rename patches/server/{0775-API-for-creating-command-sender-which-forwards-feedb.patch => 0776-API-for-creating-command-sender-which-forwards-feedb.patch} (100%)
 rename patches/server/{0776-Add-missing-structure-set-seed-configs.patch => 0777-Add-missing-structure-set-seed-configs.patch} (100%)
 rename patches/server/{0777-Implement-regenerateChunk.patch => 0778-Implement-regenerateChunk.patch} (100%)
 rename patches/server/{0778-Fix-cancelled-powdered-snow-bucket-placement.patch => 0779-Fix-cancelled-powdered-snow-bucket-placement.patch} (100%)
 rename patches/server/{0779-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch => 0780-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch} (100%)
 rename patches/server/{0780-Add-GameEvent-tags.patch => 0781-Add-GameEvent-tags.patch} (100%)
 rename patches/server/{0781-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch => 0782-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch} (100%)
 rename patches/server/{0782-Furnace-RecipesUsed-API.patch => 0783-Furnace-RecipesUsed-API.patch} (100%)
 rename patches/server/{0783-Configurable-sculk-sensor-listener-range.patch => 0784-Configurable-sculk-sensor-listener-range.patch} (100%)
 rename patches/server/{0784-Add-missing-block-data-mins-and-maxes.patch => 0785-Add-missing-block-data-mins-and-maxes.patch} (100%)
 rename patches/server/{0785-Option-to-have-default-CustomSpawners-in-custom-worl.patch => 0786-Option-to-have-default-CustomSpawners-in-custom-worl.patch} (100%)
 rename patches/server/{0786-Put-world-into-worldlist-before-initing-the-world.patch => 0787-Put-world-into-worldlist-before-initing-the-world.patch} (100%)
 rename patches/server/{0787-Fix-Entity-Position-Desync.patch => 0788-Fix-Entity-Position-Desync.patch} (100%)
 rename patches/server/{0788-Custom-Potion-Mixes.patch => 0789-Custom-Potion-Mixes.patch} (100%)
 rename patches/server/{0789-Force-close-world-loading-screen.patch => 0790-Force-close-world-loading-screen.patch} (100%)
 rename patches/server/{0790-Fix-falling-block-spawn-methods.patch => 0791-Fix-falling-block-spawn-methods.patch} (100%)
 rename patches/server/{0791-Expose-furnace-minecart-push-values.patch => 0792-Expose-furnace-minecart-push-values.patch} (100%)
 rename patches/server/{0792-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch => 0793-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch} (100%)
 rename patches/server/{0793-More-Projectile-API.patch => 0794-More-Projectile-API.patch} (100%)
 rename patches/server/{0794-Fix-swamp-hut-cat-generation-deadlock.patch => 0795-Fix-swamp-hut-cat-generation-deadlock.patch} (100%)
 rename patches/server/{0795-Don-t-allow-vehicle-movement-from-players-while-tele.patch => 0796-Don-t-allow-vehicle-movement-from-players-while-tele.patch} (100%)
 rename patches/server/{0796-Implement-getComputedBiome-API.patch => 0797-Implement-getComputedBiome-API.patch} (100%)
 rename patches/server/{0797-Make-some-itemstacks-nonnull.patch => 0798-Make-some-itemstacks-nonnull.patch} (100%)
 rename patches/server/{0798-Implement-enchantWithLevels-API.patch => 0799-Implement-enchantWithLevels-API.patch} (100%)
 rename patches/server/{0799-Fix-saving-in-unloadWorld.patch => 0800-Fix-saving-in-unloadWorld.patch} (100%)
 rename patches/server/{0800-Buffer-OOB-setBlock-calls.patch => 0801-Buffer-OOB-setBlock-calls.patch} (100%)
 rename patches/server/{0801-Add-TameableDeathMessageEvent.patch => 0802-Add-TameableDeathMessageEvent.patch} (100%)
 rename patches/server/{0802-Fix-new-block-data-for-EntityChangeBlockEvent.patch => 0803-Fix-new-block-data-for-EntityChangeBlockEvent.patch} (100%)
 rename patches/server/{0803-fix-player-loottables-running-when-mob-loot-gamerule.patch => 0804-fix-player-loottables-running-when-mob-loot-gamerule.patch} (100%)
 rename patches/server/{0804-Ensure-entity-passenger-world-matches-ridden-entity.patch => 0805-Ensure-entity-passenger-world-matches-ridden-entity.patch} (100%)
 rename patches/server/{0805-Guard-against-invalid-entity-positions.patch => 0806-Guard-against-invalid-entity-positions.patch} (100%)
 rename patches/server/{0806-cache-resource-keys.patch => 0807-cache-resource-keys.patch} (100%)
 rename patches/server/{0807-Allow-to-change-the-podium-for-the-EnderDragon.patch => 0808-Allow-to-change-the-podium-for-the-EnderDragon.patch} (100%)
 rename patches/server/{0808-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch => 0809-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch} (100%)
 rename patches/server/{0809-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch => 0810-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch} (100%)
 rename patches/server/{0810-Prevent-tile-entity-copies-loading-chunks.patch => 0811-Prevent-tile-entity-copies-loading-chunks.patch} (100%)
 rename patches/server/{0811-Use-username-instead-of-display-name-in-PlayerList-g.patch => 0812-Use-username-instead-of-display-name-in-PlayerList-g.patch} (100%)
 rename patches/server/{0812-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch => 0813-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch} (100%)
 rename patches/server/{0813-Pass-ServerLevel-for-gamerule-callbacks.patch => 0814-Pass-ServerLevel-for-gamerule-callbacks.patch} (100%)
 rename patches/server/{0814-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch => 0815-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch} (100%)
 rename patches/server/{0815-WorldCreator-keepSpawnLoaded.patch => 0816-WorldCreator-keepSpawnLoaded.patch} (100%)
 rename patches/server/{0816-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch => 0817-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch} (100%)
 rename patches/server/{0817-Add-EntityDyeEvent-and-CollarColorable-interface.patch => 0818-Add-EntityDyeEvent-and-CollarColorable-interface.patch} (100%)
 rename patches/server/{0818-Fire-CauldronLevelChange-on-initial-fill.patch => 0819-Fire-CauldronLevelChange-on-initial-fill.patch} (100%)
 rename patches/server/{0819-fix-powder-snow-cauldrons-not-turning-to-water.patch => 0820-fix-powder-snow-cauldrons-not-turning-to-water.patch} (100%)
 rename patches/server/{0820-Add-PlayerStopUsingItemEvent.patch => 0821-Add-PlayerStopUsingItemEvent.patch} (100%)
 rename patches/server/{0821-FallingBlock-auto-expire-setting.patch => 0822-FallingBlock-auto-expire-setting.patch} (100%)
 rename patches/server/{0822-Don-t-tick-markers.patch => 0823-Don-t-tick-markers.patch} (100%)
 rename patches/server/{0823-Do-not-accept-invalid-client-settings.patch => 0824-Do-not-accept-invalid-client-settings.patch} (100%)
 rename patches/server/{0824-Add-support-for-Proxy-Protocol.patch => 0825-Add-support-for-Proxy-Protocol.patch} (100%)
 rename patches/server/{0825-Fix-OfflinePlayer-getBedSpawnLocation.patch => 0826-Fix-OfflinePlayer-getBedSpawnLocation.patch} (100%)
 rename patches/server/{0826-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch => 0827-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch} (100%)
 rename patches/server/{0827-Sanitize-Sent-BlockEntity-NBT.patch => 0828-Sanitize-Sent-BlockEntity-NBT.patch} (100%)
 rename patches/server/{0828-Disable-component-selector-resolving-in-books-by-def.patch => 0829-Disable-component-selector-resolving-in-books-by-def.patch} (100%)
 rename patches/server/{0829-Prevent-entity-loading-causing-async-lookups.patch => 0830-Prevent-entity-loading-causing-async-lookups.patch} (100%)
 rename patches/server/{0830-Throw-exception-on-world-create-while-being-ticked.patch => 0831-Throw-exception-on-world-create-while-being-ticked.patch} (100%)
 rename patches/server/{0831-Add-Alternate-Current-redstone-implementation.patch => 0832-Add-Alternate-Current-redstone-implementation.patch} (100%)
 rename patches/server/{0832-Dont-resent-entity-on-art-update.patch => 0833-Dont-resent-entity-on-art-update.patch} (100%)
 rename patches/server/{0833-Add-WardenAngerChangeEvent.patch => 0834-Add-WardenAngerChangeEvent.patch} (100%)
 rename patches/server/{0834-Add-option-for-strict-advancement-dimension-checks.patch => 0835-Add-option-for-strict-advancement-dimension-checks.patch} (100%)
 rename patches/server/{0835-Add-missing-important-BlockStateListPopulator-method.patch => 0836-Add-missing-important-BlockStateListPopulator-method.patch} (100%)
 rename patches/server/{0836-Nameable-Banner-API.patch => 0837-Nameable-Banner-API.patch} (100%)
 rename patches/server/{0837-Don-t-broadcast-messages-to-command-blocks.patch => 0838-Don-t-broadcast-messages-to-command-blocks.patch} (100%)
 rename patches/server/{0838-Prevent-empty-items-from-being-added-to-world.patch => 0839-Prevent-empty-items-from-being-added-to-world.patch} (100%)
 rename patches/server/{0839-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch => 0840-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch} (100%)
 rename patches/server/{0840-Don-t-print-component-in-resource-pack-rejection-mes.patch => 0841-Don-t-print-component-in-resource-pack-rejection-mes.patch} (100%)
 rename patches/server/{0841-Add-Player-getFishHook.patch => 0842-Add-Player-getFishHook.patch} (100%)
 rename patches/server/{0842-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch => 0843-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch} (100%)
 rename patches/server/{0843-Add-various-missing-EntityDropItemEvent-calls.patch => 0844-Add-various-missing-EntityDropItemEvent-calls.patch} (100%)
 rename patches/server/{0844-Add-some-minimal-debug-information-to-chat-packet-er.patch => 0845-Add-some-minimal-debug-information-to-chat-packet-er.patch} (100%)
 rename patches/server/{0845-Fix-Bee-flower-NPE.patch => 0846-Fix-Bee-flower-NPE.patch} (100%)
 rename patches/server/{0846-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch => 0847-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch} (100%)
 rename patches/server/{0847-More-Teleport-API.patch => 0848-More-Teleport-API.patch} (100%)
 rename patches/server/{0848-Add-EntityPortalReadyEvent.patch => 0849-Add-EntityPortalReadyEvent.patch} (100%)
 rename patches/server/{0849-Don-t-use-level-random-in-entity-constructors.patch => 0850-Don-t-use-level-random-in-entity-constructors.patch} (100%)
 rename patches/server/{0850-Send-block-entities-after-destroy-prediction.patch => 0851-Send-block-entities-after-destroy-prediction.patch} (100%)
 rename patches/server/{0851-Warn-on-plugins-accessing-faraway-chunks.patch => 0852-Warn-on-plugins-accessing-faraway-chunks.patch} (100%)
 rename patches/server/{0852-Custom-Chat-Completion-Suggestions-API.patch => 0853-Custom-Chat-Completion-Suggestions-API.patch} (100%)
 rename patches/server/{0853-Add-missing-BlockFadeEvents.patch => 0854-Add-missing-BlockFadeEvents.patch} (100%)
 rename patches/server/{0854-Collision-API.patch => 0855-Collision-API.patch} (100%)
 rename patches/server/{0855-Fix-suggest-command-message-for-brigadier-syntax-exc.patch => 0856-Fix-suggest-command-message-for-brigadier-syntax-exc.patch} (100%)
 rename patches/server/{0856-Remove-invalid-signature-login-stacktrace.patch => 0857-Remove-invalid-signature-login-stacktrace.patch} (100%)
 rename patches/server/{0857-Block-Ticking-API.patch => 0858-Block-Ticking-API.patch} (100%)
 rename patches/server/{0858-Add-Velocity-IP-Forwarding-Support.patch => 0859-Add-Velocity-IP-Forwarding-Support.patch} (100%)
 rename patches/server/{0859-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch => 0860-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch} (100%)
 rename patches/server/{0860-Add-NamespacedKey-biome-methods.patch => 0861-Add-NamespacedKey-biome-methods.patch} (100%)
 rename patches/server/{0861-Fix-plugin-loggers-on-server-shutdown.patch => 0862-Fix-plugin-loggers-on-server-shutdown.patch} (100%)
 rename patches/server/{0862-Stop-large-look-changes-from-crashing-the-server.patch => 0863-Stop-large-look-changes-from-crashing-the-server.patch} (100%)
 rename patches/server/{0863-Fire-EntityChangeBlockEvent-in-more-places.patch => 0864-Fire-EntityChangeBlockEvent-in-more-places.patch} (100%)
 rename patches/server/{0864-Missing-eating-regain-reason.patch => 0865-Missing-eating-regain-reason.patch} (100%)
 rename patches/server/{0865-Missing-effect-cause.patch => 0866-Missing-effect-cause.patch} (100%)
 rename patches/server/{0866-Added-byte-array-serialization-deserialization-for-P.patch => 0867-Added-byte-array-serialization-deserialization-for-P.patch} (100%)
 rename patches/server/{0867-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch => 0868-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch} (100%)
 rename patches/server/{0868-Call-BlockPhysicsEvent-more-often.patch => 0869-Call-BlockPhysicsEvent-more-often.patch} (100%)
 rename patches/server/{0869-Configurable-chat-thread-limit.patch => 0870-Configurable-chat-thread-limit.patch} (100%)
 rename patches/server/{0870-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch => 0871-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch} (100%)
 rename patches/server/{0871-fix-Jigsaw-block-kicking-user.patch => 0872-fix-Jigsaw-block-kicking-user.patch} (100%)
 rename patches/server/{0872-use-BlockFormEvent-for-mud-converting-into-clay.patch => 0873-use-BlockFormEvent-for-mud-converting-into-clay.patch} (100%)
 rename patches/server/{0873-Add-getDrops-to-BlockState.patch => 0874-Add-getDrops-to-BlockState.patch} (100%)
 rename patches/server/{0874-Fix-a-bunch-of-vanilla-bugs.patch => 0875-Fix-a-bunch-of-vanilla-bugs.patch} (100%)
 rename patches/server/{0875-Remove-unnecessary-onTrackingStart-during-navigation.patch => 0876-Remove-unnecessary-onTrackingStart-during-navigation.patch} (100%)
 rename patches/server/{0876-Fix-custom-piglin-loved-items.patch => 0877-Fix-custom-piglin-loved-items.patch} (100%)
 rename patches/server/{0877-EntityPickupItemEvent-fixes.patch => 0878-EntityPickupItemEvent-fixes.patch} (100%)
 rename patches/server/{0878-Correctly-handle-interactions-with-items-on-cooldown.patch => 0879-Correctly-handle-interactions-with-items-on-cooldown.patch} (100%)
 rename patches/server/{0879-Add-PlayerInventorySlotChangeEvent.patch => 0880-Add-PlayerInventorySlotChangeEvent.patch} (100%)
 rename patches/server/{0880-Elder-Guardian-appearance-API.patch => 0881-Elder-Guardian-appearance-API.patch} (100%)
 rename patches/server/{0881-Allow-changing-bed-s-occupied-property.patch => 0882-Allow-changing-bed-s-occupied-property.patch} (100%)
 rename patches/server/{0882-Add-entity-knockback-API.patch => 0883-Add-entity-knockback-API.patch} (100%)
 rename patches/server/{0883-Detect-headless-JREs.patch => 0884-Detect-headless-JREs.patch} (100%)
 rename patches/server/{0884-fixed-entity-vehicle-collision-event-not-called.patch => 0885-fixed-entity-vehicle-collision-event-not-called.patch} (100%)
 rename patches/server/{0885-optimized-dirt-and-snow-spreading.patch => 0886-optimized-dirt-and-snow-spreading.patch} (100%)
 rename patches/server/{0886-Added-EntityToggleSitEvent.patch => 0887-Added-EntityToggleSitEvent.patch} (100%)
 rename patches/server/{0887-Add-fire-tick-delay-option.patch => 0888-Add-fire-tick-delay-option.patch} (100%)
 rename patches/server/{0888-Add-Moving-Piston-API.patch => 0889-Add-Moving-Piston-API.patch} (100%)
 rename patches/server/{0889-Ignore-impossible-spawn-tick.patch => 0890-Ignore-impossible-spawn-tick.patch} (100%)
 rename patches/server/{0890-Track-projectile-source-for-fireworks-from-dispenser.patch => 0891-Track-projectile-source-for-fireworks-from-dispenser.patch} (100%)
 rename patches/server/{0891-Fix-EntityArgument-suggestion-permissions-to-align-w.patch => 0892-Fix-EntityArgument-suggestion-permissions-to-align-w.patch} (100%)
 rename patches/server/{0892-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch => 0893-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch} (100%)
 rename patches/server/{0893-Prevent-compass-from-loading-chunks.patch => 0894-Prevent-compass-from-loading-chunks.patch} (100%)
 rename patches/server/{0894-Add-PrePlayerAttackEntityEvent.patch => 0895-Add-PrePlayerAttackEntityEvent.patch} (100%)
 rename patches/server/{0895-ensure-reset-EnderDragon-boss-event-name.patch => 0896-ensure-reset-EnderDragon-boss-event-name.patch} (100%)
 rename patches/server/{0896-fix-MC-252817-green-map-markers-do-not-disappear.patch => 0897-fix-MC-252817-green-map-markers-do-not-disappear.patch} (100%)
 rename patches/server/{0897-Add-Player-Warden-Warning-API.patch => 0898-Add-Player-Warden-Warning-API.patch} (100%)
 rename patches/server/{0898-More-vanilla-friendly-methods-to-update-trades.patch => 0899-More-vanilla-friendly-methods-to-update-trades.patch} (100%)
 rename patches/server/{0899-Add-paper-dumplisteners-command.patch => 0900-Add-paper-dumplisteners-command.patch} (100%)
 rename patches/server/{0900-check-global-player-list-where-appropriate.patch => 0901-check-global-player-list-where-appropriate.patch} (100%)
 rename patches/server/{0901-Fix-async-entity-add-due-to-fungus-trees.patch => 0902-Fix-async-entity-add-due-to-fungus-trees.patch} (100%)
 rename patches/server/{0902-ItemStack-damage-API.patch => 0903-ItemStack-damage-API.patch} (100%)
 rename patches/server/{0903-Friction-API.patch => 0904-Friction-API.patch} (100%)
 rename patches/server/{0904-Ability-to-control-player-s-insomnia-and-phantoms.patch => 0905-Ability-to-control-player-s-insomnia-and-phantoms.patch} (100%)
 rename patches/server/{0905-Fix-player-kick-on-shutdown.patch => 0906-Fix-player-kick-on-shutdown.patch} (100%)
 rename patches/server/{0906-Sync-offhand-slot-in-menus.patch => 0907-Sync-offhand-slot-in-menus.patch} (100%)
 rename patches/server/{0907-Player-Entity-Tracking-Events.patch => 0908-Player-Entity-Tracking-Events.patch} (100%)
 rename patches/server/{0908-Limit-pet-look-distance.patch => 0909-Limit-pet-look-distance.patch} (100%)
 rename patches/server/{0909-Properly-resend-entities.patch => 0910-Properly-resend-entities.patch} (100%)
 rename patches/server/{0910-Fixes-and-additions-to-the-SpawnReason-API.patch => 0911-Fixes-and-additions-to-the-SpawnReason-API.patch} (100%)
 rename patches/server/{0911-fix-Instruments.patch => 0912-fix-Instruments.patch} (100%)
 rename patches/server/{0912-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch => 0913-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch} (100%)
 rename patches/server/{0913-Fix-inconsistencies-in-dispense-events-regarding-sta.patch => 0914-Fix-inconsistencies-in-dispense-events-regarding-sta.patch} (100%)
 rename patches/server/{0914-Improve-logging-and-errors.patch => 0915-Improve-logging-and-errors.patch} (100%)
 rename patches/server/{0915-Add-BlockLockCheckEvent.patch => 0916-Add-BlockLockCheckEvent.patch} (100%)
 rename patches/server/{0916-Add-Sneaking-API-for-Entities.patch => 0917-Add-Sneaking-API-for-Entities.patch} (100%)
 rename patches/server/{0917-Improve-PortalEvents.patch => 0918-Improve-PortalEvents.patch} (100%)
 rename patches/server/{0918-Add-config-option-for-spider-worldborder-climbing.patch => 0919-Add-config-option-for-spider-worldborder-climbing.patch} (100%)
 rename patches/server/{0919-Add-missing-SpigotConfig-logCommands-check.patch => 0920-Add-missing-SpigotConfig-logCommands-check.patch} (100%)
 rename patches/server/{0920-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch => 0921-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch} (100%)
 rename patches/server/{0921-Flying-Fall-Damage.patch => 0922-Flying-Fall-Damage.patch} (100%)
 rename patches/server/{0922-Add-exploded-block-state-to-BlockExplodeEvent.patch => 0923-Add-exploded-block-state-to-BlockExplodeEvent.patch} (100%)
 rename patches/server/{0923-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch => 0924-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch} (100%)
 rename patches/server/{0924-config-for-disabling-entity-tag-tags.patch => 0925-config-for-disabling-entity-tag-tags.patch} (100%)
 rename patches/server/{0925-Use-single-player-info-update-packet-on-join.patch => 0926-Use-single-player-info-update-packet-on-join.patch} (100%)
 rename patches/server/{0926-Correctly-shrink-items-during-EntityResurrectEvent.patch => 0927-Correctly-shrink-items-during-EntityResurrectEvent.patch} (100%)
 rename patches/server/{0927-Win-Screen-API.patch => 0928-Win-Screen-API.patch} (100%)
 rename patches/server/{0928-Remove-CraftItemStack-setAmount-null-assignment.patch => 0929-Remove-CraftItemStack-setAmount-null-assignment.patch} (100%)
 rename patches/server/{0929-Fix-force-opening-enchantment-tables.patch => 0930-Fix-force-opening-enchantment-tables.patch} (100%)
 rename patches/server/{0930-Add-Entity-Body-Yaw-API.patch => 0931-Add-Entity-Body-Yaw-API.patch} (100%)
 rename patches/server/{0931-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch => 0932-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch} (100%)
 rename patches/server/{0932-Update-the-flag-when-a-captured-block-state-is-outda.patch => 0933-Update-the-flag-when-a-captured-block-state-is-outda.patch} (100%)
 rename patches/server/{0933-Add-EntityFertilizeEggEvent.patch => 0934-Add-EntityFertilizeEggEvent.patch} (100%)
 rename patches/server/{0934-Fix-HumanEntity-drop-not-updating-the-client-inv.patch => 0935-Fix-HumanEntity-drop-not-updating-the-client-inv.patch} (100%)
 rename patches/server/{0935-Add-CompostItemEvent-and-EntityCompostItemEvent.patch => 0936-Add-CompostItemEvent-and-EntityCompostItemEvent.patch} (100%)
 rename patches/server/{0936-Correctly-handle-ArmorStand-invisibility.patch => 0937-Correctly-handle-ArmorStand-invisibility.patch} (100%)
 rename patches/server/{0937-Fix-advancement-triggers-for-entity-damage.patch => 0938-Fix-advancement-triggers-for-entity-damage.patch} (100%)
 rename patches/server/{0938-Fix-text-display-error-on-spawn.patch => 0939-Fix-text-display-error-on-spawn.patch} (100%)
 rename patches/server/{0939-Fix-certain-inventories-returning-null-Locations.patch => 0940-Fix-certain-inventories-returning-null-Locations.patch} (100%)
 rename patches/server/{0940-Add-Shearable-API.patch => 0941-Add-Shearable-API.patch} (100%)
 rename patches/server/{0941-Fix-SpawnEggMeta-get-setSpawnedType.patch => 0942-Fix-SpawnEggMeta-get-setSpawnedType.patch} (100%)
 rename patches/server/{0942-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch => 0943-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch} (100%)
 rename patches/server/{0943-Optimize-Hoppers.patch => 0944-Optimize-Hoppers.patch} (100%)
 rename patches/server/{0944-Fix-beehives-generating-from-using-bonemeal.patch => 0945-Fix-beehives-generating-from-using-bonemeal.patch} (100%)
 rename patches/server/{0945-Fix-api-checking-banned-ips.patch => 0946-Fix-api-checking-banned-ips.patch} (100%)
 rename patches/server/{0946-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch => 0947-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch} (100%)
 rename patches/server/{0947-Treat-sequence-violations-like-they-should-be.patch => 0948-Treat-sequence-violations-like-they-should-be.patch} (100%)
 rename patches/server/{0948-remove-duplicate-animate-packet-for-records.patch => 0949-remove-duplicate-animate-packet-for-records.patch} (100%)
 rename patches/server/{0949-Prevent-causing-expired-keys-from-impacting-new-join.patch => 0950-Prevent-causing-expired-keys-from-impacting-new-join.patch} (100%)
 rename patches/server/{0950-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch => 0951-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch} (100%)
 rename patches/server/{0951-Use-array-for-gamerule-storage.patch => 0952-Use-array-for-gamerule-storage.patch} (100%)
 rename patches/server/{0952-Fix-a-couple-of-upstream-bed-issues.patch => 0953-Fix-a-couple-of-upstream-bed-issues.patch} (100%)
 rename patches/server/{0953-Fix-demo-flag-not-enabling-demo-mode.patch => 0954-Fix-demo-flag-not-enabling-demo-mode.patch} (100%)
 rename patches/server/{0954-Add-Mob-Experience-reward-API.patch => 0955-Add-Mob-Experience-reward-API.patch} (100%)
 rename patches/server/{0955-Break-redstone-on-top-of-trap-doors-early.patch => 0956-Break-redstone-on-top-of-trap-doors-early.patch} (100%)
 rename patches/server/{0956-Fix-DamageCause-for-Falling-Blocks.patch => 0957-Fix-DamageCause-for-Falling-Blocks.patch} (100%)
 rename patches/server/{0957-Avoid-Lazy-Initialization-for-Enum-Fields.patch => 0958-Avoid-Lazy-Initialization-for-Enum-Fields.patch} (100%)
 rename patches/server/{0958-More-accurate-isInOpenWater-impl.patch => 0959-More-accurate-isInOpenWater-impl.patch} (100%)
 rename patches/server/{0959-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch => 0960-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch} (100%)
 rename patches/server/{0960-Optimise-recalcBlockCounts-for-empty-sections.patch => 0961-Optimise-recalcBlockCounts-for-empty-sections.patch} (100%)
 rename patches/server/{0961-Fix-destroying-beehive-without-any-players-nearby-th.patch => 0962-Fix-destroying-beehive-without-any-players-nearby-th.patch} (100%)
 rename patches/server/{0962-Expand-PlayerItemMendEvent.patch => 0963-Expand-PlayerItemMendEvent.patch} (100%)
 rename patches/server/{0963-Refresh-ProjectileSource-for-projectiles.patch => 0964-Refresh-ProjectileSource-for-projectiles.patch} (100%)
 rename patches/server/{0964-Add-transient-modifier-API.patch => 0965-Add-transient-modifier-API.patch} (100%)
 rename patches/{removed/1.20/0972-Fix-block-place-logic.patch => server/0966-Fix-block-place-logic.patch} (57%)

diff --git a/patches/removed/1.20/0664-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0650-Allow-skipping-writing-of-comments-to-server.propert.patch
similarity index 71%
rename from patches/removed/1.20/0664-Allow-skipping-writing-of-comments-to-server.propert.patch
rename to patches/server/0650-Allow-skipping-writing-of-comments-to-server.propert.patch
index b14eca2ac6..c456bcd235 100644
--- a/patches/removed/1.20/0664-Allow-skipping-writing-of-comments-to-server.propert.patch
+++ b/patches/server/0650-Allow-skipping-writing-of-comments-to-server.propert.patch
@@ -8,10 +8,10 @@ Makes less git noise, as it won't update the date every single time
 Use -DPaper.skipServerPropertiesComments=true flag to disable writing it
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/Settings.java b/src/main/java/net/minecraft/server/dedicated/Settings.java
-index 26fc8127024d7b81ffe5c1c81b8ef8a68e35cbb6..bafd0f3492a0b8778d28610785129c5eba7fe4a2 100644
+index 9dde5b89e6de9d470b0c0b08e3aa6c471cd075fe..f6e423a76d4c9cf639f1d44af80d33cf3072f6b5 100644
 --- a/src/main/java/net/minecraft/server/dedicated/Settings.java
 +++ b/src/main/java/net/minecraft/server/dedicated/Settings.java
-@@ -23,6 +23,7 @@ public abstract class Settings<T extends Settings<T>> {
+@@ -29,6 +29,7 @@ public abstract class Settings<T extends Settings<T>> {
  
      private static final Logger LOGGER = LogUtils.getLogger();
      public final Properties properties;
@@ -19,11 +19,13 @@ index 26fc8127024d7b81ffe5c1c81b8ef8a68e35cbb6..bafd0f3492a0b8778d28610785129c5e
      // CraftBukkit start
      private OptionSet options = null;
  
-@@ -80,9 +81,47 @@ public abstract class Settings<T extends Settings<T>> {
+@@ -118,7 +119,46 @@ public abstract class Settings<T extends Settings<T>> {
+                 return;
              }
              // CraftBukkit end
-             OutputStream outputstream = Files.newOutputStream(path);
+-            BufferedWriter bufferedwriter = Files.newBufferedWriter(path, StandardCharsets.UTF_8);
 +            // Paper start - disable writing comments to properties file
++            java.io.OutputStream outputstream = Files.newOutputStream(path);
 +            java.io.BufferedOutputStream bufferedOutputStream =  !skipComments ? new java.io.BufferedOutputStream(outputstream) : new java.io.BufferedOutputStream(outputstream) {
 +                private boolean isRightAfterNewline = true; // If last written char was newline
 +                private boolean isComment = false; // Are we writing comment currently?
@@ -39,32 +41,29 @@ index 26fc8127024d7b81ffe5c1c81b8ef8a68e35cbb6..bafd0f3492a0b8778d28610785129c5e
 +                    for (int index = off; index < off + len; ++index ) {
 +                        byte c = bbuf[index];
 +                        boolean isNewline = (c == '\n' || c == '\r');
-+                        if (isNewline && isComment) {
++                        if (isNewline && this.isComment) {
 +                            // Comment has ended
-+                            isComment = false;
++                            this.isComment = false;
 +                            latest_offset = index+1;
 +                        }
-+                        if (c == '#' && isRightAfterNewline) {
-+                            isComment = true;
++                        if (c == '#' && this.isRightAfterNewline) {
++                            this.isComment = true;
 +                            if (index != latest_offset) {
 +                                // We got some non-comment data earlier
 +                                super.write(bbuf, latest_offset, index-latest_offset);
 +                            }
 +                        }
-+                        isRightAfterNewline = isNewline; // Store for next iteration
++                        this.isRightAfterNewline = isNewline; // Store for next iteration
 +
 +                    }
-+                    if (latest_offset < off+len && !isComment) {
++                    if (latest_offset < off+len && !this.isComment) {
 +                        // We have some unwritten data, that isn't part of a comment
 +                        super.write(bbuf, latest_offset, (off + len) - latest_offset);
 +                    }
 +                }
 +            };
++            BufferedWriter bufferedwriter = new BufferedWriter(new java.io.OutputStreamWriter(bufferedOutputStream, java.nio.charset.StandardCharsets.UTF_8.newEncoder()));
 +            // Paper end
  
              try {
--                this.properties.store(outputstream, "Minecraft server properties");
-+                this.properties.store(bufferedOutputStream, "Minecraft server properties"); // Paper - use bufferedOutputStream
-             } catch (Throwable throwable) {
-                 if (outputstream != null) {
-                     try {
+                 this.properties.store(bufferedwriter, "Minecraft server properties");
diff --git a/patches/server/0650-Add-PlayerSetSpawnEvent.patch b/patches/server/0651-Add-PlayerSetSpawnEvent.patch
similarity index 100%
rename from patches/server/0650-Add-PlayerSetSpawnEvent.patch
rename to patches/server/0651-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/server/0651-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0652-Make-hoppers-respect-inventory-max-stack-size.patch
similarity index 100%
rename from patches/server/0651-Make-hoppers-respect-inventory-max-stack-size.patch
rename to patches/server/0652-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0652-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0653-Optimize-entity-tracker-passenger-checks.patch
similarity index 100%
rename from patches/server/0652-Optimize-entity-tracker-passenger-checks.patch
rename to patches/server/0653-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0653-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0654-Config-option-for-Piglins-guarding-chests.patch
similarity index 100%
rename from patches/server/0653-Config-option-for-Piglins-guarding-chests.patch
rename to patches/server/0654-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0654-Added-EntityDamageItemEvent.patch b/patches/server/0655-Added-EntityDamageItemEvent.patch
similarity index 100%
rename from patches/server/0654-Added-EntityDamageItemEvent.patch
rename to patches/server/0655-Added-EntityDamageItemEvent.patch
diff --git a/patches/server/0655-Optimize-indirect-passenger-iteration.patch b/patches/server/0656-Optimize-indirect-passenger-iteration.patch
similarity index 100%
rename from patches/server/0655-Optimize-indirect-passenger-iteration.patch
rename to patches/server/0656-Optimize-indirect-passenger-iteration.patch
diff --git a/patches/server/0656-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0657-Configurable-item-frame-map-cursor-update-interval.patch
similarity index 100%
rename from patches/server/0656-Configurable-item-frame-map-cursor-update-interval.patch
rename to patches/server/0657-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0657-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0658-Make-EntityUnleashEvent-cancellable.patch
similarity index 100%
rename from patches/server/0657-Make-EntityUnleashEvent-cancellable.patch
rename to patches/server/0658-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/server/0658-Clear-bucket-NBT-after-dispense.patch b/patches/server/0659-Clear-bucket-NBT-after-dispense.patch
similarity index 100%
rename from patches/server/0658-Clear-bucket-NBT-after-dispense.patch
rename to patches/server/0659-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0659-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0660-Change-EnderEye-target-without-changing-other-things.patch
similarity index 100%
rename from patches/server/0659-Change-EnderEye-target-without-changing-other-things.patch
rename to patches/server/0660-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0660-Add-BlockBreakBlockEvent.patch b/patches/server/0661-Add-BlockBreakBlockEvent.patch
similarity index 100%
rename from patches/server/0660-Add-BlockBreakBlockEvent.patch
rename to patches/server/0661-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0661-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0662-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
similarity index 100%
rename from patches/server/0661-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
rename to patches/server/0662-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0662-More-CommandBlock-API.patch b/patches/server/0663-More-CommandBlock-API.patch
similarity index 100%
rename from patches/server/0662-More-CommandBlock-API.patch
rename to patches/server/0663-More-CommandBlock-API.patch
diff --git a/patches/server/0663-Add-missing-team-sidebar-display-slots.patch b/patches/server/0664-Add-missing-team-sidebar-display-slots.patch
similarity index 100%
rename from patches/server/0663-Add-missing-team-sidebar-display-slots.patch
rename to patches/server/0664-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0664-Add-back-EntityPortalExitEvent.patch b/patches/server/0665-Add-back-EntityPortalExitEvent.patch
similarity index 100%
rename from patches/server/0664-Add-back-EntityPortalExitEvent.patch
rename to patches/server/0665-Add-back-EntityPortalExitEvent.patch
diff --git a/patches/server/0665-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0666-Add-methods-to-find-targets-for-lightning-strikes.patch
similarity index 100%
rename from patches/server/0665-Add-methods-to-find-targets-for-lightning-strikes.patch
rename to patches/server/0666-Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/server/0666-Get-entity-default-attributes.patch b/patches/server/0667-Get-entity-default-attributes.patch
similarity index 100%
rename from patches/server/0666-Get-entity-default-attributes.patch
rename to patches/server/0667-Get-entity-default-attributes.patch
diff --git a/patches/server/0667-Left-handed-API.patch b/patches/server/0668-Left-handed-API.patch
similarity index 100%
rename from patches/server/0667-Left-handed-API.patch
rename to patches/server/0668-Left-handed-API.patch
diff --git a/patches/server/0668-Add-more-advancement-API.patch b/patches/server/0669-Add-more-advancement-API.patch
similarity index 100%
rename from patches/server/0668-Add-more-advancement-API.patch
rename to patches/server/0669-Add-more-advancement-API.patch
diff --git a/patches/server/0669-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0670-Add-ItemFactory-getSpawnEgg-API.patch
similarity index 100%
rename from patches/server/0669-Add-ItemFactory-getSpawnEgg-API.patch
rename to patches/server/0670-Add-ItemFactory-getSpawnEgg-API.patch
diff --git a/patches/server/0670-Add-critical-damage-API.patch b/patches/server/0671-Add-critical-damage-API.patch
similarity index 100%
rename from patches/server/0670-Add-critical-damage-API.patch
rename to patches/server/0671-Add-critical-damage-API.patch
diff --git a/patches/server/0671-Fix-issues-with-mob-conversion.patch b/patches/server/0672-Fix-issues-with-mob-conversion.patch
similarity index 100%
rename from patches/server/0671-Fix-issues-with-mob-conversion.patch
rename to patches/server/0672-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0672-Add-isCollidable-methods-to-various-places.patch b/patches/server/0673-Add-isCollidable-methods-to-various-places.patch
similarity index 100%
rename from patches/server/0672-Add-isCollidable-methods-to-various-places.patch
rename to patches/server/0673-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/server/0673-Goat-ram-API.patch b/patches/server/0674-Goat-ram-API.patch
similarity index 100%
rename from patches/server/0673-Goat-ram-API.patch
rename to patches/server/0674-Goat-ram-API.patch
diff --git a/patches/server/0674-Add-API-for-resetting-a-single-score.patch b/patches/server/0675-Add-API-for-resetting-a-single-score.patch
similarity index 100%
rename from patches/server/0674-Add-API-for-resetting-a-single-score.patch
rename to patches/server/0675-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0675-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0676-Add-Raw-Byte-Entity-Serialization.patch
similarity index 100%
rename from patches/server/0675-Add-Raw-Byte-Entity-Serialization.patch
rename to patches/server/0676-Add-Raw-Byte-Entity-Serialization.patch
diff --git a/patches/server/0676-Vanilla-command-permission-fixes.patch b/patches/server/0677-Vanilla-command-permission-fixes.patch
similarity index 100%
rename from patches/server/0676-Vanilla-command-permission-fixes.patch
rename to patches/server/0677-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0677-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0678-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
similarity index 100%
rename from patches/server/0677-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
rename to patches/server/0678-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
diff --git a/patches/server/0678-Fix-GameProfileCache-concurrency.patch b/patches/server/0679-Fix-GameProfileCache-concurrency.patch
similarity index 100%
rename from patches/server/0678-Fix-GameProfileCache-concurrency.patch
rename to patches/server/0679-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0679-Improve-and-expand-AsyncCatcher.patch b/patches/server/0680-Improve-and-expand-AsyncCatcher.patch
similarity index 100%
rename from patches/server/0679-Improve-and-expand-AsyncCatcher.patch
rename to patches/server/0680-Improve-and-expand-AsyncCatcher.patch
diff --git a/patches/server/0680-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0681-Add-paper-mobcaps-and-paper-playermobcaps.patch
similarity index 100%
rename from patches/server/0680-Add-paper-mobcaps-and-paper-playermobcaps.patch
rename to patches/server/0681-Add-paper-mobcaps-and-paper-playermobcaps.patch
diff --git a/patches/server/0681-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0682-Sanitize-ResourceLocation-error-logging.patch
similarity index 100%
rename from patches/server/0681-Sanitize-ResourceLocation-error-logging.patch
rename to patches/server/0682-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0682-Allow-controlled-flushing-for-network-manager.patch b/patches/server/0683-Allow-controlled-flushing-for-network-manager.patch
similarity index 100%
rename from patches/server/0682-Allow-controlled-flushing-for-network-manager.patch
rename to patches/server/0683-Allow-controlled-flushing-for-network-manager.patch
diff --git a/patches/server/0683-Optimise-general-POI-access.patch b/patches/server/0684-Optimise-general-POI-access.patch
similarity index 100%
rename from patches/server/0683-Optimise-general-POI-access.patch
rename to patches/server/0684-Optimise-general-POI-access.patch
diff --git a/patches/server/0684-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch b/patches/server/0685-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
similarity index 100%
rename from patches/server/0684-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
rename to patches/server/0685-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
diff --git a/patches/server/0685-Optimise-chunk-tick-iteration.patch b/patches/server/0686-Optimise-chunk-tick-iteration.patch
similarity index 100%
rename from patches/server/0685-Optimise-chunk-tick-iteration.patch
rename to patches/server/0686-Optimise-chunk-tick-iteration.patch
diff --git a/patches/server/0686-Execute-chunk-tasks-mid-tick.patch b/patches/server/0687-Execute-chunk-tasks-mid-tick.patch
similarity index 100%
rename from patches/server/0686-Execute-chunk-tasks-mid-tick.patch
rename to patches/server/0687-Execute-chunk-tasks-mid-tick.patch
diff --git a/patches/server/0687-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0688-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
similarity index 100%
rename from patches/server/0687-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
rename to patches/server/0688-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/0688-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0689-Custom-table-implementation-for-blockstate-state-loo.patch
similarity index 100%
rename from patches/server/0688-Custom-table-implementation-for-blockstate-state-loo.patch
rename to patches/server/0689-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/0689-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0690-Detail-more-information-in-watchdog-dumps.patch
similarity index 100%
rename from patches/server/0689-Detail-more-information-in-watchdog-dumps.patch
rename to patches/server/0690-Detail-more-information-in-watchdog-dumps.patch
diff --git a/patches/server/0690-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0691-Manually-inline-methods-in-BlockPosition.patch
similarity index 100%
rename from patches/server/0690-Manually-inline-methods-in-BlockPosition.patch
rename to patches/server/0691-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0691-Distance-manager-tick-timings.patch b/patches/server/0692-Distance-manager-tick-timings.patch
similarity index 100%
rename from patches/server/0691-Distance-manager-tick-timings.patch
rename to patches/server/0692-Distance-manager-tick-timings.patch
diff --git a/patches/server/0692-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0693-Name-craft-scheduler-threads-according-to-the-plugin.patch
similarity index 100%
rename from patches/server/0692-Name-craft-scheduler-threads-according-to-the-plugin.patch
rename to patches/server/0693-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0693-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0694-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
similarity index 100%
rename from patches/server/0693-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
rename to patches/server/0694-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0694-Add-packet-limiter-config.patch b/patches/server/0695-Add-packet-limiter-config.patch
similarity index 100%
rename from patches/server/0694-Add-packet-limiter-config.patch
rename to patches/server/0695-Add-packet-limiter-config.patch
diff --git a/patches/server/0695-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0696-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
similarity index 100%
rename from patches/server/0695-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
rename to patches/server/0696-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0696-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/server/0697-Consolidate-flush-calls-for-entity-tracker-packets.patch
similarity index 100%
rename from patches/server/0696-Consolidate-flush-calls-for-entity-tracker-packets.patch
rename to patches/server/0697-Consolidate-flush-calls-for-entity-tracker-packets.patch
diff --git a/patches/server/0697-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0698-Don-t-lookup-fluid-state-when-raytracing.patch
similarity index 100%
rename from patches/server/0697-Don-t-lookup-fluid-state-when-raytracing.patch
rename to patches/server/0698-Don-t-lookup-fluid-state-when-raytracing.patch
diff --git a/patches/server/0698-Time-scoreboard-search.patch b/patches/server/0699-Time-scoreboard-search.patch
similarity index 100%
rename from patches/server/0698-Time-scoreboard-search.patch
rename to patches/server/0699-Time-scoreboard-search.patch
diff --git a/patches/server/0699-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0700-Send-full-pos-packets-for-hard-colliding-entities.patch
similarity index 100%
rename from patches/server/0699-Send-full-pos-packets-for-hard-colliding-entities.patch
rename to patches/server/0700-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/0700-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0701-Do-not-run-raytrace-logic-for-AIR.patch
similarity index 100%
rename from patches/server/0700-Do-not-run-raytrace-logic-for-AIR.patch
rename to patches/server/0701-Do-not-run-raytrace-logic-for-AIR.patch
diff --git a/patches/server/0701-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0702-Oprimise-map-impl-for-tracked-players.patch
similarity index 100%
rename from patches/server/0701-Oprimise-map-impl-for-tracked-players.patch
rename to patches/server/0702-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0702-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0703-Optimise-BlockSoil-nearby-water-lookup.patch
similarity index 100%
rename from patches/server/0702-Optimise-BlockSoil-nearby-water-lookup.patch
rename to patches/server/0703-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0703-Optimise-random-block-ticking.patch b/patches/server/0704-Optimise-random-block-ticking.patch
similarity index 100%
rename from patches/server/0703-Optimise-random-block-ticking.patch
rename to patches/server/0704-Optimise-random-block-ticking.patch
diff --git a/patches/server/0704-Optimise-non-flush-packet-sending.patch b/patches/server/0705-Optimise-non-flush-packet-sending.patch
similarity index 100%
rename from patches/server/0704-Optimise-non-flush-packet-sending.patch
rename to patches/server/0705-Optimise-non-flush-packet-sending.patch
diff --git a/patches/server/0705-Optimise-nearby-player-lookups.patch b/patches/server/0706-Optimise-nearby-player-lookups.patch
similarity index 100%
rename from patches/server/0705-Optimise-nearby-player-lookups.patch
rename to patches/server/0706-Optimise-nearby-player-lookups.patch
diff --git a/patches/server/0706-Remove-streams-for-villager-AI.patch b/patches/server/0707-Remove-streams-for-villager-AI.patch
similarity index 100%
rename from patches/server/0706-Remove-streams-for-villager-AI.patch
rename to patches/server/0707-Remove-streams-for-villager-AI.patch
diff --git a/patches/server/0707-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0708-Use-Velocity-compression-and-cipher-natives.patch
similarity index 100%
rename from patches/server/0707-Use-Velocity-compression-and-cipher-natives.patch
rename to patches/server/0708-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/server/0708-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0709-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
similarity index 100%
rename from patches/server/0708-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
rename to patches/server/0709-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
diff --git a/patches/server/0709-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0710-Fix-Bukkit-NamespacedKey-shenanigans.patch
similarity index 100%
rename from patches/server/0709-Fix-Bukkit-NamespacedKey-shenanigans.patch
rename to patches/server/0710-Fix-Bukkit-NamespacedKey-shenanigans.patch
diff --git a/patches/server/0710-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0711-Fix-merchant-inventory-not-closing-on-entity-removal.patch
similarity index 100%
rename from patches/server/0710-Fix-merchant-inventory-not-closing-on-entity-removal.patch
rename to patches/server/0711-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0711-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0712-Check-requirement-before-suggesting-root-nodes.patch
similarity index 100%
rename from patches/server/0711-Check-requirement-before-suggesting-root-nodes.patch
rename to patches/server/0712-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0712-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0713-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
similarity index 100%
rename from patches/server/0712-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
rename to patches/server/0713-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
diff --git a/patches/server/0713-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0714-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
similarity index 100%
rename from patches/server/0713-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
rename to patches/server/0714-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0714-Ensure-valid-vehicle-status.patch b/patches/server/0715-Ensure-valid-vehicle-status.patch
similarity index 100%
rename from patches/server/0714-Ensure-valid-vehicle-status.patch
rename to patches/server/0715-Ensure-valid-vehicle-status.patch
diff --git a/patches/server/0715-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0716-Prevent-softlocked-end-exit-portal-generation.patch
similarity index 100%
rename from patches/server/0715-Prevent-softlocked-end-exit-portal-generation.patch
rename to patches/server/0716-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0716-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0717-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
similarity index 100%
rename from patches/server/0716-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
rename to patches/server/0717-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0717-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0718-Don-t-log-debug-logging-being-disabled.patch
similarity index 100%
rename from patches/server/0717-Don-t-log-debug-logging-being-disabled.patch
rename to patches/server/0718-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0718-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0719-fix-various-menus-with-empty-level-accesses.patch
similarity index 100%
rename from patches/server/0718-fix-various-menus-with-empty-level-accesses.patch
rename to patches/server/0719-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0719-Preserve-overstacked-loot.patch b/patches/server/0720-Preserve-overstacked-loot.patch
similarity index 100%
rename from patches/server/0719-Preserve-overstacked-loot.patch
rename to patches/server/0720-Preserve-overstacked-loot.patch
diff --git a/patches/server/0720-Update-head-rotation-in-missing-places.patch b/patches/server/0721-Update-head-rotation-in-missing-places.patch
similarity index 100%
rename from patches/server/0720-Update-head-rotation-in-missing-places.patch
rename to patches/server/0721-Update-head-rotation-in-missing-places.patch
diff --git a/patches/server/0721-prevent-unintended-light-block-manipulation.patch b/patches/server/0722-prevent-unintended-light-block-manipulation.patch
similarity index 100%
rename from patches/server/0721-prevent-unintended-light-block-manipulation.patch
rename to patches/server/0722-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0722-Fix-CraftCriteria-defaults-map.patch b/patches/server/0723-Fix-CraftCriteria-defaults-map.patch
similarity index 100%
rename from patches/server/0722-Fix-CraftCriteria-defaults-map.patch
rename to patches/server/0723-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0723-Fix-upstreams-block-state-factories.patch b/patches/server/0724-Fix-upstreams-block-state-factories.patch
similarity index 100%
rename from patches/server/0723-Fix-upstreams-block-state-factories.patch
rename to patches/server/0724-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0724-Add-config-option-for-logging-player-ip-addresses.patch b/patches/server/0725-Add-config-option-for-logging-player-ip-addresses.patch
similarity index 100%
rename from patches/server/0724-Add-config-option-for-logging-player-ip-addresses.patch
rename to patches/server/0725-Add-config-option-for-logging-player-ip-addresses.patch
diff --git a/patches/server/0725-Configurable-feature-seeds.patch b/patches/server/0726-Configurable-feature-seeds.patch
similarity index 100%
rename from patches/server/0725-Configurable-feature-seeds.patch
rename to patches/server/0726-Configurable-feature-seeds.patch
diff --git a/patches/server/0726-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/server/0727-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
similarity index 100%
rename from patches/server/0726-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
rename to patches/server/0727-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
diff --git a/patches/server/0727-Add-root-admin-user-detection.patch b/patches/server/0728-Add-root-admin-user-detection.patch
similarity index 100%
rename from patches/server/0727-Add-root-admin-user-detection.patch
rename to patches/server/0728-Add-root-admin-user-detection.patch
diff --git a/patches/server/0728-Always-allow-item-changing-in-Fireball.patch b/patches/server/0729-Always-allow-item-changing-in-Fireball.patch
similarity index 100%
rename from patches/server/0728-Always-allow-item-changing-in-Fireball.patch
rename to patches/server/0729-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0729-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0730-don-t-attempt-to-teleport-dead-entities.patch
similarity index 100%
rename from patches/server/0729-don-t-attempt-to-teleport-dead-entities.patch
rename to patches/server/0730-don-t-attempt-to-teleport-dead-entities.patch
diff --git a/patches/server/0730-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0731-Prevent-excessive-velocity-through-repeated-crits.patch
similarity index 100%
rename from patches/server/0730-Prevent-excessive-velocity-through-repeated-crits.patch
rename to patches/server/0731-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0731-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0732-Remove-client-side-code-using-deprecated-for-removal.patch
similarity index 100%
rename from patches/server/0731-Remove-client-side-code-using-deprecated-for-removal.patch
rename to patches/server/0732-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0732-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0733-Fix-removing-recipes-from-RecipeIterator.patch
similarity index 100%
rename from patches/server/0732-Fix-removing-recipes-from-RecipeIterator.patch
rename to patches/server/0733-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0733-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0734-Prevent-sending-oversized-item-data-in-equipment-and.patch
similarity index 100%
rename from patches/server/0733-Prevent-sending-oversized-item-data-in-equipment-and.patch
rename to patches/server/0734-Prevent-sending-oversized-item-data-in-equipment-and.patch
diff --git a/patches/server/0734-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0735-Hide-unnecessary-itemmeta-from-clients.patch
similarity index 100%
rename from patches/server/0734-Hide-unnecessary-itemmeta-from-clients.patch
rename to patches/server/0735-Hide-unnecessary-itemmeta-from-clients.patch
diff --git a/patches/server/0735-Fix-Spigot-growth-modifiers.patch b/patches/server/0736-Fix-Spigot-growth-modifiers.patch
similarity index 100%
rename from patches/server/0735-Fix-Spigot-growth-modifiers.patch
rename to patches/server/0736-Fix-Spigot-growth-modifiers.patch
diff --git a/patches/server/0736-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0737-Prevent-ContainerOpenersCounter-openCount-from-going.patch
similarity index 100%
rename from patches/server/0736-Prevent-ContainerOpenersCounter-openCount-from-going.patch
rename to patches/server/0737-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0737-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0738-Add-PlayerItemFrameChangeEvent.patch
similarity index 100%
rename from patches/server/0737-Add-PlayerItemFrameChangeEvent.patch
rename to patches/server/0738-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0738-Add-player-health-update-API.patch b/patches/server/0739-Add-player-health-update-API.patch
similarity index 100%
rename from patches/server/0738-Add-player-health-update-API.patch
rename to patches/server/0739-Add-player-health-update-API.patch
diff --git a/patches/server/0739-Optimize-HashMapPalette.patch b/patches/server/0740-Optimize-HashMapPalette.patch
similarity index 100%
rename from patches/server/0739-Optimize-HashMapPalette.patch
rename to patches/server/0740-Optimize-HashMapPalette.patch
diff --git a/patches/server/0740-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0741-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 100%
rename from patches/server/0740-Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/server/0741-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0741-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0742-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
similarity index 100%
rename from patches/server/0741-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
rename to patches/server/0742-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
diff --git a/patches/server/0742-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0743-Optimise-collision-checking-in-player-move-packet-ha.patch
similarity index 100%
rename from patches/server/0742-Optimise-collision-checking-in-player-move-packet-ha.patch
rename to patches/server/0743-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/0743-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0744-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
similarity index 100%
rename from patches/server/0743-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
rename to patches/server/0744-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0744-Add-more-Campfire-API.patch b/patches/server/0745-Add-more-Campfire-API.patch
similarity index 100%
rename from patches/server/0744-Add-more-Campfire-API.patch
rename to patches/server/0745-Add-more-Campfire-API.patch
diff --git a/patches/server/0745-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0746-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
similarity index 100%
rename from patches/server/0745-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
rename to patches/server/0746-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0746-Fix-tripwire-state-inconsistency.patch b/patches/server/0747-Fix-tripwire-state-inconsistency.patch
similarity index 100%
rename from patches/server/0746-Fix-tripwire-state-inconsistency.patch
rename to patches/server/0747-Fix-tripwire-state-inconsistency.patch
diff --git a/patches/server/0747-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0748-Forward-CraftEntity-in-teleport-command.patch
similarity index 100%
rename from patches/server/0747-Forward-CraftEntity-in-teleport-command.patch
rename to patches/server/0748-Forward-CraftEntity-in-teleport-command.patch
diff --git a/patches/server/0748-Improve-scoreboard-entries.patch b/patches/server/0749-Improve-scoreboard-entries.patch
similarity index 100%
rename from patches/server/0748-Improve-scoreboard-entries.patch
rename to patches/server/0749-Improve-scoreboard-entries.patch
diff --git a/patches/server/0749-Entity-powdered-snow-API.patch b/patches/server/0750-Entity-powdered-snow-API.patch
similarity index 100%
rename from patches/server/0749-Entity-powdered-snow-API.patch
rename to patches/server/0750-Entity-powdered-snow-API.patch
diff --git a/patches/server/0750-Add-API-for-item-entity-health.patch b/patches/server/0751-Add-API-for-item-entity-health.patch
similarity index 100%
rename from patches/server/0750-Add-API-for-item-entity-health.patch
rename to patches/server/0751-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0751-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0752-Fix-entity-type-tags-suggestions-in-selectors.patch
similarity index 100%
rename from patches/server/0751-Fix-entity-type-tags-suggestions-in-selectors.patch
rename to patches/server/0752-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/0752-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0753-Configurable-max-block-light-for-monster-spawning.patch
similarity index 100%
rename from patches/server/0752-Configurable-max-block-light-for-monster-spawning.patch
rename to patches/server/0753-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0753-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0754-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
similarity index 100%
rename from patches/server/0753-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
rename to patches/server/0754-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0754-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0755-Load-effect-amplifiers-greater-than-127-correctly.patch
similarity index 100%
rename from patches/server/0754-Load-effect-amplifiers-greater-than-127-correctly.patch
rename to patches/server/0755-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0755-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0756-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
similarity index 100%
rename from patches/server/0755-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
rename to patches/server/0756-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0756-Fix-bees-aging-inside-hives.patch b/patches/server/0757-Fix-bees-aging-inside-hives.patch
similarity index 100%
rename from patches/server/0756-Fix-bees-aging-inside-hives.patch
rename to patches/server/0757-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0757-Bucketable-API.patch b/patches/server/0758-Bucketable-API.patch
similarity index 100%
rename from patches/server/0757-Bucketable-API.patch
rename to patches/server/0758-Bucketable-API.patch
diff --git a/patches/server/0758-Validate-usernames.patch b/patches/server/0759-Validate-usernames.patch
similarity index 100%
rename from patches/server/0758-Validate-usernames.patch
rename to patches/server/0759-Validate-usernames.patch
diff --git a/patches/server/0759-Make-water-animal-spawn-height-configurable.patch b/patches/server/0760-Make-water-animal-spawn-height-configurable.patch
similarity index 100%
rename from patches/server/0759-Make-water-animal-spawn-height-configurable.patch
rename to patches/server/0760-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0760-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0761-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
similarity index 100%
rename from patches/server/0760-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
rename to patches/server/0761-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
diff --git a/patches/server/0761-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0762-Add-config-option-for-worlds-affected-by-time-cmd.patch
similarity index 100%
rename from patches/server/0761-Add-config-option-for-worlds-affected-by-time-cmd.patch
rename to patches/server/0762-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0762-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0763-Add-new-overload-to-PersistentDataContainer-has.patch
similarity index 100%
rename from patches/server/0762-Add-new-overload-to-PersistentDataContainer-has.patch
rename to patches/server/0763-Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/server/0763-Multiple-Entries-with-Scoreboards.patch b/patches/server/0764-Multiple-Entries-with-Scoreboards.patch
similarity index 100%
rename from patches/server/0763-Multiple-Entries-with-Scoreboards.patch
rename to patches/server/0764-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0764-Reset-placed-block-on-exception.patch b/patches/server/0765-Reset-placed-block-on-exception.patch
similarity index 100%
rename from patches/server/0764-Reset-placed-block-on-exception.patch
rename to patches/server/0765-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0765-Add-configurable-height-for-slime-spawn.patch b/patches/server/0766-Add-configurable-height-for-slime-spawn.patch
similarity index 100%
rename from patches/server/0765-Add-configurable-height-for-slime-spawn.patch
rename to patches/server/0766-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0766-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0767-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0766-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0767-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0767-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0768-Fix-xp-reward-for-baby-zombies.patch
similarity index 100%
rename from patches/server/0767-Fix-xp-reward-for-baby-zombies.patch
rename to patches/server/0768-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0768-Kick-on-main-for-illegal-chat.patch b/patches/server/0769-Kick-on-main-for-illegal-chat.patch
similarity index 100%
rename from patches/server/0768-Kick-on-main-for-illegal-chat.patch
rename to patches/server/0769-Kick-on-main-for-illegal-chat.patch
diff --git a/patches/server/0769-Multi-Block-Change-API-Implementation.patch b/patches/server/0770-Multi-Block-Change-API-Implementation.patch
similarity index 100%
rename from patches/server/0769-Multi-Block-Change-API-Implementation.patch
rename to patches/server/0770-Multi-Block-Change-API-Implementation.patch
diff --git a/patches/server/0770-Fix-NotePlayEvent.patch b/patches/server/0771-Fix-NotePlayEvent.patch
similarity index 100%
rename from patches/server/0770-Fix-NotePlayEvent.patch
rename to patches/server/0771-Fix-NotePlayEvent.patch
diff --git a/patches/server/0771-Freeze-Tick-Lock-API.patch b/patches/server/0772-Freeze-Tick-Lock-API.patch
similarity index 100%
rename from patches/server/0771-Freeze-Tick-Lock-API.patch
rename to patches/server/0772-Freeze-Tick-Lock-API.patch
diff --git a/patches/server/0772-Dolphin-API.patch b/patches/server/0773-Dolphin-API.patch
similarity index 100%
rename from patches/server/0772-Dolphin-API.patch
rename to patches/server/0773-Dolphin-API.patch
diff --git a/patches/server/0773-More-PotionEffectType-API.patch b/patches/server/0774-More-PotionEffectType-API.patch
similarity index 100%
rename from patches/server/0773-More-PotionEffectType-API.patch
rename to patches/server/0774-More-PotionEffectType-API.patch
diff --git a/patches/server/0774-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0775-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
similarity index 100%
rename from patches/server/0774-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
rename to patches/server/0775-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0775-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0776-API-for-creating-command-sender-which-forwards-feedb.patch
similarity index 100%
rename from patches/server/0775-API-for-creating-command-sender-which-forwards-feedb.patch
rename to patches/server/0776-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/server/0776-Add-missing-structure-set-seed-configs.patch b/patches/server/0777-Add-missing-structure-set-seed-configs.patch
similarity index 100%
rename from patches/server/0776-Add-missing-structure-set-seed-configs.patch
rename to patches/server/0777-Add-missing-structure-set-seed-configs.patch
diff --git a/patches/server/0777-Implement-regenerateChunk.patch b/patches/server/0778-Implement-regenerateChunk.patch
similarity index 100%
rename from patches/server/0777-Implement-regenerateChunk.patch
rename to patches/server/0778-Implement-regenerateChunk.patch
diff --git a/patches/server/0778-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0779-Fix-cancelled-powdered-snow-bucket-placement.patch
similarity index 100%
rename from patches/server/0778-Fix-cancelled-powdered-snow-bucket-placement.patch
rename to patches/server/0779-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0779-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0780-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
similarity index 100%
rename from patches/server/0779-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
rename to patches/server/0780-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0780-Add-GameEvent-tags.patch b/patches/server/0781-Add-GameEvent-tags.patch
similarity index 100%
rename from patches/server/0780-Add-GameEvent-tags.patch
rename to patches/server/0781-Add-GameEvent-tags.patch
diff --git a/patches/server/0781-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0782-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
similarity index 100%
rename from patches/server/0781-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
rename to patches/server/0782-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0782-Furnace-RecipesUsed-API.patch b/patches/server/0783-Furnace-RecipesUsed-API.patch
similarity index 100%
rename from patches/server/0782-Furnace-RecipesUsed-API.patch
rename to patches/server/0783-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0783-Configurable-sculk-sensor-listener-range.patch b/patches/server/0784-Configurable-sculk-sensor-listener-range.patch
similarity index 100%
rename from patches/server/0783-Configurable-sculk-sensor-listener-range.patch
rename to patches/server/0784-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0784-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0785-Add-missing-block-data-mins-and-maxes.patch
similarity index 100%
rename from patches/server/0784-Add-missing-block-data-mins-and-maxes.patch
rename to patches/server/0785-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0785-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0786-Option-to-have-default-CustomSpawners-in-custom-worl.patch
similarity index 100%
rename from patches/server/0785-Option-to-have-default-CustomSpawners-in-custom-worl.patch
rename to patches/server/0786-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0786-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0787-Put-world-into-worldlist-before-initing-the-world.patch
similarity index 100%
rename from patches/server/0786-Put-world-into-worldlist-before-initing-the-world.patch
rename to patches/server/0787-Put-world-into-worldlist-before-initing-the-world.patch
diff --git a/patches/server/0787-Fix-Entity-Position-Desync.patch b/patches/server/0788-Fix-Entity-Position-Desync.patch
similarity index 100%
rename from patches/server/0787-Fix-Entity-Position-Desync.patch
rename to patches/server/0788-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0788-Custom-Potion-Mixes.patch b/patches/server/0789-Custom-Potion-Mixes.patch
similarity index 100%
rename from patches/server/0788-Custom-Potion-Mixes.patch
rename to patches/server/0789-Custom-Potion-Mixes.patch
diff --git a/patches/server/0789-Force-close-world-loading-screen.patch b/patches/server/0790-Force-close-world-loading-screen.patch
similarity index 100%
rename from patches/server/0789-Force-close-world-loading-screen.patch
rename to patches/server/0790-Force-close-world-loading-screen.patch
diff --git a/patches/server/0790-Fix-falling-block-spawn-methods.patch b/patches/server/0791-Fix-falling-block-spawn-methods.patch
similarity index 100%
rename from patches/server/0790-Fix-falling-block-spawn-methods.patch
rename to patches/server/0791-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0791-Expose-furnace-minecart-push-values.patch b/patches/server/0792-Expose-furnace-minecart-push-values.patch
similarity index 100%
rename from patches/server/0791-Expose-furnace-minecart-push-values.patch
rename to patches/server/0792-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0792-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0793-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
similarity index 100%
rename from patches/server/0792-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
rename to patches/server/0793-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0793-More-Projectile-API.patch b/patches/server/0794-More-Projectile-API.patch
similarity index 100%
rename from patches/server/0793-More-Projectile-API.patch
rename to patches/server/0794-More-Projectile-API.patch
diff --git a/patches/server/0794-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0795-Fix-swamp-hut-cat-generation-deadlock.patch
similarity index 100%
rename from patches/server/0794-Fix-swamp-hut-cat-generation-deadlock.patch
rename to patches/server/0795-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0795-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0796-Don-t-allow-vehicle-movement-from-players-while-tele.patch
similarity index 100%
rename from patches/server/0795-Don-t-allow-vehicle-movement-from-players-while-tele.patch
rename to patches/server/0796-Don-t-allow-vehicle-movement-from-players-while-tele.patch
diff --git a/patches/server/0796-Implement-getComputedBiome-API.patch b/patches/server/0797-Implement-getComputedBiome-API.patch
similarity index 100%
rename from patches/server/0796-Implement-getComputedBiome-API.patch
rename to patches/server/0797-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0797-Make-some-itemstacks-nonnull.patch b/patches/server/0798-Make-some-itemstacks-nonnull.patch
similarity index 100%
rename from patches/server/0797-Make-some-itemstacks-nonnull.patch
rename to patches/server/0798-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0798-Implement-enchantWithLevels-API.patch b/patches/server/0799-Implement-enchantWithLevels-API.patch
similarity index 100%
rename from patches/server/0798-Implement-enchantWithLevels-API.patch
rename to patches/server/0799-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0799-Fix-saving-in-unloadWorld.patch b/patches/server/0800-Fix-saving-in-unloadWorld.patch
similarity index 100%
rename from patches/server/0799-Fix-saving-in-unloadWorld.patch
rename to patches/server/0800-Fix-saving-in-unloadWorld.patch
diff --git a/patches/server/0800-Buffer-OOB-setBlock-calls.patch b/patches/server/0801-Buffer-OOB-setBlock-calls.patch
similarity index 100%
rename from patches/server/0800-Buffer-OOB-setBlock-calls.patch
rename to patches/server/0801-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0801-Add-TameableDeathMessageEvent.patch b/patches/server/0802-Add-TameableDeathMessageEvent.patch
similarity index 100%
rename from patches/server/0801-Add-TameableDeathMessageEvent.patch
rename to patches/server/0802-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0802-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0803-Fix-new-block-data-for-EntityChangeBlockEvent.patch
similarity index 100%
rename from patches/server/0802-Fix-new-block-data-for-EntityChangeBlockEvent.patch
rename to patches/server/0803-Fix-new-block-data-for-EntityChangeBlockEvent.patch
diff --git a/patches/server/0803-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0804-fix-player-loottables-running-when-mob-loot-gamerule.patch
similarity index 100%
rename from patches/server/0803-fix-player-loottables-running-when-mob-loot-gamerule.patch
rename to patches/server/0804-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff --git a/patches/server/0804-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0805-Ensure-entity-passenger-world-matches-ridden-entity.patch
similarity index 100%
rename from patches/server/0804-Ensure-entity-passenger-world-matches-ridden-entity.patch
rename to patches/server/0805-Ensure-entity-passenger-world-matches-ridden-entity.patch
diff --git a/patches/server/0805-Guard-against-invalid-entity-positions.patch b/patches/server/0806-Guard-against-invalid-entity-positions.patch
similarity index 100%
rename from patches/server/0805-Guard-against-invalid-entity-positions.patch
rename to patches/server/0806-Guard-against-invalid-entity-positions.patch
diff --git a/patches/server/0806-cache-resource-keys.patch b/patches/server/0807-cache-resource-keys.patch
similarity index 100%
rename from patches/server/0806-cache-resource-keys.patch
rename to patches/server/0807-cache-resource-keys.patch
diff --git a/patches/server/0807-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0808-Allow-to-change-the-podium-for-the-EnderDragon.patch
similarity index 100%
rename from patches/server/0807-Allow-to-change-the-podium-for-the-EnderDragon.patch
rename to patches/server/0808-Allow-to-change-the-podium-for-the-EnderDragon.patch
diff --git a/patches/server/0808-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0809-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
similarity index 100%
rename from patches/server/0808-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
rename to patches/server/0809-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0809-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0810-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
similarity index 100%
rename from patches/server/0809-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
rename to patches/server/0810-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
diff --git a/patches/server/0810-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0811-Prevent-tile-entity-copies-loading-chunks.patch
similarity index 100%
rename from patches/server/0810-Prevent-tile-entity-copies-loading-chunks.patch
rename to patches/server/0811-Prevent-tile-entity-copies-loading-chunks.patch
diff --git a/patches/server/0811-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0812-Use-username-instead-of-display-name-in-PlayerList-g.patch
similarity index 100%
rename from patches/server/0811-Use-username-instead-of-display-name-in-PlayerList-g.patch
rename to patches/server/0812-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0812-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/server/0813-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
similarity index 100%
rename from patches/server/0812-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
rename to patches/server/0813-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
diff --git a/patches/server/0813-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0814-Pass-ServerLevel-for-gamerule-callbacks.patch
similarity index 100%
rename from patches/server/0813-Pass-ServerLevel-for-gamerule-callbacks.patch
rename to patches/server/0814-Pass-ServerLevel-for-gamerule-callbacks.patch
diff --git a/patches/server/0814-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0815-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
similarity index 100%
rename from patches/server/0814-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
rename to patches/server/0815-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/server/0815-WorldCreator-keepSpawnLoaded.patch b/patches/server/0816-WorldCreator-keepSpawnLoaded.patch
similarity index 100%
rename from patches/server/0815-WorldCreator-keepSpawnLoaded.patch
rename to patches/server/0816-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/server/0816-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0817-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
similarity index 100%
rename from patches/server/0816-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
rename to patches/server/0817-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0817-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0818-Add-EntityDyeEvent-and-CollarColorable-interface.patch
similarity index 100%
rename from patches/server/0817-Add-EntityDyeEvent-and-CollarColorable-interface.patch
rename to patches/server/0818-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0818-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0819-Fire-CauldronLevelChange-on-initial-fill.patch
similarity index 100%
rename from patches/server/0818-Fire-CauldronLevelChange-on-initial-fill.patch
rename to patches/server/0819-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0819-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0820-fix-powder-snow-cauldrons-not-turning-to-water.patch
similarity index 100%
rename from patches/server/0819-fix-powder-snow-cauldrons-not-turning-to-water.patch
rename to patches/server/0820-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0820-Add-PlayerStopUsingItemEvent.patch b/patches/server/0821-Add-PlayerStopUsingItemEvent.patch
similarity index 100%
rename from patches/server/0820-Add-PlayerStopUsingItemEvent.patch
rename to patches/server/0821-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0821-FallingBlock-auto-expire-setting.patch b/patches/server/0822-FallingBlock-auto-expire-setting.patch
similarity index 100%
rename from patches/server/0821-FallingBlock-auto-expire-setting.patch
rename to patches/server/0822-FallingBlock-auto-expire-setting.patch
diff --git a/patches/server/0822-Don-t-tick-markers.patch b/patches/server/0823-Don-t-tick-markers.patch
similarity index 100%
rename from patches/server/0822-Don-t-tick-markers.patch
rename to patches/server/0823-Don-t-tick-markers.patch
diff --git a/patches/server/0823-Do-not-accept-invalid-client-settings.patch b/patches/server/0824-Do-not-accept-invalid-client-settings.patch
similarity index 100%
rename from patches/server/0823-Do-not-accept-invalid-client-settings.patch
rename to patches/server/0824-Do-not-accept-invalid-client-settings.patch
diff --git a/patches/server/0824-Add-support-for-Proxy-Protocol.patch b/patches/server/0825-Add-support-for-Proxy-Protocol.patch
similarity index 100%
rename from patches/server/0824-Add-support-for-Proxy-Protocol.patch
rename to patches/server/0825-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0825-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0826-Fix-OfflinePlayer-getBedSpawnLocation.patch
similarity index 100%
rename from patches/server/0825-Fix-OfflinePlayer-getBedSpawnLocation.patch
rename to patches/server/0826-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0826-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0827-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
similarity index 100%
rename from patches/server/0826-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
rename to patches/server/0827-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0827-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0828-Sanitize-Sent-BlockEntity-NBT.patch
similarity index 100%
rename from patches/server/0827-Sanitize-Sent-BlockEntity-NBT.patch
rename to patches/server/0828-Sanitize-Sent-BlockEntity-NBT.patch
diff --git a/patches/server/0828-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0829-Disable-component-selector-resolving-in-books-by-def.patch
similarity index 100%
rename from patches/server/0828-Disable-component-selector-resolving-in-books-by-def.patch
rename to patches/server/0829-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0829-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0830-Prevent-entity-loading-causing-async-lookups.patch
similarity index 100%
rename from patches/server/0829-Prevent-entity-loading-causing-async-lookups.patch
rename to patches/server/0830-Prevent-entity-loading-causing-async-lookups.patch
diff --git a/patches/server/0830-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0831-Throw-exception-on-world-create-while-being-ticked.patch
similarity index 100%
rename from patches/server/0830-Throw-exception-on-world-create-while-being-ticked.patch
rename to patches/server/0831-Throw-exception-on-world-create-while-being-ticked.patch
diff --git a/patches/server/0831-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0832-Add-Alternate-Current-redstone-implementation.patch
similarity index 100%
rename from patches/server/0831-Add-Alternate-Current-redstone-implementation.patch
rename to patches/server/0832-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/0832-Dont-resent-entity-on-art-update.patch b/patches/server/0833-Dont-resent-entity-on-art-update.patch
similarity index 100%
rename from patches/server/0832-Dont-resent-entity-on-art-update.patch
rename to patches/server/0833-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0833-Add-WardenAngerChangeEvent.patch b/patches/server/0834-Add-WardenAngerChangeEvent.patch
similarity index 100%
rename from patches/server/0833-Add-WardenAngerChangeEvent.patch
rename to patches/server/0834-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0834-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0835-Add-option-for-strict-advancement-dimension-checks.patch
similarity index 100%
rename from patches/server/0834-Add-option-for-strict-advancement-dimension-checks.patch
rename to patches/server/0835-Add-option-for-strict-advancement-dimension-checks.patch
diff --git a/patches/server/0835-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0836-Add-missing-important-BlockStateListPopulator-method.patch
similarity index 100%
rename from patches/server/0835-Add-missing-important-BlockStateListPopulator-method.patch
rename to patches/server/0836-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0836-Nameable-Banner-API.patch b/patches/server/0837-Nameable-Banner-API.patch
similarity index 100%
rename from patches/server/0836-Nameable-Banner-API.patch
rename to patches/server/0837-Nameable-Banner-API.patch
diff --git a/patches/server/0837-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0838-Don-t-broadcast-messages-to-command-blocks.patch
similarity index 100%
rename from patches/server/0837-Don-t-broadcast-messages-to-command-blocks.patch
rename to patches/server/0838-Don-t-broadcast-messages-to-command-blocks.patch
diff --git a/patches/server/0838-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0839-Prevent-empty-items-from-being-added-to-world.patch
similarity index 100%
rename from patches/server/0838-Prevent-empty-items-from-being-added-to-world.patch
rename to patches/server/0839-Prevent-empty-items-from-being-added-to-world.patch
diff --git a/patches/server/0839-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0840-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
similarity index 100%
rename from patches/server/0839-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
rename to patches/server/0840-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0840-Don-t-print-component-in-resource-pack-rejection-mes.patch b/patches/server/0841-Don-t-print-component-in-resource-pack-rejection-mes.patch
similarity index 100%
rename from patches/server/0840-Don-t-print-component-in-resource-pack-rejection-mes.patch
rename to patches/server/0841-Don-t-print-component-in-resource-pack-rejection-mes.patch
diff --git a/patches/server/0841-Add-Player-getFishHook.patch b/patches/server/0842-Add-Player-getFishHook.patch
similarity index 100%
rename from patches/server/0841-Add-Player-getFishHook.patch
rename to patches/server/0842-Add-Player-getFishHook.patch
diff --git a/patches/server/0842-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0843-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
similarity index 100%
rename from patches/server/0842-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
rename to patches/server/0843-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0843-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0844-Add-various-missing-EntityDropItemEvent-calls.patch
similarity index 100%
rename from patches/server/0843-Add-various-missing-EntityDropItemEvent-calls.patch
rename to patches/server/0844-Add-various-missing-EntityDropItemEvent-calls.patch
diff --git a/patches/server/0844-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/server/0845-Add-some-minimal-debug-information-to-chat-packet-er.patch
similarity index 100%
rename from patches/server/0844-Add-some-minimal-debug-information-to-chat-packet-er.patch
rename to patches/server/0845-Add-some-minimal-debug-information-to-chat-packet-er.patch
diff --git a/patches/server/0845-Fix-Bee-flower-NPE.patch b/patches/server/0846-Fix-Bee-flower-NPE.patch
similarity index 100%
rename from patches/server/0845-Fix-Bee-flower-NPE.patch
rename to patches/server/0846-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0846-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0847-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
similarity index 100%
rename from patches/server/0846-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
rename to patches/server/0847-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
diff --git a/patches/server/0847-More-Teleport-API.patch b/patches/server/0848-More-Teleport-API.patch
similarity index 100%
rename from patches/server/0847-More-Teleport-API.patch
rename to patches/server/0848-More-Teleport-API.patch
diff --git a/patches/server/0848-Add-EntityPortalReadyEvent.patch b/patches/server/0849-Add-EntityPortalReadyEvent.patch
similarity index 100%
rename from patches/server/0848-Add-EntityPortalReadyEvent.patch
rename to patches/server/0849-Add-EntityPortalReadyEvent.patch
diff --git a/patches/server/0849-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0850-Don-t-use-level-random-in-entity-constructors.patch
similarity index 100%
rename from patches/server/0849-Don-t-use-level-random-in-entity-constructors.patch
rename to patches/server/0850-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0850-Send-block-entities-after-destroy-prediction.patch b/patches/server/0851-Send-block-entities-after-destroy-prediction.patch
similarity index 100%
rename from patches/server/0850-Send-block-entities-after-destroy-prediction.patch
rename to patches/server/0851-Send-block-entities-after-destroy-prediction.patch
diff --git a/patches/server/0851-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0852-Warn-on-plugins-accessing-faraway-chunks.patch
similarity index 100%
rename from patches/server/0851-Warn-on-plugins-accessing-faraway-chunks.patch
rename to patches/server/0852-Warn-on-plugins-accessing-faraway-chunks.patch
diff --git a/patches/server/0852-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0853-Custom-Chat-Completion-Suggestions-API.patch
similarity index 100%
rename from patches/server/0852-Custom-Chat-Completion-Suggestions-API.patch
rename to patches/server/0853-Custom-Chat-Completion-Suggestions-API.patch
diff --git a/patches/server/0853-Add-missing-BlockFadeEvents.patch b/patches/server/0854-Add-missing-BlockFadeEvents.patch
similarity index 100%
rename from patches/server/0853-Add-missing-BlockFadeEvents.patch
rename to patches/server/0854-Add-missing-BlockFadeEvents.patch
diff --git a/patches/server/0854-Collision-API.patch b/patches/server/0855-Collision-API.patch
similarity index 100%
rename from patches/server/0854-Collision-API.patch
rename to patches/server/0855-Collision-API.patch
diff --git a/patches/server/0855-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0856-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
similarity index 100%
rename from patches/server/0855-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
rename to patches/server/0856-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0856-Remove-invalid-signature-login-stacktrace.patch b/patches/server/0857-Remove-invalid-signature-login-stacktrace.patch
similarity index 100%
rename from patches/server/0856-Remove-invalid-signature-login-stacktrace.patch
rename to patches/server/0857-Remove-invalid-signature-login-stacktrace.patch
diff --git a/patches/server/0857-Block-Ticking-API.patch b/patches/server/0858-Block-Ticking-API.patch
similarity index 100%
rename from patches/server/0857-Block-Ticking-API.patch
rename to patches/server/0858-Block-Ticking-API.patch
diff --git a/patches/server/0858-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0859-Add-Velocity-IP-Forwarding-Support.patch
similarity index 100%
rename from patches/server/0858-Add-Velocity-IP-Forwarding-Support.patch
rename to patches/server/0859-Add-Velocity-IP-Forwarding-Support.patch
diff --git a/patches/server/0859-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/server/0860-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
similarity index 100%
rename from patches/server/0859-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
rename to patches/server/0860-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
diff --git a/patches/server/0860-Add-NamespacedKey-biome-methods.patch b/patches/server/0861-Add-NamespacedKey-biome-methods.patch
similarity index 100%
rename from patches/server/0860-Add-NamespacedKey-biome-methods.patch
rename to patches/server/0861-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0861-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0862-Fix-plugin-loggers-on-server-shutdown.patch
similarity index 100%
rename from patches/server/0861-Fix-plugin-loggers-on-server-shutdown.patch
rename to patches/server/0862-Fix-plugin-loggers-on-server-shutdown.patch
diff --git a/patches/server/0862-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0863-Stop-large-look-changes-from-crashing-the-server.patch
similarity index 100%
rename from patches/server/0862-Stop-large-look-changes-from-crashing-the-server.patch
rename to patches/server/0863-Stop-large-look-changes-from-crashing-the-server.patch
diff --git a/patches/server/0863-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0864-Fire-EntityChangeBlockEvent-in-more-places.patch
similarity index 100%
rename from patches/server/0863-Fire-EntityChangeBlockEvent-in-more-places.patch
rename to patches/server/0864-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0864-Missing-eating-regain-reason.patch b/patches/server/0865-Missing-eating-regain-reason.patch
similarity index 100%
rename from patches/server/0864-Missing-eating-regain-reason.patch
rename to patches/server/0865-Missing-eating-regain-reason.patch
diff --git a/patches/server/0865-Missing-effect-cause.patch b/patches/server/0866-Missing-effect-cause.patch
similarity index 100%
rename from patches/server/0865-Missing-effect-cause.patch
rename to patches/server/0866-Missing-effect-cause.patch
diff --git a/patches/server/0866-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0867-Added-byte-array-serialization-deserialization-for-P.patch
similarity index 100%
rename from patches/server/0866-Added-byte-array-serialization-deserialization-for-P.patch
rename to patches/server/0867-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0867-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0868-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
similarity index 100%
rename from patches/server/0867-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
rename to patches/server/0868-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/server/0868-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0869-Call-BlockPhysicsEvent-more-often.patch
similarity index 100%
rename from patches/server/0868-Call-BlockPhysicsEvent-more-often.patch
rename to patches/server/0869-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0869-Configurable-chat-thread-limit.patch b/patches/server/0870-Configurable-chat-thread-limit.patch
similarity index 100%
rename from patches/server/0869-Configurable-chat-thread-limit.patch
rename to patches/server/0870-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0870-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0871-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
similarity index 100%
rename from patches/server/0870-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
rename to patches/server/0871-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0871-fix-Jigsaw-block-kicking-user.patch b/patches/server/0872-fix-Jigsaw-block-kicking-user.patch
similarity index 100%
rename from patches/server/0871-fix-Jigsaw-block-kicking-user.patch
rename to patches/server/0872-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0872-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0873-use-BlockFormEvent-for-mud-converting-into-clay.patch
similarity index 100%
rename from patches/server/0872-use-BlockFormEvent-for-mud-converting-into-clay.patch
rename to patches/server/0873-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0873-Add-getDrops-to-BlockState.patch b/patches/server/0874-Add-getDrops-to-BlockState.patch
similarity index 100%
rename from patches/server/0873-Add-getDrops-to-BlockState.patch
rename to patches/server/0874-Add-getDrops-to-BlockState.patch
diff --git a/patches/server/0874-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0875-Fix-a-bunch-of-vanilla-bugs.patch
similarity index 100%
rename from patches/server/0874-Fix-a-bunch-of-vanilla-bugs.patch
rename to patches/server/0875-Fix-a-bunch-of-vanilla-bugs.patch
diff --git a/patches/server/0875-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0876-Remove-unnecessary-onTrackingStart-during-navigation.patch
similarity index 100%
rename from patches/server/0875-Remove-unnecessary-onTrackingStart-during-navigation.patch
rename to patches/server/0876-Remove-unnecessary-onTrackingStart-during-navigation.patch
diff --git a/patches/server/0876-Fix-custom-piglin-loved-items.patch b/patches/server/0877-Fix-custom-piglin-loved-items.patch
similarity index 100%
rename from patches/server/0876-Fix-custom-piglin-loved-items.patch
rename to patches/server/0877-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0877-EntityPickupItemEvent-fixes.patch b/patches/server/0878-EntityPickupItemEvent-fixes.patch
similarity index 100%
rename from patches/server/0877-EntityPickupItemEvent-fixes.patch
rename to patches/server/0878-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0878-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0879-Correctly-handle-interactions-with-items-on-cooldown.patch
similarity index 100%
rename from patches/server/0878-Correctly-handle-interactions-with-items-on-cooldown.patch
rename to patches/server/0879-Correctly-handle-interactions-with-items-on-cooldown.patch
diff --git a/patches/server/0879-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0880-Add-PlayerInventorySlotChangeEvent.patch
similarity index 100%
rename from patches/server/0879-Add-PlayerInventorySlotChangeEvent.patch
rename to patches/server/0880-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/server/0880-Elder-Guardian-appearance-API.patch b/patches/server/0881-Elder-Guardian-appearance-API.patch
similarity index 100%
rename from patches/server/0880-Elder-Guardian-appearance-API.patch
rename to patches/server/0881-Elder-Guardian-appearance-API.patch
diff --git a/patches/server/0881-Allow-changing-bed-s-occupied-property.patch b/patches/server/0882-Allow-changing-bed-s-occupied-property.patch
similarity index 100%
rename from patches/server/0881-Allow-changing-bed-s-occupied-property.patch
rename to patches/server/0882-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0882-Add-entity-knockback-API.patch b/patches/server/0883-Add-entity-knockback-API.patch
similarity index 100%
rename from patches/server/0882-Add-entity-knockback-API.patch
rename to patches/server/0883-Add-entity-knockback-API.patch
diff --git a/patches/server/0883-Detect-headless-JREs.patch b/patches/server/0884-Detect-headless-JREs.patch
similarity index 100%
rename from patches/server/0883-Detect-headless-JREs.patch
rename to patches/server/0884-Detect-headless-JREs.patch
diff --git a/patches/server/0884-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0885-fixed-entity-vehicle-collision-event-not-called.patch
similarity index 100%
rename from patches/server/0884-fixed-entity-vehicle-collision-event-not-called.patch
rename to patches/server/0885-fixed-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0885-optimized-dirt-and-snow-spreading.patch b/patches/server/0886-optimized-dirt-and-snow-spreading.patch
similarity index 100%
rename from patches/server/0885-optimized-dirt-and-snow-spreading.patch
rename to patches/server/0886-optimized-dirt-and-snow-spreading.patch
diff --git a/patches/server/0886-Added-EntityToggleSitEvent.patch b/patches/server/0887-Added-EntityToggleSitEvent.patch
similarity index 100%
rename from patches/server/0886-Added-EntityToggleSitEvent.patch
rename to patches/server/0887-Added-EntityToggleSitEvent.patch
diff --git a/patches/server/0887-Add-fire-tick-delay-option.patch b/patches/server/0888-Add-fire-tick-delay-option.patch
similarity index 100%
rename from patches/server/0887-Add-fire-tick-delay-option.patch
rename to patches/server/0888-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0888-Add-Moving-Piston-API.patch b/patches/server/0889-Add-Moving-Piston-API.patch
similarity index 100%
rename from patches/server/0888-Add-Moving-Piston-API.patch
rename to patches/server/0889-Add-Moving-Piston-API.patch
diff --git a/patches/server/0889-Ignore-impossible-spawn-tick.patch b/patches/server/0890-Ignore-impossible-spawn-tick.patch
similarity index 100%
rename from patches/server/0889-Ignore-impossible-spawn-tick.patch
rename to patches/server/0890-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0890-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0891-Track-projectile-source-for-fireworks-from-dispenser.patch
similarity index 100%
rename from patches/server/0890-Track-projectile-source-for-fireworks-from-dispenser.patch
rename to patches/server/0891-Track-projectile-source-for-fireworks-from-dispenser.patch
diff --git a/patches/server/0891-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0892-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
similarity index 100%
rename from patches/server/0891-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
rename to patches/server/0892-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0892-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0893-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
similarity index 100%
rename from patches/server/0892-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
rename to patches/server/0893-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
diff --git a/patches/server/0893-Prevent-compass-from-loading-chunks.patch b/patches/server/0894-Prevent-compass-from-loading-chunks.patch
similarity index 100%
rename from patches/server/0893-Prevent-compass-from-loading-chunks.patch
rename to patches/server/0894-Prevent-compass-from-loading-chunks.patch
diff --git a/patches/server/0894-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0895-Add-PrePlayerAttackEntityEvent.patch
similarity index 100%
rename from patches/server/0894-Add-PrePlayerAttackEntityEvent.patch
rename to patches/server/0895-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/server/0895-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0896-ensure-reset-EnderDragon-boss-event-name.patch
similarity index 100%
rename from patches/server/0895-ensure-reset-EnderDragon-boss-event-name.patch
rename to patches/server/0896-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0896-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0897-fix-MC-252817-green-map-markers-do-not-disappear.patch
similarity index 100%
rename from patches/server/0896-fix-MC-252817-green-map-markers-do-not-disappear.patch
rename to patches/server/0897-fix-MC-252817-green-map-markers-do-not-disappear.patch
diff --git a/patches/server/0897-Add-Player-Warden-Warning-API.patch b/patches/server/0898-Add-Player-Warden-Warning-API.patch
similarity index 100%
rename from patches/server/0897-Add-Player-Warden-Warning-API.patch
rename to patches/server/0898-Add-Player-Warden-Warning-API.patch
diff --git a/patches/server/0898-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0899-More-vanilla-friendly-methods-to-update-trades.patch
similarity index 100%
rename from patches/server/0898-More-vanilla-friendly-methods-to-update-trades.patch
rename to patches/server/0899-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0899-Add-paper-dumplisteners-command.patch b/patches/server/0900-Add-paper-dumplisteners-command.patch
similarity index 100%
rename from patches/server/0899-Add-paper-dumplisteners-command.patch
rename to patches/server/0900-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0900-check-global-player-list-where-appropriate.patch b/patches/server/0901-check-global-player-list-where-appropriate.patch
similarity index 100%
rename from patches/server/0900-check-global-player-list-where-appropriate.patch
rename to patches/server/0901-check-global-player-list-where-appropriate.patch
diff --git a/patches/server/0901-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0902-Fix-async-entity-add-due-to-fungus-trees.patch
similarity index 100%
rename from patches/server/0901-Fix-async-entity-add-due-to-fungus-trees.patch
rename to patches/server/0902-Fix-async-entity-add-due-to-fungus-trees.patch
diff --git a/patches/server/0902-ItemStack-damage-API.patch b/patches/server/0903-ItemStack-damage-API.patch
similarity index 100%
rename from patches/server/0902-ItemStack-damage-API.patch
rename to patches/server/0903-ItemStack-damage-API.patch
diff --git a/patches/server/0903-Friction-API.patch b/patches/server/0904-Friction-API.patch
similarity index 100%
rename from patches/server/0903-Friction-API.patch
rename to patches/server/0904-Friction-API.patch
diff --git a/patches/server/0904-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0905-Ability-to-control-player-s-insomnia-and-phantoms.patch
similarity index 100%
rename from patches/server/0904-Ability-to-control-player-s-insomnia-and-phantoms.patch
rename to patches/server/0905-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0905-Fix-player-kick-on-shutdown.patch b/patches/server/0906-Fix-player-kick-on-shutdown.patch
similarity index 100%
rename from patches/server/0905-Fix-player-kick-on-shutdown.patch
rename to patches/server/0906-Fix-player-kick-on-shutdown.patch
diff --git a/patches/server/0906-Sync-offhand-slot-in-menus.patch b/patches/server/0907-Sync-offhand-slot-in-menus.patch
similarity index 100%
rename from patches/server/0906-Sync-offhand-slot-in-menus.patch
rename to patches/server/0907-Sync-offhand-slot-in-menus.patch
diff --git a/patches/server/0907-Player-Entity-Tracking-Events.patch b/patches/server/0908-Player-Entity-Tracking-Events.patch
similarity index 100%
rename from patches/server/0907-Player-Entity-Tracking-Events.patch
rename to patches/server/0908-Player-Entity-Tracking-Events.patch
diff --git a/patches/server/0908-Limit-pet-look-distance.patch b/patches/server/0909-Limit-pet-look-distance.patch
similarity index 100%
rename from patches/server/0908-Limit-pet-look-distance.patch
rename to patches/server/0909-Limit-pet-look-distance.patch
diff --git a/patches/server/0909-Properly-resend-entities.patch b/patches/server/0910-Properly-resend-entities.patch
similarity index 100%
rename from patches/server/0909-Properly-resend-entities.patch
rename to patches/server/0910-Properly-resend-entities.patch
diff --git a/patches/server/0910-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0911-Fixes-and-additions-to-the-SpawnReason-API.patch
similarity index 100%
rename from patches/server/0910-Fixes-and-additions-to-the-SpawnReason-API.patch
rename to patches/server/0911-Fixes-and-additions-to-the-SpawnReason-API.patch
diff --git a/patches/server/0911-fix-Instruments.patch b/patches/server/0912-fix-Instruments.patch
similarity index 100%
rename from patches/server/0911-fix-Instruments.patch
rename to patches/server/0912-fix-Instruments.patch
diff --git a/patches/server/0912-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0913-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
similarity index 100%
rename from patches/server/0912-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
rename to patches/server/0913-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0913-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0914-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
similarity index 100%
rename from patches/server/0913-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
rename to patches/server/0914-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0914-Improve-logging-and-errors.patch b/patches/server/0915-Improve-logging-and-errors.patch
similarity index 100%
rename from patches/server/0914-Improve-logging-and-errors.patch
rename to patches/server/0915-Improve-logging-and-errors.patch
diff --git a/patches/server/0915-Add-BlockLockCheckEvent.patch b/patches/server/0916-Add-BlockLockCheckEvent.patch
similarity index 100%
rename from patches/server/0915-Add-BlockLockCheckEvent.patch
rename to patches/server/0916-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0916-Add-Sneaking-API-for-Entities.patch b/patches/server/0917-Add-Sneaking-API-for-Entities.patch
similarity index 100%
rename from patches/server/0916-Add-Sneaking-API-for-Entities.patch
rename to patches/server/0917-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/server/0917-Improve-PortalEvents.patch b/patches/server/0918-Improve-PortalEvents.patch
similarity index 100%
rename from patches/server/0917-Improve-PortalEvents.patch
rename to patches/server/0918-Improve-PortalEvents.patch
diff --git a/patches/server/0918-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0919-Add-config-option-for-spider-worldborder-climbing.patch
similarity index 100%
rename from patches/server/0918-Add-config-option-for-spider-worldborder-climbing.patch
rename to patches/server/0919-Add-config-option-for-spider-worldborder-climbing.patch
diff --git a/patches/server/0919-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0920-Add-missing-SpigotConfig-logCommands-check.patch
similarity index 100%
rename from patches/server/0919-Add-missing-SpigotConfig-logCommands-check.patch
rename to patches/server/0920-Add-missing-SpigotConfig-logCommands-check.patch
diff --git a/patches/server/0920-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0921-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
similarity index 100%
rename from patches/server/0920-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
rename to patches/server/0921-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0921-Flying-Fall-Damage.patch b/patches/server/0922-Flying-Fall-Damage.patch
similarity index 100%
rename from patches/server/0921-Flying-Fall-Damage.patch
rename to patches/server/0922-Flying-Fall-Damage.patch
diff --git a/patches/server/0922-Add-exploded-block-state-to-BlockExplodeEvent.patch b/patches/server/0923-Add-exploded-block-state-to-BlockExplodeEvent.patch
similarity index 100%
rename from patches/server/0922-Add-exploded-block-state-to-BlockExplodeEvent.patch
rename to patches/server/0923-Add-exploded-block-state-to-BlockExplodeEvent.patch
diff --git a/patches/server/0923-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0924-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
similarity index 100%
rename from patches/server/0923-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
rename to patches/server/0924-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
diff --git a/patches/server/0924-config-for-disabling-entity-tag-tags.patch b/patches/server/0925-config-for-disabling-entity-tag-tags.patch
similarity index 100%
rename from patches/server/0924-config-for-disabling-entity-tag-tags.patch
rename to patches/server/0925-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0925-Use-single-player-info-update-packet-on-join.patch b/patches/server/0926-Use-single-player-info-update-packet-on-join.patch
similarity index 100%
rename from patches/server/0925-Use-single-player-info-update-packet-on-join.patch
rename to patches/server/0926-Use-single-player-info-update-packet-on-join.patch
diff --git a/patches/server/0926-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0927-Correctly-shrink-items-during-EntityResurrectEvent.patch
similarity index 100%
rename from patches/server/0926-Correctly-shrink-items-during-EntityResurrectEvent.patch
rename to patches/server/0927-Correctly-shrink-items-during-EntityResurrectEvent.patch
diff --git a/patches/server/0927-Win-Screen-API.patch b/patches/server/0928-Win-Screen-API.patch
similarity index 100%
rename from patches/server/0927-Win-Screen-API.patch
rename to patches/server/0928-Win-Screen-API.patch
diff --git a/patches/server/0928-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0929-Remove-CraftItemStack-setAmount-null-assignment.patch
similarity index 100%
rename from patches/server/0928-Remove-CraftItemStack-setAmount-null-assignment.patch
rename to patches/server/0929-Remove-CraftItemStack-setAmount-null-assignment.patch
diff --git a/patches/server/0929-Fix-force-opening-enchantment-tables.patch b/patches/server/0930-Fix-force-opening-enchantment-tables.patch
similarity index 100%
rename from patches/server/0929-Fix-force-opening-enchantment-tables.patch
rename to patches/server/0930-Fix-force-opening-enchantment-tables.patch
diff --git a/patches/server/0930-Add-Entity-Body-Yaw-API.patch b/patches/server/0931-Add-Entity-Body-Yaw-API.patch
similarity index 100%
rename from patches/server/0930-Add-Entity-Body-Yaw-API.patch
rename to patches/server/0931-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/server/0931-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0932-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
similarity index 100%
rename from patches/server/0931-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
rename to patches/server/0932-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
diff --git a/patches/server/0932-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0933-Update-the-flag-when-a-captured-block-state-is-outda.patch
similarity index 100%
rename from patches/server/0932-Update-the-flag-when-a-captured-block-state-is-outda.patch
rename to patches/server/0933-Update-the-flag-when-a-captured-block-state-is-outda.patch
diff --git a/patches/server/0933-Add-EntityFertilizeEggEvent.patch b/patches/server/0934-Add-EntityFertilizeEggEvent.patch
similarity index 100%
rename from patches/server/0933-Add-EntityFertilizeEggEvent.patch
rename to patches/server/0934-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/server/0934-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0935-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
similarity index 100%
rename from patches/server/0934-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
rename to patches/server/0935-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
diff --git a/patches/server/0935-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0936-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
similarity index 100%
rename from patches/server/0935-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
rename to patches/server/0936-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/server/0936-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0937-Correctly-handle-ArmorStand-invisibility.patch
similarity index 100%
rename from patches/server/0936-Correctly-handle-ArmorStand-invisibility.patch
rename to patches/server/0937-Correctly-handle-ArmorStand-invisibility.patch
diff --git a/patches/server/0937-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0938-Fix-advancement-triggers-for-entity-damage.patch
similarity index 100%
rename from patches/server/0937-Fix-advancement-triggers-for-entity-damage.patch
rename to patches/server/0938-Fix-advancement-triggers-for-entity-damage.patch
diff --git a/patches/server/0938-Fix-text-display-error-on-spawn.patch b/patches/server/0939-Fix-text-display-error-on-spawn.patch
similarity index 100%
rename from patches/server/0938-Fix-text-display-error-on-spawn.patch
rename to patches/server/0939-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0939-Fix-certain-inventories-returning-null-Locations.patch b/patches/server/0940-Fix-certain-inventories-returning-null-Locations.patch
similarity index 100%
rename from patches/server/0939-Fix-certain-inventories-returning-null-Locations.patch
rename to patches/server/0940-Fix-certain-inventories-returning-null-Locations.patch
diff --git a/patches/server/0940-Add-Shearable-API.patch b/patches/server/0941-Add-Shearable-API.patch
similarity index 100%
rename from patches/server/0940-Add-Shearable-API.patch
rename to patches/server/0941-Add-Shearable-API.patch
diff --git a/patches/server/0941-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0942-Fix-SpawnEggMeta-get-setSpawnedType.patch
similarity index 100%
rename from patches/server/0941-Fix-SpawnEggMeta-get-setSpawnedType.patch
rename to patches/server/0942-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0942-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch b/patches/server/0943-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch
similarity index 100%
rename from patches/server/0942-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch
rename to patches/server/0943-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch
diff --git a/patches/server/0943-Optimize-Hoppers.patch b/patches/server/0944-Optimize-Hoppers.patch
similarity index 100%
rename from patches/server/0943-Optimize-Hoppers.patch
rename to patches/server/0944-Optimize-Hoppers.patch
diff --git a/patches/server/0944-Fix-beehives-generating-from-using-bonemeal.patch b/patches/server/0945-Fix-beehives-generating-from-using-bonemeal.patch
similarity index 100%
rename from patches/server/0944-Fix-beehives-generating-from-using-bonemeal.patch
rename to patches/server/0945-Fix-beehives-generating-from-using-bonemeal.patch
diff --git a/patches/server/0945-Fix-api-checking-banned-ips.patch b/patches/server/0946-Fix-api-checking-banned-ips.patch
similarity index 100%
rename from patches/server/0945-Fix-api-checking-banned-ips.patch
rename to patches/server/0946-Fix-api-checking-banned-ips.patch
diff --git a/patches/server/0946-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0947-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
similarity index 100%
rename from patches/server/0946-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
rename to patches/server/0947-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
diff --git a/patches/server/0947-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0948-Treat-sequence-violations-like-they-should-be.patch
similarity index 100%
rename from patches/server/0947-Treat-sequence-violations-like-they-should-be.patch
rename to patches/server/0948-Treat-sequence-violations-like-they-should-be.patch
diff --git a/patches/server/0948-remove-duplicate-animate-packet-for-records.patch b/patches/server/0949-remove-duplicate-animate-packet-for-records.patch
similarity index 100%
rename from patches/server/0948-remove-duplicate-animate-packet-for-records.patch
rename to patches/server/0949-remove-duplicate-animate-packet-for-records.patch
diff --git a/patches/server/0949-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0950-Prevent-causing-expired-keys-from-impacting-new-join.patch
similarity index 100%
rename from patches/server/0949-Prevent-causing-expired-keys-from-impacting-new-join.patch
rename to patches/server/0950-Prevent-causing-expired-keys-from-impacting-new-join.patch
diff --git a/patches/server/0950-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0951-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
similarity index 100%
rename from patches/server/0950-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
rename to patches/server/0951-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
diff --git a/patches/server/0951-Use-array-for-gamerule-storage.patch b/patches/server/0952-Use-array-for-gamerule-storage.patch
similarity index 100%
rename from patches/server/0951-Use-array-for-gamerule-storage.patch
rename to patches/server/0952-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0952-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0953-Fix-a-couple-of-upstream-bed-issues.patch
similarity index 100%
rename from patches/server/0952-Fix-a-couple-of-upstream-bed-issues.patch
rename to patches/server/0953-Fix-a-couple-of-upstream-bed-issues.patch
diff --git a/patches/server/0953-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0954-Fix-demo-flag-not-enabling-demo-mode.patch
similarity index 100%
rename from patches/server/0953-Fix-demo-flag-not-enabling-demo-mode.patch
rename to patches/server/0954-Fix-demo-flag-not-enabling-demo-mode.patch
diff --git a/patches/server/0954-Add-Mob-Experience-reward-API.patch b/patches/server/0955-Add-Mob-Experience-reward-API.patch
similarity index 100%
rename from patches/server/0954-Add-Mob-Experience-reward-API.patch
rename to patches/server/0955-Add-Mob-Experience-reward-API.patch
diff --git a/patches/server/0955-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0956-Break-redstone-on-top-of-trap-doors-early.patch
similarity index 100%
rename from patches/server/0955-Break-redstone-on-top-of-trap-doors-early.patch
rename to patches/server/0956-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0956-Fix-DamageCause-for-Falling-Blocks.patch b/patches/server/0957-Fix-DamageCause-for-Falling-Blocks.patch
similarity index 100%
rename from patches/server/0956-Fix-DamageCause-for-Falling-Blocks.patch
rename to patches/server/0957-Fix-DamageCause-for-Falling-Blocks.patch
diff --git a/patches/server/0957-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0958-Avoid-Lazy-Initialization-for-Enum-Fields.patch
similarity index 100%
rename from patches/server/0957-Avoid-Lazy-Initialization-for-Enum-Fields.patch
rename to patches/server/0958-Avoid-Lazy-Initialization-for-Enum-Fields.patch
diff --git a/patches/server/0958-More-accurate-isInOpenWater-impl.patch b/patches/server/0959-More-accurate-isInOpenWater-impl.patch
similarity index 100%
rename from patches/server/0958-More-accurate-isInOpenWater-impl.patch
rename to patches/server/0959-More-accurate-isInOpenWater-impl.patch
diff --git a/patches/server/0959-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/server/0960-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
similarity index 100%
rename from patches/server/0959-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
rename to patches/server/0960-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
diff --git a/patches/server/0960-Optimise-recalcBlockCounts-for-empty-sections.patch b/patches/server/0961-Optimise-recalcBlockCounts-for-empty-sections.patch
similarity index 100%
rename from patches/server/0960-Optimise-recalcBlockCounts-for-empty-sections.patch
rename to patches/server/0961-Optimise-recalcBlockCounts-for-empty-sections.patch
diff --git a/patches/server/0961-Fix-destroying-beehive-without-any-players-nearby-th.patch b/patches/server/0962-Fix-destroying-beehive-without-any-players-nearby-th.patch
similarity index 100%
rename from patches/server/0961-Fix-destroying-beehive-without-any-players-nearby-th.patch
rename to patches/server/0962-Fix-destroying-beehive-without-any-players-nearby-th.patch
diff --git a/patches/server/0962-Expand-PlayerItemMendEvent.patch b/patches/server/0963-Expand-PlayerItemMendEvent.patch
similarity index 100%
rename from patches/server/0962-Expand-PlayerItemMendEvent.patch
rename to patches/server/0963-Expand-PlayerItemMendEvent.patch
diff --git a/patches/server/0963-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0964-Refresh-ProjectileSource-for-projectiles.patch
similarity index 100%
rename from patches/server/0963-Refresh-ProjectileSource-for-projectiles.patch
rename to patches/server/0964-Refresh-ProjectileSource-for-projectiles.patch
diff --git a/patches/server/0964-Add-transient-modifier-API.patch b/patches/server/0965-Add-transient-modifier-API.patch
similarity index 100%
rename from patches/server/0964-Add-transient-modifier-API.patch
rename to patches/server/0965-Add-transient-modifier-API.patch
diff --git a/patches/removed/1.20/0972-Fix-block-place-logic.patch b/patches/server/0966-Fix-block-place-logic.patch
similarity index 57%
rename from patches/removed/1.20/0972-Fix-block-place-logic.patch
rename to patches/server/0966-Fix-block-place-logic.patch
index 7b4537bb0a..f34f9f62ec 100644
--- a/patches/removed/1.20/0972-Fix-block-place-logic.patch
+++ b/patches/server/0966-Fix-block-place-logic.patch
@@ -5,7 +5,6 @@ Subject: [PATCH] Fix block place logic
 
 TODO: what to do about dropped sign diff
 
-
 diff --git a/src/main/java/net/minecraft/world/item/BlockItem.java b/src/main/java/net/minecraft/world/item/BlockItem.java
 index b0204af850ee182773ad458208cccd946ad148d5..ebee8de2ed831755b6fd154f6cc77ac993839bb9 100644
 --- a/src/main/java/net/minecraft/world/item/BlockItem.java
@@ -19,32 +18,11 @@ index b0204af850ee182773ad458208cccd946ad148d5..ebee8de2ed831755b6fd154f6cc77ac9
                      world.gameEvent(GameEvent.BLOCK_PLACE, blockposition, GameEvent.Context.of(entityhuman, iblockdata1));
                      if ((entityhuman == null || !entityhuman.getAbilities().instabuild) && itemstack != ItemStack.EMPTY) { // CraftBukkit
                          itemstack.shrink(1);
-diff --git a/src/main/java/net/minecraft/world/item/HangingSignItem.java b/src/main/java/net/minecraft/world/item/HangingSignItem.java
-index f8f8392ba16838449354e78f0ce69af37b0b7fed..91caa607a21bfb61849826949b59bcdac73af7ab 100644
---- a/src/main/java/net/minecraft/world/item/HangingSignItem.java
-+++ b/src/main/java/net/minecraft/world/item/HangingSignItem.java
-@@ -33,11 +33,14 @@ public class HangingSignItem extends StandingAndWallBlockItem {
-     protected boolean updateCustomBlockEntityTag(BlockPos pos, Level world, @Nullable Player player, ItemStack stack, BlockState state) {
-         boolean bl = super.updateCustomBlockEntityTag(pos, world, player, stack, state);
-         if (!world.isClientSide && !bl && player != null) {
--            BlockEntity var8 = world.getBlockEntity(pos);
-+            // Paper start - moved in ItemStack use handler for events cancellation
-+            /*BlockEntity var8 = world.getBlockEntity(pos);
-             if (var8 instanceof SignBlockEntity) {
-                 SignBlockEntity signBlockEntity = (SignBlockEntity)var8;
-                 player.openTextEdit(signBlockEntity);
--            }
-+            }*/
-+            SignItem.openSign = pos;
-+            // Paper end
-         }
- 
-         return bl;
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index fd6c80d6cb83ab2dc0fca913655eea8cc68dd5a6..a7533d18fe6148d7bfd3106b9cdcb6fa3347cf7c 100644
+index da4e0712bea0c7aad9fe905b805b9fa11580f59f..103ad5f373a59fadb4783892579f3e681a8fd596 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -458,13 +458,7 @@ public final class ItemStack {
+@@ -462,13 +462,7 @@ public final class ItemStack {
                          if (tileentity instanceof JukeboxBlockEntity) {
                              JukeboxBlockEntity tileentityjukebox = (JukeboxBlockEntity) tileentity;
  
@@ -59,12 +37,3 @@ index fd6c80d6cb83ab2dc0fca913655eea8cc68dd5a6..a7533d18fe6148d7bfd3106b9cdcb6fa
                              world.gameEvent(GameEvent.BLOCK_CHANGE, blockposition, GameEvent.Context.of(entityhuman, world.getBlockState(blockposition)));
                          }
  
-@@ -490,7 +484,7 @@ public final class ItemStack {
-                     }
- 
-                     // SPIGOT-4678
--                    if (this.item instanceof SignItem && SignItem.openSign != null) {
-+                    if ((this.item instanceof SignItem || this.item instanceof HangingSignItem) && SignItem.openSign != null) { // Paper - trigger the hanging sign text editor now
-                         try {
-                             entityhuman.openTextEdit((SignBlockEntity) world.getBlockEntity(SignItem.openSign));
-                         } finally {