From 611a0ee52def85f2cbf0b5cbc6a9d19599baae7e Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Mon, 9 Nov 2020 00:09:37 +0000
Subject: [PATCH] Revert "Updated Upstream (Spigot) (#4745)"

This reverts commit e38eceb42a106568e4db5830b936e550dbe509f5.
---
 ...e-before-converting-and-renaming-pla.patch |  4 +--
 ...Make-player-data-saving-configurable.patch | 36 +++++++++++++++++++
 ...e-legacy-ping-handler-more-reliable.patch} |  0
 ...erverListPingEvent-for-legacy-pings.patch} |  0
 ...6-Flag-to-disable-the-channel-limit.patch} |  2 +-
 ...-method-to-open-already-placed-sign.patch} |  0
 ...rable-sprint-interruption-on-attack.patch} |  2 +-
 ...allowed-colored-signs-to-be-created.patch} |  0
 ...t.patch => 0210-EndermanEscapeEvent.patch} |  0
 ...h => 0211-Enderman.teleportRandomly.patch} |  2 +-
 ...212-Block-Enderpearl-Travel-Exploit.patch} |  0
 ...d.spawnParticle-API-and-add-Builder.patch} |  0
 ...h => 0214-EndermanAttackPlayerEvent.patch} |  2 +-
 ...tch => 0215-WitchConsumePotionEvent.patch} |  2 +-
 ...patch => 0216-WitchThrowPotionEvent.patch} |  2 +-
 ...tem-entities-with-World.spawnEntity.patch} |  0
 ...patch => 0218-WitchReadyPotionEvent.patch} |  2 +-
 ...219-ItemStack-getMaxItemUseDuration.patch} |  0
 ...ement-EntityTeleportEndGatewayEvent.patch} |  2 +-
 ...d-flag-on-cancel-of-Explosion-Event.patch} |  2 +-
 ...ch => 0222-Fix-CraftEntity-hashCode.patch} |  0
 ...e-Alternative-LootPool-Luck-Formula.patch} |  8 ++---
 ...ls-when-failing-to-save-player-data.patch} |  2 +-
 ...-shield-blocking-delay-configurable.patch} |  2 +-
 ...=> 0226-Improve-EntityShootBowEvent.patch} |  4 +--
 ...patch => 0227-PlayerReadyArrowEvent.patch} |  2 +-
 ...lement-EntityKnockbackByEntityEvent.patch} |  6 ++--
 ...patch => 0229-Expand-Explosions-API.patch} |  0
 ...vingEntity-Hand-Raised-Item-Use-API.patch} |  0
 ...-API.patch => 0231-RangedEntity-API.patch} |  0
 ...o-disable-ender-dragon-legacy-check.patch} |  0
 ...-Implement-World.getEntity-UUID-API.patch} |  0
 ...0234-InventoryCloseEvent-Reason-API.patch} |  0
 ...I.patch => 0235-Vex-getSummoner-API.patch} |  2 +-
 ...ventory-when-cancelling-PlayerInter.patch} |  0
 ...e-the-Entity-Random-seed-for-squids.patch} |  2 +-
 ...illa-entity-warnings-for-duplicates.patch} |  0
 ...-if-stack-size-above-max-stack-size.patch} |  2 +-
 ...40-Use-asynchronous-Log4j-2-loggers.patch} |  2 +-
 ...more-information-to-Entity.toString.patch} |  0
 ...es-option-to-debug-dupe-uuid-issues.patch} |  0
 ...ts.patch => 0243-EnderDragon-Events.patch} |  0
 ...atch => 0244-PlayerElytraBoostEvent.patch} |  0
 ...0245-Improve-BlockPosition-inlining.patch} |  0
 ...patch => 0246-Optimize-RegistryID.c.patch} |  0
 ...-armor-stands-from-doing-entity-loo.patch} |  4 +--
 ...-Vanished-players-don-t-have-rights.patch} |  8 ++---
 ...anytime-entities-change-to-guarante.patch} |  0
 ...d-some-Debug-to-Chunk-Entity-slices.patch} |  2 +-
 ...tch => 0251-SkeletonHorse-Additions.patch} |  2 +-
 ...event-Saving-Bad-entities-to-chunks.patch} |  0
 ...n-t-call-getItemMeta-on-hasItemMeta.patch} |  0
 ...ad-Entities-in-entityList-iteration.patch} |  0
 ...5-Implement-Expanded-ArmorStand-API.patch} |  2 +-
 ...vent.patch => 0256-AnvilDamageEvent.patch} |  0
 ...ent.patch => 0257-Add-TNTPrimeEvent.patch} |  2 +-
 ...d-make-tab-spam-limits-configurable.patch} |  6 ++--
 ...h => 0259-Add-hand-to-bucket-events.patch} |  0
 ...-Experience-should-save-as-Integers.patch} |  2 +-
 ...ent-rendering-skulls-from-same-user.patch} |  0
 ...d-Early-Warning-Feature-to-WatchDog.patch} |  6 ++--
 ...0263-Make-EnderDragon-implement-Mob.patch} |  0
 ...4-Use-ConcurrentHashMap-in-JsonList.patch} |  0
 ...5-Use-a-Queue-for-Queueing-Commands.patch} |  0
 ...le-Entities-from-a-chunk-without-sn.patch} |  0
 ...llow-disabling-armour-stand-ticking.patch} |  4 +--
 ...timize-BlockPosition-helper-methods.patch} |  0
 ...tore-vanlla-default-mob-spawn-range.patch} |  0
 ...tch => 0270-Slime-Pathfinder-Events.patch} |  0
 ...e-speed-for-water-flowing-over-lava.patch} |  0
 ...72-Optimize-CraftBlockData-Creation.patch} |  0
 ... => 0273-Optimize-RegistryMaterials.patch} |  0
 ...ch => 0274-Add-PhantomPreSpawnEvent.patch} |  0
 ....patch => 0275-Add-More-Creeper-API.patch} |  2 +-
 ...=> 0276-Inventory-removeItemAnySlot.patch} |  0
 ...oadChunk-int-int-false-load-unconve.patch} |  0
 ...ray-tracing-methods-to-LivingEntity.patch} |  2 +-
 ...-attack-cooldown-methods-for-Player.patch} |  2 +-
 ....patch => 0280-Improve-death-events.patch} |  4 +--
 ...w-chests-to-be-placed-with-NBT-data.patch} |  0
 ...I.patch => 0282-Mob-Pathfinding-API.patch} |  2 +-
 ...nt-chunk-loading-from-Fluid-Flowing.patch} |  0
 ...for-CanPlaceOn-and-CanDestroy-NBT-v.patch} |  0
 ...nt-Mob-AI-Rules-from-Loading-Chunks.patch} |  0
 ...ning-from-loading-generating-chunks.patch} |  0
 ...-Biome-Mob-Lookups-for-Mob-Spawning.patch} |  0
 ...t-furnace-cook-speed-multiplier-API.patch} |  0
 ....patch => 0289-PreSpawnerSpawnEvent.patch} |  0
 ...rseException-in-Entity-and-TE-names.patch} |  0
 ...=> 0291-Honor-EntityAgeable.ageLock.patch} |  2 +-
 ...le-connection-throttle-kick-message.patch} |  8 ++---
 ...> 0293-Hook-into-CB-plugin-rewrites.patch} |  0
 ...94-Allow-setting-the-vex-s-summoner.patch} |  2 +-
 ...I.patch => 0295-Add-sun-related-API.patch} |  0
 ...Turtle-API.patch => 0296-Turtle-API.patch} |  2 +-
 ...her-worlds-for-shooter-of-projectil.patch} |  0
 ...ator-target-events-and-improve-impl.patch} |  0
 ...-Add-Velocity-IP-Forwarding-Support.patch} |  4 +--
 ...PI.patch => 0300-Add-more-Witch-API.patch} |  2 +-
 ...wned-for-Villager-Aggression-Config.patch} |  2 +-
 ...-Johnny.patch => 0302-Here-s-Johnny.patch} |  2 +-
 ...vent-players-from-moving-into-unloa.patch} |  0
 ...4-Reset-players-airTicks-on-respawn.patch} |  2 +-
 ...after-profile-lookups-if-not-needed.patch} |  0
 ...r-Thread-Pool-and-Thread-Priorities.patch} |  2 +-
 ...=> 0307-Optimize-World-Time-Updates.patch} |  0
 ...tore-custom-InventoryHolder-support.patch} |  0
 ...=> 0309-Use-Vanilla-Minecart-Speeds.patch} |  2 +-
 ...0310-Fix-SpongeAbsortEvent-handling.patch} |  0
 ...-allow-digging-into-unloaded-chunks.patch} |  0
 ...mits.patch => 0312-Book-Size-Limits.patch} |  6 ++--
 ...ult-permission-message-configurable.patch} |  8 ++---
 ...revent-rayTrace-from-loading-chunks.patch} |  2 +-
 ...-Large-Packets-disconnecting-client.patch} |  2 +-
 ...ntity-dismount-during-teleportation.patch} |  2 +-
 ...I.patch => 0317-Add-more-Zombie-API.patch} |  2 +-
 ...0318-Add-PlayerConnectionCloseEvent.patch} |  0
 ...revent-Enderman-from-loading-chunks.patch} |  2 +-
 ...replace-OfflinePlayer-getLastPlayed.patch} |  4 +--
 ...ehicle-tracking-issue-on-disconnect.patch} |  2 +-
 ...nRetractEvent-for-all-empty-pistons.patch} |  0
 ...remove-from-being-called-on-Players.patch} |  2 +-
 ...ent.patch => 0324-BlockDestroyEvent.patch} |  0
 ...m-Shapeless-Custom-Crafting-Recipes.patch} |  0
 ...h => 0326-Fix-sign-edit-memory-leak.patch} |  0
 ... 0327-Limit-Client-Sign-length-more.patch} |  0
 ...onvertSigns-boolean-every-sign-save.patch} |  0
 ...Manager-and-add-advanced-packet-sup.patch} |  0
 ...e-Oversized-Tile-Entities-in-chunks.patch} |  0
 ...-Fix-Whitelist-On-Off-inconsistency.patch} |  0
 ...t-tick-at-start-of-drowning-process.patch} |  0
 ...33-Allow-Saving-of-Oversized-Chunks.patch} |  0
 ...ggleEvent-when-whitelist-is-toggled.patch} |  0
 ...35-Add-LivingEntity-getTargetEntity.patch} |  0
 ...ngth-when-serialising-BungeeCord-te.patch} |  0
 ...=> 0337-Entity-getEntitySpawnReason.patch} |  0
 ...ty-Metadata-for-all-tracked-players.patch} |  0
 ...39-Implement-PlayerPostRespawnEvent.patch} |  0
 ...for-pickupDelay-breaks-picking-up-i.patch} |  0
 ...ts.patch => 0341-Server-Tick-Events.patch} |  0
 ...342-PlayerDeathEvent-getItemsToKeep.patch} |  2 +-
 ...Optimize-Captured-TileEntity-Lookup.patch} |  0
 ...API.patch => 0344-Add-Heightmap-API.patch} |  0
 ...> 0345-Mob-Spawner-API-Enhancements.patch} |  0
 ...ayer-View-Distance-API-placeholders.patch} |  2 +-
 ...-to-changed-postToMainThread-method.patch} |  2 +-
 ...-item-frames-are-modified-MC-123450.patch} |  0
 ...sPrimaryThread-and-MinecraftServer-.patch} |  0
 ...-entity-loss-due-to-unloaded-chunks.patch} |  0
 ... 0351-Duplicate-UUID-Resolve-Option.patch} |  0
 ...52-improve-CraftWorld-isChunkLoaded.patch} |  0
 ...e-Keep-Spawn-Loaded-range-per-world.patch} |  2 +-
 ...ityAreaEffectCloud-from-going-negat.patch} |  0
 ....patch => 0355-ChunkMapDistance-CME.patch} |  0
 ...0356-Implement-CraftBlockSoundGroup.patch} |  0
 ...d.patch => 0357-Chunk-debug-command.patch} |  0
 ...ptions-from-dispenser-entity-spawns.patch} |  0
 ...59-Fix-World-isChunkGenerated-calls.patch} |  0
 ...te-location-if-we-failed-to-read-it.patch} |  0
 ...aletteBlock-instead-of-ReentrantLoc.patch} |  0
 ...ch => 0362-incremental-chunk-saving.patch} |  0
 ...2-Anti-Xray.patch => 0363-Anti-Xray.patch} |  0
 ...l-Spawned-mobs-towards-natural-spaw.patch} |  0
 ...urable-projectile-relative-velocity.patch} |  0
 ...being-ticked-when-notifying-navigat.patch} |  0
 ...h => 0367-offset-item-frame-ticking.patch} |  0
 ...pper-searches-if-there-are-no-items.patch} |  0
 ...9-Asynchronous-chunk-IO-and-loading.patch} |  4 +--
 ...tChunkIfLoadedImmediately-in-places.patch} |  0
 ...ads.patch => 0371-Reduce-sync-loads.patch} |  0
 ...ement-alternative-item-despawn-rate.patch} |  0
 ...f-we-have-a-custom-Bukkit-generator.patch} |  2 +-
 ...-158900.patch => 0374-Fix-MC-158900.patch} |  0
 ...ment-optional-per-player-mob-spawns.patch} |  2 +-
 ...event-consuming-the-wrong-itemstack.patch} |  0
 ... => 0377-Fix-nether-portal-creation.patch} |  0
 ...gs.patch => 0378-Generator-Settings.patch} |  0
 ...-161754.patch => 0379-Fix-MC-161754.patch} |  0
 ...e-improvement-for-Chunk.getEntities.patch} |  0
 ...anging-entities-that-are-not-ItemFr.patch} |  0
 ...82-Expose-the-internal-current-tick.patch} |  0
 ...sneak-when-changing-worlds-MC-10657.patch} |  2 +-
 ...-option-to-disable-pillager-patrols.patch} |  0
 ...r-when-player-hand-set-to-empty-typ.patch} |  0
 ...=> 0386-PlayerLaunchProjectileEvent.patch} |  0
 ...tMagicNumbers.isSupportedApiVersion.patch} |  0
 ...k-loads-when-villagers-try-to-find-.patch} |  0
 ...656-Fix-Follow-Range-Initial-Target.patch} |  0
 ...pers.patch => 0390-Optimize-Hoppers.patch} |  0
 ...ayerDeathEvent-shouldDropExperience.patch} |  2 +-
 ...ading-chunks-checking-hive-position.patch} |  0
 ...hunks-from-Hoppers-and-other-things.patch} |  0
 ...ializing-mismatching-chunk-coordina.patch} |  0
 ...imise-IEntityAccess-getPlayerByUUID.patch} |  0
 ...396-Fix-items-not-falling-correctly.patch} |  0
 ...patch => 0397-Lag-compensate-eating.patch} |  0
 ...ize-call-to-getFluid-for-explosions.patch} |  0
 ...-in-stack-not-having-effects-when-d.patch} |  0
 ...Add-effect-to-block-break-naturally.patch} |  0
 ...=> 0401-Tracking-Range-Improvements.patch} |  0
 ...=> 0402-Entity-Activation-Range-2.0.patch} |  0
 ...-items-vanishing-through-end-portal.patch} |  0
 ...et-gravity-in-void.-Fixes-MC-167279.patch} |  0
 ...-getChunkAt-calls-for-loaded-chunks.patch} |  0
 ...w-overriding-the-java-version-check.patch} |  0
 ...tch => 0407-Add-ThrownEggHatchEvent.patch} |  0
 ... 0408-Optimise-random-block-ticking.patch} |  0
 ...p-API.patch => 0409-Entity-Jump-API.patch} |  0
 ...-to-nerf-pigmen-from-nether-portals.patch} |  0
 ... => 0411-Make-the-GUI-graph-fancier.patch} |  2 +-
 ...12-add-hand-to-BlockMultiPlaceEvent.patch} |  0
 ...3-Prevent-teleporting-dead-entities.patch} |  0
 ...ipwire-hook-placement-before-update.patch} |  0
 ...o-allow-iron-golems-to-spawn-in-air.patch} |  0
 ...chance-of-villager-zombie-infection.patch} |  0
 ...tch => 0417-Optimise-Chunk-getFluid.patch} |  0
 ...mise-TickListServer-by-rewriting-it.patch} |  4 +--
 ...pawn-settings-and-per-player-option.patch} |  2 +-
 ...e-Entity-is-never-double-registered.patch} |  0
 ...ring-entities-from-unloading-chunks.patch} |  0
 ...nections-shouldn-t-hold-up-shutdown.patch} |  0
 ...ow-bees-to-load-chunks-for-beehives.patch} |  0
 ...PlayerChunkMap-adds-crashing-server.patch} |  0
 ...timize-Collision-to-not-load-chunks.patch} |  0
 ...tch => 0426-Don-t-tick-dead-players.patch} |  2 +-
 ...-Player-s-shouldn-t-be-able-to-move.patch} |  0
 ...unkMap-memory-use-for-visibleChunks.patch} |  0
 ...h => 0429-Increase-Light-Queue-Size.patch} |  0
 ...sks-Speed-up-processing-of-chunk-lo.patch} |  4 +--
 ...ove-existing-players-to-world-spawn.patch} |  2 +-
 ...Add-tick-times-API-and-mspt-command.patch} |  2 +-
 ...33-Expose-MinecraftServer-isRunning.patch} |  0
 ...dd-Raw-Byte-ItemStack-Serialization.patch} |  0
 ...5-Remove-streams-from-Mob-AI-System.patch} |  0
 ...ons-until-after-entity-ticking-is-d.patch} |  0
 ... => 0437-Async-command-map-building.patch} |  0
 ...h => 0438-Improved-Watchdog-Support.patch} |  0
 ....patch => 0439-Optimize-Pathfinding.patch} |  0
 ...0-Reduce-Either-Optional-allocation.patch} |  0
 ...441-Remove-streams-from-PairedQueue.patch} |  0
 ...-memory-footprint-of-NBTTagCompound.patch} |  0
 ...ent-opening-inventories-when-frozen.patch} |  2 +-
 ...44-Optimise-ArraySetSorted-removeIf.patch} |  0
 ...entity-collision-code-if-not-needed.patch} |  0
 ...viderServer-s-chunk-level-checking-.patch} |  0
 ...teleport-command-to-valid-locations.patch} |  0
 ...Implement-Player-Client-Options-API.patch} |  4 +--
 ...Chunk-Post-Processing-deadlock-risk.patch} |  0
 ...ayer-is-attempted-to-be-removed-fro.patch} |  0
 ...1-Broadcast-join-message-to-console.patch} |  0
 ...-Broken-behavior-of-PlayerJoinEvent.patch} |  2 +-
 ...oad-Chunks-for-Login-Asynchronously.patch} |  4 +--
 ...awn-point-if-spawn-in-unloaded-worl.patch} |  0
 ...layerAttackEntityCooldownResetEvent.patch} |  0
 ...llbacks-to-schedule-for-Callback-Ex.patch} |  0
 ...-fire-BlockFade-on-worldgen-threads.patch} |  0
 ...tom-creative-and-insomniac-controls.patch} |  0
 ...-duplication-issues-and-teleport-is.patch} |  0
 ...0460-Implement-Brigadier-Mojang-API.patch} |  2 +-
 ...patch => 0461-Villager-Restocks-API.patch} |  0
 ...ickItem-Packet-and-kick-for-invalid.patch} |  2 +-
 ...n.patch => 0463-Expose-game-version.patch} |  0
 ...> 0464-Optimize-Voxel-Shape-Merging.patch} |  0
 ...per-thread-native-byte-buffer-cache.patch} |  0
 ...atch => 0466-Implement-Mob-Goal-API.patch} |  0
 ...ance-map-to-optimise-entity-tracker.patch} |  0
 ...isOutsideRange-to-use-distance-maps.patch} |  2 +-
 ...e-operations-for-updating-light-dat.patch} |  0
 ...o-Tick-view-distance-implementation.patch} |  2 +-
 ...=> 0471-Add-villager-reputation-API.patch} |  0
 ...and.patch => 0472-Fix-Light-Command.patch} |  0
 ...-Fix-PotionEffect-ignores-icon-flag.patch} |  0
 ...brigadier-child-sorting-performance.patch} |  0
 ...ock-unless-actually-showing-the-mes.patch} |  0
 ...API.patch => 0476-Potential-bed-API.patch} |  0
 ...ait-for-Async-Tasks-during-shutdown.patch} |  0
 ...er-respects-game-and-entity-rules-f.patch} |  0
 ...nd-End-Portal-Frames-from-being-des.patch} |  4 +--
 ...e-NibbleArray-to-use-pooled-buffers.patch} |  0
 ...leInt-allocations-from-light-engine.patch} |  0
 ...location-of-Vec3D-by-entity-tracker.patch} |  0
 ...> 0483-Ensure-safe-gateway-teleport.patch} |  0
 ...-for-console-having-all-permissions.patch} |  4 +--
 ...und-for-Client-Lag-Spikes-MC-162253.patch} |  0
 ...-Priority-Urgency-System-for-Chunks.patch} |  0
 ...n-Full-Status-Chunk-NBT-Memory-Leak.patch} |  0
 ...packets-to-nearby-locations-sounds-.patch} |  0
 ...prove-Chunk-Status-Transition-Speed.patch} |  0
 ...x-villager-trading-demand-MC-163962.patch} |  0
 ... => 0491-Maps-shouldn-t-load-chunks.patch} |  0
 ...okup-for-Treasure-Maps-Fixes-lag-fr.patch} |  0
 ...Optimize-Bit-Operations-by-inlining.patch} |  0
 ...patch => 0494-Optimize-Light-Engine.patch} |  0
 ...nk-Unloads-based-on-Player-Movement.patch} |  0
 ...Plugin-Tickets-to-API-Chunk-Methods.patch} |  0
 ...sing-chunks-due-to-integer-overflow.patch} |  0
 ...r-runTaskTimerAsynchronously-Plugin.patch} |  0
 ...ton-physics-inconsistency-MC-188840.patch} |  4 +--
 ...uping.patch => 0500-Fix-sand-duping.patch} |  0
 ...desync-in-playerconnection-causing-.patch} |  0
 ...ch => 0502-Fix-enderdragon-exp-dupe.patch} |  0
 ...older-method-without-block-snapshot.patch} |  0
 ...h => 0504-Expose-Arrow-getItemStack.patch} |  0
 ...mplement-PlayerRecipeBookClickEvent.patch} |  0
 ...-Hide-sync-chunk-writes-behind-flag.patch} |  0
 ...it-lightning-strike-effect-distance.patch} |  0
 ...8-Add-permission-for-command-blocks.patch} |  2 +-
 ...ure-Entity-AABB-s-are-never-invalid.patch} |  0
 ...orldBorder-collision-checks-and-air.patch} |  0
 ...d-Difficulty-Remembering-Difficulty.patch} |  0
 ...atch => 0512-Paper-dumpitem-command.patch} |  0
 ...13-Don-t-allow-null-UUID-s-for-chat.patch} |  0
 ...Legacy-Component-serialization-size.patch} |  0
 ...515-Support-old-UUID-format-for-NBT.patch} |  0
 ...p-duplicated-GameProfile-Properties.patch} |  0
 ...vert-legacy-attributes-in-Item-Meta.patch} |  0
 ...Remove-some-streams-from-structures.patch} |  0
 ...rom-classes-related-villager-gossip.patch} |  0
 ...0520-Support-components-in-ItemMeta.patch} |  0
 ...rgetLivingEntityEvent-for-1.16-mobs.patch} |  0
 ...patch => 0522-Add-entity-liquid-API.patch} |  0
 ...date-itemstack-legacy-name-and-lore.patch} |  0
 ...wn-player-in-correct-world-on-login.patch} |  0
 ...atch => 0525-Add-PrepareResultEvent.patch} |  0
 ...low-delegation-to-vanilla-chunk-gen.patch} |  0
 ...-for-portal-on-world-gen-entity-add.patch} |  0
 ...e-NetworkManager-Exception-Handling.patch} |  0
 ...x-Concurrency-issue-in-WeightedList.patch} |  0
 ...ncement-data-player-iteration-to-be.patch} |  0
 ...x-arrows-never-despawning-MC-125757.patch} |  0
 ...Vanilla-Command-permission-checking.patch} |  0
 ...ve-range-check-for-block-placing-up.patch} |  0
 ...-5989.patch => 0534-Fix-SPIGOT-5989.patch} |  0
 ...-Bukkit-world-container-is-not-used.patch} |  0
 ...5885-Unable-to-disable-advancements.patch} |  0
 ...taPlayer-leak-due-from-quitting-ear.patch} |  0
 ...eLighting-call-to-World-spigot-stri.patch} |  0
 ...ix-some-rails-connecting-improperly.patch} |  0
 ...er-Remove-Streams-Optimized-collect.patch} |  0
 ...h => 0541-Incremental-player-saving.patch} |  4 +--
 ...tch => 0542-Import-fastutil-classes.patch} |  0
 ...ll-chunk-sections-for-block-updates.patch} |  0
 ...ve-armour-stand-double-add-to-world.patch} |  0
 ...Fix-MC-187716-Use-configured-height.patch} |  0
 ...urn-for-WorldServer-addAllEntitiesS.patch} |  0
 ...stake-in-CB-NBT-int-deserialization.patch} |  0
 ...rver-load-chunks-from-newer-version.patch} |  0
 ...support.patch => 0549-Brand-support.patch} |  0
 ...er-Boss-Bar-doesn-t-update-until-in.patch} |  0
 ...-197271.patch => 0551-Fix-MC-197271.patch} |  0
 ...0552-MC-197883-Bandaid-decode-issue.patch} |  0
 ...patch => 0553-Add-setMaxPlayers-API.patch} |  0
 ...PickupItemAnimation-to-LivingEntity.patch} |  0
 ...h => 0555-Don-t-require-FACING-data.patch} |  0
 ...eEvent-not-firing-for-all-use-cases.patch} |  0
 ...PI.patch => 0557-Add-moon-phase-API.patch} |  0
 ...headless-pistons-from-being-created.patch} |  4 +--
 ...support.patch => 0559-Brand-support.patch} |  0
 ...ent.patch => 0560-Add-BellRingEvent.patch} |  0
 ...dd-zombie-targets-turtle-egg-config.patch} |  0
 ...patch => 0562-Buffer-joins-to-world.patch} |  4 +--
 ...=> 0563-Optimize-redstone-algorithm.patch} |  0
 ...s-not-working-in-some-kick-messages.patch} |  0
 ...reateEvent-needs-to-know-its-entity.patch} |  0
 ...ch => 0566-Fix-CraftTeam-null-check.patch} |  0
 ...I.patch => 0567-Add-more-Evoker-API.patch} |  0
 ...translation-keys-for-blocks-entitie.patch} |  0
 ...te-HoverEvent-from-ItemStack-Entity.patch} |  0
 ...ch => 0570-Cache-block-data-strings.patch} |  0
 ...rtation-and-cancel-velocity-if-tele.patch} |  0
 ...l-open-container-api-to-HumanEntity.patch} |  0
 ...aFixerUpper-Rewrite-Rules-on-demand.patch} |  0
 ...-capture-to-capture-all-items-added.patch} |  0
 ...ty-in-invalid-locations-SPIGOT-6086.patch} |  0
 ...-Counter-to-allow-plugins-to-use-va.patch} |  0
 ...track-plugin-scoreboards-by-default.patch} |  4 +--
 ...king.patch => 0578-Entity-isTicking.patch} |  0
 ...non-whitelisted-player-when-white-l.patch} |  0
 ...ix-Not-a-string-Map-Conversion-spam.patch} |  0
 ...g-a-passenger-in-CreatureSpawnEvent.patch} |  0
 ...ems-that-are-extra-from-a-crafting-.patch} |  0
 ...eset-Ender-Crystals-on-Dragon-Spawn.patch} |  0
 ...-large-move-vectors-crashing-server.patch} |  0
 ...atch => 0585-Optimise-getType-calls.patch} |  2 +-
 ...nig-for-some-hot-IBlockData-methods.patch} |  0
 ...ce-order-when-capturing-blockstates.patch} |  0
 ...lockpos-allocation-from-pathfinding.patch} |  0
 ...em-locations-dropped-from-campfires.patch} |  0
 ...tch => 0590-Player-elytra-boost-API.patch} |  2 +-
 ...91-Fixed-TileEntityBell-memory-leak.patch} |  0
 ...ing-up-when-item-stack-is-empty-in-.patch} |  0
 ...Add-getOfflinePlayerIfCached-String.patch} |  0
 work/Spigot                                   |  2 +-
 393 files changed, 166 insertions(+), 130 deletions(-)
 create mode 100644 Spigot-Server-Patches/0203-Make-player-data-saving-configurable.patch
 rename Spigot-Server-Patches/{0203-Make-legacy-ping-handler-more-reliable.patch => 0204-Make-legacy-ping-handler-more-reliable.patch} (100%)
 rename Spigot-Server-Patches/{0204-Call-PaperServerListPingEvent-for-legacy-pings.patch => 0205-Call-PaperServerListPingEvent-for-legacy-pings.patch} (100%)
 rename Spigot-Server-Patches/{0205-Flag-to-disable-the-channel-limit.patch => 0206-Flag-to-disable-the-channel-limit.patch} (95%)
 rename Spigot-Server-Patches/{0206-Add-method-to-open-already-placed-sign.patch => 0207-Add-method-to-open-already-placed-sign.patch} (100%)
 rename Spigot-Server-Patches/{0207-Configurable-sprint-interruption-on-attack.patch => 0208-Configurable-sprint-interruption-on-attack.patch} (95%)
 rename Spigot-Server-Patches/{0208-Fix-exploit-that-allowed-colored-signs-to-be-created.patch => 0209-Fix-exploit-that-allowed-colored-signs-to-be-created.patch} (100%)
 rename Spigot-Server-Patches/{0209-EndermanEscapeEvent.patch => 0210-EndermanEscapeEvent.patch} (100%)
 rename Spigot-Server-Patches/{0210-Enderman.teleportRandomly.patch => 0211-Enderman.teleportRandomly.patch} (94%)
 rename Spigot-Server-Patches/{0211-Block-Enderpearl-Travel-Exploit.patch => 0212-Block-Enderpearl-Travel-Exploit.patch} (100%)
 rename Spigot-Server-Patches/{0212-Expand-World.spawnParticle-API-and-add-Builder.patch => 0213-Expand-World.spawnParticle-API-and-add-Builder.patch} (100%)
 rename Spigot-Server-Patches/{0213-EndermanAttackPlayerEvent.patch => 0214-EndermanAttackPlayerEvent.patch} (93%)
 rename Spigot-Server-Patches/{0214-WitchConsumePotionEvent.patch => 0215-WitchConsumePotionEvent.patch} (93%)
 rename Spigot-Server-Patches/{0215-WitchThrowPotionEvent.patch => 0216-WitchThrowPotionEvent.patch} (94%)
 rename Spigot-Server-Patches/{0216-Allow-spawning-Item-entities-with-World.spawnEntity.patch => 0217-Allow-spawning-Item-entities-with-World.spawnEntity.patch} (100%)
 rename Spigot-Server-Patches/{0217-WitchReadyPotionEvent.patch => 0218-WitchReadyPotionEvent.patch} (93%)
 rename Spigot-Server-Patches/{0218-ItemStack-getMaxItemUseDuration.patch => 0219-ItemStack-getMaxItemUseDuration.patch} (100%)
 rename Spigot-Server-Patches/{0219-Implement-EntityTeleportEndGatewayEvent.patch => 0220-Implement-EntityTeleportEndGatewayEvent.patch} (95%)
 rename Spigot-Server-Patches/{0220-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch => 0221-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch} (94%)
 rename Spigot-Server-Patches/{0221-Fix-CraftEntity-hashCode.patch => 0222-Fix-CraftEntity-hashCode.patch} (100%)
 rename Spigot-Server-Patches/{0222-Configurable-Alternative-LootPool-Luck-Formula.patch => 0223-Configurable-Alternative-LootPool-Luck-Formula.patch} (92%)
 rename Spigot-Server-Patches/{0223-Print-Error-details-when-failing-to-save-player-data.patch => 0224-Print-Error-details-when-failing-to-save-player-data.patch} (90%)
 rename Spigot-Server-Patches/{0224-Make-shield-blocking-delay-configurable.patch => 0225-Make-shield-blocking-delay-configurable.patch} (97%)
 rename Spigot-Server-Patches/{0225-Improve-EntityShootBowEvent.patch => 0226-Improve-EntityShootBowEvent.patch} (93%)
 rename Spigot-Server-Patches/{0226-PlayerReadyArrowEvent.patch => 0227-PlayerReadyArrowEvent.patch} (95%)
 rename Spigot-Server-Patches/{0227-Implement-EntityKnockbackByEntityEvent.patch => 0228-Implement-EntityKnockbackByEntityEvent.patch} (95%)
 rename Spigot-Server-Patches/{0228-Expand-Explosions-API.patch => 0229-Expand-Explosions-API.patch} (100%)
 rename Spigot-Server-Patches/{0229-LivingEntity-Hand-Raised-Item-Use-API.patch => 0230-LivingEntity-Hand-Raised-Item-Use-API.patch} (100%)
 rename Spigot-Server-Patches/{0230-RangedEntity-API.patch => 0231-RangedEntity-API.patch} (100%)
 rename Spigot-Server-Patches/{0231-Add-config-to-disable-ender-dragon-legacy-check.patch => 0232-Add-config-to-disable-ender-dragon-legacy-check.patch} (100%)
 rename Spigot-Server-Patches/{0232-Implement-World.getEntity-UUID-API.patch => 0233-Implement-World.getEntity-UUID-API.patch} (100%)
 rename Spigot-Server-Patches/{0233-InventoryCloseEvent-Reason-API.patch => 0234-InventoryCloseEvent-Reason-API.patch} (100%)
 rename Spigot-Server-Patches/{0234-Vex-getSummoner-API.patch => 0235-Vex-getSummoner-API.patch} (94%)
 rename Spigot-Server-Patches/{0235-Refresh-player-inventory-when-cancelling-PlayerInter.patch => 0236-Refresh-player-inventory-when-cancelling-PlayerInter.patch} (100%)
 rename Spigot-Server-Patches/{0236-Don-t-change-the-Entity-Random-seed-for-squids.patch => 0237-Don-t-change-the-Entity-Random-seed-for-squids.patch} (89%)
 rename Spigot-Server-Patches/{0237-Re-add-vanilla-entity-warnings-for-duplicates.patch => 0238-Re-add-vanilla-entity-warnings-for-duplicates.patch} (100%)
 rename Spigot-Server-Patches/{0238-Avoid-item-merge-if-stack-size-above-max-stack-size.patch => 0239-Avoid-item-merge-if-stack-size-above-max-stack-size.patch} (91%)
 rename Spigot-Server-Patches/{0239-Use-asynchronous-Log4j-2-loggers.patch => 0240-Use-asynchronous-Log4j-2-loggers.patch} (95%)
 rename Spigot-Server-Patches/{0240-add-more-information-to-Entity.toString.patch => 0241-add-more-information-to-Entity.toString.patch} (100%)
 rename Spigot-Server-Patches/{0241-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch => 0242-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch} (100%)
 rename Spigot-Server-Patches/{0242-EnderDragon-Events.patch => 0243-EnderDragon-Events.patch} (100%)
 rename Spigot-Server-Patches/{0243-PlayerElytraBoostEvent.patch => 0244-PlayerElytraBoostEvent.patch} (100%)
 rename Spigot-Server-Patches/{0244-Improve-BlockPosition-inlining.patch => 0245-Improve-BlockPosition-inlining.patch} (100%)
 rename Spigot-Server-Patches/{0245-Optimize-RegistryID.c.patch => 0246-Optimize-RegistryID.c.patch} (100%)
 rename Spigot-Server-Patches/{0246-Option-to-prevent-armor-stands-from-doing-entity-loo.patch => 0247-Option-to-prevent-armor-stands-from-doing-entity-loo.patch} (93%)
 rename Spigot-Server-Patches/{0247-Vanished-players-don-t-have-rights.patch => 0248-Vanished-players-don-t-have-rights.patch} (96%)
 rename Spigot-Server-Patches/{0248-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch => 0249-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch} (100%)
 rename Spigot-Server-Patches/{0249-Add-some-Debug-to-Chunk-Entity-slices.patch => 0250-Add-some-Debug-to-Chunk-Entity-slices.patch} (97%)
 rename Spigot-Server-Patches/{0250-SkeletonHorse-Additions.patch => 0251-SkeletonHorse-Additions.patch} (97%)
 rename Spigot-Server-Patches/{0251-Prevent-Saving-Bad-entities-to-chunks.patch => 0252-Prevent-Saving-Bad-entities-to-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0252-Don-t-call-getItemMeta-on-hasItemMeta.patch => 0253-Don-t-call-getItemMeta-on-hasItemMeta.patch} (100%)
 rename Spigot-Server-Patches/{0253-Ignore-Dead-Entities-in-entityList-iteration.patch => 0254-Ignore-Dead-Entities-in-entityList-iteration.patch} (100%)
 rename Spigot-Server-Patches/{0254-Implement-Expanded-ArmorStand-API.patch => 0255-Implement-Expanded-ArmorStand-API.patch} (97%)
 rename Spigot-Server-Patches/{0255-AnvilDamageEvent.patch => 0256-AnvilDamageEvent.patch} (100%)
 rename Spigot-Server-Patches/{0256-Add-TNTPrimeEvent.patch => 0257-Add-TNTPrimeEvent.patch} (98%)
 rename Spigot-Server-Patches/{0257-Break-up-and-make-tab-spam-limits-configurable.patch => 0258-Break-up-and-make-tab-spam-limits-configurable.patch} (94%)
 rename Spigot-Server-Patches/{0258-Add-hand-to-bucket-events.patch => 0259-Add-hand-to-bucket-events.patch} (100%)
 rename Spigot-Server-Patches/{0259-MC-135506-Experience-should-save-as-Integers.patch => 0260-MC-135506-Experience-should-save-as-Integers.patch} (93%)
 rename Spigot-Server-Patches/{0260-Fix-client-rendering-skulls-from-same-user.patch => 0261-Fix-client-rendering-skulls-from-same-user.patch} (100%)
 rename Spigot-Server-Patches/{0261-Add-Early-Warning-Feature-to-WatchDog.patch => 0262-Add-Early-Warning-Feature-to-WatchDog.patch} (97%)
 rename Spigot-Server-Patches/{0262-Make-EnderDragon-implement-Mob.patch => 0263-Make-EnderDragon-implement-Mob.patch} (100%)
 rename Spigot-Server-Patches/{0263-Use-ConcurrentHashMap-in-JsonList.patch => 0264-Use-ConcurrentHashMap-in-JsonList.patch} (100%)
 rename Spigot-Server-Patches/{0264-Use-a-Queue-for-Queueing-Commands.patch => 0265-Use-a-Queue-for-Queueing-Commands.patch} (100%)
 rename Spigot-Server-Patches/{0265-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch => 0266-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch} (100%)
 rename Spigot-Server-Patches/{0266-Allow-disabling-armour-stand-ticking.patch => 0267-Allow-disabling-armour-stand-ticking.patch} (97%)
 rename Spigot-Server-Patches/{0267-Optimize-BlockPosition-helper-methods.patch => 0268-Optimize-BlockPosition-helper-methods.patch} (100%)
 rename Spigot-Server-Patches/{0268-Restore-vanlla-default-mob-spawn-range.patch => 0269-Restore-vanlla-default-mob-spawn-range.patch} (100%)
 rename Spigot-Server-Patches/{0269-Slime-Pathfinder-Events.patch => 0270-Slime-Pathfinder-Events.patch} (100%)
 rename Spigot-Server-Patches/{0270-Configurable-speed-for-water-flowing-over-lava.patch => 0271-Configurable-speed-for-water-flowing-over-lava.patch} (100%)
 rename Spigot-Server-Patches/{0271-Optimize-CraftBlockData-Creation.patch => 0272-Optimize-CraftBlockData-Creation.patch} (100%)
 rename Spigot-Server-Patches/{0272-Optimize-RegistryMaterials.patch => 0273-Optimize-RegistryMaterials.patch} (100%)
 rename Spigot-Server-Patches/{0273-Add-PhantomPreSpawnEvent.patch => 0274-Add-PhantomPreSpawnEvent.patch} (100%)
 rename Spigot-Server-Patches/{0274-Add-More-Creeper-API.patch => 0275-Add-More-Creeper-API.patch} (96%)
 rename Spigot-Server-Patches/{0275-Inventory-removeItemAnySlot.patch => 0276-Inventory-removeItemAnySlot.patch} (100%)
 rename Spigot-Server-Patches/{0276-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch => 0277-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch} (100%)
 rename Spigot-Server-Patches/{0277-Add-ray-tracing-methods-to-LivingEntity.patch => 0278-Add-ray-tracing-methods-to-LivingEntity.patch} (97%)
 rename Spigot-Server-Patches/{0278-Expose-attack-cooldown-methods-for-Player.patch => 0279-Expose-attack-cooldown-methods-for-Player.patch} (94%)
 rename Spigot-Server-Patches/{0279-Improve-death-events.patch => 0280-Improve-death-events.patch} (99%)
 rename Spigot-Server-Patches/{0280-Allow-chests-to-be-placed-with-NBT-data.patch => 0281-Allow-chests-to-be-placed-with-NBT-data.patch} (100%)
 rename Spigot-Server-Patches/{0281-Mob-Pathfinding-API.patch => 0282-Mob-Pathfinding-API.patch} (99%)
 rename Spigot-Server-Patches/{0282-Prevent-chunk-loading-from-Fluid-Flowing.patch => 0283-Prevent-chunk-loading-from-Fluid-Flowing.patch} (100%)
 rename Spigot-Server-Patches/{0283-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch => 0284-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch} (100%)
 rename Spigot-Server-Patches/{0284-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch => 0285-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch} (100%)
 rename Spigot-Server-Patches/{0285-Prevent-mob-spawning-from-loading-generating-chunks.patch => 0286-Prevent-mob-spawning-from-loading-generating-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0286-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch => 0287-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch} (100%)
 rename Spigot-Server-Patches/{0287-Implement-furnace-cook-speed-multiplier-API.patch => 0288-Implement-furnace-cook-speed-multiplier-API.patch} (100%)
 rename Spigot-Server-Patches/{0288-PreSpawnerSpawnEvent.patch => 0289-PreSpawnerSpawnEvent.patch} (100%)
 rename Spigot-Server-Patches/{0289-Catch-JsonParseException-in-Entity-and-TE-names.patch => 0290-Catch-JsonParseException-in-Entity-and-TE-names.patch} (100%)
 rename Spigot-Server-Patches/{0290-Honor-EntityAgeable.ageLock.patch => 0291-Honor-EntityAgeable.ageLock.patch} (87%)
 rename Spigot-Server-Patches/{0291-Configurable-connection-throttle-kick-message.patch => 0292-Configurable-connection-throttle-kick-message.patch} (87%)
 rename Spigot-Server-Patches/{0292-Hook-into-CB-plugin-rewrites.patch => 0293-Hook-into-CB-plugin-rewrites.patch} (100%)
 rename Spigot-Server-Patches/{0293-Allow-setting-the-vex-s-summoner.patch => 0294-Allow-setting-the-vex-s-summoner.patch} (93%)
 rename Spigot-Server-Patches/{0294-Add-sun-related-API.patch => 0295-Add-sun-related-API.patch} (100%)
 rename Spigot-Server-Patches/{0295-Turtle-API.patch => 0296-Turtle-API.patch} (98%)
 rename Spigot-Server-Patches/{0296-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch => 0297-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch} (100%)
 rename Spigot-Server-Patches/{0297-Call-player-spectator-target-events-and-improve-impl.patch => 0298-Call-player-spectator-target-events-and-improve-impl.patch} (100%)
 rename Spigot-Server-Patches/{0298-Add-Velocity-IP-Forwarding-Support.patch => 0299-Add-Velocity-IP-Forwarding-Support.patch} (98%)
 rename Spigot-Server-Patches/{0299-Add-more-Witch-API.patch => 0300-Add-more-Witch-API.patch} (98%)
 rename Spigot-Server-Patches/{0300-Check-Drowned-for-Villager-Aggression-Config.patch => 0301-Check-Drowned-for-Villager-Aggression-Config.patch} (93%)
 rename Spigot-Server-Patches/{0301-Here-s-Johnny.patch => 0302-Here-s-Johnny.patch} (94%)
 rename Spigot-Server-Patches/{0302-Add-option-to-prevent-players-from-moving-into-unloa.patch => 0303-Add-option-to-prevent-players-from-moving-into-unloa.patch} (100%)
 rename Spigot-Server-Patches/{0303-Reset-players-airTicks-on-respawn.patch => 0304-Reset-players-airTicks-on-respawn.patch} (93%)
 rename Spigot-Server-Patches/{0304-Don-t-sleep-after-profile-lookups-if-not-needed.patch => 0305-Don-t-sleep-after-profile-lookups-if-not-needed.patch} (100%)
 rename Spigot-Server-Patches/{0305-Improve-Server-Thread-Pool-and-Thread-Priorities.patch => 0306-Improve-Server-Thread-Pool-and-Thread-Priorities.patch} (98%)
 rename Spigot-Server-Patches/{0306-Optimize-World-Time-Updates.patch => 0307-Optimize-World-Time-Updates.patch} (100%)
 rename Spigot-Server-Patches/{0307-Restore-custom-InventoryHolder-support.patch => 0308-Restore-custom-InventoryHolder-support.patch} (100%)
 rename Spigot-Server-Patches/{0308-Use-Vanilla-Minecart-Speeds.patch => 0309-Use-Vanilla-Minecart-Speeds.patch} (92%)
 rename Spigot-Server-Patches/{0309-Fix-SpongeAbsortEvent-handling.patch => 0310-Fix-SpongeAbsortEvent-handling.patch} (100%)
 rename Spigot-Server-Patches/{0310-Don-t-allow-digging-into-unloaded-chunks.patch => 0311-Don-t-allow-digging-into-unloaded-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0311-Book-Size-Limits.patch => 0312-Book-Size-Limits.patch} (93%)
 rename Spigot-Server-Patches/{0312-Make-the-default-permission-message-configurable.patch => 0313-Make-the-default-permission-message-configurable.patch} (87%)
 rename Spigot-Server-Patches/{0313-Prevent-rayTrace-from-loading-chunks.patch => 0314-Prevent-rayTrace-from-loading-chunks.patch} (94%)
 rename Spigot-Server-Patches/{0314-Handle-Large-Packets-disconnecting-client.patch => 0315-Handle-Large-Packets-disconnecting-client.patch} (98%)
 rename Spigot-Server-Patches/{0315-force-entity-dismount-during-teleportation.patch => 0316-force-entity-dismount-during-teleportation.patch} (98%)
 rename Spigot-Server-Patches/{0316-Add-more-Zombie-API.patch => 0317-Add-more-Zombie-API.patch} (97%)
 rename Spigot-Server-Patches/{0317-Add-PlayerConnectionCloseEvent.patch => 0318-Add-PlayerConnectionCloseEvent.patch} (100%)
 rename Spigot-Server-Patches/{0318-Prevent-Enderman-from-loading-chunks.patch => 0319-Prevent-Enderman-from-loading-chunks.patch} (95%)
 rename Spigot-Server-Patches/{0319-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch => 0320-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch} (97%)
 rename Spigot-Server-Patches/{0320-Workaround-for-vehicle-tracking-issue-on-disconnect.patch => 0321-Workaround-for-vehicle-tracking-issue-on-disconnect.patch} (91%)
 rename Spigot-Server-Patches/{0321-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch => 0322-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch} (100%)
 rename Spigot-Server-Patches/{0322-Block-Entity-remove-from-being-called-on-Players.patch => 0323-Block-Entity-remove-from-being-called-on-Players.patch} (93%)
 rename Spigot-Server-Patches/{0323-BlockDestroyEvent.patch => 0324-BlockDestroyEvent.patch} (100%)
 rename Spigot-Server-Patches/{0324-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch => 0325-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch} (100%)
 rename Spigot-Server-Patches/{0325-Fix-sign-edit-memory-leak.patch => 0326-Fix-sign-edit-memory-leak.patch} (100%)
 rename Spigot-Server-Patches/{0326-Limit-Client-Sign-length-more.patch => 0327-Limit-Client-Sign-length-more.patch} (100%)
 rename Spigot-Server-Patches/{0327-Don-t-check-ConvertSigns-boolean-every-sign-save.patch => 0328-Don-t-check-ConvertSigns-boolean-every-sign-save.patch} (100%)
 rename Spigot-Server-Patches/{0328-Optimize-Network-Manager-and-add-advanced-packet-sup.patch => 0329-Optimize-Network-Manager-and-add-advanced-packet-sup.patch} (100%)
 rename Spigot-Server-Patches/{0329-Handle-Oversized-Tile-Entities-in-chunks.patch => 0330-Handle-Oversized-Tile-Entities-in-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0330-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch => 0331-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch} (100%)
 rename Spigot-Server-Patches/{0331-Set-Zombie-last-tick-at-start-of-drowning-process.patch => 0332-Set-Zombie-last-tick-at-start-of-drowning-process.patch} (100%)
 rename Spigot-Server-Patches/{0332-Allow-Saving-of-Oversized-Chunks.patch => 0333-Allow-Saving-of-Oversized-Chunks.patch} (100%)
 rename Spigot-Server-Patches/{0333-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch => 0334-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch} (100%)
 rename Spigot-Server-Patches/{0334-Add-LivingEntity-getTargetEntity.patch => 0335-Add-LivingEntity-getTargetEntity.patch} (100%)
 rename Spigot-Server-Patches/{0335-Use-proper-max-length-when-serialising-BungeeCord-te.patch => 0336-Use-proper-max-length-when-serialising-BungeeCord-te.patch} (100%)
 rename Spigot-Server-Patches/{0336-Entity-getEntitySpawnReason.patch => 0337-Entity-getEntitySpawnReason.patch} (100%)
 rename Spigot-Server-Patches/{0337-Update-entity-Metadata-for-all-tracked-players.patch => 0338-Update-entity-Metadata-for-all-tracked-players.patch} (100%)
 rename Spigot-Server-Patches/{0338-Implement-PlayerPostRespawnEvent.patch => 0339-Implement-PlayerPostRespawnEvent.patch} (100%)
 rename Spigot-Server-Patches/{0339-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch => 0340-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch} (100%)
 rename Spigot-Server-Patches/{0340-Server-Tick-Events.patch => 0341-Server-Tick-Events.patch} (100%)
 rename Spigot-Server-Patches/{0341-PlayerDeathEvent-getItemsToKeep.patch => 0342-PlayerDeathEvent-getItemsToKeep.patch} (96%)
 rename Spigot-Server-Patches/{0342-Optimize-Captured-TileEntity-Lookup.patch => 0343-Optimize-Captured-TileEntity-Lookup.patch} (100%)
 rename Spigot-Server-Patches/{0343-Add-Heightmap-API.patch => 0344-Add-Heightmap-API.patch} (100%)
 rename Spigot-Server-Patches/{0344-Mob-Spawner-API-Enhancements.patch => 0345-Mob-Spawner-API-Enhancements.patch} (100%)
 rename Spigot-Server-Patches/{0345-Per-Player-View-Distance-API-placeholders.patch => 0346-Per-Player-View-Distance-API-placeholders.patch} (97%)
 rename Spigot-Server-Patches/{0346-Fix-CB-call-to-changed-postToMainThread-method.patch => 0347-Fix-CB-call-to-changed-postToMainThread-method.patch} (90%)
 rename Spigot-Server-Patches/{0347-Fix-sounds-when-item-frames-are-modified-MC-123450.patch => 0348-Fix-sounds-when-item-frames-are-modified-MC-123450.patch} (100%)
 rename Spigot-Server-Patches/{0348-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch => 0349-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch} (100%)
 rename Spigot-Server-Patches/{0349-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch => 0350-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0350-Duplicate-UUID-Resolve-Option.patch => 0351-Duplicate-UUID-Resolve-Option.patch} (100%)
 rename Spigot-Server-Patches/{0351-improve-CraftWorld-isChunkLoaded.patch => 0352-improve-CraftWorld-isChunkLoaded.patch} (100%)
 rename Spigot-Server-Patches/{0352-Configurable-Keep-Spawn-Loaded-range-per-world.patch => 0353-Configurable-Keep-Spawn-Loaded-range-per-world.patch} (99%)
 rename Spigot-Server-Patches/{0353-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch => 0354-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch} (100%)
 rename Spigot-Server-Patches/{0354-ChunkMapDistance-CME.patch => 0355-ChunkMapDistance-CME.patch} (100%)
 rename Spigot-Server-Patches/{0355-Implement-CraftBlockSoundGroup.patch => 0356-Implement-CraftBlockSoundGroup.patch} (100%)
 rename Spigot-Server-Patches/{0356-Chunk-debug-command.patch => 0357-Chunk-debug-command.patch} (100%)
 rename Spigot-Server-Patches/{0357-Catch-exceptions-from-dispenser-entity-spawns.patch => 0358-Catch-exceptions-from-dispenser-entity-spawns.patch} (100%)
 rename Spigot-Server-Patches/{0358-Fix-World-isChunkGenerated-calls.patch => 0359-Fix-World-isChunkGenerated-calls.patch} (100%)
 rename Spigot-Server-Patches/{0359-Show-blockstate-location-if-we-failed-to-read-it.patch => 0360-Show-blockstate-location-if-we-failed-to-read-it.patch} (100%)
 rename Spigot-Server-Patches/{0360-Synchronize-DataPaletteBlock-instead-of-ReentrantLoc.patch => 0361-Synchronize-DataPaletteBlock-instead-of-ReentrantLoc.patch} (100%)
 rename Spigot-Server-Patches/{0361-incremental-chunk-saving.patch => 0362-incremental-chunk-saving.patch} (100%)
 rename Spigot-Server-Patches/{0362-Anti-Xray.patch => 0363-Anti-Xray.patch} (100%)
 rename Spigot-Server-Patches/{0363-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch => 0364-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch} (100%)
 rename Spigot-Server-Patches/{0364-Configurable-projectile-relative-velocity.patch => 0365-Configurable-projectile-relative-velocity.patch} (100%)
 rename Spigot-Server-Patches/{0365-Mark-entities-as-being-ticked-when-notifying-navigat.patch => 0366-Mark-entities-as-being-ticked-when-notifying-navigat.patch} (100%)
 rename Spigot-Server-Patches/{0366-offset-item-frame-ticking.patch => 0367-offset-item-frame-ticking.patch} (100%)
 rename Spigot-Server-Patches/{0367-Avoid-hopper-searches-if-there-are-no-items.patch => 0368-Avoid-hopper-searches-if-there-are-no-items.patch} (100%)
 rename Spigot-Server-Patches/{0368-Asynchronous-chunk-IO-and-loading.patch => 0369-Asynchronous-chunk-IO-and-loading.patch} (99%)
 rename Spigot-Server-Patches/{0369-Use-getChunkIfLoadedImmediately-in-places.patch => 0370-Use-getChunkIfLoadedImmediately-in-places.patch} (100%)
 rename Spigot-Server-Patches/{0370-Reduce-sync-loads.patch => 0371-Reduce-sync-loads.patch} (100%)
 rename Spigot-Server-Patches/{0371-Implement-alternative-item-despawn-rate.patch => 0372-Implement-alternative-item-despawn-rate.patch} (100%)
 rename Spigot-Server-Patches/{0372-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch => 0373-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch} (96%)
 rename Spigot-Server-Patches/{0373-Fix-MC-158900.patch => 0374-Fix-MC-158900.patch} (100%)
 rename Spigot-Server-Patches/{0374-implement-optional-per-player-mob-spawns.patch => 0375-implement-optional-per-player-mob-spawns.patch} (99%)
 rename Spigot-Server-Patches/{0375-Prevent-consuming-the-wrong-itemstack.patch => 0376-Prevent-consuming-the-wrong-itemstack.patch} (100%)
 rename Spigot-Server-Patches/{0376-Fix-nether-portal-creation.patch => 0377-Fix-nether-portal-creation.patch} (100%)
 rename Spigot-Server-Patches/{0377-Generator-Settings.patch => 0378-Generator-Settings.patch} (100%)
 rename Spigot-Server-Patches/{0378-Fix-MC-161754.patch => 0379-Fix-MC-161754.patch} (100%)
 rename Spigot-Server-Patches/{0379-Performance-improvement-for-Chunk.getEntities.patch => 0380-Performance-improvement-for-Chunk.getEntities.patch} (100%)
 rename Spigot-Server-Patches/{0380-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch => 0381-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch} (100%)
 rename Spigot-Server-Patches/{0381-Expose-the-internal-current-tick.patch => 0382-Expose-the-internal-current-tick.patch} (100%)
 rename Spigot-Server-Patches/{0382-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch => 0383-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch} (94%)
 rename Spigot-Server-Patches/{0383-Add-option-to-disable-pillager-patrols.patch => 0384-Add-option-to-disable-pillager-patrols.patch} (100%)
 rename Spigot-Server-Patches/{0384-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch => 0385-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch} (100%)
 rename Spigot-Server-Patches/{0385-PlayerLaunchProjectileEvent.patch => 0386-PlayerLaunchProjectileEvent.patch} (100%)
 rename Spigot-Server-Patches/{0386-Add-CraftMagicNumbers.isSupportedApiVersion.patch => 0387-Add-CraftMagicNumbers.isSupportedApiVersion.patch} (100%)
 rename Spigot-Server-Patches/{0387-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch => 0388-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch} (100%)
 rename Spigot-Server-Patches/{0388-MC-145656-Fix-Follow-Range-Initial-Target.patch => 0389-MC-145656-Fix-Follow-Range-Initial-Target.patch} (100%)
 rename Spigot-Server-Patches/{0389-Optimize-Hoppers.patch => 0390-Optimize-Hoppers.patch} (100%)
 rename Spigot-Server-Patches/{0390-PlayerDeathEvent-shouldDropExperience.patch => 0391-PlayerDeathEvent-shouldDropExperience.patch} (90%)
 rename Spigot-Server-Patches/{0391-Prevent-bees-loading-chunks-checking-hive-position.patch => 0392-Prevent-bees-loading-chunks-checking-hive-position.patch} (100%)
 rename Spigot-Server-Patches/{0392-Don-t-load-Chunks-from-Hoppers-and-other-things.patch => 0393-Don-t-load-Chunks-from-Hoppers-and-other-things.patch} (100%)
 rename Spigot-Server-Patches/{0393-Guard-against-serializing-mismatching-chunk-coordina.patch => 0394-Guard-against-serializing-mismatching-chunk-coordina.patch} (100%)
 rename Spigot-Server-Patches/{0394-Optimise-IEntityAccess-getPlayerByUUID.patch => 0395-Optimise-IEntityAccess-getPlayerByUUID.patch} (100%)
 rename Spigot-Server-Patches/{0395-Fix-items-not-falling-correctly.patch => 0396-Fix-items-not-falling-correctly.patch} (100%)
 rename Spigot-Server-Patches/{0396-Lag-compensate-eating.patch => 0397-Lag-compensate-eating.patch} (100%)
 rename Spigot-Server-Patches/{0397-Optimize-call-to-getFluid-for-explosions.patch => 0398-Optimize-call-to-getFluid-for-explosions.patch} (100%)
 rename Spigot-Server-Patches/{0398-Fix-last-firework-in-stack-not-having-effects-when-d.patch => 0399-Fix-last-firework-in-stack-not-having-effects-when-d.patch} (100%)
 rename Spigot-Server-Patches/{0399-Add-effect-to-block-break-naturally.patch => 0400-Add-effect-to-block-break-naturally.patch} (100%)
 rename Spigot-Server-Patches/{0400-Tracking-Range-Improvements.patch => 0401-Tracking-Range-Improvements.patch} (100%)
 rename Spigot-Server-Patches/{0401-Entity-Activation-Range-2.0.patch => 0402-Entity-Activation-Range-2.0.patch} (100%)
 rename Spigot-Server-Patches/{0402-Fix-items-vanishing-through-end-portal.patch => 0403-Fix-items-vanishing-through-end-portal.patch} (100%)
 rename Spigot-Server-Patches/{0403-Bees-get-gravity-in-void.-Fixes-MC-167279.patch => 0404-Bees-get-gravity-in-void.-Fixes-MC-167279.patch} (100%)
 rename Spigot-Server-Patches/{0404-Optimise-getChunkAt-calls-for-loaded-chunks.patch => 0405-Optimise-getChunkAt-calls-for-loaded-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0405-Allow-overriding-the-java-version-check.patch => 0406-Allow-overriding-the-java-version-check.patch} (100%)
 rename Spigot-Server-Patches/{0406-Add-ThrownEggHatchEvent.patch => 0407-Add-ThrownEggHatchEvent.patch} (100%)
 rename Spigot-Server-Patches/{0407-Optimise-random-block-ticking.patch => 0408-Optimise-random-block-ticking.patch} (100%)
 rename Spigot-Server-Patches/{0408-Entity-Jump-API.patch => 0409-Entity-Jump-API.patch} (100%)
 rename Spigot-Server-Patches/{0409-Add-option-to-nerf-pigmen-from-nether-portals.patch => 0410-Add-option-to-nerf-pigmen-from-nether-portals.patch} (100%)
 rename Spigot-Server-Patches/{0410-Make-the-GUI-graph-fancier.patch => 0411-Make-the-GUI-graph-fancier.patch} (99%)
 rename Spigot-Server-Patches/{0411-add-hand-to-BlockMultiPlaceEvent.patch => 0412-add-hand-to-BlockMultiPlaceEvent.patch} (100%)
 rename Spigot-Server-Patches/{0412-Prevent-teleporting-dead-entities.patch => 0413-Prevent-teleporting-dead-entities.patch} (100%)
 rename Spigot-Server-Patches/{0413-Validate-tripwire-hook-placement-before-update.patch => 0414-Validate-tripwire-hook-placement-before-update.patch} (100%)
 rename Spigot-Server-Patches/{0414-Add-option-to-allow-iron-golems-to-spawn-in-air.patch => 0415-Add-option-to-allow-iron-golems-to-spawn-in-air.patch} (100%)
 rename Spigot-Server-Patches/{0415-Configurable-chance-of-villager-zombie-infection.patch => 0416-Configurable-chance-of-villager-zombie-infection.patch} (100%)
 rename Spigot-Server-Patches/{0416-Optimise-Chunk-getFluid.patch => 0417-Optimise-Chunk-getFluid.patch} (100%)
 rename Spigot-Server-Patches/{0417-Optimise-TickListServer-by-rewriting-it.patch => 0418-Optimise-TickListServer-by-rewriting-it.patch} (99%)
 rename Spigot-Server-Patches/{0418-Pillager-patrol-spawn-settings-and-per-player-option.patch => 0419-Pillager-patrol-spawn-settings-and-per-player-option.patch} (98%)
 rename Spigot-Server-Patches/{0419-Ensure-Entity-is-never-double-registered.patch => 0420-Ensure-Entity-is-never-double-registered.patch} (100%)
 rename Spigot-Server-Patches/{0420-Fix-unregistering-entities-from-unloading-chunks.patch => 0421-Fix-unregistering-entities-from-unloading-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0421-Remote-Connections-shouldn-t-hold-up-shutdown.patch => 0422-Remote-Connections-shouldn-t-hold-up-shutdown.patch} (100%)
 rename Spigot-Server-Patches/{0422-Do-not-allow-bees-to-load-chunks-for-beehives.patch => 0423-Do-not-allow-bees-to-load-chunks-for-beehives.patch} (100%)
 rename Spigot-Server-Patches/{0423-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch => 0424-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch} (100%)
 rename Spigot-Server-Patches/{0424-Optimize-Collision-to-not-load-chunks.patch => 0425-Optimize-Collision-to-not-load-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0425-Don-t-tick-dead-players.patch => 0426-Don-t-tick-dead-players.patch} (91%)
 rename Spigot-Server-Patches/{0426-Dead-Player-s-shouldn-t-be-able-to-move.patch => 0427-Dead-Player-s-shouldn-t-be-able-to-move.patch} (100%)
 rename Spigot-Server-Patches/{0427-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch => 0428-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch} (100%)
 rename Spigot-Server-Patches/{0428-Increase-Light-Queue-Size.patch => 0429-Increase-Light-Queue-Size.patch} (100%)
 rename Spigot-Server-Patches/{0429-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch => 0430-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch} (98%)
 rename Spigot-Server-Patches/{0430-Don-t-move-existing-players-to-world-spawn.patch => 0431-Don-t-move-existing-players-to-world-spawn.patch} (96%)
 rename Spigot-Server-Patches/{0431-Add-tick-times-API-and-mspt-command.patch => 0432-Add-tick-times-API-and-mspt-command.patch} (98%)
 rename Spigot-Server-Patches/{0432-Expose-MinecraftServer-isRunning.patch => 0433-Expose-MinecraftServer-isRunning.patch} (100%)
 rename Spigot-Server-Patches/{0433-Add-Raw-Byte-ItemStack-Serialization.patch => 0434-Add-Raw-Byte-ItemStack-Serialization.patch} (100%)
 rename Spigot-Server-Patches/{0434-Remove-streams-from-Mob-AI-System.patch => 0435-Remove-streams-from-Mob-AI-System.patch} (100%)
 rename Spigot-Server-Patches/{0435-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch => 0436-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch} (100%)
 rename Spigot-Server-Patches/{0436-Async-command-map-building.patch => 0437-Async-command-map-building.patch} (100%)
 rename Spigot-Server-Patches/{0437-Improved-Watchdog-Support.patch => 0438-Improved-Watchdog-Support.patch} (100%)
 rename Spigot-Server-Patches/{0438-Optimize-Pathfinding.patch => 0439-Optimize-Pathfinding.patch} (100%)
 rename Spigot-Server-Patches/{0439-Reduce-Either-Optional-allocation.patch => 0440-Reduce-Either-Optional-allocation.patch} (100%)
 rename Spigot-Server-Patches/{0440-Remove-streams-from-PairedQueue.patch => 0441-Remove-streams-from-PairedQueue.patch} (100%)
 rename Spigot-Server-Patches/{0441-Reduce-memory-footprint-of-NBTTagCompound.patch => 0442-Reduce-memory-footprint-of-NBTTagCompound.patch} (100%)
 rename Spigot-Server-Patches/{0442-Prevent-opening-inventories-when-frozen.patch => 0443-Prevent-opening-inventories-when-frozen.patch} (97%)
 rename Spigot-Server-Patches/{0443-Optimise-ArraySetSorted-removeIf.patch => 0444-Optimise-ArraySetSorted-removeIf.patch} (100%)
 rename Spigot-Server-Patches/{0444-Don-t-run-entity-collision-code-if-not-needed.patch => 0445-Don-t-run-entity-collision-code-if-not-needed.patch} (100%)
 rename Spigot-Server-Patches/{0445-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch => 0446-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch} (100%)
 rename Spigot-Server-Patches/{0446-Restrict-vanilla-teleport-command-to-valid-locations.patch => 0447-Restrict-vanilla-teleport-command-to-valid-locations.patch} (100%)
 rename Spigot-Server-Patches/{0447-Implement-Player-Client-Options-API.patch => 0448-Implement-Player-Client-Options-API.patch} (97%)
 rename Spigot-Server-Patches/{0448-Fix-Chunk-Post-Processing-deadlock-risk.patch => 0449-Fix-Chunk-Post-Processing-deadlock-risk.patch} (100%)
 rename Spigot-Server-Patches/{0449-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch => 0450-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch} (100%)
 rename Spigot-Server-Patches/{0450-Broadcast-join-message-to-console.patch => 0451-Broadcast-join-message-to-console.patch} (100%)
 rename Spigot-Server-Patches/{0451-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch => 0452-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch} (98%)
 rename Spigot-Server-Patches/{0452-Load-Chunks-for-Login-Asynchronously.patch => 0453-Load-Chunks-for-Login-Asynchronously.patch} (98%)
 rename Spigot-Server-Patches/{0453-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch => 0454-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch} (100%)
 rename Spigot-Server-Patches/{0454-Add-PlayerAttackEntityCooldownResetEvent.patch => 0455-Add-PlayerAttackEntityCooldownResetEvent.patch} (100%)
 rename Spigot-Server-Patches/{0455-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch => 0456-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch} (100%)
 rename Spigot-Server-Patches/{0456-Don-t-fire-BlockFade-on-worldgen-threads.patch => 0457-Don-t-fire-BlockFade-on-worldgen-threads.patch} (100%)
 rename Spigot-Server-Patches/{0457-Add-phantom-creative-and-insomniac-controls.patch => 0458-Add-phantom-creative-and-insomniac-controls.patch} (100%)
 rename Spigot-Server-Patches/{0458-Fix-numerous-item-duplication-issues-and-teleport-is.patch => 0459-Fix-numerous-item-duplication-issues-and-teleport-is.patch} (100%)
 rename Spigot-Server-Patches/{0459-Implement-Brigadier-Mojang-API.patch => 0460-Implement-Brigadier-Mojang-API.patch} (98%)
 rename Spigot-Server-Patches/{0460-Villager-Restocks-API.patch => 0461-Villager-Restocks-API.patch} (100%)
 rename Spigot-Server-Patches/{0461-Validate-PickItem-Packet-and-kick-for-invalid.patch => 0462-Validate-PickItem-Packet-and-kick-for-invalid.patch} (94%)
 rename Spigot-Server-Patches/{0462-Expose-game-version.patch => 0463-Expose-game-version.patch} (100%)
 rename Spigot-Server-Patches/{0463-Optimize-Voxel-Shape-Merging.patch => 0464-Optimize-Voxel-Shape-Merging.patch} (100%)
 rename Spigot-Server-Patches/{0464-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch => 0465-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch} (100%)
 rename Spigot-Server-Patches/{0465-Implement-Mob-Goal-API.patch => 0466-Implement-Mob-Goal-API.patch} (100%)
 rename Spigot-Server-Patches/{0466-Use-distance-map-to-optimise-entity-tracker.patch => 0467-Use-distance-map-to-optimise-entity-tracker.patch} (100%)
 rename Spigot-Server-Patches/{0467-Optimize-isOutsideRange-to-use-distance-maps.patch => 0468-Optimize-isOutsideRange-to-use-distance-maps.patch} (99%)
 rename Spigot-Server-Patches/{0468-Stop-copy-on-write-operations-for-updating-light-dat.patch => 0469-Stop-copy-on-write-operations-for-updating-light-dat.patch} (100%)
 rename Spigot-Server-Patches/{0469-No-Tick-view-distance-implementation.patch => 0470-No-Tick-view-distance-implementation.patch} (99%)
 rename Spigot-Server-Patches/{0470-Add-villager-reputation-API.patch => 0471-Add-villager-reputation-API.patch} (100%)
 rename Spigot-Server-Patches/{0471-Fix-Light-Command.patch => 0472-Fix-Light-Command.patch} (100%)
 rename Spigot-Server-Patches/{0472-Fix-PotionEffect-ignores-icon-flag.patch => 0473-Fix-PotionEffect-ignores-icon-flag.patch} (100%)
 rename Spigot-Server-Patches/{0473-Optimize-brigadier-child-sorting-performance.patch => 0474-Optimize-brigadier-child-sorting-performance.patch} (100%)
 rename Spigot-Server-Patches/{0474-Don-t-toString-block-unless-actually-showing-the-mes.patch => 0475-Don-t-toString-block-unless-actually-showing-the-mes.patch} (100%)
 rename Spigot-Server-Patches/{0475-Potential-bed-API.patch => 0476-Potential-bed-API.patch} (100%)
 rename Spigot-Server-Patches/{0476-Wait-for-Async-Tasks-during-shutdown.patch => 0477-Wait-for-Async-Tasks-during-shutdown.patch} (100%)
 rename Spigot-Server-Patches/{0477-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch => 0478-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch} (100%)
 rename Spigot-Server-Patches/{0478-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch => 0479-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch} (98%)
 rename Spigot-Server-Patches/{0479-Optimize-NibbleArray-to-use-pooled-buffers.patch => 0480-Optimize-NibbleArray-to-use-pooled-buffers.patch} (100%)
 rename Spigot-Server-Patches/{0480-Reduce-MutableInt-allocations-from-light-engine.patch => 0481-Reduce-MutableInt-allocations-from-light-engine.patch} (100%)
 rename Spigot-Server-Patches/{0481-Reduce-allocation-of-Vec3D-by-entity-tracker.patch => 0482-Reduce-allocation-of-Vec3D-by-entity-tracker.patch} (100%)
 rename Spigot-Server-Patches/{0482-Ensure-safe-gateway-teleport.patch => 0483-Ensure-safe-gateway-teleport.patch} (100%)
 rename Spigot-Server-Patches/{0483-Add-option-for-console-having-all-permissions.patch => 0484-Add-option-for-console-having-all-permissions.patch} (95%)
 rename Spigot-Server-Patches/{0484-Workaround-for-Client-Lag-Spikes-MC-162253.patch => 0485-Workaround-for-Client-Lag-Spikes-MC-162253.patch} (100%)
 rename Spigot-Server-Patches/{0485-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch => 0486-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch} (100%)
 rename Spigot-Server-Patches/{0486-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch => 0487-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch} (100%)
 rename Spigot-Server-Patches/{0487-Optimize-sending-packets-to-nearby-locations-sounds-.patch => 0488-Optimize-sending-packets-to-nearby-locations-sounds-.patch} (100%)
 rename Spigot-Server-Patches/{0488-Improve-Chunk-Status-Transition-Speed.patch => 0489-Improve-Chunk-Status-Transition-Speed.patch} (100%)
 rename Spigot-Server-Patches/{0489-Fix-villager-trading-demand-MC-163962.patch => 0490-Fix-villager-trading-demand-MC-163962.patch} (100%)
 rename Spigot-Server-Patches/{0490-Maps-shouldn-t-load-chunks.patch => 0491-Maps-shouldn-t-load-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0491-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch => 0492-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch} (100%)
 rename Spigot-Server-Patches/{0492-Optimize-Bit-Operations-by-inlining.patch => 0493-Optimize-Bit-Operations-by-inlining.patch} (100%)
 rename Spigot-Server-Patches/{0493-Optimize-Light-Engine.patch => 0494-Optimize-Light-Engine.patch} (100%)
 rename Spigot-Server-Patches/{0494-Delay-Chunk-Unloads-based-on-Player-Movement.patch => 0495-Delay-Chunk-Unloads-based-on-Player-Movement.patch} (100%)
 rename Spigot-Server-Patches/{0495-Add-Plugin-Tickets-to-API-Chunk-Methods.patch => 0496-Add-Plugin-Tickets-to-API-Chunk-Methods.patch} (100%)
 rename Spigot-Server-Patches/{0496-Fix-missing-chunks-due-to-integer-overflow.patch => 0497-Fix-missing-chunks-due-to-integer-overflow.patch} (100%)
 rename Spigot-Server-Patches/{0497-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch => 0498-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch} (100%)
 rename Spigot-Server-Patches/{0498-Fix-piston-physics-inconsistency-MC-188840.patch => 0499-Fix-piston-physics-inconsistency-MC-188840.patch} (97%)
 rename Spigot-Server-Patches/{0499-Fix-sand-duping.patch => 0500-Fix-sand-duping.patch} (100%)
 rename Spigot-Server-Patches/{0500-Prevent-position-desync-in-playerconnection-causing-.patch => 0501-Prevent-position-desync-in-playerconnection-causing-.patch} (100%)
 rename Spigot-Server-Patches/{0501-Fix-enderdragon-exp-dupe.patch => 0502-Fix-enderdragon-exp-dupe.patch} (100%)
 rename Spigot-Server-Patches/{0502-Inventory-getHolder-method-without-block-snapshot.patch => 0503-Inventory-getHolder-method-without-block-snapshot.patch} (100%)
 rename Spigot-Server-Patches/{0503-Expose-Arrow-getItemStack.patch => 0504-Expose-Arrow-getItemStack.patch} (100%)
 rename Spigot-Server-Patches/{0504-Add-and-implement-PlayerRecipeBookClickEvent.patch => 0505-Add-and-implement-PlayerRecipeBookClickEvent.patch} (100%)
 rename Spigot-Server-Patches/{0505-Hide-sync-chunk-writes-behind-flag.patch => 0506-Hide-sync-chunk-writes-behind-flag.patch} (100%)
 rename Spigot-Server-Patches/{0506-Limit-lightning-strike-effect-distance.patch => 0507-Limit-lightning-strike-effect-distance.patch} (100%)
 rename Spigot-Server-Patches/{0507-Add-permission-for-command-blocks.patch => 0508-Add-permission-for-command-blocks.patch} (98%)
 rename Spigot-Server-Patches/{0508-Ensure-Entity-AABB-s-are-never-invalid.patch => 0509-Ensure-Entity-AABB-s-are-never-invalid.patch} (100%)
 rename Spigot-Server-Patches/{0509-Optimize-WorldBorder-collision-checks-and-air.patch => 0510-Optimize-WorldBorder-collision-checks-and-air.patch} (100%)
 rename Spigot-Server-Patches/{0510-Fix-Per-World-Difficulty-Remembering-Difficulty.patch => 0511-Fix-Per-World-Difficulty-Remembering-Difficulty.patch} (100%)
 rename Spigot-Server-Patches/{0511-Paper-dumpitem-command.patch => 0512-Paper-dumpitem-command.patch} (100%)
 rename Spigot-Server-Patches/{0512-Don-t-allow-null-UUID-s-for-chat.patch => 0513-Don-t-allow-null-UUID-s-for-chat.patch} (100%)
 rename Spigot-Server-Patches/{0513-Improve-Legacy-Component-serialization-size.patch => 0514-Improve-Legacy-Component-serialization-size.patch} (100%)
 rename Spigot-Server-Patches/{0514-Support-old-UUID-format-for-NBT.patch => 0515-Support-old-UUID-format-for-NBT.patch} (100%)
 rename Spigot-Server-Patches/{0515-Clean-up-duplicated-GameProfile-Properties.patch => 0516-Clean-up-duplicated-GameProfile-Properties.patch} (100%)
 rename Spigot-Server-Patches/{0516-Convert-legacy-attributes-in-Item-Meta.patch => 0517-Convert-legacy-attributes-in-Item-Meta.patch} (100%)
 rename Spigot-Server-Patches/{0517-Remove-some-streams-from-structures.patch => 0518-Remove-some-streams-from-structures.patch} (100%)
 rename Spigot-Server-Patches/{0518-Remove-streams-from-classes-related-villager-gossip.patch => 0519-Remove-streams-from-classes-related-villager-gossip.patch} (100%)
 rename Spigot-Server-Patches/{0519-Support-components-in-ItemMeta.patch => 0520-Support-components-in-ItemMeta.patch} (100%)
 rename Spigot-Server-Patches/{0520-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch => 0521-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch} (100%)
 rename Spigot-Server-Patches/{0521-Add-entity-liquid-API.patch => 0522-Add-entity-liquid-API.patch} (100%)
 rename Spigot-Server-Patches/{0522-Update-itemstack-legacy-name-and-lore.patch => 0523-Update-itemstack-legacy-name-and-lore.patch} (100%)
 rename Spigot-Server-Patches/{0523-Spawn-player-in-correct-world-on-login.patch => 0524-Spawn-player-in-correct-world-on-login.patch} (100%)
 rename Spigot-Server-Patches/{0524-Add-PrepareResultEvent.patch => 0525-Add-PrepareResultEvent.patch} (100%)
 rename Spigot-Server-Patches/{0525-Allow-delegation-to-vanilla-chunk-gen.patch => 0526-Allow-delegation-to-vanilla-chunk-gen.patch} (100%)
 rename Spigot-Server-Patches/{0526-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch => 0527-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch} (100%)
 rename Spigot-Server-Patches/{0527-Optimize-NetworkManager-Exception-Handling.patch => 0528-Optimize-NetworkManager-Exception-Handling.patch} (100%)
 rename Spigot-Server-Patches/{0528-Fix-Concurrency-issue-in-WeightedList.patch => 0529-Fix-Concurrency-issue-in-WeightedList.patch} (100%)
 rename Spigot-Server-Patches/{0529-Optimize-the-advancement-data-player-iteration-to-be.patch => 0530-Optimize-the-advancement-data-player-iteration-to-be.patch} (100%)
 rename Spigot-Server-Patches/{0530-Fix-arrows-never-despawning-MC-125757.patch => 0531-Fix-arrows-never-despawning-MC-125757.patch} (100%)
 rename Spigot-Server-Patches/{0531-Thread-Safe-Vanilla-Command-permission-checking.patch => 0532-Thread-Safe-Vanilla-Command-permission-checking.patch} (100%)
 rename Spigot-Server-Patches/{0532-Move-range-check-for-block-placing-up.patch => 0533-Move-range-check-for-block-placing-up.patch} (100%)
 rename Spigot-Server-Patches/{0533-Fix-SPIGOT-5989.patch => 0534-Fix-SPIGOT-5989.patch} (100%)
 rename Spigot-Server-Patches/{0534-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch => 0535-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch} (100%)
 rename Spigot-Server-Patches/{0535-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch => 0536-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch} (100%)
 rename Spigot-Server-Patches/{0536-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch => 0537-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch} (100%)
 rename Spigot-Server-Patches/{0537-Add-missing-strikeLighting-call-to-World-spigot-stri.patch => 0538-Add-missing-strikeLighting-call-to-World-spigot-stri.patch} (100%)
 rename Spigot-Server-Patches/{0538-Fix-some-rails-connecting-improperly.patch => 0539-Fix-some-rails-connecting-improperly.patch} (100%)
 rename Spigot-Server-Patches/{0539-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch => 0540-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch} (100%)
 rename Spigot-Server-Patches/{0540-Incremental-player-saving.patch => 0541-Incremental-player-saving.patch} (97%)
 rename Spigot-Server-Patches/{0541-Import-fastutil-classes.patch => 0542-Import-fastutil-classes.patch} (100%)
 rename Spigot-Server-Patches/{0542-Don-t-mark-null-chunk-sections-for-block-updates.patch => 0543-Don-t-mark-null-chunk-sections-for-block-updates.patch} (100%)
 rename Spigot-Server-Patches/{0543-Remove-armour-stand-double-add-to-world.patch => 0544-Remove-armour-stand-double-add-to-world.patch} (100%)
 rename Spigot-Server-Patches/{0544-Fix-MC-187716-Use-configured-height.patch => 0545-Fix-MC-187716-Use-configured-height.patch} (100%)
 rename Spigot-Server-Patches/{0545-Fix-incorrect-return-for-WorldServer-addAllEntitiesS.patch => 0546-Fix-incorrect-return-for-WorldServer-addAllEntitiesS.patch} (100%)
 rename Spigot-Server-Patches/{0546-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch => 0547-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch} (100%)
 rename Spigot-Server-Patches/{0547-Do-not-let-the-server-load-chunks-from-newer-version.patch => 0548-Do-not-let-the-server-load-chunks-from-newer-version.patch} (100%)
 rename Spigot-Server-Patches/{0548-Brand-support.patch => 0549-Brand-support.patch} (100%)
 rename Spigot-Server-Patches/{0549-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch => 0550-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch} (100%)
 rename Spigot-Server-Patches/{0550-Fix-MC-197271.patch => 0551-Fix-MC-197271.patch} (100%)
 rename Spigot-Server-Patches/{0551-MC-197883-Bandaid-decode-issue.patch => 0552-MC-197883-Bandaid-decode-issue.patch} (100%)
 rename Spigot-Server-Patches/{0552-Add-setMaxPlayers-API.patch => 0553-Add-setMaxPlayers-API.patch} (100%)
 rename Spigot-Server-Patches/{0553-Add-playPickupItemAnimation-to-LivingEntity.patch => 0554-Add-playPickupItemAnimation-to-LivingEntity.patch} (100%)
 rename Spigot-Server-Patches/{0554-Don-t-require-FACING-data.patch => 0555-Don-t-require-FACING-data.patch} (100%)
 rename Spigot-Server-Patches/{0555-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch => 0556-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch} (100%)
 rename Spigot-Server-Patches/{0556-Add-moon-phase-API.patch => 0557-Add-moon-phase-API.patch} (100%)
 rename Spigot-Server-Patches/{0557-Prevent-headless-pistons-from-being-created.patch => 0558-Prevent-headless-pistons-from-being-created.patch} (95%)
 rename Spigot-Server-Patches/{0558-Brand-support.patch => 0559-Brand-support.patch} (100%)
 rename Spigot-Server-Patches/{0559-Add-BellRingEvent.patch => 0560-Add-BellRingEvent.patch} (100%)
 rename Spigot-Server-Patches/{0560-Add-zombie-targets-turtle-egg-config.patch => 0561-Add-zombie-targets-turtle-egg-config.patch} (100%)
 rename Spigot-Server-Patches/{0561-Buffer-joins-to-world.patch => 0562-Buffer-joins-to-world.patch} (94%)
 rename Spigot-Server-Patches/{0562-Optimize-redstone-algorithm.patch => 0563-Optimize-redstone-algorithm.patch} (100%)
 rename Spigot-Server-Patches/{0563-Fix-hex-colors-not-working-in-some-kick-messages.patch => 0564-Fix-hex-colors-not-working-in-some-kick-messages.patch} (100%)
 rename Spigot-Server-Patches/{0564-PortalCreateEvent-needs-to-know-its-entity.patch => 0565-PortalCreateEvent-needs-to-know-its-entity.patch} (100%)
 rename Spigot-Server-Patches/{0565-Fix-CraftTeam-null-check.patch => 0566-Fix-CraftTeam-null-check.patch} (100%)
 rename Spigot-Server-Patches/{0566-Add-more-Evoker-API.patch => 0567-Add-more-Evoker-API.patch} (100%)
 rename Spigot-Server-Patches/{0567-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch => 0568-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch} (100%)
 rename Spigot-Server-Patches/{0568-Create-HoverEvent-from-ItemStack-Entity.patch => 0569-Create-HoverEvent-from-ItemStack-Entity.patch} (100%)
 rename Spigot-Server-Patches/{0569-Cache-block-data-strings.patch => 0570-Cache-block-data-strings.patch} (100%)
 rename Spigot-Server-Patches/{0570-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch => 0571-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch} (100%)
 rename Spigot-Server-Patches/{0571-Add-additional-open-container-api-to-HumanEntity.patch => 0572-Add-additional-open-container-api-to-HumanEntity.patch} (100%)
 rename Spigot-Server-Patches/{0572-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch => 0573-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch} (100%)
 rename Spigot-Server-Patches/{0573-Extend-block-drop-capture-to-capture-all-items-added.patch => 0574-Extend-block-drop-capture-to-capture-all-items-added.patch} (100%)
 rename Spigot-Server-Patches/{0574-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch => 0575-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch} (100%)
 rename Spigot-Server-Patches/{0575-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch => 0576-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch} (100%)
 rename Spigot-Server-Patches/{0576-Lazily-track-plugin-scoreboards-by-default.patch => 0577-Lazily-track-plugin-scoreboards-by-default.patch} (97%)
 rename Spigot-Server-Patches/{0577-Entity-isTicking.patch => 0578-Entity-isTicking.patch} (100%)
 rename Spigot-Server-Patches/{0578-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch => 0579-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch} (100%)
 rename Spigot-Server-Patches/{0579-Fix-Not-a-string-Map-Conversion-spam.patch => 0580-Fix-Not-a-string-Map-Conversion-spam.patch} (100%)
 rename Spigot-Server-Patches/{0580-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch => 0581-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch} (100%)
 rename Spigot-Server-Patches/{0581-MC-147729-Drop-items-that-are-extra-from-a-crafting-.patch => 0582-MC-147729-Drop-items-that-are-extra-from-a-crafting-.patch} (100%)
 rename Spigot-Server-Patches/{0582-Reset-Ender-Crystals-on-Dragon-Spawn.patch => 0583-Reset-Ender-Crystals-on-Dragon-Spawn.patch} (100%)
 rename Spigot-Server-Patches/{0583-Fix-for-large-move-vectors-crashing-server.patch => 0584-Fix-for-large-move-vectors-crashing-server.patch} (100%)
 rename Spigot-Server-Patches/{0584-Optimise-getType-calls.patch => 0585-Optimise-getType-calls.patch} (98%)
 rename Spigot-Server-Patches/{0585-Improve-inlinig-for-some-hot-IBlockData-methods.patch => 0586-Improve-inlinig-for-some-hot-IBlockData-methods.patch} (100%)
 rename Spigot-Server-Patches/{0586-Retain-block-place-order-when-capturing-blockstates.patch => 0587-Retain-block-place-order-when-capturing-blockstates.patch} (100%)
 rename Spigot-Server-Patches/{0587-Reduce-blockpos-allocation-from-pathfinding.patch => 0588-Reduce-blockpos-allocation-from-pathfinding.patch} (100%)
 rename Spigot-Server-Patches/{0588-Fix-item-locations-dropped-from-campfires.patch => 0589-Fix-item-locations-dropped-from-campfires.patch} (100%)
 rename Spigot-Server-Patches/{0589-Player-elytra-boost-API.patch => 0590-Player-elytra-boost-API.patch} (93%)
 rename Spigot-Server-Patches/{0590-Fixed-TileEntityBell-memory-leak.patch => 0591-Fixed-TileEntityBell-memory-leak.patch} (100%)
 rename Spigot-Server-Patches/{0591-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch => 0592-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch} (100%)
 rename Spigot-Server-Patches/{0592-Add-getOfflinePlayerIfCached-String.patch => 0593-Add-getOfflinePlayerIfCached-String.patch} (100%)

diff --git a/Spigot-Server-Patches/0028-Check-online-mode-before-converting-and-renaming-pla.patch b/Spigot-Server-Patches/0028-Check-online-mode-before-converting-and-renaming-pla.patch
index b9d6ee1e6f..99598db234 100644
--- a/Spigot-Server-Patches/0028-Check-online-mode-before-converting-and-renaming-pla.patch
+++ b/Spigot-Server-Patches/0028-Check-online-mode-before-converting-and-renaming-pla.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Check online mode before converting and renaming player data
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
-index 88e0c5167ce545ef98868947b2722c55bbc46687..6a9e0e644801ddc5f18a47d15d5f6d5b6dc13004 100644
+index 9190e7c6de201868b909f0724930f13f7ec82edf..9d81bb896e3688c644edf93cd9dfeadd9cdf8836 100644
 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
 +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
-@@ -49,7 +49,7 @@ public class WorldNBTStorage {
+@@ -48,7 +48,7 @@ public class WorldNBTStorage {
              File file = new File(this.playerDir, entityhuman.getUniqueIDString() + ".dat");
              // Spigot Start
              boolean usingWrongFile = false;
diff --git a/Spigot-Server-Patches/0203-Make-player-data-saving-configurable.patch b/Spigot-Server-Patches/0203-Make-player-data-saving-configurable.patch
new file mode 100644
index 0000000000..b7a8d8814e
--- /dev/null
+++ b/Spigot-Server-Patches/0203-Make-player-data-saving-configurable.patch
@@ -0,0 +1,36 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
+Date: Mon, 26 Mar 2018 18:30:53 +0300
+Subject: [PATCH] Make player data saving configurable
+
+
+diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
+index cee8740e644c492e3d71fd58791e7d52d57e856d..f22bed69f690f6e4754b87dd61cebe9c6627b12d 100644
+--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
++++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
+@@ -271,4 +271,13 @@ public class PaperConfig {
+     private static void authenticationServersDownKickMessage() {
+         authenticationServersDownKickMessage = Strings.emptyToNull(getString("messages.kick.authentication-servers-down", authenticationServersDownKickMessage));
+     }
++
++    public static boolean savePlayerData = true;
++    private static void savePlayerData() {
++        savePlayerData = getBoolean("settings.save-player-data", savePlayerData);
++        if(!savePlayerData) {
++            Bukkit.getLogger().log(Level.WARNING, "Player Data Saving is currently disabled. Any changes to your players data, " +
++                    "such as inventories, experience points, advancements and the like will not be saved when they log out.");
++        }
++    }
+ }
+diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
+index 9d81bb896e3688c644edf93cd9dfeadd9cdf8836..af9e94a87a946a4a9e2579a87f3f5a7adeb66f25 100644
+--- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
++++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
+@@ -25,6 +25,7 @@ public class WorldNBTStorage {
+     }
+ 
+     public void save(EntityHuman entityhuman) {
++        if(!com.destroystokyo.paper.PaperConfig.savePlayerData) return; // Paper - Make player data saving configurable
+         try {
+             NBTTagCompound nbttagcompound = entityhuman.save(new NBTTagCompound());
+             File file = File.createTempFile(entityhuman.getUniqueIDString() + "-", ".dat", this.playerDir);
diff --git a/Spigot-Server-Patches/0203-Make-legacy-ping-handler-more-reliable.patch b/Spigot-Server-Patches/0204-Make-legacy-ping-handler-more-reliable.patch
similarity index 100%
rename from Spigot-Server-Patches/0203-Make-legacy-ping-handler-more-reliable.patch
rename to Spigot-Server-Patches/0204-Make-legacy-ping-handler-more-reliable.patch
diff --git a/Spigot-Server-Patches/0204-Call-PaperServerListPingEvent-for-legacy-pings.patch b/Spigot-Server-Patches/0205-Call-PaperServerListPingEvent-for-legacy-pings.patch
similarity index 100%
rename from Spigot-Server-Patches/0204-Call-PaperServerListPingEvent-for-legacy-pings.patch
rename to Spigot-Server-Patches/0205-Call-PaperServerListPingEvent-for-legacy-pings.patch
diff --git a/Spigot-Server-Patches/0205-Flag-to-disable-the-channel-limit.patch b/Spigot-Server-Patches/0206-Flag-to-disable-the-channel-limit.patch
similarity index 95%
rename from Spigot-Server-Patches/0205-Flag-to-disable-the-channel-limit.patch
rename to Spigot-Server-Patches/0206-Flag-to-disable-the-channel-limit.patch
index 8cad2d9598..be64e678d3 100644
--- a/Spigot-Server-Patches/0205-Flag-to-disable-the-channel-limit.patch
+++ b/Spigot-Server-Patches/0206-Flag-to-disable-the-channel-limit.patch
@@ -9,7 +9,7 @@ e.g. servers which allow and support the usage of mod packs.
 provide an optional flag to disable this check, at your own risk.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 79db5b2c858f952b8bca089500dfd18db084f2e7..c24a0c6bd72b4b2cbc2432d5e1651c3c396e4baf 100644
+index 1721f3c937450eacfcb48df482535e6cf1f24fe3..df1896d447295123dbf7f8c8dea163be7849132f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -141,6 +141,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0206-Add-method-to-open-already-placed-sign.patch b/Spigot-Server-Patches/0207-Add-method-to-open-already-placed-sign.patch
similarity index 100%
rename from Spigot-Server-Patches/0206-Add-method-to-open-already-placed-sign.patch
rename to Spigot-Server-Patches/0207-Add-method-to-open-already-placed-sign.patch
diff --git a/Spigot-Server-Patches/0207-Configurable-sprint-interruption-on-attack.patch b/Spigot-Server-Patches/0208-Configurable-sprint-interruption-on-attack.patch
similarity index 95%
rename from Spigot-Server-Patches/0207-Configurable-sprint-interruption-on-attack.patch
rename to Spigot-Server-Patches/0208-Configurable-sprint-interruption-on-attack.patch
index 9eaf02b29c..7fe953637f 100644
--- a/Spigot-Server-Patches/0207-Configurable-sprint-interruption-on-attack.patch
+++ b/Spigot-Server-Patches/0208-Configurable-sprint-interruption-on-attack.patch
@@ -20,7 +20,7 @@ index 3804c7cf96087cdf94fd5fbdce4ebcdafa9e0019..873f81c74a94f6d76edd45e34ddc476d
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 7e9a077a6e6af34c06910d1381399eed81f9fc20..d340ec2fed8a4308d1fd2e998e6716e42d84fb98 100644
+index 49f051a1f47c73a66cc462b3eecf72c4e932b648..9a55d1e6f4c6632c1f27d8c1fac55abc3c3d8204 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1086,7 +1086,11 @@ public abstract class EntityHuman extends EntityLiving {
diff --git a/Spigot-Server-Patches/0208-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/Spigot-Server-Patches/0209-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
similarity index 100%
rename from Spigot-Server-Patches/0208-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
rename to Spigot-Server-Patches/0209-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
diff --git a/Spigot-Server-Patches/0209-EndermanEscapeEvent.patch b/Spigot-Server-Patches/0210-EndermanEscapeEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0209-EndermanEscapeEvent.patch
rename to Spigot-Server-Patches/0210-EndermanEscapeEvent.patch
diff --git a/Spigot-Server-Patches/0210-Enderman.teleportRandomly.patch b/Spigot-Server-Patches/0211-Enderman.teleportRandomly.patch
similarity index 94%
rename from Spigot-Server-Patches/0210-Enderman.teleportRandomly.patch
rename to Spigot-Server-Patches/0211-Enderman.teleportRandomly.patch
index bdcf36ded7..58fb313151 100644
--- a/Spigot-Server-Patches/0210-Enderman.teleportRandomly.patch
+++ b/Spigot-Server-Patches/0211-Enderman.teleportRandomly.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Enderman.teleportRandomly()
 Ability to trigger the vanilla "teleport randomly" mechanic of an enderman.
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index b9ede7d533a813f4de27404dc14b0ef99c8fcd62..1e7aa2ee1c399bf3484e0245d57ab428d48d32f5 100644
+index f20283585464d54c4c5da294cf19261c2d258c97..c256fa48d64776ae7a7b21d42fb87c0a8ca7f3bc 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -224,6 +224,7 @@ public class EntityEnderman extends EntityMonster implements IEntityAngerable {
diff --git a/Spigot-Server-Patches/0211-Block-Enderpearl-Travel-Exploit.patch b/Spigot-Server-Patches/0212-Block-Enderpearl-Travel-Exploit.patch
similarity index 100%
rename from Spigot-Server-Patches/0211-Block-Enderpearl-Travel-Exploit.patch
rename to Spigot-Server-Patches/0212-Block-Enderpearl-Travel-Exploit.patch
diff --git a/Spigot-Server-Patches/0212-Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-Server-Patches/0213-Expand-World.spawnParticle-API-and-add-Builder.patch
similarity index 100%
rename from Spigot-Server-Patches/0212-Expand-World.spawnParticle-API-and-add-Builder.patch
rename to Spigot-Server-Patches/0213-Expand-World.spawnParticle-API-and-add-Builder.patch
diff --git a/Spigot-Server-Patches/0213-EndermanAttackPlayerEvent.patch b/Spigot-Server-Patches/0214-EndermanAttackPlayerEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0213-EndermanAttackPlayerEvent.patch
rename to Spigot-Server-Patches/0214-EndermanAttackPlayerEvent.patch
index d08b2f1cac..42ae3cd790 100644
--- a/Spigot-Server-Patches/0213-EndermanAttackPlayerEvent.patch
+++ b/Spigot-Server-Patches/0214-EndermanAttackPlayerEvent.patch
@@ -8,7 +8,7 @@ Allow control over whether or not an enderman aggros a player.
 This allows you to override/extend the pumpkin/stare logic.
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index 1e7aa2ee1c399bf3484e0245d57ab428d48d32f5..f4b823882e1e842c897c7946f7d1a46ce5366de0 100644
+index c256fa48d64776ae7a7b21d42fb87c0a8ca7f3bc..d03c0b4ea5fad793a7bedad5ae3be0b779dc458c 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -167,7 +167,15 @@ public class EntityEnderman extends EntityMonster implements IEntityAngerable {
diff --git a/Spigot-Server-Patches/0214-WitchConsumePotionEvent.patch b/Spigot-Server-Patches/0215-WitchConsumePotionEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0214-WitchConsumePotionEvent.patch
rename to Spigot-Server-Patches/0215-WitchConsumePotionEvent.patch
index 8664d99737..562f3d81d0 100644
--- a/Spigot-Server-Patches/0214-WitchConsumePotionEvent.patch
+++ b/Spigot-Server-Patches/0215-WitchConsumePotionEvent.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] WitchConsumePotionEvent
 Fires when a witch consumes the potion in their hand
 
 diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
-index fd54fbe9d331a8065ecfea90e54975b5d8e6368a..44a744f0af2de92c33a43eaaf7de6f027e1d4e29 100644
+index 43bc7f509b00b40c3fa7031546a52154c39b093d..4f2212ed9abb00e86c3d80d7facc7298f7a07b89 100644
 --- a/src/main/java/net/minecraft/server/EntityWitch.java
 +++ b/src/main/java/net/minecraft/server/EntityWitch.java
 @@ -85,7 +85,11 @@ public class EntityWitch extends EntityRaider implements IRangedEntity {
diff --git a/Spigot-Server-Patches/0215-WitchThrowPotionEvent.patch b/Spigot-Server-Patches/0216-WitchThrowPotionEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0215-WitchThrowPotionEvent.patch
rename to Spigot-Server-Patches/0216-WitchThrowPotionEvent.patch
index a1eeb14474..09135fccfa 100644
--- a/Spigot-Server-Patches/0215-WitchThrowPotionEvent.patch
+++ b/Spigot-Server-Patches/0216-WitchThrowPotionEvent.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] WitchThrowPotionEvent
 Fired when a witch throws a potion at a player
 
 diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
-index 44a744f0af2de92c33a43eaaf7de6f027e1d4e29..58949acbcb69649366df16a0d55e822a039e4d9a 100644
+index 4f2212ed9abb00e86c3d80d7facc7298f7a07b89..2e085e3c4021719eeaefa0a3323f03567e988c81 100644
 --- a/src/main/java/net/minecraft/server/EntityWitch.java
 +++ b/src/main/java/net/minecraft/server/EntityWitch.java
 @@ -185,9 +185,16 @@ public class EntityWitch extends EntityRaider implements IRangedEntity {
diff --git a/Spigot-Server-Patches/0216-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/Spigot-Server-Patches/0217-Allow-spawning-Item-entities-with-World.spawnEntity.patch
similarity index 100%
rename from Spigot-Server-Patches/0216-Allow-spawning-Item-entities-with-World.spawnEntity.patch
rename to Spigot-Server-Patches/0217-Allow-spawning-Item-entities-with-World.spawnEntity.patch
diff --git a/Spigot-Server-Patches/0217-WitchReadyPotionEvent.patch b/Spigot-Server-Patches/0218-WitchReadyPotionEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0217-WitchReadyPotionEvent.patch
rename to Spigot-Server-Patches/0218-WitchReadyPotionEvent.patch
index 34d7fe161b..0b0c088d25 100644
--- a/Spigot-Server-Patches/0217-WitchReadyPotionEvent.patch
+++ b/Spigot-Server-Patches/0218-WitchReadyPotionEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] WitchReadyPotionEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
-index 58949acbcb69649366df16a0d55e822a039e4d9a..0703124e5137ff0a5ae4d025488eb343d2813067 100644
+index 2e085e3c4021719eeaefa0a3323f03567e988c81..fc58cce8455dcf244355189fabb1a76114c19368 100644
 --- a/src/main/java/net/minecraft/server/EntityWitch.java
 +++ b/src/main/java/net/minecraft/server/EntityWitch.java
 @@ -118,7 +118,11 @@ public class EntityWitch extends EntityRaider implements IRangedEntity {
diff --git a/Spigot-Server-Patches/0218-ItemStack-getMaxItemUseDuration.patch b/Spigot-Server-Patches/0219-ItemStack-getMaxItemUseDuration.patch
similarity index 100%
rename from Spigot-Server-Patches/0218-ItemStack-getMaxItemUseDuration.patch
rename to Spigot-Server-Patches/0219-ItemStack-getMaxItemUseDuration.patch
diff --git a/Spigot-Server-Patches/0219-Implement-EntityTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0220-Implement-EntityTeleportEndGatewayEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0219-Implement-EntityTeleportEndGatewayEvent.patch
rename to Spigot-Server-Patches/0220-Implement-EntityTeleportEndGatewayEvent.patch
index e387235920..e5691e15d8 100644
--- a/Spigot-Server-Patches/0219-Implement-EntityTeleportEndGatewayEvent.patch
+++ b/Spigot-Server-Patches/0220-Implement-EntityTeleportEndGatewayEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement EntityTeleportEndGatewayEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityEndGateway.java b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
-index 6a0f7b02c5a2663bb7304a1f8c6cbf1603507d45..5550fd9ea6bcae07dcdf431322cb0da0b26a6d71 100644
+index 717c736cbc4defd24c5d08b501227bbd3e00a7e8..8eb1520d603aa59650418ee12cb1031168271fea 100644
 --- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 +++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 @@ -168,9 +168,20 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick
diff --git a/Spigot-Server-Patches/0220-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/Spigot-Server-Patches/0221-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
similarity index 94%
rename from Spigot-Server-Patches/0220-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
rename to Spigot-Server-Patches/0221-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
index e2d20dc754..2a9b4bae77 100644
--- a/Spigot-Server-Patches/0220-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
+++ b/Spigot-Server-Patches/0221-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Unset Ignited flag on cancel of Explosion Event
 Otherwise the creeper infinite explodes
 
 diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
-index 7b9188a33c079155a7ff5b0e5de854550324f0f1..647795bc7ea68f9dbe9d3f6488eaec82159feb9f 100644
+index 749c6e21cbd01a81196476728def640ba46a5783..055272e49ff522a009fcd335e2183172ada11c35 100644
 --- a/src/main/java/net/minecraft/server/EntityCreeper.java
 +++ b/src/main/java/net/minecraft/server/EntityCreeper.java
 @@ -12,7 +12,7 @@ public class EntityCreeper extends EntityMonster {
diff --git a/Spigot-Server-Patches/0221-Fix-CraftEntity-hashCode.patch b/Spigot-Server-Patches/0222-Fix-CraftEntity-hashCode.patch
similarity index 100%
rename from Spigot-Server-Patches/0221-Fix-CraftEntity-hashCode.patch
rename to Spigot-Server-Patches/0222-Fix-CraftEntity-hashCode.patch
diff --git a/Spigot-Server-Patches/0222-Configurable-Alternative-LootPool-Luck-Formula.patch b/Spigot-Server-Patches/0223-Configurable-Alternative-LootPool-Luck-Formula.patch
similarity index 92%
rename from Spigot-Server-Patches/0222-Configurable-Alternative-LootPool-Luck-Formula.patch
rename to Spigot-Server-Patches/0223-Configurable-Alternative-LootPool-Luck-Formula.patch
index 676b194999..cfcfb0363a 100644
--- a/Spigot-Server-Patches/0222-Configurable-Alternative-LootPool-Luck-Formula.patch
+++ b/Spigot-Server-Patches/0223-Configurable-Alternative-LootPool-Luck-Formula.patch
@@ -36,12 +36,12 @@ This change will result in some major changes to fishing formulas.
 I would love to see this change in Vanilla, so Mojang please pull :)
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 5fe6c36bdf8527d7fcb41e8d471194c7e395b946..0b2f77e37f9b13aef6af7d1254aaeec56c4e55c9 100644
+index f22bed69f690f6e4754b87dd61cebe9c6627b12d..c8a7d8092a2849b62a8d83d7970756fd76100025 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -271,4 +271,12 @@ public class PaperConfig {
-     private static void authenticationServersDownKickMessage() {
-         authenticationServersDownKickMessage = Strings.emptyToNull(getString("messages.kick.authentication-servers-down", authenticationServersDownKickMessage));
+@@ -280,4 +280,12 @@ public class PaperConfig {
+                     "such as inventories, experience points, advancements and the like will not be saved when they log out.");
+         }
      }
 +
 +    public static boolean useAlternativeLuckFormula = false;
diff --git a/Spigot-Server-Patches/0223-Print-Error-details-when-failing-to-save-player-data.patch b/Spigot-Server-Patches/0224-Print-Error-details-when-failing-to-save-player-data.patch
similarity index 90%
rename from Spigot-Server-Patches/0223-Print-Error-details-when-failing-to-save-player-data.patch
rename to Spigot-Server-Patches/0224-Print-Error-details-when-failing-to-save-player-data.patch
index 92b60883de..353a864c72 100644
--- a/Spigot-Server-Patches/0223-Print-Error-details-when-failing-to-save-player-data.patch
+++ b/Spigot-Server-Patches/0224-Print-Error-details-when-failing-to-save-player-data.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Print Error details when failing to save player data
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
-index 6a9e0e644801ddc5f18a47d15d5f6d5b6dc13004..b5cf60495b85c6ae6c32ee8a1c65d80e59fdce3d 100644
+index af9e94a87a946a4a9e2579a87f3f5a7adeb66f25..859d604cf9bf72aff261af39eec495959a9ac04b 100644
 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
 +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
 @@ -36,7 +36,7 @@ public class WorldNBTStorage {
diff --git a/Spigot-Server-Patches/0224-Make-shield-blocking-delay-configurable.patch b/Spigot-Server-Patches/0225-Make-shield-blocking-delay-configurable.patch
similarity index 97%
rename from Spigot-Server-Patches/0224-Make-shield-blocking-delay-configurable.patch
rename to Spigot-Server-Patches/0225-Make-shield-blocking-delay-configurable.patch
index 7b2c582df9..1264f5a801 100644
--- a/Spigot-Server-Patches/0224-Make-shield-blocking-delay-configurable.patch
+++ b/Spigot-Server-Patches/0225-Make-shield-blocking-delay-configurable.patch
@@ -19,7 +19,7 @@ index 69009246f12cc3acb0055af746e01097fa668e1b..35075ffac394153e28039809e0ed48fe
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 0bfc3a7a532a166497eff75ed355f05c96e216c4..5ecb82078f884946e83a15b254196e39986b7424 100644
+index ddcaa435f87171bd3940089c30ba6eea73546e1f..7175a1146fbad4aa91f898a45415432bc27976da 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -3199,7 +3199,7 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0225-Improve-EntityShootBowEvent.patch b/Spigot-Server-Patches/0226-Improve-EntityShootBowEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0225-Improve-EntityShootBowEvent.patch
rename to Spigot-Server-Patches/0226-Improve-EntityShootBowEvent.patch
index 1ac847e796..ff0ef0f9b1 100644
--- a/Spigot-Server-Patches/0225-Improve-EntityShootBowEvent.patch
+++ b/Spigot-Server-Patches/0226-Improve-EntityShootBowEvent.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Improve EntityShootBowEvent
 Adds missing call to Illagers and also adds Arrow ItemStack to skeltons
 
 diff --git a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
-index b00a18643ea8425c5008a25563dbaa17d1a82ca4..50442b3a498d1bab4270e69952a79f5182153ece 100644
+index 435b755fdcfa64b4f8c4167e375d59e3ac8f23fb..ff8efca2616cb14d9e79e03e3d08781d2547b8eb 100644
 --- a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
 +++ b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
 @@ -134,8 +134,18 @@ public class EntityIllagerIllusioner extends EntityIllagerWizard implements IRan
@@ -30,7 +30,7 @@ index b00a18643ea8425c5008a25563dbaa17d1a82ca4..50442b3a498d1bab4270e69952a79f51
  
      class a extends EntityIllagerWizard.PathfinderGoalCastSpell {
 diff --git a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
-index 48c7ba6ecc4ab42805363e31d0864fb685c8d3ca..ced89af70ca791bfe42c4e2d21604997a0cf3e0f 100644
+index ac013d55c5df502d8a8cdf18237a0ca956a444c4..513bb3087ea8e81d36dcc8f78e22b6c63b26f582 100644
 --- a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
 @@ -155,7 +155,7 @@ public abstract class EntitySkeletonAbstract extends EntityMonster implements IR
diff --git a/Spigot-Server-Patches/0226-PlayerReadyArrowEvent.patch b/Spigot-Server-Patches/0227-PlayerReadyArrowEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0226-PlayerReadyArrowEvent.patch
rename to Spigot-Server-Patches/0227-PlayerReadyArrowEvent.patch
index eede526025..1f9af570a2 100644
--- a/Spigot-Server-Patches/0226-PlayerReadyArrowEvent.patch
+++ b/Spigot-Server-Patches/0227-PlayerReadyArrowEvent.patch
@@ -7,7 +7,7 @@ Called when a player is firing a bow and the server is choosing an arrow to use.
 Plugins can skip selection of certain arrows and control which is used.
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index d340ec2fed8a4308d1fd2e998e6716e42d84fb98..bd031108edadd98050bcfe5bc9f702600bde266b 100644
+index 9a55d1e6f4c6632c1f27d8c1fac55abc3c3d8204..85d2f4bab52cef2822fb0431c9cf7b7becbd5ee7 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -2044,6 +2044,17 @@ public abstract class EntityHuman extends EntityLiving {
diff --git a/Spigot-Server-Patches/0227-Implement-EntityKnockbackByEntityEvent.patch b/Spigot-Server-Patches/0228-Implement-EntityKnockbackByEntityEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0227-Implement-EntityKnockbackByEntityEvent.patch
rename to Spigot-Server-Patches/0228-Implement-EntityKnockbackByEntityEvent.patch
index 48859ce702..3850128845 100644
--- a/Spigot-Server-Patches/0227-Implement-EntityKnockbackByEntityEvent.patch
+++ b/Spigot-Server-Patches/0228-Implement-EntityKnockbackByEntityEvent.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement EntityKnockbackByEntityEvent
 This event is called when an entity receives knockback by another entity.
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index bd031108edadd98050bcfe5bc9f702600bde266b..cbffebfe323ff4ddec792c49ebc3391fc9ac35ac 100644
+index 85d2f4bab52cef2822fb0431c9cf7b7becbd5ee7..0f7e162b342ac589dc357508a1dcd1ab02d1fe3e 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1080,7 +1080,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -28,7 +28,7 @@ index bd031108edadd98050bcfe5bc9f702600bde266b..cbffebfe323ff4ddec792c49ebc3391f
                                      // CraftBukkit end
                                  }
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 1b0c4234cf579b35f404c129c2c6d3266b670b09..38bf49da2cc6b2f7068462ea8b57cf3a76ae1779 100644
+index ab96dd1ac20998b6458ecf6f3fb6f5a2d5189eba..90c38aed8f546987e45b9fd3ae9aa11b2e1f2084 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -1500,7 +1500,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -41,7 +41,7 @@ index 1b0c4234cf579b35f404c129c2c6d3266b670b09..38bf49da2cc6b2f7068462ea8b57cf3a
              }
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 5ecb82078f884946e83a15b254196e39986b7424..a962f695f3f3508f8ce32f72a56990eb0e601589 100644
+index 7175a1146fbad4aa91f898a45415432bc27976da..4c6c0b3b77b3cea9abf4a9e6dec4872201db7b7b 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1240,7 +1240,7 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0228-Expand-Explosions-API.patch b/Spigot-Server-Patches/0229-Expand-Explosions-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0228-Expand-Explosions-API.patch
rename to Spigot-Server-Patches/0229-Expand-Explosions-API.patch
diff --git a/Spigot-Server-Patches/0229-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-Server-Patches/0230-LivingEntity-Hand-Raised-Item-Use-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0229-LivingEntity-Hand-Raised-Item-Use-API.patch
rename to Spigot-Server-Patches/0230-LivingEntity-Hand-Raised-Item-Use-API.patch
diff --git a/Spigot-Server-Patches/0230-RangedEntity-API.patch b/Spigot-Server-Patches/0231-RangedEntity-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0230-RangedEntity-API.patch
rename to Spigot-Server-Patches/0231-RangedEntity-API.patch
diff --git a/Spigot-Server-Patches/0231-Add-config-to-disable-ender-dragon-legacy-check.patch b/Spigot-Server-Patches/0232-Add-config-to-disable-ender-dragon-legacy-check.patch
similarity index 100%
rename from Spigot-Server-Patches/0231-Add-config-to-disable-ender-dragon-legacy-check.patch
rename to Spigot-Server-Patches/0232-Add-config-to-disable-ender-dragon-legacy-check.patch
diff --git a/Spigot-Server-Patches/0232-Implement-World.getEntity-UUID-API.patch b/Spigot-Server-Patches/0233-Implement-World.getEntity-UUID-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0232-Implement-World.getEntity-UUID-API.patch
rename to Spigot-Server-Patches/0233-Implement-World.getEntity-UUID-API.patch
diff --git a/Spigot-Server-Patches/0233-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0234-InventoryCloseEvent-Reason-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0233-InventoryCloseEvent-Reason-API.patch
rename to Spigot-Server-Patches/0234-InventoryCloseEvent-Reason-API.patch
diff --git a/Spigot-Server-Patches/0234-Vex-getSummoner-API.patch b/Spigot-Server-Patches/0235-Vex-getSummoner-API.patch
similarity index 94%
rename from Spigot-Server-Patches/0234-Vex-getSummoner-API.patch
rename to Spigot-Server-Patches/0235-Vex-getSummoner-API.patch
index bd97a8b935..dc9166e4c2 100644
--- a/Spigot-Server-Patches/0234-Vex-getSummoner-API.patch
+++ b/Spigot-Server-Patches/0235-Vex-getSummoner-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Vex#getSummoner API
 Get's the NPC that summoned this Vex
 
 diff --git a/src/main/java/net/minecraft/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java
-index ffcb0e1bfbb196ddcbc144fa83d1525398970309..b84eb0394ab9a53e32b774682bc42b067625195e 100644
+index d69beb58d805d442e346725020fe47582841000f..a8e9b1e83969f4e49465fc5e8b5fb8a5efe5f81d 100644
 --- a/src/main/java/net/minecraft/server/EntityVex.java
 +++ b/src/main/java/net/minecraft/server/EntityVex.java
 @@ -89,6 +89,7 @@ public class EntityVex extends EntityMonster {
diff --git a/Spigot-Server-Patches/0235-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/Spigot-Server-Patches/0236-Refresh-player-inventory-when-cancelling-PlayerInter.patch
similarity index 100%
rename from Spigot-Server-Patches/0235-Refresh-player-inventory-when-cancelling-PlayerInter.patch
rename to Spigot-Server-Patches/0236-Refresh-player-inventory-when-cancelling-PlayerInter.patch
diff --git a/Spigot-Server-Patches/0236-Don-t-change-the-Entity-Random-seed-for-squids.patch b/Spigot-Server-Patches/0237-Don-t-change-the-Entity-Random-seed-for-squids.patch
similarity index 89%
rename from Spigot-Server-Patches/0236-Don-t-change-the-Entity-Random-seed-for-squids.patch
rename to Spigot-Server-Patches/0237-Don-t-change-the-Entity-Random-seed-for-squids.patch
index 14039f8d2a..735a4cde96 100644
--- a/Spigot-Server-Patches/0236-Don-t-change-the-Entity-Random-seed-for-squids.patch
+++ b/Spigot-Server-Patches/0237-Don-t-change-the-Entity-Random-seed-for-squids.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't change the Entity Random seed for squids
 
 
 diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
-index 050c4bdac8519250157b77c3221c99bd49e53a22..b21605a62365fe24f315f35bd840b4740fc80f0e 100644
+index 6a436c6edb4f2f17bbb165ff6497c15e476d3317..03d707ed09e08baf3992b3f4a0cc7e42e412d16b 100644
 --- a/src/main/java/net/minecraft/server/EntitySquid.java
 +++ b/src/main/java/net/minecraft/server/EntitySquid.java
 @@ -21,7 +21,7 @@ public class EntitySquid extends EntityWaterAnimal {
diff --git a/Spigot-Server-Patches/0237-Re-add-vanilla-entity-warnings-for-duplicates.patch b/Spigot-Server-Patches/0238-Re-add-vanilla-entity-warnings-for-duplicates.patch
similarity index 100%
rename from Spigot-Server-Patches/0237-Re-add-vanilla-entity-warnings-for-duplicates.patch
rename to Spigot-Server-Patches/0238-Re-add-vanilla-entity-warnings-for-duplicates.patch
diff --git a/Spigot-Server-Patches/0238-Avoid-item-merge-if-stack-size-above-max-stack-size.patch b/Spigot-Server-Patches/0239-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
similarity index 91%
rename from Spigot-Server-Patches/0238-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
rename to Spigot-Server-Patches/0239-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
index 6b6729148f..95a78b89a1 100644
--- a/Spigot-Server-Patches/0238-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
+++ b/Spigot-Server-Patches/0239-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Avoid item merge if stack size above max stack size
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index 7e1cc212e22f21bec1f6b1a2d337ef2ee70dc699..fde34e4c0c95d23a006304f26339a60ea6cf51fa 100644
+index 6d9a03a1ccc78ae9eeb654dd7fab9f23fcce74b8..78a2e28c9fe93cdbb2a7326a5d6fcb596724ad30 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -182,6 +182,10 @@ public class EntityItem extends Entity {
diff --git a/Spigot-Server-Patches/0239-Use-asynchronous-Log4j-2-loggers.patch b/Spigot-Server-Patches/0240-Use-asynchronous-Log4j-2-loggers.patch
similarity index 95%
rename from Spigot-Server-Patches/0239-Use-asynchronous-Log4j-2-loggers.patch
rename to Spigot-Server-Patches/0240-Use-asynchronous-Log4j-2-loggers.patch
index 58aaa9e723..7b18c2a963 100644
--- a/Spigot-Server-Patches/0239-Use-asynchronous-Log4j-2-loggers.patch
+++ b/Spigot-Server-Patches/0240-Use-asynchronous-Log4j-2-loggers.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use asynchronous Log4j 2 loggers
 
 
 diff --git a/pom.xml b/pom.xml
-index 0c7a485ae7c2fbb5aa4c892d75a314a75056ba9a..2349491a15393a450d80397dd92c5733b28a3482 100644
+index e3630cd3847c6a5d5b3c8a37fe6f101f938b8700..c10888b862541e244c9c9c60d45ef9fee59ae3e8 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -78,6 +78,13 @@
diff --git a/Spigot-Server-Patches/0240-add-more-information-to-Entity.toString.patch b/Spigot-Server-Patches/0241-add-more-information-to-Entity.toString.patch
similarity index 100%
rename from Spigot-Server-Patches/0240-add-more-information-to-Entity.toString.patch
rename to Spigot-Server-Patches/0241-add-more-information-to-Entity.toString.patch
diff --git a/Spigot-Server-Patches/0241-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/Spigot-Server-Patches/0242-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
similarity index 100%
rename from Spigot-Server-Patches/0241-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
rename to Spigot-Server-Patches/0242-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
diff --git a/Spigot-Server-Patches/0242-EnderDragon-Events.patch b/Spigot-Server-Patches/0243-EnderDragon-Events.patch
similarity index 100%
rename from Spigot-Server-Patches/0242-EnderDragon-Events.patch
rename to Spigot-Server-Patches/0243-EnderDragon-Events.patch
diff --git a/Spigot-Server-Patches/0243-PlayerElytraBoostEvent.patch b/Spigot-Server-Patches/0244-PlayerElytraBoostEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0243-PlayerElytraBoostEvent.patch
rename to Spigot-Server-Patches/0244-PlayerElytraBoostEvent.patch
diff --git a/Spigot-Server-Patches/0244-Improve-BlockPosition-inlining.patch b/Spigot-Server-Patches/0245-Improve-BlockPosition-inlining.patch
similarity index 100%
rename from Spigot-Server-Patches/0244-Improve-BlockPosition-inlining.patch
rename to Spigot-Server-Patches/0245-Improve-BlockPosition-inlining.patch
diff --git a/Spigot-Server-Patches/0245-Optimize-RegistryID.c.patch b/Spigot-Server-Patches/0246-Optimize-RegistryID.c.patch
similarity index 100%
rename from Spigot-Server-Patches/0245-Optimize-RegistryID.c.patch
rename to Spigot-Server-Patches/0246-Optimize-RegistryID.c.patch
diff --git a/Spigot-Server-Patches/0246-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/0247-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
similarity index 93%
rename from Spigot-Server-Patches/0246-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
rename to Spigot-Server-Patches/0247-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
index 21bcf610da..cfeb6ffa9d 100644
--- a/Spigot-Server-Patches/0246-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/Spigot-Server-Patches/0247-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
@@ -19,7 +19,7 @@ index 6352051ab937d4d365e823a7112e76dc3ec34225..92ddf96f7db08a2b390ef3f49b0643f9
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 96c229e5dd214d32478fe4d5b96e77d8ba2bc93c..2592a59e9506cee901802a3bdc78db8832700fd8 100644
+index f2938b115aa34158e76da9f974f5746ed43630e1..0330bdf46a3baba169dd226261094a18a6aecf54 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -314,6 +314,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -31,7 +31,7 @@ index 96c229e5dd214d32478fe4d5b96e77d8ba2bc93c..2592a59e9506cee901802a3bdc78db88
  
          for (int i = 0; i < list.size(); ++i) {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 6003201197a89fa6c46c35d711a53db690295b1e..23a38825b71ea981538f32368705e7a7b98dadaf 100644
+index 6ebf3884a289d0be081d43d012ac10796740cc1e..909e01e458d729f277797bf1dca564f927318460 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -801,6 +801,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
diff --git a/Spigot-Server-Patches/0247-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0248-Vanished-players-don-t-have-rights.patch
similarity index 96%
rename from Spigot-Server-Patches/0247-Vanished-players-don-t-have-rights.patch
rename to Spigot-Server-Patches/0248-Vanished-players-don-t-have-rights.patch
index d80eb7911a..c7bb24e8cf 100644
--- a/Spigot-Server-Patches/0247-Vanished-players-don-t-have-rights.patch
+++ b/Spigot-Server-Patches/0248-Vanished-players-don-t-have-rights.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Vanished players don't have rights
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockBase.java b/src/main/java/net/minecraft/server/BlockBase.java
-index e0ae51ede44de5c894df526c1fc6d94c46d72013..8bcca73ae48ee822d32a6d23be2e1056a376e5f6 100644
+index 2d3e498d5c40e573aad88fd0fce7943e930956ba..8ba7718b61ad9f6c8537b44265818ecbcffbfb63 100644
 --- a/src/main/java/net/minecraft/server/BlockBase.java
 +++ b/src/main/java/net/minecraft/server/BlockBase.java
 @@ -453,6 +453,7 @@ public abstract class BlockBase {
@@ -17,7 +17,7 @@ index e0ae51ede44de5c894df526c1fc6d94c46d72013..8bcca73ae48ee822d32a6d23be2e1056
              return this.getBlock().c(this.p(), iblockaccess, blockposition, voxelshapecollision);
          }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index c863fd94ee77b81aec84223588e20eed974515d6..02e4ce705c2a7a1cdc7024a6c3db799db8922ce9 100644
+index d0e077084b84e44336878410aa9a44fed7408670..76ffbcec75fb1e22190179cf1f6ef7e417268ded 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -98,7 +98,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -96,7 +96,7 @@ index ed0f9c5d29c4f88b7beee4b0ecdd7a56de2d7a9e..881cea7c466f29ff4a89db28d104e850
          if (operatorboolean.apply(false, false)) {
              throw (IllegalArgumentException) SystemUtils.c((Throwable) (new IllegalArgumentException()));
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 23a38825b71ea981538f32368705e7a7b98dadaf..514be9c4356380627032c54b4b1eda37aaefe16d 100644
+index 909e01e458d729f277797bf1dca564f927318460..4b28cb07e24a2deb18e2c7e97f25fee1d32e0d25 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -178,6 +178,46 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -147,7 +147,7 @@ index 23a38825b71ea981538f32368705e7a7b98dadaf..514be9c4356380627032c54b4b1eda37
      public boolean s_() {
          return this.isClientSide;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 52762d75edd35dd3bc9668e3f7a3c79be279b783..6458cd6823ea066588742f8105048001395e4dde 100644
+index 0980c1f19340ac2bb044ff896f5ee6153c95bbd6..462cc4539c98787bb0c7e5925d8b6b06874120ca 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1209,6 +1209,14 @@ public class CraftEventFactory {
diff --git a/Spigot-Server-Patches/0248-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch b/Spigot-Server-Patches/0249-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
similarity index 100%
rename from Spigot-Server-Patches/0248-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
rename to Spigot-Server-Patches/0249-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
diff --git a/Spigot-Server-Patches/0249-Add-some-Debug-to-Chunk-Entity-slices.patch b/Spigot-Server-Patches/0250-Add-some-Debug-to-Chunk-Entity-slices.patch
similarity index 97%
rename from Spigot-Server-Patches/0249-Add-some-Debug-to-Chunk-Entity-slices.patch
rename to Spigot-Server-Patches/0250-Add-some-Debug-to-Chunk-Entity-slices.patch
index 237f1cf08d..79858a7314 100644
--- a/Spigot-Server-Patches/0249-Add-some-Debug-to-Chunk-Entity-slices.patch
+++ b/Spigot-Server-Patches/0250-Add-some-Debug-to-Chunk-Entity-slices.patch
@@ -58,7 +58,7 @@ index edacc6da62593c94392f460cb6839ed5f8067dd4..18d55cea6258c7b59b79aec1bcdf3589
              return;
          }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 02e4ce705c2a7a1cdc7024a6c3db799db8922ce9..29b24fd75f06501a814868d1fab85c9b818bd316 100644
+index 76ffbcec75fb1e22190179cf1f6ef7e417268ded..ef375f3987c26d70ba3f88e53f458bdccb6fc1ae 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -71,6 +71,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/Spigot-Server-Patches/0250-SkeletonHorse-Additions.patch b/Spigot-Server-Patches/0251-SkeletonHorse-Additions.patch
similarity index 97%
rename from Spigot-Server-Patches/0250-SkeletonHorse-Additions.patch
rename to Spigot-Server-Patches/0251-SkeletonHorse-Additions.patch
index b6539e59dc..acfb3783ac 100644
--- a/Spigot-Server-Patches/0250-SkeletonHorse-Additions.patch
+++ b/Spigot-Server-Patches/0251-SkeletonHorse-Additions.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] SkeletonHorse Additions
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
-index bb23e313b236ceb81c60d62833dc6f5afee044eb..a53d335f3af9df80bec3f94f81fb5ff0e0e5ebb5 100644
+index 187c21efe4899f84666af4007f34b488e3e7f7d4..abbc12c8e0767cf70ae5558979f1e49e8e52dd5c 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
 @@ -6,7 +6,7 @@ public class EntityHorseSkeleton extends EntityHorseAbstract {
diff --git a/Spigot-Server-Patches/0251-Prevent-Saving-Bad-entities-to-chunks.patch b/Spigot-Server-Patches/0252-Prevent-Saving-Bad-entities-to-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0251-Prevent-Saving-Bad-entities-to-chunks.patch
rename to Spigot-Server-Patches/0252-Prevent-Saving-Bad-entities-to-chunks.patch
diff --git a/Spigot-Server-Patches/0252-Don-t-call-getItemMeta-on-hasItemMeta.patch b/Spigot-Server-Patches/0253-Don-t-call-getItemMeta-on-hasItemMeta.patch
similarity index 100%
rename from Spigot-Server-Patches/0252-Don-t-call-getItemMeta-on-hasItemMeta.patch
rename to Spigot-Server-Patches/0253-Don-t-call-getItemMeta-on-hasItemMeta.patch
diff --git a/Spigot-Server-Patches/0253-Ignore-Dead-Entities-in-entityList-iteration.patch b/Spigot-Server-Patches/0254-Ignore-Dead-Entities-in-entityList-iteration.patch
similarity index 100%
rename from Spigot-Server-Patches/0253-Ignore-Dead-Entities-in-entityList-iteration.patch
rename to Spigot-Server-Patches/0254-Ignore-Dead-Entities-in-entityList-iteration.patch
diff --git a/Spigot-Server-Patches/0254-Implement-Expanded-ArmorStand-API.patch b/Spigot-Server-Patches/0255-Implement-Expanded-ArmorStand-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0254-Implement-Expanded-ArmorStand-API.patch
rename to Spigot-Server-Patches/0255-Implement-Expanded-ArmorStand-API.patch
index 165eff5ea9..3db98674c0 100644
--- a/Spigot-Server-Patches/0254-Implement-Expanded-ArmorStand-API.patch
+++ b/Spigot-Server-Patches/0255-Implement-Expanded-ArmorStand-API.patch
@@ -8,7 +8,7 @@ Add the following:
 - Enable/Disable slot interactions
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 2592a59e9506cee901802a3bdc78db8832700fd8..9b71e3207b0f41ab34871d5f4d7e87d90bc6446d 100644
+index 0330bdf46a3baba169dd226261094a18a6aecf54..554bf021f05165438ef4a0db75f9654b4d4b5480 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -388,6 +388,7 @@ public class EntityArmorStand extends EntityLiving {
diff --git a/Spigot-Server-Patches/0255-AnvilDamageEvent.patch b/Spigot-Server-Patches/0256-AnvilDamageEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0255-AnvilDamageEvent.patch
rename to Spigot-Server-Patches/0256-AnvilDamageEvent.patch
diff --git a/Spigot-Server-Patches/0256-Add-TNTPrimeEvent.patch b/Spigot-Server-Patches/0257-Add-TNTPrimeEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0256-Add-TNTPrimeEvent.patch
rename to Spigot-Server-Patches/0257-Add-TNTPrimeEvent.patch
index 943db52b76..686f30f7f1 100644
--- a/Spigot-Server-Patches/0256-Add-TNTPrimeEvent.patch
+++ b/Spigot-Server-Patches/0257-Add-TNTPrimeEvent.patch
@@ -115,7 +115,7 @@ index c6fe9c1f7ef06c4524533130b493ca5e72bd1693..7b601955f3fd36f06c838b896b455a60
                  world.a(blockposition, false);
              }
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index ef9df3c7c7c455373641f7a7c701f82a23ffef36..6bd55433fafcfd8079b8e7b1ce6b65daa13b83c1 100644
+index 6ad63e5bb4b7bec976d1aef74547ff96f64204c6..8da02467dff4b9da644aa12e453d127b7a01e259 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -11,6 +11,7 @@ import org.bukkit.craftbukkit.block.CraftBlock;
diff --git a/Spigot-Server-Patches/0257-Break-up-and-make-tab-spam-limits-configurable.patch b/Spigot-Server-Patches/0258-Break-up-and-make-tab-spam-limits-configurable.patch
similarity index 94%
rename from Spigot-Server-Patches/0257-Break-up-and-make-tab-spam-limits-configurable.patch
rename to Spigot-Server-Patches/0258-Break-up-and-make-tab-spam-limits-configurable.patch
index da36d429c4..3f849f0ec2 100644
--- a/Spigot-Server-Patches/0257-Break-up-and-make-tab-spam-limits-configurable.patch
+++ b/Spigot-Server-Patches/0258-Break-up-and-make-tab-spam-limits-configurable.patch
@@ -22,10 +22,10 @@ to take the burden of this into their own hand without having to rely on
 plugins doing unsafe things.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 0b2f77e37f9b13aef6af7d1254aaeec56c4e55c9..cddc4d017596d0c83fcb9661e71cb647389ce9d6 100644
+index f3e906902a3a90fd023050ebfae7ebc6d50311eb..e8d6cc7c116faaf168efdb0af0b2365bb7fb6eac 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -279,4 +279,18 @@ public class PaperConfig {
+@@ -288,4 +288,18 @@ public class PaperConfig {
              Bukkit.getLogger().log(Level.INFO, "Using Aikar's Alternative Luck Formula to apply Luck attribute to all loot pool calculations. See https://luckformula.emc.gs");
          }
      }
@@ -45,7 +45,7 @@ index 0b2f77e37f9b13aef6af7d1254aaeec56c4e55c9..cddc4d017596d0c83fcb9661e71cb647
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index a62fcd57be08cce2aa51de078aa86e2eeb6f11e5..be2c94a8fb93ee024e035cc8557f230ee7c1c647 100644
+index e025360ffdb54f91b2215076f24f9abb08d6718f..6e3d66ab776146e2204539319412ea8bde17d58a 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -83,6 +83,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0258-Add-hand-to-bucket-events.patch b/Spigot-Server-Patches/0259-Add-hand-to-bucket-events.patch
similarity index 100%
rename from Spigot-Server-Patches/0258-Add-hand-to-bucket-events.patch
rename to Spigot-Server-Patches/0259-Add-hand-to-bucket-events.patch
diff --git a/Spigot-Server-Patches/0259-MC-135506-Experience-should-save-as-Integers.patch b/Spigot-Server-Patches/0260-MC-135506-Experience-should-save-as-Integers.patch
similarity index 93%
rename from Spigot-Server-Patches/0259-MC-135506-Experience-should-save-as-Integers.patch
rename to Spigot-Server-Patches/0260-MC-135506-Experience-should-save-as-Integers.patch
index 663592f287..a2dd4567f0 100644
--- a/Spigot-Server-Patches/0259-MC-135506-Experience-should-save-as-Integers.patch
+++ b/Spigot-Server-Patches/0260-MC-135506-Experience-should-save-as-Integers.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] MC-135506: Experience should save as Integers
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index 4df7df781d12e38885ecfbc89dd1d42d9de14248..c2be0c2bc315876f120cff207e5516dda2bd55d7 100644
+index a2eaea4bd847ebe0b3dc35c95c4c29d6c73f4797..e33a42dcd52ab1d027df542e044d84d42970559c 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -202,7 +202,7 @@ public class EntityExperienceOrb extends Entity {
diff --git a/Spigot-Server-Patches/0260-Fix-client-rendering-skulls-from-same-user.patch b/Spigot-Server-Patches/0261-Fix-client-rendering-skulls-from-same-user.patch
similarity index 100%
rename from Spigot-Server-Patches/0260-Fix-client-rendering-skulls-from-same-user.patch
rename to Spigot-Server-Patches/0261-Fix-client-rendering-skulls-from-same-user.patch
diff --git a/Spigot-Server-Patches/0261-Add-Early-Warning-Feature-to-WatchDog.patch b/Spigot-Server-Patches/0262-Add-Early-Warning-Feature-to-WatchDog.patch
similarity index 97%
rename from Spigot-Server-Patches/0261-Add-Early-Warning-Feature-to-WatchDog.patch
rename to Spigot-Server-Patches/0262-Add-Early-Warning-Feature-to-WatchDog.patch
index 68735d512e..891eb6914f 100644
--- a/Spigot-Server-Patches/0261-Add-Early-Warning-Feature-to-WatchDog.patch
+++ b/Spigot-Server-Patches/0262-Add-Early-Warning-Feature-to-WatchDog.patch
@@ -9,7 +9,7 @@ thread dumps at an interval until the point of crash.
 This will help diagnose what was going on in that time before the crash.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index cddc4d017596d0c83fcb9661e71cb647389ce9d6..6a23438c11d4c758ef718e9575c548152052ff2f 100644
+index e8d6cc7c116faaf168efdb0af0b2365bb7fb6eac..aaaaead8c740a22906612ca43147bd00eb4639f7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -25,6 +25,7 @@ import org.bukkit.configuration.file.YamlConfiguration;
@@ -20,7 +20,7 @@ index cddc4d017596d0c83fcb9661e71cb647389ce9d6..6a23438c11d4c758ef718e9575c54815
  
  public class PaperConfig {
  
-@@ -280,6 +281,14 @@ public class PaperConfig {
+@@ -289,6 +290,14 @@ public class PaperConfig {
          }
      }
  
@@ -68,7 +68,7 @@ index f1bb3acf370ed71bc48116ce96396f999a34e83e..dce11770da204b09cdc2f89dceccb3cf
  
      @Override
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 18aca464506c6584be7a4d28cb303e9ace9bdc32..7fa844f168af9b622aaf44b4cb0e0e38132c95a0 100644
+index 1cf214eaca80feae283f6524605976022f856116..e66050b87ace6544636e10123ad0963176e5fdf7 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -225,7 +225,7 @@ public class SpigotConfig
diff --git a/Spigot-Server-Patches/0262-Make-EnderDragon-implement-Mob.patch b/Spigot-Server-Patches/0263-Make-EnderDragon-implement-Mob.patch
similarity index 100%
rename from Spigot-Server-Patches/0262-Make-EnderDragon-implement-Mob.patch
rename to Spigot-Server-Patches/0263-Make-EnderDragon-implement-Mob.patch
diff --git a/Spigot-Server-Patches/0263-Use-ConcurrentHashMap-in-JsonList.patch b/Spigot-Server-Patches/0264-Use-ConcurrentHashMap-in-JsonList.patch
similarity index 100%
rename from Spigot-Server-Patches/0263-Use-ConcurrentHashMap-in-JsonList.patch
rename to Spigot-Server-Patches/0264-Use-ConcurrentHashMap-in-JsonList.patch
diff --git a/Spigot-Server-Patches/0264-Use-a-Queue-for-Queueing-Commands.patch b/Spigot-Server-Patches/0265-Use-a-Queue-for-Queueing-Commands.patch
similarity index 100%
rename from Spigot-Server-Patches/0264-Use-a-Queue-for-Queueing-Commands.patch
rename to Spigot-Server-Patches/0265-Use-a-Queue-for-Queueing-Commands.patch
diff --git a/Spigot-Server-Patches/0265-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/Spigot-Server-Patches/0266-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
similarity index 100%
rename from Spigot-Server-Patches/0265-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
rename to Spigot-Server-Patches/0266-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
diff --git a/Spigot-Server-Patches/0266-Allow-disabling-armour-stand-ticking.patch b/Spigot-Server-Patches/0267-Allow-disabling-armour-stand-ticking.patch
similarity index 97%
rename from Spigot-Server-Patches/0266-Allow-disabling-armour-stand-ticking.patch
rename to Spigot-Server-Patches/0267-Allow-disabling-armour-stand-ticking.patch
index e8127b07ff..6444aff0a1 100644
--- a/Spigot-Server-Patches/0266-Allow-disabling-armour-stand-ticking.patch
+++ b/Spigot-Server-Patches/0267-Allow-disabling-armour-stand-ticking.patch
@@ -20,7 +20,7 @@ index 92ddf96f7db08a2b390ef3f49b0643f9d90bbea4..414b9077317022e4efc0b1e547d7f387
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 9b71e3207b0f41ab34871d5f4d7e87d90bc6446d..4e6f195965af2108631f373a3a2987826e4317de 100644
+index 554bf021f05165438ef4a0db75f9654b4d4b5480..fc86ae2519c8ff54ff7c5e45d7c45fcc16eefca0 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -46,9 +46,16 @@ public class EntityArmorStand extends EntityLiving {
@@ -137,7 +137,7 @@ index 9b71e3207b0f41ab34871d5f4d7e87d90bc6446d..4e6f195965af2108631f373a3a298782
          this.datawatcher.set(EntityArmorStand.bh, vector3f);
      }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 51d1d9abcb66bef329fa2396e9e338b9d962733b..83d98b705875fa543de4f37b1234ad65e4e0604a 100644
+index db84ddd62b627764ff5debc56095d37e81c94605..3a6e5cb459fb9866cf2e377b803501152ab7ce69 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2514,6 +2514,7 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0267-Optimize-BlockPosition-helper-methods.patch b/Spigot-Server-Patches/0268-Optimize-BlockPosition-helper-methods.patch
similarity index 100%
rename from Spigot-Server-Patches/0267-Optimize-BlockPosition-helper-methods.patch
rename to Spigot-Server-Patches/0268-Optimize-BlockPosition-helper-methods.patch
diff --git a/Spigot-Server-Patches/0268-Restore-vanlla-default-mob-spawn-range.patch b/Spigot-Server-Patches/0269-Restore-vanlla-default-mob-spawn-range.patch
similarity index 100%
rename from Spigot-Server-Patches/0268-Restore-vanlla-default-mob-spawn-range.patch
rename to Spigot-Server-Patches/0269-Restore-vanlla-default-mob-spawn-range.patch
diff --git a/Spigot-Server-Patches/0269-Slime-Pathfinder-Events.patch b/Spigot-Server-Patches/0270-Slime-Pathfinder-Events.patch
similarity index 100%
rename from Spigot-Server-Patches/0269-Slime-Pathfinder-Events.patch
rename to Spigot-Server-Patches/0270-Slime-Pathfinder-Events.patch
diff --git a/Spigot-Server-Patches/0270-Configurable-speed-for-water-flowing-over-lava.patch b/Spigot-Server-Patches/0271-Configurable-speed-for-water-flowing-over-lava.patch
similarity index 100%
rename from Spigot-Server-Patches/0270-Configurable-speed-for-water-flowing-over-lava.patch
rename to Spigot-Server-Patches/0271-Configurable-speed-for-water-flowing-over-lava.patch
diff --git a/Spigot-Server-Patches/0271-Optimize-CraftBlockData-Creation.patch b/Spigot-Server-Patches/0272-Optimize-CraftBlockData-Creation.patch
similarity index 100%
rename from Spigot-Server-Patches/0271-Optimize-CraftBlockData-Creation.patch
rename to Spigot-Server-Patches/0272-Optimize-CraftBlockData-Creation.patch
diff --git a/Spigot-Server-Patches/0272-Optimize-RegistryMaterials.patch b/Spigot-Server-Patches/0273-Optimize-RegistryMaterials.patch
similarity index 100%
rename from Spigot-Server-Patches/0272-Optimize-RegistryMaterials.patch
rename to Spigot-Server-Patches/0273-Optimize-RegistryMaterials.patch
diff --git a/Spigot-Server-Patches/0273-Add-PhantomPreSpawnEvent.patch b/Spigot-Server-Patches/0274-Add-PhantomPreSpawnEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0273-Add-PhantomPreSpawnEvent.patch
rename to Spigot-Server-Patches/0274-Add-PhantomPreSpawnEvent.patch
diff --git a/Spigot-Server-Patches/0274-Add-More-Creeper-API.patch b/Spigot-Server-Patches/0275-Add-More-Creeper-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0274-Add-More-Creeper-API.patch
rename to Spigot-Server-Patches/0275-Add-More-Creeper-API.patch
index 28271aacd8..7a61fd5280 100644
--- a/Spigot-Server-Patches/0274-Add-More-Creeper-API.patch
+++ b/Spigot-Server-Patches/0275-Add-More-Creeper-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add More Creeper API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
-index 647795bc7ea68f9dbe9d3f6488eaec82159feb9f..79ef955070b2982be79cc58e40093624bd088ff0 100644
+index 055272e49ff522a009fcd335e2183172ada11c35..ad422dfafbfcf62f6aa483dafa9764c274414d8d 100644
 --- a/src/main/java/net/minecraft/server/EntityCreeper.java
 +++ b/src/main/java/net/minecraft/server/EntityCreeper.java
 @@ -14,7 +14,7 @@ public class EntityCreeper extends EntityMonster {
diff --git a/Spigot-Server-Patches/0275-Inventory-removeItemAnySlot.patch b/Spigot-Server-Patches/0276-Inventory-removeItemAnySlot.patch
similarity index 100%
rename from Spigot-Server-Patches/0275-Inventory-removeItemAnySlot.patch
rename to Spigot-Server-Patches/0276-Inventory-removeItemAnySlot.patch
diff --git a/Spigot-Server-Patches/0276-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/Spigot-Server-Patches/0277-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
similarity index 100%
rename from Spigot-Server-Patches/0276-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
rename to Spigot-Server-Patches/0277-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
diff --git a/Spigot-Server-Patches/0277-Add-ray-tracing-methods-to-LivingEntity.patch b/Spigot-Server-Patches/0278-Add-ray-tracing-methods-to-LivingEntity.patch
similarity index 97%
rename from Spigot-Server-Patches/0277-Add-ray-tracing-methods-to-LivingEntity.patch
rename to Spigot-Server-Patches/0278-Add-ray-tracing-methods-to-LivingEntity.patch
index bb888b1fe0..f26e734208 100644
--- a/Spigot-Server-Patches/0277-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/Spigot-Server-Patches/0278-Add-ray-tracing-methods-to-LivingEntity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add ray tracing methods to LivingEntity
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 83d98b705875fa543de4f37b1234ad65e4e0604a..99dac0a315c29dd394ea3e8049da89c62ace65cc 100644
+index 3a6e5cb459fb9866cf2e377b803501152ab7ce69..f193c2778d0f04973546256d648692398b932dca 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -3474,6 +3474,23 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0278-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-Server-Patches/0279-Expose-attack-cooldown-methods-for-Player.patch
similarity index 94%
rename from Spigot-Server-Patches/0278-Expose-attack-cooldown-methods-for-Player.patch
rename to Spigot-Server-Patches/0279-Expose-attack-cooldown-methods-for-Player.patch
index 6dd7b27c37..a4517e80e0 100644
--- a/Spigot-Server-Patches/0278-Expose-attack-cooldown-methods-for-Player.patch
+++ b/Spigot-Server-Patches/0279-Expose-attack-cooldown-methods-for-Player.patch
@@ -17,7 +17,7 @@ index 73a33eff97d26e5b3542d787344013e18e52db68..6a46b9262ba34febc2664a6f56c18684
          return (float) (1.0D / this.b(GenericAttributes.ATTACK_SPEED) * 20.0D);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 8092fba753f08b31edfd457960b8edc3578fb3ca..7976d943855e444746b9e6efca57bfefe28bb0b1 100644
+index 18f0d23e38abb9c3e326a727cc4b4e040adb432d..982b8a7028385d38ff0bd88aabd94801ae258037 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1993,6 +1993,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0279-Improve-death-events.patch b/Spigot-Server-Patches/0280-Improve-death-events.patch
similarity index 99%
rename from Spigot-Server-Patches/0279-Improve-death-events.patch
rename to Spigot-Server-Patches/0280-Improve-death-events.patch
index 67795d9657..050bf69f6b 100644
--- a/Spigot-Server-Patches/0279-Improve-death-events.patch
+++ b/Spigot-Server-Patches/0280-Improve-death-events.patch
@@ -274,7 +274,7 @@ index 99dac0a315c29dd394ea3e8049da89c62ace65cc..81e41ec85160eeef833824821d797db9
          return this.isBaby() ? (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.5F : (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index d4c907fb4914d3ffc3c361af08cfd709d3a88558..8da30fd037a91309b09a1ba55cc085364d292c1f 100644
+index dd3ae707776626d54894d19d5b0968256104c4dd..08e2e911d726e9d306f5fcc7755ab89f94959aa3 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -84,6 +84,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -352,7 +352,7 @@ index 9a2e6bedfc50fba10f37c01d825f80415bfb69d3..a4afe638515471159d505a5e402a9342
          this.minecraftKey = minecraftKey;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7976d943855e444746b9e6efca57bfefe28bb0b1..89553476d6dec092d04830c169b886d7868da3be 100644
+index 982b8a7028385d38ff0bd88aabd94801ae258037..6c3b9df31e9c44f7171cf08014561e4b095133b1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1784,7 +1784,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0280-Allow-chests-to-be-placed-with-NBT-data.patch b/Spigot-Server-Patches/0281-Allow-chests-to-be-placed-with-NBT-data.patch
similarity index 100%
rename from Spigot-Server-Patches/0280-Allow-chests-to-be-placed-with-NBT-data.patch
rename to Spigot-Server-Patches/0281-Allow-chests-to-be-placed-with-NBT-data.patch
diff --git a/Spigot-Server-Patches/0281-Mob-Pathfinding-API.patch b/Spigot-Server-Patches/0282-Mob-Pathfinding-API.patch
similarity index 99%
rename from Spigot-Server-Patches/0281-Mob-Pathfinding-API.patch
rename to Spigot-Server-Patches/0282-Mob-Pathfinding-API.patch
index e20e0c19b2..a52dde881f 100644
--- a/Spigot-Server-Patches/0281-Mob-Pathfinding-API.patch
+++ b/Spigot-Server-Patches/0282-Mob-Pathfinding-API.patch
@@ -153,7 +153,7 @@ index 0000000000000000000000000000000000000000..af1bac9680028130e99c5e7130f258c1
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
-index ee7b1f25ba8b6b4318e332b739359db6ddd58b62..64b991859f0f3ca7d932b8acc8aeed401e22a388 100644
+index d39ce9c1816aaa33478dcd623056488ca21411f3..81c88c6bf737945c6cbd659d2feaf3f763b7df73 100644
 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java
 +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
 @@ -79,7 +79,7 @@ public abstract class NavigationAbstract {
diff --git a/Spigot-Server-Patches/0282-Prevent-chunk-loading-from-Fluid-Flowing.patch b/Spigot-Server-Patches/0283-Prevent-chunk-loading-from-Fluid-Flowing.patch
similarity index 100%
rename from Spigot-Server-Patches/0282-Prevent-chunk-loading-from-Fluid-Flowing.patch
rename to Spigot-Server-Patches/0283-Prevent-chunk-loading-from-Fluid-Flowing.patch
diff --git a/Spigot-Server-Patches/0283-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/Spigot-Server-Patches/0284-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
similarity index 100%
rename from Spigot-Server-Patches/0283-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
rename to Spigot-Server-Patches/0284-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
diff --git a/Spigot-Server-Patches/0284-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/Spigot-Server-Patches/0285-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0284-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
rename to Spigot-Server-Patches/0285-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
diff --git a/Spigot-Server-Patches/0285-Prevent-mob-spawning-from-loading-generating-chunks.patch b/Spigot-Server-Patches/0286-Prevent-mob-spawning-from-loading-generating-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0285-Prevent-mob-spawning-from-loading-generating-chunks.patch
rename to Spigot-Server-Patches/0286-Prevent-mob-spawning-from-loading-generating-chunks.patch
diff --git a/Spigot-Server-Patches/0286-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/Spigot-Server-Patches/0287-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from Spigot-Server-Patches/0286-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to Spigot-Server-Patches/0287-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/Spigot-Server-Patches/0287-Implement-furnace-cook-speed-multiplier-API.patch b/Spigot-Server-Patches/0288-Implement-furnace-cook-speed-multiplier-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0287-Implement-furnace-cook-speed-multiplier-API.patch
rename to Spigot-Server-Patches/0288-Implement-furnace-cook-speed-multiplier-API.patch
diff --git a/Spigot-Server-Patches/0288-PreSpawnerSpawnEvent.patch b/Spigot-Server-Patches/0289-PreSpawnerSpawnEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0288-PreSpawnerSpawnEvent.patch
rename to Spigot-Server-Patches/0289-PreSpawnerSpawnEvent.patch
diff --git a/Spigot-Server-Patches/0289-Catch-JsonParseException-in-Entity-and-TE-names.patch b/Spigot-Server-Patches/0290-Catch-JsonParseException-in-Entity-and-TE-names.patch
similarity index 100%
rename from Spigot-Server-Patches/0289-Catch-JsonParseException-in-Entity-and-TE-names.patch
rename to Spigot-Server-Patches/0290-Catch-JsonParseException-in-Entity-and-TE-names.patch
diff --git a/Spigot-Server-Patches/0290-Honor-EntityAgeable.ageLock.patch b/Spigot-Server-Patches/0291-Honor-EntityAgeable.ageLock.patch
similarity index 87%
rename from Spigot-Server-Patches/0290-Honor-EntityAgeable.ageLock.patch
rename to Spigot-Server-Patches/0291-Honor-EntityAgeable.ageLock.patch
index 415fcfeec3..6d9375d3f4 100644
--- a/Spigot-Server-Patches/0290-Honor-EntityAgeable.ageLock.patch
+++ b/Spigot-Server-Patches/0291-Honor-EntityAgeable.ageLock.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Honor EntityAgeable.ageLock
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityAgeable.java b/src/main/java/net/minecraft/server/EntityAgeable.java
-index e56aabd8a59c29406ac0f8dfc2207526f6fa99aa..de48dc7cd1996f1a62ef1d0047b1182d7889bd38 100644
+index 03f7979e34355842e405ec32c713ecc34c5a7a8b..026e75e5ae9e231e3f898823825adab30237d53d 100644
 --- a/src/main/java/net/minecraft/server/EntityAgeable.java
 +++ b/src/main/java/net/minecraft/server/EntityAgeable.java
 @@ -73,6 +73,7 @@ public abstract class EntityAgeable extends EntityCreature {
diff --git a/Spigot-Server-Patches/0291-Configurable-connection-throttle-kick-message.patch b/Spigot-Server-Patches/0292-Configurable-connection-throttle-kick-message.patch
similarity index 87%
rename from Spigot-Server-Patches/0291-Configurable-connection-throttle-kick-message.patch
rename to Spigot-Server-Patches/0292-Configurable-connection-throttle-kick-message.patch
index 8730b6e7b2..844eecbb48 100644
--- a/Spigot-Server-Patches/0291-Configurable-connection-throttle-kick-message.patch
+++ b/Spigot-Server-Patches/0292-Configurable-connection-throttle-kick-message.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable connection throttle kick message
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 6a23438c11d4c758ef718e9575c548152052ff2f..c11b864b667f199f3d73db856399e47ec7e66d6c 100644
+index aaaaead8c740a22906612ca43147bd00eb4639f7..9e10e2e965dd52755ee5ede71104cc89b11da45e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -273,6 +273,11 @@ public class PaperConfig {
@@ -17,9 +17,9 @@ index 6a23438c11d4c758ef718e9575c548152052ff2f..c11b864b667f199f3d73db856399e47e
 +        connectionThrottleKickMessage = getString("messages.kick.connection-throttle", connectionThrottleKickMessage);
 +    }
 +
-     public static boolean useAlternativeLuckFormula = false;
-     private static void useAlternativeLuckFormula() {
-         useAlternativeLuckFormula = getBoolean("settings.use-alternative-luck-formula", false);
+     public static boolean savePlayerData = true;
+     private static void savePlayerData() {
+         savePlayerData = getBoolean("settings.save-player-data", savePlayerData);
 diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
 index abace78271eedd453df692f4e24dacef474d215e..5e1747dc176ef855829a38605ec85c8494fb0d21 100644
 --- a/src/main/java/net/minecraft/server/HandshakeListener.java
diff --git a/Spigot-Server-Patches/0292-Hook-into-CB-plugin-rewrites.patch b/Spigot-Server-Patches/0293-Hook-into-CB-plugin-rewrites.patch
similarity index 100%
rename from Spigot-Server-Patches/0292-Hook-into-CB-plugin-rewrites.patch
rename to Spigot-Server-Patches/0293-Hook-into-CB-plugin-rewrites.patch
diff --git a/Spigot-Server-Patches/0293-Allow-setting-the-vex-s-summoner.patch b/Spigot-Server-Patches/0294-Allow-setting-the-vex-s-summoner.patch
similarity index 93%
rename from Spigot-Server-Patches/0293-Allow-setting-the-vex-s-summoner.patch
rename to Spigot-Server-Patches/0294-Allow-setting-the-vex-s-summoner.patch
index f0d34c350a..8501d294f9 100644
--- a/Spigot-Server-Patches/0293-Allow-setting-the-vex-s-summoner.patch
+++ b/Spigot-Server-Patches/0294-Allow-setting-the-vex-s-summoner.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow setting the vex's summoner
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java
-index b84eb0394ab9a53e32b774682bc42b067625195e..ed6a47ad2fd973695fbb151d1a44000ec3639e54 100644
+index a8e9b1e83969f4e49465fc5e8b5fb8a5efe5f81d..ae05856f25b092d193ec709ac6971c1089482242 100644
 --- a/src/main/java/net/minecraft/server/EntityVex.java
 +++ b/src/main/java/net/minecraft/server/EntityVex.java
 @@ -130,6 +130,7 @@ public class EntityVex extends EntityMonster {
diff --git a/Spigot-Server-Patches/0294-Add-sun-related-API.patch b/Spigot-Server-Patches/0295-Add-sun-related-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0294-Add-sun-related-API.patch
rename to Spigot-Server-Patches/0295-Add-sun-related-API.patch
diff --git a/Spigot-Server-Patches/0295-Turtle-API.patch b/Spigot-Server-Patches/0296-Turtle-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0295-Turtle-API.patch
rename to Spigot-Server-Patches/0296-Turtle-API.patch
index e614210f58..36d5c793e6 100644
--- a/Spigot-Server-Patches/0295-Turtle-API.patch
+++ b/Spigot-Server-Patches/0296-Turtle-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Turtle API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java
-index 19c92bea21ddcc3917eb011dcfe41006299356ef..fa8eab20bb839c53bf7989d02d2274f835002609 100644
+index a3dcb72c600034886137c24b22e64c54980c33f3..2ce40da2a8e28e80b4cb2cb827f45ddd4601d93a 100644
 --- a/src/main/java/net/minecraft/server/EntityTurtle.java
 +++ b/src/main/java/net/minecraft/server/EntityTurtle.java
 @@ -31,7 +31,7 @@ public class EntityTurtle extends EntityAnimal {
diff --git a/Spigot-Server-Patches/0296-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/Spigot-Server-Patches/0297-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
similarity index 100%
rename from Spigot-Server-Patches/0296-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
rename to Spigot-Server-Patches/0297-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
diff --git a/Spigot-Server-Patches/0297-Call-player-spectator-target-events-and-improve-impl.patch b/Spigot-Server-Patches/0298-Call-player-spectator-target-events-and-improve-impl.patch
similarity index 100%
rename from Spigot-Server-Patches/0297-Call-player-spectator-target-events-and-improve-impl.patch
rename to Spigot-Server-Patches/0298-Call-player-spectator-target-events-and-improve-impl.patch
diff --git a/Spigot-Server-Patches/0298-Add-Velocity-IP-Forwarding-Support.patch b/Spigot-Server-Patches/0299-Add-Velocity-IP-Forwarding-Support.patch
similarity index 98%
rename from Spigot-Server-Patches/0298-Add-Velocity-IP-Forwarding-Support.patch
rename to Spigot-Server-Patches/0299-Add-Velocity-IP-Forwarding-Support.patch
index 4fd9655d09..c353bbadd1 100644
--- a/Spigot-Server-Patches/0298-Add-Velocity-IP-Forwarding-Support.patch
+++ b/Spigot-Server-Patches/0299-Add-Velocity-IP-Forwarding-Support.patch
@@ -14,7 +14,7 @@ forwarding, and is integrated into the Minecraft login process by using the 1.13
 login plugin message packet.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index c11b864b667f199f3d73db856399e47ec7e66d6c..81a83dd3efdccf55fab848ba2f00a4850f2e2b4d 100644
+index 9e10e2e965dd52755ee5ede71104cc89b11da45e..7b905c16e3833741966cce301b0f7639addac05e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -8,6 +8,7 @@ import java.io.IOException;
@@ -34,7 +34,7 @@ index c11b864b667f199f3d73db856399e47ec7e66d6c..81a83dd3efdccf55fab848ba2f00a485
      }
  
      public static int packetInSpamThreshold = 300;
-@@ -307,4 +308,21 @@ public class PaperConfig {
+@@ -316,4 +317,21 @@ public class PaperConfig {
          }
          tabSpamLimit = getInt("settings.spam-limiter.tab-spam-limit", tabSpamLimit);
      }
diff --git a/Spigot-Server-Patches/0299-Add-more-Witch-API.patch b/Spigot-Server-Patches/0300-Add-more-Witch-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0299-Add-more-Witch-API.patch
rename to Spigot-Server-Patches/0300-Add-more-Witch-API.patch
index 717dc73757..9a7ab12787 100644
--- a/Spigot-Server-Patches/0299-Add-more-Witch-API.patch
+++ b/Spigot-Server-Patches/0300-Add-more-Witch-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add more Witch API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
-index 0703124e5137ff0a5ae4d025488eb343d2813067..ca3c5150bcfe2a92b49ad5a27c23dd37a7054fbb 100644
+index fc58cce8455dcf244355189fabb1a76114c19368..0ef981e5ad1c928fbcf32e83e28285e690df1775 100644
 --- a/src/main/java/net/minecraft/server/EntityWitch.java
 +++ b/src/main/java/net/minecraft/server/EntityWitch.java
 @@ -1,5 +1,11 @@
diff --git a/Spigot-Server-Patches/0300-Check-Drowned-for-Villager-Aggression-Config.patch b/Spigot-Server-Patches/0301-Check-Drowned-for-Villager-Aggression-Config.patch
similarity index 93%
rename from Spigot-Server-Patches/0300-Check-Drowned-for-Villager-Aggression-Config.patch
rename to Spigot-Server-Patches/0301-Check-Drowned-for-Villager-Aggression-Config.patch
index 04ed06de59..7648bb5758 100644
--- a/Spigot-Server-Patches/0300-Check-Drowned-for-Villager-Aggression-Config.patch
+++ b/Spigot-Server-Patches/0301-Check-Drowned-for-Villager-Aggression-Config.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Check Drowned for Villager Aggression Config
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityDrowned.java b/src/main/java/net/minecraft/server/EntityDrowned.java
-index 9c507cb0810029e3c5d7cb1055da170469315596..9ae0897bfd6a4577901d9189d0dba22f3ec2110c 100644
+index 958bdb8ff25a1605ab7f99816bf80908b444a3fb..ea7934060d7b7c3ca1c7fdc303168377a59c21a3 100644
 --- a/src/main/java/net/minecraft/server/EntityDrowned.java
 +++ b/src/main/java/net/minecraft/server/EntityDrowned.java
 @@ -31,7 +31,7 @@ public class EntityDrowned extends EntityZombie implements IRangedEntity {
diff --git a/Spigot-Server-Patches/0301-Here-s-Johnny.patch b/Spigot-Server-Patches/0302-Here-s-Johnny.patch
similarity index 94%
rename from Spigot-Server-Patches/0301-Here-s-Johnny.patch
rename to Spigot-Server-Patches/0302-Here-s-Johnny.patch
index 08e83e4082..b621c44e52 100644
--- a/Spigot-Server-Patches/0301-Here-s-Johnny.patch
+++ b/Spigot-Server-Patches/0302-Here-s-Johnny.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Here's Johnny!
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityVindicator.java b/src/main/java/net/minecraft/server/EntityVindicator.java
-index b358070215477bcd33dcd440472db4489017135a..c0d26aa9dcd02c44d744b10e18609857ada95889 100644
+index a959006185afaa3306fdd228f52d8177b58286a7..fd34d88c0b64dea75b82a5b23a79b119eca22a4a 100644
 --- a/src/main/java/net/minecraft/server/EntityVindicator.java
 +++ b/src/main/java/net/minecraft/server/EntityVindicator.java
 @@ -11,7 +11,7 @@ public class EntityVindicator extends EntityIllagerAbstract {
diff --git a/Spigot-Server-Patches/0302-Add-option-to-prevent-players-from-moving-into-unloa.patch b/Spigot-Server-Patches/0303-Add-option-to-prevent-players-from-moving-into-unloa.patch
similarity index 100%
rename from Spigot-Server-Patches/0302-Add-option-to-prevent-players-from-moving-into-unloa.patch
rename to Spigot-Server-Patches/0303-Add-option-to-prevent-players-from-moving-into-unloa.patch
diff --git a/Spigot-Server-Patches/0303-Reset-players-airTicks-on-respawn.patch b/Spigot-Server-Patches/0304-Reset-players-airTicks-on-respawn.patch
similarity index 93%
rename from Spigot-Server-Patches/0303-Reset-players-airTicks-on-respawn.patch
rename to Spigot-Server-Patches/0304-Reset-players-airTicks-on-respawn.patch
index eb0ff68d0e..70838355be 100644
--- a/Spigot-Server-Patches/0303-Reset-players-airTicks-on-respawn.patch
+++ b/Spigot-Server-Patches/0304-Reset-players-airTicks-on-respawn.patch
@@ -17,7 +17,7 @@ index 4923fe299e7f057d5d70d346e83e746185eafdd3..470f8f1440c62b30a9df6cf356003dd3
          return 300;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 7d2d7a909dba9e741605774081a6d4b589c428d9..7559409ab22ef66f4866845c0c5353b3a1bab3f9 100644
+index 0eb5d6a58a9794ed366d03b76f01abb673a6827c..f07014a563e2d472f02fc17d3bbf7d8c8a7f63f5 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -2005,6 +2005,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0304-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/Spigot-Server-Patches/0305-Don-t-sleep-after-profile-lookups-if-not-needed.patch
similarity index 100%
rename from Spigot-Server-Patches/0304-Don-t-sleep-after-profile-lookups-if-not-needed.patch
rename to Spigot-Server-Patches/0305-Don-t-sleep-after-profile-lookups-if-not-needed.patch
diff --git a/Spigot-Server-Patches/0305-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/Spigot-Server-Patches/0306-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
similarity index 98%
rename from Spigot-Server-Patches/0305-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
rename to Spigot-Server-Patches/0306-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
index c19f14f9da..d95cf29d6f 100644
--- a/Spigot-Server-Patches/0305-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
+++ b/Spigot-Server-Patches/0306-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
@@ -12,7 +12,7 @@ server threads
 Allow usage of a single thread executor by not using ForkJoin so single core CPU's.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index aea9e169f9a11378c176c0cc3ee5a0d59e6a4c38..354109e5f7a8e1b0895e12002951a4bd3bf7dd0c 100644
+index f9608bf0eb4e3dfc573fe626e7da9fccf69dc783..e08f913403c3cf3e6efec6c6409f046600c9eb7f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -175,6 +175,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
diff --git a/Spigot-Server-Patches/0306-Optimize-World-Time-Updates.patch b/Spigot-Server-Patches/0307-Optimize-World-Time-Updates.patch
similarity index 100%
rename from Spigot-Server-Patches/0306-Optimize-World-Time-Updates.patch
rename to Spigot-Server-Patches/0307-Optimize-World-Time-Updates.patch
diff --git a/Spigot-Server-Patches/0307-Restore-custom-InventoryHolder-support.patch b/Spigot-Server-Patches/0308-Restore-custom-InventoryHolder-support.patch
similarity index 100%
rename from Spigot-Server-Patches/0307-Restore-custom-InventoryHolder-support.patch
rename to Spigot-Server-Patches/0308-Restore-custom-InventoryHolder-support.patch
diff --git a/Spigot-Server-Patches/0308-Use-Vanilla-Minecart-Speeds.patch b/Spigot-Server-Patches/0309-Use-Vanilla-Minecart-Speeds.patch
similarity index 92%
rename from Spigot-Server-Patches/0308-Use-Vanilla-Minecart-Speeds.patch
rename to Spigot-Server-Patches/0309-Use-Vanilla-Minecart-Speeds.patch
index be722a4aef..59230dccf6 100644
--- a/Spigot-Server-Patches/0308-Use-Vanilla-Minecart-Speeds.patch
+++ b/Spigot-Server-Patches/0309-Use-Vanilla-Minecart-Speeds.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Use Vanilla Minecart Speeds
 CraftBukkit changed the values on flying speed, restore back to vanilla
 
 diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
-index 35b5d41084b47de6a1185e23970ebe21875668d6..9af2bb392881900d74803cccd093d96b08673a25 100644
+index f04e0dbe544b5dc0e40e37c4159a4f26fa149845..9bc21ef8a1f366f77ceb31b8bd01e6cc6b8a17a5 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 @@ -62,9 +62,9 @@ public abstract class EntityMinecartAbstract extends Entity {
diff --git a/Spigot-Server-Patches/0309-Fix-SpongeAbsortEvent-handling.patch b/Spigot-Server-Patches/0310-Fix-SpongeAbsortEvent-handling.patch
similarity index 100%
rename from Spigot-Server-Patches/0309-Fix-SpongeAbsortEvent-handling.patch
rename to Spigot-Server-Patches/0310-Fix-SpongeAbsortEvent-handling.patch
diff --git a/Spigot-Server-Patches/0310-Don-t-allow-digging-into-unloaded-chunks.patch b/Spigot-Server-Patches/0311-Don-t-allow-digging-into-unloaded-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0310-Don-t-allow-digging-into-unloaded-chunks.patch
rename to Spigot-Server-Patches/0311-Don-t-allow-digging-into-unloaded-chunks.patch
diff --git a/Spigot-Server-Patches/0311-Book-Size-Limits.patch b/Spigot-Server-Patches/0312-Book-Size-Limits.patch
similarity index 93%
rename from Spigot-Server-Patches/0311-Book-Size-Limits.patch
rename to Spigot-Server-Patches/0312-Book-Size-Limits.patch
index 94b10ab4da..4cbfed7709 100644
--- a/Spigot-Server-Patches/0311-Book-Size-Limits.patch
+++ b/Spigot-Server-Patches/0312-Book-Size-Limits.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Book Size Limits
 Puts some limits on the size of books.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 81a83dd3efdccf55fab848ba2f00a4850f2e2b4d..ae27b5d3fbc8e9476469a1201066b46b47efeb5c 100644
+index 7b905c16e3833741966cce301b0f7639addac05e..b61a1925ba09bb6e9f59baa6df111d994edd1169 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -325,4 +325,11 @@ public class PaperConfig {
+@@ -334,4 +334,11 @@ public class PaperConfig {
              velocitySecretKey = secret.getBytes(StandardCharsets.UTF_8);
          }
      }
@@ -22,7 +22,7 @@ index 81a83dd3efdccf55fab848ba2f00a4850f2e2b4d..ae27b5d3fbc8e9476469a1201066b46b
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 1ea1066109814ae441f5ec3be2e72766bf6b67b7..07c42d062e6618f47afc9a35ae53277527ef7379 100644
+index 1adf90526360bd0cf2a46251dd767498ac44565c..58102ee94907b9ab1bac93b4086d8aa4c6b06287 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -20,6 +20,7 @@ import java.util.function.Consumer;
diff --git a/Spigot-Server-Patches/0312-Make-the-default-permission-message-configurable.patch b/Spigot-Server-Patches/0313-Make-the-default-permission-message-configurable.patch
similarity index 87%
rename from Spigot-Server-Patches/0312-Make-the-default-permission-message-configurable.patch
rename to Spigot-Server-Patches/0313-Make-the-default-permission-message-configurable.patch
index b1e2f031ad..f89fe11a69 100644
--- a/Spigot-Server-Patches/0312-Make-the-default-permission-message-configurable.patch
+++ b/Spigot-Server-Patches/0313-Make-the-default-permission-message-configurable.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Make the default permission message configurable
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index ae27b5d3fbc8e9476469a1201066b46b47efeb5c..92386af0dc3e308b93fd4fa04ffe32ac9f76e272 100644
+index 01d48da8b2f89ad3a615ad10c044c5f0a08ee4ed..f9b1b198299166759fe0bd0a36d8d88c626e06a4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -19,6 +19,7 @@ import java.util.regex.Pattern;
@@ -25,9 +25,9 @@ index ae27b5d3fbc8e9476469a1201066b46b47efeb5c..92386af0dc3e308b93fd4fa04ffe32ac
 +        noPermissionMessage = ChatColor.translateAlternateColorCodes('&', getString("messages.no-permission", noPermissionMessage));
 +    }
 +
-     public static boolean useAlternativeLuckFormula = false;
-     private static void useAlternativeLuckFormula() {
-         useAlternativeLuckFormula = getBoolean("settings.use-alternative-luck-formula", false);
+     public static boolean savePlayerData = true;
+     private static void savePlayerData() {
+         savePlayerData = getBoolean("settings.save-player-data", savePlayerData);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 index 251433b5a0560cdfca298aca45c53191b74bc403..975b2b35324d5eb00a85b4771f68dd0b320c58e3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
diff --git a/Spigot-Server-Patches/0313-Prevent-rayTrace-from-loading-chunks.patch b/Spigot-Server-Patches/0314-Prevent-rayTrace-from-loading-chunks.patch
similarity index 94%
rename from Spigot-Server-Patches/0313-Prevent-rayTrace-from-loading-chunks.patch
rename to Spigot-Server-Patches/0314-Prevent-rayTrace-from-loading-chunks.patch
index d817761f84..704f44f8b9 100644
--- a/Spigot-Server-Patches/0313-Prevent-rayTrace-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0314-Prevent-rayTrace-from-loading-chunks.patch
@@ -7,7 +7,7 @@ ray tracing into an unloaded chunk should be treated as a miss
 this saves a ton of lag for when AI tries to raytrace near unloaded chunks.
 
 diff --git a/src/main/java/net/minecraft/server/IBlockAccess.java b/src/main/java/net/minecraft/server/IBlockAccess.java
-index 93946d15c08fa71c63273f6b4e096bb8b4448394..c4a83448ed4513f6e4ab179d1d43e5bb0cb13641 100644
+index a168218c6f41bb798557461a80efb785eea99b25..b90c9990668f7956e8ef67413bcfc5d7d9616db1 100644
 --- a/src/main/java/net/minecraft/server/IBlockAccess.java
 +++ b/src/main/java/net/minecraft/server/IBlockAccess.java
 @@ -46,7 +46,15 @@ public interface IBlockAccess {
diff --git a/Spigot-Server-Patches/0314-Handle-Large-Packets-disconnecting-client.patch b/Spigot-Server-Patches/0315-Handle-Large-Packets-disconnecting-client.patch
similarity index 98%
rename from Spigot-Server-Patches/0314-Handle-Large-Packets-disconnecting-client.patch
rename to Spigot-Server-Patches/0315-Handle-Large-Packets-disconnecting-client.patch
index aa7bf79387..733717eaa5 100644
--- a/Spigot-Server-Patches/0314-Handle-Large-Packets-disconnecting-client.patch
+++ b/Spigot-Server-Patches/0315-Handle-Large-Packets-disconnecting-client.patch
@@ -7,7 +7,7 @@ If a players inventory is too big to send in a single packet,
 split the inventory set into multiple packets instead.
 
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 3351389dc122b66c198fb21ff02976491e9b46d9..c90c616860b5157956250e4fe21e1764dd04881c 100644
+index 2fda6f6965916e99e603ff87af4226b5ab8417ee..9ea4ce3aa6a43906eb7bf9593de0191a94242da2 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -12,6 +12,7 @@ import io.netty.channel.epoll.EpollEventLoopGroup;
diff --git a/Spigot-Server-Patches/0315-force-entity-dismount-during-teleportation.patch b/Spigot-Server-Patches/0316-force-entity-dismount-during-teleportation.patch
similarity index 98%
rename from Spigot-Server-Patches/0315-force-entity-dismount-during-teleportation.patch
rename to Spigot-Server-Patches/0316-force-entity-dismount-during-teleportation.patch
index 2f737aff64..6a3562ea03 100644
--- a/Spigot-Server-Patches/0315-force-entity-dismount-during-teleportation.patch
+++ b/Spigot-Server-Patches/0316-force-entity-dismount-during-teleportation.patch
@@ -112,7 +112,7 @@ index 81e41ec85160eeef833824821d797db9b3d38b40..eaaef11527bc325d6cd6d3b1bc24c59e
              this.a(entity);
          }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 7559409ab22ef66f4866845c0c5353b3a1bab3f9..e0230b8e21789aedc9822155962e097e8b939361 100644
+index f07014a563e2d472f02fc17d3bbf7d8c8a7f63f5..c2726933790ec58bf9ae84969b973dd727fac059 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1110,11 +1110,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0316-Add-more-Zombie-API.patch b/Spigot-Server-Patches/0317-Add-more-Zombie-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0316-Add-more-Zombie-API.patch
rename to Spigot-Server-Patches/0317-Add-more-Zombie-API.patch
index 4f5286f33a..055d32842f 100644
--- a/Spigot-Server-Patches/0316-Add-more-Zombie-API.patch
+++ b/Spigot-Server-Patches/0317-Add-more-Zombie-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add more Zombie API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index d07847876e22971b4a90f67d8281bf08361424e0..8c4a27721b66800c2d9b7bc6c1878b73b76b0df1 100644
+index 12f954723ac2f0058081d810ce83aed99532caad..2c0246fe39e3a0f513d6be8d270b76a0016935f4 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -33,6 +33,7 @@ public class EntityZombie extends EntityMonster {
diff --git a/Spigot-Server-Patches/0317-Add-PlayerConnectionCloseEvent.patch b/Spigot-Server-Patches/0318-Add-PlayerConnectionCloseEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0317-Add-PlayerConnectionCloseEvent.patch
rename to Spigot-Server-Patches/0318-Add-PlayerConnectionCloseEvent.patch
diff --git a/Spigot-Server-Patches/0318-Prevent-Enderman-from-loading-chunks.patch b/Spigot-Server-Patches/0319-Prevent-Enderman-from-loading-chunks.patch
similarity index 95%
rename from Spigot-Server-Patches/0318-Prevent-Enderman-from-loading-chunks.patch
rename to Spigot-Server-Patches/0319-Prevent-Enderman-from-loading-chunks.patch
index fd61be70e1..6bc9fda007 100644
--- a/Spigot-Server-Patches/0318-Prevent-Enderman-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0319-Prevent-Enderman-from-loading-chunks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent Enderman from loading chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index f4b823882e1e842c897c7946f7d1a46ce5366de0..f53525eb32a6096ae24fd23756b2169d5d39e9d4 100644
+index d03c0b4ea5fad793a7bedad5ae3be0b779dc458c..03176e83ae31aff4c2c75702e249afaef3240f50 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -380,7 +380,8 @@ public class EntityEnderman extends EntityMonster implements IEntityAngerable {
diff --git a/Spigot-Server-Patches/0319-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/Spigot-Server-Patches/0320-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
similarity index 97%
rename from Spigot-Server-Patches/0319-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
rename to Spigot-Server-Patches/0320-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index 0030c27391..8eae9086b7 100644
--- a/Spigot-Server-Patches/0319-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/Spigot-Server-Patches/0320-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
@@ -16,7 +16,7 @@ intent to remove) and replace it with two new methods, clearly named and
 documented as to their purpose.
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index e0230b8e21789aedc9822155962e097e8b939361..7d8960b8ada9c7076afb1c58d345467d9a7d750b 100644
+index c2726933790ec58bf9ae84969b973dd727fac059..508fe73d2117be31f929c577b9aa4fb44c0fa226 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -84,6 +84,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -106,7 +106,7 @@ index 00333548b470435aa89fb0f4b29047eb1461e992..5770d4183c1b9ab6119a25930283c023
      public Location getBedSpawnLocation() {
          NBTTagCompound data = getData();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 89553476d6dec092d04830c169b886d7868da3be..3d9720498e4758df71d80d1c8ec092edbe1de49d 100644
+index 6c3b9df31e9c44f7171cf08014561e4b095133b1..16c0aafcb2f0dc9e44e6f68f410236b3283050e5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -142,6 +142,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0320-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/Spigot-Server-Patches/0321-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
similarity index 91%
rename from Spigot-Server-Patches/0320-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
rename to Spigot-Server-Patches/0321-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
index a87997ac5d..478f5c8d07 100644
--- a/Spigot-Server-Patches/0320-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
+++ b/Spigot-Server-Patches/0321-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Workaround for vehicle tracking issue on disconnect
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 7d8960b8ada9c7076afb1c58d345467d9a7d750b..a89a0b417b6adb021aefe52fc3de627320e30b80 100644
+index 508fe73d2117be31f929c577b9aa4fb44c0fa226..b518b49aa96ff63ac4907e5baa09c5789a07949d 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1376,6 +1376,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0321-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch b/Spigot-Server-Patches/0322-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
similarity index 100%
rename from Spigot-Server-Patches/0321-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
rename to Spigot-Server-Patches/0322-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
diff --git a/Spigot-Server-Patches/0322-Block-Entity-remove-from-being-called-on-Players.patch b/Spigot-Server-Patches/0323-Block-Entity-remove-from-being-called-on-Players.patch
similarity index 93%
rename from Spigot-Server-Patches/0322-Block-Entity-remove-from-being-called-on-Players.patch
rename to Spigot-Server-Patches/0323-Block-Entity-remove-from-being-called-on-Players.patch
index 43f36003eb..7d3b0bcc58 100644
--- a/Spigot-Server-Patches/0322-Block-Entity-remove-from-being-called-on-Players.patch
+++ b/Spigot-Server-Patches/0323-Block-Entity-remove-from-being-called-on-Players.patch
@@ -12,7 +12,7 @@ Player we will look at limiting the scope of this change. It appears to
 be unintentional in the few cases we've seen so far.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3d9720498e4758df71d80d1c8ec092edbe1de49d..602eeb3455bbc161070b000cf4a7a61611b8140e 100644
+index 16c0aafcb2f0dc9e44e6f68f410236b3283050e5..af7838a654978e86b4d2f2ff80c04da245ff1a41 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2038,6 +2038,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0323-BlockDestroyEvent.patch b/Spigot-Server-Patches/0324-BlockDestroyEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0323-BlockDestroyEvent.patch
rename to Spigot-Server-Patches/0324-BlockDestroyEvent.patch
diff --git a/Spigot-Server-Patches/0324-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/Spigot-Server-Patches/0325-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
similarity index 100%
rename from Spigot-Server-Patches/0324-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
rename to Spigot-Server-Patches/0325-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
diff --git a/Spigot-Server-Patches/0325-Fix-sign-edit-memory-leak.patch b/Spigot-Server-Patches/0326-Fix-sign-edit-memory-leak.patch
similarity index 100%
rename from Spigot-Server-Patches/0325-Fix-sign-edit-memory-leak.patch
rename to Spigot-Server-Patches/0326-Fix-sign-edit-memory-leak.patch
diff --git a/Spigot-Server-Patches/0326-Limit-Client-Sign-length-more.patch b/Spigot-Server-Patches/0327-Limit-Client-Sign-length-more.patch
similarity index 100%
rename from Spigot-Server-Patches/0326-Limit-Client-Sign-length-more.patch
rename to Spigot-Server-Patches/0327-Limit-Client-Sign-length-more.patch
diff --git a/Spigot-Server-Patches/0327-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/Spigot-Server-Patches/0328-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
similarity index 100%
rename from Spigot-Server-Patches/0327-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
rename to Spigot-Server-Patches/0328-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
diff --git a/Spigot-Server-Patches/0328-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/Spigot-Server-Patches/0329-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
similarity index 100%
rename from Spigot-Server-Patches/0328-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
rename to Spigot-Server-Patches/0329-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/Spigot-Server-Patches/0329-Handle-Oversized-Tile-Entities-in-chunks.patch b/Spigot-Server-Patches/0330-Handle-Oversized-Tile-Entities-in-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0329-Handle-Oversized-Tile-Entities-in-chunks.patch
rename to Spigot-Server-Patches/0330-Handle-Oversized-Tile-Entities-in-chunks.patch
diff --git a/Spigot-Server-Patches/0330-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch b/Spigot-Server-Patches/0331-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
similarity index 100%
rename from Spigot-Server-Patches/0330-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
rename to Spigot-Server-Patches/0331-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
diff --git a/Spigot-Server-Patches/0331-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/Spigot-Server-Patches/0332-Set-Zombie-last-tick-at-start-of-drowning-process.patch
similarity index 100%
rename from Spigot-Server-Patches/0331-Set-Zombie-last-tick-at-start-of-drowning-process.patch
rename to Spigot-Server-Patches/0332-Set-Zombie-last-tick-at-start-of-drowning-process.patch
diff --git a/Spigot-Server-Patches/0332-Allow-Saving-of-Oversized-Chunks.patch b/Spigot-Server-Patches/0333-Allow-Saving-of-Oversized-Chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0332-Allow-Saving-of-Oversized-Chunks.patch
rename to Spigot-Server-Patches/0333-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/Spigot-Server-Patches/0333-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/Spigot-Server-Patches/0334-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
similarity index 100%
rename from Spigot-Server-Patches/0333-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
rename to Spigot-Server-Patches/0334-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
diff --git a/Spigot-Server-Patches/0334-Add-LivingEntity-getTargetEntity.patch b/Spigot-Server-Patches/0335-Add-LivingEntity-getTargetEntity.patch
similarity index 100%
rename from Spigot-Server-Patches/0334-Add-LivingEntity-getTargetEntity.patch
rename to Spigot-Server-Patches/0335-Add-LivingEntity-getTargetEntity.patch
diff --git a/Spigot-Server-Patches/0335-Use-proper-max-length-when-serialising-BungeeCord-te.patch b/Spigot-Server-Patches/0336-Use-proper-max-length-when-serialising-BungeeCord-te.patch
similarity index 100%
rename from Spigot-Server-Patches/0335-Use-proper-max-length-when-serialising-BungeeCord-te.patch
rename to Spigot-Server-Patches/0336-Use-proper-max-length-when-serialising-BungeeCord-te.patch
diff --git a/Spigot-Server-Patches/0336-Entity-getEntitySpawnReason.patch b/Spigot-Server-Patches/0337-Entity-getEntitySpawnReason.patch
similarity index 100%
rename from Spigot-Server-Patches/0336-Entity-getEntitySpawnReason.patch
rename to Spigot-Server-Patches/0337-Entity-getEntitySpawnReason.patch
diff --git a/Spigot-Server-Patches/0337-Update-entity-Metadata-for-all-tracked-players.patch b/Spigot-Server-Patches/0338-Update-entity-Metadata-for-all-tracked-players.patch
similarity index 100%
rename from Spigot-Server-Patches/0337-Update-entity-Metadata-for-all-tracked-players.patch
rename to Spigot-Server-Patches/0338-Update-entity-Metadata-for-all-tracked-players.patch
diff --git a/Spigot-Server-Patches/0338-Implement-PlayerPostRespawnEvent.patch b/Spigot-Server-Patches/0339-Implement-PlayerPostRespawnEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0338-Implement-PlayerPostRespawnEvent.patch
rename to Spigot-Server-Patches/0339-Implement-PlayerPostRespawnEvent.patch
diff --git a/Spigot-Server-Patches/0339-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/Spigot-Server-Patches/0340-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
similarity index 100%
rename from Spigot-Server-Patches/0339-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
rename to Spigot-Server-Patches/0340-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
diff --git a/Spigot-Server-Patches/0340-Server-Tick-Events.patch b/Spigot-Server-Patches/0341-Server-Tick-Events.patch
similarity index 100%
rename from Spigot-Server-Patches/0340-Server-Tick-Events.patch
rename to Spigot-Server-Patches/0341-Server-Tick-Events.patch
diff --git a/Spigot-Server-Patches/0341-PlayerDeathEvent-getItemsToKeep.patch b/Spigot-Server-Patches/0342-PlayerDeathEvent-getItemsToKeep.patch
similarity index 96%
rename from Spigot-Server-Patches/0341-PlayerDeathEvent-getItemsToKeep.patch
rename to Spigot-Server-Patches/0342-PlayerDeathEvent-getItemsToKeep.patch
index 9bfd2aa123..f896955b6d 100644
--- a/Spigot-Server-Patches/0341-PlayerDeathEvent-getItemsToKeep.patch
+++ b/Spigot-Server-Patches/0342-PlayerDeathEvent-getItemsToKeep.patch
@@ -8,7 +8,7 @@ Exposes a mutable array on items a player should keep on death
 Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index a89a0b417b6adb021aefe52fc3de627320e30b80..c776f9bf65dedab951e3176bd74f854522503024 100644
+index b518b49aa96ff63ac4907e5baa09c5789a07949d..1a8d8bc120fec876c528029dcc2804519caa569f 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -563,6 +563,46 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0342-Optimize-Captured-TileEntity-Lookup.patch b/Spigot-Server-Patches/0343-Optimize-Captured-TileEntity-Lookup.patch
similarity index 100%
rename from Spigot-Server-Patches/0342-Optimize-Captured-TileEntity-Lookup.patch
rename to Spigot-Server-Patches/0343-Optimize-Captured-TileEntity-Lookup.patch
diff --git a/Spigot-Server-Patches/0343-Add-Heightmap-API.patch b/Spigot-Server-Patches/0344-Add-Heightmap-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0343-Add-Heightmap-API.patch
rename to Spigot-Server-Patches/0344-Add-Heightmap-API.patch
diff --git a/Spigot-Server-Patches/0344-Mob-Spawner-API-Enhancements.patch b/Spigot-Server-Patches/0345-Mob-Spawner-API-Enhancements.patch
similarity index 100%
rename from Spigot-Server-Patches/0344-Mob-Spawner-API-Enhancements.patch
rename to Spigot-Server-Patches/0345-Mob-Spawner-API-Enhancements.patch
diff --git a/Spigot-Server-Patches/0345-Per-Player-View-Distance-API-placeholders.patch b/Spigot-Server-Patches/0346-Per-Player-View-Distance-API-placeholders.patch
similarity index 97%
rename from Spigot-Server-Patches/0345-Per-Player-View-Distance-API-placeholders.patch
rename to Spigot-Server-Patches/0346-Per-Player-View-Distance-API-placeholders.patch
index 335e2c9096..1dc0086079 100644
--- a/Spigot-Server-Patches/0345-Per-Player-View-Distance-API-placeholders.patch
+++ b/Spigot-Server-Patches/0346-Per-Player-View-Distance-API-placeholders.patch
@@ -40,7 +40,7 @@ index ad5a7cbe83fb61b79203369895e82edca2ffcb72..06cf8ca80c314b7c236984c7f6236533
                          double deltaZ = this.locZ() - player.locZ();
                          double distanceSquared = deltaX * deltaX + deltaZ * deltaZ;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 602eeb3455bbc161070b000cf4a7a61611b8140e..fa4f2df4a669df838e5c553a21b9291ed7d6b32f 100644
+index af7838a654978e86b4d2f2ff80c04da245ff1a41..b5088ad2eeef0a3fae0acb3dfea7605b9a861c73 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2047,6 +2047,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0346-Fix-CB-call-to-changed-postToMainThread-method.patch b/Spigot-Server-Patches/0347-Fix-CB-call-to-changed-postToMainThread-method.patch
similarity index 90%
rename from Spigot-Server-Patches/0346-Fix-CB-call-to-changed-postToMainThread-method.patch
rename to Spigot-Server-Patches/0347-Fix-CB-call-to-changed-postToMainThread-method.patch
index 9024799349..a855b391fe 100644
--- a/Spigot-Server-Patches/0346-Fix-CB-call-to-changed-postToMainThread-method.patch
+++ b/Spigot-Server-Patches/0347-Fix-CB-call-to-changed-postToMainThread-method.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix CB call to changed postToMainThread method
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index bd84eb771f0c098bbdad1539fc23b6573522e8d8..6c2af33d0807634a79aa092edc363d6561d0cadc 100644
+index 9eaa4e1caf297c26d49b0e4777cf75a81d6bc9c0..ec3089d49fe85295bddbb2960eaef788a2ae7805 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -297,7 +297,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0347-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/Spigot-Server-Patches/0348-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
similarity index 100%
rename from Spigot-Server-Patches/0347-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
rename to Spigot-Server-Patches/0348-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
diff --git a/Spigot-Server-Patches/0348-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch b/Spigot-Server-Patches/0349-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
similarity index 100%
rename from Spigot-Server-Patches/0348-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
rename to Spigot-Server-Patches/0349-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
diff --git a/Spigot-Server-Patches/0349-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch b/Spigot-Server-Patches/0350-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0349-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
rename to Spigot-Server-Patches/0350-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
diff --git a/Spigot-Server-Patches/0350-Duplicate-UUID-Resolve-Option.patch b/Spigot-Server-Patches/0351-Duplicate-UUID-Resolve-Option.patch
similarity index 100%
rename from Spigot-Server-Patches/0350-Duplicate-UUID-Resolve-Option.patch
rename to Spigot-Server-Patches/0351-Duplicate-UUID-Resolve-Option.patch
diff --git a/Spigot-Server-Patches/0351-improve-CraftWorld-isChunkLoaded.patch b/Spigot-Server-Patches/0352-improve-CraftWorld-isChunkLoaded.patch
similarity index 100%
rename from Spigot-Server-Patches/0351-improve-CraftWorld-isChunkLoaded.patch
rename to Spigot-Server-Patches/0352-improve-CraftWorld-isChunkLoaded.patch
diff --git a/Spigot-Server-Patches/0352-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0353-Configurable-Keep-Spawn-Loaded-range-per-world.patch
similarity index 99%
rename from Spigot-Server-Patches/0352-Configurable-Keep-Spawn-Loaded-range-per-world.patch
rename to Spigot-Server-Patches/0353-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index 6cfe821af9..e70a96f2af 100644
--- a/Spigot-Server-Patches/0352-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/Spigot-Server-Patches/0353-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -21,7 +21,7 @@ index 21910dfd1a533e923a8a73e92fea25685a07b445..44811683cfe47adbdce6c8bd627bdbeb
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 44991803a489a42842f79ce51bdd53a73ef35d71..12866eec621d9ae8801d50bdda13e757f303010e 100644
+index 5816c8b367923a1722665b86e7fdcbe39cf51ee1..8886572361e56e8006bcdf2b066267336634cd7d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -605,6 +605,14 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
diff --git a/Spigot-Server-Patches/0353-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch b/Spigot-Server-Patches/0354-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
similarity index 100%
rename from Spigot-Server-Patches/0353-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
rename to Spigot-Server-Patches/0354-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
diff --git a/Spigot-Server-Patches/0354-ChunkMapDistance-CME.patch b/Spigot-Server-Patches/0355-ChunkMapDistance-CME.patch
similarity index 100%
rename from Spigot-Server-Patches/0354-ChunkMapDistance-CME.patch
rename to Spigot-Server-Patches/0355-ChunkMapDistance-CME.patch
diff --git a/Spigot-Server-Patches/0355-Implement-CraftBlockSoundGroup.patch b/Spigot-Server-Patches/0356-Implement-CraftBlockSoundGroup.patch
similarity index 100%
rename from Spigot-Server-Patches/0355-Implement-CraftBlockSoundGroup.patch
rename to Spigot-Server-Patches/0356-Implement-CraftBlockSoundGroup.patch
diff --git a/Spigot-Server-Patches/0356-Chunk-debug-command.patch b/Spigot-Server-Patches/0357-Chunk-debug-command.patch
similarity index 100%
rename from Spigot-Server-Patches/0356-Chunk-debug-command.patch
rename to Spigot-Server-Patches/0357-Chunk-debug-command.patch
diff --git a/Spigot-Server-Patches/0357-Catch-exceptions-from-dispenser-entity-spawns.patch b/Spigot-Server-Patches/0358-Catch-exceptions-from-dispenser-entity-spawns.patch
similarity index 100%
rename from Spigot-Server-Patches/0357-Catch-exceptions-from-dispenser-entity-spawns.patch
rename to Spigot-Server-Patches/0358-Catch-exceptions-from-dispenser-entity-spawns.patch
diff --git a/Spigot-Server-Patches/0358-Fix-World-isChunkGenerated-calls.patch b/Spigot-Server-Patches/0359-Fix-World-isChunkGenerated-calls.patch
similarity index 100%
rename from Spigot-Server-Patches/0358-Fix-World-isChunkGenerated-calls.patch
rename to Spigot-Server-Patches/0359-Fix-World-isChunkGenerated-calls.patch
diff --git a/Spigot-Server-Patches/0359-Show-blockstate-location-if-we-failed-to-read-it.patch b/Spigot-Server-Patches/0360-Show-blockstate-location-if-we-failed-to-read-it.patch
similarity index 100%
rename from Spigot-Server-Patches/0359-Show-blockstate-location-if-we-failed-to-read-it.patch
rename to Spigot-Server-Patches/0360-Show-blockstate-location-if-we-failed-to-read-it.patch
diff --git a/Spigot-Server-Patches/0360-Synchronize-DataPaletteBlock-instead-of-ReentrantLoc.patch b/Spigot-Server-Patches/0361-Synchronize-DataPaletteBlock-instead-of-ReentrantLoc.patch
similarity index 100%
rename from Spigot-Server-Patches/0360-Synchronize-DataPaletteBlock-instead-of-ReentrantLoc.patch
rename to Spigot-Server-Patches/0361-Synchronize-DataPaletteBlock-instead-of-ReentrantLoc.patch
diff --git a/Spigot-Server-Patches/0361-incremental-chunk-saving.patch b/Spigot-Server-Patches/0362-incremental-chunk-saving.patch
similarity index 100%
rename from Spigot-Server-Patches/0361-incremental-chunk-saving.patch
rename to Spigot-Server-Patches/0362-incremental-chunk-saving.patch
diff --git a/Spigot-Server-Patches/0362-Anti-Xray.patch b/Spigot-Server-Patches/0363-Anti-Xray.patch
similarity index 100%
rename from Spigot-Server-Patches/0362-Anti-Xray.patch
rename to Spigot-Server-Patches/0363-Anti-Xray.patch
diff --git a/Spigot-Server-Patches/0363-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/Spigot-Server-Patches/0364-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
similarity index 100%
rename from Spigot-Server-Patches/0363-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
rename to Spigot-Server-Patches/0364-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
diff --git a/Spigot-Server-Patches/0364-Configurable-projectile-relative-velocity.patch b/Spigot-Server-Patches/0365-Configurable-projectile-relative-velocity.patch
similarity index 100%
rename from Spigot-Server-Patches/0364-Configurable-projectile-relative-velocity.patch
rename to Spigot-Server-Patches/0365-Configurable-projectile-relative-velocity.patch
diff --git a/Spigot-Server-Patches/0365-Mark-entities-as-being-ticked-when-notifying-navigat.patch b/Spigot-Server-Patches/0366-Mark-entities-as-being-ticked-when-notifying-navigat.patch
similarity index 100%
rename from Spigot-Server-Patches/0365-Mark-entities-as-being-ticked-when-notifying-navigat.patch
rename to Spigot-Server-Patches/0366-Mark-entities-as-being-ticked-when-notifying-navigat.patch
diff --git a/Spigot-Server-Patches/0366-offset-item-frame-ticking.patch b/Spigot-Server-Patches/0367-offset-item-frame-ticking.patch
similarity index 100%
rename from Spigot-Server-Patches/0366-offset-item-frame-ticking.patch
rename to Spigot-Server-Patches/0367-offset-item-frame-ticking.patch
diff --git a/Spigot-Server-Patches/0367-Avoid-hopper-searches-if-there-are-no-items.patch b/Spigot-Server-Patches/0368-Avoid-hopper-searches-if-there-are-no-items.patch
similarity index 100%
rename from Spigot-Server-Patches/0367-Avoid-hopper-searches-if-there-are-no-items.patch
rename to Spigot-Server-Patches/0368-Avoid-hopper-searches-if-there-are-no-items.patch
diff --git a/Spigot-Server-Patches/0368-Asynchronous-chunk-IO-and-loading.patch b/Spigot-Server-Patches/0369-Asynchronous-chunk-IO-and-loading.patch
similarity index 99%
rename from Spigot-Server-Patches/0368-Asynchronous-chunk-IO-and-loading.patch
rename to Spigot-Server-Patches/0369-Asynchronous-chunk-IO-and-loading.patch
index ef1e4569a2..3750b411db 100644
--- a/Spigot-Server-Patches/0368-Asynchronous-chunk-IO-and-loading.patch
+++ b/Spigot-Server-Patches/0369-Asynchronous-chunk-IO-and-loading.patch
@@ -199,7 +199,7 @@ index 9ead9b1ea1fafaa3d684c17efbae747386b7c587..9b8b49be032d7ceebcea8d7b98f999ed
                  doChunkInfo(sender, args);
                  break;
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 92386af0dc3e308b93fd4fa04ffe32ac9f76e272..56f6b567bd4727861be0ce27f3ac82bc8c0a90e9 100644
+index 3c034d0354bbc3cb7bd68d499ed01b96f79eeeb8..0f4b4b26bda48084dacff2bf79cc6df288405607 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -1,5 +1,6 @@
@@ -209,7 +209,7 @@ index 92386af0dc3e308b93fd4fa04ffe32ac9f76e272..56f6b567bd4727861be0ce27f3ac82bc
  import com.google.common.base.Strings;
  import com.google.common.base.Throwables;
  
-@@ -338,4 +339,54 @@ public class PaperConfig {
+@@ -347,4 +348,54 @@ public class PaperConfig {
          maxBookPageSize = getInt("settings.book-size.page-max", maxBookPageSize);
          maxBookTotalSizeMultiplier = getDouble("settings.book-size.total-multiplier", maxBookTotalSizeMultiplier);
      }
diff --git a/Spigot-Server-Patches/0369-Use-getChunkIfLoadedImmediately-in-places.patch b/Spigot-Server-Patches/0370-Use-getChunkIfLoadedImmediately-in-places.patch
similarity index 100%
rename from Spigot-Server-Patches/0369-Use-getChunkIfLoadedImmediately-in-places.patch
rename to Spigot-Server-Patches/0370-Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/Spigot-Server-Patches/0370-Reduce-sync-loads.patch b/Spigot-Server-Patches/0371-Reduce-sync-loads.patch
similarity index 100%
rename from Spigot-Server-Patches/0370-Reduce-sync-loads.patch
rename to Spigot-Server-Patches/0371-Reduce-sync-loads.patch
diff --git a/Spigot-Server-Patches/0371-Implement-alternative-item-despawn-rate.patch b/Spigot-Server-Patches/0372-Implement-alternative-item-despawn-rate.patch
similarity index 100%
rename from Spigot-Server-Patches/0371-Implement-alternative-item-despawn-rate.patch
rename to Spigot-Server-Patches/0372-Implement-alternative-item-despawn-rate.patch
diff --git a/Spigot-Server-Patches/0372-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch b/Spigot-Server-Patches/0373-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
similarity index 96%
rename from Spigot-Server-Patches/0372-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
rename to Spigot-Server-Patches/0373-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
index 300f5153da..eb6e4b0a10 100644
--- a/Spigot-Server-Patches/0372-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
+++ b/Spigot-Server-Patches/0373-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
@@ -7,7 +7,7 @@ If the Bukkit generator already has a spawn, use it immediately instead
 of spending time generating one that we won't use
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 416658a2ddfb11c4a6929807b4e9d8bd8f708e2d..bf3da57c1e709acb3fa9243fb3bb6eaf0613f145 100644
+index 23d700d055b0c80a412be349ed1c877792187eb8..62b28103f26377a71c61d9282ac65de05286adca 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -509,12 +509,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
diff --git a/Spigot-Server-Patches/0373-Fix-MC-158900.patch b/Spigot-Server-Patches/0374-Fix-MC-158900.patch
similarity index 100%
rename from Spigot-Server-Patches/0373-Fix-MC-158900.patch
rename to Spigot-Server-Patches/0374-Fix-MC-158900.patch
diff --git a/Spigot-Server-Patches/0374-implement-optional-per-player-mob-spawns.patch b/Spigot-Server-Patches/0375-implement-optional-per-player-mob-spawns.patch
similarity index 99%
rename from Spigot-Server-Patches/0374-implement-optional-per-player-mob-spawns.patch
rename to Spigot-Server-Patches/0375-implement-optional-per-player-mob-spawns.patch
index 0f3b11ba63..dd58bd5410 100644
--- a/Spigot-Server-Patches/0374-implement-optional-per-player-mob-spawns.patch
+++ b/Spigot-Server-Patches/0375-implement-optional-per-player-mob-spawns.patch
@@ -573,7 +573,7 @@ index 7278e39d7fb47737b783c482f4c74a82ded163f8..5b60777c63d54b74b3de5a7373f64ba9
  
              this.p = spawnercreature_d;
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index c776f9bf65dedab951e3176bd74f854522503024..147af78e4bf95dd4f3f346b839287e37c0f3b8e1 100644
+index 1a8d8bc120fec876c528029dcc2804519caa569f..bb79467c6bb0ed44057802dde6cd40fa81c8d4fd 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -89,6 +89,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0375-Prevent-consuming-the-wrong-itemstack.patch b/Spigot-Server-Patches/0376-Prevent-consuming-the-wrong-itemstack.patch
similarity index 100%
rename from Spigot-Server-Patches/0375-Prevent-consuming-the-wrong-itemstack.patch
rename to Spigot-Server-Patches/0376-Prevent-consuming-the-wrong-itemstack.patch
diff --git a/Spigot-Server-Patches/0376-Fix-nether-portal-creation.patch b/Spigot-Server-Patches/0377-Fix-nether-portal-creation.patch
similarity index 100%
rename from Spigot-Server-Patches/0376-Fix-nether-portal-creation.patch
rename to Spigot-Server-Patches/0377-Fix-nether-portal-creation.patch
diff --git a/Spigot-Server-Patches/0377-Generator-Settings.patch b/Spigot-Server-Patches/0378-Generator-Settings.patch
similarity index 100%
rename from Spigot-Server-Patches/0377-Generator-Settings.patch
rename to Spigot-Server-Patches/0378-Generator-Settings.patch
diff --git a/Spigot-Server-Patches/0378-Fix-MC-161754.patch b/Spigot-Server-Patches/0379-Fix-MC-161754.patch
similarity index 100%
rename from Spigot-Server-Patches/0378-Fix-MC-161754.patch
rename to Spigot-Server-Patches/0379-Fix-MC-161754.patch
diff --git a/Spigot-Server-Patches/0379-Performance-improvement-for-Chunk.getEntities.patch b/Spigot-Server-Patches/0380-Performance-improvement-for-Chunk.getEntities.patch
similarity index 100%
rename from Spigot-Server-Patches/0379-Performance-improvement-for-Chunk.getEntities.patch
rename to Spigot-Server-Patches/0380-Performance-improvement-for-Chunk.getEntities.patch
diff --git a/Spigot-Server-Patches/0380-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch b/Spigot-Server-Patches/0381-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
similarity index 100%
rename from Spigot-Server-Patches/0380-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
rename to Spigot-Server-Patches/0381-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
diff --git a/Spigot-Server-Patches/0381-Expose-the-internal-current-tick.patch b/Spigot-Server-Patches/0382-Expose-the-internal-current-tick.patch
similarity index 100%
rename from Spigot-Server-Patches/0381-Expose-the-internal-current-tick.patch
rename to Spigot-Server-Patches/0382-Expose-the-internal-current-tick.patch
diff --git a/Spigot-Server-Patches/0382-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch b/Spigot-Server-Patches/0383-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
similarity index 94%
rename from Spigot-Server-Patches/0382-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
rename to Spigot-Server-Patches/0383-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
index 7c52e071d5..a6b4675a6a 100644
--- a/Spigot-Server-Patches/0382-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
+++ b/Spigot-Server-Patches/0383-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix stuck in sneak when changing worlds (MC-10657)
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 147af78e4bf95dd4f3f346b839287e37c0f3b8e1..7d9b882d4532df24aeaa8a128569cf1634fdb9d1 100644
+index bb79467c6bb0ed44057802dde6cd40fa81c8d4fd..ee53d2cf4cf893911d851a3a011861b020799ba3 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -946,6 +946,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0383-Add-option-to-disable-pillager-patrols.patch b/Spigot-Server-Patches/0384-Add-option-to-disable-pillager-patrols.patch
similarity index 100%
rename from Spigot-Server-Patches/0383-Add-option-to-disable-pillager-patrols.patch
rename to Spigot-Server-Patches/0384-Add-option-to-disable-pillager-patrols.patch
diff --git a/Spigot-Server-Patches/0384-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch b/Spigot-Server-Patches/0385-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
similarity index 100%
rename from Spigot-Server-Patches/0384-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
rename to Spigot-Server-Patches/0385-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
diff --git a/Spigot-Server-Patches/0385-PlayerLaunchProjectileEvent.patch b/Spigot-Server-Patches/0386-PlayerLaunchProjectileEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0385-PlayerLaunchProjectileEvent.patch
rename to Spigot-Server-Patches/0386-PlayerLaunchProjectileEvent.patch
diff --git a/Spigot-Server-Patches/0386-Add-CraftMagicNumbers.isSupportedApiVersion.patch b/Spigot-Server-Patches/0387-Add-CraftMagicNumbers.isSupportedApiVersion.patch
similarity index 100%
rename from Spigot-Server-Patches/0386-Add-CraftMagicNumbers.isSupportedApiVersion.patch
rename to Spigot-Server-Patches/0387-Add-CraftMagicNumbers.isSupportedApiVersion.patch
diff --git a/Spigot-Server-Patches/0387-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/Spigot-Server-Patches/0388-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
similarity index 100%
rename from Spigot-Server-Patches/0387-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
rename to Spigot-Server-Patches/0388-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
diff --git a/Spigot-Server-Patches/0388-MC-145656-Fix-Follow-Range-Initial-Target.patch b/Spigot-Server-Patches/0389-MC-145656-Fix-Follow-Range-Initial-Target.patch
similarity index 100%
rename from Spigot-Server-Patches/0388-MC-145656-Fix-Follow-Range-Initial-Target.patch
rename to Spigot-Server-Patches/0389-MC-145656-Fix-Follow-Range-Initial-Target.patch
diff --git a/Spigot-Server-Patches/0389-Optimize-Hoppers.patch b/Spigot-Server-Patches/0390-Optimize-Hoppers.patch
similarity index 100%
rename from Spigot-Server-Patches/0389-Optimize-Hoppers.patch
rename to Spigot-Server-Patches/0390-Optimize-Hoppers.patch
diff --git a/Spigot-Server-Patches/0390-PlayerDeathEvent-shouldDropExperience.patch b/Spigot-Server-Patches/0391-PlayerDeathEvent-shouldDropExperience.patch
similarity index 90%
rename from Spigot-Server-Patches/0390-PlayerDeathEvent-shouldDropExperience.patch
rename to Spigot-Server-Patches/0391-PlayerDeathEvent-shouldDropExperience.patch
index 1148f4ebd4..738aadd99e 100644
--- a/Spigot-Server-Patches/0390-PlayerDeathEvent-shouldDropExperience.patch
+++ b/Spigot-Server-Patches/0391-PlayerDeathEvent-shouldDropExperience.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerDeathEvent#shouldDropExperience
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 7d9b882d4532df24aeaa8a128569cf1634fdb9d1..d06dd36bd83f6f2f785e5262dd67928eb6afd70a 100644
+index ee53d2cf4cf893911d851a3a011861b020799ba3..d1be6ef1a04c8bc98929421e73c0712086f147d5 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -695,7 +695,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0391-Prevent-bees-loading-chunks-checking-hive-position.patch b/Spigot-Server-Patches/0392-Prevent-bees-loading-chunks-checking-hive-position.patch
similarity index 100%
rename from Spigot-Server-Patches/0391-Prevent-bees-loading-chunks-checking-hive-position.patch
rename to Spigot-Server-Patches/0392-Prevent-bees-loading-chunks-checking-hive-position.patch
diff --git a/Spigot-Server-Patches/0392-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/Spigot-Server-Patches/0393-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
similarity index 100%
rename from Spigot-Server-Patches/0392-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
rename to Spigot-Server-Patches/0393-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
diff --git a/Spigot-Server-Patches/0393-Guard-against-serializing-mismatching-chunk-coordina.patch b/Spigot-Server-Patches/0394-Guard-against-serializing-mismatching-chunk-coordina.patch
similarity index 100%
rename from Spigot-Server-Patches/0393-Guard-against-serializing-mismatching-chunk-coordina.patch
rename to Spigot-Server-Patches/0394-Guard-against-serializing-mismatching-chunk-coordina.patch
diff --git a/Spigot-Server-Patches/0394-Optimise-IEntityAccess-getPlayerByUUID.patch b/Spigot-Server-Patches/0395-Optimise-IEntityAccess-getPlayerByUUID.patch
similarity index 100%
rename from Spigot-Server-Patches/0394-Optimise-IEntityAccess-getPlayerByUUID.patch
rename to Spigot-Server-Patches/0395-Optimise-IEntityAccess-getPlayerByUUID.patch
diff --git a/Spigot-Server-Patches/0395-Fix-items-not-falling-correctly.patch b/Spigot-Server-Patches/0396-Fix-items-not-falling-correctly.patch
similarity index 100%
rename from Spigot-Server-Patches/0395-Fix-items-not-falling-correctly.patch
rename to Spigot-Server-Patches/0396-Fix-items-not-falling-correctly.patch
diff --git a/Spigot-Server-Patches/0396-Lag-compensate-eating.patch b/Spigot-Server-Patches/0397-Lag-compensate-eating.patch
similarity index 100%
rename from Spigot-Server-Patches/0396-Lag-compensate-eating.patch
rename to Spigot-Server-Patches/0397-Lag-compensate-eating.patch
diff --git a/Spigot-Server-Patches/0397-Optimize-call-to-getFluid-for-explosions.patch b/Spigot-Server-Patches/0398-Optimize-call-to-getFluid-for-explosions.patch
similarity index 100%
rename from Spigot-Server-Patches/0397-Optimize-call-to-getFluid-for-explosions.patch
rename to Spigot-Server-Patches/0398-Optimize-call-to-getFluid-for-explosions.patch
diff --git a/Spigot-Server-Patches/0398-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/Spigot-Server-Patches/0399-Fix-last-firework-in-stack-not-having-effects-when-d.patch
similarity index 100%
rename from Spigot-Server-Patches/0398-Fix-last-firework-in-stack-not-having-effects-when-d.patch
rename to Spigot-Server-Patches/0399-Fix-last-firework-in-stack-not-having-effects-when-d.patch
diff --git a/Spigot-Server-Patches/0399-Add-effect-to-block-break-naturally.patch b/Spigot-Server-Patches/0400-Add-effect-to-block-break-naturally.patch
similarity index 100%
rename from Spigot-Server-Patches/0399-Add-effect-to-block-break-naturally.patch
rename to Spigot-Server-Patches/0400-Add-effect-to-block-break-naturally.patch
diff --git a/Spigot-Server-Patches/0400-Tracking-Range-Improvements.patch b/Spigot-Server-Patches/0401-Tracking-Range-Improvements.patch
similarity index 100%
rename from Spigot-Server-Patches/0400-Tracking-Range-Improvements.patch
rename to Spigot-Server-Patches/0401-Tracking-Range-Improvements.patch
diff --git a/Spigot-Server-Patches/0401-Entity-Activation-Range-2.0.patch b/Spigot-Server-Patches/0402-Entity-Activation-Range-2.0.patch
similarity index 100%
rename from Spigot-Server-Patches/0401-Entity-Activation-Range-2.0.patch
rename to Spigot-Server-Patches/0402-Entity-Activation-Range-2.0.patch
diff --git a/Spigot-Server-Patches/0402-Fix-items-vanishing-through-end-portal.patch b/Spigot-Server-Patches/0403-Fix-items-vanishing-through-end-portal.patch
similarity index 100%
rename from Spigot-Server-Patches/0402-Fix-items-vanishing-through-end-portal.patch
rename to Spigot-Server-Patches/0403-Fix-items-vanishing-through-end-portal.patch
diff --git a/Spigot-Server-Patches/0403-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/Spigot-Server-Patches/0404-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
similarity index 100%
rename from Spigot-Server-Patches/0403-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
rename to Spigot-Server-Patches/0404-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
diff --git a/Spigot-Server-Patches/0404-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/Spigot-Server-Patches/0405-Optimise-getChunkAt-calls-for-loaded-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0404-Optimise-getChunkAt-calls-for-loaded-chunks.patch
rename to Spigot-Server-Patches/0405-Optimise-getChunkAt-calls-for-loaded-chunks.patch
diff --git a/Spigot-Server-Patches/0405-Allow-overriding-the-java-version-check.patch b/Spigot-Server-Patches/0406-Allow-overriding-the-java-version-check.patch
similarity index 100%
rename from Spigot-Server-Patches/0405-Allow-overriding-the-java-version-check.patch
rename to Spigot-Server-Patches/0406-Allow-overriding-the-java-version-check.patch
diff --git a/Spigot-Server-Patches/0406-Add-ThrownEggHatchEvent.patch b/Spigot-Server-Patches/0407-Add-ThrownEggHatchEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0406-Add-ThrownEggHatchEvent.patch
rename to Spigot-Server-Patches/0407-Add-ThrownEggHatchEvent.patch
diff --git a/Spigot-Server-Patches/0407-Optimise-random-block-ticking.patch b/Spigot-Server-Patches/0408-Optimise-random-block-ticking.patch
similarity index 100%
rename from Spigot-Server-Patches/0407-Optimise-random-block-ticking.patch
rename to Spigot-Server-Patches/0408-Optimise-random-block-ticking.patch
diff --git a/Spigot-Server-Patches/0408-Entity-Jump-API.patch b/Spigot-Server-Patches/0409-Entity-Jump-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0408-Entity-Jump-API.patch
rename to Spigot-Server-Patches/0409-Entity-Jump-API.patch
diff --git a/Spigot-Server-Patches/0409-Add-option-to-nerf-pigmen-from-nether-portals.patch b/Spigot-Server-Patches/0410-Add-option-to-nerf-pigmen-from-nether-portals.patch
similarity index 100%
rename from Spigot-Server-Patches/0409-Add-option-to-nerf-pigmen-from-nether-portals.patch
rename to Spigot-Server-Patches/0410-Add-option-to-nerf-pigmen-from-nether-portals.patch
diff --git a/Spigot-Server-Patches/0410-Make-the-GUI-graph-fancier.patch b/Spigot-Server-Patches/0411-Make-the-GUI-graph-fancier.patch
similarity index 99%
rename from Spigot-Server-Patches/0410-Make-the-GUI-graph-fancier.patch
rename to Spigot-Server-Patches/0411-Make-the-GUI-graph-fancier.patch
index 22479f6f0c..80bd2da98e 100644
--- a/Spigot-Server-Patches/0410-Make-the-GUI-graph-fancier.patch
+++ b/Spigot-Server-Patches/0411-Make-the-GUI-graph-fancier.patch
@@ -398,7 +398,7 @@ index d4d5bc19e167a5271f8eb8d010f8a52b23b942df..859e31c63f94bdc7729c6d475990750b
      });
      private final int[] b = new int[256];
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 7edc7bfe804a9b450d5873444923d26ffaa96ba0..e57bda6223966171f15e0c6c24680a54c0edd83d 100644
+index 63b0cc9d355d0a8e578514cc14ffe7729023c22c..60b018fb6865a4b73f944cffd79e7d246636360b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -106,7 +106,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
diff --git a/Spigot-Server-Patches/0411-add-hand-to-BlockMultiPlaceEvent.patch b/Spigot-Server-Patches/0412-add-hand-to-BlockMultiPlaceEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0411-add-hand-to-BlockMultiPlaceEvent.patch
rename to Spigot-Server-Patches/0412-add-hand-to-BlockMultiPlaceEvent.patch
diff --git a/Spigot-Server-Patches/0412-Prevent-teleporting-dead-entities.patch b/Spigot-Server-Patches/0413-Prevent-teleporting-dead-entities.patch
similarity index 100%
rename from Spigot-Server-Patches/0412-Prevent-teleporting-dead-entities.patch
rename to Spigot-Server-Patches/0413-Prevent-teleporting-dead-entities.patch
diff --git a/Spigot-Server-Patches/0413-Validate-tripwire-hook-placement-before-update.patch b/Spigot-Server-Patches/0414-Validate-tripwire-hook-placement-before-update.patch
similarity index 100%
rename from Spigot-Server-Patches/0413-Validate-tripwire-hook-placement-before-update.patch
rename to Spigot-Server-Patches/0414-Validate-tripwire-hook-placement-before-update.patch
diff --git a/Spigot-Server-Patches/0414-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/Spigot-Server-Patches/0415-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
similarity index 100%
rename from Spigot-Server-Patches/0414-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
rename to Spigot-Server-Patches/0415-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
diff --git a/Spigot-Server-Patches/0415-Configurable-chance-of-villager-zombie-infection.patch b/Spigot-Server-Patches/0416-Configurable-chance-of-villager-zombie-infection.patch
similarity index 100%
rename from Spigot-Server-Patches/0415-Configurable-chance-of-villager-zombie-infection.patch
rename to Spigot-Server-Patches/0416-Configurable-chance-of-villager-zombie-infection.patch
diff --git a/Spigot-Server-Patches/0416-Optimise-Chunk-getFluid.patch b/Spigot-Server-Patches/0417-Optimise-Chunk-getFluid.patch
similarity index 100%
rename from Spigot-Server-Patches/0416-Optimise-Chunk-getFluid.patch
rename to Spigot-Server-Patches/0417-Optimise-Chunk-getFluid.patch
diff --git a/Spigot-Server-Patches/0417-Optimise-TickListServer-by-rewriting-it.patch b/Spigot-Server-Patches/0418-Optimise-TickListServer-by-rewriting-it.patch
similarity index 99%
rename from Spigot-Server-Patches/0417-Optimise-TickListServer-by-rewriting-it.patch
rename to Spigot-Server-Patches/0418-Optimise-TickListServer-by-rewriting-it.patch
index 5652a39b69..ad8207c15a 100644
--- a/Spigot-Server-Patches/0417-Optimise-TickListServer-by-rewriting-it.patch
+++ b/Spigot-Server-Patches/0418-Optimise-TickListServer-by-rewriting-it.patch
@@ -42,10 +42,10 @@ sets the excessive tick delay to the specified ticks (defaults to
 60 * 20 ticks, aka 60 seconds)
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 56f6b567bd4727861be0ce27f3ac82bc8c0a90e9..746e82de894b4dbb79353790d1b7368f528ebe89 100644
+index 0f4b4b26bda48084dacff2bf79cc6df288405607..2901236b1c6bd5d27c9d40f9e5b3756144e14faa 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -340,6 +340,13 @@ public class PaperConfig {
+@@ -349,6 +349,13 @@ public class PaperConfig {
          maxBookTotalSizeMultiplier = getDouble("settings.book-size.total-multiplier", maxBookTotalSizeMultiplier);
      }
  
diff --git a/Spigot-Server-Patches/0418-Pillager-patrol-spawn-settings-and-per-player-option.patch b/Spigot-Server-Patches/0419-Pillager-patrol-spawn-settings-and-per-player-option.patch
similarity index 98%
rename from Spigot-Server-Patches/0418-Pillager-patrol-spawn-settings-and-per-player-option.patch
rename to Spigot-Server-Patches/0419-Pillager-patrol-spawn-settings-and-per-player-option.patch
index 35dfcd8740..88ba42a0a4 100644
--- a/Spigot-Server-Patches/0418-Pillager-patrol-spawn-settings-and-per-player-option.patch
+++ b/Spigot-Server-Patches/0419-Pillager-patrol-spawn-settings-and-per-player-option.patch
@@ -36,7 +36,7 @@ index 7a15bbf1bdb965bdfc71f03b2e2b9add06200e72..29eaa572648113216a267462a79da7e3
      private void entitiesTargetWithFollowRange() {
          entitiesTargetWithFollowRange = getBoolean("entities-target-with-follow-range", entitiesTargetWithFollowRange);
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index d06dd36bd83f6f2f785e5262dd67928eb6afd70a..19b8bc22d784f21bbc9cebb9689abda70de808f9 100644
+index d1be6ef1a04c8bc98929421e73c0712086f147d5..371063fb37a354a4c23601aa2ba787dd65380ce4 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -85,6 +85,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0419-Ensure-Entity-is-never-double-registered.patch b/Spigot-Server-Patches/0420-Ensure-Entity-is-never-double-registered.patch
similarity index 100%
rename from Spigot-Server-Patches/0419-Ensure-Entity-is-never-double-registered.patch
rename to Spigot-Server-Patches/0420-Ensure-Entity-is-never-double-registered.patch
diff --git a/Spigot-Server-Patches/0420-Fix-unregistering-entities-from-unloading-chunks.patch b/Spigot-Server-Patches/0421-Fix-unregistering-entities-from-unloading-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0420-Fix-unregistering-entities-from-unloading-chunks.patch
rename to Spigot-Server-Patches/0421-Fix-unregistering-entities-from-unloading-chunks.patch
diff --git a/Spigot-Server-Patches/0421-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/Spigot-Server-Patches/0422-Remote-Connections-shouldn-t-hold-up-shutdown.patch
similarity index 100%
rename from Spigot-Server-Patches/0421-Remote-Connections-shouldn-t-hold-up-shutdown.patch
rename to Spigot-Server-Patches/0422-Remote-Connections-shouldn-t-hold-up-shutdown.patch
diff --git a/Spigot-Server-Patches/0422-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/Spigot-Server-Patches/0423-Do-not-allow-bees-to-load-chunks-for-beehives.patch
similarity index 100%
rename from Spigot-Server-Patches/0422-Do-not-allow-bees-to-load-chunks-for-beehives.patch
rename to Spigot-Server-Patches/0423-Do-not-allow-bees-to-load-chunks-for-beehives.patch
diff --git a/Spigot-Server-Patches/0423-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/Spigot-Server-Patches/0424-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
similarity index 100%
rename from Spigot-Server-Patches/0423-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
rename to Spigot-Server-Patches/0424-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
diff --git a/Spigot-Server-Patches/0424-Optimize-Collision-to-not-load-chunks.patch b/Spigot-Server-Patches/0425-Optimize-Collision-to-not-load-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0424-Optimize-Collision-to-not-load-chunks.patch
rename to Spigot-Server-Patches/0425-Optimize-Collision-to-not-load-chunks.patch
diff --git a/Spigot-Server-Patches/0425-Don-t-tick-dead-players.patch b/Spigot-Server-Patches/0426-Don-t-tick-dead-players.patch
similarity index 91%
rename from Spigot-Server-Patches/0425-Don-t-tick-dead-players.patch
rename to Spigot-Server-Patches/0426-Don-t-tick-dead-players.patch
index 80cd88f939..bb318acf2f 100644
--- a/Spigot-Server-Patches/0425-Don-t-tick-dead-players.patch
+++ b/Spigot-Server-Patches/0426-Don-t-tick-dead-players.patch
@@ -7,7 +7,7 @@ Causes sync chunk loads and who knows what all else.
 This is safe because Spectators are skipped in unloaded chunks too in vanilla.
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 19b8bc22d784f21bbc9cebb9689abda70de808f9..fdaff4b1aeb463ea6dbad3bd0e228c1b2fa4662c 100644
+index 371063fb37a354a4c23601aa2ba787dd65380ce4..f238ac3a57815539b6913a026e0e2e1bdba7ae84 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -476,7 +476,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0426-Dead-Player-s-shouldn-t-be-able-to-move.patch b/Spigot-Server-Patches/0427-Dead-Player-s-shouldn-t-be-able-to-move.patch
similarity index 100%
rename from Spigot-Server-Patches/0426-Dead-Player-s-shouldn-t-be-able-to-move.patch
rename to Spigot-Server-Patches/0427-Dead-Player-s-shouldn-t-be-able-to-move.patch
diff --git a/Spigot-Server-Patches/0427-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch b/Spigot-Server-Patches/0428-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0427-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
rename to Spigot-Server-Patches/0428-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
diff --git a/Spigot-Server-Patches/0428-Increase-Light-Queue-Size.patch b/Spigot-Server-Patches/0429-Increase-Light-Queue-Size.patch
similarity index 100%
rename from Spigot-Server-Patches/0428-Increase-Light-Queue-Size.patch
rename to Spigot-Server-Patches/0429-Increase-Light-Queue-Size.patch
diff --git a/Spigot-Server-Patches/0429-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch b/Spigot-Server-Patches/0430-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
similarity index 98%
rename from Spigot-Server-Patches/0429-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
rename to Spigot-Server-Patches/0430-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
index e9f8761f80..16ce345d39 100644
--- a/Spigot-Server-Patches/0429-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
+++ b/Spigot-Server-Patches/0430-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
@@ -42,10 +42,10 @@ index 11fe3524f38f7756ebd0e3807678e8848fd2217d..884b59d478aa7de49906520e77866a79
      public static final Timing commandFunctionsTimer = Timings.ofSafe("Command Functions");
      public static final Timing connectionTimer = Timings.ofSafe("Connection Handler");
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 746e82de894b4dbb79353790d1b7368f528ebe89..07a005d7f408d65e641a97b81bf7bc0a21b1d3f7 100644
+index 2901236b1c6bd5d27c9d40f9e5b3756144e14faa..56b32e2319c5f89d12c0ca4ea0211c6d7cbb366f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -396,4 +396,9 @@ public class PaperConfig {
+@@ -405,4 +405,9 @@ public class PaperConfig {
              log("Async Chunks: Enabled - Chunks will be loaded much faster, without lag.");
          }
      }
diff --git a/Spigot-Server-Patches/0430-Don-t-move-existing-players-to-world-spawn.patch b/Spigot-Server-Patches/0431-Don-t-move-existing-players-to-world-spawn.patch
similarity index 96%
rename from Spigot-Server-Patches/0430-Don-t-move-existing-players-to-world-spawn.patch
rename to Spigot-Server-Patches/0431-Don-t-move-existing-players-to-world-spawn.patch
index 49a0ae60d8..6197d8718d 100644
--- a/Spigot-Server-Patches/0430-Don-t-move-existing-players-to-world-spawn.patch
+++ b/Spigot-Server-Patches/0431-Don-t-move-existing-players-to-world-spawn.patch
@@ -10,7 +10,7 @@ larger than the keep loaded range.
 By skipping this, we avoid potential for a large spike on server start.
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index fdaff4b1aeb463ea6dbad3bd0e228c1b2fa4662c..fc32cab15786d3c7b05e190ed3062de6bcb1fd10 100644
+index f238ac3a57815539b6913a026e0e2e1bdba7ae84..a46f8573467f8a64a76532237072094460491938 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -122,7 +122,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0431-Add-tick-times-API-and-mspt-command.patch b/Spigot-Server-Patches/0432-Add-tick-times-API-and-mspt-command.patch
similarity index 98%
rename from Spigot-Server-Patches/0431-Add-tick-times-API-and-mspt-command.patch
rename to Spigot-Server-Patches/0432-Add-tick-times-API-and-mspt-command.patch
index 61ced4d16f..d4a877bd1b 100644
--- a/Spigot-Server-Patches/0431-Add-tick-times-API-and-mspt-command.patch
+++ b/Spigot-Server-Patches/0432-Add-tick-times-API-and-mspt-command.patch
@@ -75,7 +75,7 @@ index 0000000000000000000000000000000000000000..d0211d4f39f9d6af1d751ac66342b42c
 +    }
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 07a005d7f408d65e641a97b81bf7bc0a21b1d3f7..73bd85de76d28e5100601a0c9b0d32deb873626e 100644
+index 56b32e2319c5f89d12c0ca4ea0211c6d7cbb366f..273ed1c5537a69256f1020646f5cd0c13d50f170 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -69,6 +69,7 @@ public class PaperConfig {
diff --git a/Spigot-Server-Patches/0432-Expose-MinecraftServer-isRunning.patch b/Spigot-Server-Patches/0433-Expose-MinecraftServer-isRunning.patch
similarity index 100%
rename from Spigot-Server-Patches/0432-Expose-MinecraftServer-isRunning.patch
rename to Spigot-Server-Patches/0433-Expose-MinecraftServer-isRunning.patch
diff --git a/Spigot-Server-Patches/0433-Add-Raw-Byte-ItemStack-Serialization.patch b/Spigot-Server-Patches/0434-Add-Raw-Byte-ItemStack-Serialization.patch
similarity index 100%
rename from Spigot-Server-Patches/0433-Add-Raw-Byte-ItemStack-Serialization.patch
rename to Spigot-Server-Patches/0434-Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/Spigot-Server-Patches/0434-Remove-streams-from-Mob-AI-System.patch b/Spigot-Server-Patches/0435-Remove-streams-from-Mob-AI-System.patch
similarity index 100%
rename from Spigot-Server-Patches/0434-Remove-streams-from-Mob-AI-System.patch
rename to Spigot-Server-Patches/0435-Remove-streams-from-Mob-AI-System.patch
diff --git a/Spigot-Server-Patches/0435-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch b/Spigot-Server-Patches/0436-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch
similarity index 100%
rename from Spigot-Server-Patches/0435-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch
rename to Spigot-Server-Patches/0436-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch
diff --git a/Spigot-Server-Patches/0436-Async-command-map-building.patch b/Spigot-Server-Patches/0437-Async-command-map-building.patch
similarity index 100%
rename from Spigot-Server-Patches/0436-Async-command-map-building.patch
rename to Spigot-Server-Patches/0437-Async-command-map-building.patch
diff --git a/Spigot-Server-Patches/0437-Improved-Watchdog-Support.patch b/Spigot-Server-Patches/0438-Improved-Watchdog-Support.patch
similarity index 100%
rename from Spigot-Server-Patches/0437-Improved-Watchdog-Support.patch
rename to Spigot-Server-Patches/0438-Improved-Watchdog-Support.patch
diff --git a/Spigot-Server-Patches/0438-Optimize-Pathfinding.patch b/Spigot-Server-Patches/0439-Optimize-Pathfinding.patch
similarity index 100%
rename from Spigot-Server-Patches/0438-Optimize-Pathfinding.patch
rename to Spigot-Server-Patches/0439-Optimize-Pathfinding.patch
diff --git a/Spigot-Server-Patches/0439-Reduce-Either-Optional-allocation.patch b/Spigot-Server-Patches/0440-Reduce-Either-Optional-allocation.patch
similarity index 100%
rename from Spigot-Server-Patches/0439-Reduce-Either-Optional-allocation.patch
rename to Spigot-Server-Patches/0440-Reduce-Either-Optional-allocation.patch
diff --git a/Spigot-Server-Patches/0440-Remove-streams-from-PairedQueue.patch b/Spigot-Server-Patches/0441-Remove-streams-from-PairedQueue.patch
similarity index 100%
rename from Spigot-Server-Patches/0440-Remove-streams-from-PairedQueue.patch
rename to Spigot-Server-Patches/0441-Remove-streams-from-PairedQueue.patch
diff --git a/Spigot-Server-Patches/0441-Reduce-memory-footprint-of-NBTTagCompound.patch b/Spigot-Server-Patches/0442-Reduce-memory-footprint-of-NBTTagCompound.patch
similarity index 100%
rename from Spigot-Server-Patches/0441-Reduce-memory-footprint-of-NBTTagCompound.patch
rename to Spigot-Server-Patches/0442-Reduce-memory-footprint-of-NBTTagCompound.patch
diff --git a/Spigot-Server-Patches/0442-Prevent-opening-inventories-when-frozen.patch b/Spigot-Server-Patches/0443-Prevent-opening-inventories-when-frozen.patch
similarity index 97%
rename from Spigot-Server-Patches/0442-Prevent-opening-inventories-when-frozen.patch
rename to Spigot-Server-Patches/0443-Prevent-opening-inventories-when-frozen.patch
index 4d4e414064..a5fe9795ad 100644
--- a/Spigot-Server-Patches/0442-Prevent-opening-inventories-when-frozen.patch
+++ b/Spigot-Server-Patches/0443-Prevent-opening-inventories-when-frozen.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent opening inventories when frozen
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index fc32cab15786d3c7b05e190ed3062de6bcb1fd10..a979422edfea7bcfd17e7b2251576a9592b90419 100644
+index a46f8573467f8a64a76532237072094460491938..7a791f5ea0ecb98f8b4509f79538d3f1e55703f6 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -427,7 +427,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0443-Optimise-ArraySetSorted-removeIf.patch b/Spigot-Server-Patches/0444-Optimise-ArraySetSorted-removeIf.patch
similarity index 100%
rename from Spigot-Server-Patches/0443-Optimise-ArraySetSorted-removeIf.patch
rename to Spigot-Server-Patches/0444-Optimise-ArraySetSorted-removeIf.patch
diff --git a/Spigot-Server-Patches/0444-Don-t-run-entity-collision-code-if-not-needed.patch b/Spigot-Server-Patches/0445-Don-t-run-entity-collision-code-if-not-needed.patch
similarity index 100%
rename from Spigot-Server-Patches/0444-Don-t-run-entity-collision-code-if-not-needed.patch
rename to Spigot-Server-Patches/0445-Don-t-run-entity-collision-code-if-not-needed.patch
diff --git a/Spigot-Server-Patches/0445-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch b/Spigot-Server-Patches/0446-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch
similarity index 100%
rename from Spigot-Server-Patches/0445-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch
rename to Spigot-Server-Patches/0446-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch
diff --git a/Spigot-Server-Patches/0446-Restrict-vanilla-teleport-command-to-valid-locations.patch b/Spigot-Server-Patches/0447-Restrict-vanilla-teleport-command-to-valid-locations.patch
similarity index 100%
rename from Spigot-Server-Patches/0446-Restrict-vanilla-teleport-command-to-valid-locations.patch
rename to Spigot-Server-Patches/0447-Restrict-vanilla-teleport-command-to-valid-locations.patch
diff --git a/Spigot-Server-Patches/0447-Implement-Player-Client-Options-API.patch b/Spigot-Server-Patches/0448-Implement-Player-Client-Options-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0447-Implement-Player-Client-Options-API.patch
rename to Spigot-Server-Patches/0448-Implement-Player-Client-Options-API.patch
index 3b7e668943..74d6e4c2dd 100644
--- a/Spigot-Server-Patches/0447-Implement-Player-Client-Options-API.patch
+++ b/Spigot-Server-Patches/0448-Implement-Player-Client-Options-API.patch
@@ -98,7 +98,7 @@ index 7c0d381926e5ce59ded474c65b50016d4a7feab1..caaa01b20e5b7430b809477022f8ab35
      protected static final DataWatcherObject<NBTTagCompound> bk = DataWatcher.a(EntityHuman.class, DataWatcherRegistry.p);
      protected static final DataWatcherObject<NBTTagCompound> bl = DataWatcher.a(EntityHuman.class, DataWatcherRegistry.p);
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index a979422edfea7bcfd17e7b2251576a9592b90419..5eccd9e2f243f5f5cea45f93efec3a82d61aafda 100644
+index 7a791f5ea0ecb98f8b4509f79538d3f1e55703f6..8a68f9aec04ad99632a4c81659834a9b9b433bd8 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -2,6 +2,7 @@ package net.minecraft.server;
@@ -149,7 +149,7 @@ index dbc3552d50c4129e1844c8a379ab5ba396645f52..87ec3987d4b6de836016e91ef90383e3
          return this.e;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index fa4f2df4a669df838e5c553a21b9291ed7d6b32f..a4c112844ce99e770d8ad2df5a096be39897c4ce 100644
+index b5088ad2eeef0a3fae0acb3dfea7605b9a861c73..3c24c1cc5045fbf794e605a5dd5473d8bf8e6542 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1,5 +1,8 @@
diff --git a/Spigot-Server-Patches/0448-Fix-Chunk-Post-Processing-deadlock-risk.patch b/Spigot-Server-Patches/0449-Fix-Chunk-Post-Processing-deadlock-risk.patch
similarity index 100%
rename from Spigot-Server-Patches/0448-Fix-Chunk-Post-Processing-deadlock-risk.patch
rename to Spigot-Server-Patches/0449-Fix-Chunk-Post-Processing-deadlock-risk.patch
diff --git a/Spigot-Server-Patches/0449-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/Spigot-Server-Patches/0450-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
similarity index 100%
rename from Spigot-Server-Patches/0449-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
rename to Spigot-Server-Patches/0450-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/Spigot-Server-Patches/0450-Broadcast-join-message-to-console.patch b/Spigot-Server-Patches/0451-Broadcast-join-message-to-console.patch
similarity index 100%
rename from Spigot-Server-Patches/0450-Broadcast-join-message-to-console.patch
rename to Spigot-Server-Patches/0451-Broadcast-join-message-to-console.patch
diff --git a/Spigot-Server-Patches/0451-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/Spigot-Server-Patches/0452-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0451-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
rename to Spigot-Server-Patches/0452-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
index 95ebf497e6..e0ac4d6af1 100644
--- a/Spigot-Server-Patches/0451-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
+++ b/Spigot-Server-Patches/0452-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
@@ -28,7 +28,7 @@ receives a deterministic result, and should no longer require 1 tick
 delays anymore.
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 5eccd9e2f243f5f5cea45f93efec3a82d61aafda..0844922c4734eebf9c7b047db79f88c4e0200fa4 100644
+index 8a68f9aec04ad99632a4c81659834a9b9b433bd8..c2a6abcde6aad90c7d6d7989b8bbc811b79b3d22 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -108,6 +108,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0452-Load-Chunks-for-Login-Asynchronously.patch b/Spigot-Server-Patches/0453-Load-Chunks-for-Login-Asynchronously.patch
similarity index 98%
rename from Spigot-Server-Patches/0452-Load-Chunks-for-Login-Asynchronously.patch
rename to Spigot-Server-Patches/0453-Load-Chunks-for-Login-Asynchronously.patch
index 34ffb873a6..0d1d353747 100644
--- a/Spigot-Server-Patches/0452-Load-Chunks-for-Login-Asynchronously.patch
+++ b/Spigot-Server-Patches/0453-Load-Chunks-for-Login-Asynchronously.patch
@@ -31,7 +31,7 @@ index 2762215b2cdbeb2ea77dbd1dccecaa770a5b94c8..dc9b371af6c21510e9efba31ad462968
  
      public void d(Vec3D vec3d) {
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 0844922c4734eebf9c7b047db79f88c4e0200fa4..2fb1789de7e86ba6def838abc983e0e644e34ae9 100644
+index c2a6abcde6aad90c7d6d7989b8bbc811b79b3d22..052f209d18818bcd5fa07c0026bcb922de2e78ba 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -44,6 +44,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -73,7 +73,7 @@ index 0b1baeab3075a741519c6875f7b4847ce6cad8fc..efb59a7409902aa3c4bf95337683346a
              if (entityplayer != null) {
                  this.g = LoginListener.EnumProtocolState.DELAY_ACCEPT;
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 9b58dd080f318a2d197a6f60d40a48b728867b91..88a887f23fd5fc1acd03c1ef3a16a5b73b9c10d1 100644
+index 93877b45f380e57f2dc9656463e333ef422a4b95..a3dad0e380736fa64b50553ffbadf0cf2dac015d 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -76,6 +76,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0453-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/Spigot-Server-Patches/0454-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
similarity index 100%
rename from Spigot-Server-Patches/0453-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
rename to Spigot-Server-Patches/0454-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
diff --git a/Spigot-Server-Patches/0454-Add-PlayerAttackEntityCooldownResetEvent.patch b/Spigot-Server-Patches/0455-Add-PlayerAttackEntityCooldownResetEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0454-Add-PlayerAttackEntityCooldownResetEvent.patch
rename to Spigot-Server-Patches/0455-Add-PlayerAttackEntityCooldownResetEvent.patch
diff --git a/Spigot-Server-Patches/0455-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch b/Spigot-Server-Patches/0456-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
similarity index 100%
rename from Spigot-Server-Patches/0455-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
rename to Spigot-Server-Patches/0456-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
diff --git a/Spigot-Server-Patches/0456-Don-t-fire-BlockFade-on-worldgen-threads.patch b/Spigot-Server-Patches/0457-Don-t-fire-BlockFade-on-worldgen-threads.patch
similarity index 100%
rename from Spigot-Server-Patches/0456-Don-t-fire-BlockFade-on-worldgen-threads.patch
rename to Spigot-Server-Patches/0457-Don-t-fire-BlockFade-on-worldgen-threads.patch
diff --git a/Spigot-Server-Patches/0457-Add-phantom-creative-and-insomniac-controls.patch b/Spigot-Server-Patches/0458-Add-phantom-creative-and-insomniac-controls.patch
similarity index 100%
rename from Spigot-Server-Patches/0457-Add-phantom-creative-and-insomniac-controls.patch
rename to Spigot-Server-Patches/0458-Add-phantom-creative-and-insomniac-controls.patch
diff --git a/Spigot-Server-Patches/0458-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/Spigot-Server-Patches/0459-Fix-numerous-item-duplication-issues-and-teleport-is.patch
similarity index 100%
rename from Spigot-Server-Patches/0458-Fix-numerous-item-duplication-issues-and-teleport-is.patch
rename to Spigot-Server-Patches/0459-Fix-numerous-item-duplication-issues-and-teleport-is.patch
diff --git a/Spigot-Server-Patches/0459-Implement-Brigadier-Mojang-API.patch b/Spigot-Server-Patches/0460-Implement-Brigadier-Mojang-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0459-Implement-Brigadier-Mojang-API.patch
rename to Spigot-Server-Patches/0460-Implement-Brigadier-Mojang-API.patch
index 1887c69e6d..7d4a513cfd 100644
--- a/Spigot-Server-Patches/0459-Implement-Brigadier-Mojang-API.patch
+++ b/Spigot-Server-Patches/0460-Implement-Brigadier-Mojang-API.patch
@@ -69,7 +69,7 @@ index 54a1988341a4a6e80ab40624280b7c92532d5db6..7073d697a5d35b9b72ea05d5608438ac
      public boolean hasPermission(int i) {
          // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 88a887f23fd5fc1acd03c1ef3a16a5b73b9c10d1..9a7a1ebc7b0d4b013575da622ee149249d39590c 100644
+index a3dad0e380736fa64b50553ffbadf0cf2dac015d..3b7efa4ca3903ef980c5693efa8ab45a04b29652 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -622,8 +622,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0460-Villager-Restocks-API.patch b/Spigot-Server-Patches/0461-Villager-Restocks-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0460-Villager-Restocks-API.patch
rename to Spigot-Server-Patches/0461-Villager-Restocks-API.patch
diff --git a/Spigot-Server-Patches/0461-Validate-PickItem-Packet-and-kick-for-invalid.patch b/Spigot-Server-Patches/0462-Validate-PickItem-Packet-and-kick-for-invalid.patch
similarity index 94%
rename from Spigot-Server-Patches/0461-Validate-PickItem-Packet-and-kick-for-invalid.patch
rename to Spigot-Server-Patches/0462-Validate-PickItem-Packet-and-kick-for-invalid.patch
index 67c465baa4..f8fe34067b 100644
--- a/Spigot-Server-Patches/0461-Validate-PickItem-Packet-and-kick-for-invalid.patch
+++ b/Spigot-Server-Patches/0462-Validate-PickItem-Packet-and-kick-for-invalid.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Validate PickItem Packet and kick for invalid
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 9a7a1ebc7b0d4b013575da622ee149249d39590c..37b7925b0c6dea0920d67cacf3b1982e8034e202 100644
+index 3b7efa4ca3903ef980c5693efa8ab45a04b29652..033578cb5f2be7db6c03c37dcdf1e353a0441d68 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -735,7 +735,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0462-Expose-game-version.patch b/Spigot-Server-Patches/0463-Expose-game-version.patch
similarity index 100%
rename from Spigot-Server-Patches/0462-Expose-game-version.patch
rename to Spigot-Server-Patches/0463-Expose-game-version.patch
diff --git a/Spigot-Server-Patches/0463-Optimize-Voxel-Shape-Merging.patch b/Spigot-Server-Patches/0464-Optimize-Voxel-Shape-Merging.patch
similarity index 100%
rename from Spigot-Server-Patches/0463-Optimize-Voxel-Shape-Merging.patch
rename to Spigot-Server-Patches/0464-Optimize-Voxel-Shape-Merging.patch
diff --git a/Spigot-Server-Patches/0464-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/Spigot-Server-Patches/0465-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
similarity index 100%
rename from Spigot-Server-Patches/0464-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
rename to Spigot-Server-Patches/0465-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
diff --git a/Spigot-Server-Patches/0465-Implement-Mob-Goal-API.patch b/Spigot-Server-Patches/0466-Implement-Mob-Goal-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0465-Implement-Mob-Goal-API.patch
rename to Spigot-Server-Patches/0466-Implement-Mob-Goal-API.patch
diff --git a/Spigot-Server-Patches/0466-Use-distance-map-to-optimise-entity-tracker.patch b/Spigot-Server-Patches/0467-Use-distance-map-to-optimise-entity-tracker.patch
similarity index 100%
rename from Spigot-Server-Patches/0466-Use-distance-map-to-optimise-entity-tracker.patch
rename to Spigot-Server-Patches/0467-Use-distance-map-to-optimise-entity-tracker.patch
diff --git a/Spigot-Server-Patches/0467-Optimize-isOutsideRange-to-use-distance-maps.patch b/Spigot-Server-Patches/0468-Optimize-isOutsideRange-to-use-distance-maps.patch
similarity index 99%
rename from Spigot-Server-Patches/0467-Optimize-isOutsideRange-to-use-distance-maps.patch
rename to Spigot-Server-Patches/0468-Optimize-isOutsideRange-to-use-distance-maps.patch
index 436b0e5667..1c1a35e885 100644
--- a/Spigot-Server-Patches/0467-Optimize-isOutsideRange-to-use-distance-maps.patch
+++ b/Spigot-Server-Patches/0468-Optimize-isOutsideRange-to-use-distance-maps.patch
@@ -148,7 +148,7 @@ index 4e50ef38700918a0efb2c67f5acf98eb66fd8335..b4d8657d37b2a6c02e886ec6de243634
                              }
  
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 2fb1789de7e86ba6def838abc983e0e644e34ae9..4a927cb12b6dc9352550717d1128cb6b9080b8a7 100644
+index 052f209d18818bcd5fa07c0026bcb922de2e78ba..a70721a051f524862003b9fb1dda79cf9ad64db0 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -117,6 +117,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0468-Stop-copy-on-write-operations-for-updating-light-dat.patch b/Spigot-Server-Patches/0469-Stop-copy-on-write-operations-for-updating-light-dat.patch
similarity index 100%
rename from Spigot-Server-Patches/0468-Stop-copy-on-write-operations-for-updating-light-dat.patch
rename to Spigot-Server-Patches/0469-Stop-copy-on-write-operations-for-updating-light-dat.patch
diff --git a/Spigot-Server-Patches/0469-No-Tick-view-distance-implementation.patch b/Spigot-Server-Patches/0470-No-Tick-view-distance-implementation.patch
similarity index 99%
rename from Spigot-Server-Patches/0469-No-Tick-view-distance-implementation.patch
rename to Spigot-Server-Patches/0470-No-Tick-view-distance-implementation.patch
index 81b448beb8..e8fd56440e 100644
--- a/Spigot-Server-Patches/0469-No-Tick-view-distance-implementation.patch
+++ b/Spigot-Server-Patches/0470-No-Tick-view-distance-implementation.patch
@@ -124,7 +124,7 @@ index ef61f8e784b7ebd26293d627e8b8e1aef1be6e21..03b1a67aaf3ed75b7669a3157847affd
                  if (flag1) {
                      ChunkMapDistance.this.j.a(ChunkTaskQueueSorter.a(() -> {
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 4a927cb12b6dc9352550717d1128cb6b9080b8a7..563b5f10649a165180f7f39ff8bce4c79508ae97 100644
+index a70721a051f524862003b9fb1dda79cf9ad64db0..f6e04a116367010e23116161aca648c44535e2b7 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -119,6 +119,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0470-Add-villager-reputation-API.patch b/Spigot-Server-Patches/0471-Add-villager-reputation-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0470-Add-villager-reputation-API.patch
rename to Spigot-Server-Patches/0471-Add-villager-reputation-API.patch
diff --git a/Spigot-Server-Patches/0471-Fix-Light-Command.patch b/Spigot-Server-Patches/0472-Fix-Light-Command.patch
similarity index 100%
rename from Spigot-Server-Patches/0471-Fix-Light-Command.patch
rename to Spigot-Server-Patches/0472-Fix-Light-Command.patch
diff --git a/Spigot-Server-Patches/0472-Fix-PotionEffect-ignores-icon-flag.patch b/Spigot-Server-Patches/0473-Fix-PotionEffect-ignores-icon-flag.patch
similarity index 100%
rename from Spigot-Server-Patches/0472-Fix-PotionEffect-ignores-icon-flag.patch
rename to Spigot-Server-Patches/0473-Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/Spigot-Server-Patches/0473-Optimize-brigadier-child-sorting-performance.patch b/Spigot-Server-Patches/0474-Optimize-brigadier-child-sorting-performance.patch
similarity index 100%
rename from Spigot-Server-Patches/0473-Optimize-brigadier-child-sorting-performance.patch
rename to Spigot-Server-Patches/0474-Optimize-brigadier-child-sorting-performance.patch
diff --git a/Spigot-Server-Patches/0474-Don-t-toString-block-unless-actually-showing-the-mes.patch b/Spigot-Server-Patches/0475-Don-t-toString-block-unless-actually-showing-the-mes.patch
similarity index 100%
rename from Spigot-Server-Patches/0474-Don-t-toString-block-unless-actually-showing-the-mes.patch
rename to Spigot-Server-Patches/0475-Don-t-toString-block-unless-actually-showing-the-mes.patch
diff --git a/Spigot-Server-Patches/0475-Potential-bed-API.patch b/Spigot-Server-Patches/0476-Potential-bed-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0475-Potential-bed-API.patch
rename to Spigot-Server-Patches/0476-Potential-bed-API.patch
diff --git a/Spigot-Server-Patches/0476-Wait-for-Async-Tasks-during-shutdown.patch b/Spigot-Server-Patches/0477-Wait-for-Async-Tasks-during-shutdown.patch
similarity index 100%
rename from Spigot-Server-Patches/0476-Wait-for-Async-Tasks-during-shutdown.patch
rename to Spigot-Server-Patches/0477-Wait-for-Async-Tasks-during-shutdown.patch
diff --git a/Spigot-Server-Patches/0477-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/Spigot-Server-Patches/0478-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
similarity index 100%
rename from Spigot-Server-Patches/0477-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
rename to Spigot-Server-Patches/0478-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/Spigot-Server-Patches/0478-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/Spigot-Server-Patches/0479-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
similarity index 98%
rename from Spigot-Server-Patches/0478-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
rename to Spigot-Server-Patches/0479-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index fc05eeaba2..81c6b36d5a 100644
--- a/Spigot-Server-Patches/0478-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/Spigot-Server-Patches/0479-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
@@ -13,10 +13,10 @@ A config is provided if you rather let players use these exploits, and let
 them destroy the worlds End Portals and get on top of the nether easy.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 73bd85de76d28e5100601a0c9b0d32deb873626e..4be70a7737ec03aa6affd418bfe26ca5d3390cc7 100644
+index 273ed1c5537a69256f1020646f5cd0c13d50f170..e750aedfad992635019d1abd7c880f4829b1e41d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -402,4 +402,17 @@ public class PaperConfig {
+@@ -411,4 +411,17 @@ public class PaperConfig {
      private static void midTickChunkTasks() {
          midTickChunkTasks = getInt("settings.chunk-tasks-per-tick", midTickChunkTasks);
      }
diff --git a/Spigot-Server-Patches/0479-Optimize-NibbleArray-to-use-pooled-buffers.patch b/Spigot-Server-Patches/0480-Optimize-NibbleArray-to-use-pooled-buffers.patch
similarity index 100%
rename from Spigot-Server-Patches/0479-Optimize-NibbleArray-to-use-pooled-buffers.patch
rename to Spigot-Server-Patches/0480-Optimize-NibbleArray-to-use-pooled-buffers.patch
diff --git a/Spigot-Server-Patches/0480-Reduce-MutableInt-allocations-from-light-engine.patch b/Spigot-Server-Patches/0481-Reduce-MutableInt-allocations-from-light-engine.patch
similarity index 100%
rename from Spigot-Server-Patches/0480-Reduce-MutableInt-allocations-from-light-engine.patch
rename to Spigot-Server-Patches/0481-Reduce-MutableInt-allocations-from-light-engine.patch
diff --git a/Spigot-Server-Patches/0481-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/Spigot-Server-Patches/0482-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
similarity index 100%
rename from Spigot-Server-Patches/0481-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
rename to Spigot-Server-Patches/0482-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
diff --git a/Spigot-Server-Patches/0482-Ensure-safe-gateway-teleport.patch b/Spigot-Server-Patches/0483-Ensure-safe-gateway-teleport.patch
similarity index 100%
rename from Spigot-Server-Patches/0482-Ensure-safe-gateway-teleport.patch
rename to Spigot-Server-Patches/0483-Ensure-safe-gateway-teleport.patch
diff --git a/Spigot-Server-Patches/0483-Add-option-for-console-having-all-permissions.patch b/Spigot-Server-Patches/0484-Add-option-for-console-having-all-permissions.patch
similarity index 95%
rename from Spigot-Server-Patches/0483-Add-option-for-console-having-all-permissions.patch
rename to Spigot-Server-Patches/0484-Add-option-for-console-having-all-permissions.patch
index c871e2ac38..8dbbd49676 100644
--- a/Spigot-Server-Patches/0483-Add-option-for-console-having-all-permissions.patch
+++ b/Spigot-Server-Patches/0484-Add-option-for-console-having-all-permissions.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add option for console having all permissions
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 4be70a7737ec03aa6affd418bfe26ca5d3390cc7..a4d21025e8871f4c408b10eb9fe5267aaa641e58 100644
+index e750aedfad992635019d1abd7c880f4829b1e41d..d393e37f50e2815da6b486ff0c3e277fa3413f3e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -415,4 +415,9 @@ public class PaperConfig {
+@@ -424,4 +424,9 @@ public class PaperConfig {
  
      }
  
diff --git a/Spigot-Server-Patches/0484-Workaround-for-Client-Lag-Spikes-MC-162253.patch b/Spigot-Server-Patches/0485-Workaround-for-Client-Lag-Spikes-MC-162253.patch
similarity index 100%
rename from Spigot-Server-Patches/0484-Workaround-for-Client-Lag-Spikes-MC-162253.patch
rename to Spigot-Server-Patches/0485-Workaround-for-Client-Lag-Spikes-MC-162253.patch
diff --git a/Spigot-Server-Patches/0485-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch b/Spigot-Server-Patches/0486-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0485-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
rename to Spigot-Server-Patches/0486-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
diff --git a/Spigot-Server-Patches/0486-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch b/Spigot-Server-Patches/0487-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
similarity index 100%
rename from Spigot-Server-Patches/0486-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
rename to Spigot-Server-Patches/0487-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
diff --git a/Spigot-Server-Patches/0487-Optimize-sending-packets-to-nearby-locations-sounds-.patch b/Spigot-Server-Patches/0488-Optimize-sending-packets-to-nearby-locations-sounds-.patch
similarity index 100%
rename from Spigot-Server-Patches/0487-Optimize-sending-packets-to-nearby-locations-sounds-.patch
rename to Spigot-Server-Patches/0488-Optimize-sending-packets-to-nearby-locations-sounds-.patch
diff --git a/Spigot-Server-Patches/0488-Improve-Chunk-Status-Transition-Speed.patch b/Spigot-Server-Patches/0489-Improve-Chunk-Status-Transition-Speed.patch
similarity index 100%
rename from Spigot-Server-Patches/0488-Improve-Chunk-Status-Transition-Speed.patch
rename to Spigot-Server-Patches/0489-Improve-Chunk-Status-Transition-Speed.patch
diff --git a/Spigot-Server-Patches/0489-Fix-villager-trading-demand-MC-163962.patch b/Spigot-Server-Patches/0490-Fix-villager-trading-demand-MC-163962.patch
similarity index 100%
rename from Spigot-Server-Patches/0489-Fix-villager-trading-demand-MC-163962.patch
rename to Spigot-Server-Patches/0490-Fix-villager-trading-demand-MC-163962.patch
diff --git a/Spigot-Server-Patches/0490-Maps-shouldn-t-load-chunks.patch b/Spigot-Server-Patches/0491-Maps-shouldn-t-load-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0490-Maps-shouldn-t-load-chunks.patch
rename to Spigot-Server-Patches/0491-Maps-shouldn-t-load-chunks.patch
diff --git a/Spigot-Server-Patches/0491-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/Spigot-Server-Patches/0492-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
similarity index 100%
rename from Spigot-Server-Patches/0491-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
rename to Spigot-Server-Patches/0492-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/Spigot-Server-Patches/0492-Optimize-Bit-Operations-by-inlining.patch b/Spigot-Server-Patches/0493-Optimize-Bit-Operations-by-inlining.patch
similarity index 100%
rename from Spigot-Server-Patches/0492-Optimize-Bit-Operations-by-inlining.patch
rename to Spigot-Server-Patches/0493-Optimize-Bit-Operations-by-inlining.patch
diff --git a/Spigot-Server-Patches/0493-Optimize-Light-Engine.patch b/Spigot-Server-Patches/0494-Optimize-Light-Engine.patch
similarity index 100%
rename from Spigot-Server-Patches/0493-Optimize-Light-Engine.patch
rename to Spigot-Server-Patches/0494-Optimize-Light-Engine.patch
diff --git a/Spigot-Server-Patches/0494-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/0495-Delay-Chunk-Unloads-based-on-Player-Movement.patch
similarity index 100%
rename from Spigot-Server-Patches/0494-Delay-Chunk-Unloads-based-on-Player-Movement.patch
rename to Spigot-Server-Patches/0495-Delay-Chunk-Unloads-based-on-Player-Movement.patch
diff --git a/Spigot-Server-Patches/0495-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/Spigot-Server-Patches/0496-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
similarity index 100%
rename from Spigot-Server-Patches/0495-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
rename to Spigot-Server-Patches/0496-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
diff --git a/Spigot-Server-Patches/0496-Fix-missing-chunks-due-to-integer-overflow.patch b/Spigot-Server-Patches/0497-Fix-missing-chunks-due-to-integer-overflow.patch
similarity index 100%
rename from Spigot-Server-Patches/0496-Fix-missing-chunks-due-to-integer-overflow.patch
rename to Spigot-Server-Patches/0497-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/Spigot-Server-Patches/0497-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/Spigot-Server-Patches/0498-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
similarity index 100%
rename from Spigot-Server-Patches/0497-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
rename to Spigot-Server-Patches/0498-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/Spigot-Server-Patches/0498-Fix-piston-physics-inconsistency-MC-188840.patch b/Spigot-Server-Patches/0499-Fix-piston-physics-inconsistency-MC-188840.patch
similarity index 97%
rename from Spigot-Server-Patches/0498-Fix-piston-physics-inconsistency-MC-188840.patch
rename to Spigot-Server-Patches/0499-Fix-piston-physics-inconsistency-MC-188840.patch
index 951db84aa6..cedc5efb3d 100644
--- a/Spigot-Server-Patches/0498-Fix-piston-physics-inconsistency-MC-188840.patch
+++ b/Spigot-Server-Patches/0499-Fix-piston-physics-inconsistency-MC-188840.patch
@@ -32,10 +32,10 @@ This patch fixes https://bugs.mojang.com/browse/MC-188840
 This patch also fixes rail duping and carpet duping.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index a4d21025e8871f4c408b10eb9fe5267aaa641e58..1326736f1aeb1df220802e9404428af0d3f17423 100644
+index d393e37f50e2815da6b486ff0c3e277fa3413f3e..53b62057a3edc3c211c4bade3a01fb065a523fcf 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -420,4 +420,10 @@ public class PaperConfig {
+@@ -429,4 +429,10 @@ public class PaperConfig {
          consoleHasAllPermissions = getBoolean("settings.console-has-all-permissions", consoleHasAllPermissions);
      }
  
diff --git a/Spigot-Server-Patches/0499-Fix-sand-duping.patch b/Spigot-Server-Patches/0500-Fix-sand-duping.patch
similarity index 100%
rename from Spigot-Server-Patches/0499-Fix-sand-duping.patch
rename to Spigot-Server-Patches/0500-Fix-sand-duping.patch
diff --git a/Spigot-Server-Patches/0500-Prevent-position-desync-in-playerconnection-causing-.patch b/Spigot-Server-Patches/0501-Prevent-position-desync-in-playerconnection-causing-.patch
similarity index 100%
rename from Spigot-Server-Patches/0500-Prevent-position-desync-in-playerconnection-causing-.patch
rename to Spigot-Server-Patches/0501-Prevent-position-desync-in-playerconnection-causing-.patch
diff --git a/Spigot-Server-Patches/0501-Fix-enderdragon-exp-dupe.patch b/Spigot-Server-Patches/0502-Fix-enderdragon-exp-dupe.patch
similarity index 100%
rename from Spigot-Server-Patches/0501-Fix-enderdragon-exp-dupe.patch
rename to Spigot-Server-Patches/0502-Fix-enderdragon-exp-dupe.patch
diff --git a/Spigot-Server-Patches/0502-Inventory-getHolder-method-without-block-snapshot.patch b/Spigot-Server-Patches/0503-Inventory-getHolder-method-without-block-snapshot.patch
similarity index 100%
rename from Spigot-Server-Patches/0502-Inventory-getHolder-method-without-block-snapshot.patch
rename to Spigot-Server-Patches/0503-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/Spigot-Server-Patches/0503-Expose-Arrow-getItemStack.patch b/Spigot-Server-Patches/0504-Expose-Arrow-getItemStack.patch
similarity index 100%
rename from Spigot-Server-Patches/0503-Expose-Arrow-getItemStack.patch
rename to Spigot-Server-Patches/0504-Expose-Arrow-getItemStack.patch
diff --git a/Spigot-Server-Patches/0504-Add-and-implement-PlayerRecipeBookClickEvent.patch b/Spigot-Server-Patches/0505-Add-and-implement-PlayerRecipeBookClickEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0504-Add-and-implement-PlayerRecipeBookClickEvent.patch
rename to Spigot-Server-Patches/0505-Add-and-implement-PlayerRecipeBookClickEvent.patch
diff --git a/Spigot-Server-Patches/0505-Hide-sync-chunk-writes-behind-flag.patch b/Spigot-Server-Patches/0506-Hide-sync-chunk-writes-behind-flag.patch
similarity index 100%
rename from Spigot-Server-Patches/0505-Hide-sync-chunk-writes-behind-flag.patch
rename to Spigot-Server-Patches/0506-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/Spigot-Server-Patches/0506-Limit-lightning-strike-effect-distance.patch b/Spigot-Server-Patches/0507-Limit-lightning-strike-effect-distance.patch
similarity index 100%
rename from Spigot-Server-Patches/0506-Limit-lightning-strike-effect-distance.patch
rename to Spigot-Server-Patches/0507-Limit-lightning-strike-effect-distance.patch
diff --git a/Spigot-Server-Patches/0507-Add-permission-for-command-blocks.patch b/Spigot-Server-Patches/0508-Add-permission-for-command-blocks.patch
similarity index 98%
rename from Spigot-Server-Patches/0507-Add-permission-for-command-blocks.patch
rename to Spigot-Server-Patches/0508-Add-permission-for-command-blocks.patch
index e04466e93f..a70ec155f0 100644
--- a/Spigot-Server-Patches/0507-Add-permission-for-command-blocks.patch
+++ b/Spigot-Server-Patches/0508-Add-permission-for-command-blocks.patch
@@ -31,7 +31,7 @@ index 7e13b1cf6d92c3e0f2dab1ba1d42bd4f250e256c..3820acd65f3cd488dba964e6d9c45885
          } else {
              if (entityhuman.getWorld().isClientSide) {
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 623ec94e5d3cdd67313510b41cbcbd609d067426..d01950720cb769ad13713812abee32d05edfa46d 100644
+index d391ca12bc3de506cc4485e4d207f04033ca0b94..bf052016d7ca4d2012bafe86909f4d581498d403 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -650,7 +650,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0508-Ensure-Entity-AABB-s-are-never-invalid.patch b/Spigot-Server-Patches/0509-Ensure-Entity-AABB-s-are-never-invalid.patch
similarity index 100%
rename from Spigot-Server-Patches/0508-Ensure-Entity-AABB-s-are-never-invalid.patch
rename to Spigot-Server-Patches/0509-Ensure-Entity-AABB-s-are-never-invalid.patch
diff --git a/Spigot-Server-Patches/0509-Optimize-WorldBorder-collision-checks-and-air.patch b/Spigot-Server-Patches/0510-Optimize-WorldBorder-collision-checks-and-air.patch
similarity index 100%
rename from Spigot-Server-Patches/0509-Optimize-WorldBorder-collision-checks-and-air.patch
rename to Spigot-Server-Patches/0510-Optimize-WorldBorder-collision-checks-and-air.patch
diff --git a/Spigot-Server-Patches/0510-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/Spigot-Server-Patches/0511-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
similarity index 100%
rename from Spigot-Server-Patches/0510-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
rename to Spigot-Server-Patches/0511-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
diff --git a/Spigot-Server-Patches/0511-Paper-dumpitem-command.patch b/Spigot-Server-Patches/0512-Paper-dumpitem-command.patch
similarity index 100%
rename from Spigot-Server-Patches/0511-Paper-dumpitem-command.patch
rename to Spigot-Server-Patches/0512-Paper-dumpitem-command.patch
diff --git a/Spigot-Server-Patches/0512-Don-t-allow-null-UUID-s-for-chat.patch b/Spigot-Server-Patches/0513-Don-t-allow-null-UUID-s-for-chat.patch
similarity index 100%
rename from Spigot-Server-Patches/0512-Don-t-allow-null-UUID-s-for-chat.patch
rename to Spigot-Server-Patches/0513-Don-t-allow-null-UUID-s-for-chat.patch
diff --git a/Spigot-Server-Patches/0513-Improve-Legacy-Component-serialization-size.patch b/Spigot-Server-Patches/0514-Improve-Legacy-Component-serialization-size.patch
similarity index 100%
rename from Spigot-Server-Patches/0513-Improve-Legacy-Component-serialization-size.patch
rename to Spigot-Server-Patches/0514-Improve-Legacy-Component-serialization-size.patch
diff --git a/Spigot-Server-Patches/0514-Support-old-UUID-format-for-NBT.patch b/Spigot-Server-Patches/0515-Support-old-UUID-format-for-NBT.patch
similarity index 100%
rename from Spigot-Server-Patches/0514-Support-old-UUID-format-for-NBT.patch
rename to Spigot-Server-Patches/0515-Support-old-UUID-format-for-NBT.patch
diff --git a/Spigot-Server-Patches/0515-Clean-up-duplicated-GameProfile-Properties.patch b/Spigot-Server-Patches/0516-Clean-up-duplicated-GameProfile-Properties.patch
similarity index 100%
rename from Spigot-Server-Patches/0515-Clean-up-duplicated-GameProfile-Properties.patch
rename to Spigot-Server-Patches/0516-Clean-up-duplicated-GameProfile-Properties.patch
diff --git a/Spigot-Server-Patches/0516-Convert-legacy-attributes-in-Item-Meta.patch b/Spigot-Server-Patches/0517-Convert-legacy-attributes-in-Item-Meta.patch
similarity index 100%
rename from Spigot-Server-Patches/0516-Convert-legacy-attributes-in-Item-Meta.patch
rename to Spigot-Server-Patches/0517-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/Spigot-Server-Patches/0517-Remove-some-streams-from-structures.patch b/Spigot-Server-Patches/0518-Remove-some-streams-from-structures.patch
similarity index 100%
rename from Spigot-Server-Patches/0517-Remove-some-streams-from-structures.patch
rename to Spigot-Server-Patches/0518-Remove-some-streams-from-structures.patch
diff --git a/Spigot-Server-Patches/0518-Remove-streams-from-classes-related-villager-gossip.patch b/Spigot-Server-Patches/0519-Remove-streams-from-classes-related-villager-gossip.patch
similarity index 100%
rename from Spigot-Server-Patches/0518-Remove-streams-from-classes-related-villager-gossip.patch
rename to Spigot-Server-Patches/0519-Remove-streams-from-classes-related-villager-gossip.patch
diff --git a/Spigot-Server-Patches/0519-Support-components-in-ItemMeta.patch b/Spigot-Server-Patches/0520-Support-components-in-ItemMeta.patch
similarity index 100%
rename from Spigot-Server-Patches/0519-Support-components-in-ItemMeta.patch
rename to Spigot-Server-Patches/0520-Support-components-in-ItemMeta.patch
diff --git a/Spigot-Server-Patches/0520-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch b/Spigot-Server-Patches/0521-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
similarity index 100%
rename from Spigot-Server-Patches/0520-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
rename to Spigot-Server-Patches/0521-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
diff --git a/Spigot-Server-Patches/0521-Add-entity-liquid-API.patch b/Spigot-Server-Patches/0522-Add-entity-liquid-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0521-Add-entity-liquid-API.patch
rename to Spigot-Server-Patches/0522-Add-entity-liquid-API.patch
diff --git a/Spigot-Server-Patches/0522-Update-itemstack-legacy-name-and-lore.patch b/Spigot-Server-Patches/0523-Update-itemstack-legacy-name-and-lore.patch
similarity index 100%
rename from Spigot-Server-Patches/0522-Update-itemstack-legacy-name-and-lore.patch
rename to Spigot-Server-Patches/0523-Update-itemstack-legacy-name-and-lore.patch
diff --git a/Spigot-Server-Patches/0523-Spawn-player-in-correct-world-on-login.patch b/Spigot-Server-Patches/0524-Spawn-player-in-correct-world-on-login.patch
similarity index 100%
rename from Spigot-Server-Patches/0523-Spawn-player-in-correct-world-on-login.patch
rename to Spigot-Server-Patches/0524-Spawn-player-in-correct-world-on-login.patch
diff --git a/Spigot-Server-Patches/0524-Add-PrepareResultEvent.patch b/Spigot-Server-Patches/0525-Add-PrepareResultEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0524-Add-PrepareResultEvent.patch
rename to Spigot-Server-Patches/0525-Add-PrepareResultEvent.patch
diff --git a/Spigot-Server-Patches/0525-Allow-delegation-to-vanilla-chunk-gen.patch b/Spigot-Server-Patches/0526-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 100%
rename from Spigot-Server-Patches/0525-Allow-delegation-to-vanilla-chunk-gen.patch
rename to Spigot-Server-Patches/0526-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/Spigot-Server-Patches/0526-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/Spigot-Server-Patches/0527-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
similarity index 100%
rename from Spigot-Server-Patches/0526-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
rename to Spigot-Server-Patches/0527-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
diff --git a/Spigot-Server-Patches/0527-Optimize-NetworkManager-Exception-Handling.patch b/Spigot-Server-Patches/0528-Optimize-NetworkManager-Exception-Handling.patch
similarity index 100%
rename from Spigot-Server-Patches/0527-Optimize-NetworkManager-Exception-Handling.patch
rename to Spigot-Server-Patches/0528-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/Spigot-Server-Patches/0528-Fix-Concurrency-issue-in-WeightedList.patch b/Spigot-Server-Patches/0529-Fix-Concurrency-issue-in-WeightedList.patch
similarity index 100%
rename from Spigot-Server-Patches/0528-Fix-Concurrency-issue-in-WeightedList.patch
rename to Spigot-Server-Patches/0529-Fix-Concurrency-issue-in-WeightedList.patch
diff --git a/Spigot-Server-Patches/0529-Optimize-the-advancement-data-player-iteration-to-be.patch b/Spigot-Server-Patches/0530-Optimize-the-advancement-data-player-iteration-to-be.patch
similarity index 100%
rename from Spigot-Server-Patches/0529-Optimize-the-advancement-data-player-iteration-to-be.patch
rename to Spigot-Server-Patches/0530-Optimize-the-advancement-data-player-iteration-to-be.patch
diff --git a/Spigot-Server-Patches/0530-Fix-arrows-never-despawning-MC-125757.patch b/Spigot-Server-Patches/0531-Fix-arrows-never-despawning-MC-125757.patch
similarity index 100%
rename from Spigot-Server-Patches/0530-Fix-arrows-never-despawning-MC-125757.patch
rename to Spigot-Server-Patches/0531-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/Spigot-Server-Patches/0531-Thread-Safe-Vanilla-Command-permission-checking.patch b/Spigot-Server-Patches/0532-Thread-Safe-Vanilla-Command-permission-checking.patch
similarity index 100%
rename from Spigot-Server-Patches/0531-Thread-Safe-Vanilla-Command-permission-checking.patch
rename to Spigot-Server-Patches/0532-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/Spigot-Server-Patches/0532-Move-range-check-for-block-placing-up.patch b/Spigot-Server-Patches/0533-Move-range-check-for-block-placing-up.patch
similarity index 100%
rename from Spigot-Server-Patches/0532-Move-range-check-for-block-placing-up.patch
rename to Spigot-Server-Patches/0533-Move-range-check-for-block-placing-up.patch
diff --git a/Spigot-Server-Patches/0533-Fix-SPIGOT-5989.patch b/Spigot-Server-Patches/0534-Fix-SPIGOT-5989.patch
similarity index 100%
rename from Spigot-Server-Patches/0533-Fix-SPIGOT-5989.patch
rename to Spigot-Server-Patches/0534-Fix-SPIGOT-5989.patch
diff --git a/Spigot-Server-Patches/0534-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/Spigot-Server-Patches/0535-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
similarity index 100%
rename from Spigot-Server-Patches/0534-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
rename to Spigot-Server-Patches/0535-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/Spigot-Server-Patches/0535-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/Spigot-Server-Patches/0536-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
similarity index 100%
rename from Spigot-Server-Patches/0535-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
rename to Spigot-Server-Patches/0536-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/Spigot-Server-Patches/0536-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/Spigot-Server-Patches/0537-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
similarity index 100%
rename from Spigot-Server-Patches/0536-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
rename to Spigot-Server-Patches/0537-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/Spigot-Server-Patches/0537-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/Spigot-Server-Patches/0538-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
similarity index 100%
rename from Spigot-Server-Patches/0537-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
rename to Spigot-Server-Patches/0538-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
diff --git a/Spigot-Server-Patches/0538-Fix-some-rails-connecting-improperly.patch b/Spigot-Server-Patches/0539-Fix-some-rails-connecting-improperly.patch
similarity index 100%
rename from Spigot-Server-Patches/0538-Fix-some-rails-connecting-improperly.patch
rename to Spigot-Server-Patches/0539-Fix-some-rails-connecting-improperly.patch
diff --git a/Spigot-Server-Patches/0539-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/Spigot-Server-Patches/0540-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
similarity index 100%
rename from Spigot-Server-Patches/0539-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
rename to Spigot-Server-Patches/0540-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/Spigot-Server-Patches/0540-Incremental-player-saving.patch b/Spigot-Server-Patches/0541-Incremental-player-saving.patch
similarity index 97%
rename from Spigot-Server-Patches/0540-Incremental-player-saving.patch
rename to Spigot-Server-Patches/0541-Incremental-player-saving.patch
index e5a654e477..ab61e3de0e 100644
--- a/Spigot-Server-Patches/0540-Incremental-player-saving.patch
+++ b/Spigot-Server-Patches/0541-Incremental-player-saving.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Incremental player saving
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 1326736f1aeb1df220802e9404428af0d3f17423..bf456db50df5e8efdb4180ea2150ff4cab10bc28 100644
+index 53b62057a3edc3c211c4bade3a01fb065a523fcf..669653b5cfb057b277e509b630fd73a843b42b24 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -426,4 +426,15 @@ public class PaperConfig {
+@@ -435,4 +435,15 @@ public class PaperConfig {
          allowPistonDuplication = getBoolean("settings.unsupported-settings.allow-piston-duplication", config.getBoolean("settings.unsupported-settings.allow-tnt-duplication", false));
          set("settings.unsupported-settings.allow-tnt-duplication", null);
      }
diff --git a/Spigot-Server-Patches/0541-Import-fastutil-classes.patch b/Spigot-Server-Patches/0542-Import-fastutil-classes.patch
similarity index 100%
rename from Spigot-Server-Patches/0541-Import-fastutil-classes.patch
rename to Spigot-Server-Patches/0542-Import-fastutil-classes.patch
diff --git a/Spigot-Server-Patches/0542-Don-t-mark-null-chunk-sections-for-block-updates.patch b/Spigot-Server-Patches/0543-Don-t-mark-null-chunk-sections-for-block-updates.patch
similarity index 100%
rename from Spigot-Server-Patches/0542-Don-t-mark-null-chunk-sections-for-block-updates.patch
rename to Spigot-Server-Patches/0543-Don-t-mark-null-chunk-sections-for-block-updates.patch
diff --git a/Spigot-Server-Patches/0543-Remove-armour-stand-double-add-to-world.patch b/Spigot-Server-Patches/0544-Remove-armour-stand-double-add-to-world.patch
similarity index 100%
rename from Spigot-Server-Patches/0543-Remove-armour-stand-double-add-to-world.patch
rename to Spigot-Server-Patches/0544-Remove-armour-stand-double-add-to-world.patch
diff --git a/Spigot-Server-Patches/0544-Fix-MC-187716-Use-configured-height.patch b/Spigot-Server-Patches/0545-Fix-MC-187716-Use-configured-height.patch
similarity index 100%
rename from Spigot-Server-Patches/0544-Fix-MC-187716-Use-configured-height.patch
rename to Spigot-Server-Patches/0545-Fix-MC-187716-Use-configured-height.patch
diff --git a/Spigot-Server-Patches/0545-Fix-incorrect-return-for-WorldServer-addAllEntitiesS.patch b/Spigot-Server-Patches/0546-Fix-incorrect-return-for-WorldServer-addAllEntitiesS.patch
similarity index 100%
rename from Spigot-Server-Patches/0545-Fix-incorrect-return-for-WorldServer-addAllEntitiesS.patch
rename to Spigot-Server-Patches/0546-Fix-incorrect-return-for-WorldServer-addAllEntitiesS.patch
diff --git a/Spigot-Server-Patches/0546-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/Spigot-Server-Patches/0547-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
similarity index 100%
rename from Spigot-Server-Patches/0546-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
rename to Spigot-Server-Patches/0547-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/Spigot-Server-Patches/0547-Do-not-let-the-server-load-chunks-from-newer-version.patch b/Spigot-Server-Patches/0548-Do-not-let-the-server-load-chunks-from-newer-version.patch
similarity index 100%
rename from Spigot-Server-Patches/0547-Do-not-let-the-server-load-chunks-from-newer-version.patch
rename to Spigot-Server-Patches/0548-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/Spigot-Server-Patches/0548-Brand-support.patch b/Spigot-Server-Patches/0549-Brand-support.patch
similarity index 100%
rename from Spigot-Server-Patches/0548-Brand-support.patch
rename to Spigot-Server-Patches/0549-Brand-support.patch
diff --git a/Spigot-Server-Patches/0549-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch b/Spigot-Server-Patches/0550-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch
similarity index 100%
rename from Spigot-Server-Patches/0549-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch
rename to Spigot-Server-Patches/0550-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch
diff --git a/Spigot-Server-Patches/0550-Fix-MC-197271.patch b/Spigot-Server-Patches/0551-Fix-MC-197271.patch
similarity index 100%
rename from Spigot-Server-Patches/0550-Fix-MC-197271.patch
rename to Spigot-Server-Patches/0551-Fix-MC-197271.patch
diff --git a/Spigot-Server-Patches/0551-MC-197883-Bandaid-decode-issue.patch b/Spigot-Server-Patches/0552-MC-197883-Bandaid-decode-issue.patch
similarity index 100%
rename from Spigot-Server-Patches/0551-MC-197883-Bandaid-decode-issue.patch
rename to Spigot-Server-Patches/0552-MC-197883-Bandaid-decode-issue.patch
diff --git a/Spigot-Server-Patches/0552-Add-setMaxPlayers-API.patch b/Spigot-Server-Patches/0553-Add-setMaxPlayers-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0552-Add-setMaxPlayers-API.patch
rename to Spigot-Server-Patches/0553-Add-setMaxPlayers-API.patch
diff --git a/Spigot-Server-Patches/0553-Add-playPickupItemAnimation-to-LivingEntity.patch b/Spigot-Server-Patches/0554-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 100%
rename from Spigot-Server-Patches/0553-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to Spigot-Server-Patches/0554-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/Spigot-Server-Patches/0554-Don-t-require-FACING-data.patch b/Spigot-Server-Patches/0555-Don-t-require-FACING-data.patch
similarity index 100%
rename from Spigot-Server-Patches/0554-Don-t-require-FACING-data.patch
rename to Spigot-Server-Patches/0555-Don-t-require-FACING-data.patch
diff --git a/Spigot-Server-Patches/0555-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/Spigot-Server-Patches/0556-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
similarity index 100%
rename from Spigot-Server-Patches/0555-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
rename to Spigot-Server-Patches/0556-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
diff --git a/Spigot-Server-Patches/0556-Add-moon-phase-API.patch b/Spigot-Server-Patches/0557-Add-moon-phase-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0556-Add-moon-phase-API.patch
rename to Spigot-Server-Patches/0557-Add-moon-phase-API.patch
diff --git a/Spigot-Server-Patches/0557-Prevent-headless-pistons-from-being-created.patch b/Spigot-Server-Patches/0558-Prevent-headless-pistons-from-being-created.patch
similarity index 95%
rename from Spigot-Server-Patches/0557-Prevent-headless-pistons-from-being-created.patch
rename to Spigot-Server-Patches/0558-Prevent-headless-pistons-from-being-created.patch
index dcc0ace6d8..50e332642e 100644
--- a/Spigot-Server-Patches/0557-Prevent-headless-pistons-from-being-created.patch
+++ b/Spigot-Server-Patches/0558-Prevent-headless-pistons-from-being-created.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Prevent headless pistons from being created
 Prevent headless pistons from being created by explosions or tree/mushroom growth.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index bf456db50df5e8efdb4180ea2150ff4cab10bc28..ef9ca88522922948d9a6a09f2d6a6bad86ee5135 100644
+index 669653b5cfb057b277e509b630fd73a843b42b24..a01b28d47669cbc36a9e6c47deb5135bec231948 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -427,6 +427,12 @@ public class PaperConfig {
+@@ -436,6 +436,12 @@ public class PaperConfig {
          set("settings.unsupported-settings.allow-tnt-duplication", null);
      }
  
diff --git a/Spigot-Server-Patches/0558-Brand-support.patch b/Spigot-Server-Patches/0559-Brand-support.patch
similarity index 100%
rename from Spigot-Server-Patches/0558-Brand-support.patch
rename to Spigot-Server-Patches/0559-Brand-support.patch
diff --git a/Spigot-Server-Patches/0559-Add-BellRingEvent.patch b/Spigot-Server-Patches/0560-Add-BellRingEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0559-Add-BellRingEvent.patch
rename to Spigot-Server-Patches/0560-Add-BellRingEvent.patch
diff --git a/Spigot-Server-Patches/0560-Add-zombie-targets-turtle-egg-config.patch b/Spigot-Server-Patches/0561-Add-zombie-targets-turtle-egg-config.patch
similarity index 100%
rename from Spigot-Server-Patches/0560-Add-zombie-targets-turtle-egg-config.patch
rename to Spigot-Server-Patches/0561-Add-zombie-targets-turtle-egg-config.patch
diff --git a/Spigot-Server-Patches/0561-Buffer-joins-to-world.patch b/Spigot-Server-Patches/0562-Buffer-joins-to-world.patch
similarity index 94%
rename from Spigot-Server-Patches/0561-Buffer-joins-to-world.patch
rename to Spigot-Server-Patches/0562-Buffer-joins-to-world.patch
index 32f1f2e709..88968d0fb2 100644
--- a/Spigot-Server-Patches/0561-Buffer-joins-to-world.patch
+++ b/Spigot-Server-Patches/0562-Buffer-joins-to-world.patch
@@ -8,10 +8,10 @@ the world per tick, this attempts to reduce the impact that join floods
 has on the server
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index ef9ca88522922948d9a6a09f2d6a6bad86ee5135..f21f1e1f815a7beccad456b07568bca117adbf1e 100644
+index a01b28d47669cbc36a9e6c47deb5135bec231948..9be3a3e0752a31ca465e3e50bbdad05951a28739 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -443,4 +443,9 @@ public class PaperConfig {
+@@ -452,4 +452,9 @@ public class PaperConfig {
              maxPlayerAutoSavePerTick = (playerAutoSaveRate == -1 || playerAutoSaveRate > 100) ? 10 : 20;
          }
      }
diff --git a/Spigot-Server-Patches/0562-Optimize-redstone-algorithm.patch b/Spigot-Server-Patches/0563-Optimize-redstone-algorithm.patch
similarity index 100%
rename from Spigot-Server-Patches/0562-Optimize-redstone-algorithm.patch
rename to Spigot-Server-Patches/0563-Optimize-redstone-algorithm.patch
diff --git a/Spigot-Server-Patches/0563-Fix-hex-colors-not-working-in-some-kick-messages.patch b/Spigot-Server-Patches/0564-Fix-hex-colors-not-working-in-some-kick-messages.patch
similarity index 100%
rename from Spigot-Server-Patches/0563-Fix-hex-colors-not-working-in-some-kick-messages.patch
rename to Spigot-Server-Patches/0564-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/Spigot-Server-Patches/0564-PortalCreateEvent-needs-to-know-its-entity.patch b/Spigot-Server-Patches/0565-PortalCreateEvent-needs-to-know-its-entity.patch
similarity index 100%
rename from Spigot-Server-Patches/0564-PortalCreateEvent-needs-to-know-its-entity.patch
rename to Spigot-Server-Patches/0565-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/Spigot-Server-Patches/0565-Fix-CraftTeam-null-check.patch b/Spigot-Server-Patches/0566-Fix-CraftTeam-null-check.patch
similarity index 100%
rename from Spigot-Server-Patches/0565-Fix-CraftTeam-null-check.patch
rename to Spigot-Server-Patches/0566-Fix-CraftTeam-null-check.patch
diff --git a/Spigot-Server-Patches/0566-Add-more-Evoker-API.patch b/Spigot-Server-Patches/0567-Add-more-Evoker-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0566-Add-more-Evoker-API.patch
rename to Spigot-Server-Patches/0567-Add-more-Evoker-API.patch
diff --git a/Spigot-Server-Patches/0567-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch b/Spigot-Server-Patches/0568-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
similarity index 100%
rename from Spigot-Server-Patches/0567-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
rename to Spigot-Server-Patches/0568-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
diff --git a/Spigot-Server-Patches/0568-Create-HoverEvent-from-ItemStack-Entity.patch b/Spigot-Server-Patches/0569-Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from Spigot-Server-Patches/0568-Create-HoverEvent-from-ItemStack-Entity.patch
rename to Spigot-Server-Patches/0569-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/Spigot-Server-Patches/0569-Cache-block-data-strings.patch b/Spigot-Server-Patches/0570-Cache-block-data-strings.patch
similarity index 100%
rename from Spigot-Server-Patches/0569-Cache-block-data-strings.patch
rename to Spigot-Server-Patches/0570-Cache-block-data-strings.patch
diff --git a/Spigot-Server-Patches/0570-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/Spigot-Server-Patches/0571-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
similarity index 100%
rename from Spigot-Server-Patches/0570-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
rename to Spigot-Server-Patches/0571-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
diff --git a/Spigot-Server-Patches/0571-Add-additional-open-container-api-to-HumanEntity.patch b/Spigot-Server-Patches/0572-Add-additional-open-container-api-to-HumanEntity.patch
similarity index 100%
rename from Spigot-Server-Patches/0571-Add-additional-open-container-api-to-HumanEntity.patch
rename to Spigot-Server-Patches/0572-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/Spigot-Server-Patches/0572-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/Spigot-Server-Patches/0573-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
similarity index 100%
rename from Spigot-Server-Patches/0572-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
rename to Spigot-Server-Patches/0573-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/Spigot-Server-Patches/0573-Extend-block-drop-capture-to-capture-all-items-added.patch b/Spigot-Server-Patches/0574-Extend-block-drop-capture-to-capture-all-items-added.patch
similarity index 100%
rename from Spigot-Server-Patches/0573-Extend-block-drop-capture-to-capture-all-items-added.patch
rename to Spigot-Server-Patches/0574-Extend-block-drop-capture-to-capture-all-items-added.patch
diff --git a/Spigot-Server-Patches/0574-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch b/Spigot-Server-Patches/0575-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
similarity index 100%
rename from Spigot-Server-Patches/0574-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
rename to Spigot-Server-Patches/0575-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
diff --git a/Spigot-Server-Patches/0575-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/Spigot-Server-Patches/0576-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 100%
rename from Spigot-Server-Patches/0575-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to Spigot-Server-Patches/0576-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/Spigot-Server-Patches/0576-Lazily-track-plugin-scoreboards-by-default.patch b/Spigot-Server-Patches/0577-Lazily-track-plugin-scoreboards-by-default.patch
similarity index 97%
rename from Spigot-Server-Patches/0576-Lazily-track-plugin-scoreboards-by-default.patch
rename to Spigot-Server-Patches/0577-Lazily-track-plugin-scoreboards-by-default.patch
index 508a950d2b..3d3225b787 100644
--- a/Spigot-Server-Patches/0576-Lazily-track-plugin-scoreboards-by-default.patch
+++ b/Spigot-Server-Patches/0577-Lazily-track-plugin-scoreboards-by-default.patch
@@ -14,10 +14,10 @@ this breaks your workflow you can always force all scoreboards to be tracked wit
 settings.track-plugin-scoreboards in paper.yml.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index f21f1e1f815a7beccad456b07568bca117adbf1e..c4633989c7747f3429c9c13a36613f81971a6b50 100644
+index 9be3a3e0752a31ca465e3e50bbdad05951a28739..053da5119404ded5e3cf6bb55967cc8ffba47de6 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -448,4 +448,9 @@ public class PaperConfig {
+@@ -457,4 +457,9 @@ public class PaperConfig {
      private static void maxJoinsPerTick() {
          maxJoinsPerTick = getInt("settings.max-joins-per-tick", 3);
      }
diff --git a/Spigot-Server-Patches/0577-Entity-isTicking.patch b/Spigot-Server-Patches/0578-Entity-isTicking.patch
similarity index 100%
rename from Spigot-Server-Patches/0577-Entity-isTicking.patch
rename to Spigot-Server-Patches/0578-Entity-isTicking.patch
diff --git a/Spigot-Server-Patches/0578-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/Spigot-Server-Patches/0579-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
similarity index 100%
rename from Spigot-Server-Patches/0578-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
rename to Spigot-Server-Patches/0579-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/Spigot-Server-Patches/0579-Fix-Not-a-string-Map-Conversion-spam.patch b/Spigot-Server-Patches/0580-Fix-Not-a-string-Map-Conversion-spam.patch
similarity index 100%
rename from Spigot-Server-Patches/0579-Fix-Not-a-string-Map-Conversion-spam.patch
rename to Spigot-Server-Patches/0580-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/Spigot-Server-Patches/0580-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch b/Spigot-Server-Patches/0581-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0580-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch
rename to Spigot-Server-Patches/0581-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch
diff --git a/Spigot-Server-Patches/0581-MC-147729-Drop-items-that-are-extra-from-a-crafting-.patch b/Spigot-Server-Patches/0582-MC-147729-Drop-items-that-are-extra-from-a-crafting-.patch
similarity index 100%
rename from Spigot-Server-Patches/0581-MC-147729-Drop-items-that-are-extra-from-a-crafting-.patch
rename to Spigot-Server-Patches/0582-MC-147729-Drop-items-that-are-extra-from-a-crafting-.patch
diff --git a/Spigot-Server-Patches/0582-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/Spigot-Server-Patches/0583-Reset-Ender-Crystals-on-Dragon-Spawn.patch
similarity index 100%
rename from Spigot-Server-Patches/0582-Reset-Ender-Crystals-on-Dragon-Spawn.patch
rename to Spigot-Server-Patches/0583-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/Spigot-Server-Patches/0583-Fix-for-large-move-vectors-crashing-server.patch b/Spigot-Server-Patches/0584-Fix-for-large-move-vectors-crashing-server.patch
similarity index 100%
rename from Spigot-Server-Patches/0583-Fix-for-large-move-vectors-crashing-server.patch
rename to Spigot-Server-Patches/0584-Fix-for-large-move-vectors-crashing-server.patch
diff --git a/Spigot-Server-Patches/0584-Optimise-getType-calls.patch b/Spigot-Server-Patches/0585-Optimise-getType-calls.patch
similarity index 98%
rename from Spigot-Server-Patches/0584-Optimise-getType-calls.patch
rename to Spigot-Server-Patches/0585-Optimise-getType-calls.patch
index f5dc00293e..3d55c63ff4 100644
--- a/Spigot-Server-Patches/0584-Optimise-getType-calls.patch
+++ b/Spigot-Server-Patches/0585-Optimise-getType-calls.patch
@@ -69,7 +69,7 @@ index 0f89e776816ad4ecb6c3e54c2549692f1b5b6aae..36d7de6e6540e156499edb4b69b8bbae
  
      public void setFlag(int flag) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
-index f44fc4a95954e0745fbcd6d06b79acc37699c77a..4a9245fa5b91b894f982b29f7b87878453189cb9 100644
+index 7591159c25899fb7a58b25622c6b7241b788652e..820644e0971b42a9698208544232ea87a04ed4a9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
 @@ -44,7 +44,7 @@ public class CraftBlockData implements BlockData {
diff --git a/Spigot-Server-Patches/0585-Improve-inlinig-for-some-hot-IBlockData-methods.patch b/Spigot-Server-Patches/0586-Improve-inlinig-for-some-hot-IBlockData-methods.patch
similarity index 100%
rename from Spigot-Server-Patches/0585-Improve-inlinig-for-some-hot-IBlockData-methods.patch
rename to Spigot-Server-Patches/0586-Improve-inlinig-for-some-hot-IBlockData-methods.patch
diff --git a/Spigot-Server-Patches/0586-Retain-block-place-order-when-capturing-blockstates.patch b/Spigot-Server-Patches/0587-Retain-block-place-order-when-capturing-blockstates.patch
similarity index 100%
rename from Spigot-Server-Patches/0586-Retain-block-place-order-when-capturing-blockstates.patch
rename to Spigot-Server-Patches/0587-Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/Spigot-Server-Patches/0587-Reduce-blockpos-allocation-from-pathfinding.patch b/Spigot-Server-Patches/0588-Reduce-blockpos-allocation-from-pathfinding.patch
similarity index 100%
rename from Spigot-Server-Patches/0587-Reduce-blockpos-allocation-from-pathfinding.patch
rename to Spigot-Server-Patches/0588-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/Spigot-Server-Patches/0588-Fix-item-locations-dropped-from-campfires.patch b/Spigot-Server-Patches/0589-Fix-item-locations-dropped-from-campfires.patch
similarity index 100%
rename from Spigot-Server-Patches/0588-Fix-item-locations-dropped-from-campfires.patch
rename to Spigot-Server-Patches/0589-Fix-item-locations-dropped-from-campfires.patch
diff --git a/Spigot-Server-Patches/0589-Player-elytra-boost-API.patch b/Spigot-Server-Patches/0590-Player-elytra-boost-API.patch
similarity index 93%
rename from Spigot-Server-Patches/0589-Player-elytra-boost-API.patch
rename to Spigot-Server-Patches/0590-Player-elytra-boost-API.patch
index 7aeafcb766..1206f76d88 100644
--- a/Spigot-Server-Patches/0589-Player-elytra-boost-API.patch
+++ b/Spigot-Server-Patches/0590-Player-elytra-boost-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Player elytra boost API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7f3275b89a6ab745091a42175be916d8997163df..f4f4e29f56ff8658395c2f5049478eb54aed47bf 100644
+index fb1852ea6bf6997771a3522079bf3a32ebca357c..9f04172fb28b89f57515191204c62148d14e0034 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2086,6 +2086,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0590-Fixed-TileEntityBell-memory-leak.patch b/Spigot-Server-Patches/0591-Fixed-TileEntityBell-memory-leak.patch
similarity index 100%
rename from Spigot-Server-Patches/0590-Fixed-TileEntityBell-memory-leak.patch
rename to Spigot-Server-Patches/0591-Fixed-TileEntityBell-memory-leak.patch
diff --git a/Spigot-Server-Patches/0591-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/Spigot-Server-Patches/0592-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
similarity index 100%
rename from Spigot-Server-Patches/0591-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
rename to Spigot-Server-Patches/0592-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/Spigot-Server-Patches/0592-Add-getOfflinePlayerIfCached-String.patch b/Spigot-Server-Patches/0593-Add-getOfflinePlayerIfCached-String.patch
similarity index 100%
rename from Spigot-Server-Patches/0592-Add-getOfflinePlayerIfCached-String.patch
rename to Spigot-Server-Patches/0593-Add-getOfflinePlayerIfCached-String.patch
diff --git a/work/Spigot b/work/Spigot
index a19903d24b..37d799b230 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit a19903d24b3189e8769657b9b130f7ed5919b8b8
+Subproject commit 37d799b230195de166af55b0a746310ddcf92bc0