From b6925c36afa7565cac8f9fe9d3432fe658ca1f77 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 28 Jun 2020 04:35:41 -0400
Subject: [PATCH] Remove no longer needed undead horse leash patch

This is now default vanilla behavior

Fixes #3644
---
 ...63-Handle-Item-Meta-Inconsistencies.patch} |  0
 .../0063-Undead-horse-leashing.patch          | 52 -------------------
 ...rable-Non-Player-Arrow-Despawn-Rate.patch} |  8 +--
 ...atch => 0065-Add-World-Util-Methods.patch} |  0
 ...-Custom-replacement-for-eaten-items.patch} |  0
 ...h-absorb-values-and-repair-bad-data.patch} |  0
 ...ch => 0068-Waving-banner-workaround.patch} |  0
 ...69-Use-a-Shared-Random-for-Entities.patch} |  0
 ...e-spawn-chances-for-skeleton-horses.patch} |  4 +-
 ...ocation-getType-and-getBlockData-fo.patch} |  0
 ...kPhysicsEvent-if-a-plugin-has-a-lis.patch} |  0
 ...ntity-AddTo-RemoveFrom-World-Events.patch} |  0
 ...4-Configurable-Chunk-Inhabited-Time.patch} |  4 +-
 ...t.patch => 0075-EntityPathfindEvent.patch} |  0
 ...gionFileCache-and-make-configurable.patch} |  0
 ...-Do-not-load-chunks-for-Pathfinding.patch} |  0
 ...078-Add-PlayerUseUnknownEntityEvent.patch} |  0
 ...DebugInfo-not-initialized-on-client.patch} |  0
 ...Configurable-Grass-Spread-Tick-Rate.patch} |  4 +-
 ...-BlockPlaceEvent-triggering-physics.patch} |  0
 ...2-Remove-Debug-checks-from-DataBits.patch} |  0
 ...illa-per-world-scoreboard-coloring-.patch} |  4 +-
 ...d-for-setting-passengers-on-players.patch} |  0
 ...emove-unused-World-Tile-Entity-List.patch} |  0
 ... 0086-Don-t-tick-Skulls-unused-code.patch} |  0
 ... 0087-Configurable-Player-Collision.patch} |  0
 ...nt-to-allow-plugins-to-handle-clien.patch} |  0
 ...> 0089-Configurable-RCON-IP-address.patch} |  0
 ...90-Prevent-Fire-from-loading-chunks.patch} |  0
 ...1-Implement-PlayerLocaleChangeEvent.patch} |  0
 ...tyRegainHealthEvent-isFastRegen-API.patch} |  0
 ...to-configure-frosted_ice-properties.patch} |  4 +-
 ...possibility-for-getServer-singleton.patch} |  0
 ...tem-frames-performance-and-bug-fixe.patch} |  0
 ...API-Replenishable-Lootables-Feature.patch} |  4 +-
 ...-scoreboard-teams-to-scoreboard.dat.patch} |  0
 ...em-property-for-disabling-watchdoge.patch} |  0
 ...0099-Optimize-UserCache-Thread-Safe.patch} |  0
 ...locking-on-Network-Manager-creation.patch} |  0
 ...-Optional-TNT-doesn-t-move-in-water.patch} |  4 +-
 ...-redstone-torch-rapid-clock-removal.patch} |  0
 ...h => 0103-Add-server-name-parameter.patch} |  0
 ...n-Wither-Death-sounds-to-same-world.patch} |  0
 ...=> 0105-Fix-Double-World-Add-issues.patch} |  0
 ...tch => 0106-Fix-Old-Sign-Conversion.patch} |  0
 ...-profiles-that-have-no-UUID-and-no-.patch} |  0
 ...etting-for-proxy-online-mode-status.patch} |  0
 ...timise-BlockState-s-hashCode-equals.patch} |  0
 ...nfigurable-packet-in-spam-threshold.patch} |  0
 ...1-Configurable-flying-kick-messages.patch} |  0
 ...ch => 0112-Chunk-registration-fixes.patch} |  0
 ...k-reference-on-Craft-Entity-removal.patch} |  0
 ...to-fix-bad-Y-levels-on-player-login.patch} |  2 +-
 ...ion-to-remove-corrupt-tile-entities.patch} |  4 +-
 ...nt.patch => 0116-Add-EntityZapEvent.patch} |  0
 ...-from-ArmorStand-and-SpawnEgg-items.patch} |  4 +-
 ...18-Cache-user-authenticator-threads.patch} |  0
 ....patch => 0119-Optimise-removeQueue.patch} |  0
 ...-Allow-Reloading-of-Command-Aliases.patch} |  0
 ...-Add-source-to-PlayerExpChangeEvent.patch} |  0
 ...-Don-t-let-fishinghooks-use-portals.patch} |  0
 ... => 0123-Add-ProjectileCollideEvent.patch} |  0
 ...ent-Pathfinding-out-of-World-Border.patch} |  0
 ...mize-World.isLoaded-BlockPosition-Z.patch} |  0
 ...Bound-Treasure-Maps-to-World-Border.patch} |  0
 ...igurable-Cartographer-Treasure-Maps.patch} |  4 +-
 ... => 0128-Optimize-ItemStack.isEmpty.patch} |  0
 ...o-control-if-armour-stands-can-move.patch} |  0
 ...0-Properly-fix-item-duplication-bug.patch} |  0
 ...=> 0131-String-based-Action-Bar-API.patch} |  0
 ...-API-s.patch => 0132-Firework-API-s.patch} |  0
 ... 0133-PlayerTeleportEndGatewayEvent.patch} |  0
 ...ovide-E-TE-Chunk-count-stat-methods.patch} |  0
 ...h => 0135-Enforce-Sync-Player-Saves.patch} |  0
 ...low-entities-to-ride-themselves-572.patch} |  0
 ...I-for-Reason-Source-Triggering-play.patch} |  0
 ...patch => 0138-Cap-Entity-Collisions.patch} |  4 +-
 ...-CraftScheduler-Async-Task-Debugger.patch} |  0
 ...ore-aggressive-in-the-chunk-unload-.patch} |  0
 ...> 0141-Do-not-let-armorstands-drown.patch} |  0
 ...e-async-calls-to-restart-the-server.patch} |  0
 ...roperty-to-disable-book-size-limits.patch} |  0
 ...e-parrots-stay-on-shoulders-despite.patch} |  4 +-
 ...-option-to-prevent-player-names-fro.patch} |  0
 ...leAppender-for-console-improvements.patch} |  0
 ...rable-option-to-disable-creeper-lin.patch} |  4 +-
 ....patch => 0148-Item-canEntityPickup.patch} |  2 +-
 ...layerPickupItemEvent-setFlyAtPlayer.patch} |  0
 ...> 0150-PlayerAttemptPickupItemEvent.patch} |  0
 ...tch => 0151-Add-UnknownCommandEvent.patch} |  0
 ...tch => 0152-Basic-PlayerProfile-API.patch} |  0
 ... 0153-Shoulder-Entities-Release-API.patch} |  0
 ...patch => 0154-Profile-Lookup-Events.patch} |  0
 ...layer-logins-during-server-shutdown.patch} |  0
 ...patch => 0156-Entity-fromMobSpawner.patch} |  0
 ...7-Improve-the-Saddle-API-for-Horses.patch} |  0
 ...plement-ensureServerConversions-API.patch} |  0
 ...> 0159-Implement-getI18NDisplayName.patch} |  0
 ...=> 0160-ProfileWhitelistVerifyEvent.patch} |  0
 ...ch => 0161-Fix-this-stupid-bullshit.patch} |  0
 ...wns-should-honor-nametags-and-leash.patch} |  0
 ...mer-when-spawner-event-is-cancelled.patch} |  0
 ...4-Fix-MC-117075-TE-Unload-Lag-Spike.patch} |  0
 ...a-custom-authentication-servers-dow.patch} |  0
 ...atch => 0166-LivingEntity-setKiller.patch} |  0
 ...ms-to-redirect-System.out-err-to-lo.patch} |  0
 ...-prefixes-using-Log4J-configuration.patch} |  0
 ...Include-Log4J2-SLF4J-implementation.patch} |  0
 ...-Log4J-Configuration-Plugin-Loggers.patch} |  0
 ...t.patch => 0171-Add-PlayerJumpEvent.patch} |  0
 ...-handle-PacketPlayInKeepAlive-async.patch} |  0
 ...t-protocol-version-and-virtual-host.patch} |  0
 ...t-serverside-behavior-of-keepalives.patch} |  0
 ...Effects-only-to-players-who-can-see.patch} |  0
 ...maximum-exp-value-when-merging-orbs.patch} |  4 +-
 ... => 0177-Add-PlayerArmorChangeEvent.patch} |  0
 ...om-being-processed-when-the-player-.patch} |  0
 ...-implementations-for-captured-block.patch} |  0
 ...get-a-BlockState-without-a-snapshot.patch} |  0
 ...patch => 0181-AsyncTabCompleteEvent.patch} |  0
 ...82-Avoid-NPE-in-PathfinderGoalTempt.patch} |  0
 ...=> 0183-PlayerPickupExperienceEvent.patch} |  0
 ...tch => 0184-ExperienceOrbMergeEvent.patch} |  0
 ...-Ability-to-apply-mending-to-XP-API.patch} |  0
 ...max-squid-spawn-height-configurable.patch} |  4 +-
 ...patch => 0187-PreCreatureSpawnEvent.patch} |  0
 ...-PlayerNaturallySpawnCreaturesEvent.patch} |  2 +-
 ...Add-setPlayerProfile-API-for-Skulls.patch} |  0
 ...> 0190-Fill-Profile-Property-Events.patch} |  0
 ...layerAdvancementCriterionGrantEvent.patch} |  0
 ...ch => 0192-Add-ArmorStand-Item-Meta.patch} |  0
 ...Extend-Player-Interact-cancellation.patch} |  0
 ... 0194-Tameable-getOwnerUniqueId-API.patch} |  0
 ...-crits-helps-mitigate-hacked-client.patch} |  2 +-
 ...ing-location-from-InventoryEnderChe.patch} |  0
 ...ted-Ice-from-loading-holding-chunks.patch} |  0
 ...e-Explicit-Network-Manager-Flushing.patch} |  0
 ...t-extended-PaperServerListPingEvent.patch} |  0
 ... 0200-Improved-Async-Task-Scheduler.patch} |  0
 ...-PlayerProfile-in-AsyncPreLoginEven.patch} |  0
 ...=> 0202-Player.setPlayerProfile-API.patch} |  0
 ...h => 0203-Fix-Dragon-Server-Crashes.patch} |  0
 ...patch => 0204-getPlayerUniqueId-API.patch} |  0
 ...ake-player-data-saving-configurable.patch} |  0
 ...e-legacy-ping-handler-more-reliable.patch} |  0
 ...erverListPingEvent-for-legacy-pings.patch} |  0
 ...8-Flag-to-disable-the-channel-limit.patch} |  0
 ...-method-to-open-already-placed-sign.patch} |  0
 ...rable-sprint-interruption-on-attack.patch} |  4 +-
 ...allowed-colored-signs-to-be-created.patch} |  0
 ...t.patch => 0212-EndermanEscapeEvent.patch} |  0
 ...h => 0213-Enderman.teleportRandomly.patch} |  0
 ...214-Block-Enderpearl-Travel-Exploit.patch} |  4 +-
 ...d.spawnParticle-API-and-add-Builder.patch} |  0
 ...h => 0216-EndermanAttackPlayerEvent.patch} |  0
 ...tch => 0217-WitchConsumePotionEvent.patch} |  0
 ...patch => 0218-WitchThrowPotionEvent.patch} |  0
 ...tem-entities-with-World.spawnEntity.patch} |  0
 ...patch => 0220-WitchReadyPotionEvent.patch} |  0
 ...221-ItemStack-getMaxItemUseDuration.patch} |  0
 ...ement-EntityTeleportEndGatewayEvent.patch} |  0
 ...d-flag-on-cancel-of-Explosion-Event.patch} |  0
 ...ch => 0224-Fix-CraftEntity-hashCode.patch} |  0
 ...e-Alternative-LootPool-Luck-Formula.patch} |  0
 ...ls-when-failing-to-save-player-data.patch} |  0
 ...-shield-blocking-delay-configurable.patch} |  4 +-
 ...nt-consumeArrow-and-getArrowItem-AP.patch} |  0
 ...patch => 0229-PlayerReadyArrowEvent.patch} |  0
 ...-EntityShootBowEvent-for-Illusioner.patch} |  0
 ...lement-EntityKnockbackByEntityEvent.patch} |  2 +-
 ...patch => 0232-Expand-Explosions-API.patch} |  0
 ...vingEntity-Hand-Raised-Item-Use-API.patch} |  0
 ...-API.patch => 0234-RangedEntity-API.patch} |  0
 ...o-disable-ender-dragon-legacy-check.patch} |  4 +-
 ...-Implement-World.getEntity-UUID-API.patch} |  0
 ...0237-InventoryCloseEvent-Reason-API.patch} |  0
 ...0238-Configurable-Bed-Search-Radius.patch} |  4 +-
 ...I.patch => 0239-Vex-getSummoner-API.patch} |  0
 ...ventory-when-cancelling-PlayerInter.patch} |  0
 ...e-the-Entity-Random-seed-for-squids.patch} |  0
 ...illa-entity-warnings-for-duplicates.patch} |  0
 ...-if-stack-size-above-max-stack-size.patch} |  0
 ...44-Use-asynchronous-Log4j-2-loggers.patch} |  0
 ...more-information-to-Entity.toString.patch} |  0
 ...es-option-to-debug-dupe-uuid-issues.patch} |  0
 ...ts.patch => 0247-EnderDragon-Events.patch} |  0
 ...atch => 0248-PlayerElytraBoostEvent.patch} |  0
 ...0249-Improve-BlockPosition-inlining.patch} |  0
 ...patch => 0250-Optimize-RegistryID.c.patch} |  0
 ...-armor-stands-from-doing-entity-loo.patch} |  4 +-
 ...-Vanished-players-don-t-have-rights.patch} |  0
 ...anytime-entities-change-to-guarante.patch} |  0
 ...d-some-Debug-to-Chunk-Entity-slices.patch} |  0
 ...atch => 0255-EntityTransformedEvent.patch} |  2 +-
 ...tch => 0256-SkeletonHorse-Additions.patch} |  0
 ...event-Saving-Bad-entities-to-chunks.patch} |  0
 ...n-t-call-getItemMeta-on-hasItemMeta.patch} |  0
 ...ad-Entities-in-entityList-iteration.patch} |  0
 ...0-Implement-Expanded-ArmorStand-API.patch} |  0
 ...vent.patch => 0261-AnvilDamageEvent.patch} |  0
 ...ent.patch => 0262-Add-TNTPrimeEvent.patch} |  0
 ...d-make-tab-spam-limits-configurable.patch} |  0
 ...h => 0264-Add-hand-to-bucket-events.patch} |  0
 ...-Experience-should-save-as-Integers.patch} |  0
 ...ent-rendering-skulls-from-same-user.patch} |  0
 ...d-Early-Warning-Feature-to-WatchDog.patch} |  0
 ...0268-Make-EnderDragon-implement-Mob.patch} |  0
 ...9-Use-ConcurrentHashMap-in-JsonList.patch} |  0
 ...0-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
 ...-124320.patch => 0275-Fix-MC-124320.patch} |  0
 ...tch => 0276-Slime-Pathfinder-Events.patch} |  0
 ...e-speed-for-water-flowing-over-lava.patch} |  4 +-
 ...78-Optimize-CraftBlockData-Creation.patch} |  0
 ... => 0279-Optimize-RegistryMaterials.patch} |  0
 ...ch => 0280-Add-PhantomPreSpawnEvent.patch} |  0
 ....patch => 0281-Add-More-Creeper-API.patch} |  0
 ...=> 0282-Inventory-removeItemAnySlot.patch} |  0
 ...oadChunk-int-int-false-load-unconve.patch} |  0
 ...ray-tracing-methods-to-LivingEntity.patch} |  0
 ...-attack-cooldown-methods-for-Player.patch} |  0
 ....patch => 0286-Improve-death-events.patch} |  2 +-
 ...w-chests-to-be-placed-with-NBT-data.patch} |  0
 ...I.patch => 0288-Mob-Pathfinding-API.patch} |  0
 ...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 => 0295-PreSpawnerSpawnEvent.patch} |  0
 ...rseException-in-Entity-and-TE-names.patch} |  0
 ...=> 0297-Honor-EntityAgeable.ageLock.patch} |  0
 ...le-connection-throttle-kick-message.patch} |  0
 ...> 0299-Hook-into-CB-plugin-rewrites.patch} |  0
 ...00-Allow-setting-the-vex-s-summoner.patch} |  0
 ...I.patch => 0301-Add-sun-related-API.patch} |  2 +-
 ...Turtle-API.patch => 0302-Turtle-API.patch} |  0
 ...her-worlds-for-shooter-of-projectil.patch} |  0
 ...ator-target-events-and-improve-impl.patch} |  0
 ...-Add-Velocity-IP-Forwarding-Support.patch} |  0
 ...PI.patch => 0306-Add-more-Witch-API.patch} |  0
 ...wned-for-Villager-Aggression-Config.patch} |  0
 ...-Johnny.patch => 0308-Here-s-Johnny.patch} |  0
 ...vent-players-from-moving-into-unloa.patch} |  4 +-
 ...0-Reset-players-airTicks-on-respawn.patch} |  0
 ...after-profile-lookups-if-not-needed.patch} |  0
 ...r-Thread-Pool-and-Thread-Priorities.patch} |  0
 ...=> 0313-Optimize-World-Time-Updates.patch} |  0
 ...tore-custom-InventoryHolder-support.patch} |  0
 ...=> 0315-Use-Vanilla-Minecart-Speeds.patch} |  0
 ...0316-Fix-SpongeAbsortEvent-handling.patch} |  0
 ...-allow-digging-into-unloaded-chunks.patch} |  0
 ...mits.patch => 0318-Book-Size-Limits.patch} |  0
 ...ult-permission-message-configurable.patch} |  0
 ...revent-rayTrace-from-loading-chunks.patch} |  0
 ...-Large-Packets-disconnecting-client.patch} |  0
 ...ntity-dismount-during-teleportation.patch} |  0
 ...I.patch => 0323-Add-more-Zombie-API.patch} |  2 +-
 ...0324-Add-PlayerConnectionCloseEvent.patch} |  0
 ...revent-Enderman-from-loading-chunks.patch} |  0
 ...replace-OfflinePlayer-getLastPlayed.patch} |  2 +-
 ...tch => 0327-Fix-PlayerEditBookEvent.patch} |  0
 ...ehicle-tracking-issue-on-disconnect.patch} |  0
 ...nRetractEvent-for-all-empty-pistons.patch} |  0
 ...remove-from-being-called-on-Players.patch} |  0
 ...ent.patch => 0331-BlockDestroyEvent.patch} |  0
 ...m-Shapeless-Custom-Crafting-Recipes.patch} |  0
 ...h => 0333-Fix-sign-edit-memory-leak.patch} |  0
 ... 0334-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
 ...40-Allow-Saving-of-Oversized-Chunks.patch} |  0
 ...ggleEvent-when-whitelist-is-toggled.patch} |  0
 ...42-Add-LivingEntity-getTargetEntity.patch} |  0
 ...ngth-when-serialising-BungeeCord-te.patch} |  0
 ...=> 0344-Entity-getEntitySpawnReason.patch} |  0
 ...ty-Metadata-for-all-tracked-players.patch} |  0
 ...46-Implement-PlayerPostRespawnEvent.patch} |  0
 ...for-pickupDelay-breaks-picking-up-i.patch} |  0
 ...-and-setters-for-EntityItem-owner-a.patch} |  0
 ...ts.patch => 0349-Server-Tick-Events.patch} |  0
 ...350-PlayerDeathEvent-getItemsToKeep.patch} |  2 +-
 ...Optimize-Captured-TileEntity-Lookup.patch} |  0
 ...API.patch => 0352-Add-Heightmap-API.patch} |  0
 ...> 0353-Mob-Spawner-API-Enhancements.patch} |  0
 ...ayer-View-Distance-API-placeholders.patch} |  0
 ...-to-changed-postToMainThread-method.patch} |  0
 ...-item-frames-are-modified-MC-123450.patch} |  0
 ...sPrimaryThread-and-MinecraftServer-.patch} |  0
 ...-entity-loss-due-to-unloaded-chunks.patch} |  0
 ... 0359-Duplicate-UUID-Resolve-Option.patch} |  4 +-
 ...60-improve-CraftWorld-isChunkLoaded.patch} |  0
 ...e-Keep-Spawn-Loaded-range-per-world.patch} |  4 +-
 ...ityAreaEffectCloud-from-going-negat.patch} |  0
 ....patch => 0363-ChunkMapDistance-CME.patch} |  0
 ...0364-Implement-CraftBlockSoundGroup.patch} |  0
 ...d.patch => 0365-Chunk-debug-command.patch} |  0
 ...ptions-from-dispenser-entity-spawns.patch} |  0
 ...67-Fix-World-isChunkGenerated-calls.patch} |  0
 ...te-location-if-we-failed-to-read-it.patch} |  0
 ...aletteBlock-instead-of-ReentrantLoc.patch} |  0
 ...ch => 0370-incremental-chunk-saving.patch} |  4 +-
 ...2-Anti-Xray.patch => 0371-Anti-Xray.patch} |  4 +-
 ...l-Spawned-mobs-towards-natural-spaw.patch} |  4 +-
 ...urable-projectile-relative-velocity.patch} |  4 +-
 ...being-ticked-when-notifying-navigat.patch} |  0
 ...h => 0375-offset-item-frame-ticking.patch} |  0
 ...pper-searches-if-there-are-no-items.patch} |  0
 ...7-Asynchronous-chunk-IO-and-loading.patch} |  0
 ...tChunkIfLoadedImmediately-in-places.patch} |  0
 ...ads.patch => 0379-Reduce-sync-loads.patch} |  0
 ...ement-alternative-item-despawn-rate.patch} |  4 +-
 ...f-we-have-a-custom-Bukkit-generator.patch} |  0
 ...-158900.patch => 0382-Fix-MC-158900.patch} |  0
 ...ment-optional-per-player-mob-spawns.patch} |  4 +-
 ...event-consuming-the-wrong-itemstack.patch} |  0
 ...ssanger-entities-once-from-spawners.patch} |  0
 ... => 0386-Fix-nether-portal-creation.patch} |  0
 ...gs.patch => 0387-Generator-Settings.patch} |  4 +-
 ...-161754.patch => 0388-Fix-MC-161754.patch} |  0
 ...e-improvement-for-Chunk.getEntities.patch} |  0
 ...anging-entities-that-are-not-ItemFr.patch} |  0
 ...91-Expose-the-internal-current-tick.patch} |  0
 ...sneak-when-changing-worlds-MC-10657.patch} |  0
 ...-option-to-disable-pillager-patrols.patch} |  4 +-
 ...r-when-player-hand-set-to-empty-typ.patch} |  0
 ...=> 0395-PlayerLaunchProjectileEvent.patch} |  0
 ...tMagicNumbers.isSupportedApiVersion.patch} |  0
 ...k-loads-when-villagers-try-to-find-.patch} |  0
 ...656-Fix-Follow-Range-Initial-Target.patch} |  4 +-
 ...pers.patch => 0399-Optimize-Hoppers.patch} |  4 +-
 ...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
 ...405-Fix-items-not-falling-correctly.patch} |  0
 ...patch => 0406-Lag-compensate-eating.patch} |  0
 ...ize-call-to-getFluid-for-explosions.patch} |  0
 ...-in-stack-not-having-effects-when-d.patch} |  0
 ...=> 0409-Entity-Activation-Range-2.0.patch} |  2 +-
 ...Add-effect-to-block-break-naturally.patch} |  0
 ...=> 0411-Tracking-Range-Improvements.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 => 0416-Add-ThrownEggHatchEvent.patch} |  0
 ... 0417-Optimise-random-block-ticking.patch} |  0
 ...p-API.patch => 0418-Entity-Jump-API.patch} |  0
 ...-to-nerf-pigmen-from-nether-portals.patch} |  4 +-
 ... => 0420-Make-the-GUI-graph-fancier.patch} |  0
 ...21-add-hand-to-BlockMultiPlaceEvent.patch} |  0
 ...2-Prevent-teleporting-dead-entities.patch} |  0
 ...ipwire-hook-placement-before-update.patch} |  0
 ...o-allow-iron-golems-to-spawn-in-air.patch} |  4 +-
 ...chance-of-villager-zombie-infection.patch} |  4 +-
 ...tch => 0426-Optimise-Chunk-getFluid.patch} |  0
 ...mise-TickListServer-by-rewriting-it.patch} |  0
 ...pawn-settings-and-per-player-option.patch} |  6 +--
 ...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 => 0435-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 => 0438-Increase-Light-Queue-Size.patch} |  4 +-
 ...sks-Speed-up-processing-of-chunk-lo.patch} |  0
 ...ove-existing-players-to-world-spawn.patch} |  2 +-
 ...Add-tick-times-API-and-mspt-command.patch} |  0
 ...42-Expose-MinecraftServer-isRunning.patch} |  0
 ...dd-Raw-Byte-ItemStack-Serialization.patch} |  0
 ...4-Remove-streams-from-Mob-AI-System.patch} |  0
 ...ons-until-after-entity-ticking-is-d.patch} |  0
 ... => 0446-Async-command-map-building.patch} |  0
 ...h => 0447-Improved-Watchdog-Support.patch} |  0
 ....patch => 0448-Optimize-Pathfinding.patch} |  0
 ...9-Reduce-Either-Optional-allocation.patch} |  0
 ...450-Remove-streams-from-PairedQueue.patch} |  0
 ...-memory-footprint-of-NBTTagCompound.patch} |  0
 ...ent-opening-inventories-when-frozen.patch} |  0
 ...53-Optimise-ArraySetSorted-removeIf.patch} |  0
 ...entity-collision-code-if-not-needed.patch} |  0
 ...mise-entity-hard-collision-checking.patch} |  0
 ...viderServer-s-chunk-level-checking-.patch} |  0
 ...teleport-command-to-valid-locations.patch} |  0
 ...Implement-Player-Client-Options-API.patch} |  0
 ...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} |  2 +-
 ...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} |  4 +-
 ...-duplication-issues-and-teleport-is.patch} |  0
 ...0470-Implement-Brigadier-Mojang-API.patch} |  0
 ...patch => 0471-Villager-Restocks-API.patch} |  0
 ...ickItem-Packet-and-kick-for-invalid.patch} |  0
 ...n.patch => 0473-Expose-game-version.patch} |  0
 ...0474-Sync-position-on-teleportation.patch} |  0
 ...> 0475-Optimize-Voxel-Shape-Merging.patch} |  0
 ...per-thread-native-byte-buffer-cache.patch} |  2 +-
 ...atch => 0477-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} |  6 +--
 ...=> 0482-Add-villager-reputation-API.patch} |  0
 ...and.patch => 0483-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 => 0487-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} |  0
 ...e-NibbleArray-to-use-pooled-buffers.patch} |  0
 ...leInt-allocations-from-light-engine.patch} |  0
 ...location-of-Vec3D-by-entity-tracker.patch} |  0
 ...> 0494-Ensure-safe-gateway-teleport.patch} |  0
 ...-for-console-having-all-permissions.patch} |  0
 ...und-for-Client-Lag-Spikes-MC-162253.patch} |  0
 ...-Priority-Urgency-System-for-Chunks.patch} |  2 +-
 ...n-Full-Status-Chunk-NBT-Memory-Leak.patch} |  0
 ...packets-to-nearby-locations-sounds-.patch} |  2 +-
 ...prove-Chunk-Status-Transition-Speed.patch} |  0
 ...x-villager-trading-demand-MC-163962.patch} |  0
 ... => 0502-Maps-shouldn-t-load-chunks.patch} |  0
 ...okup-for-Treasure-Maps-Fixes-lag-fr.patch} |  0
 ...Optimize-Bit-Operations-by-inlining.patch} |  0
 ...patch => 0505-Optimize-Light-Engine.patch} |  0
 ...nk-Unloads-based-on-Player-Movement.patch} |  4 +-
 ...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} |  0
 ...uping.patch => 0511-Fix-sand-duping.patch} |  0
 ...desync-in-playerconnection-causing-.patch} |  0
 ...ch => 0513-Fix-enderdragon-exp-dupe.patch} |  0
 ...older-method-without-block-snapshot.patch} |  0
 ...h => 0515-Expose-Arrow-getItemStack.patch} |  0
 ...mplement-PlayerRecipeBookClickEvent.patch} |  0
 ... => 0517-Add-PrepareGrindstoneEvent.patch} |  0
 ...-Hide-sync-chunk-writes-behind-flag.patch} |  0
 ...it-lightning-strike-effect-distance.patch} |  4 +-
 ...0-Add-permission-for-command-blocks.patch} |  0
 ...ure-Entity-AABB-s-are-never-invalid.patch} |  0
 ...orldBorder-collision-checks-and-air.patch} |  0
 ...d-Difficulty-Remembering-Difficulty.patch} |  0
 462 files changed, 117 insertions(+), 169 deletions(-)
 rename Spigot-Server-Patches/{0064-Handle-Item-Meta-Inconsistencies.patch => 0063-Handle-Item-Meta-Inconsistencies.patch} (100%)
 delete mode 100644 Spigot-Server-Patches/0063-Undead-horse-leashing.patch
 rename Spigot-Server-Patches/{0065-Configurable-Non-Player-Arrow-Despawn-Rate.patch => 0064-Configurable-Non-Player-Arrow-Despawn-Rate.patch} (88%)
 rename Spigot-Server-Patches/{0066-Add-World-Util-Methods.patch => 0065-Add-World-Util-Methods.patch} (100%)
 rename Spigot-Server-Patches/{0067-Custom-replacement-for-eaten-items.patch => 0066-Custom-replacement-for-eaten-items.patch} (100%)
 rename Spigot-Server-Patches/{0068-handle-NaN-health-absorb-values-and-repair-bad-data.patch => 0067-handle-NaN-health-absorb-values-and-repair-bad-data.patch} (100%)
 rename Spigot-Server-Patches/{0069-Waving-banner-workaround.patch => 0068-Waving-banner-workaround.patch} (100%)
 rename Spigot-Server-Patches/{0070-Use-a-Shared-Random-for-Entities.patch => 0069-Use-a-Shared-Random-for-Entities.patch} (100%)
 rename Spigot-Server-Patches/{0071-Configurable-spawn-chances-for-skeleton-horses.patch => 0070-Configurable-spawn-chances-for-skeleton-horses.patch} (93%)
 rename Spigot-Server-Patches/{0072-Optimize-isValidLocation-getType-and-getBlockData-fo.patch => 0071-Optimize-isValidLocation-getType-and-getBlockData-fo.patch} (100%)
 rename Spigot-Server-Patches/{0073-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch => 0072-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch} (100%)
 rename Spigot-Server-Patches/{0074-Entity-AddTo-RemoveFrom-World-Events.patch => 0073-Entity-AddTo-RemoveFrom-World-Events.patch} (100%)
 rename Spigot-Server-Patches/{0075-Configurable-Chunk-Inhabited-Time.patch => 0074-Configurable-Chunk-Inhabited-Time.patch} (93%)
 rename Spigot-Server-Patches/{0076-EntityPathfindEvent.patch => 0075-EntityPathfindEvent.patch} (100%)
 rename Spigot-Server-Patches/{0077-Sanitise-RegionFileCache-and-make-configurable.patch => 0076-Sanitise-RegionFileCache-and-make-configurable.patch} (100%)
 rename Spigot-Server-Patches/{0078-Do-not-load-chunks-for-Pathfinding.patch => 0077-Do-not-load-chunks-for-Pathfinding.patch} (100%)
 rename Spigot-Server-Patches/{0079-Add-PlayerUseUnknownEntityEvent.patch => 0078-Add-PlayerUseUnknownEntityEvent.patch} (100%)
 rename Spigot-Server-Patches/{0080-Fix-reducedDebugInfo-not-initialized-on-client.patch => 0079-Fix-reducedDebugInfo-not-initialized-on-client.patch} (100%)
 rename Spigot-Server-Patches/{0081-Configurable-Grass-Spread-Tick-Rate.patch => 0080-Configurable-Grass-Spread-Tick-Rate.patch} (92%)
 rename Spigot-Server-Patches/{0082-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch => 0081-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch} (100%)
 rename Spigot-Server-Patches/{0083-Remove-Debug-checks-from-DataBits.patch => 0082-Remove-Debug-checks-from-DataBits.patch} (100%)
 rename Spigot-Server-Patches/{0084-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch => 0083-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch} (95%)
 rename Spigot-Server-Patches/{0085-Workaround-for-setting-passengers-on-players.patch => 0084-Workaround-for-setting-passengers-on-players.patch} (100%)
 rename Spigot-Server-Patches/{0086-Remove-unused-World-Tile-Entity-List.patch => 0085-Remove-unused-World-Tile-Entity-List.patch} (100%)
 rename Spigot-Server-Patches/{0087-Don-t-tick-Skulls-unused-code.patch => 0086-Don-t-tick-Skulls-unused-code.patch} (100%)
 rename Spigot-Server-Patches/{0088-Configurable-Player-Collision.patch => 0087-Configurable-Player-Collision.patch} (100%)
 rename Spigot-Server-Patches/{0089-Add-handshake-event-to-allow-plugins-to-handle-clien.patch => 0088-Add-handshake-event-to-allow-plugins-to-handle-clien.patch} (100%)
 rename Spigot-Server-Patches/{0090-Configurable-RCON-IP-address.patch => 0089-Configurable-RCON-IP-address.patch} (100%)
 rename Spigot-Server-Patches/{0091-Prevent-Fire-from-loading-chunks.patch => 0090-Prevent-Fire-from-loading-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0092-Implement-PlayerLocaleChangeEvent.patch => 0091-Implement-PlayerLocaleChangeEvent.patch} (100%)
 rename Spigot-Server-Patches/{0093-EntityRegainHealthEvent-isFastRegen-API.patch => 0092-EntityRegainHealthEvent-isFastRegen-API.patch} (100%)
 rename Spigot-Server-Patches/{0094-Add-ability-to-configure-frosted_ice-properties.patch => 0093-Add-ability-to-configure-frosted_ice-properties.patch} (95%)
 rename Spigot-Server-Patches/{0095-remove-null-possibility-for-getServer-singleton.patch => 0094-remove-null-possibility-for-getServer-singleton.patch} (100%)
 rename Spigot-Server-Patches/{0096-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch => 0095-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch} (100%)
 rename Spigot-Server-Patches/{0097-LootTable-API-Replenishable-Lootables-Feature.patch => 0096-LootTable-API-Replenishable-Lootables-Feature.patch} (99%)
 rename Spigot-Server-Patches/{0098-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch => 0097-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch} (100%)
 rename Spigot-Server-Patches/{0099-System-property-for-disabling-watchdoge.patch => 0098-System-property-for-disabling-watchdoge.patch} (100%)
 rename Spigot-Server-Patches/{0100-Optimize-UserCache-Thread-Safe.patch => 0099-Optimize-UserCache-Thread-Safe.patch} (100%)
 rename Spigot-Server-Patches/{0101-Avoid-blocking-on-Network-Manager-creation.patch => 0100-Avoid-blocking-on-Network-Manager-creation.patch} (100%)
 rename Spigot-Server-Patches/{0102-Optional-TNT-doesn-t-move-in-water.patch => 0101-Optional-TNT-doesn-t-move-in-water.patch} (96%)
 rename Spigot-Server-Patches/{0103-Faster-redstone-torch-rapid-clock-removal.patch => 0102-Faster-redstone-torch-rapid-clock-removal.patch} (100%)
 rename Spigot-Server-Patches/{0104-Add-server-name-parameter.patch => 0103-Add-server-name-parameter.patch} (100%)
 rename Spigot-Server-Patches/{0105-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch => 0104-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch} (100%)
 rename Spigot-Server-Patches/{0106-Fix-Double-World-Add-issues.patch => 0105-Fix-Double-World-Add-issues.patch} (100%)
 rename Spigot-Server-Patches/{0107-Fix-Old-Sign-Conversion.patch => 0106-Fix-Old-Sign-Conversion.patch} (100%)
 rename Spigot-Server-Patches/{0108-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch => 0107-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch} (100%)
 rename Spigot-Server-Patches/{0109-Add-setting-for-proxy-online-mode-status.patch => 0108-Add-setting-for-proxy-online-mode-status.patch} (100%)
 rename Spigot-Server-Patches/{0110-Optimise-BlockState-s-hashCode-equals.patch => 0109-Optimise-BlockState-s-hashCode-equals.patch} (100%)
 rename Spigot-Server-Patches/{0111-Configurable-packet-in-spam-threshold.patch => 0110-Configurable-packet-in-spam-threshold.patch} (100%)
 rename Spigot-Server-Patches/{0112-Configurable-flying-kick-messages.patch => 0111-Configurable-flying-kick-messages.patch} (100%)
 rename Spigot-Server-Patches/{0113-Chunk-registration-fixes.patch => 0112-Chunk-registration-fixes.patch} (100%)
 rename Spigot-Server-Patches/{0114-Remove-FishingHook-reference-on-Craft-Entity-removal.patch => 0113-Remove-FishingHook-reference-on-Craft-Entity-removal.patch} (100%)
 rename Spigot-Server-Patches/{0115-Auto-fix-bad-Y-levels-on-player-login.patch => 0114-Auto-fix-bad-Y-levels-on-player-login.patch} (91%)
 rename Spigot-Server-Patches/{0116-Option-to-remove-corrupt-tile-entities.patch => 0115-Option-to-remove-corrupt-tile-entities.patch} (92%)
 rename Spigot-Server-Patches/{0117-Add-EntityZapEvent.patch => 0116-Add-EntityZapEvent.patch} (100%)
 rename Spigot-Server-Patches/{0118-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch => 0117-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch} (94%)
 rename Spigot-Server-Patches/{0119-Cache-user-authenticator-threads.patch => 0118-Cache-user-authenticator-threads.patch} (100%)
 rename Spigot-Server-Patches/{0120-Optimise-removeQueue.patch => 0119-Optimise-removeQueue.patch} (100%)
 rename Spigot-Server-Patches/{0121-Allow-Reloading-of-Command-Aliases.patch => 0120-Allow-Reloading-of-Command-Aliases.patch} (100%)
 rename Spigot-Server-Patches/{0122-Add-source-to-PlayerExpChangeEvent.patch => 0121-Add-source-to-PlayerExpChangeEvent.patch} (100%)
 rename Spigot-Server-Patches/{0123-Don-t-let-fishinghooks-use-portals.patch => 0122-Don-t-let-fishinghooks-use-portals.patch} (100%)
 rename Spigot-Server-Patches/{0124-Add-ProjectileCollideEvent.patch => 0123-Add-ProjectileCollideEvent.patch} (100%)
 rename Spigot-Server-Patches/{0125-Prevent-Pathfinding-out-of-World-Border.patch => 0124-Prevent-Pathfinding-out-of-World-Border.patch} (100%)
 rename Spigot-Server-Patches/{0126-Optimize-World.isLoaded-BlockPosition-Z.patch => 0125-Optimize-World.isLoaded-BlockPosition-Z.patch} (100%)
 rename Spigot-Server-Patches/{0127-Bound-Treasure-Maps-to-World-Border.patch => 0126-Bound-Treasure-Maps-to-World-Border.patch} (100%)
 rename Spigot-Server-Patches/{0128-Configurable-Cartographer-Treasure-Maps.patch => 0127-Configurable-Cartographer-Treasure-Maps.patch} (95%)
 rename Spigot-Server-Patches/{0129-Optimize-ItemStack.isEmpty.patch => 0128-Optimize-ItemStack.isEmpty.patch} (100%)
 rename Spigot-Server-Patches/{0130-Add-API-methods-to-control-if-armour-stands-can-move.patch => 0129-Add-API-methods-to-control-if-armour-stands-can-move.patch} (100%)
 rename Spigot-Server-Patches/{0131-Properly-fix-item-duplication-bug.patch => 0130-Properly-fix-item-duplication-bug.patch} (100%)
 rename Spigot-Server-Patches/{0132-String-based-Action-Bar-API.patch => 0131-String-based-Action-Bar-API.patch} (100%)
 rename Spigot-Server-Patches/{0133-Firework-API-s.patch => 0132-Firework-API-s.patch} (100%)
 rename Spigot-Server-Patches/{0134-PlayerTeleportEndGatewayEvent.patch => 0133-PlayerTeleportEndGatewayEvent.patch} (100%)
 rename Spigot-Server-Patches/{0135-Provide-E-TE-Chunk-count-stat-methods.patch => 0134-Provide-E-TE-Chunk-count-stat-methods.patch} (100%)
 rename Spigot-Server-Patches/{0136-Enforce-Sync-Player-Saves.patch => 0135-Enforce-Sync-Player-Saves.patch} (100%)
 rename Spigot-Server-Patches/{0137-Don-t-allow-entities-to-ride-themselves-572.patch => 0136-Don-t-allow-entities-to-ride-themselves-572.patch} (100%)
 rename Spigot-Server-Patches/{0138-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch => 0137-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch} (100%)
 rename Spigot-Server-Patches/{0139-Cap-Entity-Collisions.patch => 0138-Cap-Entity-Collisions.patch} (95%)
 rename Spigot-Server-Patches/{0140-Remove-CraftScheduler-Async-Task-Debugger.patch => 0139-Remove-CraftScheduler-Async-Task-Debugger.patch} (100%)
 rename Spigot-Server-Patches/{0141-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch => 0140-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch} (100%)
 rename Spigot-Server-Patches/{0142-Do-not-let-armorstands-drown.patch => 0141-Do-not-let-armorstands-drown.patch} (100%)
 rename Spigot-Server-Patches/{0143-Properly-handle-async-calls-to-restart-the-server.patch => 0142-Properly-handle-async-calls-to-restart-the-server.patch} (100%)
 rename Spigot-Server-Patches/{0144-Add-system-property-to-disable-book-size-limits.patch => 0143-Add-system-property-to-disable-book-size-limits.patch} (100%)
 rename Spigot-Server-Patches/{0145-Add-option-to-make-parrots-stay-on-shoulders-despite.patch => 0144-Add-option-to-make-parrots-stay-on-shoulders-despite.patch} (95%)
 rename Spigot-Server-Patches/{0146-Add-configuration-option-to-prevent-player-names-fro.patch => 0145-Add-configuration-option-to-prevent-player-names-fro.patch} (100%)
 rename Spigot-Server-Patches/{0147-Use-TerminalConsoleAppender-for-console-improvements.patch => 0146-Use-TerminalConsoleAppender-for-console-improvements.patch} (100%)
 rename Spigot-Server-Patches/{0148-provide-a-configurable-option-to-disable-creeper-lin.patch => 0147-provide-a-configurable-option-to-disable-creeper-lin.patch} (92%)
 rename Spigot-Server-Patches/{0149-Item-canEntityPickup.patch => 0148-Item-canEntityPickup.patch} (96%)
 rename Spigot-Server-Patches/{0150-PlayerPickupItemEvent-setFlyAtPlayer.patch => 0149-PlayerPickupItemEvent-setFlyAtPlayer.patch} (100%)
 rename Spigot-Server-Patches/{0151-PlayerAttemptPickupItemEvent.patch => 0150-PlayerAttemptPickupItemEvent.patch} (100%)
 rename Spigot-Server-Patches/{0152-Add-UnknownCommandEvent.patch => 0151-Add-UnknownCommandEvent.patch} (100%)
 rename Spigot-Server-Patches/{0153-Basic-PlayerProfile-API.patch => 0152-Basic-PlayerProfile-API.patch} (100%)
 rename Spigot-Server-Patches/{0154-Shoulder-Entities-Release-API.patch => 0153-Shoulder-Entities-Release-API.patch} (100%)
 rename Spigot-Server-Patches/{0155-Profile-Lookup-Events.patch => 0154-Profile-Lookup-Events.patch} (100%)
 rename Spigot-Server-Patches/{0156-Block-player-logins-during-server-shutdown.patch => 0155-Block-player-logins-during-server-shutdown.patch} (100%)
 rename Spigot-Server-Patches/{0157-Entity-fromMobSpawner.patch => 0156-Entity-fromMobSpawner.patch} (100%)
 rename Spigot-Server-Patches/{0158-Improve-the-Saddle-API-for-Horses.patch => 0157-Improve-the-Saddle-API-for-Horses.patch} (100%)
 rename Spigot-Server-Patches/{0159-Implement-ensureServerConversions-API.patch => 0158-Implement-ensureServerConversions-API.patch} (100%)
 rename Spigot-Server-Patches/{0160-Implement-getI18NDisplayName.patch => 0159-Implement-getI18NDisplayName.patch} (100%)
 rename Spigot-Server-Patches/{0161-ProfileWhitelistVerifyEvent.patch => 0160-ProfileWhitelistVerifyEvent.patch} (100%)
 rename Spigot-Server-Patches/{0162-Fix-this-stupid-bullshit.patch => 0161-Fix-this-stupid-bullshit.patch} (100%)
 rename Spigot-Server-Patches/{0163-Ocelot-despawns-should-honor-nametags-and-leash.patch => 0162-Ocelot-despawns-should-honor-nametags-and-leash.patch} (100%)
 rename Spigot-Server-Patches/{0164-Reset-spawner-timer-when-spawner-event-is-cancelled.patch => 0163-Reset-spawner-timer-when-spawner-event-is-cancelled.patch} (100%)
 rename Spigot-Server-Patches/{0165-Fix-MC-117075-TE-Unload-Lag-Spike.patch => 0164-Fix-MC-117075-TE-Unload-Lag-Spike.patch} (100%)
 rename Spigot-Server-Patches/{0166-Allow-specifying-a-custom-authentication-servers-dow.patch => 0165-Allow-specifying-a-custom-authentication-servers-dow.patch} (100%)
 rename Spigot-Server-Patches/{0167-LivingEntity-setKiller.patch => 0166-LivingEntity-setKiller.patch} (100%)
 rename Spigot-Server-Patches/{0168-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch => 0167-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch} (100%)
 rename Spigot-Server-Patches/{0169-Handle-plugin-prefixes-using-Log4J-configuration.patch => 0168-Handle-plugin-prefixes-using-Log4J-configuration.patch} (100%)
 rename Spigot-Server-Patches/{0170-Include-Log4J2-SLF4J-implementation.patch => 0169-Include-Log4J2-SLF4J-implementation.patch} (100%)
 rename Spigot-Server-Patches/{0171-Improve-Log4J-Configuration-Plugin-Loggers.patch => 0170-Improve-Log4J-Configuration-Plugin-Loggers.patch} (100%)
 rename Spigot-Server-Patches/{0172-Add-PlayerJumpEvent.patch => 0171-Add-PlayerJumpEvent.patch} (100%)
 rename Spigot-Server-Patches/{0173-handle-PacketPlayInKeepAlive-async.patch => 0172-handle-PacketPlayInKeepAlive-async.patch} (100%)
 rename Spigot-Server-Patches/{0174-Expose-client-protocol-version-and-virtual-host.patch => 0173-Expose-client-protocol-version-and-virtual-host.patch} (100%)
 rename Spigot-Server-Patches/{0175-revert-serverside-behavior-of-keepalives.patch => 0174-revert-serverside-behavior-of-keepalives.patch} (100%)
 rename Spigot-Server-Patches/{0176-Send-attack-SoundEffects-only-to-players-who-can-see.patch => 0175-Send-attack-SoundEffects-only-to-players-who-can-see.patch} (100%)
 rename Spigot-Server-Patches/{0177-Option-for-maximum-exp-value-when-merging-orbs.patch => 0176-Option-for-maximum-exp-value-when-merging-orbs.patch} (95%)
 rename Spigot-Server-Patches/{0178-Add-PlayerArmorChangeEvent.patch => 0177-Add-PlayerArmorChangeEvent.patch} (100%)
 rename Spigot-Server-Patches/{0179-Prevent-logins-from-being-processed-when-the-player-.patch => 0178-Prevent-logins-from-being-processed-when-the-player-.patch} (100%)
 rename Spigot-Server-Patches/{0180-use-CB-BlockState-implementations-for-captured-block.patch => 0179-use-CB-BlockState-implementations-for-captured-block.patch} (100%)
 rename Spigot-Server-Patches/{0181-API-to-get-a-BlockState-without-a-snapshot.patch => 0180-API-to-get-a-BlockState-without-a-snapshot.patch} (100%)
 rename Spigot-Server-Patches/{0182-AsyncTabCompleteEvent.patch => 0181-AsyncTabCompleteEvent.patch} (100%)
 rename Spigot-Server-Patches/{0183-Avoid-NPE-in-PathfinderGoalTempt.patch => 0182-Avoid-NPE-in-PathfinderGoalTempt.patch} (100%)
 rename Spigot-Server-Patches/{0184-PlayerPickupExperienceEvent.patch => 0183-PlayerPickupExperienceEvent.patch} (100%)
 rename Spigot-Server-Patches/{0185-ExperienceOrbMergeEvent.patch => 0184-ExperienceOrbMergeEvent.patch} (100%)
 rename Spigot-Server-Patches/{0186-Ability-to-apply-mending-to-XP-API.patch => 0185-Ability-to-apply-mending-to-XP-API.patch} (100%)
 rename Spigot-Server-Patches/{0187-Make-max-squid-spawn-height-configurable.patch => 0186-Make-max-squid-spawn-height-configurable.patch} (93%)
 rename Spigot-Server-Patches/{0188-PreCreatureSpawnEvent.patch => 0187-PreCreatureSpawnEvent.patch} (100%)
 rename Spigot-Server-Patches/{0189-PlayerNaturallySpawnCreaturesEvent.patch => 0188-PlayerNaturallySpawnCreaturesEvent.patch} (97%)
 rename Spigot-Server-Patches/{0190-Add-setPlayerProfile-API-for-Skulls.patch => 0189-Add-setPlayerProfile-API-for-Skulls.patch} (100%)
 rename Spigot-Server-Patches/{0191-Fill-Profile-Property-Events.patch => 0190-Fill-Profile-Property-Events.patch} (100%)
 rename Spigot-Server-Patches/{0192-PlayerAdvancementCriterionGrantEvent.patch => 0191-PlayerAdvancementCriterionGrantEvent.patch} (100%)
 rename Spigot-Server-Patches/{0193-Add-ArmorStand-Item-Meta.patch => 0192-Add-ArmorStand-Item-Meta.patch} (100%)
 rename Spigot-Server-Patches/{0194-Extend-Player-Interact-cancellation.patch => 0193-Extend-Player-Interact-cancellation.patch} (100%)
 rename Spigot-Server-Patches/{0195-Tameable-getOwnerUniqueId-API.patch => 0194-Tameable-getOwnerUniqueId-API.patch} (100%)
 rename Spigot-Server-Patches/{0196-Toggleable-player-crits-helps-mitigate-hacked-client.patch => 0195-Toggleable-player-crits-helps-mitigate-hacked-client.patch} (95%)
 rename Spigot-Server-Patches/{0197-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch => 0196-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch} (100%)
 rename Spigot-Server-Patches/{0198-Prevent-Frosted-Ice-from-loading-holding-chunks.patch => 0197-Prevent-Frosted-Ice-from-loading-holding-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0199-Disable-Explicit-Network-Manager-Flushing.patch => 0198-Disable-Explicit-Network-Manager-Flushing.patch} (100%)
 rename Spigot-Server-Patches/{0200-Implement-extended-PaperServerListPingEvent.patch => 0199-Implement-extended-PaperServerListPingEvent.patch} (100%)
 rename Spigot-Server-Patches/{0201-Improved-Async-Task-Scheduler.patch => 0200-Improved-Async-Task-Scheduler.patch} (100%)
 rename Spigot-Server-Patches/{0202-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch => 0201-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch} (100%)
 rename Spigot-Server-Patches/{0203-Player.setPlayerProfile-API.patch => 0202-Player.setPlayerProfile-API.patch} (100%)
 rename Spigot-Server-Patches/{0204-Fix-Dragon-Server-Crashes.patch => 0203-Fix-Dragon-Server-Crashes.patch} (100%)
 rename Spigot-Server-Patches/{0205-getPlayerUniqueId-API.patch => 0204-getPlayerUniqueId-API.patch} (100%)
 rename Spigot-Server-Patches/{0206-Make-player-data-saving-configurable.patch => 0205-Make-player-data-saving-configurable.patch} (100%)
 rename Spigot-Server-Patches/{0207-Make-legacy-ping-handler-more-reliable.patch => 0206-Make-legacy-ping-handler-more-reliable.patch} (100%)
 rename Spigot-Server-Patches/{0208-Call-PaperServerListPingEvent-for-legacy-pings.patch => 0207-Call-PaperServerListPingEvent-for-legacy-pings.patch} (100%)
 rename Spigot-Server-Patches/{0209-Flag-to-disable-the-channel-limit.patch => 0208-Flag-to-disable-the-channel-limit.patch} (100%)
 rename Spigot-Server-Patches/{0210-Add-method-to-open-already-placed-sign.patch => 0209-Add-method-to-open-already-placed-sign.patch} (100%)
 rename Spigot-Server-Patches/{0211-Configurable-sprint-interruption-on-attack.patch => 0210-Configurable-sprint-interruption-on-attack.patch} (92%)
 rename Spigot-Server-Patches/{0212-Fix-exploit-that-allowed-colored-signs-to-be-created.patch => 0211-Fix-exploit-that-allowed-colored-signs-to-be-created.patch} (100%)
 rename Spigot-Server-Patches/{0213-EndermanEscapeEvent.patch => 0212-EndermanEscapeEvent.patch} (100%)
 rename Spigot-Server-Patches/{0214-Enderman.teleportRandomly.patch => 0213-Enderman.teleportRandomly.patch} (100%)
 rename Spigot-Server-Patches/{0215-Block-Enderpearl-Travel-Exploit.patch => 0214-Block-Enderpearl-Travel-Exploit.patch} (93%)
 rename Spigot-Server-Patches/{0216-Expand-World.spawnParticle-API-and-add-Builder.patch => 0215-Expand-World.spawnParticle-API-and-add-Builder.patch} (100%)
 rename Spigot-Server-Patches/{0217-EndermanAttackPlayerEvent.patch => 0216-EndermanAttackPlayerEvent.patch} (100%)
 rename Spigot-Server-Patches/{0218-WitchConsumePotionEvent.patch => 0217-WitchConsumePotionEvent.patch} (100%)
 rename Spigot-Server-Patches/{0219-WitchThrowPotionEvent.patch => 0218-WitchThrowPotionEvent.patch} (100%)
 rename Spigot-Server-Patches/{0220-Allow-spawning-Item-entities-with-World.spawnEntity.patch => 0219-Allow-spawning-Item-entities-with-World.spawnEntity.patch} (100%)
 rename Spigot-Server-Patches/{0221-WitchReadyPotionEvent.patch => 0220-WitchReadyPotionEvent.patch} (100%)
 rename Spigot-Server-Patches/{0222-ItemStack-getMaxItemUseDuration.patch => 0221-ItemStack-getMaxItemUseDuration.patch} (100%)
 rename Spigot-Server-Patches/{0223-Implement-EntityTeleportEndGatewayEvent.patch => 0222-Implement-EntityTeleportEndGatewayEvent.patch} (100%)
 rename Spigot-Server-Patches/{0224-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch => 0223-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch} (100%)
 rename Spigot-Server-Patches/{0225-Fix-CraftEntity-hashCode.patch => 0224-Fix-CraftEntity-hashCode.patch} (100%)
 rename Spigot-Server-Patches/{0226-Configurable-Alternative-LootPool-Luck-Formula.patch => 0225-Configurable-Alternative-LootPool-Luck-Formula.patch} (100%)
 rename Spigot-Server-Patches/{0227-Print-Error-details-when-failing-to-save-player-data.patch => 0226-Print-Error-details-when-failing-to-save-player-data.patch} (100%)
 rename Spigot-Server-Patches/{0228-Make-shield-blocking-delay-configurable.patch => 0227-Make-shield-blocking-delay-configurable.patch} (95%)
 rename Spigot-Server-Patches/{0229-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch => 0228-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch} (100%)
 rename Spigot-Server-Patches/{0230-PlayerReadyArrowEvent.patch => 0229-PlayerReadyArrowEvent.patch} (100%)
 rename Spigot-Server-Patches/{0231-Fire-EntityShootBowEvent-for-Illusioner.patch => 0230-Fire-EntityShootBowEvent-for-Illusioner.patch} (100%)
 rename Spigot-Server-Patches/{0232-Implement-EntityKnockbackByEntityEvent.patch => 0231-Implement-EntityKnockbackByEntityEvent.patch} (98%)
 rename Spigot-Server-Patches/{0233-Expand-Explosions-API.patch => 0232-Expand-Explosions-API.patch} (100%)
 rename Spigot-Server-Patches/{0234-LivingEntity-Hand-Raised-Item-Use-API.patch => 0233-LivingEntity-Hand-Raised-Item-Use-API.patch} (100%)
 rename Spigot-Server-Patches/{0235-RangedEntity-API.patch => 0234-RangedEntity-API.patch} (100%)
 rename Spigot-Server-Patches/{0236-Add-config-to-disable-ender-dragon-legacy-check.patch => 0235-Add-config-to-disable-ender-dragon-legacy-check.patch} (94%)
 rename Spigot-Server-Patches/{0237-Implement-World.getEntity-UUID-API.patch => 0236-Implement-World.getEntity-UUID-API.patch} (100%)
 rename Spigot-Server-Patches/{0238-InventoryCloseEvent-Reason-API.patch => 0237-InventoryCloseEvent-Reason-API.patch} (100%)
 rename Spigot-Server-Patches/{0239-Configurable-Bed-Search-Radius.patch => 0238-Configurable-Bed-Search-Radius.patch} (98%)
 rename Spigot-Server-Patches/{0240-Vex-getSummoner-API.patch => 0239-Vex-getSummoner-API.patch} (100%)
 rename Spigot-Server-Patches/{0241-Refresh-player-inventory-when-cancelling-PlayerInter.patch => 0240-Refresh-player-inventory-when-cancelling-PlayerInter.patch} (100%)
 rename Spigot-Server-Patches/{0242-Don-t-change-the-Entity-Random-seed-for-squids.patch => 0241-Don-t-change-the-Entity-Random-seed-for-squids.patch} (100%)
 rename Spigot-Server-Patches/{0243-Re-add-vanilla-entity-warnings-for-duplicates.patch => 0242-Re-add-vanilla-entity-warnings-for-duplicates.patch} (100%)
 rename Spigot-Server-Patches/{0244-Avoid-item-merge-if-stack-size-above-max-stack-size.patch => 0243-Avoid-item-merge-if-stack-size-above-max-stack-size.patch} (100%)
 rename Spigot-Server-Patches/{0245-Use-asynchronous-Log4j-2-loggers.patch => 0244-Use-asynchronous-Log4j-2-loggers.patch} (100%)
 rename Spigot-Server-Patches/{0246-add-more-information-to-Entity.toString.patch => 0245-add-more-information-to-Entity.toString.patch} (100%)
 rename Spigot-Server-Patches/{0247-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch => 0246-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch} (100%)
 rename Spigot-Server-Patches/{0248-EnderDragon-Events.patch => 0247-EnderDragon-Events.patch} (100%)
 rename Spigot-Server-Patches/{0249-PlayerElytraBoostEvent.patch => 0248-PlayerElytraBoostEvent.patch} (100%)
 rename Spigot-Server-Patches/{0250-Improve-BlockPosition-inlining.patch => 0249-Improve-BlockPosition-inlining.patch} (100%)
 rename Spigot-Server-Patches/{0251-Optimize-RegistryID.c.patch => 0250-Optimize-RegistryID.c.patch} (100%)
 rename Spigot-Server-Patches/{0252-Option-to-prevent-armor-stands-from-doing-entity-loo.patch => 0251-Option-to-prevent-armor-stands-from-doing-entity-loo.patch} (92%)
 rename Spigot-Server-Patches/{0253-Vanished-players-don-t-have-rights.patch => 0252-Vanished-players-don-t-have-rights.patch} (100%)
 rename Spigot-Server-Patches/{0254-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch => 0253-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch} (100%)
 rename Spigot-Server-Patches/{0255-Add-some-Debug-to-Chunk-Entity-slices.patch => 0254-Add-some-Debug-to-Chunk-Entity-slices.patch} (100%)
 rename Spigot-Server-Patches/{0256-EntityTransformedEvent.patch => 0255-EntityTransformedEvent.patch} (98%)
 rename Spigot-Server-Patches/{0257-SkeletonHorse-Additions.patch => 0256-SkeletonHorse-Additions.patch} (100%)
 rename Spigot-Server-Patches/{0258-Prevent-Saving-Bad-entities-to-chunks.patch => 0257-Prevent-Saving-Bad-entities-to-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0259-Don-t-call-getItemMeta-on-hasItemMeta.patch => 0258-Don-t-call-getItemMeta-on-hasItemMeta.patch} (100%)
 rename Spigot-Server-Patches/{0260-Ignore-Dead-Entities-in-entityList-iteration.patch => 0259-Ignore-Dead-Entities-in-entityList-iteration.patch} (100%)
 rename Spigot-Server-Patches/{0261-Implement-Expanded-ArmorStand-API.patch => 0260-Implement-Expanded-ArmorStand-API.patch} (100%)
 rename Spigot-Server-Patches/{0262-AnvilDamageEvent.patch => 0261-AnvilDamageEvent.patch} (100%)
 rename Spigot-Server-Patches/{0263-Add-TNTPrimeEvent.patch => 0262-Add-TNTPrimeEvent.patch} (100%)
 rename Spigot-Server-Patches/{0264-Break-up-and-make-tab-spam-limits-configurable.patch => 0263-Break-up-and-make-tab-spam-limits-configurable.patch} (100%)
 rename Spigot-Server-Patches/{0265-Add-hand-to-bucket-events.patch => 0264-Add-hand-to-bucket-events.patch} (100%)
 rename Spigot-Server-Patches/{0266-MC-135506-Experience-should-save-as-Integers.patch => 0265-MC-135506-Experience-should-save-as-Integers.patch} (100%)
 rename Spigot-Server-Patches/{0267-Fix-client-rendering-skulls-from-same-user.patch => 0266-Fix-client-rendering-skulls-from-same-user.patch} (100%)
 rename Spigot-Server-Patches/{0268-Add-Early-Warning-Feature-to-WatchDog.patch => 0267-Add-Early-Warning-Feature-to-WatchDog.patch} (100%)
 rename Spigot-Server-Patches/{0269-Make-EnderDragon-implement-Mob.patch => 0268-Make-EnderDragon-implement-Mob.patch} (100%)
 rename Spigot-Server-Patches/{0270-Use-ConcurrentHashMap-in-JsonList.patch => 0269-Use-ConcurrentHashMap-in-JsonList.patch} (100%)
 rename Spigot-Server-Patches/{0271-Use-a-Queue-for-Queueing-Commands.patch => 0270-Use-a-Queue-for-Queueing-Commands.patch} (100%)
 rename Spigot-Server-Patches/{0272-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch => 0271-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch} (100%)
 rename Spigot-Server-Patches/{0273-Allow-disabling-armour-stand-ticking.patch => 0272-Allow-disabling-armour-stand-ticking.patch} (97%)
 rename Spigot-Server-Patches/{0274-Optimize-BlockPosition-helper-methods.patch => 0273-Optimize-BlockPosition-helper-methods.patch} (100%)
 rename Spigot-Server-Patches/{0275-Restore-vanlla-default-mob-spawn-range.patch => 0274-Restore-vanlla-default-mob-spawn-range.patch} (100%)
 rename Spigot-Server-Patches/{0276-Fix-MC-124320.patch => 0275-Fix-MC-124320.patch} (100%)
 rename Spigot-Server-Patches/{0277-Slime-Pathfinder-Events.patch => 0276-Slime-Pathfinder-Events.patch} (100%)
 rename Spigot-Server-Patches/{0278-Configurable-speed-for-water-flowing-over-lava.patch => 0277-Configurable-speed-for-water-flowing-over-lava.patch} (95%)
 rename Spigot-Server-Patches/{0279-Optimize-CraftBlockData-Creation.patch => 0278-Optimize-CraftBlockData-Creation.patch} (100%)
 rename Spigot-Server-Patches/{0280-Optimize-RegistryMaterials.patch => 0279-Optimize-RegistryMaterials.patch} (100%)
 rename Spigot-Server-Patches/{0281-Add-PhantomPreSpawnEvent.patch => 0280-Add-PhantomPreSpawnEvent.patch} (100%)
 rename Spigot-Server-Patches/{0282-Add-More-Creeper-API.patch => 0281-Add-More-Creeper-API.patch} (100%)
 rename Spigot-Server-Patches/{0283-Inventory-removeItemAnySlot.patch => 0282-Inventory-removeItemAnySlot.patch} (100%)
 rename Spigot-Server-Patches/{0284-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch => 0283-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch} (100%)
 rename Spigot-Server-Patches/{0285-Add-ray-tracing-methods-to-LivingEntity.patch => 0284-Add-ray-tracing-methods-to-LivingEntity.patch} (100%)
 rename Spigot-Server-Patches/{0286-Expose-attack-cooldown-methods-for-Player.patch => 0285-Expose-attack-cooldown-methods-for-Player.patch} (100%)
 rename Spigot-Server-Patches/{0287-Improve-death-events.patch => 0286-Improve-death-events.patch} (99%)
 rename Spigot-Server-Patches/{0288-Allow-chests-to-be-placed-with-NBT-data.patch => 0287-Allow-chests-to-be-placed-with-NBT-data.patch} (100%)
 rename Spigot-Server-Patches/{0289-Mob-Pathfinding-API.patch => 0288-Mob-Pathfinding-API.patch} (100%)
 rename Spigot-Server-Patches/{0290-Prevent-chunk-loading-from-Fluid-Flowing.patch => 0289-Prevent-chunk-loading-from-Fluid-Flowing.patch} (100%)
 rename Spigot-Server-Patches/{0291-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch => 0290-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch} (100%)
 rename Spigot-Server-Patches/{0292-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch => 0291-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch} (100%)
 rename Spigot-Server-Patches/{0293-Prevent-mob-spawning-from-loading-generating-chunks.patch => 0292-Prevent-mob-spawning-from-loading-generating-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0294-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch => 0293-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch} (100%)
 rename Spigot-Server-Patches/{0295-Implement-furnace-cook-speed-multiplier-API.patch => 0294-Implement-furnace-cook-speed-multiplier-API.patch} (100%)
 rename Spigot-Server-Patches/{0296-PreSpawnerSpawnEvent.patch => 0295-PreSpawnerSpawnEvent.patch} (100%)
 rename Spigot-Server-Patches/{0297-Catch-JsonParseException-in-Entity-and-TE-names.patch => 0296-Catch-JsonParseException-in-Entity-and-TE-names.patch} (100%)
 rename Spigot-Server-Patches/{0298-Honor-EntityAgeable.ageLock.patch => 0297-Honor-EntityAgeable.ageLock.patch} (100%)
 rename Spigot-Server-Patches/{0299-Configurable-connection-throttle-kick-message.patch => 0298-Configurable-connection-throttle-kick-message.patch} (100%)
 rename Spigot-Server-Patches/{0300-Hook-into-CB-plugin-rewrites.patch => 0299-Hook-into-CB-plugin-rewrites.patch} (100%)
 rename Spigot-Server-Patches/{0301-Allow-setting-the-vex-s-summoner.patch => 0300-Allow-setting-the-vex-s-summoner.patch} (100%)
 rename Spigot-Server-Patches/{0302-Add-sun-related-API.patch => 0301-Add-sun-related-API.patch} (95%)
 rename Spigot-Server-Patches/{0303-Turtle-API.patch => 0302-Turtle-API.patch} (100%)
 rename Spigot-Server-Patches/{0304-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch => 0303-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch} (100%)
 rename Spigot-Server-Patches/{0305-Call-player-spectator-target-events-and-improve-impl.patch => 0304-Call-player-spectator-target-events-and-improve-impl.patch} (100%)
 rename Spigot-Server-Patches/{0306-Add-Velocity-IP-Forwarding-Support.patch => 0305-Add-Velocity-IP-Forwarding-Support.patch} (100%)
 rename Spigot-Server-Patches/{0307-Add-more-Witch-API.patch => 0306-Add-more-Witch-API.patch} (100%)
 rename Spigot-Server-Patches/{0308-Check-Drowned-for-Villager-Aggression-Config.patch => 0307-Check-Drowned-for-Villager-Aggression-Config.patch} (100%)
 rename Spigot-Server-Patches/{0309-Here-s-Johnny.patch => 0308-Here-s-Johnny.patch} (100%)
 rename Spigot-Server-Patches/{0310-Add-option-to-prevent-players-from-moving-into-unloa.patch => 0309-Add-option-to-prevent-players-from-moving-into-unloa.patch} (96%)
 rename Spigot-Server-Patches/{0311-Reset-players-airTicks-on-respawn.patch => 0310-Reset-players-airTicks-on-respawn.patch} (100%)
 rename Spigot-Server-Patches/{0312-Don-t-sleep-after-profile-lookups-if-not-needed.patch => 0311-Don-t-sleep-after-profile-lookups-if-not-needed.patch} (100%)
 rename Spigot-Server-Patches/{0313-Improve-Server-Thread-Pool-and-Thread-Priorities.patch => 0312-Improve-Server-Thread-Pool-and-Thread-Priorities.patch} (100%)
 rename Spigot-Server-Patches/{0314-Optimize-World-Time-Updates.patch => 0313-Optimize-World-Time-Updates.patch} (100%)
 rename Spigot-Server-Patches/{0315-Restore-custom-InventoryHolder-support.patch => 0314-Restore-custom-InventoryHolder-support.patch} (100%)
 rename Spigot-Server-Patches/{0316-Use-Vanilla-Minecart-Speeds.patch => 0315-Use-Vanilla-Minecart-Speeds.patch} (100%)
 rename Spigot-Server-Patches/{0317-Fix-SpongeAbsortEvent-handling.patch => 0316-Fix-SpongeAbsortEvent-handling.patch} (100%)
 rename Spigot-Server-Patches/{0318-Don-t-allow-digging-into-unloaded-chunks.patch => 0317-Don-t-allow-digging-into-unloaded-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0319-Book-Size-Limits.patch => 0318-Book-Size-Limits.patch} (100%)
 rename Spigot-Server-Patches/{0320-Make-the-default-permission-message-configurable.patch => 0319-Make-the-default-permission-message-configurable.patch} (100%)
 rename Spigot-Server-Patches/{0321-Prevent-rayTrace-from-loading-chunks.patch => 0320-Prevent-rayTrace-from-loading-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0322-Handle-Large-Packets-disconnecting-client.patch => 0321-Handle-Large-Packets-disconnecting-client.patch} (100%)
 rename Spigot-Server-Patches/{0323-force-entity-dismount-during-teleportation.patch => 0322-force-entity-dismount-during-teleportation.patch} (100%)
 rename Spigot-Server-Patches/{0324-Add-more-Zombie-API.patch => 0323-Add-more-Zombie-API.patch} (98%)
 rename Spigot-Server-Patches/{0325-Add-PlayerConnectionCloseEvent.patch => 0324-Add-PlayerConnectionCloseEvent.patch} (100%)
 rename Spigot-Server-Patches/{0326-Prevent-Enderman-from-loading-chunks.patch => 0325-Prevent-Enderman-from-loading-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0327-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch => 0326-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch} (98%)
 rename Spigot-Server-Patches/{0328-Fix-PlayerEditBookEvent.patch => 0327-Fix-PlayerEditBookEvent.patch} (100%)
 rename Spigot-Server-Patches/{0329-Workaround-for-vehicle-tracking-issue-on-disconnect.patch => 0328-Workaround-for-vehicle-tracking-issue-on-disconnect.patch} (100%)
 rename Spigot-Server-Patches/{0330-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch => 0329-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch} (100%)
 rename Spigot-Server-Patches/{0331-Block-Entity-remove-from-being-called-on-Players.patch => 0330-Block-Entity-remove-from-being-called-on-Players.patch} (100%)
 rename Spigot-Server-Patches/{0332-BlockDestroyEvent.patch => 0331-BlockDestroyEvent.patch} (100%)
 rename Spigot-Server-Patches/{0333-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch => 0332-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch} (100%)
 rename Spigot-Server-Patches/{0334-Fix-sign-edit-memory-leak.patch => 0333-Fix-sign-edit-memory-leak.patch} (100%)
 rename Spigot-Server-Patches/{0335-Limit-Client-Sign-length-more.patch => 0334-Limit-Client-Sign-length-more.patch} (100%)
 rename Spigot-Server-Patches/{0336-Don-t-check-ConvertSigns-boolean-every-sign-save.patch => 0335-Don-t-check-ConvertSigns-boolean-every-sign-save.patch} (100%)
 rename Spigot-Server-Patches/{0337-Optimize-Network-Manager-and-add-advanced-packet-sup.patch => 0336-Optimize-Network-Manager-and-add-advanced-packet-sup.patch} (100%)
 rename Spigot-Server-Patches/{0338-Handle-Oversized-Tile-Entities-in-chunks.patch => 0337-Handle-Oversized-Tile-Entities-in-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0339-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch => 0338-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch} (100%)
 rename Spigot-Server-Patches/{0340-Set-Zombie-last-tick-at-start-of-drowning-process.patch => 0339-Set-Zombie-last-tick-at-start-of-drowning-process.patch} (100%)
 rename Spigot-Server-Patches/{0341-Allow-Saving-of-Oversized-Chunks.patch => 0340-Allow-Saving-of-Oversized-Chunks.patch} (100%)
 rename Spigot-Server-Patches/{0342-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch => 0341-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch} (100%)
 rename Spigot-Server-Patches/{0343-Add-LivingEntity-getTargetEntity.patch => 0342-Add-LivingEntity-getTargetEntity.patch} (100%)
 rename Spigot-Server-Patches/{0344-Use-proper-max-length-when-serialising-BungeeCord-te.patch => 0343-Use-proper-max-length-when-serialising-BungeeCord-te.patch} (100%)
 rename Spigot-Server-Patches/{0345-Entity-getEntitySpawnReason.patch => 0344-Entity-getEntitySpawnReason.patch} (100%)
 rename Spigot-Server-Patches/{0346-Update-entity-Metadata-for-all-tracked-players.patch => 0345-Update-entity-Metadata-for-all-tracked-players.patch} (100%)
 rename Spigot-Server-Patches/{0347-Implement-PlayerPostRespawnEvent.patch => 0346-Implement-PlayerPostRespawnEvent.patch} (100%)
 rename Spigot-Server-Patches/{0348-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch => 0347-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch} (100%)
 rename Spigot-Server-Patches/{0349-Implement-getters-and-setters-for-EntityItem-owner-a.patch => 0348-Implement-getters-and-setters-for-EntityItem-owner-a.patch} (100%)
 rename Spigot-Server-Patches/{0350-Server-Tick-Events.patch => 0349-Server-Tick-Events.patch} (100%)
 rename Spigot-Server-Patches/{0351-PlayerDeathEvent-getItemsToKeep.patch => 0350-PlayerDeathEvent-getItemsToKeep.patch} (96%)
 rename Spigot-Server-Patches/{0352-Optimize-Captured-TileEntity-Lookup.patch => 0351-Optimize-Captured-TileEntity-Lookup.patch} (100%)
 rename Spigot-Server-Patches/{0353-Add-Heightmap-API.patch => 0352-Add-Heightmap-API.patch} (100%)
 rename Spigot-Server-Patches/{0354-Mob-Spawner-API-Enhancements.patch => 0353-Mob-Spawner-API-Enhancements.patch} (100%)
 rename Spigot-Server-Patches/{0355-Per-Player-View-Distance-API-placeholders.patch => 0354-Per-Player-View-Distance-API-placeholders.patch} (100%)
 rename Spigot-Server-Patches/{0356-Fix-CB-call-to-changed-postToMainThread-method.patch => 0355-Fix-CB-call-to-changed-postToMainThread-method.patch} (100%)
 rename Spigot-Server-Patches/{0357-Fix-sounds-when-item-frames-are-modified-MC-123450.patch => 0356-Fix-sounds-when-item-frames-are-modified-MC-123450.patch} (100%)
 rename Spigot-Server-Patches/{0358-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch => 0357-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch} (100%)
 rename Spigot-Server-Patches/{0359-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch => 0358-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0360-Duplicate-UUID-Resolve-Option.patch => 0359-Duplicate-UUID-Resolve-Option.patch} (98%)
 rename Spigot-Server-Patches/{0361-improve-CraftWorld-isChunkLoaded.patch => 0360-improve-CraftWorld-isChunkLoaded.patch} (100%)
 rename Spigot-Server-Patches/{0362-Configurable-Keep-Spawn-Loaded-range-per-world.patch => 0361-Configurable-Keep-Spawn-Loaded-range-per-world.patch} (98%)
 rename Spigot-Server-Patches/{0363-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch => 0362-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch} (100%)
 rename Spigot-Server-Patches/{0364-ChunkMapDistance-CME.patch => 0363-ChunkMapDistance-CME.patch} (100%)
 rename Spigot-Server-Patches/{0365-Implement-CraftBlockSoundGroup.patch => 0364-Implement-CraftBlockSoundGroup.patch} (100%)
 rename Spigot-Server-Patches/{0366-Chunk-debug-command.patch => 0365-Chunk-debug-command.patch} (100%)
 rename Spigot-Server-Patches/{0367-Catch-exceptions-from-dispenser-entity-spawns.patch => 0366-Catch-exceptions-from-dispenser-entity-spawns.patch} (100%)
 rename Spigot-Server-Patches/{0368-Fix-World-isChunkGenerated-calls.patch => 0367-Fix-World-isChunkGenerated-calls.patch} (100%)
 rename Spigot-Server-Patches/{0369-Show-blockstate-location-if-we-failed-to-read-it.patch => 0368-Show-blockstate-location-if-we-failed-to-read-it.patch} (100%)
 rename Spigot-Server-Patches/{0370-Synchronize-DataPaletteBlock-instead-of-ReentrantLoc.patch => 0369-Synchronize-DataPaletteBlock-instead-of-ReentrantLoc.patch} (100%)
 rename Spigot-Server-Patches/{0371-incremental-chunk-saving.patch => 0370-incremental-chunk-saving.patch} (99%)
 rename Spigot-Server-Patches/{0372-Anti-Xray.patch => 0371-Anti-Xray.patch} (99%)
 rename Spigot-Server-Patches/{0373-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch => 0372-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch} (94%)
 rename Spigot-Server-Patches/{0374-Configurable-projectile-relative-velocity.patch => 0373-Configurable-projectile-relative-velocity.patch} (95%)
 rename Spigot-Server-Patches/{0375-Mark-entities-as-being-ticked-when-notifying-navigat.patch => 0374-Mark-entities-as-being-ticked-when-notifying-navigat.patch} (100%)
 rename Spigot-Server-Patches/{0376-offset-item-frame-ticking.patch => 0375-offset-item-frame-ticking.patch} (100%)
 rename Spigot-Server-Patches/{0377-Avoid-hopper-searches-if-there-are-no-items.patch => 0376-Avoid-hopper-searches-if-there-are-no-items.patch} (100%)
 rename Spigot-Server-Patches/{0378-Asynchronous-chunk-IO-and-loading.patch => 0377-Asynchronous-chunk-IO-and-loading.patch} (100%)
 rename Spigot-Server-Patches/{0379-Use-getChunkIfLoadedImmediately-in-places.patch => 0378-Use-getChunkIfLoadedImmediately-in-places.patch} (100%)
 rename Spigot-Server-Patches/{0380-Reduce-sync-loads.patch => 0379-Reduce-sync-loads.patch} (100%)
 rename Spigot-Server-Patches/{0381-Implement-alternative-item-despawn-rate.patch => 0380-Implement-alternative-item-despawn-rate.patch} (97%)
 rename Spigot-Server-Patches/{0382-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch => 0381-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch} (100%)
 rename Spigot-Server-Patches/{0383-Fix-MC-158900.patch => 0382-Fix-MC-158900.patch} (100%)
 rename Spigot-Server-Patches/{0384-implement-optional-per-player-mob-spawns.patch => 0383-implement-optional-per-player-mob-spawns.patch} (99%)
 rename Spigot-Server-Patches/{0385-Prevent-consuming-the-wrong-itemstack.patch => 0384-Prevent-consuming-the-wrong-itemstack.patch} (100%)
 rename Spigot-Server-Patches/{0386-only-add-passanger-entities-once-from-spawners.patch => 0385-only-add-passanger-entities-once-from-spawners.patch} (100%)
 rename Spigot-Server-Patches/{0387-Fix-nether-portal-creation.patch => 0386-Fix-nether-portal-creation.patch} (100%)
 rename Spigot-Server-Patches/{0388-Generator-Settings.patch => 0387-Generator-Settings.patch} (97%)
 rename Spigot-Server-Patches/{0389-Fix-MC-161754.patch => 0388-Fix-MC-161754.patch} (100%)
 rename Spigot-Server-Patches/{0390-Performance-improvement-for-Chunk.getEntities.patch => 0389-Performance-improvement-for-Chunk.getEntities.patch} (100%)
 rename Spigot-Server-Patches/{0391-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch => 0390-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch} (100%)
 rename Spigot-Server-Patches/{0392-Expose-the-internal-current-tick.patch => 0391-Expose-the-internal-current-tick.patch} (100%)
 rename Spigot-Server-Patches/{0393-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch => 0392-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch} (100%)
 rename Spigot-Server-Patches/{0394-Add-option-to-disable-pillager-patrols.patch => 0393-Add-option-to-disable-pillager-patrols.patch} (91%)
 rename Spigot-Server-Patches/{0395-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch => 0394-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch} (100%)
 rename Spigot-Server-Patches/{0396-PlayerLaunchProjectileEvent.patch => 0395-PlayerLaunchProjectileEvent.patch} (100%)
 rename Spigot-Server-Patches/{0397-Add-CraftMagicNumbers.isSupportedApiVersion.patch => 0396-Add-CraftMagicNumbers.isSupportedApiVersion.patch} (100%)
 rename Spigot-Server-Patches/{0398-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch => 0397-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch} (100%)
 rename Spigot-Server-Patches/{0399-MC-145656-Fix-Follow-Range-Initial-Target.patch => 0398-MC-145656-Fix-Follow-Range-Initial-Target.patch} (95%)
 rename Spigot-Server-Patches/{0400-Optimize-Hoppers.patch => 0399-Optimize-Hoppers.patch} (99%)
 rename Spigot-Server-Patches/{0401-PlayerDeathEvent-shouldDropExperience.patch => 0400-PlayerDeathEvent-shouldDropExperience.patch} (90%)
 rename Spigot-Server-Patches/{0402-Prevent-bees-loading-chunks-checking-hive-position.patch => 0401-Prevent-bees-loading-chunks-checking-hive-position.patch} (100%)
 rename Spigot-Server-Patches/{0403-Don-t-load-Chunks-from-Hoppers-and-other-things.patch => 0402-Don-t-load-Chunks-from-Hoppers-and-other-things.patch} (100%)
 rename Spigot-Server-Patches/{0404-Guard-against-serializing-mismatching-chunk-coordina.patch => 0403-Guard-against-serializing-mismatching-chunk-coordina.patch} (100%)
 rename Spigot-Server-Patches/{0405-Optimise-IEntityAccess-getPlayerByUUID.patch => 0404-Optimise-IEntityAccess-getPlayerByUUID.patch} (100%)
 rename Spigot-Server-Patches/{0406-Fix-items-not-falling-correctly.patch => 0405-Fix-items-not-falling-correctly.patch} (100%)
 rename Spigot-Server-Patches/{0407-Lag-compensate-eating.patch => 0406-Lag-compensate-eating.patch} (100%)
 rename Spigot-Server-Patches/{0408-Optimize-call-to-getFluid-for-explosions.patch => 0407-Optimize-call-to-getFluid-for-explosions.patch} (100%)
 rename Spigot-Server-Patches/{0409-Fix-last-firework-in-stack-not-having-effects-when-d.patch => 0408-Fix-last-firework-in-stack-not-having-effects-when-d.patch} (100%)
 rename Spigot-Server-Patches/{0410-Entity-Activation-Range-2.0.patch => 0409-Entity-Activation-Range-2.0.patch} (99%)
 rename Spigot-Server-Patches/{0411-Add-effect-to-block-break-naturally.patch => 0410-Add-effect-to-block-break-naturally.patch} (100%)
 rename Spigot-Server-Patches/{0412-Tracking-Range-Improvements.patch => 0411-Tracking-Range-Improvements.patch} (100%)
 rename Spigot-Server-Patches/{0413-Fix-items-vanishing-through-end-portal.patch => 0412-Fix-items-vanishing-through-end-portal.patch} (100%)
 rename Spigot-Server-Patches/{0414-Bees-get-gravity-in-void.-Fixes-MC-167279.patch => 0413-Bees-get-gravity-in-void.-Fixes-MC-167279.patch} (100%)
 rename Spigot-Server-Patches/{0415-Optimise-getChunkAt-calls-for-loaded-chunks.patch => 0414-Optimise-getChunkAt-calls-for-loaded-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0416-Allow-overriding-the-java-version-check.patch => 0415-Allow-overriding-the-java-version-check.patch} (100%)
 rename Spigot-Server-Patches/{0417-Add-ThrownEggHatchEvent.patch => 0416-Add-ThrownEggHatchEvent.patch} (100%)
 rename Spigot-Server-Patches/{0418-Optimise-random-block-ticking.patch => 0417-Optimise-random-block-ticking.patch} (100%)
 rename Spigot-Server-Patches/{0419-Entity-Jump-API.patch => 0418-Entity-Jump-API.patch} (100%)
 rename Spigot-Server-Patches/{0420-Add-option-to-nerf-pigmen-from-nether-portals.patch => 0419-Add-option-to-nerf-pigmen-from-nether-portals.patch} (95%)
 rename Spigot-Server-Patches/{0421-Make-the-GUI-graph-fancier.patch => 0420-Make-the-GUI-graph-fancier.patch} (100%)
 rename Spigot-Server-Patches/{0422-add-hand-to-BlockMultiPlaceEvent.patch => 0421-add-hand-to-BlockMultiPlaceEvent.patch} (100%)
 rename Spigot-Server-Patches/{0423-Prevent-teleporting-dead-entities.patch => 0422-Prevent-teleporting-dead-entities.patch} (100%)
 rename Spigot-Server-Patches/{0424-Validate-tripwire-hook-placement-before-update.patch => 0423-Validate-tripwire-hook-placement-before-update.patch} (100%)
 rename Spigot-Server-Patches/{0425-Add-option-to-allow-iron-golems-to-spawn-in-air.patch => 0424-Add-option-to-allow-iron-golems-to-spawn-in-air.patch} (92%)
 rename Spigot-Server-Patches/{0426-Configurable-chance-of-villager-zombie-infection.patch => 0425-Configurable-chance-of-villager-zombie-infection.patch} (94%)
 rename Spigot-Server-Patches/{0427-Optimise-Chunk-getFluid.patch => 0426-Optimise-Chunk-getFluid.patch} (100%)
 rename Spigot-Server-Patches/{0428-Optimise-TickListServer-by-rewriting-it.patch => 0427-Optimise-TickListServer-by-rewriting-it.patch} (100%)
 rename Spigot-Server-Patches/{0429-Pillager-patrol-spawn-settings-and-per-player-option.patch => 0428-Pillager-patrol-spawn-settings-and-per-player-option.patch} (96%)
 rename Spigot-Server-Patches/{0430-Ensure-Entity-is-never-double-registered.patch => 0429-Ensure-Entity-is-never-double-registered.patch} (100%)
 rename Spigot-Server-Patches/{0431-Fix-unregistering-entities-from-unloading-chunks.patch => 0430-Fix-unregistering-entities-from-unloading-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0432-Remote-Connections-shouldn-t-hold-up-shutdown.patch => 0431-Remote-Connections-shouldn-t-hold-up-shutdown.patch} (100%)
 rename Spigot-Server-Patches/{0433-Do-not-allow-bees-to-load-chunks-for-beehives.patch => 0432-Do-not-allow-bees-to-load-chunks-for-beehives.patch} (100%)
 rename Spigot-Server-Patches/{0434-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch => 0433-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch} (100%)
 rename Spigot-Server-Patches/{0435-Optimize-Collision-to-not-load-chunks.patch => 0434-Optimize-Collision-to-not-load-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0436-Don-t-tick-dead-players.patch => 0435-Don-t-tick-dead-players.patch} (91%)
 rename Spigot-Server-Patches/{0437-Dead-Player-s-shouldn-t-be-able-to-move.patch => 0436-Dead-Player-s-shouldn-t-be-able-to-move.patch} (100%)
 rename Spigot-Server-Patches/{0438-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch => 0437-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch} (100%)
 rename Spigot-Server-Patches/{0439-Increase-Light-Queue-Size.patch => 0438-Increase-Light-Queue-Size.patch} (92%)
 rename Spigot-Server-Patches/{0440-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch => 0439-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch} (100%)
 rename Spigot-Server-Patches/{0441-Don-t-move-existing-players-to-world-spawn.patch => 0440-Don-t-move-existing-players-to-world-spawn.patch} (96%)
 rename Spigot-Server-Patches/{0442-Add-tick-times-API-and-mspt-command.patch => 0441-Add-tick-times-API-and-mspt-command.patch} (100%)
 rename Spigot-Server-Patches/{0443-Expose-MinecraftServer-isRunning.patch => 0442-Expose-MinecraftServer-isRunning.patch} (100%)
 rename Spigot-Server-Patches/{0444-Add-Raw-Byte-ItemStack-Serialization.patch => 0443-Add-Raw-Byte-ItemStack-Serialization.patch} (100%)
 rename Spigot-Server-Patches/{0445-Remove-streams-from-Mob-AI-System.patch => 0444-Remove-streams-from-Mob-AI-System.patch} (100%)
 rename Spigot-Server-Patches/{0446-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch => 0445-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch} (100%)
 rename Spigot-Server-Patches/{0447-Async-command-map-building.patch => 0446-Async-command-map-building.patch} (100%)
 rename Spigot-Server-Patches/{0448-Improved-Watchdog-Support.patch => 0447-Improved-Watchdog-Support.patch} (100%)
 rename Spigot-Server-Patches/{0449-Optimize-Pathfinding.patch => 0448-Optimize-Pathfinding.patch} (100%)
 rename Spigot-Server-Patches/{0450-Reduce-Either-Optional-allocation.patch => 0449-Reduce-Either-Optional-allocation.patch} (100%)
 rename Spigot-Server-Patches/{0451-Remove-streams-from-PairedQueue.patch => 0450-Remove-streams-from-PairedQueue.patch} (100%)
 rename Spigot-Server-Patches/{0452-Reduce-memory-footprint-of-NBTTagCompound.patch => 0451-Reduce-memory-footprint-of-NBTTagCompound.patch} (100%)
 rename Spigot-Server-Patches/{0453-Prevent-opening-inventories-when-frozen.patch => 0452-Prevent-opening-inventories-when-frozen.patch} (100%)
 rename Spigot-Server-Patches/{0454-Optimise-ArraySetSorted-removeIf.patch => 0453-Optimise-ArraySetSorted-removeIf.patch} (100%)
 rename Spigot-Server-Patches/{0455-Don-t-run-entity-collision-code-if-not-needed.patch => 0454-Don-t-run-entity-collision-code-if-not-needed.patch} (100%)
 rename Spigot-Server-Patches/{0456-Optimise-entity-hard-collision-checking.patch => 0455-Optimise-entity-hard-collision-checking.patch} (100%)
 rename Spigot-Server-Patches/{0457-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch => 0456-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch} (100%)
 rename Spigot-Server-Patches/{0458-Restrict-vanilla-teleport-command-to-valid-locations.patch => 0457-Restrict-vanilla-teleport-command-to-valid-locations.patch} (100%)
 rename Spigot-Server-Patches/{0459-Implement-Player-Client-Options-API.patch => 0458-Implement-Player-Client-Options-API.patch} (100%)
 rename Spigot-Server-Patches/{0460-Fix-Chunk-Post-Processing-deadlock-risk.patch => 0459-Fix-Chunk-Post-Processing-deadlock-risk.patch} (100%)
 rename Spigot-Server-Patches/{0461-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch => 0460-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch} (100%)
 rename Spigot-Server-Patches/{0462-Broadcast-join-message-to-console.patch => 0461-Broadcast-join-message-to-console.patch} (100%)
 rename Spigot-Server-Patches/{0463-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch => 0462-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch} (98%)
 rename Spigot-Server-Patches/{0464-Load-Chunks-for-Login-Asynchronously.patch => 0463-Load-Chunks-for-Login-Asynchronously.patch} (99%)
 rename Spigot-Server-Patches/{0465-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch => 0464-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch} (100%)
 rename Spigot-Server-Patches/{0466-Add-PlayerAttackEntityCooldownResetEvent.patch => 0465-Add-PlayerAttackEntityCooldownResetEvent.patch} (100%)
 rename Spigot-Server-Patches/{0467-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch => 0466-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch} (100%)
 rename Spigot-Server-Patches/{0468-Don-t-fire-BlockFade-on-worldgen-threads.patch => 0467-Don-t-fire-BlockFade-on-worldgen-threads.patch} (100%)
 rename Spigot-Server-Patches/{0469-Add-phantom-creative-and-insomniac-controls.patch => 0468-Add-phantom-creative-and-insomniac-controls.patch} (96%)
 rename Spigot-Server-Patches/{0470-Fix-numerous-item-duplication-issues-and-teleport-is.patch => 0469-Fix-numerous-item-duplication-issues-and-teleport-is.patch} (100%)
 rename Spigot-Server-Patches/{0471-Implement-Brigadier-Mojang-API.patch => 0470-Implement-Brigadier-Mojang-API.patch} (100%)
 rename Spigot-Server-Patches/{0472-Villager-Restocks-API.patch => 0471-Villager-Restocks-API.patch} (100%)
 rename Spigot-Server-Patches/{0473-Validate-PickItem-Packet-and-kick-for-invalid.patch => 0472-Validate-PickItem-Packet-and-kick-for-invalid.patch} (100%)
 rename Spigot-Server-Patches/{0474-Expose-game-version.patch => 0473-Expose-game-version.patch} (100%)
 rename Spigot-Server-Patches/{0475-Sync-position-on-teleportation.patch => 0474-Sync-position-on-teleportation.patch} (100%)
 rename Spigot-Server-Patches/{0476-Optimize-Voxel-Shape-Merging.patch => 0475-Optimize-Voxel-Shape-Merging.patch} (100%)
 rename Spigot-Server-Patches/{0477-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch => 0476-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch} (93%)
 rename Spigot-Server-Patches/{0478-Implement-Mob-Goal-API.patch => 0477-Implement-Mob-Goal-API.patch} (100%)
 rename Spigot-Server-Patches/{0479-Use-distance-map-to-optimise-entity-tracker.patch => 0478-Use-distance-map-to-optimise-entity-tracker.patch} (100%)
 rename Spigot-Server-Patches/{0480-Optimize-isOutsideRange-to-use-distance-maps.patch => 0479-Optimize-isOutsideRange-to-use-distance-maps.patch} (99%)
 rename Spigot-Server-Patches/{0481-Stop-copy-on-write-operations-for-updating-light-dat.patch => 0480-Stop-copy-on-write-operations-for-updating-light-dat.patch} (100%)
 rename Spigot-Server-Patches/{0482-No-Tick-view-distance-implementation.patch => 0481-No-Tick-view-distance-implementation.patch} (99%)
 rename Spigot-Server-Patches/{0483-Add-villager-reputation-API.patch => 0482-Add-villager-reputation-API.patch} (100%)
 rename Spigot-Server-Patches/{0484-Fix-Light-Command.patch => 0483-Fix-Light-Command.patch} (100%)
 rename Spigot-Server-Patches/{0485-Fix-PotionEffect-ignores-icon-flag.patch => 0484-Fix-PotionEffect-ignores-icon-flag.patch} (100%)
 rename Spigot-Server-Patches/{0486-Optimize-brigadier-child-sorting-performance.patch => 0485-Optimize-brigadier-child-sorting-performance.patch} (100%)
 rename Spigot-Server-Patches/{0487-Don-t-toString-block-unless-actually-showing-the-mes.patch => 0486-Don-t-toString-block-unless-actually-showing-the-mes.patch} (100%)
 rename Spigot-Server-Patches/{0488-Potential-bed-API.patch => 0487-Potential-bed-API.patch} (100%)
 rename Spigot-Server-Patches/{0489-Wait-for-Async-Tasks-during-shutdown.patch => 0488-Wait-for-Async-Tasks-during-shutdown.patch} (100%)
 rename Spigot-Server-Patches/{0490-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch => 0489-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch} (100%)
 rename Spigot-Server-Patches/{0491-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch => 0490-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch} (100%)
 rename Spigot-Server-Patches/{0492-Optimize-NibbleArray-to-use-pooled-buffers.patch => 0491-Optimize-NibbleArray-to-use-pooled-buffers.patch} (100%)
 rename Spigot-Server-Patches/{0493-Reduce-MutableInt-allocations-from-light-engine.patch => 0492-Reduce-MutableInt-allocations-from-light-engine.patch} (100%)
 rename Spigot-Server-Patches/{0494-Reduce-allocation-of-Vec3D-by-entity-tracker.patch => 0493-Reduce-allocation-of-Vec3D-by-entity-tracker.patch} (100%)
 rename Spigot-Server-Patches/{0495-Ensure-safe-gateway-teleport.patch => 0494-Ensure-safe-gateway-teleport.patch} (100%)
 rename Spigot-Server-Patches/{0496-Add-option-for-console-having-all-permissions.patch => 0495-Add-option-for-console-having-all-permissions.patch} (100%)
 rename Spigot-Server-Patches/{0497-Workaround-for-Client-Lag-Spikes-MC-162253.patch => 0496-Workaround-for-Client-Lag-Spikes-MC-162253.patch} (100%)
 rename Spigot-Server-Patches/{0498-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch => 0497-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch} (99%)
 rename Spigot-Server-Patches/{0499-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch => 0498-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch} (100%)
 rename Spigot-Server-Patches/{0500-Optimize-sending-packets-to-nearby-locations-sounds-.patch => 0499-Optimize-sending-packets-to-nearby-locations-sounds-.patch} (97%)
 rename Spigot-Server-Patches/{0501-Improve-Chunk-Status-Transition-Speed.patch => 0500-Improve-Chunk-Status-Transition-Speed.patch} (100%)
 rename Spigot-Server-Patches/{0502-Fix-villager-trading-demand-MC-163962.patch => 0501-Fix-villager-trading-demand-MC-163962.patch} (100%)
 rename Spigot-Server-Patches/{0503-Maps-shouldn-t-load-chunks.patch => 0502-Maps-shouldn-t-load-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0504-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch => 0503-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch} (100%)
 rename Spigot-Server-Patches/{0505-Optimize-Bit-Operations-by-inlining.patch => 0504-Optimize-Bit-Operations-by-inlining.patch} (100%)
 rename Spigot-Server-Patches/{0506-Optimize-Light-Engine.patch => 0505-Optimize-Light-Engine.patch} (100%)
 rename Spigot-Server-Patches/{0507-Delay-Chunk-Unloads-based-on-Player-Movement.patch => 0506-Delay-Chunk-Unloads-based-on-Player-Movement.patch} (97%)
 rename Spigot-Server-Patches/{0508-Add-Plugin-Tickets-to-API-Chunk-Methods.patch => 0507-Add-Plugin-Tickets-to-API-Chunk-Methods.patch} (100%)
 rename Spigot-Server-Patches/{0509-Fix-missing-chunks-due-to-integer-overflow.patch => 0508-Fix-missing-chunks-due-to-integer-overflow.patch} (100%)
 rename Spigot-Server-Patches/{0510-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch => 0509-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch} (100%)
 rename Spigot-Server-Patches/{0511-Fix-piston-physics-inconsistency-MC-188840.patch => 0510-Fix-piston-physics-inconsistency-MC-188840.patch} (100%)
 rename Spigot-Server-Patches/{0512-Fix-sand-duping.patch => 0511-Fix-sand-duping.patch} (100%)
 rename Spigot-Server-Patches/{0513-Prevent-position-desync-in-playerconnection-causing-.patch => 0512-Prevent-position-desync-in-playerconnection-causing-.patch} (100%)
 rename Spigot-Server-Patches/{0514-Fix-enderdragon-exp-dupe.patch => 0513-Fix-enderdragon-exp-dupe.patch} (100%)
 rename Spigot-Server-Patches/{0515-Inventory-getHolder-method-without-block-snapshot.patch => 0514-Inventory-getHolder-method-without-block-snapshot.patch} (100%)
 rename Spigot-Server-Patches/{0516-Expose-Arrow-getItemStack.patch => 0515-Expose-Arrow-getItemStack.patch} (100%)
 rename Spigot-Server-Patches/{0517-Add-and-implement-PlayerRecipeBookClickEvent.patch => 0516-Add-and-implement-PlayerRecipeBookClickEvent.patch} (100%)
 rename Spigot-Server-Patches/{0518-Add-PrepareGrindstoneEvent.patch => 0517-Add-PrepareGrindstoneEvent.patch} (100%)
 rename Spigot-Server-Patches/{0519-Hide-sync-chunk-writes-behind-flag.patch => 0518-Hide-sync-chunk-writes-behind-flag.patch} (100%)
 rename Spigot-Server-Patches/{0520-Limit-lightning-strike-effect-distance.patch => 0519-Limit-lightning-strike-effect-distance.patch} (96%)
 rename Spigot-Server-Patches/{0521-Add-permission-for-command-blocks.patch => 0520-Add-permission-for-command-blocks.patch} (100%)
 rename Spigot-Server-Patches/{0522-Ensure-Entity-AABB-s-are-never-invalid.patch => 0521-Ensure-Entity-AABB-s-are-never-invalid.patch} (100%)
 rename Spigot-Server-Patches/{0523-Optimize-WorldBorder-collision-checks-and-air.patch => 0522-Optimize-WorldBorder-collision-checks-and-air.patch} (100%)
 rename Spigot-Server-Patches/{0524-Fix-Per-World-Difficulty-Remembering-Difficulty.patch => 0523-Fix-Per-World-Difficulty-Remembering-Difficulty.patch} (100%)

diff --git a/Spigot-Server-Patches/0064-Handle-Item-Meta-Inconsistencies.patch b/Spigot-Server-Patches/0063-Handle-Item-Meta-Inconsistencies.patch
similarity index 100%
rename from Spigot-Server-Patches/0064-Handle-Item-Meta-Inconsistencies.patch
rename to Spigot-Server-Patches/0063-Handle-Item-Meta-Inconsistencies.patch
diff --git a/Spigot-Server-Patches/0063-Undead-horse-leashing.patch b/Spigot-Server-Patches/0063-Undead-horse-leashing.patch
deleted file mode 100644
index b9bb06206b..0000000000
--- a/Spigot-Server-Patches/0063-Undead-horse-leashing.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Fri, 18 Mar 2016 14:19:19 -0400
-Subject: [PATCH] Undead horse leashing
-
-default false to match vanilla, but option to allow undead horse types to be leashed.
-
-diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 04430aae52205ee167662004e45c145b9d2e8bed..dd21221534542d0265fa7d2178ab69c236579cf7 100644
---- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -208,4 +208,9 @@ public class PaperWorldConfig {
-     private void nonPlayerEntitiesOnScoreboards() {
-         nonPlayerEntitiesOnScoreboards = getBoolean("allow-non-player-entities-on-scoreboards", false);
-     }
-+
-+    public boolean allowLeashingUndeadHorse = false;
-+    private void allowLeashingUndeadHorse() {
-+        allowLeashingUndeadHorse = getBoolean("allow-leashing-undead-horse", false);
-+    }
- }
-diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
-index 364697e0155012c300219ad94a3995809e6c2f8f..d45d025fa74a5ff53f0828f51639e19613e30186 100644
---- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
-+++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
-@@ -106,6 +106,13 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
-         this.bx = flag;
-     }
- 
-+    // Paper start
-+    @Override
-+    public boolean a(EntityHuman entityhuman) {
-+        return world.paperConfig.allowLeashingUndeadHorse ? super.a(entityhuman) : super.a(entityhuman) && this.getMonsterType() != EnumMonsterType.UNDEAD; // Paper
-+    }
-+    // Paper end
-+
-     @Override
-     protected void t(float f) {
-         if (f > 6.0F && this.fa()) {
-diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 9715f10c790c0210435622ab9997ac40f98da185..2f85d9799d67d3fb1d340179d8dbd03771467329 100644
---- a/src/main/java/net/minecraft/server/EntityInsentient.java
-+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
-@@ -1282,7 +1282,7 @@ public abstract class EntityInsentient extends EntityLiving {
- 
-     }
- 
--    public boolean a(EntityHuman entityhuman) {
-+    public boolean a(EntityHuman entityhuman) { // Paper - overriden in EntityHorseAbstract
-         return !this.isLeashed() && !(this instanceof IMonster);
-     }
- 
diff --git a/Spigot-Server-Patches/0065-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/Spigot-Server-Patches/0064-Configurable-Non-Player-Arrow-Despawn-Rate.patch
similarity index 88%
rename from Spigot-Server-Patches/0065-Configurable-Non-Player-Arrow-Despawn-Rate.patch
rename to Spigot-Server-Patches/0064-Configurable-Non-Player-Arrow-Despawn-Rate.patch
index 72d298de10..4af1434650 100644
--- a/Spigot-Server-Patches/0065-Configurable-Non-Player-Arrow-Despawn-Rate.patch
+++ b/Spigot-Server-Patches/0064-Configurable-Non-Player-Arrow-Despawn-Rate.patch
@@ -6,12 +6,12 @@ Subject: [PATCH] Configurable Non Player Arrow Despawn Rate
 Can set a much shorter despawn rate for arrows that players can not pick up.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index dd21221534542d0265fa7d2178ab69c236579cf7..7de7b74ff69bba1cbad24623d7eeff6c79812bab 100644
+index 04430aae52205ee167662004e45c145b9d2e8bed..d8b9d87bca6eb95c2cea91e4d8466b9792582d52 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -213,4 +213,19 @@ public class PaperWorldConfig {
-     private void allowLeashingUndeadHorse() {
-         allowLeashingUndeadHorse = getBoolean("allow-leashing-undead-horse", false);
+@@ -208,4 +208,19 @@ public class PaperWorldConfig {
+     private void nonPlayerEntitiesOnScoreboards() {
+         nonPlayerEntitiesOnScoreboards = getBoolean("allow-non-player-entities-on-scoreboards", false);
      }
 +
 +    public int nonPlayerArrowDespawnRate = -1;
diff --git a/Spigot-Server-Patches/0066-Add-World-Util-Methods.patch b/Spigot-Server-Patches/0065-Add-World-Util-Methods.patch
similarity index 100%
rename from Spigot-Server-Patches/0066-Add-World-Util-Methods.patch
rename to Spigot-Server-Patches/0065-Add-World-Util-Methods.patch
diff --git a/Spigot-Server-Patches/0067-Custom-replacement-for-eaten-items.patch b/Spigot-Server-Patches/0066-Custom-replacement-for-eaten-items.patch
similarity index 100%
rename from Spigot-Server-Patches/0067-Custom-replacement-for-eaten-items.patch
rename to Spigot-Server-Patches/0066-Custom-replacement-for-eaten-items.patch
diff --git a/Spigot-Server-Patches/0068-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/Spigot-Server-Patches/0067-handle-NaN-health-absorb-values-and-repair-bad-data.patch
similarity index 100%
rename from Spigot-Server-Patches/0068-handle-NaN-health-absorb-values-and-repair-bad-data.patch
rename to Spigot-Server-Patches/0067-handle-NaN-health-absorb-values-and-repair-bad-data.patch
diff --git a/Spigot-Server-Patches/0069-Waving-banner-workaround.patch b/Spigot-Server-Patches/0068-Waving-banner-workaround.patch
similarity index 100%
rename from Spigot-Server-Patches/0069-Waving-banner-workaround.patch
rename to Spigot-Server-Patches/0068-Waving-banner-workaround.patch
diff --git a/Spigot-Server-Patches/0070-Use-a-Shared-Random-for-Entities.patch b/Spigot-Server-Patches/0069-Use-a-Shared-Random-for-Entities.patch
similarity index 100%
rename from Spigot-Server-Patches/0070-Use-a-Shared-Random-for-Entities.patch
rename to Spigot-Server-Patches/0069-Use-a-Shared-Random-for-Entities.patch
diff --git a/Spigot-Server-Patches/0071-Configurable-spawn-chances-for-skeleton-horses.patch b/Spigot-Server-Patches/0070-Configurable-spawn-chances-for-skeleton-horses.patch
similarity index 93%
rename from Spigot-Server-Patches/0071-Configurable-spawn-chances-for-skeleton-horses.patch
rename to Spigot-Server-Patches/0070-Configurable-spawn-chances-for-skeleton-horses.patch
index 9949e7e988..098d8d7228 100644
--- a/Spigot-Server-Patches/0071-Configurable-spawn-chances-for-skeleton-horses.patch
+++ b/Spigot-Server-Patches/0070-Configurable-spawn-chances-for-skeleton-horses.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable spawn chances for skeleton horses
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 7de7b74ff69bba1cbad24623d7eeff6c79812bab..6ef0e1399e9ff260712db1a044068c125b1316d3 100644
+index d8b9d87bca6eb95c2cea91e4d8466b9792582d52..92d1dffbf436a21943b4a6aa0fabf54f064e6046 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -228,4 +228,12 @@ public class PaperWorldConfig {
+@@ -223,4 +223,12 @@ public class PaperWorldConfig {
          log("Non Player Arrow Despawn Rate: " + nonPlayerArrowDespawnRate);
          log("Creative Arrow Despawn Rate: " + creativeArrowDespawnRate);
      }
diff --git a/Spigot-Server-Patches/0072-Optimize-isValidLocation-getType-and-getBlockData-fo.patch b/Spigot-Server-Patches/0071-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
similarity index 100%
rename from Spigot-Server-Patches/0072-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
rename to Spigot-Server-Patches/0071-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
diff --git a/Spigot-Server-Patches/0073-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch b/Spigot-Server-Patches/0072-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
similarity index 100%
rename from Spigot-Server-Patches/0073-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
rename to Spigot-Server-Patches/0072-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
diff --git a/Spigot-Server-Patches/0074-Entity-AddTo-RemoveFrom-World-Events.patch b/Spigot-Server-Patches/0073-Entity-AddTo-RemoveFrom-World-Events.patch
similarity index 100%
rename from Spigot-Server-Patches/0074-Entity-AddTo-RemoveFrom-World-Events.patch
rename to Spigot-Server-Patches/0073-Entity-AddTo-RemoveFrom-World-Events.patch
diff --git a/Spigot-Server-Patches/0075-Configurable-Chunk-Inhabited-Time.patch b/Spigot-Server-Patches/0074-Configurable-Chunk-Inhabited-Time.patch
similarity index 93%
rename from Spigot-Server-Patches/0075-Configurable-Chunk-Inhabited-Time.patch
rename to Spigot-Server-Patches/0074-Configurable-Chunk-Inhabited-Time.patch
index 3273ad6f68..ee7c5ebd1c 100644
--- a/Spigot-Server-Patches/0075-Configurable-Chunk-Inhabited-Time.patch
+++ b/Spigot-Server-Patches/0074-Configurable-Chunk-Inhabited-Time.patch
@@ -11,10 +11,10 @@ For people who want all chunks to be treated equally, you can chose a fixed valu
 This allows to fine-tune vanilla gameplay.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 6ef0e1399e9ff260712db1a044068c125b1316d3..5872e6b171416686b11678ac9f65706b83b4e231 100644
+index 92d1dffbf436a21943b4a6aa0fabf54f064e6046..725958efab3dd05e04b7b18e169230762ef800d0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -236,4 +236,14 @@ public class PaperWorldConfig {
+@@ -231,4 +231,14 @@ public class PaperWorldConfig {
              skeleHorseSpawnChance = 0.01D; // Vanilla value
          }
      }
diff --git a/Spigot-Server-Patches/0076-EntityPathfindEvent.patch b/Spigot-Server-Patches/0075-EntityPathfindEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0076-EntityPathfindEvent.patch
rename to Spigot-Server-Patches/0075-EntityPathfindEvent.patch
diff --git a/Spigot-Server-Patches/0077-Sanitise-RegionFileCache-and-make-configurable.patch b/Spigot-Server-Patches/0076-Sanitise-RegionFileCache-and-make-configurable.patch
similarity index 100%
rename from Spigot-Server-Patches/0077-Sanitise-RegionFileCache-and-make-configurable.patch
rename to Spigot-Server-Patches/0076-Sanitise-RegionFileCache-and-make-configurable.patch
diff --git a/Spigot-Server-Patches/0078-Do-not-load-chunks-for-Pathfinding.patch b/Spigot-Server-Patches/0077-Do-not-load-chunks-for-Pathfinding.patch
similarity index 100%
rename from Spigot-Server-Patches/0078-Do-not-load-chunks-for-Pathfinding.patch
rename to Spigot-Server-Patches/0077-Do-not-load-chunks-for-Pathfinding.patch
diff --git a/Spigot-Server-Patches/0079-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-Server-Patches/0078-Add-PlayerUseUnknownEntityEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0079-Add-PlayerUseUnknownEntityEvent.patch
rename to Spigot-Server-Patches/0078-Add-PlayerUseUnknownEntityEvent.patch
diff --git a/Spigot-Server-Patches/0080-Fix-reducedDebugInfo-not-initialized-on-client.patch b/Spigot-Server-Patches/0079-Fix-reducedDebugInfo-not-initialized-on-client.patch
similarity index 100%
rename from Spigot-Server-Patches/0080-Fix-reducedDebugInfo-not-initialized-on-client.patch
rename to Spigot-Server-Patches/0079-Fix-reducedDebugInfo-not-initialized-on-client.patch
diff --git a/Spigot-Server-Patches/0081-Configurable-Grass-Spread-Tick-Rate.patch b/Spigot-Server-Patches/0080-Configurable-Grass-Spread-Tick-Rate.patch
similarity index 92%
rename from Spigot-Server-Patches/0081-Configurable-Grass-Spread-Tick-Rate.patch
rename to Spigot-Server-Patches/0080-Configurable-Grass-Spread-Tick-Rate.patch
index cb86ec9a43..8941bb9c17 100644
--- a/Spigot-Server-Patches/0081-Configurable-Grass-Spread-Tick-Rate.patch
+++ b/Spigot-Server-Patches/0080-Configurable-Grass-Spread-Tick-Rate.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable Grass Spread Tick Rate
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 5872e6b171416686b11678ac9f65706b83b4e231..47f5f8055ed45914309ca9a295ac48b89f192320 100644
+index 725958efab3dd05e04b7b18e169230762ef800d0..fe2c8001897dc6d66ce0d24ddb1a5d3b79810294 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -246,4 +246,10 @@ public class PaperWorldConfig {
+@@ -241,4 +241,10 @@ public class PaperWorldConfig {
          }
          fixedInhabitedTime = getInt("fixed-chunk-inhabited-time", -1);
      }
diff --git a/Spigot-Server-Patches/0082-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/Spigot-Server-Patches/0081-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
similarity index 100%
rename from Spigot-Server-Patches/0082-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
rename to Spigot-Server-Patches/0081-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
diff --git a/Spigot-Server-Patches/0083-Remove-Debug-checks-from-DataBits.patch b/Spigot-Server-Patches/0082-Remove-Debug-checks-from-DataBits.patch
similarity index 100%
rename from Spigot-Server-Patches/0083-Remove-Debug-checks-from-DataBits.patch
rename to Spigot-Server-Patches/0082-Remove-Debug-checks-from-DataBits.patch
diff --git a/Spigot-Server-Patches/0084-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/Spigot-Server-Patches/0083-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
similarity index 95%
rename from Spigot-Server-Patches/0084-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
rename to Spigot-Server-Patches/0083-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
index defef8b05c..509722c2fb 100644
--- a/Spigot-Server-Patches/0084-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+++ b/Spigot-Server-Patches/0083-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
@@ -12,10 +12,10 @@ for this on CB at one point but I can't find it. We may need to do this
 ourselves at some point in the future.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 47f5f8055ed45914309ca9a295ac48b89f192320..b1d1a3c1f84e0d2153de257183687502c8f393d1 100644
+index fe2c8001897dc6d66ce0d24ddb1a5d3b79810294..538e6751f3bda77ba32256158d2a6a25025b360c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -252,4 +252,9 @@ public class PaperWorldConfig {
+@@ -247,4 +247,9 @@ public class PaperWorldConfig {
          grassUpdateRate = Math.max(0, getInt("grass-spread-tick-rate", grassUpdateRate));
          log("Grass Spread Tick Rate: " + grassUpdateRate);
      }
diff --git a/Spigot-Server-Patches/0085-Workaround-for-setting-passengers-on-players.patch b/Spigot-Server-Patches/0084-Workaround-for-setting-passengers-on-players.patch
similarity index 100%
rename from Spigot-Server-Patches/0085-Workaround-for-setting-passengers-on-players.patch
rename to Spigot-Server-Patches/0084-Workaround-for-setting-passengers-on-players.patch
diff --git a/Spigot-Server-Patches/0086-Remove-unused-World-Tile-Entity-List.patch b/Spigot-Server-Patches/0085-Remove-unused-World-Tile-Entity-List.patch
similarity index 100%
rename from Spigot-Server-Patches/0086-Remove-unused-World-Tile-Entity-List.patch
rename to Spigot-Server-Patches/0085-Remove-unused-World-Tile-Entity-List.patch
diff --git a/Spigot-Server-Patches/0087-Don-t-tick-Skulls-unused-code.patch b/Spigot-Server-Patches/0086-Don-t-tick-Skulls-unused-code.patch
similarity index 100%
rename from Spigot-Server-Patches/0087-Don-t-tick-Skulls-unused-code.patch
rename to Spigot-Server-Patches/0086-Don-t-tick-Skulls-unused-code.patch
diff --git a/Spigot-Server-Patches/0088-Configurable-Player-Collision.patch b/Spigot-Server-Patches/0087-Configurable-Player-Collision.patch
similarity index 100%
rename from Spigot-Server-Patches/0088-Configurable-Player-Collision.patch
rename to Spigot-Server-Patches/0087-Configurable-Player-Collision.patch
diff --git a/Spigot-Server-Patches/0089-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/Spigot-Server-Patches/0088-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
similarity index 100%
rename from Spigot-Server-Patches/0089-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
rename to Spigot-Server-Patches/0088-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
diff --git a/Spigot-Server-Patches/0090-Configurable-RCON-IP-address.patch b/Spigot-Server-Patches/0089-Configurable-RCON-IP-address.patch
similarity index 100%
rename from Spigot-Server-Patches/0090-Configurable-RCON-IP-address.patch
rename to Spigot-Server-Patches/0089-Configurable-RCON-IP-address.patch
diff --git a/Spigot-Server-Patches/0091-Prevent-Fire-from-loading-chunks.patch b/Spigot-Server-Patches/0090-Prevent-Fire-from-loading-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0091-Prevent-Fire-from-loading-chunks.patch
rename to Spigot-Server-Patches/0090-Prevent-Fire-from-loading-chunks.patch
diff --git a/Spigot-Server-Patches/0092-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0091-Implement-PlayerLocaleChangeEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0092-Implement-PlayerLocaleChangeEvent.patch
rename to Spigot-Server-Patches/0091-Implement-PlayerLocaleChangeEvent.patch
diff --git a/Spigot-Server-Patches/0093-EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-Server-Patches/0092-EntityRegainHealthEvent-isFastRegen-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0093-EntityRegainHealthEvent-isFastRegen-API.patch
rename to Spigot-Server-Patches/0092-EntityRegainHealthEvent-isFastRegen-API.patch
diff --git a/Spigot-Server-Patches/0094-Add-ability-to-configure-frosted_ice-properties.patch b/Spigot-Server-Patches/0093-Add-ability-to-configure-frosted_ice-properties.patch
similarity index 95%
rename from Spigot-Server-Patches/0094-Add-ability-to-configure-frosted_ice-properties.patch
rename to Spigot-Server-Patches/0093-Add-ability-to-configure-frosted_ice-properties.patch
index d321b0ce3c..ad1bf5bf27 100644
--- a/Spigot-Server-Patches/0094-Add-ability-to-configure-frosted_ice-properties.patch
+++ b/Spigot-Server-Patches/0093-Add-ability-to-configure-frosted_ice-properties.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add ability to configure frosted_ice properties
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index b1d1a3c1f84e0d2153de257183687502c8f393d1..9e0c4895403a264f927292db2ac06b00731986e3 100644
+index 538e6751f3bda77ba32256158d2a6a25025b360c..fd3793c55b8021b9fc61ce6be585a8c9b477aba2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -257,4 +257,14 @@ public class PaperWorldConfig {
+@@ -252,4 +252,14 @@ public class PaperWorldConfig {
      private void useVanillaScoreboardColoring() {
          useVanillaScoreboardColoring = getBoolean("use-vanilla-world-scoreboard-name-coloring", false);
      }
diff --git a/Spigot-Server-Patches/0095-remove-null-possibility-for-getServer-singleton.patch b/Spigot-Server-Patches/0094-remove-null-possibility-for-getServer-singleton.patch
similarity index 100%
rename from Spigot-Server-Patches/0095-remove-null-possibility-for-getServer-singleton.patch
rename to Spigot-Server-Patches/0094-remove-null-possibility-for-getServer-singleton.patch
diff --git a/Spigot-Server-Patches/0096-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/Spigot-Server-Patches/0095-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
similarity index 100%
rename from Spigot-Server-Patches/0096-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
rename to Spigot-Server-Patches/0095-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
diff --git a/Spigot-Server-Patches/0097-LootTable-API-Replenishable-Lootables-Feature.patch b/Spigot-Server-Patches/0096-LootTable-API-Replenishable-Lootables-Feature.patch
similarity index 99%
rename from Spigot-Server-Patches/0097-LootTable-API-Replenishable-Lootables-Feature.patch
rename to Spigot-Server-Patches/0096-LootTable-API-Replenishable-Lootables-Feature.patch
index 4ac3e6edd0..3282a9fb1f 100644
--- a/Spigot-Server-Patches/0097-LootTable-API-Replenishable-Lootables-Feature.patch
+++ b/Spigot-Server-Patches/0096-LootTable-API-Replenishable-Lootables-Feature.patch
@@ -11,10 +11,10 @@ This feature is good for long term worlds so that newer players
 do not suffer with "Every chest has been looted"
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 9e0c4895403a264f927292db2ac06b00731986e3..6db1312035807c04b98408100fb0a5c04c07aff4 100644
+index fd3793c55b8021b9fc61ce6be585a8c9b477aba2..05ea87a473228f5b386258fae3943f3f4561eaa6 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -267,4 +267,26 @@ public class PaperWorldConfig {
+@@ -262,4 +262,26 @@ public class PaperWorldConfig {
          this.frostedIceDelayMax = this.getInt("frosted-ice.delay.max", this.frostedIceDelayMax);
          log("Frosted Ice: " + (this.frostedIceEnabled ? "enabled" : "disabled") + " / delay: min=" + this.frostedIceDelayMin + ", max=" + this.frostedIceDelayMax);
      }
diff --git a/Spigot-Server-Patches/0098-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/Spigot-Server-Patches/0097-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
similarity index 100%
rename from Spigot-Server-Patches/0098-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
rename to Spigot-Server-Patches/0097-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
diff --git a/Spigot-Server-Patches/0099-System-property-for-disabling-watchdoge.patch b/Spigot-Server-Patches/0098-System-property-for-disabling-watchdoge.patch
similarity index 100%
rename from Spigot-Server-Patches/0099-System-property-for-disabling-watchdoge.patch
rename to Spigot-Server-Patches/0098-System-property-for-disabling-watchdoge.patch
diff --git a/Spigot-Server-Patches/0100-Optimize-UserCache-Thread-Safe.patch b/Spigot-Server-Patches/0099-Optimize-UserCache-Thread-Safe.patch
similarity index 100%
rename from Spigot-Server-Patches/0100-Optimize-UserCache-Thread-Safe.patch
rename to Spigot-Server-Patches/0099-Optimize-UserCache-Thread-Safe.patch
diff --git a/Spigot-Server-Patches/0101-Avoid-blocking-on-Network-Manager-creation.patch b/Spigot-Server-Patches/0100-Avoid-blocking-on-Network-Manager-creation.patch
similarity index 100%
rename from Spigot-Server-Patches/0101-Avoid-blocking-on-Network-Manager-creation.patch
rename to Spigot-Server-Patches/0100-Avoid-blocking-on-Network-Manager-creation.patch
diff --git a/Spigot-Server-Patches/0102-Optional-TNT-doesn-t-move-in-water.patch b/Spigot-Server-Patches/0101-Optional-TNT-doesn-t-move-in-water.patch
similarity index 96%
rename from Spigot-Server-Patches/0102-Optional-TNT-doesn-t-move-in-water.patch
rename to Spigot-Server-Patches/0101-Optional-TNT-doesn-t-move-in-water.patch
index 6c71ab72c3..ec0aca043a 100644
--- a/Spigot-Server-Patches/0102-Optional-TNT-doesn-t-move-in-water.patch
+++ b/Spigot-Server-Patches/0101-Optional-TNT-doesn-t-move-in-water.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Optional TNT doesn't move in water
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 6db1312035807c04b98408100fb0a5c04c07aff4..8cf3076f4e0d8d7e81158881c763f89ebda7e678 100644
+index 05ea87a473228f5b386258fae3943f3f4561eaa6..ac76bdd7e1d91b0d242539c4495948cdfbb622e0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -2,7 +2,6 @@ package com.destroystokyo.paper;
@@ -16,7 +16,7 @@ index 6db1312035807c04b98408100fb0a5c04c07aff4..8cf3076f4e0d8d7e81158881c763f89e
  import org.bukkit.configuration.file.YamlConfiguration;
  import org.spigotmc.SpigotWorldConfig;
  
-@@ -289,4 +288,14 @@ public class PaperWorldConfig {
+@@ -284,4 +283,14 @@ public class PaperWorldConfig {
              );
          }
      }
diff --git a/Spigot-Server-Patches/0103-Faster-redstone-torch-rapid-clock-removal.patch b/Spigot-Server-Patches/0102-Faster-redstone-torch-rapid-clock-removal.patch
similarity index 100%
rename from Spigot-Server-Patches/0103-Faster-redstone-torch-rapid-clock-removal.patch
rename to Spigot-Server-Patches/0102-Faster-redstone-torch-rapid-clock-removal.patch
diff --git a/Spigot-Server-Patches/0104-Add-server-name-parameter.patch b/Spigot-Server-Patches/0103-Add-server-name-parameter.patch
similarity index 100%
rename from Spigot-Server-Patches/0104-Add-server-name-parameter.patch
rename to Spigot-Server-Patches/0103-Add-server-name-parameter.patch
diff --git a/Spigot-Server-Patches/0105-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch b/Spigot-Server-Patches/0104-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
similarity index 100%
rename from Spigot-Server-Patches/0105-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
rename to Spigot-Server-Patches/0104-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
diff --git a/Spigot-Server-Patches/0106-Fix-Double-World-Add-issues.patch b/Spigot-Server-Patches/0105-Fix-Double-World-Add-issues.patch
similarity index 100%
rename from Spigot-Server-Patches/0106-Fix-Double-World-Add-issues.patch
rename to Spigot-Server-Patches/0105-Fix-Double-World-Add-issues.patch
diff --git a/Spigot-Server-Patches/0107-Fix-Old-Sign-Conversion.patch b/Spigot-Server-Patches/0106-Fix-Old-Sign-Conversion.patch
similarity index 100%
rename from Spigot-Server-Patches/0107-Fix-Old-Sign-Conversion.patch
rename to Spigot-Server-Patches/0106-Fix-Old-Sign-Conversion.patch
diff --git a/Spigot-Server-Patches/0108-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/Spigot-Server-Patches/0107-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
similarity index 100%
rename from Spigot-Server-Patches/0108-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
rename to Spigot-Server-Patches/0107-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
diff --git a/Spigot-Server-Patches/0109-Add-setting-for-proxy-online-mode-status.patch b/Spigot-Server-Patches/0108-Add-setting-for-proxy-online-mode-status.patch
similarity index 100%
rename from Spigot-Server-Patches/0109-Add-setting-for-proxy-online-mode-status.patch
rename to Spigot-Server-Patches/0108-Add-setting-for-proxy-online-mode-status.patch
diff --git a/Spigot-Server-Patches/0110-Optimise-BlockState-s-hashCode-equals.patch b/Spigot-Server-Patches/0109-Optimise-BlockState-s-hashCode-equals.patch
similarity index 100%
rename from Spigot-Server-Patches/0110-Optimise-BlockState-s-hashCode-equals.patch
rename to Spigot-Server-Patches/0109-Optimise-BlockState-s-hashCode-equals.patch
diff --git a/Spigot-Server-Patches/0111-Configurable-packet-in-spam-threshold.patch b/Spigot-Server-Patches/0110-Configurable-packet-in-spam-threshold.patch
similarity index 100%
rename from Spigot-Server-Patches/0111-Configurable-packet-in-spam-threshold.patch
rename to Spigot-Server-Patches/0110-Configurable-packet-in-spam-threshold.patch
diff --git a/Spigot-Server-Patches/0112-Configurable-flying-kick-messages.patch b/Spigot-Server-Patches/0111-Configurable-flying-kick-messages.patch
similarity index 100%
rename from Spigot-Server-Patches/0112-Configurable-flying-kick-messages.patch
rename to Spigot-Server-Patches/0111-Configurable-flying-kick-messages.patch
diff --git a/Spigot-Server-Patches/0113-Chunk-registration-fixes.patch b/Spigot-Server-Patches/0112-Chunk-registration-fixes.patch
similarity index 100%
rename from Spigot-Server-Patches/0113-Chunk-registration-fixes.patch
rename to Spigot-Server-Patches/0112-Chunk-registration-fixes.patch
diff --git a/Spigot-Server-Patches/0114-Remove-FishingHook-reference-on-Craft-Entity-removal.patch b/Spigot-Server-Patches/0113-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
similarity index 100%
rename from Spigot-Server-Patches/0114-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
rename to Spigot-Server-Patches/0113-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
diff --git a/Spigot-Server-Patches/0115-Auto-fix-bad-Y-levels-on-player-login.patch b/Spigot-Server-Patches/0114-Auto-fix-bad-Y-levels-on-player-login.patch
similarity index 91%
rename from Spigot-Server-Patches/0115-Auto-fix-bad-Y-levels-on-player-login.patch
rename to Spigot-Server-Patches/0114-Auto-fix-bad-Y-levels-on-player-login.patch
index f700b81317..b523521a58 100644
--- a/Spigot-Server-Patches/0115-Auto-fix-bad-Y-levels-on-player-login.patch
+++ b/Spigot-Server-Patches/0114-Auto-fix-bad-Y-levels-on-player-login.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Auto fix bad Y levels on player login
 Bring down to a saner Y level if super high, as this can cause the server to crash
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 898ac661042381b99b98991f493538c0433ddb09..69178bcfa328b79e8433805b650948fadc7b799b 100644
+index 177f865688c40d0ecca72771007e2271626ab5cc..b7f7dd59fd9deaff9ec3797b395c91c91ce5b54c 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -206,6 +206,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0116-Option-to-remove-corrupt-tile-entities.patch b/Spigot-Server-Patches/0115-Option-to-remove-corrupt-tile-entities.patch
similarity index 92%
rename from Spigot-Server-Patches/0116-Option-to-remove-corrupt-tile-entities.patch
rename to Spigot-Server-Patches/0115-Option-to-remove-corrupt-tile-entities.patch
index bc6c0cfd22..4fc8b4c766 100644
--- a/Spigot-Server-Patches/0116-Option-to-remove-corrupt-tile-entities.patch
+++ b/Spigot-Server-Patches/0115-Option-to-remove-corrupt-tile-entities.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Option to remove corrupt tile entities
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 8cf3076f4e0d8d7e81158881c763f89ebda7e678..721eceeffc843da8b9da1ccc2d07f3bcc901db76 100644
+index ac76bdd7e1d91b0d242539c4495948cdfbb622e0..6cb717a63f52d757b0b323408d2fc0c3d7db77da 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -298,4 +298,9 @@ public class PaperWorldConfig {
+@@ -293,4 +293,9 @@ public class PaperWorldConfig {
          preventTntFromMovingInWater = getBoolean("prevent-tnt-from-moving-in-water", false);
          log("Prevent TNT from moving in water: " + preventTntFromMovingInWater);
      }
diff --git a/Spigot-Server-Patches/0117-Add-EntityZapEvent.patch b/Spigot-Server-Patches/0116-Add-EntityZapEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0117-Add-EntityZapEvent.patch
rename to Spigot-Server-Patches/0116-Add-EntityZapEvent.patch
diff --git a/Spigot-Server-Patches/0118-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch b/Spigot-Server-Patches/0117-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
similarity index 94%
rename from Spigot-Server-Patches/0118-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
rename to Spigot-Server-Patches/0117-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
index 0e52d401fa..bcf6ae9288 100644
--- a/Spigot-Server-Patches/0118-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
+++ b/Spigot-Server-Patches/0117-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Filter bad data from ArmorStand and SpawnEgg items
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 721eceeffc843da8b9da1ccc2d07f3bcc901db76..bff2e9d26dc8057c3950d1b57ee2e7469e7f943c 100644
+index 6cb717a63f52d757b0b323408d2fc0c3d7db77da..e43aee3757b6765d898b50ebfff1a28071638558 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -2,6 +2,7 @@ package com.destroystokyo.paper;
@@ -16,7 +16,7 @@ index 721eceeffc843da8b9da1ccc2d07f3bcc901db76..bff2e9d26dc8057c3950d1b57ee2e746
  import org.bukkit.configuration.file.YamlConfiguration;
  import org.spigotmc.SpigotWorldConfig;
  
-@@ -303,4 +304,12 @@ public class PaperWorldConfig {
+@@ -298,4 +299,12 @@ public class PaperWorldConfig {
      private void removeCorruptTEs() {
          removeCorruptTEs = getBoolean("remove-corrupt-tile-entities", false);
      }
diff --git a/Spigot-Server-Patches/0119-Cache-user-authenticator-threads.patch b/Spigot-Server-Patches/0118-Cache-user-authenticator-threads.patch
similarity index 100%
rename from Spigot-Server-Patches/0119-Cache-user-authenticator-threads.patch
rename to Spigot-Server-Patches/0118-Cache-user-authenticator-threads.patch
diff --git a/Spigot-Server-Patches/0120-Optimise-removeQueue.patch b/Spigot-Server-Patches/0119-Optimise-removeQueue.patch
similarity index 100%
rename from Spigot-Server-Patches/0120-Optimise-removeQueue.patch
rename to Spigot-Server-Patches/0119-Optimise-removeQueue.patch
diff --git a/Spigot-Server-Patches/0121-Allow-Reloading-of-Command-Aliases.patch b/Spigot-Server-Patches/0120-Allow-Reloading-of-Command-Aliases.patch
similarity index 100%
rename from Spigot-Server-Patches/0121-Allow-Reloading-of-Command-Aliases.patch
rename to Spigot-Server-Patches/0120-Allow-Reloading-of-Command-Aliases.patch
diff --git a/Spigot-Server-Patches/0122-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-Server-Patches/0121-Add-source-to-PlayerExpChangeEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0122-Add-source-to-PlayerExpChangeEvent.patch
rename to Spigot-Server-Patches/0121-Add-source-to-PlayerExpChangeEvent.patch
diff --git a/Spigot-Server-Patches/0123-Don-t-let-fishinghooks-use-portals.patch b/Spigot-Server-Patches/0122-Don-t-let-fishinghooks-use-portals.patch
similarity index 100%
rename from Spigot-Server-Patches/0123-Don-t-let-fishinghooks-use-portals.patch
rename to Spigot-Server-Patches/0122-Don-t-let-fishinghooks-use-portals.patch
diff --git a/Spigot-Server-Patches/0124-Add-ProjectileCollideEvent.patch b/Spigot-Server-Patches/0123-Add-ProjectileCollideEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0124-Add-ProjectileCollideEvent.patch
rename to Spigot-Server-Patches/0123-Add-ProjectileCollideEvent.patch
diff --git a/Spigot-Server-Patches/0125-Prevent-Pathfinding-out-of-World-Border.patch b/Spigot-Server-Patches/0124-Prevent-Pathfinding-out-of-World-Border.patch
similarity index 100%
rename from Spigot-Server-Patches/0125-Prevent-Pathfinding-out-of-World-Border.patch
rename to Spigot-Server-Patches/0124-Prevent-Pathfinding-out-of-World-Border.patch
diff --git a/Spigot-Server-Patches/0126-Optimize-World.isLoaded-BlockPosition-Z.patch b/Spigot-Server-Patches/0125-Optimize-World.isLoaded-BlockPosition-Z.patch
similarity index 100%
rename from Spigot-Server-Patches/0126-Optimize-World.isLoaded-BlockPosition-Z.patch
rename to Spigot-Server-Patches/0125-Optimize-World.isLoaded-BlockPosition-Z.patch
diff --git a/Spigot-Server-Patches/0127-Bound-Treasure-Maps-to-World-Border.patch b/Spigot-Server-Patches/0126-Bound-Treasure-Maps-to-World-Border.patch
similarity index 100%
rename from Spigot-Server-Patches/0127-Bound-Treasure-Maps-to-World-Border.patch
rename to Spigot-Server-Patches/0126-Bound-Treasure-Maps-to-World-Border.patch
diff --git a/Spigot-Server-Patches/0128-Configurable-Cartographer-Treasure-Maps.patch b/Spigot-Server-Patches/0127-Configurable-Cartographer-Treasure-Maps.patch
similarity index 95%
rename from Spigot-Server-Patches/0128-Configurable-Cartographer-Treasure-Maps.patch
rename to Spigot-Server-Patches/0127-Configurable-Cartographer-Treasure-Maps.patch
index f46bdadca6..f55d2be9cd 100644
--- a/Spigot-Server-Patches/0128-Configurable-Cartographer-Treasure-Maps.patch
+++ b/Spigot-Server-Patches/0127-Configurable-Cartographer-Treasure-Maps.patch
@@ -9,10 +9,10 @@ Also allow turning off treasure maps all together as they can eat up Map ID's
 which are limited in quantity.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index bff2e9d26dc8057c3950d1b57ee2e7469e7f943c..f164844f339793860e773c499443ce160d0a6830 100644
+index e43aee3757b6765d898b50ebfff1a28071638558..255b4081314162cbe344b008158c6f4584795fb8 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -312,4 +312,14 @@ public class PaperWorldConfig {
+@@ -307,4 +307,14 @@ public class PaperWorldConfig {
              Bukkit.getLogger().warning("Spawn Egg and Armor Stand NBT filtering disabled, this is a potential security risk");
          }
      }
diff --git a/Spigot-Server-Patches/0129-Optimize-ItemStack.isEmpty.patch b/Spigot-Server-Patches/0128-Optimize-ItemStack.isEmpty.patch
similarity index 100%
rename from Spigot-Server-Patches/0129-Optimize-ItemStack.isEmpty.patch
rename to Spigot-Server-Patches/0128-Optimize-ItemStack.isEmpty.patch
diff --git a/Spigot-Server-Patches/0130-Add-API-methods-to-control-if-armour-stands-can-move.patch b/Spigot-Server-Patches/0129-Add-API-methods-to-control-if-armour-stands-can-move.patch
similarity index 100%
rename from Spigot-Server-Patches/0130-Add-API-methods-to-control-if-armour-stands-can-move.patch
rename to Spigot-Server-Patches/0129-Add-API-methods-to-control-if-armour-stands-can-move.patch
diff --git a/Spigot-Server-Patches/0131-Properly-fix-item-duplication-bug.patch b/Spigot-Server-Patches/0130-Properly-fix-item-duplication-bug.patch
similarity index 100%
rename from Spigot-Server-Patches/0131-Properly-fix-item-duplication-bug.patch
rename to Spigot-Server-Patches/0130-Properly-fix-item-duplication-bug.patch
diff --git a/Spigot-Server-Patches/0132-String-based-Action-Bar-API.patch b/Spigot-Server-Patches/0131-String-based-Action-Bar-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0132-String-based-Action-Bar-API.patch
rename to Spigot-Server-Patches/0131-String-based-Action-Bar-API.patch
diff --git a/Spigot-Server-Patches/0133-Firework-API-s.patch b/Spigot-Server-Patches/0132-Firework-API-s.patch
similarity index 100%
rename from Spigot-Server-Patches/0133-Firework-API-s.patch
rename to Spigot-Server-Patches/0132-Firework-API-s.patch
diff --git a/Spigot-Server-Patches/0134-PlayerTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0133-PlayerTeleportEndGatewayEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0134-PlayerTeleportEndGatewayEvent.patch
rename to Spigot-Server-Patches/0133-PlayerTeleportEndGatewayEvent.patch
diff --git a/Spigot-Server-Patches/0135-Provide-E-TE-Chunk-count-stat-methods.patch b/Spigot-Server-Patches/0134-Provide-E-TE-Chunk-count-stat-methods.patch
similarity index 100%
rename from Spigot-Server-Patches/0135-Provide-E-TE-Chunk-count-stat-methods.patch
rename to Spigot-Server-Patches/0134-Provide-E-TE-Chunk-count-stat-methods.patch
diff --git a/Spigot-Server-Patches/0136-Enforce-Sync-Player-Saves.patch b/Spigot-Server-Patches/0135-Enforce-Sync-Player-Saves.patch
similarity index 100%
rename from Spigot-Server-Patches/0136-Enforce-Sync-Player-Saves.patch
rename to Spigot-Server-Patches/0135-Enforce-Sync-Player-Saves.patch
diff --git a/Spigot-Server-Patches/0137-Don-t-allow-entities-to-ride-themselves-572.patch b/Spigot-Server-Patches/0136-Don-t-allow-entities-to-ride-themselves-572.patch
similarity index 100%
rename from Spigot-Server-Patches/0137-Don-t-allow-entities-to-ride-themselves-572.patch
rename to Spigot-Server-Patches/0136-Don-t-allow-entities-to-ride-themselves-572.patch
diff --git a/Spigot-Server-Patches/0138-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/Spigot-Server-Patches/0137-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
similarity index 100%
rename from Spigot-Server-Patches/0138-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
rename to Spigot-Server-Patches/0137-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
diff --git a/Spigot-Server-Patches/0139-Cap-Entity-Collisions.patch b/Spigot-Server-Patches/0138-Cap-Entity-Collisions.patch
similarity index 95%
rename from Spigot-Server-Patches/0139-Cap-Entity-Collisions.patch
rename to Spigot-Server-Patches/0138-Cap-Entity-Collisions.patch
index 89ff13d7bd..a71d865565 100644
--- a/Spigot-Server-Patches/0139-Cap-Entity-Collisions.patch
+++ b/Spigot-Server-Patches/0138-Cap-Entity-Collisions.patch
@@ -12,10 +12,10 @@ just as it does in Vanilla, but entity pushing logic will be capped.
 You can set this to 0 to disable collisions.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index f164844f339793860e773c499443ce160d0a6830..751551f173338217f6682532a9a5e1a269415177 100644
+index 255b4081314162cbe344b008158c6f4584795fb8..04ee0856a8c62e1afb438d4fddf40e605e82a074 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -322,4 +322,10 @@ public class PaperWorldConfig {
+@@ -317,4 +317,10 @@ public class PaperWorldConfig {
              log("Treasure Maps will return already discovered locations");
          }
      }
diff --git a/Spigot-Server-Patches/0140-Remove-CraftScheduler-Async-Task-Debugger.patch b/Spigot-Server-Patches/0139-Remove-CraftScheduler-Async-Task-Debugger.patch
similarity index 100%
rename from Spigot-Server-Patches/0140-Remove-CraftScheduler-Async-Task-Debugger.patch
rename to Spigot-Server-Patches/0139-Remove-CraftScheduler-Async-Task-Debugger.patch
diff --git a/Spigot-Server-Patches/0141-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch b/Spigot-Server-Patches/0140-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
similarity index 100%
rename from Spigot-Server-Patches/0141-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
rename to Spigot-Server-Patches/0140-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
diff --git a/Spigot-Server-Patches/0142-Do-not-let-armorstands-drown.patch b/Spigot-Server-Patches/0141-Do-not-let-armorstands-drown.patch
similarity index 100%
rename from Spigot-Server-Patches/0142-Do-not-let-armorstands-drown.patch
rename to Spigot-Server-Patches/0141-Do-not-let-armorstands-drown.patch
diff --git a/Spigot-Server-Patches/0143-Properly-handle-async-calls-to-restart-the-server.patch b/Spigot-Server-Patches/0142-Properly-handle-async-calls-to-restart-the-server.patch
similarity index 100%
rename from Spigot-Server-Patches/0143-Properly-handle-async-calls-to-restart-the-server.patch
rename to Spigot-Server-Patches/0142-Properly-handle-async-calls-to-restart-the-server.patch
diff --git a/Spigot-Server-Patches/0144-Add-system-property-to-disable-book-size-limits.patch b/Spigot-Server-Patches/0143-Add-system-property-to-disable-book-size-limits.patch
similarity index 100%
rename from Spigot-Server-Patches/0144-Add-system-property-to-disable-book-size-limits.patch
rename to Spigot-Server-Patches/0143-Add-system-property-to-disable-book-size-limits.patch
diff --git a/Spigot-Server-Patches/0145-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/Spigot-Server-Patches/0144-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
similarity index 95%
rename from Spigot-Server-Patches/0145-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
rename to Spigot-Server-Patches/0144-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
index 59d1e3b68d..4e0871e3eb 100644
--- a/Spigot-Server-Patches/0145-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/Spigot-Server-Patches/0144-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
@@ -11,10 +11,10 @@ I suspect Mojang may switch to this behavior before full release.
 To be converted into a Paper-API event at some point in the future?
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 751551f173338217f6682532a9a5e1a269415177..eae1690cc6db99b2f3af70a121f83b455b0fb20d 100644
+index 04ee0856a8c62e1afb438d4fddf40e605e82a074..0cc7ad571eba249199a2e5e8ec567a874241c903 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -328,4 +328,10 @@ public class PaperWorldConfig {
+@@ -323,4 +323,10 @@ public class PaperWorldConfig {
          maxCollisionsPerEntity = getInt( "max-entity-collisions", this.spigotConfig.getInt("max-entity-collisions", 8) );
          log( "Max Entity Collisions: " + maxCollisionsPerEntity );
      }
diff --git a/Spigot-Server-Patches/0146-Add-configuration-option-to-prevent-player-names-fro.patch b/Spigot-Server-Patches/0145-Add-configuration-option-to-prevent-player-names-fro.patch
similarity index 100%
rename from Spigot-Server-Patches/0146-Add-configuration-option-to-prevent-player-names-fro.patch
rename to Spigot-Server-Patches/0145-Add-configuration-option-to-prevent-player-names-fro.patch
diff --git a/Spigot-Server-Patches/0147-Use-TerminalConsoleAppender-for-console-improvements.patch b/Spigot-Server-Patches/0146-Use-TerminalConsoleAppender-for-console-improvements.patch
similarity index 100%
rename from Spigot-Server-Patches/0147-Use-TerminalConsoleAppender-for-console-improvements.patch
rename to Spigot-Server-Patches/0146-Use-TerminalConsoleAppender-for-console-improvements.patch
diff --git a/Spigot-Server-Patches/0148-provide-a-configurable-option-to-disable-creeper-lin.patch b/Spigot-Server-Patches/0147-provide-a-configurable-option-to-disable-creeper-lin.patch
similarity index 92%
rename from Spigot-Server-Patches/0148-provide-a-configurable-option-to-disable-creeper-lin.patch
rename to Spigot-Server-Patches/0147-provide-a-configurable-option-to-disable-creeper-lin.patch
index 51a0672e09..682daa1e7d 100644
--- a/Spigot-Server-Patches/0148-provide-a-configurable-option-to-disable-creeper-lin.patch
+++ b/Spigot-Server-Patches/0147-provide-a-configurable-option-to-disable-creeper-lin.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] provide a configurable option to disable creeper lingering
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index eae1690cc6db99b2f3af70a121f83b455b0fb20d..39ab5457569684bc66cd67f5f9d2505ef9f304ab 100644
+index 0cc7ad571eba249199a2e5e8ec567a874241c903..e30f48caf2ce4f48f371b2594b765c27bc9e9778 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -334,4 +334,10 @@ public class PaperWorldConfig {
+@@ -329,4 +329,10 @@ public class PaperWorldConfig {
          parrotsHangOnBetter = getBoolean("parrots-are-unaffected-by-player-movement", false);
          log("Parrots are unaffected by player movement: " + parrotsHangOnBetter);
      }
diff --git a/Spigot-Server-Patches/0149-Item-canEntityPickup.patch b/Spigot-Server-Patches/0148-Item-canEntityPickup.patch
similarity index 96%
rename from Spigot-Server-Patches/0149-Item-canEntityPickup.patch
rename to Spigot-Server-Patches/0148-Item-canEntityPickup.patch
index 60f3a133e4..b8a554bc25 100644
--- a/Spigot-Server-Patches/0149-Item-canEntityPickup.patch
+++ b/Spigot-Server-Patches/0148-Item-canEntityPickup.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Item#canEntityPickup
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 2f85d9799d67d3fb1d340179d8dbd03771467329..e434e23bf5b22a623ed7b915711bdb31b7e90b61 100644
+index 9715f10c790c0210435622ab9997ac40f98da185..a6aa7a1a8da787604b2d8f3f9ea119d4b6bc188d 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -539,6 +539,11 @@ public abstract class EntityInsentient extends EntityLiving {
diff --git a/Spigot-Server-Patches/0150-PlayerPickupItemEvent-setFlyAtPlayer.patch b/Spigot-Server-Patches/0149-PlayerPickupItemEvent-setFlyAtPlayer.patch
similarity index 100%
rename from Spigot-Server-Patches/0150-PlayerPickupItemEvent-setFlyAtPlayer.patch
rename to Spigot-Server-Patches/0149-PlayerPickupItemEvent-setFlyAtPlayer.patch
diff --git a/Spigot-Server-Patches/0151-PlayerAttemptPickupItemEvent.patch b/Spigot-Server-Patches/0150-PlayerAttemptPickupItemEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0151-PlayerAttemptPickupItemEvent.patch
rename to Spigot-Server-Patches/0150-PlayerAttemptPickupItemEvent.patch
diff --git a/Spigot-Server-Patches/0152-Add-UnknownCommandEvent.patch b/Spigot-Server-Patches/0151-Add-UnknownCommandEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0152-Add-UnknownCommandEvent.patch
rename to Spigot-Server-Patches/0151-Add-UnknownCommandEvent.patch
diff --git a/Spigot-Server-Patches/0153-Basic-PlayerProfile-API.patch b/Spigot-Server-Patches/0152-Basic-PlayerProfile-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0153-Basic-PlayerProfile-API.patch
rename to Spigot-Server-Patches/0152-Basic-PlayerProfile-API.patch
diff --git a/Spigot-Server-Patches/0154-Shoulder-Entities-Release-API.patch b/Spigot-Server-Patches/0153-Shoulder-Entities-Release-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0154-Shoulder-Entities-Release-API.patch
rename to Spigot-Server-Patches/0153-Shoulder-Entities-Release-API.patch
diff --git a/Spigot-Server-Patches/0155-Profile-Lookup-Events.patch b/Spigot-Server-Patches/0154-Profile-Lookup-Events.patch
similarity index 100%
rename from Spigot-Server-Patches/0155-Profile-Lookup-Events.patch
rename to Spigot-Server-Patches/0154-Profile-Lookup-Events.patch
diff --git a/Spigot-Server-Patches/0156-Block-player-logins-during-server-shutdown.patch b/Spigot-Server-Patches/0155-Block-player-logins-during-server-shutdown.patch
similarity index 100%
rename from Spigot-Server-Patches/0156-Block-player-logins-during-server-shutdown.patch
rename to Spigot-Server-Patches/0155-Block-player-logins-during-server-shutdown.patch
diff --git a/Spigot-Server-Patches/0157-Entity-fromMobSpawner.patch b/Spigot-Server-Patches/0156-Entity-fromMobSpawner.patch
similarity index 100%
rename from Spigot-Server-Patches/0157-Entity-fromMobSpawner.patch
rename to Spigot-Server-Patches/0156-Entity-fromMobSpawner.patch
diff --git a/Spigot-Server-Patches/0158-Improve-the-Saddle-API-for-Horses.patch b/Spigot-Server-Patches/0157-Improve-the-Saddle-API-for-Horses.patch
similarity index 100%
rename from Spigot-Server-Patches/0158-Improve-the-Saddle-API-for-Horses.patch
rename to Spigot-Server-Patches/0157-Improve-the-Saddle-API-for-Horses.patch
diff --git a/Spigot-Server-Patches/0159-Implement-ensureServerConversions-API.patch b/Spigot-Server-Patches/0158-Implement-ensureServerConversions-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0159-Implement-ensureServerConversions-API.patch
rename to Spigot-Server-Patches/0158-Implement-ensureServerConversions-API.patch
diff --git a/Spigot-Server-Patches/0160-Implement-getI18NDisplayName.patch b/Spigot-Server-Patches/0159-Implement-getI18NDisplayName.patch
similarity index 100%
rename from Spigot-Server-Patches/0160-Implement-getI18NDisplayName.patch
rename to Spigot-Server-Patches/0159-Implement-getI18NDisplayName.patch
diff --git a/Spigot-Server-Patches/0161-ProfileWhitelistVerifyEvent.patch b/Spigot-Server-Patches/0160-ProfileWhitelistVerifyEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0161-ProfileWhitelistVerifyEvent.patch
rename to Spigot-Server-Patches/0160-ProfileWhitelistVerifyEvent.patch
diff --git a/Spigot-Server-Patches/0162-Fix-this-stupid-bullshit.patch b/Spigot-Server-Patches/0161-Fix-this-stupid-bullshit.patch
similarity index 100%
rename from Spigot-Server-Patches/0162-Fix-this-stupid-bullshit.patch
rename to Spigot-Server-Patches/0161-Fix-this-stupid-bullshit.patch
diff --git a/Spigot-Server-Patches/0163-Ocelot-despawns-should-honor-nametags-and-leash.patch b/Spigot-Server-Patches/0162-Ocelot-despawns-should-honor-nametags-and-leash.patch
similarity index 100%
rename from Spigot-Server-Patches/0163-Ocelot-despawns-should-honor-nametags-and-leash.patch
rename to Spigot-Server-Patches/0162-Ocelot-despawns-should-honor-nametags-and-leash.patch
diff --git a/Spigot-Server-Patches/0164-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/Spigot-Server-Patches/0163-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
similarity index 100%
rename from Spigot-Server-Patches/0164-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
rename to Spigot-Server-Patches/0163-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
diff --git a/Spigot-Server-Patches/0165-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/Spigot-Server-Patches/0164-Fix-MC-117075-TE-Unload-Lag-Spike.patch
similarity index 100%
rename from Spigot-Server-Patches/0165-Fix-MC-117075-TE-Unload-Lag-Spike.patch
rename to Spigot-Server-Patches/0164-Fix-MC-117075-TE-Unload-Lag-Spike.patch
diff --git a/Spigot-Server-Patches/0166-Allow-specifying-a-custom-authentication-servers-dow.patch b/Spigot-Server-Patches/0165-Allow-specifying-a-custom-authentication-servers-dow.patch
similarity index 100%
rename from Spigot-Server-Patches/0166-Allow-specifying-a-custom-authentication-servers-dow.patch
rename to Spigot-Server-Patches/0165-Allow-specifying-a-custom-authentication-servers-dow.patch
diff --git a/Spigot-Server-Patches/0167-LivingEntity-setKiller.patch b/Spigot-Server-Patches/0166-LivingEntity-setKiller.patch
similarity index 100%
rename from Spigot-Server-Patches/0167-LivingEntity-setKiller.patch
rename to Spigot-Server-Patches/0166-LivingEntity-setKiller.patch
diff --git a/Spigot-Server-Patches/0168-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch b/Spigot-Server-Patches/0167-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
similarity index 100%
rename from Spigot-Server-Patches/0168-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
rename to Spigot-Server-Patches/0167-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
diff --git a/Spigot-Server-Patches/0169-Handle-plugin-prefixes-using-Log4J-configuration.patch b/Spigot-Server-Patches/0168-Handle-plugin-prefixes-using-Log4J-configuration.patch
similarity index 100%
rename from Spigot-Server-Patches/0169-Handle-plugin-prefixes-using-Log4J-configuration.patch
rename to Spigot-Server-Patches/0168-Handle-plugin-prefixes-using-Log4J-configuration.patch
diff --git a/Spigot-Server-Patches/0170-Include-Log4J2-SLF4J-implementation.patch b/Spigot-Server-Patches/0169-Include-Log4J2-SLF4J-implementation.patch
similarity index 100%
rename from Spigot-Server-Patches/0170-Include-Log4J2-SLF4J-implementation.patch
rename to Spigot-Server-Patches/0169-Include-Log4J2-SLF4J-implementation.patch
diff --git a/Spigot-Server-Patches/0171-Improve-Log4J-Configuration-Plugin-Loggers.patch b/Spigot-Server-Patches/0170-Improve-Log4J-Configuration-Plugin-Loggers.patch
similarity index 100%
rename from Spigot-Server-Patches/0171-Improve-Log4J-Configuration-Plugin-Loggers.patch
rename to Spigot-Server-Patches/0170-Improve-Log4J-Configuration-Plugin-Loggers.patch
diff --git a/Spigot-Server-Patches/0172-Add-PlayerJumpEvent.patch b/Spigot-Server-Patches/0171-Add-PlayerJumpEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0172-Add-PlayerJumpEvent.patch
rename to Spigot-Server-Patches/0171-Add-PlayerJumpEvent.patch
diff --git a/Spigot-Server-Patches/0173-handle-PacketPlayInKeepAlive-async.patch b/Spigot-Server-Patches/0172-handle-PacketPlayInKeepAlive-async.patch
similarity index 100%
rename from Spigot-Server-Patches/0173-handle-PacketPlayInKeepAlive-async.patch
rename to Spigot-Server-Patches/0172-handle-PacketPlayInKeepAlive-async.patch
diff --git a/Spigot-Server-Patches/0174-Expose-client-protocol-version-and-virtual-host.patch b/Spigot-Server-Patches/0173-Expose-client-protocol-version-and-virtual-host.patch
similarity index 100%
rename from Spigot-Server-Patches/0174-Expose-client-protocol-version-and-virtual-host.patch
rename to Spigot-Server-Patches/0173-Expose-client-protocol-version-and-virtual-host.patch
diff --git a/Spigot-Server-Patches/0175-revert-serverside-behavior-of-keepalives.patch b/Spigot-Server-Patches/0174-revert-serverside-behavior-of-keepalives.patch
similarity index 100%
rename from Spigot-Server-Patches/0175-revert-serverside-behavior-of-keepalives.patch
rename to Spigot-Server-Patches/0174-revert-serverside-behavior-of-keepalives.patch
diff --git a/Spigot-Server-Patches/0176-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/Spigot-Server-Patches/0175-Send-attack-SoundEffects-only-to-players-who-can-see.patch
similarity index 100%
rename from Spigot-Server-Patches/0176-Send-attack-SoundEffects-only-to-players-who-can-see.patch
rename to Spigot-Server-Patches/0175-Send-attack-SoundEffects-only-to-players-who-can-see.patch
diff --git a/Spigot-Server-Patches/0177-Option-for-maximum-exp-value-when-merging-orbs.patch b/Spigot-Server-Patches/0176-Option-for-maximum-exp-value-when-merging-orbs.patch
similarity index 95%
rename from Spigot-Server-Patches/0177-Option-for-maximum-exp-value-when-merging-orbs.patch
rename to Spigot-Server-Patches/0176-Option-for-maximum-exp-value-when-merging-orbs.patch
index 07c0bd76f2..a2de8f3eec 100644
--- a/Spigot-Server-Patches/0177-Option-for-maximum-exp-value-when-merging-orbs.patch
+++ b/Spigot-Server-Patches/0176-Option-for-maximum-exp-value-when-merging-orbs.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Option for maximum exp value when merging orbs
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 39ab5457569684bc66cd67f5f9d2505ef9f304ab..d2582d981f859b55ba5086540963c01ed49e4c15 100644
+index e30f48caf2ce4f48f371b2594b765c27bc9e9778..2d8b354d707e8b5b0e7cd644fb93bc8f1c4009f1 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -340,4 +340,10 @@ public class PaperWorldConfig {
+@@ -335,4 +335,10 @@ public class PaperWorldConfig {
          disableCreeperLingeringEffect = getBoolean("disable-creeper-lingering-effect", false);
          log("Creeper lingering effect: " + disableCreeperLingeringEffect);
      }
diff --git a/Spigot-Server-Patches/0178-Add-PlayerArmorChangeEvent.patch b/Spigot-Server-Patches/0177-Add-PlayerArmorChangeEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0178-Add-PlayerArmorChangeEvent.patch
rename to Spigot-Server-Patches/0177-Add-PlayerArmorChangeEvent.patch
diff --git a/Spigot-Server-Patches/0179-Prevent-logins-from-being-processed-when-the-player-.patch b/Spigot-Server-Patches/0178-Prevent-logins-from-being-processed-when-the-player-.patch
similarity index 100%
rename from Spigot-Server-Patches/0179-Prevent-logins-from-being-processed-when-the-player-.patch
rename to Spigot-Server-Patches/0178-Prevent-logins-from-being-processed-when-the-player-.patch
diff --git a/Spigot-Server-Patches/0180-use-CB-BlockState-implementations-for-captured-block.patch b/Spigot-Server-Patches/0179-use-CB-BlockState-implementations-for-captured-block.patch
similarity index 100%
rename from Spigot-Server-Patches/0180-use-CB-BlockState-implementations-for-captured-block.patch
rename to Spigot-Server-Patches/0179-use-CB-BlockState-implementations-for-captured-block.patch
diff --git a/Spigot-Server-Patches/0181-API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-Server-Patches/0180-API-to-get-a-BlockState-without-a-snapshot.patch
similarity index 100%
rename from Spigot-Server-Patches/0181-API-to-get-a-BlockState-without-a-snapshot.patch
rename to Spigot-Server-Patches/0180-API-to-get-a-BlockState-without-a-snapshot.patch
diff --git a/Spigot-Server-Patches/0182-AsyncTabCompleteEvent.patch b/Spigot-Server-Patches/0181-AsyncTabCompleteEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0182-AsyncTabCompleteEvent.patch
rename to Spigot-Server-Patches/0181-AsyncTabCompleteEvent.patch
diff --git a/Spigot-Server-Patches/0183-Avoid-NPE-in-PathfinderGoalTempt.patch b/Spigot-Server-Patches/0182-Avoid-NPE-in-PathfinderGoalTempt.patch
similarity index 100%
rename from Spigot-Server-Patches/0183-Avoid-NPE-in-PathfinderGoalTempt.patch
rename to Spigot-Server-Patches/0182-Avoid-NPE-in-PathfinderGoalTempt.patch
diff --git a/Spigot-Server-Patches/0184-PlayerPickupExperienceEvent.patch b/Spigot-Server-Patches/0183-PlayerPickupExperienceEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0184-PlayerPickupExperienceEvent.patch
rename to Spigot-Server-Patches/0183-PlayerPickupExperienceEvent.patch
diff --git a/Spigot-Server-Patches/0185-ExperienceOrbMergeEvent.patch b/Spigot-Server-Patches/0184-ExperienceOrbMergeEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0185-ExperienceOrbMergeEvent.patch
rename to Spigot-Server-Patches/0184-ExperienceOrbMergeEvent.patch
diff --git a/Spigot-Server-Patches/0186-Ability-to-apply-mending-to-XP-API.patch b/Spigot-Server-Patches/0185-Ability-to-apply-mending-to-XP-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0186-Ability-to-apply-mending-to-XP-API.patch
rename to Spigot-Server-Patches/0185-Ability-to-apply-mending-to-XP-API.patch
diff --git a/Spigot-Server-Patches/0187-Make-max-squid-spawn-height-configurable.patch b/Spigot-Server-Patches/0186-Make-max-squid-spawn-height-configurable.patch
similarity index 93%
rename from Spigot-Server-Patches/0187-Make-max-squid-spawn-height-configurable.patch
rename to Spigot-Server-Patches/0186-Make-max-squid-spawn-height-configurable.patch
index a12846c612..e652242856 100644
--- a/Spigot-Server-Patches/0187-Make-max-squid-spawn-height-configurable.patch
+++ b/Spigot-Server-Patches/0186-Make-max-squid-spawn-height-configurable.patch
@@ -7,10 +7,10 @@ I don't know why upstream made only the minimum height configurable but
 whatever
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index d2582d981f859b55ba5086540963c01ed49e4c15..92e6891502ef6dc276ed5b371124f24d5237b26b 100644
+index 2d8b354d707e8b5b0e7cd644fb93bc8f1c4009f1..48fa2483fc657b36b8f2fd7d8b35703cff2698a5 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -346,4 +346,9 @@ public class PaperWorldConfig {
+@@ -341,4 +341,9 @@ public class PaperWorldConfig {
          expMergeMaxValue = getInt("experience-merge-max-value", -1);
          log("Experience Merge Max Value: " + expMergeMaxValue);
      }
diff --git a/Spigot-Server-Patches/0188-PreCreatureSpawnEvent.patch b/Spigot-Server-Patches/0187-PreCreatureSpawnEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0188-PreCreatureSpawnEvent.patch
rename to Spigot-Server-Patches/0187-PreCreatureSpawnEvent.patch
diff --git a/Spigot-Server-Patches/0189-PlayerNaturallySpawnCreaturesEvent.patch b/Spigot-Server-Patches/0188-PlayerNaturallySpawnCreaturesEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0189-PlayerNaturallySpawnCreaturesEvent.patch
rename to Spigot-Server-Patches/0188-PlayerNaturallySpawnCreaturesEvent.patch
index b6a7714d43..23191eda61 100644
--- a/Spigot-Server-Patches/0189-PlayerNaturallySpawnCreaturesEvent.patch
+++ b/Spigot-Server-Patches/0188-PlayerNaturallySpawnCreaturesEvent.patch
@@ -29,7 +29,7 @@ index 7abd3683f9cc21b90dc74739954de2decddf6478..6921def2dc8dd7f2b8ba9d46ab697a9f
                  Optional<Chunk> optional = ((Either) playerchunk.a().getNow(PlayerChunk.UNLOADED_CHUNK)).left();
  
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 2fa8c3e2491ff5947a99374c0678694d833bf659..253dac9aff57f4311f8c3134caad760992bd340b 100644
+index 7227717f1ede5d67432f97f527c2d18f9d1c656f..6414ff3ca7e5f217268f7114f7ac751532444af6 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1,5 +1,6 @@
diff --git a/Spigot-Server-Patches/0190-Add-setPlayerProfile-API-for-Skulls.patch b/Spigot-Server-Patches/0189-Add-setPlayerProfile-API-for-Skulls.patch
similarity index 100%
rename from Spigot-Server-Patches/0190-Add-setPlayerProfile-API-for-Skulls.patch
rename to Spigot-Server-Patches/0189-Add-setPlayerProfile-API-for-Skulls.patch
diff --git a/Spigot-Server-Patches/0191-Fill-Profile-Property-Events.patch b/Spigot-Server-Patches/0190-Fill-Profile-Property-Events.patch
similarity index 100%
rename from Spigot-Server-Patches/0191-Fill-Profile-Property-Events.patch
rename to Spigot-Server-Patches/0190-Fill-Profile-Property-Events.patch
diff --git a/Spigot-Server-Patches/0192-PlayerAdvancementCriterionGrantEvent.patch b/Spigot-Server-Patches/0191-PlayerAdvancementCriterionGrantEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0192-PlayerAdvancementCriterionGrantEvent.patch
rename to Spigot-Server-Patches/0191-PlayerAdvancementCriterionGrantEvent.patch
diff --git a/Spigot-Server-Patches/0193-Add-ArmorStand-Item-Meta.patch b/Spigot-Server-Patches/0192-Add-ArmorStand-Item-Meta.patch
similarity index 100%
rename from Spigot-Server-Patches/0193-Add-ArmorStand-Item-Meta.patch
rename to Spigot-Server-Patches/0192-Add-ArmorStand-Item-Meta.patch
diff --git a/Spigot-Server-Patches/0194-Extend-Player-Interact-cancellation.patch b/Spigot-Server-Patches/0193-Extend-Player-Interact-cancellation.patch
similarity index 100%
rename from Spigot-Server-Patches/0194-Extend-Player-Interact-cancellation.patch
rename to Spigot-Server-Patches/0193-Extend-Player-Interact-cancellation.patch
diff --git a/Spigot-Server-Patches/0195-Tameable-getOwnerUniqueId-API.patch b/Spigot-Server-Patches/0194-Tameable-getOwnerUniqueId-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0195-Tameable-getOwnerUniqueId-API.patch
rename to Spigot-Server-Patches/0194-Tameable-getOwnerUniqueId-API.patch
diff --git a/Spigot-Server-Patches/0196-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/Spigot-Server-Patches/0195-Toggleable-player-crits-helps-mitigate-hacked-client.patch
similarity index 95%
rename from Spigot-Server-Patches/0196-Toggleable-player-crits-helps-mitigate-hacked-client.patch
rename to Spigot-Server-Patches/0195-Toggleable-player-crits-helps-mitigate-hacked-client.patch
index 2e13a03729..5e0ca8f083 100644
--- a/Spigot-Server-Patches/0196-Toggleable-player-crits-helps-mitigate-hacked-client.patch
+++ b/Spigot-Server-Patches/0195-Toggleable-player-crits-helps-mitigate-hacked-client.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Toggleable player crits, helps mitigate hacked clients.
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 92e6891502ef6dc276ed5b371124f24d5237b26b..77cdbfadf9c3eddb6a02460c321fa816d1bab8ac 100644
+index 48fa2483fc657b36b8f2fd7d8b35703cff2698a5..3804c7cf96087cdf94fd5fbdce4ebcdafa9e0019 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -187,6 +187,11 @@ public class PaperWorldConfig {
diff --git a/Spigot-Server-Patches/0197-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch b/Spigot-Server-Patches/0196-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
similarity index 100%
rename from Spigot-Server-Patches/0197-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
rename to Spigot-Server-Patches/0196-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
diff --git a/Spigot-Server-Patches/0198-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/Spigot-Server-Patches/0197-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0198-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
rename to Spigot-Server-Patches/0197-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
diff --git a/Spigot-Server-Patches/0199-Disable-Explicit-Network-Manager-Flushing.patch b/Spigot-Server-Patches/0198-Disable-Explicit-Network-Manager-Flushing.patch
similarity index 100%
rename from Spigot-Server-Patches/0199-Disable-Explicit-Network-Manager-Flushing.patch
rename to Spigot-Server-Patches/0198-Disable-Explicit-Network-Manager-Flushing.patch
diff --git a/Spigot-Server-Patches/0200-Implement-extended-PaperServerListPingEvent.patch b/Spigot-Server-Patches/0199-Implement-extended-PaperServerListPingEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0200-Implement-extended-PaperServerListPingEvent.patch
rename to Spigot-Server-Patches/0199-Implement-extended-PaperServerListPingEvent.patch
diff --git a/Spigot-Server-Patches/0201-Improved-Async-Task-Scheduler.patch b/Spigot-Server-Patches/0200-Improved-Async-Task-Scheduler.patch
similarity index 100%
rename from Spigot-Server-Patches/0201-Improved-Async-Task-Scheduler.patch
rename to Spigot-Server-Patches/0200-Improved-Async-Task-Scheduler.patch
diff --git a/Spigot-Server-Patches/0202-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/Spigot-Server-Patches/0201-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
similarity index 100%
rename from Spigot-Server-Patches/0202-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
rename to Spigot-Server-Patches/0201-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
diff --git a/Spigot-Server-Patches/0203-Player.setPlayerProfile-API.patch b/Spigot-Server-Patches/0202-Player.setPlayerProfile-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0203-Player.setPlayerProfile-API.patch
rename to Spigot-Server-Patches/0202-Player.setPlayerProfile-API.patch
diff --git a/Spigot-Server-Patches/0204-Fix-Dragon-Server-Crashes.patch b/Spigot-Server-Patches/0203-Fix-Dragon-Server-Crashes.patch
similarity index 100%
rename from Spigot-Server-Patches/0204-Fix-Dragon-Server-Crashes.patch
rename to Spigot-Server-Patches/0203-Fix-Dragon-Server-Crashes.patch
diff --git a/Spigot-Server-Patches/0205-getPlayerUniqueId-API.patch b/Spigot-Server-Patches/0204-getPlayerUniqueId-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0205-getPlayerUniqueId-API.patch
rename to Spigot-Server-Patches/0204-getPlayerUniqueId-API.patch
diff --git a/Spigot-Server-Patches/0206-Make-player-data-saving-configurable.patch b/Spigot-Server-Patches/0205-Make-player-data-saving-configurable.patch
similarity index 100%
rename from Spigot-Server-Patches/0206-Make-player-data-saving-configurable.patch
rename to Spigot-Server-Patches/0205-Make-player-data-saving-configurable.patch
diff --git a/Spigot-Server-Patches/0207-Make-legacy-ping-handler-more-reliable.patch b/Spigot-Server-Patches/0206-Make-legacy-ping-handler-more-reliable.patch
similarity index 100%
rename from Spigot-Server-Patches/0207-Make-legacy-ping-handler-more-reliable.patch
rename to Spigot-Server-Patches/0206-Make-legacy-ping-handler-more-reliable.patch
diff --git a/Spigot-Server-Patches/0208-Call-PaperServerListPingEvent-for-legacy-pings.patch b/Spigot-Server-Patches/0207-Call-PaperServerListPingEvent-for-legacy-pings.patch
similarity index 100%
rename from Spigot-Server-Patches/0208-Call-PaperServerListPingEvent-for-legacy-pings.patch
rename to Spigot-Server-Patches/0207-Call-PaperServerListPingEvent-for-legacy-pings.patch
diff --git a/Spigot-Server-Patches/0209-Flag-to-disable-the-channel-limit.patch b/Spigot-Server-Patches/0208-Flag-to-disable-the-channel-limit.patch
similarity index 100%
rename from Spigot-Server-Patches/0209-Flag-to-disable-the-channel-limit.patch
rename to Spigot-Server-Patches/0208-Flag-to-disable-the-channel-limit.patch
diff --git a/Spigot-Server-Patches/0210-Add-method-to-open-already-placed-sign.patch b/Spigot-Server-Patches/0209-Add-method-to-open-already-placed-sign.patch
similarity index 100%
rename from Spigot-Server-Patches/0210-Add-method-to-open-already-placed-sign.patch
rename to Spigot-Server-Patches/0209-Add-method-to-open-already-placed-sign.patch
diff --git a/Spigot-Server-Patches/0211-Configurable-sprint-interruption-on-attack.patch b/Spigot-Server-Patches/0210-Configurable-sprint-interruption-on-attack.patch
similarity index 92%
rename from Spigot-Server-Patches/0211-Configurable-sprint-interruption-on-attack.patch
rename to Spigot-Server-Patches/0210-Configurable-sprint-interruption-on-attack.patch
index 4055fbd39f..cb50a1f5d1 100644
--- a/Spigot-Server-Patches/0211-Configurable-sprint-interruption-on-attack.patch
+++ b/Spigot-Server-Patches/0210-Configurable-sprint-interruption-on-attack.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Configurable sprint interruption on attack
 If the sprint interruption is disabled players continue sprinting when they attack entities.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 77cdbfadf9c3eddb6a02460c321fa816d1bab8ac..171c8e3031cf4bf4da062663089cc0cb4552fab6 100644
+index 3804c7cf96087cdf94fd5fbdce4ebcdafa9e0019..873f81c74a94f6d76edd45e34ddc476dc525b47c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -356,4 +356,9 @@ public class PaperWorldConfig {
+@@ -351,4 +351,9 @@ public class PaperWorldConfig {
      private void squidMaxSpawnHeight() {
          squidMaxSpawnHeight = getDouble("squid-spawn-height.maximum", 0.0D);
      }
diff --git a/Spigot-Server-Patches/0212-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/Spigot-Server-Patches/0211-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
similarity index 100%
rename from Spigot-Server-Patches/0212-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
rename to Spigot-Server-Patches/0211-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
diff --git a/Spigot-Server-Patches/0213-EndermanEscapeEvent.patch b/Spigot-Server-Patches/0212-EndermanEscapeEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0213-EndermanEscapeEvent.patch
rename to Spigot-Server-Patches/0212-EndermanEscapeEvent.patch
diff --git a/Spigot-Server-Patches/0214-Enderman.teleportRandomly.patch b/Spigot-Server-Patches/0213-Enderman.teleportRandomly.patch
similarity index 100%
rename from Spigot-Server-Patches/0214-Enderman.teleportRandomly.patch
rename to Spigot-Server-Patches/0213-Enderman.teleportRandomly.patch
diff --git a/Spigot-Server-Patches/0215-Block-Enderpearl-Travel-Exploit.patch b/Spigot-Server-Patches/0214-Block-Enderpearl-Travel-Exploit.patch
similarity index 93%
rename from Spigot-Server-Patches/0215-Block-Enderpearl-Travel-Exploit.patch
rename to Spigot-Server-Patches/0214-Block-Enderpearl-Travel-Exploit.patch
index d3f007cb38..f988c17ca0 100644
--- a/Spigot-Server-Patches/0215-Block-Enderpearl-Travel-Exploit.patch
+++ b/Spigot-Server-Patches/0214-Block-Enderpearl-Travel-Exploit.patch
@@ -12,10 +12,10 @@ This disables that by not saving the thrower when the chunk is unloaded.
 This is mainly useful for survival servers that do not allow freeform teleporting.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 171c8e3031cf4bf4da062663089cc0cb4552fab6..9c52e31f4cf1e64a37c65c021da219fc26dda137 100644
+index 873f81c74a94f6d76edd45e34ddc476dc525b47c..69009246f12cc3acb0055af746e01097fa668e1b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -361,4 +361,10 @@ public class PaperWorldConfig {
+@@ -356,4 +356,10 @@ public class PaperWorldConfig {
      private void disableSprintInterruptionOnAttack() {
          disableSprintInterruptionOnAttack = getBoolean("game-mechanics.disable-sprint-interruption-on-attack", false);
      }
diff --git a/Spigot-Server-Patches/0216-Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-Server-Patches/0215-Expand-World.spawnParticle-API-and-add-Builder.patch
similarity index 100%
rename from Spigot-Server-Patches/0216-Expand-World.spawnParticle-API-and-add-Builder.patch
rename to Spigot-Server-Patches/0215-Expand-World.spawnParticle-API-and-add-Builder.patch
diff --git a/Spigot-Server-Patches/0217-EndermanAttackPlayerEvent.patch b/Spigot-Server-Patches/0216-EndermanAttackPlayerEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0217-EndermanAttackPlayerEvent.patch
rename to Spigot-Server-Patches/0216-EndermanAttackPlayerEvent.patch
diff --git a/Spigot-Server-Patches/0218-WitchConsumePotionEvent.patch b/Spigot-Server-Patches/0217-WitchConsumePotionEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0218-WitchConsumePotionEvent.patch
rename to Spigot-Server-Patches/0217-WitchConsumePotionEvent.patch
diff --git a/Spigot-Server-Patches/0219-WitchThrowPotionEvent.patch b/Spigot-Server-Patches/0218-WitchThrowPotionEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0219-WitchThrowPotionEvent.patch
rename to Spigot-Server-Patches/0218-WitchThrowPotionEvent.patch
diff --git a/Spigot-Server-Patches/0220-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/Spigot-Server-Patches/0219-Allow-spawning-Item-entities-with-World.spawnEntity.patch
similarity index 100%
rename from Spigot-Server-Patches/0220-Allow-spawning-Item-entities-with-World.spawnEntity.patch
rename to Spigot-Server-Patches/0219-Allow-spawning-Item-entities-with-World.spawnEntity.patch
diff --git a/Spigot-Server-Patches/0221-WitchReadyPotionEvent.patch b/Spigot-Server-Patches/0220-WitchReadyPotionEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0221-WitchReadyPotionEvent.patch
rename to Spigot-Server-Patches/0220-WitchReadyPotionEvent.patch
diff --git a/Spigot-Server-Patches/0222-ItemStack-getMaxItemUseDuration.patch b/Spigot-Server-Patches/0221-ItemStack-getMaxItemUseDuration.patch
similarity index 100%
rename from Spigot-Server-Patches/0222-ItemStack-getMaxItemUseDuration.patch
rename to Spigot-Server-Patches/0221-ItemStack-getMaxItemUseDuration.patch
diff --git a/Spigot-Server-Patches/0223-Implement-EntityTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0222-Implement-EntityTeleportEndGatewayEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0223-Implement-EntityTeleportEndGatewayEvent.patch
rename to Spigot-Server-Patches/0222-Implement-EntityTeleportEndGatewayEvent.patch
diff --git a/Spigot-Server-Patches/0224-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/Spigot-Server-Patches/0223-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
similarity index 100%
rename from Spigot-Server-Patches/0224-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
rename to Spigot-Server-Patches/0223-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
diff --git a/Spigot-Server-Patches/0225-Fix-CraftEntity-hashCode.patch b/Spigot-Server-Patches/0224-Fix-CraftEntity-hashCode.patch
similarity index 100%
rename from Spigot-Server-Patches/0225-Fix-CraftEntity-hashCode.patch
rename to Spigot-Server-Patches/0224-Fix-CraftEntity-hashCode.patch
diff --git a/Spigot-Server-Patches/0226-Configurable-Alternative-LootPool-Luck-Formula.patch b/Spigot-Server-Patches/0225-Configurable-Alternative-LootPool-Luck-Formula.patch
similarity index 100%
rename from Spigot-Server-Patches/0226-Configurable-Alternative-LootPool-Luck-Formula.patch
rename to Spigot-Server-Patches/0225-Configurable-Alternative-LootPool-Luck-Formula.patch
diff --git a/Spigot-Server-Patches/0227-Print-Error-details-when-failing-to-save-player-data.patch b/Spigot-Server-Patches/0226-Print-Error-details-when-failing-to-save-player-data.patch
similarity index 100%
rename from Spigot-Server-Patches/0227-Print-Error-details-when-failing-to-save-player-data.patch
rename to Spigot-Server-Patches/0226-Print-Error-details-when-failing-to-save-player-data.patch
diff --git a/Spigot-Server-Patches/0228-Make-shield-blocking-delay-configurable.patch b/Spigot-Server-Patches/0227-Make-shield-blocking-delay-configurable.patch
similarity index 95%
rename from Spigot-Server-Patches/0228-Make-shield-blocking-delay-configurable.patch
rename to Spigot-Server-Patches/0227-Make-shield-blocking-delay-configurable.patch
index a8bb704890..43064f93fa 100644
--- a/Spigot-Server-Patches/0228-Make-shield-blocking-delay-configurable.patch
+++ b/Spigot-Server-Patches/0227-Make-shield-blocking-delay-configurable.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Make shield blocking delay configurable
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 9c52e31f4cf1e64a37c65c021da219fc26dda137..33ce9a500430a01650e69a3568c8b03db325a936 100644
+index 69009246f12cc3acb0055af746e01097fa668e1b..35075ffac394153e28039809e0ed48fe066a6223 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -367,4 +367,9 @@ public class PaperWorldConfig {
+@@ -362,4 +362,9 @@ public class PaperWorldConfig {
          disableEnderpearlExploit = getBoolean("game-mechanics.disable-unloaded-chunk-enderpearl-exploit", disableEnderpearlExploit);
          log("Disable Unloaded Chunk Enderpearl Exploit: " + (disableEnderpearlExploit ? "enabled" : "disabled"));
      }
diff --git a/Spigot-Server-Patches/0229-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/Spigot-Server-Patches/0228-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
similarity index 100%
rename from Spigot-Server-Patches/0229-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
rename to Spigot-Server-Patches/0228-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
diff --git a/Spigot-Server-Patches/0230-PlayerReadyArrowEvent.patch b/Spigot-Server-Patches/0229-PlayerReadyArrowEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0230-PlayerReadyArrowEvent.patch
rename to Spigot-Server-Patches/0229-PlayerReadyArrowEvent.patch
diff --git a/Spigot-Server-Patches/0231-Fire-EntityShootBowEvent-for-Illusioner.patch b/Spigot-Server-Patches/0230-Fire-EntityShootBowEvent-for-Illusioner.patch
similarity index 100%
rename from Spigot-Server-Patches/0231-Fire-EntityShootBowEvent-for-Illusioner.patch
rename to Spigot-Server-Patches/0230-Fire-EntityShootBowEvent-for-Illusioner.patch
diff --git a/Spigot-Server-Patches/0232-Implement-EntityKnockbackByEntityEvent.patch b/Spigot-Server-Patches/0231-Implement-EntityKnockbackByEntityEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0232-Implement-EntityKnockbackByEntityEvent.patch
rename to Spigot-Server-Patches/0231-Implement-EntityKnockbackByEntityEvent.patch
index f95ced4cfa..ee17ade14b 100644
--- a/Spigot-Server-Patches/0232-Implement-EntityKnockbackByEntityEvent.patch
+++ b/Spigot-Server-Patches/0231-Implement-EntityKnockbackByEntityEvent.patch
@@ -28,7 +28,7 @@ index a1cfa610eb3cc368b9641feeab709a4f5985ffbe..08141147f9795546e9397abed95834ed
                                      // CraftBukkit end
                                  }
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index e434e23bf5b22a623ed7b915711bdb31b7e90b61..424157dcf536527e80faf5428f18f7e66d4216b6 100644
+index a6aa7a1a8da787604b2d8f3f9ea119d4b6bc188d..bb831658d91ffa7d78cd8597509e61f3f14b0890 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -1474,7 +1474,7 @@ public abstract class EntityInsentient extends EntityLiving {
diff --git a/Spigot-Server-Patches/0233-Expand-Explosions-API.patch b/Spigot-Server-Patches/0232-Expand-Explosions-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0233-Expand-Explosions-API.patch
rename to Spigot-Server-Patches/0232-Expand-Explosions-API.patch
diff --git a/Spigot-Server-Patches/0234-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-Server-Patches/0233-LivingEntity-Hand-Raised-Item-Use-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0234-LivingEntity-Hand-Raised-Item-Use-API.patch
rename to Spigot-Server-Patches/0233-LivingEntity-Hand-Raised-Item-Use-API.patch
diff --git a/Spigot-Server-Patches/0235-RangedEntity-API.patch b/Spigot-Server-Patches/0234-RangedEntity-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0235-RangedEntity-API.patch
rename to Spigot-Server-Patches/0234-RangedEntity-API.patch
diff --git a/Spigot-Server-Patches/0236-Add-config-to-disable-ender-dragon-legacy-check.patch b/Spigot-Server-Patches/0235-Add-config-to-disable-ender-dragon-legacy-check.patch
similarity index 94%
rename from Spigot-Server-Patches/0236-Add-config-to-disable-ender-dragon-legacy-check.patch
rename to Spigot-Server-Patches/0235-Add-config-to-disable-ender-dragon-legacy-check.patch
index 621e22b74d..166e3a2751 100644
--- a/Spigot-Server-Patches/0236-Add-config-to-disable-ender-dragon-legacy-check.patch
+++ b/Spigot-Server-Patches/0235-Add-config-to-disable-ender-dragon-legacy-check.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add config to disable ender dragon legacy check
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 33ce9a500430a01650e69a3568c8b03db325a936..cea15d50ed89430ee8d8cff9de21e1fc7982e1d8 100644
+index 35075ffac394153e28039809e0ed48fe066a6223..6352051ab937d4d365e823a7112e76dc3ec34225 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -372,4 +372,9 @@ public class PaperWorldConfig {
+@@ -367,4 +367,9 @@ public class PaperWorldConfig {
      private void shieldBlockingDelay() {
          shieldBlockingDelay = getInt("game-mechanics.shield-blocking-delay", 5);
      }
diff --git a/Spigot-Server-Patches/0237-Implement-World.getEntity-UUID-API.patch b/Spigot-Server-Patches/0236-Implement-World.getEntity-UUID-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0237-Implement-World.getEntity-UUID-API.patch
rename to Spigot-Server-Patches/0236-Implement-World.getEntity-UUID-API.patch
diff --git a/Spigot-Server-Patches/0238-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0237-InventoryCloseEvent-Reason-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0238-InventoryCloseEvent-Reason-API.patch
rename to Spigot-Server-Patches/0237-InventoryCloseEvent-Reason-API.patch
diff --git a/Spigot-Server-Patches/0239-Configurable-Bed-Search-Radius.patch b/Spigot-Server-Patches/0238-Configurable-Bed-Search-Radius.patch
similarity index 98%
rename from Spigot-Server-Patches/0239-Configurable-Bed-Search-Radius.patch
rename to Spigot-Server-Patches/0238-Configurable-Bed-Search-Radius.patch
index 8219587132..4e8d577fbd 100644
--- a/Spigot-Server-Patches/0239-Configurable-Bed-Search-Radius.patch
+++ b/Spigot-Server-Patches/0238-Configurable-Bed-Search-Radius.patch
@@ -10,10 +10,10 @@ player at their bed should it of became obstructed.
 Defaults to vanilla 1.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index cea15d50ed89430ee8d8cff9de21e1fc7982e1d8..387e0dcb9f01ad947daaa19211331a96742ce004 100644
+index 6352051ab937d4d365e823a7112e76dc3ec34225..d6a3d882e375ac5a2b6ec8920532db615f4fe4ef 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -377,4 +377,15 @@ public class PaperWorldConfig {
+@@ -372,4 +372,15 @@ public class PaperWorldConfig {
      private void scanForLegacyEnderDragon() {
          scanForLegacyEnderDragon = getBoolean("game-mechanics.scan-for-legacy-ender-dragon", true);
      }
diff --git a/Spigot-Server-Patches/0240-Vex-getSummoner-API.patch b/Spigot-Server-Patches/0239-Vex-getSummoner-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0240-Vex-getSummoner-API.patch
rename to Spigot-Server-Patches/0239-Vex-getSummoner-API.patch
diff --git a/Spigot-Server-Patches/0241-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/Spigot-Server-Patches/0240-Refresh-player-inventory-when-cancelling-PlayerInter.patch
similarity index 100%
rename from Spigot-Server-Patches/0241-Refresh-player-inventory-when-cancelling-PlayerInter.patch
rename to Spigot-Server-Patches/0240-Refresh-player-inventory-when-cancelling-PlayerInter.patch
diff --git a/Spigot-Server-Patches/0242-Don-t-change-the-Entity-Random-seed-for-squids.patch b/Spigot-Server-Patches/0241-Don-t-change-the-Entity-Random-seed-for-squids.patch
similarity index 100%
rename from Spigot-Server-Patches/0242-Don-t-change-the-Entity-Random-seed-for-squids.patch
rename to Spigot-Server-Patches/0241-Don-t-change-the-Entity-Random-seed-for-squids.patch
diff --git a/Spigot-Server-Patches/0243-Re-add-vanilla-entity-warnings-for-duplicates.patch b/Spigot-Server-Patches/0242-Re-add-vanilla-entity-warnings-for-duplicates.patch
similarity index 100%
rename from Spigot-Server-Patches/0243-Re-add-vanilla-entity-warnings-for-duplicates.patch
rename to Spigot-Server-Patches/0242-Re-add-vanilla-entity-warnings-for-duplicates.patch
diff --git a/Spigot-Server-Patches/0244-Avoid-item-merge-if-stack-size-above-max-stack-size.patch b/Spigot-Server-Patches/0243-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
similarity index 100%
rename from Spigot-Server-Patches/0244-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
rename to Spigot-Server-Patches/0243-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
diff --git a/Spigot-Server-Patches/0245-Use-asynchronous-Log4j-2-loggers.patch b/Spigot-Server-Patches/0244-Use-asynchronous-Log4j-2-loggers.patch
similarity index 100%
rename from Spigot-Server-Patches/0245-Use-asynchronous-Log4j-2-loggers.patch
rename to Spigot-Server-Patches/0244-Use-asynchronous-Log4j-2-loggers.patch
diff --git a/Spigot-Server-Patches/0246-add-more-information-to-Entity.toString.patch b/Spigot-Server-Patches/0245-add-more-information-to-Entity.toString.patch
similarity index 100%
rename from Spigot-Server-Patches/0246-add-more-information-to-Entity.toString.patch
rename to Spigot-Server-Patches/0245-add-more-information-to-Entity.toString.patch
diff --git a/Spigot-Server-Patches/0247-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/Spigot-Server-Patches/0246-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
similarity index 100%
rename from Spigot-Server-Patches/0247-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
rename to Spigot-Server-Patches/0246-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
diff --git a/Spigot-Server-Patches/0248-EnderDragon-Events.patch b/Spigot-Server-Patches/0247-EnderDragon-Events.patch
similarity index 100%
rename from Spigot-Server-Patches/0248-EnderDragon-Events.patch
rename to Spigot-Server-Patches/0247-EnderDragon-Events.patch
diff --git a/Spigot-Server-Patches/0249-PlayerElytraBoostEvent.patch b/Spigot-Server-Patches/0248-PlayerElytraBoostEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0249-PlayerElytraBoostEvent.patch
rename to Spigot-Server-Patches/0248-PlayerElytraBoostEvent.patch
diff --git a/Spigot-Server-Patches/0250-Improve-BlockPosition-inlining.patch b/Spigot-Server-Patches/0249-Improve-BlockPosition-inlining.patch
similarity index 100%
rename from Spigot-Server-Patches/0250-Improve-BlockPosition-inlining.patch
rename to Spigot-Server-Patches/0249-Improve-BlockPosition-inlining.patch
diff --git a/Spigot-Server-Patches/0251-Optimize-RegistryID.c.patch b/Spigot-Server-Patches/0250-Optimize-RegistryID.c.patch
similarity index 100%
rename from Spigot-Server-Patches/0251-Optimize-RegistryID.c.patch
rename to Spigot-Server-Patches/0250-Optimize-RegistryID.c.patch
diff --git a/Spigot-Server-Patches/0252-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/0251-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
similarity index 92%
rename from Spigot-Server-Patches/0252-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
rename to Spigot-Server-Patches/0251-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
index 79d3ed4320..d4131ade17 100644
--- a/Spigot-Server-Patches/0252-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/Spigot-Server-Patches/0251-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Option to prevent armor stands from doing entity lookups
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 387e0dcb9f01ad947daaa19211331a96742ce004..eaaa51e4bf761f41fd516402ce1ad0f903c6ab71 100644
+index d6a3d882e375ac5a2b6ec8920532db615f4fe4ef..14bb9d843f05058cae5cc64de8149d2c97264f1a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -388,4 +388,9 @@ public class PaperWorldConfig {
+@@ -383,4 +383,9 @@ public class PaperWorldConfig {
              log("Bed Search Radius: " + bedSearchRadius);
          }
      }
diff --git a/Spigot-Server-Patches/0253-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0252-Vanished-players-don-t-have-rights.patch
similarity index 100%
rename from Spigot-Server-Patches/0253-Vanished-players-don-t-have-rights.patch
rename to Spigot-Server-Patches/0252-Vanished-players-don-t-have-rights.patch
diff --git a/Spigot-Server-Patches/0254-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch b/Spigot-Server-Patches/0253-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
similarity index 100%
rename from Spigot-Server-Patches/0254-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
rename to Spigot-Server-Patches/0253-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
diff --git a/Spigot-Server-Patches/0255-Add-some-Debug-to-Chunk-Entity-slices.patch b/Spigot-Server-Patches/0254-Add-some-Debug-to-Chunk-Entity-slices.patch
similarity index 100%
rename from Spigot-Server-Patches/0255-Add-some-Debug-to-Chunk-Entity-slices.patch
rename to Spigot-Server-Patches/0254-Add-some-Debug-to-Chunk-Entity-slices.patch
diff --git a/Spigot-Server-Patches/0256-EntityTransformedEvent.patch b/Spigot-Server-Patches/0255-EntityTransformedEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0256-EntityTransformedEvent.patch
rename to Spigot-Server-Patches/0255-EntityTransformedEvent.patch
index 7ecaec4d42..b1f90ec94d 100644
--- a/Spigot-Server-Patches/0256-EntityTransformedEvent.patch
+++ b/Spigot-Server-Patches/0255-EntityTransformedEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] EntityTransformedEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 424157dcf536527e80faf5428f18f7e66d4216b6..c23e634dca6aab051b432a5fee2756afa80fb776 100644
+index bb831658d91ffa7d78cd8597509e61f3f14b0890..8a79302b9cc178bfe4e0909293e3a87c01d344ca 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -1244,6 +1244,7 @@ public abstract class EntityInsentient extends EntityLiving {
diff --git a/Spigot-Server-Patches/0257-SkeletonHorse-Additions.patch b/Spigot-Server-Patches/0256-SkeletonHorse-Additions.patch
similarity index 100%
rename from Spigot-Server-Patches/0257-SkeletonHorse-Additions.patch
rename to Spigot-Server-Patches/0256-SkeletonHorse-Additions.patch
diff --git a/Spigot-Server-Patches/0258-Prevent-Saving-Bad-entities-to-chunks.patch b/Spigot-Server-Patches/0257-Prevent-Saving-Bad-entities-to-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0258-Prevent-Saving-Bad-entities-to-chunks.patch
rename to Spigot-Server-Patches/0257-Prevent-Saving-Bad-entities-to-chunks.patch
diff --git a/Spigot-Server-Patches/0259-Don-t-call-getItemMeta-on-hasItemMeta.patch b/Spigot-Server-Patches/0258-Don-t-call-getItemMeta-on-hasItemMeta.patch
similarity index 100%
rename from Spigot-Server-Patches/0259-Don-t-call-getItemMeta-on-hasItemMeta.patch
rename to Spigot-Server-Patches/0258-Don-t-call-getItemMeta-on-hasItemMeta.patch
diff --git a/Spigot-Server-Patches/0260-Ignore-Dead-Entities-in-entityList-iteration.patch b/Spigot-Server-Patches/0259-Ignore-Dead-Entities-in-entityList-iteration.patch
similarity index 100%
rename from Spigot-Server-Patches/0260-Ignore-Dead-Entities-in-entityList-iteration.patch
rename to Spigot-Server-Patches/0259-Ignore-Dead-Entities-in-entityList-iteration.patch
diff --git a/Spigot-Server-Patches/0261-Implement-Expanded-ArmorStand-API.patch b/Spigot-Server-Patches/0260-Implement-Expanded-ArmorStand-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0261-Implement-Expanded-ArmorStand-API.patch
rename to Spigot-Server-Patches/0260-Implement-Expanded-ArmorStand-API.patch
diff --git a/Spigot-Server-Patches/0262-AnvilDamageEvent.patch b/Spigot-Server-Patches/0261-AnvilDamageEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0262-AnvilDamageEvent.patch
rename to Spigot-Server-Patches/0261-AnvilDamageEvent.patch
diff --git a/Spigot-Server-Patches/0263-Add-TNTPrimeEvent.patch b/Spigot-Server-Patches/0262-Add-TNTPrimeEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0263-Add-TNTPrimeEvent.patch
rename to Spigot-Server-Patches/0262-Add-TNTPrimeEvent.patch
diff --git a/Spigot-Server-Patches/0264-Break-up-and-make-tab-spam-limits-configurable.patch b/Spigot-Server-Patches/0263-Break-up-and-make-tab-spam-limits-configurable.patch
similarity index 100%
rename from Spigot-Server-Patches/0264-Break-up-and-make-tab-spam-limits-configurable.patch
rename to Spigot-Server-Patches/0263-Break-up-and-make-tab-spam-limits-configurable.patch
diff --git a/Spigot-Server-Patches/0265-Add-hand-to-bucket-events.patch b/Spigot-Server-Patches/0264-Add-hand-to-bucket-events.patch
similarity index 100%
rename from Spigot-Server-Patches/0265-Add-hand-to-bucket-events.patch
rename to Spigot-Server-Patches/0264-Add-hand-to-bucket-events.patch
diff --git a/Spigot-Server-Patches/0266-MC-135506-Experience-should-save-as-Integers.patch b/Spigot-Server-Patches/0265-MC-135506-Experience-should-save-as-Integers.patch
similarity index 100%
rename from Spigot-Server-Patches/0266-MC-135506-Experience-should-save-as-Integers.patch
rename to Spigot-Server-Patches/0265-MC-135506-Experience-should-save-as-Integers.patch
diff --git a/Spigot-Server-Patches/0267-Fix-client-rendering-skulls-from-same-user.patch b/Spigot-Server-Patches/0266-Fix-client-rendering-skulls-from-same-user.patch
similarity index 100%
rename from Spigot-Server-Patches/0267-Fix-client-rendering-skulls-from-same-user.patch
rename to Spigot-Server-Patches/0266-Fix-client-rendering-skulls-from-same-user.patch
diff --git a/Spigot-Server-Patches/0268-Add-Early-Warning-Feature-to-WatchDog.patch b/Spigot-Server-Patches/0267-Add-Early-Warning-Feature-to-WatchDog.patch
similarity index 100%
rename from Spigot-Server-Patches/0268-Add-Early-Warning-Feature-to-WatchDog.patch
rename to Spigot-Server-Patches/0267-Add-Early-Warning-Feature-to-WatchDog.patch
diff --git a/Spigot-Server-Patches/0269-Make-EnderDragon-implement-Mob.patch b/Spigot-Server-Patches/0268-Make-EnderDragon-implement-Mob.patch
similarity index 100%
rename from Spigot-Server-Patches/0269-Make-EnderDragon-implement-Mob.patch
rename to Spigot-Server-Patches/0268-Make-EnderDragon-implement-Mob.patch
diff --git a/Spigot-Server-Patches/0270-Use-ConcurrentHashMap-in-JsonList.patch b/Spigot-Server-Patches/0269-Use-ConcurrentHashMap-in-JsonList.patch
similarity index 100%
rename from Spigot-Server-Patches/0270-Use-ConcurrentHashMap-in-JsonList.patch
rename to Spigot-Server-Patches/0269-Use-ConcurrentHashMap-in-JsonList.patch
diff --git a/Spigot-Server-Patches/0271-Use-a-Queue-for-Queueing-Commands.patch b/Spigot-Server-Patches/0270-Use-a-Queue-for-Queueing-Commands.patch
similarity index 100%
rename from Spigot-Server-Patches/0271-Use-a-Queue-for-Queueing-Commands.patch
rename to Spigot-Server-Patches/0270-Use-a-Queue-for-Queueing-Commands.patch
diff --git a/Spigot-Server-Patches/0272-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/Spigot-Server-Patches/0271-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
similarity index 100%
rename from Spigot-Server-Patches/0272-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
rename to Spigot-Server-Patches/0271-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
diff --git a/Spigot-Server-Patches/0273-Allow-disabling-armour-stand-ticking.patch b/Spigot-Server-Patches/0272-Allow-disabling-armour-stand-ticking.patch
similarity index 97%
rename from Spigot-Server-Patches/0273-Allow-disabling-armour-stand-ticking.patch
rename to Spigot-Server-Patches/0272-Allow-disabling-armour-stand-ticking.patch
index 233fcd1150..7b562f594f 100644
--- a/Spigot-Server-Patches/0273-Allow-disabling-armour-stand-ticking.patch
+++ b/Spigot-Server-Patches/0272-Allow-disabling-armour-stand-ticking.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Allow disabling armour stand ticking
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index eaaa51e4bf761f41fd516402ce1ad0f903c6ab71..bc3df01aab3e79be9c2836820e0eacc69ea6c1f4 100644
+index 14bb9d843f05058cae5cc64de8149d2c97264f1a..661694da6cfbed5e3e26de2355e67a5a6d17a3fc 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -393,4 +393,10 @@ public class PaperWorldConfig {
+@@ -388,4 +388,10 @@ public class PaperWorldConfig {
      private void armorStandEntityLookups() {
          armorStandEntityLookups = getBoolean("armor-stands-do-collision-entity-lookups", true);
      }
diff --git a/Spigot-Server-Patches/0274-Optimize-BlockPosition-helper-methods.patch b/Spigot-Server-Patches/0273-Optimize-BlockPosition-helper-methods.patch
similarity index 100%
rename from Spigot-Server-Patches/0274-Optimize-BlockPosition-helper-methods.patch
rename to Spigot-Server-Patches/0273-Optimize-BlockPosition-helper-methods.patch
diff --git a/Spigot-Server-Patches/0275-Restore-vanlla-default-mob-spawn-range.patch b/Spigot-Server-Patches/0274-Restore-vanlla-default-mob-spawn-range.patch
similarity index 100%
rename from Spigot-Server-Patches/0275-Restore-vanlla-default-mob-spawn-range.patch
rename to Spigot-Server-Patches/0274-Restore-vanlla-default-mob-spawn-range.patch
diff --git a/Spigot-Server-Patches/0276-Fix-MC-124320.patch b/Spigot-Server-Patches/0275-Fix-MC-124320.patch
similarity index 100%
rename from Spigot-Server-Patches/0276-Fix-MC-124320.patch
rename to Spigot-Server-Patches/0275-Fix-MC-124320.patch
diff --git a/Spigot-Server-Patches/0277-Slime-Pathfinder-Events.patch b/Spigot-Server-Patches/0276-Slime-Pathfinder-Events.patch
similarity index 100%
rename from Spigot-Server-Patches/0277-Slime-Pathfinder-Events.patch
rename to Spigot-Server-Patches/0276-Slime-Pathfinder-Events.patch
diff --git a/Spigot-Server-Patches/0278-Configurable-speed-for-water-flowing-over-lava.patch b/Spigot-Server-Patches/0277-Configurable-speed-for-water-flowing-over-lava.patch
similarity index 95%
rename from Spigot-Server-Patches/0278-Configurable-speed-for-water-flowing-over-lava.patch
rename to Spigot-Server-Patches/0277-Configurable-speed-for-water-flowing-over-lava.patch
index 32045df15b..f5c9d3c60c 100644
--- a/Spigot-Server-Patches/0278-Configurable-speed-for-water-flowing-over-lava.patch
+++ b/Spigot-Server-Patches/0277-Configurable-speed-for-water-flowing-over-lava.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable speed for water flowing over lava
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index bc3df01aab3e79be9c2836820e0eacc69ea6c1f4..487b0d5cd608e84a793eba5fdbd50a9f3d95c79b 100644
+index 661694da6cfbed5e3e26de2355e67a5a6d17a3fc..37bd28f18d3f48767d8141bde3395b8443d5650a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -399,4 +399,10 @@ public class PaperWorldConfig {
+@@ -394,4 +394,10 @@ public class PaperWorldConfig {
          this.armorStandTick = this.getBoolean("armor-stands-tick", this.armorStandTick);
          log("ArmorStand ticking is " + (this.armorStandTick ? "enabled" : "disabled") + " by default");
      }
diff --git a/Spigot-Server-Patches/0279-Optimize-CraftBlockData-Creation.patch b/Spigot-Server-Patches/0278-Optimize-CraftBlockData-Creation.patch
similarity index 100%
rename from Spigot-Server-Patches/0279-Optimize-CraftBlockData-Creation.patch
rename to Spigot-Server-Patches/0278-Optimize-CraftBlockData-Creation.patch
diff --git a/Spigot-Server-Patches/0280-Optimize-RegistryMaterials.patch b/Spigot-Server-Patches/0279-Optimize-RegistryMaterials.patch
similarity index 100%
rename from Spigot-Server-Patches/0280-Optimize-RegistryMaterials.patch
rename to Spigot-Server-Patches/0279-Optimize-RegistryMaterials.patch
diff --git a/Spigot-Server-Patches/0281-Add-PhantomPreSpawnEvent.patch b/Spigot-Server-Patches/0280-Add-PhantomPreSpawnEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0281-Add-PhantomPreSpawnEvent.patch
rename to Spigot-Server-Patches/0280-Add-PhantomPreSpawnEvent.patch
diff --git a/Spigot-Server-Patches/0282-Add-More-Creeper-API.patch b/Spigot-Server-Patches/0281-Add-More-Creeper-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0282-Add-More-Creeper-API.patch
rename to Spigot-Server-Patches/0281-Add-More-Creeper-API.patch
diff --git a/Spigot-Server-Patches/0283-Inventory-removeItemAnySlot.patch b/Spigot-Server-Patches/0282-Inventory-removeItemAnySlot.patch
similarity index 100%
rename from Spigot-Server-Patches/0283-Inventory-removeItemAnySlot.patch
rename to Spigot-Server-Patches/0282-Inventory-removeItemAnySlot.patch
diff --git a/Spigot-Server-Patches/0284-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/Spigot-Server-Patches/0283-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
similarity index 100%
rename from Spigot-Server-Patches/0284-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
rename to Spigot-Server-Patches/0283-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
diff --git a/Spigot-Server-Patches/0285-Add-ray-tracing-methods-to-LivingEntity.patch b/Spigot-Server-Patches/0284-Add-ray-tracing-methods-to-LivingEntity.patch
similarity index 100%
rename from Spigot-Server-Patches/0285-Add-ray-tracing-methods-to-LivingEntity.patch
rename to Spigot-Server-Patches/0284-Add-ray-tracing-methods-to-LivingEntity.patch
diff --git a/Spigot-Server-Patches/0286-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-Server-Patches/0285-Expose-attack-cooldown-methods-for-Player.patch
similarity index 100%
rename from Spigot-Server-Patches/0286-Expose-attack-cooldown-methods-for-Player.patch
rename to Spigot-Server-Patches/0285-Expose-attack-cooldown-methods-for-Player.patch
diff --git a/Spigot-Server-Patches/0287-Improve-death-events.patch b/Spigot-Server-Patches/0286-Improve-death-events.patch
similarity index 99%
rename from Spigot-Server-Patches/0287-Improve-death-events.patch
rename to Spigot-Server-Patches/0286-Improve-death-events.patch
index 3f3c7958c4..f18da62adc 100644
--- a/Spigot-Server-Patches/0287-Improve-death-events.patch
+++ b/Spigot-Server-Patches/0286-Improve-death-events.patch
@@ -279,7 +279,7 @@ index 4b249a644c680a7cc64b0d31cf453f94ff2b6a0c..d6a98bb7fc107649c179cded2d37c06a
          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 e050f21fb74ff28e1f18894dc5c9452e2c280c45..8719381d942789bf80f4b0394cec12e7394ce871 100644
+index 8a9a287074f2e91488f91ec9d8a7687c92f72099..b360077d72afafcaa23c438eb073b9286c8fb563 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -80,6 +80,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0288-Allow-chests-to-be-placed-with-NBT-data.patch b/Spigot-Server-Patches/0287-Allow-chests-to-be-placed-with-NBT-data.patch
similarity index 100%
rename from Spigot-Server-Patches/0288-Allow-chests-to-be-placed-with-NBT-data.patch
rename to Spigot-Server-Patches/0287-Allow-chests-to-be-placed-with-NBT-data.patch
diff --git a/Spigot-Server-Patches/0289-Mob-Pathfinding-API.patch b/Spigot-Server-Patches/0288-Mob-Pathfinding-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0289-Mob-Pathfinding-API.patch
rename to Spigot-Server-Patches/0288-Mob-Pathfinding-API.patch
diff --git a/Spigot-Server-Patches/0290-Prevent-chunk-loading-from-Fluid-Flowing.patch b/Spigot-Server-Patches/0289-Prevent-chunk-loading-from-Fluid-Flowing.patch
similarity index 100%
rename from Spigot-Server-Patches/0290-Prevent-chunk-loading-from-Fluid-Flowing.patch
rename to Spigot-Server-Patches/0289-Prevent-chunk-loading-from-Fluid-Flowing.patch
diff --git a/Spigot-Server-Patches/0291-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/Spigot-Server-Patches/0290-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
similarity index 100%
rename from Spigot-Server-Patches/0291-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
rename to Spigot-Server-Patches/0290-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
diff --git a/Spigot-Server-Patches/0292-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/Spigot-Server-Patches/0291-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0292-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
rename to Spigot-Server-Patches/0291-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
diff --git a/Spigot-Server-Patches/0293-Prevent-mob-spawning-from-loading-generating-chunks.patch b/Spigot-Server-Patches/0292-Prevent-mob-spawning-from-loading-generating-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0293-Prevent-mob-spawning-from-loading-generating-chunks.patch
rename to Spigot-Server-Patches/0292-Prevent-mob-spawning-from-loading-generating-chunks.patch
diff --git a/Spigot-Server-Patches/0294-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/Spigot-Server-Patches/0293-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from Spigot-Server-Patches/0294-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to Spigot-Server-Patches/0293-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/Spigot-Server-Patches/0295-Implement-furnace-cook-speed-multiplier-API.patch b/Spigot-Server-Patches/0294-Implement-furnace-cook-speed-multiplier-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0295-Implement-furnace-cook-speed-multiplier-API.patch
rename to Spigot-Server-Patches/0294-Implement-furnace-cook-speed-multiplier-API.patch
diff --git a/Spigot-Server-Patches/0296-PreSpawnerSpawnEvent.patch b/Spigot-Server-Patches/0295-PreSpawnerSpawnEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0296-PreSpawnerSpawnEvent.patch
rename to Spigot-Server-Patches/0295-PreSpawnerSpawnEvent.patch
diff --git a/Spigot-Server-Patches/0297-Catch-JsonParseException-in-Entity-and-TE-names.patch b/Spigot-Server-Patches/0296-Catch-JsonParseException-in-Entity-and-TE-names.patch
similarity index 100%
rename from Spigot-Server-Patches/0297-Catch-JsonParseException-in-Entity-and-TE-names.patch
rename to Spigot-Server-Patches/0296-Catch-JsonParseException-in-Entity-and-TE-names.patch
diff --git a/Spigot-Server-Patches/0298-Honor-EntityAgeable.ageLock.patch b/Spigot-Server-Patches/0297-Honor-EntityAgeable.ageLock.patch
similarity index 100%
rename from Spigot-Server-Patches/0298-Honor-EntityAgeable.ageLock.patch
rename to Spigot-Server-Patches/0297-Honor-EntityAgeable.ageLock.patch
diff --git a/Spigot-Server-Patches/0299-Configurable-connection-throttle-kick-message.patch b/Spigot-Server-Patches/0298-Configurable-connection-throttle-kick-message.patch
similarity index 100%
rename from Spigot-Server-Patches/0299-Configurable-connection-throttle-kick-message.patch
rename to Spigot-Server-Patches/0298-Configurable-connection-throttle-kick-message.patch
diff --git a/Spigot-Server-Patches/0300-Hook-into-CB-plugin-rewrites.patch b/Spigot-Server-Patches/0299-Hook-into-CB-plugin-rewrites.patch
similarity index 100%
rename from Spigot-Server-Patches/0300-Hook-into-CB-plugin-rewrites.patch
rename to Spigot-Server-Patches/0299-Hook-into-CB-plugin-rewrites.patch
diff --git a/Spigot-Server-Patches/0301-Allow-setting-the-vex-s-summoner.patch b/Spigot-Server-Patches/0300-Allow-setting-the-vex-s-summoner.patch
similarity index 100%
rename from Spigot-Server-Patches/0301-Allow-setting-the-vex-s-summoner.patch
rename to Spigot-Server-Patches/0300-Allow-setting-the-vex-s-summoner.patch
diff --git a/Spigot-Server-Patches/0302-Add-sun-related-API.patch b/Spigot-Server-Patches/0301-Add-sun-related-API.patch
similarity index 95%
rename from Spigot-Server-Patches/0302-Add-sun-related-API.patch
rename to Spigot-Server-Patches/0301-Add-sun-related-API.patch
index f2a4068ec2..bfeffc40f8 100644
--- a/Spigot-Server-Patches/0302-Add-sun-related-API.patch
+++ b/Spigot-Server-Patches/0301-Add-sun-related-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add sun related API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index c23e634dca6aab051b432a5fee2756afa80fb776..5a61167999f7d2fc271659762de9f4e861564542 100644
+index 8a79302b9cc178bfe4e0909293e3a87c01d344ca..e0ecdb8f87ec82b97a056c8f6d91d6a86f37bd34 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -1504,6 +1504,7 @@ public abstract class EntityInsentient extends EntityLiving {
diff --git a/Spigot-Server-Patches/0303-Turtle-API.patch b/Spigot-Server-Patches/0302-Turtle-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0303-Turtle-API.patch
rename to Spigot-Server-Patches/0302-Turtle-API.patch
diff --git a/Spigot-Server-Patches/0304-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/Spigot-Server-Patches/0303-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
similarity index 100%
rename from Spigot-Server-Patches/0304-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
rename to Spigot-Server-Patches/0303-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
diff --git a/Spigot-Server-Patches/0305-Call-player-spectator-target-events-and-improve-impl.patch b/Spigot-Server-Patches/0304-Call-player-spectator-target-events-and-improve-impl.patch
similarity index 100%
rename from Spigot-Server-Patches/0305-Call-player-spectator-target-events-and-improve-impl.patch
rename to Spigot-Server-Patches/0304-Call-player-spectator-target-events-and-improve-impl.patch
diff --git a/Spigot-Server-Patches/0306-Add-Velocity-IP-Forwarding-Support.patch b/Spigot-Server-Patches/0305-Add-Velocity-IP-Forwarding-Support.patch
similarity index 100%
rename from Spigot-Server-Patches/0306-Add-Velocity-IP-Forwarding-Support.patch
rename to Spigot-Server-Patches/0305-Add-Velocity-IP-Forwarding-Support.patch
diff --git a/Spigot-Server-Patches/0307-Add-more-Witch-API.patch b/Spigot-Server-Patches/0306-Add-more-Witch-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0307-Add-more-Witch-API.patch
rename to Spigot-Server-Patches/0306-Add-more-Witch-API.patch
diff --git a/Spigot-Server-Patches/0308-Check-Drowned-for-Villager-Aggression-Config.patch b/Spigot-Server-Patches/0307-Check-Drowned-for-Villager-Aggression-Config.patch
similarity index 100%
rename from Spigot-Server-Patches/0308-Check-Drowned-for-Villager-Aggression-Config.patch
rename to Spigot-Server-Patches/0307-Check-Drowned-for-Villager-Aggression-Config.patch
diff --git a/Spigot-Server-Patches/0309-Here-s-Johnny.patch b/Spigot-Server-Patches/0308-Here-s-Johnny.patch
similarity index 100%
rename from Spigot-Server-Patches/0309-Here-s-Johnny.patch
rename to Spigot-Server-Patches/0308-Here-s-Johnny.patch
diff --git a/Spigot-Server-Patches/0310-Add-option-to-prevent-players-from-moving-into-unloa.patch b/Spigot-Server-Patches/0309-Add-option-to-prevent-players-from-moving-into-unloa.patch
similarity index 96%
rename from Spigot-Server-Patches/0310-Add-option-to-prevent-players-from-moving-into-unloa.patch
rename to Spigot-Server-Patches/0309-Add-option-to-prevent-players-from-moving-into-unloa.patch
index d91eb34e74..ec2778b10f 100644
--- a/Spigot-Server-Patches/0310-Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/Spigot-Server-Patches/0309-Add-option-to-prevent-players-from-moving-into-unloa.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add option to prevent players from moving into unloaded
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 487b0d5cd608e84a793eba5fdbd50a9f3d95c79b..b49a1a6f5017c9e183a7d08b16e89899c25a9717 100644
+index 37bd28f18d3f48767d8141bde3395b8443d5650a..a73b88d51608ce94f6e4c9013c8c4de97523fe42 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -405,4 +405,9 @@ public class PaperWorldConfig {
+@@ -400,4 +400,9 @@ public class PaperWorldConfig {
          waterOverLavaFlowSpeed = getInt("water-over-lava-flow-speed", 5);
          log("Water over lava flow speed: " + waterOverLavaFlowSpeed);
      }
diff --git a/Spigot-Server-Patches/0311-Reset-players-airTicks-on-respawn.patch b/Spigot-Server-Patches/0310-Reset-players-airTicks-on-respawn.patch
similarity index 100%
rename from Spigot-Server-Patches/0311-Reset-players-airTicks-on-respawn.patch
rename to Spigot-Server-Patches/0310-Reset-players-airTicks-on-respawn.patch
diff --git a/Spigot-Server-Patches/0312-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/Spigot-Server-Patches/0311-Don-t-sleep-after-profile-lookups-if-not-needed.patch
similarity index 100%
rename from Spigot-Server-Patches/0312-Don-t-sleep-after-profile-lookups-if-not-needed.patch
rename to Spigot-Server-Patches/0311-Don-t-sleep-after-profile-lookups-if-not-needed.patch
diff --git a/Spigot-Server-Patches/0313-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/Spigot-Server-Patches/0312-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
similarity index 100%
rename from Spigot-Server-Patches/0313-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
rename to Spigot-Server-Patches/0312-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
diff --git a/Spigot-Server-Patches/0314-Optimize-World-Time-Updates.patch b/Spigot-Server-Patches/0313-Optimize-World-Time-Updates.patch
similarity index 100%
rename from Spigot-Server-Patches/0314-Optimize-World-Time-Updates.patch
rename to Spigot-Server-Patches/0313-Optimize-World-Time-Updates.patch
diff --git a/Spigot-Server-Patches/0315-Restore-custom-InventoryHolder-support.patch b/Spigot-Server-Patches/0314-Restore-custom-InventoryHolder-support.patch
similarity index 100%
rename from Spigot-Server-Patches/0315-Restore-custom-InventoryHolder-support.patch
rename to Spigot-Server-Patches/0314-Restore-custom-InventoryHolder-support.patch
diff --git a/Spigot-Server-Patches/0316-Use-Vanilla-Minecart-Speeds.patch b/Spigot-Server-Patches/0315-Use-Vanilla-Minecart-Speeds.patch
similarity index 100%
rename from Spigot-Server-Patches/0316-Use-Vanilla-Minecart-Speeds.patch
rename to Spigot-Server-Patches/0315-Use-Vanilla-Minecart-Speeds.patch
diff --git a/Spigot-Server-Patches/0317-Fix-SpongeAbsortEvent-handling.patch b/Spigot-Server-Patches/0316-Fix-SpongeAbsortEvent-handling.patch
similarity index 100%
rename from Spigot-Server-Patches/0317-Fix-SpongeAbsortEvent-handling.patch
rename to Spigot-Server-Patches/0316-Fix-SpongeAbsortEvent-handling.patch
diff --git a/Spigot-Server-Patches/0318-Don-t-allow-digging-into-unloaded-chunks.patch b/Spigot-Server-Patches/0317-Don-t-allow-digging-into-unloaded-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0318-Don-t-allow-digging-into-unloaded-chunks.patch
rename to Spigot-Server-Patches/0317-Don-t-allow-digging-into-unloaded-chunks.patch
diff --git a/Spigot-Server-Patches/0319-Book-Size-Limits.patch b/Spigot-Server-Patches/0318-Book-Size-Limits.patch
similarity index 100%
rename from Spigot-Server-Patches/0319-Book-Size-Limits.patch
rename to Spigot-Server-Patches/0318-Book-Size-Limits.patch
diff --git a/Spigot-Server-Patches/0320-Make-the-default-permission-message-configurable.patch b/Spigot-Server-Patches/0319-Make-the-default-permission-message-configurable.patch
similarity index 100%
rename from Spigot-Server-Patches/0320-Make-the-default-permission-message-configurable.patch
rename to Spigot-Server-Patches/0319-Make-the-default-permission-message-configurable.patch
diff --git a/Spigot-Server-Patches/0321-Prevent-rayTrace-from-loading-chunks.patch b/Spigot-Server-Patches/0320-Prevent-rayTrace-from-loading-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0321-Prevent-rayTrace-from-loading-chunks.patch
rename to Spigot-Server-Patches/0320-Prevent-rayTrace-from-loading-chunks.patch
diff --git a/Spigot-Server-Patches/0322-Handle-Large-Packets-disconnecting-client.patch b/Spigot-Server-Patches/0321-Handle-Large-Packets-disconnecting-client.patch
similarity index 100%
rename from Spigot-Server-Patches/0322-Handle-Large-Packets-disconnecting-client.patch
rename to Spigot-Server-Patches/0321-Handle-Large-Packets-disconnecting-client.patch
diff --git a/Spigot-Server-Patches/0323-force-entity-dismount-during-teleportation.patch b/Spigot-Server-Patches/0322-force-entity-dismount-during-teleportation.patch
similarity index 100%
rename from Spigot-Server-Patches/0323-force-entity-dismount-during-teleportation.patch
rename to Spigot-Server-Patches/0322-force-entity-dismount-during-teleportation.patch
diff --git a/Spigot-Server-Patches/0324-Add-more-Zombie-API.patch b/Spigot-Server-Patches/0323-Add-more-Zombie-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0324-Add-more-Zombie-API.patch
rename to Spigot-Server-Patches/0323-Add-more-Zombie-API.patch
index 27cb3458af..e6ce345f90 100644
--- a/Spigot-Server-Patches/0324-Add-more-Zombie-API.patch
+++ b/Spigot-Server-Patches/0323-Add-more-Zombie-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add more Zombie API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 5a61167999f7d2fc271659762de9f4e861564542..513c987a56e8d2bda0bda8771285c7c8d5ca88e1 100644
+index e0ecdb8f87ec82b97a056c8f6d91d6a86f37bd34..5e9a05dfe822c42b83da84a154fe881d57ac1689 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -1418,6 +1418,8 @@ public abstract class EntityInsentient extends EntityLiving {
diff --git a/Spigot-Server-Patches/0325-Add-PlayerConnectionCloseEvent.patch b/Spigot-Server-Patches/0324-Add-PlayerConnectionCloseEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0325-Add-PlayerConnectionCloseEvent.patch
rename to Spigot-Server-Patches/0324-Add-PlayerConnectionCloseEvent.patch
diff --git a/Spigot-Server-Patches/0326-Prevent-Enderman-from-loading-chunks.patch b/Spigot-Server-Patches/0325-Prevent-Enderman-from-loading-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0326-Prevent-Enderman-from-loading-chunks.patch
rename to Spigot-Server-Patches/0325-Prevent-Enderman-from-loading-chunks.patch
diff --git a/Spigot-Server-Patches/0327-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/Spigot-Server-Patches/0326-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
similarity index 98%
rename from Spigot-Server-Patches/0327-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
rename to Spigot-Server-Patches/0326-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index 77245a2098..c03da8ed46 100644
--- a/Spigot-Server-Patches/0327-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/Spigot-Server-Patches/0326-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 80a9faf3b02c51efc1f55beebce173309628b9ab..ccf1a64d33038a73360f68a814bd46023c549cd2 100644
+index 76eff7dcb734f366b515d13a4a693adaa23695ad..af4fd8beab932589a832c7f4916bc669376a6615 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -80,6 +80,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0328-Fix-PlayerEditBookEvent.patch b/Spigot-Server-Patches/0327-Fix-PlayerEditBookEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0328-Fix-PlayerEditBookEvent.patch
rename to Spigot-Server-Patches/0327-Fix-PlayerEditBookEvent.patch
diff --git a/Spigot-Server-Patches/0329-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/Spigot-Server-Patches/0328-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
similarity index 100%
rename from Spigot-Server-Patches/0329-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
rename to Spigot-Server-Patches/0328-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
diff --git a/Spigot-Server-Patches/0330-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch b/Spigot-Server-Patches/0329-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
similarity index 100%
rename from Spigot-Server-Patches/0330-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
rename to Spigot-Server-Patches/0329-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
diff --git a/Spigot-Server-Patches/0331-Block-Entity-remove-from-being-called-on-Players.patch b/Spigot-Server-Patches/0330-Block-Entity-remove-from-being-called-on-Players.patch
similarity index 100%
rename from Spigot-Server-Patches/0331-Block-Entity-remove-from-being-called-on-Players.patch
rename to Spigot-Server-Patches/0330-Block-Entity-remove-from-being-called-on-Players.patch
diff --git a/Spigot-Server-Patches/0332-BlockDestroyEvent.patch b/Spigot-Server-Patches/0331-BlockDestroyEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0332-BlockDestroyEvent.patch
rename to Spigot-Server-Patches/0331-BlockDestroyEvent.patch
diff --git a/Spigot-Server-Patches/0333-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/Spigot-Server-Patches/0332-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
similarity index 100%
rename from Spigot-Server-Patches/0333-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
rename to Spigot-Server-Patches/0332-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
diff --git a/Spigot-Server-Patches/0334-Fix-sign-edit-memory-leak.patch b/Spigot-Server-Patches/0333-Fix-sign-edit-memory-leak.patch
similarity index 100%
rename from Spigot-Server-Patches/0334-Fix-sign-edit-memory-leak.patch
rename to Spigot-Server-Patches/0333-Fix-sign-edit-memory-leak.patch
diff --git a/Spigot-Server-Patches/0335-Limit-Client-Sign-length-more.patch b/Spigot-Server-Patches/0334-Limit-Client-Sign-length-more.patch
similarity index 100%
rename from Spigot-Server-Patches/0335-Limit-Client-Sign-length-more.patch
rename to Spigot-Server-Patches/0334-Limit-Client-Sign-length-more.patch
diff --git a/Spigot-Server-Patches/0336-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/Spigot-Server-Patches/0335-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
similarity index 100%
rename from Spigot-Server-Patches/0336-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
rename to Spigot-Server-Patches/0335-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
diff --git a/Spigot-Server-Patches/0337-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/Spigot-Server-Patches/0336-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
similarity index 100%
rename from Spigot-Server-Patches/0337-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
rename to Spigot-Server-Patches/0336-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/Spigot-Server-Patches/0338-Handle-Oversized-Tile-Entities-in-chunks.patch b/Spigot-Server-Patches/0337-Handle-Oversized-Tile-Entities-in-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0338-Handle-Oversized-Tile-Entities-in-chunks.patch
rename to Spigot-Server-Patches/0337-Handle-Oversized-Tile-Entities-in-chunks.patch
diff --git a/Spigot-Server-Patches/0339-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch b/Spigot-Server-Patches/0338-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
similarity index 100%
rename from Spigot-Server-Patches/0339-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
rename to Spigot-Server-Patches/0338-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
diff --git a/Spigot-Server-Patches/0340-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/Spigot-Server-Patches/0339-Set-Zombie-last-tick-at-start-of-drowning-process.patch
similarity index 100%
rename from Spigot-Server-Patches/0340-Set-Zombie-last-tick-at-start-of-drowning-process.patch
rename to Spigot-Server-Patches/0339-Set-Zombie-last-tick-at-start-of-drowning-process.patch
diff --git a/Spigot-Server-Patches/0341-Allow-Saving-of-Oversized-Chunks.patch b/Spigot-Server-Patches/0340-Allow-Saving-of-Oversized-Chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0341-Allow-Saving-of-Oversized-Chunks.patch
rename to Spigot-Server-Patches/0340-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/Spigot-Server-Patches/0342-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/Spigot-Server-Patches/0341-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
similarity index 100%
rename from Spigot-Server-Patches/0342-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
rename to Spigot-Server-Patches/0341-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
diff --git a/Spigot-Server-Patches/0343-Add-LivingEntity-getTargetEntity.patch b/Spigot-Server-Patches/0342-Add-LivingEntity-getTargetEntity.patch
similarity index 100%
rename from Spigot-Server-Patches/0343-Add-LivingEntity-getTargetEntity.patch
rename to Spigot-Server-Patches/0342-Add-LivingEntity-getTargetEntity.patch
diff --git a/Spigot-Server-Patches/0344-Use-proper-max-length-when-serialising-BungeeCord-te.patch b/Spigot-Server-Patches/0343-Use-proper-max-length-when-serialising-BungeeCord-te.patch
similarity index 100%
rename from Spigot-Server-Patches/0344-Use-proper-max-length-when-serialising-BungeeCord-te.patch
rename to Spigot-Server-Patches/0343-Use-proper-max-length-when-serialising-BungeeCord-te.patch
diff --git a/Spigot-Server-Patches/0345-Entity-getEntitySpawnReason.patch b/Spigot-Server-Patches/0344-Entity-getEntitySpawnReason.patch
similarity index 100%
rename from Spigot-Server-Patches/0345-Entity-getEntitySpawnReason.patch
rename to Spigot-Server-Patches/0344-Entity-getEntitySpawnReason.patch
diff --git a/Spigot-Server-Patches/0346-Update-entity-Metadata-for-all-tracked-players.patch b/Spigot-Server-Patches/0345-Update-entity-Metadata-for-all-tracked-players.patch
similarity index 100%
rename from Spigot-Server-Patches/0346-Update-entity-Metadata-for-all-tracked-players.patch
rename to Spigot-Server-Patches/0345-Update-entity-Metadata-for-all-tracked-players.patch
diff --git a/Spigot-Server-Patches/0347-Implement-PlayerPostRespawnEvent.patch b/Spigot-Server-Patches/0346-Implement-PlayerPostRespawnEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0347-Implement-PlayerPostRespawnEvent.patch
rename to Spigot-Server-Patches/0346-Implement-PlayerPostRespawnEvent.patch
diff --git a/Spigot-Server-Patches/0348-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/Spigot-Server-Patches/0347-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
similarity index 100%
rename from Spigot-Server-Patches/0348-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
rename to Spigot-Server-Patches/0347-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
diff --git a/Spigot-Server-Patches/0349-Implement-getters-and-setters-for-EntityItem-owner-a.patch b/Spigot-Server-Patches/0348-Implement-getters-and-setters-for-EntityItem-owner-a.patch
similarity index 100%
rename from Spigot-Server-Patches/0349-Implement-getters-and-setters-for-EntityItem-owner-a.patch
rename to Spigot-Server-Patches/0348-Implement-getters-and-setters-for-EntityItem-owner-a.patch
diff --git a/Spigot-Server-Patches/0350-Server-Tick-Events.patch b/Spigot-Server-Patches/0349-Server-Tick-Events.patch
similarity index 100%
rename from Spigot-Server-Patches/0350-Server-Tick-Events.patch
rename to Spigot-Server-Patches/0349-Server-Tick-Events.patch
diff --git a/Spigot-Server-Patches/0351-PlayerDeathEvent-getItemsToKeep.patch b/Spigot-Server-Patches/0350-PlayerDeathEvent-getItemsToKeep.patch
similarity index 96%
rename from Spigot-Server-Patches/0351-PlayerDeathEvent-getItemsToKeep.patch
rename to Spigot-Server-Patches/0350-PlayerDeathEvent-getItemsToKeep.patch
index 300cc9bed6..c4e04c6e94 100644
--- a/Spigot-Server-Patches/0351-PlayerDeathEvent-getItemsToKeep.patch
+++ b/Spigot-Server-Patches/0350-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 b45e265ff95f9130009b0d5ba3e60644a7caa2ee..3a3ffe5a544d9f73b0ac512f67629b1169110395 100644
+index 3a6bd8e7d78d8c6188c0594c9806181f30abea32..4099915aa00ef74a3e0e667a5036af3ee128cd36 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -559,6 +559,46 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0352-Optimize-Captured-TileEntity-Lookup.patch b/Spigot-Server-Patches/0351-Optimize-Captured-TileEntity-Lookup.patch
similarity index 100%
rename from Spigot-Server-Patches/0352-Optimize-Captured-TileEntity-Lookup.patch
rename to Spigot-Server-Patches/0351-Optimize-Captured-TileEntity-Lookup.patch
diff --git a/Spigot-Server-Patches/0353-Add-Heightmap-API.patch b/Spigot-Server-Patches/0352-Add-Heightmap-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0353-Add-Heightmap-API.patch
rename to Spigot-Server-Patches/0352-Add-Heightmap-API.patch
diff --git a/Spigot-Server-Patches/0354-Mob-Spawner-API-Enhancements.patch b/Spigot-Server-Patches/0353-Mob-Spawner-API-Enhancements.patch
similarity index 100%
rename from Spigot-Server-Patches/0354-Mob-Spawner-API-Enhancements.patch
rename to Spigot-Server-Patches/0353-Mob-Spawner-API-Enhancements.patch
diff --git a/Spigot-Server-Patches/0355-Per-Player-View-Distance-API-placeholders.patch b/Spigot-Server-Patches/0354-Per-Player-View-Distance-API-placeholders.patch
similarity index 100%
rename from Spigot-Server-Patches/0355-Per-Player-View-Distance-API-placeholders.patch
rename to Spigot-Server-Patches/0354-Per-Player-View-Distance-API-placeholders.patch
diff --git a/Spigot-Server-Patches/0356-Fix-CB-call-to-changed-postToMainThread-method.patch b/Spigot-Server-Patches/0355-Fix-CB-call-to-changed-postToMainThread-method.patch
similarity index 100%
rename from Spigot-Server-Patches/0356-Fix-CB-call-to-changed-postToMainThread-method.patch
rename to Spigot-Server-Patches/0355-Fix-CB-call-to-changed-postToMainThread-method.patch
diff --git a/Spigot-Server-Patches/0357-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/Spigot-Server-Patches/0356-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
similarity index 100%
rename from Spigot-Server-Patches/0357-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
rename to Spigot-Server-Patches/0356-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
diff --git a/Spigot-Server-Patches/0358-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch b/Spigot-Server-Patches/0357-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
similarity index 100%
rename from Spigot-Server-Patches/0358-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
rename to Spigot-Server-Patches/0357-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
diff --git a/Spigot-Server-Patches/0359-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch b/Spigot-Server-Patches/0358-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0359-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
rename to Spigot-Server-Patches/0358-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
diff --git a/Spigot-Server-Patches/0360-Duplicate-UUID-Resolve-Option.patch b/Spigot-Server-Patches/0359-Duplicate-UUID-Resolve-Option.patch
similarity index 98%
rename from Spigot-Server-Patches/0360-Duplicate-UUID-Resolve-Option.patch
rename to Spigot-Server-Patches/0359-Duplicate-UUID-Resolve-Option.patch
index 447d39f525..b9d54ba667 100644
--- a/Spigot-Server-Patches/0360-Duplicate-UUID-Resolve-Option.patch
+++ b/Spigot-Server-Patches/0359-Duplicate-UUID-Resolve-Option.patch
@@ -33,10 +33,10 @@ But for those who are ok with leaving this inconsistent behavior, you may use WA
 It is recommended you regenerate the entities, as these were legit entities, and deserve your love.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index b49a1a6f5017c9e183a7d08b16e89899c25a9717..2debafdc1bb539a49c3f0723b696ea56e9b3eb16 100644
+index a73b88d51608ce94f6e4c9013c8c4de97523fe42..6e29e3294d0661cc35d53b4201d980a2db4f5c93 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -410,4 +410,43 @@ public class PaperWorldConfig {
+@@ -405,4 +405,43 @@ public class PaperWorldConfig {
      private void preventMovingIntoUnloadedChunks() {
          preventMovingIntoUnloadedChunks = getBoolean("prevent-moving-into-unloaded-chunks", false);
      }
diff --git a/Spigot-Server-Patches/0361-improve-CraftWorld-isChunkLoaded.patch b/Spigot-Server-Patches/0360-improve-CraftWorld-isChunkLoaded.patch
similarity index 100%
rename from Spigot-Server-Patches/0361-improve-CraftWorld-isChunkLoaded.patch
rename to Spigot-Server-Patches/0360-improve-CraftWorld-isChunkLoaded.patch
diff --git a/Spigot-Server-Patches/0362-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0361-Configurable-Keep-Spawn-Loaded-range-per-world.patch
similarity index 98%
rename from Spigot-Server-Patches/0362-Configurable-Keep-Spawn-Loaded-range-per-world.patch
rename to Spigot-Server-Patches/0361-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index bdcde28c59..8e017df9e7 100644
--- a/Spigot-Server-Patches/0362-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/Spigot-Server-Patches/0361-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Configurable Keep Spawn Loaded range per world
 This lets you disable it for some worlds and lower it for others.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 2debafdc1bb539a49c3f0723b696ea56e9b3eb16..91c9a027dd7aef8253f3d707c95e4ed917d32580 100644
+index 6e29e3294d0661cc35d53b4201d980a2db4f5c93..6e1756eb90b6237100612527f69c995246d53ed1 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -449,4 +449,10 @@ public class PaperWorldConfig {
+@@ -444,4 +444,10 @@ public class PaperWorldConfig {
                  break;
          }
      }
diff --git a/Spigot-Server-Patches/0363-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch b/Spigot-Server-Patches/0362-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
similarity index 100%
rename from Spigot-Server-Patches/0363-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
rename to Spigot-Server-Patches/0362-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
diff --git a/Spigot-Server-Patches/0364-ChunkMapDistance-CME.patch b/Spigot-Server-Patches/0363-ChunkMapDistance-CME.patch
similarity index 100%
rename from Spigot-Server-Patches/0364-ChunkMapDistance-CME.patch
rename to Spigot-Server-Patches/0363-ChunkMapDistance-CME.patch
diff --git a/Spigot-Server-Patches/0365-Implement-CraftBlockSoundGroup.patch b/Spigot-Server-Patches/0364-Implement-CraftBlockSoundGroup.patch
similarity index 100%
rename from Spigot-Server-Patches/0365-Implement-CraftBlockSoundGroup.patch
rename to Spigot-Server-Patches/0364-Implement-CraftBlockSoundGroup.patch
diff --git a/Spigot-Server-Patches/0366-Chunk-debug-command.patch b/Spigot-Server-Patches/0365-Chunk-debug-command.patch
similarity index 100%
rename from Spigot-Server-Patches/0366-Chunk-debug-command.patch
rename to Spigot-Server-Patches/0365-Chunk-debug-command.patch
diff --git a/Spigot-Server-Patches/0367-Catch-exceptions-from-dispenser-entity-spawns.patch b/Spigot-Server-Patches/0366-Catch-exceptions-from-dispenser-entity-spawns.patch
similarity index 100%
rename from Spigot-Server-Patches/0367-Catch-exceptions-from-dispenser-entity-spawns.patch
rename to Spigot-Server-Patches/0366-Catch-exceptions-from-dispenser-entity-spawns.patch
diff --git a/Spigot-Server-Patches/0368-Fix-World-isChunkGenerated-calls.patch b/Spigot-Server-Patches/0367-Fix-World-isChunkGenerated-calls.patch
similarity index 100%
rename from Spigot-Server-Patches/0368-Fix-World-isChunkGenerated-calls.patch
rename to Spigot-Server-Patches/0367-Fix-World-isChunkGenerated-calls.patch
diff --git a/Spigot-Server-Patches/0369-Show-blockstate-location-if-we-failed-to-read-it.patch b/Spigot-Server-Patches/0368-Show-blockstate-location-if-we-failed-to-read-it.patch
similarity index 100%
rename from Spigot-Server-Patches/0369-Show-blockstate-location-if-we-failed-to-read-it.patch
rename to Spigot-Server-Patches/0368-Show-blockstate-location-if-we-failed-to-read-it.patch
diff --git a/Spigot-Server-Patches/0370-Synchronize-DataPaletteBlock-instead-of-ReentrantLoc.patch b/Spigot-Server-Patches/0369-Synchronize-DataPaletteBlock-instead-of-ReentrantLoc.patch
similarity index 100%
rename from Spigot-Server-Patches/0370-Synchronize-DataPaletteBlock-instead-of-ReentrantLoc.patch
rename to Spigot-Server-Patches/0369-Synchronize-DataPaletteBlock-instead-of-ReentrantLoc.patch
diff --git a/Spigot-Server-Patches/0371-incremental-chunk-saving.patch b/Spigot-Server-Patches/0370-incremental-chunk-saving.patch
similarity index 99%
rename from Spigot-Server-Patches/0371-incremental-chunk-saving.patch
rename to Spigot-Server-Patches/0370-incremental-chunk-saving.patch
index ca173d6a34..5cfae10eba 100644
--- a/Spigot-Server-Patches/0371-incremental-chunk-saving.patch
+++ b/Spigot-Server-Patches/0370-incremental-chunk-saving.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] incremental chunk saving
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 91c9a027dd7aef8253f3d707c95e4ed917d32580..b947b31fc3b135f116af97907d5301619cc33070 100644
+index 6e1756eb90b6237100612527f69c995246d53ed1..5f3c8f74a60f9446623b863f9297402be1cd2f88 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -455,4 +455,19 @@ public class PaperWorldConfig {
+@@ -450,4 +450,19 @@ public class PaperWorldConfig {
          keepLoadedRange = (short) (getInt("keep-spawn-loaded-range", Math.min(spigotConfig.viewDistance, 10)) * 16);
          log( "Keep Spawn Loaded Range: " + (keepLoadedRange/16));
      }
diff --git a/Spigot-Server-Patches/0372-Anti-Xray.patch b/Spigot-Server-Patches/0371-Anti-Xray.patch
similarity index 99%
rename from Spigot-Server-Patches/0372-Anti-Xray.patch
rename to Spigot-Server-Patches/0371-Anti-Xray.patch
index 0e6bb715a4..81523ead87 100644
--- a/Spigot-Server-Patches/0372-Anti-Xray.patch
+++ b/Spigot-Server-Patches/0371-Anti-Xray.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Anti-Xray
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index b947b31fc3b135f116af97907d5301619cc33070..43925ed1e5c210399ba9fedb7bf890a6bd617e4a 100644
+index 5f3c8f74a60f9446623b863f9297402be1cd2f88..c2cc7b8ebb1b15cf2c080ef5f78c5215d7c20828 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -1,7 +1,9 @@
@@ -18,7 +18,7 @@ index b947b31fc3b135f116af97907d5301619cc33070..43925ed1e5c210399ba9fedb7bf890a6
  import org.bukkit.Bukkit;
  import org.bukkit.configuration.file.YamlConfiguration;
  import org.spigotmc.SpigotWorldConfig;
-@@ -470,4 +472,31 @@ public class PaperWorldConfig {
+@@ -465,4 +467,31 @@ public class PaperWorldConfig {
      private void maxAutoSaveChunksPerTick() {
          maxAutoSaveChunksPerTick = getInt("max-auto-save-chunks-per-tick", 24);
      }
diff --git a/Spigot-Server-Patches/0373-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/Spigot-Server-Patches/0372-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
similarity index 94%
rename from Spigot-Server-Patches/0373-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
rename to Spigot-Server-Patches/0372-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
index 6e939e4efb..4699925f45 100644
--- a/Spigot-Server-Patches/0373-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
+++ b/Spigot-Server-Patches/0372-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
@@ -17,10 +17,10 @@ This should fully solve all of the issues around it so that only natural
 influences natural spawns.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 43925ed1e5c210399ba9fedb7bf890a6bd617e4a..16727e92f591725c8f8cefb250b7ab8c64a19472 100644
+index c2cc7b8ebb1b15cf2c080ef5f78c5215d7c20828..bccc2cb3e76aa3ffe1c4200f1b7380d136cb2f96 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -473,6 +473,16 @@ public class PaperWorldConfig {
+@@ -468,6 +468,16 @@ public class PaperWorldConfig {
          maxAutoSaveChunksPerTick = getInt("max-auto-save-chunks-per-tick", 24);
      }
  
diff --git a/Spigot-Server-Patches/0374-Configurable-projectile-relative-velocity.patch b/Spigot-Server-Patches/0373-Configurable-projectile-relative-velocity.patch
similarity index 95%
rename from Spigot-Server-Patches/0374-Configurable-projectile-relative-velocity.patch
rename to Spigot-Server-Patches/0373-Configurable-projectile-relative-velocity.patch
index 76dd42a186..2c39e54360 100644
--- a/Spigot-Server-Patches/0374-Configurable-projectile-relative-velocity.patch
+++ b/Spigot-Server-Patches/0373-Configurable-projectile-relative-velocity.patch
@@ -25,10 +25,10 @@ P3) Solutions for 1) and especially 2) might not be future-proof, while this
 server-internal fix makes this change future-proof.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 16727e92f591725c8f8cefb250b7ab8c64a19472..a6e68b2ab8890d9d2a842ca0a6b565a1831fed6b 100644
+index bccc2cb3e76aa3ffe1c4200f1b7380d136cb2f96..822b738f48578b39f81bb8e38208dc3d26c2a221 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -509,4 +509,9 @@ public class PaperWorldConfig {
+@@ -504,4 +504,9 @@ public class PaperWorldConfig {
          }
          log("Anti-Xray: " + (antiXray ? "enabled" : "disabled") + " / Engine Mode: " + engineMode.getDescription() + " / Up to " + ((maxChunkSectionIndex + 1) * 16) + " blocks / Update Radius: " + updateRadius);
      }
diff --git a/Spigot-Server-Patches/0375-Mark-entities-as-being-ticked-when-notifying-navigat.patch b/Spigot-Server-Patches/0374-Mark-entities-as-being-ticked-when-notifying-navigat.patch
similarity index 100%
rename from Spigot-Server-Patches/0375-Mark-entities-as-being-ticked-when-notifying-navigat.patch
rename to Spigot-Server-Patches/0374-Mark-entities-as-being-ticked-when-notifying-navigat.patch
diff --git a/Spigot-Server-Patches/0376-offset-item-frame-ticking.patch b/Spigot-Server-Patches/0375-offset-item-frame-ticking.patch
similarity index 100%
rename from Spigot-Server-Patches/0376-offset-item-frame-ticking.patch
rename to Spigot-Server-Patches/0375-offset-item-frame-ticking.patch
diff --git a/Spigot-Server-Patches/0377-Avoid-hopper-searches-if-there-are-no-items.patch b/Spigot-Server-Patches/0376-Avoid-hopper-searches-if-there-are-no-items.patch
similarity index 100%
rename from Spigot-Server-Patches/0377-Avoid-hopper-searches-if-there-are-no-items.patch
rename to Spigot-Server-Patches/0376-Avoid-hopper-searches-if-there-are-no-items.patch
diff --git a/Spigot-Server-Patches/0378-Asynchronous-chunk-IO-and-loading.patch b/Spigot-Server-Patches/0377-Asynchronous-chunk-IO-and-loading.patch
similarity index 100%
rename from Spigot-Server-Patches/0378-Asynchronous-chunk-IO-and-loading.patch
rename to Spigot-Server-Patches/0377-Asynchronous-chunk-IO-and-loading.patch
diff --git a/Spigot-Server-Patches/0379-Use-getChunkIfLoadedImmediately-in-places.patch b/Spigot-Server-Patches/0378-Use-getChunkIfLoadedImmediately-in-places.patch
similarity index 100%
rename from Spigot-Server-Patches/0379-Use-getChunkIfLoadedImmediately-in-places.patch
rename to Spigot-Server-Patches/0378-Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/Spigot-Server-Patches/0380-Reduce-sync-loads.patch b/Spigot-Server-Patches/0379-Reduce-sync-loads.patch
similarity index 100%
rename from Spigot-Server-Patches/0380-Reduce-sync-loads.patch
rename to Spigot-Server-Patches/0379-Reduce-sync-loads.patch
diff --git a/Spigot-Server-Patches/0381-Implement-alternative-item-despawn-rate.patch b/Spigot-Server-Patches/0380-Implement-alternative-item-despawn-rate.patch
similarity index 97%
rename from Spigot-Server-Patches/0381-Implement-alternative-item-despawn-rate.patch
rename to Spigot-Server-Patches/0380-Implement-alternative-item-despawn-rate.patch
index 47adb6a101..27424c79ad 100644
--- a/Spigot-Server-Patches/0381-Implement-alternative-item-despawn-rate.patch
+++ b/Spigot-Server-Patches/0380-Implement-alternative-item-despawn-rate.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement alternative item-despawn-rate
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index a6e68b2ab8890d9d2a842ca0a6b565a1831fed6b..cf9d980e61be199a34cff98f805e511f9410dd51 100644
+index 822b738f48578b39f81bb8e38208dc3d26c2a221..ce0db77ccd24c3543c7894db4044bed03ea776d8 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -1,10 +1,15 @@
@@ -24,7 +24,7 @@ index a6e68b2ab8890d9d2a842ca0a6b565a1831fed6b..cf9d980e61be199a34cff98f805e511f
  import org.bukkit.configuration.file.YamlConfiguration;
  import org.spigotmc.SpigotWorldConfig;
  
-@@ -514,4 +519,52 @@ public class PaperWorldConfig {
+@@ -509,4 +514,52 @@ public class PaperWorldConfig {
      private void disableRelativeProjectileVelocity() {
          disableRelativeProjectileVelocity = getBoolean("game-mechanics.disable-relative-projectile-velocity", false);
      }
diff --git a/Spigot-Server-Patches/0382-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch b/Spigot-Server-Patches/0381-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
similarity index 100%
rename from Spigot-Server-Patches/0382-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
rename to Spigot-Server-Patches/0381-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
diff --git a/Spigot-Server-Patches/0383-Fix-MC-158900.patch b/Spigot-Server-Patches/0382-Fix-MC-158900.patch
similarity index 100%
rename from Spigot-Server-Patches/0383-Fix-MC-158900.patch
rename to Spigot-Server-Patches/0382-Fix-MC-158900.patch
diff --git a/Spigot-Server-Patches/0384-implement-optional-per-player-mob-spawns.patch b/Spigot-Server-Patches/0383-implement-optional-per-player-mob-spawns.patch
similarity index 99%
rename from Spigot-Server-Patches/0384-implement-optional-per-player-mob-spawns.patch
rename to Spigot-Server-Patches/0383-implement-optional-per-player-mob-spawns.patch
index b8b77c81c0..bb9ef29033 100644
--- a/Spigot-Server-Patches/0384-implement-optional-per-player-mob-spawns.patch
+++ b/Spigot-Server-Patches/0383-implement-optional-per-player-mob-spawns.patch
@@ -25,10 +25,10 @@ index a27dc38d1a29ed1d63d2f44b7984c2b65be487d9..96aaaab5b7685c874463505f9d25e8a0
          poiUnload = Timings.ofSafe(name + "Chunk unload - POI");
          chunkUnload = Timings.ofSafe(name + "Chunk unload - Chunk");
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index cf9d980e61be199a34cff98f805e511f9410dd51..3d9a48e56194225cf39e31d13d26ec17afedadaf 100644
+index ce0db77ccd24c3543c7894db4044bed03ea776d8..edf4fa474d32ac20ff85cecfa9f03464a7ecf6ec 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -567,4 +567,9 @@ public class PaperWorldConfig {
+@@ -562,4 +562,9 @@ public class PaperWorldConfig {
              }
          }
      }
diff --git a/Spigot-Server-Patches/0385-Prevent-consuming-the-wrong-itemstack.patch b/Spigot-Server-Patches/0384-Prevent-consuming-the-wrong-itemstack.patch
similarity index 100%
rename from Spigot-Server-Patches/0385-Prevent-consuming-the-wrong-itemstack.patch
rename to Spigot-Server-Patches/0384-Prevent-consuming-the-wrong-itemstack.patch
diff --git a/Spigot-Server-Patches/0386-only-add-passanger-entities-once-from-spawners.patch b/Spigot-Server-Patches/0385-only-add-passanger-entities-once-from-spawners.patch
similarity index 100%
rename from Spigot-Server-Patches/0386-only-add-passanger-entities-once-from-spawners.patch
rename to Spigot-Server-Patches/0385-only-add-passanger-entities-once-from-spawners.patch
diff --git a/Spigot-Server-Patches/0387-Fix-nether-portal-creation.patch b/Spigot-Server-Patches/0386-Fix-nether-portal-creation.patch
similarity index 100%
rename from Spigot-Server-Patches/0387-Fix-nether-portal-creation.patch
rename to Spigot-Server-Patches/0386-Fix-nether-portal-creation.patch
diff --git a/Spigot-Server-Patches/0388-Generator-Settings.patch b/Spigot-Server-Patches/0387-Generator-Settings.patch
similarity index 97%
rename from Spigot-Server-Patches/0388-Generator-Settings.patch
rename to Spigot-Server-Patches/0387-Generator-Settings.patch
index 04d445d5d6..c60e196ea9 100644
--- a/Spigot-Server-Patches/0388-Generator-Settings.patch
+++ b/Spigot-Server-Patches/0387-Generator-Settings.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Generator Settings
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 3d9a48e56194225cf39e31d13d26ec17afedadaf..a9d7e81ef123a7da7785a4b8dc868a0e256a61d0 100644
+index edf4fa474d32ac20ff85cecfa9f03464a7ecf6ec..fde31f324b3578c65a7d064c466b80ee46b65e03 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -572,4 +572,9 @@ public class PaperWorldConfig {
+@@ -567,4 +567,9 @@ public class PaperWorldConfig {
      private void perPlayerMobSpawns() {
          perPlayerMobSpawns = getBoolean("per-player-mob-spawns", false);
      }
diff --git a/Spigot-Server-Patches/0389-Fix-MC-161754.patch b/Spigot-Server-Patches/0388-Fix-MC-161754.patch
similarity index 100%
rename from Spigot-Server-Patches/0389-Fix-MC-161754.patch
rename to Spigot-Server-Patches/0388-Fix-MC-161754.patch
diff --git a/Spigot-Server-Patches/0390-Performance-improvement-for-Chunk.getEntities.patch b/Spigot-Server-Patches/0389-Performance-improvement-for-Chunk.getEntities.patch
similarity index 100%
rename from Spigot-Server-Patches/0390-Performance-improvement-for-Chunk.getEntities.patch
rename to Spigot-Server-Patches/0389-Performance-improvement-for-Chunk.getEntities.patch
diff --git a/Spigot-Server-Patches/0391-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch b/Spigot-Server-Patches/0390-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
similarity index 100%
rename from Spigot-Server-Patches/0391-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
rename to Spigot-Server-Patches/0390-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
diff --git a/Spigot-Server-Patches/0392-Expose-the-internal-current-tick.patch b/Spigot-Server-Patches/0391-Expose-the-internal-current-tick.patch
similarity index 100%
rename from Spigot-Server-Patches/0392-Expose-the-internal-current-tick.patch
rename to Spigot-Server-Patches/0391-Expose-the-internal-current-tick.patch
diff --git a/Spigot-Server-Patches/0393-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch b/Spigot-Server-Patches/0392-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
similarity index 100%
rename from Spigot-Server-Patches/0393-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
rename to Spigot-Server-Patches/0392-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
diff --git a/Spigot-Server-Patches/0394-Add-option-to-disable-pillager-patrols.patch b/Spigot-Server-Patches/0393-Add-option-to-disable-pillager-patrols.patch
similarity index 91%
rename from Spigot-Server-Patches/0394-Add-option-to-disable-pillager-patrols.patch
rename to Spigot-Server-Patches/0393-Add-option-to-disable-pillager-patrols.patch
index d11e1de6e9..a159a6c4e3 100644
--- a/Spigot-Server-Patches/0394-Add-option-to-disable-pillager-patrols.patch
+++ b/Spigot-Server-Patches/0393-Add-option-to-disable-pillager-patrols.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add option to disable pillager patrols
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index a9d7e81ef123a7da7785a4b8dc868a0e256a61d0..f8a617a62e62d088077712bfb66656c28b82a3c5 100644
+index fde31f324b3578c65a7d064c466b80ee46b65e03..c51a149fd9cd7f2d250f07a4ca0e7ce8c9b91383 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -577,4 +577,9 @@ public class PaperWorldConfig {
+@@ -572,4 +572,9 @@ public class PaperWorldConfig {
      private void generatorSettings() {
          generateFlatBedrock = getBoolean("generator-settings.flat-bedrock", false);
      }
diff --git a/Spigot-Server-Patches/0395-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch b/Spigot-Server-Patches/0394-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
similarity index 100%
rename from Spigot-Server-Patches/0395-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
rename to Spigot-Server-Patches/0394-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
diff --git a/Spigot-Server-Patches/0396-PlayerLaunchProjectileEvent.patch b/Spigot-Server-Patches/0395-PlayerLaunchProjectileEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0396-PlayerLaunchProjectileEvent.patch
rename to Spigot-Server-Patches/0395-PlayerLaunchProjectileEvent.patch
diff --git a/Spigot-Server-Patches/0397-Add-CraftMagicNumbers.isSupportedApiVersion.patch b/Spigot-Server-Patches/0396-Add-CraftMagicNumbers.isSupportedApiVersion.patch
similarity index 100%
rename from Spigot-Server-Patches/0397-Add-CraftMagicNumbers.isSupportedApiVersion.patch
rename to Spigot-Server-Patches/0396-Add-CraftMagicNumbers.isSupportedApiVersion.patch
diff --git a/Spigot-Server-Patches/0398-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/Spigot-Server-Patches/0397-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
similarity index 100%
rename from Spigot-Server-Patches/0398-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
rename to Spigot-Server-Patches/0397-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
diff --git a/Spigot-Server-Patches/0399-MC-145656-Fix-Follow-Range-Initial-Target.patch b/Spigot-Server-Patches/0398-MC-145656-Fix-Follow-Range-Initial-Target.patch
similarity index 95%
rename from Spigot-Server-Patches/0399-MC-145656-Fix-Follow-Range-Initial-Target.patch
rename to Spigot-Server-Patches/0398-MC-145656-Fix-Follow-Range-Initial-Target.patch
index 88873b8767..524934062e 100644
--- a/Spigot-Server-Patches/0399-MC-145656-Fix-Follow-Range-Initial-Target.patch
+++ b/Spigot-Server-Patches/0398-MC-145656-Fix-Follow-Range-Initial-Target.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] MC-145656 Fix Follow Range Initial Target
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index f8a617a62e62d088077712bfb66656c28b82a3c5..5c5a79d0ea00c9c4c2e93d524291f48f92e77857 100644
+index c51a149fd9cd7f2d250f07a4ca0e7ce8c9b91383..f0a28d787e06ceae71034f757637b4c90b6f3c04 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -582,4 +582,9 @@ public class PaperWorldConfig {
+@@ -577,4 +577,9 @@ public class PaperWorldConfig {
      private void pillagerSettings() {
          disablePillagerPatrols = getBoolean("game-mechanics.disable-pillager-patrols", disablePillagerPatrols);
      }
diff --git a/Spigot-Server-Patches/0400-Optimize-Hoppers.patch b/Spigot-Server-Patches/0399-Optimize-Hoppers.patch
similarity index 99%
rename from Spigot-Server-Patches/0400-Optimize-Hoppers.patch
rename to Spigot-Server-Patches/0399-Optimize-Hoppers.patch
index da4fc4359b..5920e97d67 100644
--- a/Spigot-Server-Patches/0400-Optimize-Hoppers.patch
+++ b/Spigot-Server-Patches/0399-Optimize-Hoppers.patch
@@ -13,10 +13,10 @@ Subject: [PATCH] Optimize Hoppers
 * Remove Streams from Item Suck In and restore restore 1.12 AABB checks which is simpler and no voxel allocations (was doing TWO Item Suck ins)
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 5c5a79d0ea00c9c4c2e93d524291f48f92e77857..4bfe2fb948ee204f8c5a8c316141904a8a6a8b16 100644
+index f0a28d787e06ceae71034f757637b4c90b6f3c04..9bd64034587217743157a81c04fc20751474e21d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -587,4 +587,13 @@ public class PaperWorldConfig {
+@@ -582,4 +582,13 @@ public class PaperWorldConfig {
      private void entitiesTargetWithFollowRange() {
          entitiesTargetWithFollowRange = getBoolean("entities-target-with-follow-range", entitiesTargetWithFollowRange);
      }
diff --git a/Spigot-Server-Patches/0401-PlayerDeathEvent-shouldDropExperience.patch b/Spigot-Server-Patches/0400-PlayerDeathEvent-shouldDropExperience.patch
similarity index 90%
rename from Spigot-Server-Patches/0401-PlayerDeathEvent-shouldDropExperience.patch
rename to Spigot-Server-Patches/0400-PlayerDeathEvent-shouldDropExperience.patch
index 8659debca7..feb50c8954 100644
--- a/Spigot-Server-Patches/0401-PlayerDeathEvent-shouldDropExperience.patch
+++ b/Spigot-Server-Patches/0400-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 b33041765051f519807081607d2a8f1c75bb1fe7..dd78cfd8e9031558a6986c1929da330458d28597 100644
+index ec160ddedf8b6fcbfd357afcc5f9e58ed32e69d5..810207b656aba81710ee6786d964656d343bcdf4 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -691,7 +691,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0402-Prevent-bees-loading-chunks-checking-hive-position.patch b/Spigot-Server-Patches/0401-Prevent-bees-loading-chunks-checking-hive-position.patch
similarity index 100%
rename from Spigot-Server-Patches/0402-Prevent-bees-loading-chunks-checking-hive-position.patch
rename to Spigot-Server-Patches/0401-Prevent-bees-loading-chunks-checking-hive-position.patch
diff --git a/Spigot-Server-Patches/0403-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/Spigot-Server-Patches/0402-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
similarity index 100%
rename from Spigot-Server-Patches/0403-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
rename to Spigot-Server-Patches/0402-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
diff --git a/Spigot-Server-Patches/0404-Guard-against-serializing-mismatching-chunk-coordina.patch b/Spigot-Server-Patches/0403-Guard-against-serializing-mismatching-chunk-coordina.patch
similarity index 100%
rename from Spigot-Server-Patches/0404-Guard-against-serializing-mismatching-chunk-coordina.patch
rename to Spigot-Server-Patches/0403-Guard-against-serializing-mismatching-chunk-coordina.patch
diff --git a/Spigot-Server-Patches/0405-Optimise-IEntityAccess-getPlayerByUUID.patch b/Spigot-Server-Patches/0404-Optimise-IEntityAccess-getPlayerByUUID.patch
similarity index 100%
rename from Spigot-Server-Patches/0405-Optimise-IEntityAccess-getPlayerByUUID.patch
rename to Spigot-Server-Patches/0404-Optimise-IEntityAccess-getPlayerByUUID.patch
diff --git a/Spigot-Server-Patches/0406-Fix-items-not-falling-correctly.patch b/Spigot-Server-Patches/0405-Fix-items-not-falling-correctly.patch
similarity index 100%
rename from Spigot-Server-Patches/0406-Fix-items-not-falling-correctly.patch
rename to Spigot-Server-Patches/0405-Fix-items-not-falling-correctly.patch
diff --git a/Spigot-Server-Patches/0407-Lag-compensate-eating.patch b/Spigot-Server-Patches/0406-Lag-compensate-eating.patch
similarity index 100%
rename from Spigot-Server-Patches/0407-Lag-compensate-eating.patch
rename to Spigot-Server-Patches/0406-Lag-compensate-eating.patch
diff --git a/Spigot-Server-Patches/0408-Optimize-call-to-getFluid-for-explosions.patch b/Spigot-Server-Patches/0407-Optimize-call-to-getFluid-for-explosions.patch
similarity index 100%
rename from Spigot-Server-Patches/0408-Optimize-call-to-getFluid-for-explosions.patch
rename to Spigot-Server-Patches/0407-Optimize-call-to-getFluid-for-explosions.patch
diff --git a/Spigot-Server-Patches/0409-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/Spigot-Server-Patches/0408-Fix-last-firework-in-stack-not-having-effects-when-d.patch
similarity index 100%
rename from Spigot-Server-Patches/0409-Fix-last-firework-in-stack-not-having-effects-when-d.patch
rename to Spigot-Server-Patches/0408-Fix-last-firework-in-stack-not-having-effects-when-d.patch
diff --git a/Spigot-Server-Patches/0410-Entity-Activation-Range-2.0.patch b/Spigot-Server-Patches/0409-Entity-Activation-Range-2.0.patch
similarity index 99%
rename from Spigot-Server-Patches/0410-Entity-Activation-Range-2.0.patch
rename to Spigot-Server-Patches/0409-Entity-Activation-Range-2.0.patch
index a84a7566fa..b830977daf 100644
--- a/Spigot-Server-Patches/0410-Entity-Activation-Range-2.0.patch
+++ b/Spigot-Server-Patches/0409-Entity-Activation-Range-2.0.patch
@@ -68,7 +68,7 @@ index c94197a50269622e8995685119bac984c45e6833..11d384729326af693a9a679195acbd59
      protected EntityCreature(EntityTypes<? extends EntityCreature> entitytypes, World world) {
          super(entitytypes, world);
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 513c987a56e8d2bda0bda8771285c7c8d5ca88e1..f638b21a3b457323600baeecab4a04ca76d0e813 100644
+index 5e9a05dfe822c42b83da84a154fe881d57ac1689..605bbf0174e60f795e445193a0284739ea452946 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -47,7 +47,7 @@ public abstract class EntityInsentient extends EntityLiving {
diff --git a/Spigot-Server-Patches/0411-Add-effect-to-block-break-naturally.patch b/Spigot-Server-Patches/0410-Add-effect-to-block-break-naturally.patch
similarity index 100%
rename from Spigot-Server-Patches/0411-Add-effect-to-block-break-naturally.patch
rename to Spigot-Server-Patches/0410-Add-effect-to-block-break-naturally.patch
diff --git a/Spigot-Server-Patches/0412-Tracking-Range-Improvements.patch b/Spigot-Server-Patches/0411-Tracking-Range-Improvements.patch
similarity index 100%
rename from Spigot-Server-Patches/0412-Tracking-Range-Improvements.patch
rename to Spigot-Server-Patches/0411-Tracking-Range-Improvements.patch
diff --git a/Spigot-Server-Patches/0413-Fix-items-vanishing-through-end-portal.patch b/Spigot-Server-Patches/0412-Fix-items-vanishing-through-end-portal.patch
similarity index 100%
rename from Spigot-Server-Patches/0413-Fix-items-vanishing-through-end-portal.patch
rename to Spigot-Server-Patches/0412-Fix-items-vanishing-through-end-portal.patch
diff --git a/Spigot-Server-Patches/0414-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/Spigot-Server-Patches/0413-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
similarity index 100%
rename from Spigot-Server-Patches/0414-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
rename to Spigot-Server-Patches/0413-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
diff --git a/Spigot-Server-Patches/0415-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/Spigot-Server-Patches/0414-Optimise-getChunkAt-calls-for-loaded-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0415-Optimise-getChunkAt-calls-for-loaded-chunks.patch
rename to Spigot-Server-Patches/0414-Optimise-getChunkAt-calls-for-loaded-chunks.patch
diff --git a/Spigot-Server-Patches/0416-Allow-overriding-the-java-version-check.patch b/Spigot-Server-Patches/0415-Allow-overriding-the-java-version-check.patch
similarity index 100%
rename from Spigot-Server-Patches/0416-Allow-overriding-the-java-version-check.patch
rename to Spigot-Server-Patches/0415-Allow-overriding-the-java-version-check.patch
diff --git a/Spigot-Server-Patches/0417-Add-ThrownEggHatchEvent.patch b/Spigot-Server-Patches/0416-Add-ThrownEggHatchEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0417-Add-ThrownEggHatchEvent.patch
rename to Spigot-Server-Patches/0416-Add-ThrownEggHatchEvent.patch
diff --git a/Spigot-Server-Patches/0418-Optimise-random-block-ticking.patch b/Spigot-Server-Patches/0417-Optimise-random-block-ticking.patch
similarity index 100%
rename from Spigot-Server-Patches/0418-Optimise-random-block-ticking.patch
rename to Spigot-Server-Patches/0417-Optimise-random-block-ticking.patch
diff --git a/Spigot-Server-Patches/0419-Entity-Jump-API.patch b/Spigot-Server-Patches/0418-Entity-Jump-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0419-Entity-Jump-API.patch
rename to Spigot-Server-Patches/0418-Entity-Jump-API.patch
diff --git a/Spigot-Server-Patches/0420-Add-option-to-nerf-pigmen-from-nether-portals.patch b/Spigot-Server-Patches/0419-Add-option-to-nerf-pigmen-from-nether-portals.patch
similarity index 95%
rename from Spigot-Server-Patches/0420-Add-option-to-nerf-pigmen-from-nether-portals.patch
rename to Spigot-Server-Patches/0419-Add-option-to-nerf-pigmen-from-nether-portals.patch
index b554afd515..a1d7ed9059 100644
--- a/Spigot-Server-Patches/0420-Add-option-to-nerf-pigmen-from-nether-portals.patch
+++ b/Spigot-Server-Patches/0419-Add-option-to-nerf-pigmen-from-nether-portals.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add option to nerf pigmen from nether portals
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 4bfe2fb948ee204f8c5a8c316141904a8a6a8b16..3496f615aa9857aa704767f460b1b166295ccf39 100644
+index 9bd64034587217743157a81c04fc20751474e21d..796c5a0b110009b479f5c9eef17e2605b564ce09 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -596,4 +596,9 @@ public class PaperWorldConfig {
+@@ -591,4 +591,9 @@ public class PaperWorldConfig {
          disableHopperMoveEvents = getBoolean("hopper.disable-move-event", disableHopperMoveEvents);
          log("Hopper Move Item Events: " + (disableHopperMoveEvents ? "disabled" : "enabled"));
      }
diff --git a/Spigot-Server-Patches/0421-Make-the-GUI-graph-fancier.patch b/Spigot-Server-Patches/0420-Make-the-GUI-graph-fancier.patch
similarity index 100%
rename from Spigot-Server-Patches/0421-Make-the-GUI-graph-fancier.patch
rename to Spigot-Server-Patches/0420-Make-the-GUI-graph-fancier.patch
diff --git a/Spigot-Server-Patches/0422-add-hand-to-BlockMultiPlaceEvent.patch b/Spigot-Server-Patches/0421-add-hand-to-BlockMultiPlaceEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0422-add-hand-to-BlockMultiPlaceEvent.patch
rename to Spigot-Server-Patches/0421-add-hand-to-BlockMultiPlaceEvent.patch
diff --git a/Spigot-Server-Patches/0423-Prevent-teleporting-dead-entities.patch b/Spigot-Server-Patches/0422-Prevent-teleporting-dead-entities.patch
similarity index 100%
rename from Spigot-Server-Patches/0423-Prevent-teleporting-dead-entities.patch
rename to Spigot-Server-Patches/0422-Prevent-teleporting-dead-entities.patch
diff --git a/Spigot-Server-Patches/0424-Validate-tripwire-hook-placement-before-update.patch b/Spigot-Server-Patches/0423-Validate-tripwire-hook-placement-before-update.patch
similarity index 100%
rename from Spigot-Server-Patches/0424-Validate-tripwire-hook-placement-before-update.patch
rename to Spigot-Server-Patches/0423-Validate-tripwire-hook-placement-before-update.patch
diff --git a/Spigot-Server-Patches/0425-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/Spigot-Server-Patches/0424-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
similarity index 92%
rename from Spigot-Server-Patches/0425-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
rename to Spigot-Server-Patches/0424-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
index 533e3f7386..ca49b9a59c 100644
--- a/Spigot-Server-Patches/0425-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
+++ b/Spigot-Server-Patches/0424-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add option to allow iron golems to spawn in air
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 3496f615aa9857aa704767f460b1b166295ccf39..101a473ff8979b37098fde7ac6ac66c6ed1b0282 100644
+index 796c5a0b110009b479f5c9eef17e2605b564ce09..1b2256144f7f968667570e5a9838a77173d515c5 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -385,6 +385,11 @@ public class PaperWorldConfig {
+@@ -380,6 +380,11 @@ public class PaperWorldConfig {
          scanForLegacyEnderDragon = getBoolean("game-mechanics.scan-for-legacy-ender-dragon", true);
      }
  
diff --git a/Spigot-Server-Patches/0426-Configurable-chance-of-villager-zombie-infection.patch b/Spigot-Server-Patches/0425-Configurable-chance-of-villager-zombie-infection.patch
similarity index 94%
rename from Spigot-Server-Patches/0426-Configurable-chance-of-villager-zombie-infection.patch
rename to Spigot-Server-Patches/0425-Configurable-chance-of-villager-zombie-infection.patch
index 69cc38bd06..b6b2bfc1ce 100644
--- a/Spigot-Server-Patches/0426-Configurable-chance-of-villager-zombie-infection.patch
+++ b/Spigot-Server-Patches/0425-Configurable-chance-of-villager-zombie-infection.patch
@@ -8,10 +8,10 @@ This allows you to solve an issue in vanilla behavior where:
 * On normal difficulty they will have a 50% of getting infected or dying.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 101a473ff8979b37098fde7ac6ac66c6ed1b0282..9e8485679bd36481c2bd2f0c7cfa49892f0e4baf 100644
+index 1b2256144f7f968667570e5a9838a77173d515c5..f888fc1c5ef4212f81ed936da6485abadc336407 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -606,4 +606,9 @@ public class PaperWorldConfig {
+@@ -601,4 +601,9 @@ public class PaperWorldConfig {
      private void nerfNetherPortalPigmen() {
          nerfNetherPortalPigmen = getBoolean("game-mechanics.nerf-pigmen-from-nether-portals", nerfNetherPortalPigmen);
      }
diff --git a/Spigot-Server-Patches/0427-Optimise-Chunk-getFluid.patch b/Spigot-Server-Patches/0426-Optimise-Chunk-getFluid.patch
similarity index 100%
rename from Spigot-Server-Patches/0427-Optimise-Chunk-getFluid.patch
rename to Spigot-Server-Patches/0426-Optimise-Chunk-getFluid.patch
diff --git a/Spigot-Server-Patches/0428-Optimise-TickListServer-by-rewriting-it.patch b/Spigot-Server-Patches/0427-Optimise-TickListServer-by-rewriting-it.patch
similarity index 100%
rename from Spigot-Server-Patches/0428-Optimise-TickListServer-by-rewriting-it.patch
rename to Spigot-Server-Patches/0427-Optimise-TickListServer-by-rewriting-it.patch
diff --git a/Spigot-Server-Patches/0429-Pillager-patrol-spawn-settings-and-per-player-option.patch b/Spigot-Server-Patches/0428-Pillager-patrol-spawn-settings-and-per-player-option.patch
similarity index 96%
rename from Spigot-Server-Patches/0429-Pillager-patrol-spawn-settings-and-per-player-option.patch
rename to Spigot-Server-Patches/0428-Pillager-patrol-spawn-settings-and-per-player-option.patch
index 29e9629656..f91170d799 100644
--- a/Spigot-Server-Patches/0429-Pillager-patrol-spawn-settings-and-per-player-option.patch
+++ b/Spigot-Server-Patches/0428-Pillager-patrol-spawn-settings-and-per-player-option.patch
@@ -10,10 +10,10 @@ When not per player it will use the Vanilla mechanic of one delay per
 world and the world age for the start day.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 9e8485679bd36481c2bd2f0c7cfa49892f0e4baf..2688b3018eaab4e7ba95754164f83065a98e53fc 100644
+index f888fc1c5ef4212f81ed936da6485abadc336407..b987399ca3786a30f87c98658e8bf04d4aa2e2da 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -584,10 +584,21 @@ public class PaperWorldConfig {
+@@ -579,10 +579,21 @@ public class PaperWorldConfig {
      }
  
      public boolean disablePillagerPatrols = false;
@@ -36,7 +36,7 @@ index 9e8485679bd36481c2bd2f0c7cfa49892f0e4baf..2688b3018eaab4e7ba95754164f83065
      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 dd78cfd8e9031558a6986c1929da330458d28597..59f5ef6e14b738a408dc8462ba99605ec1ae82e9 100644
+index 810207b656aba81710ee6786d964656d343bcdf4..41aee7ad9b0bec813b617428cdcc7002e3f66c63 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -81,6 +81,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0430-Ensure-Entity-is-never-double-registered.patch b/Spigot-Server-Patches/0429-Ensure-Entity-is-never-double-registered.patch
similarity index 100%
rename from Spigot-Server-Patches/0430-Ensure-Entity-is-never-double-registered.patch
rename to Spigot-Server-Patches/0429-Ensure-Entity-is-never-double-registered.patch
diff --git a/Spigot-Server-Patches/0431-Fix-unregistering-entities-from-unloading-chunks.patch b/Spigot-Server-Patches/0430-Fix-unregistering-entities-from-unloading-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0431-Fix-unregistering-entities-from-unloading-chunks.patch
rename to Spigot-Server-Patches/0430-Fix-unregistering-entities-from-unloading-chunks.patch
diff --git a/Spigot-Server-Patches/0432-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/Spigot-Server-Patches/0431-Remote-Connections-shouldn-t-hold-up-shutdown.patch
similarity index 100%
rename from Spigot-Server-Patches/0432-Remote-Connections-shouldn-t-hold-up-shutdown.patch
rename to Spigot-Server-Patches/0431-Remote-Connections-shouldn-t-hold-up-shutdown.patch
diff --git a/Spigot-Server-Patches/0433-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/Spigot-Server-Patches/0432-Do-not-allow-bees-to-load-chunks-for-beehives.patch
similarity index 100%
rename from Spigot-Server-Patches/0433-Do-not-allow-bees-to-load-chunks-for-beehives.patch
rename to Spigot-Server-Patches/0432-Do-not-allow-bees-to-load-chunks-for-beehives.patch
diff --git a/Spigot-Server-Patches/0434-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/Spigot-Server-Patches/0433-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
similarity index 100%
rename from Spigot-Server-Patches/0434-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
rename to Spigot-Server-Patches/0433-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
diff --git a/Spigot-Server-Patches/0435-Optimize-Collision-to-not-load-chunks.patch b/Spigot-Server-Patches/0434-Optimize-Collision-to-not-load-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0435-Optimize-Collision-to-not-load-chunks.patch
rename to Spigot-Server-Patches/0434-Optimize-Collision-to-not-load-chunks.patch
diff --git a/Spigot-Server-Patches/0436-Don-t-tick-dead-players.patch b/Spigot-Server-Patches/0435-Don-t-tick-dead-players.patch
similarity index 91%
rename from Spigot-Server-Patches/0436-Don-t-tick-dead-players.patch
rename to Spigot-Server-Patches/0435-Don-t-tick-dead-players.patch
index 5e3107254e..26b48cfda3 100644
--- a/Spigot-Server-Patches/0436-Don-t-tick-dead-players.patch
+++ b/Spigot-Server-Patches/0435-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 59f5ef6e14b738a408dc8462ba99605ec1ae82e9..52b5c47452a46cd6e61e1dd7c135620e36472c73 100644
+index 41aee7ad9b0bec813b617428cdcc7002e3f66c63..cf7ff024c1645593b7922249b7ee8f82b8811fa2 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -472,7 +472,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0437-Dead-Player-s-shouldn-t-be-able-to-move.patch b/Spigot-Server-Patches/0436-Dead-Player-s-shouldn-t-be-able-to-move.patch
similarity index 100%
rename from Spigot-Server-Patches/0437-Dead-Player-s-shouldn-t-be-able-to-move.patch
rename to Spigot-Server-Patches/0436-Dead-Player-s-shouldn-t-be-able-to-move.patch
diff --git a/Spigot-Server-Patches/0438-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch b/Spigot-Server-Patches/0437-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0438-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
rename to Spigot-Server-Patches/0437-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
diff --git a/Spigot-Server-Patches/0439-Increase-Light-Queue-Size.patch b/Spigot-Server-Patches/0438-Increase-Light-Queue-Size.patch
similarity index 92%
rename from Spigot-Server-Patches/0439-Increase-Light-Queue-Size.patch
rename to Spigot-Server-Patches/0438-Increase-Light-Queue-Size.patch
index 7d2f0a1ac1..1b143f00ef 100644
--- a/Spigot-Server-Patches/0439-Increase-Light-Queue-Size.patch
+++ b/Spigot-Server-Patches/0438-Increase-Light-Queue-Size.patch
@@ -14,10 +14,10 @@ light engine on shutdown...
 The queue size only puts a cap on max loss, doesn't solve that problem.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 2688b3018eaab4e7ba95754164f83065a98e53fc..e4821d4c23689aaf51b60c66fc1e6bc7a0b02fd5 100644
+index b987399ca3786a30f87c98658e8bf04d4aa2e2da..08949526752e4d66e4c0df11f76f6500846e1fe4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -622,4 +622,9 @@ public class PaperWorldConfig {
+@@ -617,4 +617,9 @@ public class PaperWorldConfig {
      private void zombieVillagerInfectionChance() {
          zombieVillagerInfectionChance = getDouble("zombie-villager-infection-chance", zombieVillagerInfectionChance);
      }
diff --git a/Spigot-Server-Patches/0440-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch b/Spigot-Server-Patches/0439-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
similarity index 100%
rename from Spigot-Server-Patches/0440-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
rename to Spigot-Server-Patches/0439-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
diff --git a/Spigot-Server-Patches/0441-Don-t-move-existing-players-to-world-spawn.patch b/Spigot-Server-Patches/0440-Don-t-move-existing-players-to-world-spawn.patch
similarity index 96%
rename from Spigot-Server-Patches/0441-Don-t-move-existing-players-to-world-spawn.patch
rename to Spigot-Server-Patches/0440-Don-t-move-existing-players-to-world-spawn.patch
index 6b35894783..6c4db1e074 100644
--- a/Spigot-Server-Patches/0441-Don-t-move-existing-players-to-world-spawn.patch
+++ b/Spigot-Server-Patches/0440-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 52b5c47452a46cd6e61e1dd7c135620e36472c73..62f6e507586560355269b54a6c3921296106a3bc 100644
+index cf7ff024c1645593b7922249b7ee8f82b8811fa2..dad115496d3210e1471f1c4eb81989c27a8eb368 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -118,7 +118,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0442-Add-tick-times-API-and-mspt-command.patch b/Spigot-Server-Patches/0441-Add-tick-times-API-and-mspt-command.patch
similarity index 100%
rename from Spigot-Server-Patches/0442-Add-tick-times-API-and-mspt-command.patch
rename to Spigot-Server-Patches/0441-Add-tick-times-API-and-mspt-command.patch
diff --git a/Spigot-Server-Patches/0443-Expose-MinecraftServer-isRunning.patch b/Spigot-Server-Patches/0442-Expose-MinecraftServer-isRunning.patch
similarity index 100%
rename from Spigot-Server-Patches/0443-Expose-MinecraftServer-isRunning.patch
rename to Spigot-Server-Patches/0442-Expose-MinecraftServer-isRunning.patch
diff --git a/Spigot-Server-Patches/0444-Add-Raw-Byte-ItemStack-Serialization.patch b/Spigot-Server-Patches/0443-Add-Raw-Byte-ItemStack-Serialization.patch
similarity index 100%
rename from Spigot-Server-Patches/0444-Add-Raw-Byte-ItemStack-Serialization.patch
rename to Spigot-Server-Patches/0443-Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/Spigot-Server-Patches/0445-Remove-streams-from-Mob-AI-System.patch b/Spigot-Server-Patches/0444-Remove-streams-from-Mob-AI-System.patch
similarity index 100%
rename from Spigot-Server-Patches/0445-Remove-streams-from-Mob-AI-System.patch
rename to Spigot-Server-Patches/0444-Remove-streams-from-Mob-AI-System.patch
diff --git a/Spigot-Server-Patches/0446-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch b/Spigot-Server-Patches/0445-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch
similarity index 100%
rename from Spigot-Server-Patches/0446-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch
rename to Spigot-Server-Patches/0445-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch
diff --git a/Spigot-Server-Patches/0447-Async-command-map-building.patch b/Spigot-Server-Patches/0446-Async-command-map-building.patch
similarity index 100%
rename from Spigot-Server-Patches/0447-Async-command-map-building.patch
rename to Spigot-Server-Patches/0446-Async-command-map-building.patch
diff --git a/Spigot-Server-Patches/0448-Improved-Watchdog-Support.patch b/Spigot-Server-Patches/0447-Improved-Watchdog-Support.patch
similarity index 100%
rename from Spigot-Server-Patches/0448-Improved-Watchdog-Support.patch
rename to Spigot-Server-Patches/0447-Improved-Watchdog-Support.patch
diff --git a/Spigot-Server-Patches/0449-Optimize-Pathfinding.patch b/Spigot-Server-Patches/0448-Optimize-Pathfinding.patch
similarity index 100%
rename from Spigot-Server-Patches/0449-Optimize-Pathfinding.patch
rename to Spigot-Server-Patches/0448-Optimize-Pathfinding.patch
diff --git a/Spigot-Server-Patches/0450-Reduce-Either-Optional-allocation.patch b/Spigot-Server-Patches/0449-Reduce-Either-Optional-allocation.patch
similarity index 100%
rename from Spigot-Server-Patches/0450-Reduce-Either-Optional-allocation.patch
rename to Spigot-Server-Patches/0449-Reduce-Either-Optional-allocation.patch
diff --git a/Spigot-Server-Patches/0451-Remove-streams-from-PairedQueue.patch b/Spigot-Server-Patches/0450-Remove-streams-from-PairedQueue.patch
similarity index 100%
rename from Spigot-Server-Patches/0451-Remove-streams-from-PairedQueue.patch
rename to Spigot-Server-Patches/0450-Remove-streams-from-PairedQueue.patch
diff --git a/Spigot-Server-Patches/0452-Reduce-memory-footprint-of-NBTTagCompound.patch b/Spigot-Server-Patches/0451-Reduce-memory-footprint-of-NBTTagCompound.patch
similarity index 100%
rename from Spigot-Server-Patches/0452-Reduce-memory-footprint-of-NBTTagCompound.patch
rename to Spigot-Server-Patches/0451-Reduce-memory-footprint-of-NBTTagCompound.patch
diff --git a/Spigot-Server-Patches/0453-Prevent-opening-inventories-when-frozen.patch b/Spigot-Server-Patches/0452-Prevent-opening-inventories-when-frozen.patch
similarity index 100%
rename from Spigot-Server-Patches/0453-Prevent-opening-inventories-when-frozen.patch
rename to Spigot-Server-Patches/0452-Prevent-opening-inventories-when-frozen.patch
diff --git a/Spigot-Server-Patches/0454-Optimise-ArraySetSorted-removeIf.patch b/Spigot-Server-Patches/0453-Optimise-ArraySetSorted-removeIf.patch
similarity index 100%
rename from Spigot-Server-Patches/0454-Optimise-ArraySetSorted-removeIf.patch
rename to Spigot-Server-Patches/0453-Optimise-ArraySetSorted-removeIf.patch
diff --git a/Spigot-Server-Patches/0455-Don-t-run-entity-collision-code-if-not-needed.patch b/Spigot-Server-Patches/0454-Don-t-run-entity-collision-code-if-not-needed.patch
similarity index 100%
rename from Spigot-Server-Patches/0455-Don-t-run-entity-collision-code-if-not-needed.patch
rename to Spigot-Server-Patches/0454-Don-t-run-entity-collision-code-if-not-needed.patch
diff --git a/Spigot-Server-Patches/0456-Optimise-entity-hard-collision-checking.patch b/Spigot-Server-Patches/0455-Optimise-entity-hard-collision-checking.patch
similarity index 100%
rename from Spigot-Server-Patches/0456-Optimise-entity-hard-collision-checking.patch
rename to Spigot-Server-Patches/0455-Optimise-entity-hard-collision-checking.patch
diff --git a/Spigot-Server-Patches/0457-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch b/Spigot-Server-Patches/0456-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch
similarity index 100%
rename from Spigot-Server-Patches/0457-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch
rename to Spigot-Server-Patches/0456-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch
diff --git a/Spigot-Server-Patches/0458-Restrict-vanilla-teleport-command-to-valid-locations.patch b/Spigot-Server-Patches/0457-Restrict-vanilla-teleport-command-to-valid-locations.patch
similarity index 100%
rename from Spigot-Server-Patches/0458-Restrict-vanilla-teleport-command-to-valid-locations.patch
rename to Spigot-Server-Patches/0457-Restrict-vanilla-teleport-command-to-valid-locations.patch
diff --git a/Spigot-Server-Patches/0459-Implement-Player-Client-Options-API.patch b/Spigot-Server-Patches/0458-Implement-Player-Client-Options-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0459-Implement-Player-Client-Options-API.patch
rename to Spigot-Server-Patches/0458-Implement-Player-Client-Options-API.patch
diff --git a/Spigot-Server-Patches/0460-Fix-Chunk-Post-Processing-deadlock-risk.patch b/Spigot-Server-Patches/0459-Fix-Chunk-Post-Processing-deadlock-risk.patch
similarity index 100%
rename from Spigot-Server-Patches/0460-Fix-Chunk-Post-Processing-deadlock-risk.patch
rename to Spigot-Server-Patches/0459-Fix-Chunk-Post-Processing-deadlock-risk.patch
diff --git a/Spigot-Server-Patches/0461-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/Spigot-Server-Patches/0460-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
similarity index 100%
rename from Spigot-Server-Patches/0461-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
rename to Spigot-Server-Patches/0460-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/Spigot-Server-Patches/0462-Broadcast-join-message-to-console.patch b/Spigot-Server-Patches/0461-Broadcast-join-message-to-console.patch
similarity index 100%
rename from Spigot-Server-Patches/0462-Broadcast-join-message-to-console.patch
rename to Spigot-Server-Patches/0461-Broadcast-join-message-to-console.patch
diff --git a/Spigot-Server-Patches/0463-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/Spigot-Server-Patches/0462-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0463-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
rename to Spigot-Server-Patches/0462-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
index b6772ad34c..90569f8f80 100644
--- a/Spigot-Server-Patches/0463-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
+++ b/Spigot-Server-Patches/0462-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 ef35e07fd8b27a66710140c1422f88ad512e774f..56cf64709ae520287f6687fe7c2f55040cc769a1 100644
+index 0d624d35a86f77cc710162c302270535126ad13d..35c8e18a45dc4b461d6dd320e1235ec627662723 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -104,6 +104,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0464-Load-Chunks-for-Login-Asynchronously.patch b/Spigot-Server-Patches/0463-Load-Chunks-for-Login-Asynchronously.patch
similarity index 99%
rename from Spigot-Server-Patches/0464-Load-Chunks-for-Login-Asynchronously.patch
rename to Spigot-Server-Patches/0463-Load-Chunks-for-Login-Asynchronously.patch
index 03a8a366a1..16b5328664 100644
--- a/Spigot-Server-Patches/0464-Load-Chunks-for-Login-Asynchronously.patch
+++ b/Spigot-Server-Patches/0463-Load-Chunks-for-Login-Asynchronously.patch
@@ -31,7 +31,7 @@ index c879e5d9acd400db5b7fdb770e5f8cc419e3bb23..228666eccfb924d2844c911e734eef4b
  
      public void c(Vec3D vec3d) {
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 56cf64709ae520287f6687fe7c2f55040cc769a1..0a5f784e851414f84e5a94b53f5616531f533109 100644
+index 35c8e18a45dc4b461d6dd320e1235ec627662723..426c4105ba99c364c3d67f1b421e6b1218de9480 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -43,6 +43,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0465-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/Spigot-Server-Patches/0464-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
similarity index 100%
rename from Spigot-Server-Patches/0465-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
rename to Spigot-Server-Patches/0464-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
diff --git a/Spigot-Server-Patches/0466-Add-PlayerAttackEntityCooldownResetEvent.patch b/Spigot-Server-Patches/0465-Add-PlayerAttackEntityCooldownResetEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0466-Add-PlayerAttackEntityCooldownResetEvent.patch
rename to Spigot-Server-Patches/0465-Add-PlayerAttackEntityCooldownResetEvent.patch
diff --git a/Spigot-Server-Patches/0467-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch b/Spigot-Server-Patches/0466-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
similarity index 100%
rename from Spigot-Server-Patches/0467-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
rename to Spigot-Server-Patches/0466-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
diff --git a/Spigot-Server-Patches/0468-Don-t-fire-BlockFade-on-worldgen-threads.patch b/Spigot-Server-Patches/0467-Don-t-fire-BlockFade-on-worldgen-threads.patch
similarity index 100%
rename from Spigot-Server-Patches/0468-Don-t-fire-BlockFade-on-worldgen-threads.patch
rename to Spigot-Server-Patches/0467-Don-t-fire-BlockFade-on-worldgen-threads.patch
diff --git a/Spigot-Server-Patches/0469-Add-phantom-creative-and-insomniac-controls.patch b/Spigot-Server-Patches/0468-Add-phantom-creative-and-insomniac-controls.patch
similarity index 96%
rename from Spigot-Server-Patches/0469-Add-phantom-creative-and-insomniac-controls.patch
rename to Spigot-Server-Patches/0468-Add-phantom-creative-and-insomniac-controls.patch
index 76796703ef..1b5e3e7a31 100644
--- a/Spigot-Server-Patches/0469-Add-phantom-creative-and-insomniac-controls.patch
+++ b/Spigot-Server-Patches/0468-Add-phantom-creative-and-insomniac-controls.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add phantom creative and insomniac controls
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e4821d4c23689aaf51b60c66fc1e6bc7a0b02fd5..5785f24b0646f8dbf3fba0bbc3b3e5b93e02f162 100644
+index 08949526752e4d66e4c0df11f76f6500846e1fe4..13b89276feb76fcecaeefc166a1bc161d5931d9d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -627,4 +627,11 @@ public class PaperWorldConfig {
+@@ -622,4 +622,11 @@ public class PaperWorldConfig {
      private void lightQueueSize() {
          lightQueueSize = getInt("light-queue-size", lightQueueSize);
      }
diff --git a/Spigot-Server-Patches/0470-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/Spigot-Server-Patches/0469-Fix-numerous-item-duplication-issues-and-teleport-is.patch
similarity index 100%
rename from Spigot-Server-Patches/0470-Fix-numerous-item-duplication-issues-and-teleport-is.patch
rename to Spigot-Server-Patches/0469-Fix-numerous-item-duplication-issues-and-teleport-is.patch
diff --git a/Spigot-Server-Patches/0471-Implement-Brigadier-Mojang-API.patch b/Spigot-Server-Patches/0470-Implement-Brigadier-Mojang-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0471-Implement-Brigadier-Mojang-API.patch
rename to Spigot-Server-Patches/0470-Implement-Brigadier-Mojang-API.patch
diff --git a/Spigot-Server-Patches/0472-Villager-Restocks-API.patch b/Spigot-Server-Patches/0471-Villager-Restocks-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0472-Villager-Restocks-API.patch
rename to Spigot-Server-Patches/0471-Villager-Restocks-API.patch
diff --git a/Spigot-Server-Patches/0473-Validate-PickItem-Packet-and-kick-for-invalid.patch b/Spigot-Server-Patches/0472-Validate-PickItem-Packet-and-kick-for-invalid.patch
similarity index 100%
rename from Spigot-Server-Patches/0473-Validate-PickItem-Packet-and-kick-for-invalid.patch
rename to Spigot-Server-Patches/0472-Validate-PickItem-Packet-and-kick-for-invalid.patch
diff --git a/Spigot-Server-Patches/0474-Expose-game-version.patch b/Spigot-Server-Patches/0473-Expose-game-version.patch
similarity index 100%
rename from Spigot-Server-Patches/0474-Expose-game-version.patch
rename to Spigot-Server-Patches/0473-Expose-game-version.patch
diff --git a/Spigot-Server-Patches/0475-Sync-position-on-teleportation.patch b/Spigot-Server-Patches/0474-Sync-position-on-teleportation.patch
similarity index 100%
rename from Spigot-Server-Patches/0475-Sync-position-on-teleportation.patch
rename to Spigot-Server-Patches/0474-Sync-position-on-teleportation.patch
diff --git a/Spigot-Server-Patches/0476-Optimize-Voxel-Shape-Merging.patch b/Spigot-Server-Patches/0475-Optimize-Voxel-Shape-Merging.patch
similarity index 100%
rename from Spigot-Server-Patches/0476-Optimize-Voxel-Shape-Merging.patch
rename to Spigot-Server-Patches/0475-Optimize-Voxel-Shape-Merging.patch
diff --git a/Spigot-Server-Patches/0477-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/Spigot-Server-Patches/0476-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
similarity index 93%
rename from Spigot-Server-Patches/0477-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
rename to Spigot-Server-Patches/0476-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
index c070fa4565..1a3341b74f 100644
--- a/Spigot-Server-Patches/0477-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
+++ b/Spigot-Server-Patches/0476-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
@@ -17,7 +17,7 @@ keeping long lived large direct buffers in cache.
 Set system properly at server startup if not set already to help protect from this.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index ff2b21305e4a46a8cafa247a0d4e786a6b7cb627..feb45475bb3c0785a8d8198615fbf4b3cd99acbe 100644
+index 894552adf119037e97c7de27d783920db580f62b..83151f3d7e9703f99391d24c41e90fc5ce1a80e7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -20,6 +20,7 @@ public class Main {
diff --git a/Spigot-Server-Patches/0478-Implement-Mob-Goal-API.patch b/Spigot-Server-Patches/0477-Implement-Mob-Goal-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0478-Implement-Mob-Goal-API.patch
rename to Spigot-Server-Patches/0477-Implement-Mob-Goal-API.patch
diff --git a/Spigot-Server-Patches/0479-Use-distance-map-to-optimise-entity-tracker.patch b/Spigot-Server-Patches/0478-Use-distance-map-to-optimise-entity-tracker.patch
similarity index 100%
rename from Spigot-Server-Patches/0479-Use-distance-map-to-optimise-entity-tracker.patch
rename to Spigot-Server-Patches/0478-Use-distance-map-to-optimise-entity-tracker.patch
diff --git a/Spigot-Server-Patches/0480-Optimize-isOutsideRange-to-use-distance-maps.patch b/Spigot-Server-Patches/0479-Optimize-isOutsideRange-to-use-distance-maps.patch
similarity index 99%
rename from Spigot-Server-Patches/0480-Optimize-isOutsideRange-to-use-distance-maps.patch
rename to Spigot-Server-Patches/0479-Optimize-isOutsideRange-to-use-distance-maps.patch
index 01bde81e3a..1b2886f324 100644
--- a/Spigot-Server-Patches/0480-Optimize-isOutsideRange-to-use-distance-maps.patch
+++ b/Spigot-Server-Patches/0479-Optimize-isOutsideRange-to-use-distance-maps.patch
@@ -147,7 +147,7 @@ index eebd4c50a7324250d3ebe7060739a71af4243f72..a6363b73522f9d27534b6e80f4b3789e
                              }
  
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 0a5f784e851414f84e5a94b53f5616531f533109..fb2b64628b974758cace770ce6debe5e88318ae8 100644
+index 426c4105ba99c364c3d67f1b421e6b1218de9480..9eaf78095415f09073615db80a87b1fd93a126cc 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -113,6 +113,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0481-Stop-copy-on-write-operations-for-updating-light-dat.patch b/Spigot-Server-Patches/0480-Stop-copy-on-write-operations-for-updating-light-dat.patch
similarity index 100%
rename from Spigot-Server-Patches/0481-Stop-copy-on-write-operations-for-updating-light-dat.patch
rename to Spigot-Server-Patches/0480-Stop-copy-on-write-operations-for-updating-light-dat.patch
diff --git a/Spigot-Server-Patches/0482-No-Tick-view-distance-implementation.patch b/Spigot-Server-Patches/0481-No-Tick-view-distance-implementation.patch
similarity index 99%
rename from Spigot-Server-Patches/0482-No-Tick-view-distance-implementation.patch
rename to Spigot-Server-Patches/0481-No-Tick-view-distance-implementation.patch
index bb75c321f0..5cf989c8bf 100644
--- a/Spigot-Server-Patches/0482-No-Tick-view-distance-implementation.patch
+++ b/Spigot-Server-Patches/0481-No-Tick-view-distance-implementation.patch
@@ -23,10 +23,10 @@ index c9164dfdb27ddf3709129c8aec54903a1df121ff..e33e889c291d37a821a4fbd40d9aac7b
          }));
  
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 5785f24b0646f8dbf3fba0bbc3b3e5b93e02f162..0746932a3191669052f15270f5c94efbce0bd0c2 100644
+index 13b89276feb76fcecaeefc166a1bc161d5931d9d..5af7e5c815752f2fd2b13c02a905796971401813 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -634,4 +634,9 @@ public class PaperWorldConfig {
+@@ -629,4 +629,9 @@ public class PaperWorldConfig {
          phantomIgnoreCreative = getBoolean("phantoms-do-not-spawn-on-creative-players", phantomIgnoreCreative);
          phantomOnlyAttackInsomniacs = getBoolean("phantoms-only-attack-insomniacs", phantomOnlyAttackInsomniacs);
      }
@@ -115,7 +115,7 @@ index 7e57a53ec614a2f7d2672edff9d7c0e0dca42377..c072f61e8c88eac8335acd660d8ff0e2
                  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 fb2b64628b974758cace770ce6debe5e88318ae8..0e3ceb60e503c74fc65b1d08371645ffbb26ef5c 100644
+index 9eaf78095415f09073615db80a87b1fd93a126cc..1a88503a743202e1da7dd81b5501d7b48943b3db 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -115,6 +115,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0483-Add-villager-reputation-API.patch b/Spigot-Server-Patches/0482-Add-villager-reputation-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0483-Add-villager-reputation-API.patch
rename to Spigot-Server-Patches/0482-Add-villager-reputation-API.patch
diff --git a/Spigot-Server-Patches/0484-Fix-Light-Command.patch b/Spigot-Server-Patches/0483-Fix-Light-Command.patch
similarity index 100%
rename from Spigot-Server-Patches/0484-Fix-Light-Command.patch
rename to Spigot-Server-Patches/0483-Fix-Light-Command.patch
diff --git a/Spigot-Server-Patches/0485-Fix-PotionEffect-ignores-icon-flag.patch b/Spigot-Server-Patches/0484-Fix-PotionEffect-ignores-icon-flag.patch
similarity index 100%
rename from Spigot-Server-Patches/0485-Fix-PotionEffect-ignores-icon-flag.patch
rename to Spigot-Server-Patches/0484-Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/Spigot-Server-Patches/0486-Optimize-brigadier-child-sorting-performance.patch b/Spigot-Server-Patches/0485-Optimize-brigadier-child-sorting-performance.patch
similarity index 100%
rename from Spigot-Server-Patches/0486-Optimize-brigadier-child-sorting-performance.patch
rename to Spigot-Server-Patches/0485-Optimize-brigadier-child-sorting-performance.patch
diff --git a/Spigot-Server-Patches/0487-Don-t-toString-block-unless-actually-showing-the-mes.patch b/Spigot-Server-Patches/0486-Don-t-toString-block-unless-actually-showing-the-mes.patch
similarity index 100%
rename from Spigot-Server-Patches/0487-Don-t-toString-block-unless-actually-showing-the-mes.patch
rename to Spigot-Server-Patches/0486-Don-t-toString-block-unless-actually-showing-the-mes.patch
diff --git a/Spigot-Server-Patches/0488-Potential-bed-API.patch b/Spigot-Server-Patches/0487-Potential-bed-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0488-Potential-bed-API.patch
rename to Spigot-Server-Patches/0487-Potential-bed-API.patch
diff --git a/Spigot-Server-Patches/0489-Wait-for-Async-Tasks-during-shutdown.patch b/Spigot-Server-Patches/0488-Wait-for-Async-Tasks-during-shutdown.patch
similarity index 100%
rename from Spigot-Server-Patches/0489-Wait-for-Async-Tasks-during-shutdown.patch
rename to Spigot-Server-Patches/0488-Wait-for-Async-Tasks-during-shutdown.patch
diff --git a/Spigot-Server-Patches/0490-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/Spigot-Server-Patches/0489-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
similarity index 100%
rename from Spigot-Server-Patches/0490-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
rename to Spigot-Server-Patches/0489-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/Spigot-Server-Patches/0491-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/Spigot-Server-Patches/0490-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
similarity index 100%
rename from Spigot-Server-Patches/0491-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
rename to Spigot-Server-Patches/0490-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
diff --git a/Spigot-Server-Patches/0492-Optimize-NibbleArray-to-use-pooled-buffers.patch b/Spigot-Server-Patches/0491-Optimize-NibbleArray-to-use-pooled-buffers.patch
similarity index 100%
rename from Spigot-Server-Patches/0492-Optimize-NibbleArray-to-use-pooled-buffers.patch
rename to Spigot-Server-Patches/0491-Optimize-NibbleArray-to-use-pooled-buffers.patch
diff --git a/Spigot-Server-Patches/0493-Reduce-MutableInt-allocations-from-light-engine.patch b/Spigot-Server-Patches/0492-Reduce-MutableInt-allocations-from-light-engine.patch
similarity index 100%
rename from Spigot-Server-Patches/0493-Reduce-MutableInt-allocations-from-light-engine.patch
rename to Spigot-Server-Patches/0492-Reduce-MutableInt-allocations-from-light-engine.patch
diff --git a/Spigot-Server-Patches/0494-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/Spigot-Server-Patches/0493-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
similarity index 100%
rename from Spigot-Server-Patches/0494-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
rename to Spigot-Server-Patches/0493-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
diff --git a/Spigot-Server-Patches/0495-Ensure-safe-gateway-teleport.patch b/Spigot-Server-Patches/0494-Ensure-safe-gateway-teleport.patch
similarity index 100%
rename from Spigot-Server-Patches/0495-Ensure-safe-gateway-teleport.patch
rename to Spigot-Server-Patches/0494-Ensure-safe-gateway-teleport.patch
diff --git a/Spigot-Server-Patches/0496-Add-option-for-console-having-all-permissions.patch b/Spigot-Server-Patches/0495-Add-option-for-console-having-all-permissions.patch
similarity index 100%
rename from Spigot-Server-Patches/0496-Add-option-for-console-having-all-permissions.patch
rename to Spigot-Server-Patches/0495-Add-option-for-console-having-all-permissions.patch
diff --git a/Spigot-Server-Patches/0497-Workaround-for-Client-Lag-Spikes-MC-162253.patch b/Spigot-Server-Patches/0496-Workaround-for-Client-Lag-Spikes-MC-162253.patch
similarity index 100%
rename from Spigot-Server-Patches/0497-Workaround-for-Client-Lag-Spikes-MC-162253.patch
rename to Spigot-Server-Patches/0496-Workaround-for-Client-Lag-Spikes-MC-162253.patch
diff --git a/Spigot-Server-Patches/0498-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch b/Spigot-Server-Patches/0497-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
similarity index 99%
rename from Spigot-Server-Patches/0498-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
rename to Spigot-Server-Patches/0497-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
index e827309fa3..f1c0598210 100644
--- a/Spigot-Server-Patches/0498-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
+++ b/Spigot-Server-Patches/0497-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
@@ -570,7 +570,7 @@ index a6363b73522f9d27534b6e80f4b3789e84316c49..604e7004b659daed2844ba1a76bf0928
          boolean flag1 = this.playerChunkMap.b();
  
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 0e3ceb60e503c74fc65b1d08371645ffbb26ef5c..d5740a25bb487fc186333e908968c6a23a9b5005 100644
+index 1a88503a743202e1da7dd81b5501d7b48943b3db..93e1fe6f37efe1bc84e2dfbb5d12af6f9dc7d762 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -55,6 +55,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0499-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch b/Spigot-Server-Patches/0498-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
similarity index 100%
rename from Spigot-Server-Patches/0499-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
rename to Spigot-Server-Patches/0498-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
diff --git a/Spigot-Server-Patches/0500-Optimize-sending-packets-to-nearby-locations-sounds-.patch b/Spigot-Server-Patches/0499-Optimize-sending-packets-to-nearby-locations-sounds-.patch
similarity index 97%
rename from Spigot-Server-Patches/0500-Optimize-sending-packets-to-nearby-locations-sounds-.patch
rename to Spigot-Server-Patches/0499-Optimize-sending-packets-to-nearby-locations-sounds-.patch
index 1ebc2ae9fb..1b476668ba 100644
--- a/Spigot-Server-Patches/0500-Optimize-sending-packets-to-nearby-locations-sounds-.patch
+++ b/Spigot-Server-Patches/0499-Optimize-sending-packets-to-nearby-locations-sounds-.patch
@@ -11,7 +11,7 @@ This will drastically cut down on packet sending cost for worlds with
 lots of players in them.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 09d7435ed4e5a00f8215aceedf26033fc703d659..0c0c285364ab919cb92b9c7db085672cb6165dff 100644
+index a8100f7ade20932a87c55750b412d6a755a9cdd5..ea744e2fdf7a256d9f04786a670c44e8b517f281 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1063,16 +1063,40 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0501-Improve-Chunk-Status-Transition-Speed.patch b/Spigot-Server-Patches/0500-Improve-Chunk-Status-Transition-Speed.patch
similarity index 100%
rename from Spigot-Server-Patches/0501-Improve-Chunk-Status-Transition-Speed.patch
rename to Spigot-Server-Patches/0500-Improve-Chunk-Status-Transition-Speed.patch
diff --git a/Spigot-Server-Patches/0502-Fix-villager-trading-demand-MC-163962.patch b/Spigot-Server-Patches/0501-Fix-villager-trading-demand-MC-163962.patch
similarity index 100%
rename from Spigot-Server-Patches/0502-Fix-villager-trading-demand-MC-163962.patch
rename to Spigot-Server-Patches/0501-Fix-villager-trading-demand-MC-163962.patch
diff --git a/Spigot-Server-Patches/0503-Maps-shouldn-t-load-chunks.patch b/Spigot-Server-Patches/0502-Maps-shouldn-t-load-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0503-Maps-shouldn-t-load-chunks.patch
rename to Spigot-Server-Patches/0502-Maps-shouldn-t-load-chunks.patch
diff --git a/Spigot-Server-Patches/0504-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/Spigot-Server-Patches/0503-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
similarity index 100%
rename from Spigot-Server-Patches/0504-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
rename to Spigot-Server-Patches/0503-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/Spigot-Server-Patches/0505-Optimize-Bit-Operations-by-inlining.patch b/Spigot-Server-Patches/0504-Optimize-Bit-Operations-by-inlining.patch
similarity index 100%
rename from Spigot-Server-Patches/0505-Optimize-Bit-Operations-by-inlining.patch
rename to Spigot-Server-Patches/0504-Optimize-Bit-Operations-by-inlining.patch
diff --git a/Spigot-Server-Patches/0506-Optimize-Light-Engine.patch b/Spigot-Server-Patches/0505-Optimize-Light-Engine.patch
similarity index 100%
rename from Spigot-Server-Patches/0506-Optimize-Light-Engine.patch
rename to Spigot-Server-Patches/0505-Optimize-Light-Engine.patch
diff --git a/Spigot-Server-Patches/0507-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/0506-Delay-Chunk-Unloads-based-on-Player-Movement.patch
similarity index 97%
rename from Spigot-Server-Patches/0507-Delay-Chunk-Unloads-based-on-Player-Movement.patch
rename to Spigot-Server-Patches/0506-Delay-Chunk-Unloads-based-on-Player-Movement.patch
index 4738b38c7b..32ee419044 100644
--- a/Spigot-Server-Patches/0507-Delay-Chunk-Unloads-based-on-Player-Movement.patch
+++ b/Spigot-Server-Patches/0506-Delay-Chunk-Unloads-based-on-Player-Movement.patch
@@ -17,10 +17,10 @@ This allows servers with smaller worlds who do less long distance exploring to s
 wasting cpu cycles on saving/unloading/reloading chunks repeatedly.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 0746932a3191669052f15270f5c94efbce0bd0c2..0f4fca90fd6c3788a5762c96c344899cb1665466 100644
+index 5af7e5c815752f2fd2b13c02a905796971401813..6e6534ab25dbebbad5d2ee848edb88ebcae86d03 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -639,4 +639,13 @@ public class PaperWorldConfig {
+@@ -634,4 +634,13 @@ public class PaperWorldConfig {
      private void viewDistance() {
          this.noTickViewDistance = this.getInt("viewdistances.no-tick-view-distance", -1);
      }
diff --git a/Spigot-Server-Patches/0508-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/Spigot-Server-Patches/0507-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
similarity index 100%
rename from Spigot-Server-Patches/0508-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
rename to Spigot-Server-Patches/0507-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
diff --git a/Spigot-Server-Patches/0509-Fix-missing-chunks-due-to-integer-overflow.patch b/Spigot-Server-Patches/0508-Fix-missing-chunks-due-to-integer-overflow.patch
similarity index 100%
rename from Spigot-Server-Patches/0509-Fix-missing-chunks-due-to-integer-overflow.patch
rename to Spigot-Server-Patches/0508-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/Spigot-Server-Patches/0510-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/Spigot-Server-Patches/0509-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
similarity index 100%
rename from Spigot-Server-Patches/0510-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
rename to Spigot-Server-Patches/0509-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/Spigot-Server-Patches/0511-Fix-piston-physics-inconsistency-MC-188840.patch b/Spigot-Server-Patches/0510-Fix-piston-physics-inconsistency-MC-188840.patch
similarity index 100%
rename from Spigot-Server-Patches/0511-Fix-piston-physics-inconsistency-MC-188840.patch
rename to Spigot-Server-Patches/0510-Fix-piston-physics-inconsistency-MC-188840.patch
diff --git a/Spigot-Server-Patches/0512-Fix-sand-duping.patch b/Spigot-Server-Patches/0511-Fix-sand-duping.patch
similarity index 100%
rename from Spigot-Server-Patches/0512-Fix-sand-duping.patch
rename to Spigot-Server-Patches/0511-Fix-sand-duping.patch
diff --git a/Spigot-Server-Patches/0513-Prevent-position-desync-in-playerconnection-causing-.patch b/Spigot-Server-Patches/0512-Prevent-position-desync-in-playerconnection-causing-.patch
similarity index 100%
rename from Spigot-Server-Patches/0513-Prevent-position-desync-in-playerconnection-causing-.patch
rename to Spigot-Server-Patches/0512-Prevent-position-desync-in-playerconnection-causing-.patch
diff --git a/Spigot-Server-Patches/0514-Fix-enderdragon-exp-dupe.patch b/Spigot-Server-Patches/0513-Fix-enderdragon-exp-dupe.patch
similarity index 100%
rename from Spigot-Server-Patches/0514-Fix-enderdragon-exp-dupe.patch
rename to Spigot-Server-Patches/0513-Fix-enderdragon-exp-dupe.patch
diff --git a/Spigot-Server-Patches/0515-Inventory-getHolder-method-without-block-snapshot.patch b/Spigot-Server-Patches/0514-Inventory-getHolder-method-without-block-snapshot.patch
similarity index 100%
rename from Spigot-Server-Patches/0515-Inventory-getHolder-method-without-block-snapshot.patch
rename to Spigot-Server-Patches/0514-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/Spigot-Server-Patches/0516-Expose-Arrow-getItemStack.patch b/Spigot-Server-Patches/0515-Expose-Arrow-getItemStack.patch
similarity index 100%
rename from Spigot-Server-Patches/0516-Expose-Arrow-getItemStack.patch
rename to Spigot-Server-Patches/0515-Expose-Arrow-getItemStack.patch
diff --git a/Spigot-Server-Patches/0517-Add-and-implement-PlayerRecipeBookClickEvent.patch b/Spigot-Server-Patches/0516-Add-and-implement-PlayerRecipeBookClickEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0517-Add-and-implement-PlayerRecipeBookClickEvent.patch
rename to Spigot-Server-Patches/0516-Add-and-implement-PlayerRecipeBookClickEvent.patch
diff --git a/Spigot-Server-Patches/0518-Add-PrepareGrindstoneEvent.patch b/Spigot-Server-Patches/0517-Add-PrepareGrindstoneEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0518-Add-PrepareGrindstoneEvent.patch
rename to Spigot-Server-Patches/0517-Add-PrepareGrindstoneEvent.patch
diff --git a/Spigot-Server-Patches/0519-Hide-sync-chunk-writes-behind-flag.patch b/Spigot-Server-Patches/0518-Hide-sync-chunk-writes-behind-flag.patch
similarity index 100%
rename from Spigot-Server-Patches/0519-Hide-sync-chunk-writes-behind-flag.patch
rename to Spigot-Server-Patches/0518-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/Spigot-Server-Patches/0520-Limit-lightning-strike-effect-distance.patch b/Spigot-Server-Patches/0519-Limit-lightning-strike-effect-distance.patch
similarity index 96%
rename from Spigot-Server-Patches/0520-Limit-lightning-strike-effect-distance.patch
rename to Spigot-Server-Patches/0519-Limit-lightning-strike-effect-distance.patch
index 4d2af37153..5735d85dd7 100644
--- a/Spigot-Server-Patches/0520-Limit-lightning-strike-effect-distance.patch
+++ b/Spigot-Server-Patches/0519-Limit-lightning-strike-effect-distance.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Limit lightning strike effect distance
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 0f4fca90fd6c3788a5762c96c344899cb1665466..708448a72503c5878070d3aef710aa8f6b118be1 100644
+index 6e6534ab25dbebbad5d2ee848edb88ebcae86d03..e471e764935e2a89560de56959a782b02e5e8fe1 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -648,4 +648,26 @@ public class PaperWorldConfig {
+@@ -643,4 +643,26 @@ public class PaperWorldConfig {
              delayChunkUnloadsBy *= 20;
          }
      }
diff --git a/Spigot-Server-Patches/0521-Add-permission-for-command-blocks.patch b/Spigot-Server-Patches/0520-Add-permission-for-command-blocks.patch
similarity index 100%
rename from Spigot-Server-Patches/0521-Add-permission-for-command-blocks.patch
rename to Spigot-Server-Patches/0520-Add-permission-for-command-blocks.patch
diff --git a/Spigot-Server-Patches/0522-Ensure-Entity-AABB-s-are-never-invalid.patch b/Spigot-Server-Patches/0521-Ensure-Entity-AABB-s-are-never-invalid.patch
similarity index 100%
rename from Spigot-Server-Patches/0522-Ensure-Entity-AABB-s-are-never-invalid.patch
rename to Spigot-Server-Patches/0521-Ensure-Entity-AABB-s-are-never-invalid.patch
diff --git a/Spigot-Server-Patches/0523-Optimize-WorldBorder-collision-checks-and-air.patch b/Spigot-Server-Patches/0522-Optimize-WorldBorder-collision-checks-and-air.patch
similarity index 100%
rename from Spigot-Server-Patches/0523-Optimize-WorldBorder-collision-checks-and-air.patch
rename to Spigot-Server-Patches/0522-Optimize-WorldBorder-collision-checks-and-air.patch
diff --git a/Spigot-Server-Patches/0524-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/Spigot-Server-Patches/0523-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
similarity index 100%
rename from Spigot-Server-Patches/0524-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
rename to Spigot-Server-Patches/0523-Fix-Per-World-Difficulty-Remembering-Difficulty.patch