From 586ee2bb11ea73e8dee2dd4bc341985c380e5c17 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 11 Apr 2020 20:39:21 -0400
Subject: [PATCH] Remove patch for MC-111480, fixed in 1.14

We were now starting entities at ID 2
---
 ...4-Implement-Expanded-ArmorStand-API.patch} |  2 +-
 ...264-MC-111480-Start-Entity-ID-s-at-1.patch | 24 -------------------
 ...vent.patch => 0265-AnvilDamageEvent.patch} |  2 +-
 ...ent.patch => 0266-Add-TNTPrimeEvent.patch} |  2 +-
 ...d-make-tab-spam-limits-configurable.patch} |  2 +-
 ...h => 0268-Add-hand-to-bucket-events.patch} |  2 +-
 ...-Experience-should-save-as-Integers.patch} |  2 +-
 ...ent-rendering-skulls-from-same-user.patch} |  2 +-
 ...d-Early-Warning-Feature-to-WatchDog.patch} |  2 +-
 ...0272-Make-EnderDragon-implement-Mob.patch} |  2 +-
 ...3-Use-ConcurrentHashMap-in-JsonList.patch} |  2 +-
 ...4-Use-a-Queue-for-Queueing-Commands.patch} |  2 +-
 ...le-Entities-from-a-chunk-without-sn.patch} |  2 +-
 ...llow-disabling-armour-stand-ticking.patch} |  2 +-
 ...timize-BlockPosition-helper-methods.patch} |  2 +-
 ...ts-from-world-player-list-not-serve.patch} |  4 ++--
 ...tore-vanlla-default-mob-spawn-range.patch} |  4 ++--
 ...80-Optimize-CraftBlockData-Creation.patch} |  2 +-
 ...-124320.patch => 0281-Fix-MC-124320.patch} |  2 +-
 ...tch => 0282-Slime-Pathfinder-Events.patch} |  2 +-
 ...e-speed-for-water-flowing-over-lava.patch} |  2 +-
 ... => 0284-Optimize-RegistryMaterials.patch} |  2 +-
 ...ch => 0285-Add-PhantomPreSpawnEvent.patch} |  2 +-
 ....patch => 0286-Add-More-Creeper-API.patch} |  2 +-
 ...=> 0287-Inventory-removeItemAnySlot.patch} |  2 +-
 ...oadChunk-int-int-false-load-unconve.patch} |  2 +-
 ...ray-tracing-methods-to-LivingEntity.patch} |  2 +-
 ...-attack-cooldown-methods-for-Player.patch} |  2 +-
 ....patch => 0291-Improve-death-events.patch} |  4 ++--
 ...w-chests-to-be-placed-with-NBT-data.patch} |  2 +-
 ...I.patch => 0293-Mob-Pathfinding-API.patch} |  2 +-
 ...nt-chunk-loading-from-Fluid-Flowing.patch} |  2 +-
 ...for-CanPlaceOn-and-CanDestroy-NBT-v.patch} |  2 +-
 ...nt-Mob-AI-Rules-from-Loading-Chunks.patch} |  2 +-
 ...ning-from-loading-generating-chunks.patch} |  2 +-
 ...-Biome-Mob-Lookups-for-Mob-Spawning.patch} |  2 +-
 ...t-furnace-cook-speed-multiplier-API.patch} |  2 +-
 ...0300-Support-Overriding-World-Seeds.patch} |  2 +-
 ...h => 0301-Optimize-Server-World-Map.patch} |  2 +-
 ....patch => 0302-PreSpawnerSpawnEvent.patch} |  2 +-
 ...rseException-in-Entity-and-TE-names.patch} |  4 ++--
 ... 0304-Avoid-dimension-id-collisions.patch} |  2 +-
 ...=> 0305-Honor-EntityAgeable.ageLock.patch} |  2 +-
 ...le-connection-throttle-kick-message.patch} |  2 +-
 ...> 0307-Hook-into-CB-plugin-rewrites.patch} |  2 +-
 ...08-Allow-setting-the-vex-s-summoner.patch} |  2 +-
 ...I.patch => 0309-Add-sun-related-API.patch} |  2 +-
 ...wned-for-Villager-Aggression-Config.patch} |  2 +-
 ...-Johnny.patch => 0311-Here-s-Johnny.patch} |  2 +-
 ...Turtle-API.patch => 0312-Turtle-API.patch} |  2 +-
 ...it-lightning-strike-effect-distance.patch} |  2 +-
 ...her-worlds-for-shooter-of-projectil.patch} |  2 +-
 ...Call-player-spectator-target-events.patch} |  2 +-
 ...-Add-Velocity-IP-Forwarding-Support.patch} |  2 +-
 ...PI.patch => 0317-Add-more-Witch-API.patch} |  2 +-
 ...MC-93764.patch => 0318-Fix-MC-93764.patch} |  2 +-
 ...vent-players-from-moving-into-unloa.patch} |  2 +-
 ...0-Reset-players-airTicks-on-respawn.patch} |  4 ++--
 ...after-profile-lookups-if-not-needed.patch} |  2 +-
 ...le-thread-count-default-for-bootstr.patch} |  2 +-
 ...=> 0323-Optimize-World-Time-Updates.patch} |  2 +-
 ...tore-custom-InventoryHolder-support.patch} |  2 +-
 ...=> 0325-Use-Vanilla-Minecart-Speeds.patch} |  2 +-
 ...0326-Fix-SpongeAbsortEvent-handling.patch} |  2 +-
 ...-allow-digging-into-unloaded-chunks.patch} |  2 +-
 ...=> 0328-Optimize-redstone-algorithm.patch} |  2 +-
 ...ntity-dismount-during-teleportation.patch} |  4 ++--
 ...mits.patch => 0330-Book-Size-Limits.patch} |  2 +-
 ...ult-permission-message-configurable.patch} |  2 +-
 ...I.patch => 0332-Add-more-Zombie-API.patch} |  2 +-
 ...revent-rayTrace-from-loading-chunks.patch} |  2 +-
 ...-Large-Packets-disconnecting-client.patch} |  2 +-
 ...world-storage-in-CraftOfflinePlayer.patch} |  2 +-
 ...0336-Add-PlayerConnectionCloseEvent.patch} |  2 +-
 ...revent-Enderman-from-loading-chunks.patch} |  2 +-
 ...replace-OfflinePlayer-getLastPlayed.patch} |  2 +-
 ...tch => 0339-Fix-PlayerEditBookEvent.patch} |  2 +-
 ...ehicle-tracking-issue-on-disconnect.patch} |  2 +-
 ...nRetractEvent-for-all-empty-pistons.patch} |  2 +-
 ...remove-from-being-called-on-Players.patch} |  2 +-
 ...ent.patch => 0343-BlockDestroyEvent.patch} |  2 +-
 ...m-Shapeless-Custom-Crafting-Recipes.patch} |  2 +-
 ...h => 0345-Fix-sign-edit-memory-leak.patch} |  2 +-
 ... 0346-Limit-Client-Sign-length-more.patch} |  2 +-
 ...onvertSigns-boolean-every-sign-save.patch} |  2 +-
 ...Signs-in-Chunks-creating-too-large-.patch} |  2 +-
 ...-Fix-Whitelist-On-Off-inconsistency.patch} |  4 ++--
 ...t-tick-at-start-of-drowning-process.patch} |  2 +-
 ...51-Allow-Saving-of-Oversized-Chunks.patch} |  2 +-
 ...ggleEvent-when-whitelist-is-toggled.patch} |  4 ++--
 ...53-Add-LivingEntity-getTargetEntity.patch} |  4 ++--
 ...ngth-when-serialising-BungeeCord-te.patch} |  2 +-
 ...=> 0355-Entity-getEntitySpawnReason.patch} |  6 ++---
 ...ty-Metadata-for-all-tracked-players.patch} |  2 +-
 ...tch => 0357-Fire-event-on-GS4-query.patch} |  2 +-
 ...58-Implement-PlayerPostRespawnEvent.patch} |  4 ++--
 ...for-pickupDelay-breaks-picking-up-i.patch} |  2 +-
 ...-and-setters-for-EntityItem-owner-a.patch} |  2 +-
 ...ts.patch => 0361-Server-Tick-Events.patch} |  2 +-
 ...362-PlayerDeathEvent-getItemsToKeep.patch} |  2 +-
 ...Optimize-Captured-TileEntity-Lookup.patch} |  2 +-
 ...API.patch => 0364-Add-Heightmap-API.patch} |  2 +-
 ...> 0365-Mob-Spawner-API-Enhancements.patch} |  2 +-
 ...ayer-View-Distance-API-placeholders.patch} |  2 +-
 ...-to-changed-postToMainThread-method.patch} |  2 +-
 ...-item-frames-are-modified-MC-123450.patch} |  2 +-
 ...sPrimaryThread-and-MinecraftServer-.patch} |  2 +-
 ...-entity-loss-due-to-unloaded-chunks.patch} |  2 +-
 ... 0371-Duplicate-UUID-Resolve-Option.patch} |  4 ++--
 ...72-improve-CraftWorld-isChunkLoaded.patch} |  2 +-
 ...e-Keep-Spawn-Loaded-range-per-world.patch} |  2 +-
 ...-some-generation-concurrency-issues.patch} |  4 ++--
 ...ityAreaEffectCloud-from-going-negat.patch} |  2 +-
 ....patch => 0376-ChunkMapDistance-CME.patch} |  2 +-
 ...0377-Implement-CraftBlockSoundGroup.patch} |  2 +-
 ...d.patch => 0378-Chunk-debug-command.patch} |  4 ++--
 ...ch => 0379-incremental-chunk-saving.patch} |  6 ++---
 ...ptions-from-dispenser-entity-spawns.patch} |  2 +-
 ...81-Fix-World-isChunkGenerated-calls.patch} |  4 ++--
 ...te-location-if-we-failed-to-read-it.patch} |  2 +-
 ...ad-in-DataPaletteBlock-lock-failure.patch} |  2 +-
 ...tatus-cache-when-saving-protochunks.patch} |  4 ++--
 ...6-Anti-Xray.patch => 0385-Anti-Xray.patch} |  2 +-
 ...l-Spawned-mobs-towards-natural-spaw.patch} |  2 +-
 ...urable-projectile-relative-velocity.patch} |  2 +-
 ...being-ticked-when-notifying-navigat.patch} |  2 +-
 ...h => 0389-offset-item-frame-ticking.patch} |  2 +-
 ...pper-searches-if-there-are-no-items.patch} |  2 +-
 ...1-Asynchronous-chunk-IO-and-loading.patch} |  2 +-
 ...tChunkIfLoadedImmediately-in-places.patch} |  2 +-
 ...ads.patch => 0393-Reduce-sync-loads.patch} |  2 +-
 ...ement-alternative-item-despawn-rate.patch} |  2 +-
 ...f-we-have-a-custom-Bukkit-generator.patch} |  2 +-
 ...-158900.patch => 0396-Fix-MC-158900.patch} |  4 ++--
 ...ment-optional-per-player-mob-spawns.patch} |  6 ++---
 ...event-consuming-the-wrong-itemstack.patch} |  2 +-
 ...ssanger-entities-once-from-spawners.patch} |  2 +-
 ... => 0400-Fix-nether-portal-creation.patch} |  2 +-
 ...gs.patch => 0401-Generator-Settings.patch} |  2 +-
 ...o-tick-instant-grow-farms-MC-113809.patch} |  2 +-
 ...-161754.patch => 0403-Fix-MC-161754.patch} |  2 +-
 ...e-improvement-for-Chunk.getEntities.patch} |  2 +-
 ...anging-entities-that-are-not-ItemFr.patch} |  2 +-
 ...06-Expose-the-internal-current-tick.patch} |  2 +-
 ...sneak-when-changing-worlds-MC-10657.patch} |  4 ++--
 ...-option-to-disable-pillager-patrols.patch} |  2 +-
 ...r-when-player-hand-set-to-empty-typ.patch} |  2 +-
 ...=> 0410-PlayerLaunchProjectileEvent.patch} |  2 +-
 ...tMagicNumbers.isSupportedApiVersion.patch} |  2 +-
 ...k-loads-when-villagers-try-to-find-.patch} |  2 +-
 ...Fix-spawn-radius-being-treated-as-0.patch} |  2 +-
 ...656-Fix-Follow-Range-Initial-Target.patch} |  2 +-
 ...pers.patch => 0415-Optimize-Hoppers.patch} |  2 +-
 ...ayerDeathEvent-shouldDropExperience.patch} |  2 +-
 ...ading-chunks-checking-hive-position.patch} |  2 +-
 ...hunks-from-Hoppers-and-other-things.patch} |  2 +-
 ...ializing-mismatching-chunk-coordina.patch} |  2 +-
 ...imise-IEntityAccess-getPlayerByUUID.patch} |  2 +-
 ...421-Fix-items-not-falling-correctly.patch} |  2 +-
 ...patch => 0422-Lag-compensate-eating.patch} |  2 +-
 ...ize-call-to-getFluid-for-explosions.patch} |  2 +-
 ...-in-stack-not-having-effects-when-d.patch} |  2 +-
 ... 0425-Activation-Range-Improvements.patch} |  8 +++----
 ...Add-effect-to-block-break-naturally.patch} |  2 +-
 ...=> 0427-Tracking-Range-Improvements.patch} |  2 +-
 ...tor-behavior-for-EntityPhanton-goal.patch} |  2 +-
 ...-items-vanishing-through-end-portal.patch} |  4 ++--
 ...h => 0430-Seed-based-feature-search.patch} |  2 +-
 ...et-gravity-in-void.-Fixes-MC-167279.patch} |  2 +-
 ...-getChunkAt-calls-for-loaded-chunks.patch} |  4 ++--
 ...more-tolerant-of-invalid-attributes.patch} |  2 +-
 ...w-overriding-the-java-version-check.patch} |  2 +-
 ...tch => 0435-Add-ThrownEggHatchEvent.patch} |  2 +-
 ... 0436-Optimise-random-block-ticking.patch} |  2 +-
 ...p-API.patch => 0437-Entity-Jump-API.patch} |  2 +-
 ...-to-nerf-pigmen-from-nether-portals.patch} |  4 ++--
 ... => 0439-Make-the-GUI-graph-fancier.patch} |  2 +-
 ... => 0440-Backport-fix-for-MC-167561.patch} |  2 +-
 ...41-add-hand-to-BlockMultiPlaceEvent.patch} |  2 +-
 ...2-Prevent-teleporting-dead-entities.patch} |  2 +-
 ...ipwire-hook-placement-before-update.patch} |  2 +-
 ...o-allow-iron-golems-to-spawn-in-air.patch} |  2 +-
 ...chance-of-villager-zombie-infection.patch} |  2 +-
 ...tch => 0446-Optimise-Chunk-getFluid.patch} |  2 +-
 ...mise-TickListServer-by-rewriting-it.patch} |  2 +-
 ...duce-entity-tracker-updates-on-move.patch} |  2 +-
 ...pawn-settings-and-per-player-option.patch} |  2 +-
 ...e-Entity-is-never-double-registered.patch} |  4 ++--
 ...ring-entities-from-unloading-chunks.patch} |  2 +-
 ...nections-shouldn-t-hold-up-shutdown.patch} |  2 +-
 ...ow-bees-to-load-chunks-for-beehives.patch} |  2 +-
 ...PlayerChunkMap-adds-crashing-server.patch} |  2 +-
 ...n-Chunk-lookup-and-avoid-loading-fa.patch} |  2 +-
 ...tch => 0456-Don-t-tick-dead-players.patch} |  2 +-
 ...-Player-s-shouldn-t-be-able-to-move.patch} |  2 +-
 ...unkMap-memory-use-for-visibleChunks.patch} |  2 +-
 ...s-when-attempting-to-unload-a-chunk.patch} |  2 +-
 ...h => 0460-Increase-Light-Queue-Size.patch} |  2 +-
 ...ssing-of-chunk-loads-and-generation.patch} |  2 +-
 ...ove-existing-players-to-world-spawn.patch} |  2 +-
 ...Add-tick-times-API-and-mspt-command.patch} |  2 +-
 ...64-Expose-MinecraftServer-isRunning.patch} |  2 +-
 ...riority-Urgency-System-for-World-Ge.patch} |  2 +-
 ...6-Remove-streams-from-Mob-AI-System.patch} |  2 +-
 204 files changed, 233 insertions(+), 257 deletions(-)
 rename Spigot-Server-Patches/{0265-Implement-Expanded-ArmorStand-API.patch => 0264-Implement-Expanded-ArmorStand-API.patch} (98%)
 delete mode 100644 Spigot-Server-Patches/0264-MC-111480-Start-Entity-ID-s-at-1.patch
 rename Spigot-Server-Patches/{0266-AnvilDamageEvent.patch => 0265-AnvilDamageEvent.patch} (96%)
 rename Spigot-Server-Patches/{0267-Add-TNTPrimeEvent.patch => 0266-Add-TNTPrimeEvent.patch} (99%)
 rename Spigot-Server-Patches/{0268-Break-up-and-make-tab-spam-limits-configurable.patch => 0267-Break-up-and-make-tab-spam-limits-configurable.patch} (98%)
 rename Spigot-Server-Patches/{0269-Add-hand-to-bucket-events.patch => 0268-Add-hand-to-bucket-events.patch} (99%)
 rename Spigot-Server-Patches/{0270-MC-135506-Experience-should-save-as-Integers.patch => 0269-MC-135506-Experience-should-save-as-Integers.patch} (95%)
 rename Spigot-Server-Patches/{0271-Fix-client-rendering-skulls-from-same-user.patch => 0270-Fix-client-rendering-skulls-from-same-user.patch} (98%)
 rename Spigot-Server-Patches/{0272-Add-Early-Warning-Feature-to-WatchDog.patch => 0271-Add-Early-Warning-Feature-to-WatchDog.patch} (99%)
 rename Spigot-Server-Patches/{0273-Make-EnderDragon-implement-Mob.patch => 0272-Make-EnderDragon-implement-Mob.patch} (95%)
 rename Spigot-Server-Patches/{0274-Use-ConcurrentHashMap-in-JsonList.patch => 0273-Use-ConcurrentHashMap-in-JsonList.patch} (98%)
 rename Spigot-Server-Patches/{0275-Use-a-Queue-for-Queueing-Commands.patch => 0274-Use-a-Queue-for-Queueing-Commands.patch} (96%)
 rename Spigot-Server-Patches/{0276-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch => 0275-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch} (95%)
 rename Spigot-Server-Patches/{0277-Allow-disabling-armour-stand-ticking.patch => 0276-Allow-disabling-armour-stand-ticking.patch} (99%)
 rename Spigot-Server-Patches/{0278-Optimize-BlockPosition-helper-methods.patch => 0277-Optimize-BlockPosition-helper-methods.patch} (98%)
 rename Spigot-Server-Patches/{0279-Send-nearby-packets-from-world-player-list-not-serve.patch => 0278-Send-nearby-packets-from-world-player-list-not-serve.patch} (98%)
 rename Spigot-Server-Patches/{0280-Restore-vanlla-default-mob-spawn-range.patch => 0279-Restore-vanlla-default-mob-spawn-range.patch} (87%)
 rename Spigot-Server-Patches/{0281-Optimize-CraftBlockData-Creation.patch => 0280-Optimize-CraftBlockData-Creation.patch} (97%)
 rename Spigot-Server-Patches/{0282-Fix-MC-124320.patch => 0281-Fix-MC-124320.patch} (97%)
 rename Spigot-Server-Patches/{0283-Slime-Pathfinder-Events.patch => 0282-Slime-Pathfinder-Events.patch} (99%)
 rename Spigot-Server-Patches/{0284-Configurable-speed-for-water-flowing-over-lava.patch => 0283-Configurable-speed-for-water-flowing-over-lava.patch} (98%)
 rename Spigot-Server-Patches/{0285-Optimize-RegistryMaterials.patch => 0284-Optimize-RegistryMaterials.patch} (95%)
 rename Spigot-Server-Patches/{0286-Add-PhantomPreSpawnEvent.patch => 0285-Add-PhantomPreSpawnEvent.patch} (98%)
 rename Spigot-Server-Patches/{0287-Add-More-Creeper-API.patch => 0286-Add-More-Creeper-API.patch} (97%)
 rename Spigot-Server-Patches/{0288-Inventory-removeItemAnySlot.patch => 0287-Inventory-removeItemAnySlot.patch} (97%)
 rename Spigot-Server-Patches/{0289-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch => 0288-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch} (94%)
 rename Spigot-Server-Patches/{0290-Add-ray-tracing-methods-to-LivingEntity.patch => 0289-Add-ray-tracing-methods-to-LivingEntity.patch} (98%)
 rename Spigot-Server-Patches/{0291-Expose-attack-cooldown-methods-for-Player.patch => 0290-Expose-attack-cooldown-methods-for-Player.patch} (96%)
 rename Spigot-Server-Patches/{0292-Improve-death-events.patch => 0291-Improve-death-events.patch} (99%)
 rename Spigot-Server-Patches/{0293-Allow-chests-to-be-placed-with-NBT-data.patch => 0292-Allow-chests-to-be-placed-with-NBT-data.patch} (96%)
 rename Spigot-Server-Patches/{0294-Mob-Pathfinding-API.patch => 0293-Mob-Pathfinding-API.patch} (99%)
 rename Spigot-Server-Patches/{0295-Prevent-chunk-loading-from-Fluid-Flowing.patch => 0294-Prevent-chunk-loading-from-Fluid-Flowing.patch} (98%)
 rename Spigot-Server-Patches/{0296-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch => 0295-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch} (99%)
 rename Spigot-Server-Patches/{0297-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch => 0296-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch} (98%)
 rename Spigot-Server-Patches/{0298-Prevent-mob-spawning-from-loading-generating-chunks.patch => 0297-Prevent-mob-spawning-from-loading-generating-chunks.patch} (97%)
 rename Spigot-Server-Patches/{0299-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch => 0298-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch} (97%)
 rename Spigot-Server-Patches/{0300-Implement-furnace-cook-speed-multiplier-API.patch => 0299-Implement-furnace-cook-speed-multiplier-API.patch} (98%)
 rename Spigot-Server-Patches/{0301-Support-Overriding-World-Seeds.patch => 0300-Support-Overriding-World-Seeds.patch} (98%)
 rename Spigot-Server-Patches/{0302-Optimize-Server-World-Map.patch => 0301-Optimize-Server-World-Map.patch} (99%)
 rename Spigot-Server-Patches/{0303-PreSpawnerSpawnEvent.patch => 0302-PreSpawnerSpawnEvent.patch} (96%)
 rename Spigot-Server-Patches/{0304-Catch-JsonParseException-in-Entity-and-TE-names.patch => 0303-Catch-JsonParseException-in-Entity-and-TE-names.patch} (97%)
 rename Spigot-Server-Patches/{0305-Avoid-dimension-id-collisions.patch => 0304-Avoid-dimension-id-collisions.patch} (94%)
 rename Spigot-Server-Patches/{0306-Honor-EntityAgeable.ageLock.patch => 0305-Honor-EntityAgeable.ageLock.patch} (91%)
 rename Spigot-Server-Patches/{0307-Configurable-connection-throttle-kick-message.patch => 0306-Configurable-connection-throttle-kick-message.patch} (97%)
 rename Spigot-Server-Patches/{0308-Hook-into-CB-plugin-rewrites.patch => 0307-Hook-into-CB-plugin-rewrites.patch} (99%)
 rename Spigot-Server-Patches/{0309-Allow-setting-the-vex-s-summoner.patch => 0308-Allow-setting-the-vex-s-summoner.patch} (95%)
 rename Spigot-Server-Patches/{0310-Add-sun-related-API.patch => 0309-Add-sun-related-API.patch} (96%)
 rename Spigot-Server-Patches/{0311-Check-Drowned-for-Villager-Aggression-Config.patch => 0310-Check-Drowned-for-Villager-Aggression-Config.patch} (95%)
 rename Spigot-Server-Patches/{0312-Here-s-Johnny.patch => 0311-Here-s-Johnny.patch} (96%)
 rename Spigot-Server-Patches/{0313-Turtle-API.patch => 0312-Turtle-API.patch} (99%)
 rename Spigot-Server-Patches/{0314-Limit-lightning-strike-effect-distance.patch => 0313-Limit-lightning-strike-effect-distance.patch} (98%)
 rename Spigot-Server-Patches/{0315-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch => 0314-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch} (96%)
 rename Spigot-Server-Patches/{0316-Call-player-spectator-target-events.patch => 0315-Call-player-spectator-target-events.patch} (98%)
 rename Spigot-Server-Patches/{0317-Add-Velocity-IP-Forwarding-Support.patch => 0316-Add-Velocity-IP-Forwarding-Support.patch} (99%)
 rename Spigot-Server-Patches/{0318-Add-more-Witch-API.patch => 0317-Add-more-Witch-API.patch} (99%)
 rename Spigot-Server-Patches/{0319-Fix-MC-93764.patch => 0318-Fix-MC-93764.patch} (91%)
 rename Spigot-Server-Patches/{0320-Add-option-to-prevent-players-from-moving-into-unloa.patch => 0319-Add-option-to-prevent-players-from-moving-into-unloa.patch} (98%)
 rename Spigot-Server-Patches/{0321-Reset-players-airTicks-on-respawn.patch => 0320-Reset-players-airTicks-on-respawn.patch} (92%)
 rename Spigot-Server-Patches/{0322-Don-t-sleep-after-profile-lookups-if-not-needed.patch => 0321-Don-t-sleep-after-profile-lookups-if-not-needed.patch} (96%)
 rename Spigot-Server-Patches/{0323-Use-more-reasonable-thread-count-default-for-bootstr.patch => 0322-Use-more-reasonable-thread-count-default-for-bootstr.patch} (92%)
 rename Spigot-Server-Patches/{0324-Optimize-World-Time-Updates.patch => 0323-Optimize-World-Time-Updates.patch} (97%)
 rename Spigot-Server-Patches/{0325-Restore-custom-InventoryHolder-support.patch => 0324-Restore-custom-InventoryHolder-support.patch} (96%)
 rename Spigot-Server-Patches/{0326-Use-Vanilla-Minecart-Speeds.patch => 0325-Use-Vanilla-Minecart-Speeds.patch} (94%)
 rename Spigot-Server-Patches/{0327-Fix-SpongeAbsortEvent-handling.patch => 0326-Fix-SpongeAbsortEvent-handling.patch} (97%)
 rename Spigot-Server-Patches/{0328-Don-t-allow-digging-into-unloaded-chunks.patch => 0327-Don-t-allow-digging-into-unloaded-chunks.patch} (94%)
 rename Spigot-Server-Patches/{0329-Optimize-redstone-algorithm.patch => 0328-Optimize-redstone-algorithm.patch} (99%)
 rename Spigot-Server-Patches/{0330-force-entity-dismount-during-teleportation.patch => 0329-force-entity-dismount-during-teleportation.patch} (98%)
 rename Spigot-Server-Patches/{0331-Book-Size-Limits.patch => 0330-Book-Size-Limits.patch} (98%)
 rename Spigot-Server-Patches/{0332-Make-the-default-permission-message-configurable.patch => 0331-Make-the-default-permission-message-configurable.patch} (97%)
 rename Spigot-Server-Patches/{0333-Add-more-Zombie-API.patch => 0332-Add-more-Zombie-API.patch} (98%)
 rename Spigot-Server-Patches/{0334-Prevent-rayTrace-from-loading-chunks.patch => 0333-Prevent-rayTrace-from-loading-chunks.patch} (95%)
 rename Spigot-Server-Patches/{0335-Handle-Large-Packets-disconnecting-client.patch => 0334-Handle-Large-Packets-disconnecting-client.patch} (98%)
 rename Spigot-Server-Patches/{0336-Lazy-init-world-storage-in-CraftOfflinePlayer.patch => 0335-Lazy-init-world-storage-in-CraftOfflinePlayer.patch} (97%)
 rename Spigot-Server-Patches/{0337-Add-PlayerConnectionCloseEvent.patch => 0336-Add-PlayerConnectionCloseEvent.patch} (98%)
 rename Spigot-Server-Patches/{0338-Prevent-Enderman-from-loading-chunks.patch => 0337-Prevent-Enderman-from-loading-chunks.patch} (97%)
 rename Spigot-Server-Patches/{0339-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch => 0338-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch} (99%)
 rename Spigot-Server-Patches/{0340-Fix-PlayerEditBookEvent.patch => 0339-Fix-PlayerEditBookEvent.patch} (96%)
 rename Spigot-Server-Patches/{0341-Workaround-for-vehicle-tracking-issue-on-disconnect.patch => 0340-Workaround-for-vehicle-tracking-issue-on-disconnect.patch} (93%)
 rename Spigot-Server-Patches/{0342-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch => 0341-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch} (97%)
 rename Spigot-Server-Patches/{0343-Block-Entity-remove-from-being-called-on-Players.patch => 0342-Block-Entity-remove-from-being-called-on-Players.patch} (95%)
 rename Spigot-Server-Patches/{0344-BlockDestroyEvent.patch => 0343-BlockDestroyEvent.patch} (97%)
 rename Spigot-Server-Patches/{0345-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch => 0344-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch} (97%)
 rename Spigot-Server-Patches/{0346-Fix-sign-edit-memory-leak.patch => 0345-Fix-sign-edit-memory-leak.patch} (97%)
 rename Spigot-Server-Patches/{0347-Limit-Client-Sign-length-more.patch => 0346-Limit-Client-Sign-length-more.patch} (97%)
 rename Spigot-Server-Patches/{0348-Don-t-check-ConvertSigns-boolean-every-sign-save.patch => 0347-Don-t-check-ConvertSigns-boolean-every-sign-save.patch} (95%)
 rename Spigot-Server-Patches/{0349-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch => 0348-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch} (98%)
 rename Spigot-Server-Patches/{0350-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch => 0349-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch} (96%)
 rename Spigot-Server-Patches/{0351-Set-Zombie-last-tick-at-start-of-drowning-process.patch => 0350-Set-Zombie-last-tick-at-start-of-drowning-process.patch} (93%)
 rename Spigot-Server-Patches/{0352-Allow-Saving-of-Oversized-Chunks.patch => 0351-Allow-Saving-of-Oversized-Chunks.patch} (99%)
 rename Spigot-Server-Patches/{0353-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch => 0352-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch} (87%)
 rename Spigot-Server-Patches/{0354-Add-LivingEntity-getTargetEntity.patch => 0353-Add-LivingEntity-getTargetEntity.patch} (98%)
 rename Spigot-Server-Patches/{0355-Use-proper-max-length-when-serialising-BungeeCord-te.patch => 0354-Use-proper-max-length-when-serialising-BungeeCord-te.patch} (96%)
 rename Spigot-Server-Patches/{0356-Entity-getEntitySpawnReason.patch => 0355-Entity-getEntitySpawnReason.patch} (97%)
 rename Spigot-Server-Patches/{0357-Update-entity-Metadata-for-all-tracked-players.patch => 0356-Update-entity-Metadata-for-all-tracked-players.patch} (96%)
 rename Spigot-Server-Patches/{0358-Fire-event-on-GS4-query.patch => 0357-Fire-event-on-GS4-query.patch} (99%)
 rename Spigot-Server-Patches/{0359-Implement-PlayerPostRespawnEvent.patch => 0358-Implement-PlayerPostRespawnEvent.patch} (95%)
 rename Spigot-Server-Patches/{0360-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch => 0359-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch} (95%)
 rename Spigot-Server-Patches/{0361-Implement-getters-and-setters-for-EntityItem-owner-a.patch => 0360-Implement-getters-and-setters-for-EntityItem-owner-a.patch} (95%)
 rename Spigot-Server-Patches/{0362-Server-Tick-Events.patch => 0361-Server-Tick-Events.patch} (95%)
 rename Spigot-Server-Patches/{0363-PlayerDeathEvent-getItemsToKeep.patch => 0362-PlayerDeathEvent-getItemsToKeep.patch} (97%)
 rename Spigot-Server-Patches/{0364-Optimize-Captured-TileEntity-Lookup.patch => 0363-Optimize-Captured-TileEntity-Lookup.patch} (95%)
 rename Spigot-Server-Patches/{0365-Add-Heightmap-API.patch => 0364-Add-Heightmap-API.patch} (97%)
 rename Spigot-Server-Patches/{0366-Mob-Spawner-API-Enhancements.patch => 0365-Mob-Spawner-API-Enhancements.patch} (98%)
 rename Spigot-Server-Patches/{0367-Per-Player-View-Distance-API-placeholders.patch => 0366-Per-Player-View-Distance-API-placeholders.patch} (98%)
 rename Spigot-Server-Patches/{0368-Fix-CB-call-to-changed-postToMainThread-method.patch => 0367-Fix-CB-call-to-changed-postToMainThread-method.patch} (92%)
 rename Spigot-Server-Patches/{0369-Fix-sounds-when-item-frames-are-modified-MC-123450.patch => 0368-Fix-sounds-when-item-frames-are-modified-MC-123450.patch} (96%)
 rename Spigot-Server-Patches/{0370-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch => 0369-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch} (97%)
 rename Spigot-Server-Patches/{0371-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch => 0370-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch} (97%)
 rename Spigot-Server-Patches/{0372-Duplicate-UUID-Resolve-Option.patch => 0371-Duplicate-UUID-Resolve-Option.patch} (99%)
 rename Spigot-Server-Patches/{0373-improve-CraftWorld-isChunkLoaded.patch => 0372-improve-CraftWorld-isChunkLoaded.patch} (96%)
 rename Spigot-Server-Patches/{0374-Configurable-Keep-Spawn-Loaded-range-per-world.patch => 0373-Configurable-Keep-Spawn-Loaded-range-per-world.patch} (99%)
 rename Spigot-Server-Patches/{0375-Fix-some-generation-concurrency-issues.patch => 0374-Fix-some-generation-concurrency-issues.patch} (98%)
 rename Spigot-Server-Patches/{0376-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch => 0375-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch} (93%)
 rename Spigot-Server-Patches/{0377-ChunkMapDistance-CME.patch => 0376-ChunkMapDistance-CME.patch} (97%)
 rename Spigot-Server-Patches/{0378-Implement-CraftBlockSoundGroup.patch => 0377-Implement-CraftBlockSoundGroup.patch} (98%)
 rename Spigot-Server-Patches/{0379-Chunk-debug-command.patch => 0378-Chunk-debug-command.patch} (99%)
 rename Spigot-Server-Patches/{0380-incremental-chunk-saving.patch => 0379-incremental-chunk-saving.patch} (99%)
 rename Spigot-Server-Patches/{0381-Catch-exceptions-from-dispenser-entity-spawns.patch => 0380-Catch-exceptions-from-dispenser-entity-spawns.patch} (95%)
 rename Spigot-Server-Patches/{0382-Fix-World-isChunkGenerated-calls.patch => 0381-Fix-World-isChunkGenerated-calls.patch} (99%)
 rename Spigot-Server-Patches/{0383-Show-blockstate-location-if-we-failed-to-read-it.patch => 0382-Show-blockstate-location-if-we-failed-to-read-it.patch} (95%)
 rename Spigot-Server-Patches/{0384-Log-other-thread-in-DataPaletteBlock-lock-failure.patch => 0383-Log-other-thread-in-DataPaletteBlock-lock-failure.patch} (97%)
 rename Spigot-Server-Patches/{0385-Use-ChunkStatus-cache-when-saving-protochunks.patch => 0384-Use-ChunkStatus-cache-when-saving-protochunks.patch} (92%)
 rename Spigot-Server-Patches/{0386-Anti-Xray.patch => 0385-Anti-Xray.patch} (99%)
 rename Spigot-Server-Patches/{0387-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch => 0386-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch} (97%)
 rename Spigot-Server-Patches/{0388-Configurable-projectile-relative-velocity.patch => 0387-Configurable-projectile-relative-velocity.patch} (98%)
 rename Spigot-Server-Patches/{0389-Mark-entities-as-being-ticked-when-notifying-navigat.patch => 0388-Mark-entities-as-being-ticked-when-notifying-navigat.patch} (94%)
 rename Spigot-Server-Patches/{0390-offset-item-frame-ticking.patch => 0389-offset-item-frame-ticking.patch} (92%)
 rename Spigot-Server-Patches/{0391-Avoid-hopper-searches-if-there-are-no-items.patch => 0390-Avoid-hopper-searches-if-there-are-no-items.patch} (98%)
 rename Spigot-Server-Patches/{0392-Asynchronous-chunk-IO-and-loading.patch => 0391-Asynchronous-chunk-IO-and-loading.patch} (99%)
 rename Spigot-Server-Patches/{0393-Use-getChunkIfLoadedImmediately-in-places.patch => 0392-Use-getChunkIfLoadedImmediately-in-places.patch} (98%)
 rename Spigot-Server-Patches/{0394-Reduce-sync-loads.patch => 0393-Reduce-sync-loads.patch} (99%)
 rename Spigot-Server-Patches/{0395-Implement-alternative-item-despawn-rate.patch => 0394-Implement-alternative-item-despawn-rate.patch} (98%)
 rename Spigot-Server-Patches/{0396-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch => 0395-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch} (97%)
 rename Spigot-Server-Patches/{0397-Fix-MC-158900.patch => 0396-Fix-MC-158900.patch} (93%)
 rename Spigot-Server-Patches/{0398-implement-optional-per-player-mob-spawns.patch => 0397-implement-optional-per-player-mob-spawns.patch} (99%)
 rename Spigot-Server-Patches/{0399-Prevent-consuming-the-wrong-itemstack.patch => 0398-Prevent-consuming-the-wrong-itemstack.patch} (97%)
 rename Spigot-Server-Patches/{0400-only-add-passanger-entities-once-from-spawners.patch => 0399-only-add-passanger-entities-once-from-spawners.patch} (93%)
 rename Spigot-Server-Patches/{0401-Fix-nether-portal-creation.patch => 0400-Fix-nether-portal-creation.patch} (94%)
 rename Spigot-Server-Patches/{0402-Generator-Settings.patch => 0401-Generator-Settings.patch} (97%)
 rename Spigot-Server-Patches/{0403-Fix-zero-tick-instant-grow-farms-MC-113809.patch => 0402-Fix-zero-tick-instant-grow-farms-MC-113809.patch} (98%)
 rename Spigot-Server-Patches/{0404-Fix-MC-161754.patch => 0403-Fix-MC-161754.patch} (94%)
 rename Spigot-Server-Patches/{0405-Performance-improvement-for-Chunk.getEntities.patch => 0404-Performance-improvement-for-Chunk.getEntities.patch} (96%)
 rename Spigot-Server-Patches/{0406-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch => 0405-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch} (96%)
 rename Spigot-Server-Patches/{0407-Expose-the-internal-current-tick.patch => 0406-Expose-the-internal-current-tick.patch} (92%)
 rename Spigot-Server-Patches/{0408-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch => 0407-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch} (93%)
 rename Spigot-Server-Patches/{0409-Add-option-to-disable-pillager-patrols.patch => 0408-Add-option-to-disable-pillager-patrols.patch} (96%)
 rename Spigot-Server-Patches/{0410-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch => 0409-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch} (96%)
 rename Spigot-Server-Patches/{0411-PlayerLaunchProjectileEvent.patch => 0410-PlayerLaunchProjectileEvent.patch} (99%)
 rename Spigot-Server-Patches/{0412-Add-CraftMagicNumbers.isSupportedApiVersion.patch => 0411-Add-CraftMagicNumbers.isSupportedApiVersion.patch} (93%)
 rename Spigot-Server-Patches/{0413-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch => 0412-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch} (95%)
 rename Spigot-Server-Patches/{0414-Fix-spawn-radius-being-treated-as-0.patch => 0413-Fix-spawn-radius-being-treated-as-0.patch} (94%)
 rename Spigot-Server-Patches/{0415-MC-145656-Fix-Follow-Range-Initial-Target.patch => 0414-MC-145656-Fix-Follow-Range-Initial-Target.patch} (97%)
 rename Spigot-Server-Patches/{0416-Optimize-Hoppers.patch => 0415-Optimize-Hoppers.patch} (99%)
 rename Spigot-Server-Patches/{0417-PlayerDeathEvent-shouldDropExperience.patch => 0416-PlayerDeathEvent-shouldDropExperience.patch} (93%)
 rename Spigot-Server-Patches/{0418-Prevent-bees-loading-chunks-checking-hive-position.patch => 0417-Prevent-bees-loading-chunks-checking-hive-position.patch} (93%)
 rename Spigot-Server-Patches/{0419-Don-t-load-Chunks-from-Hoppers-and-other-things.patch => 0418-Don-t-load-Chunks-from-Hoppers-and-other-things.patch} (96%)
 rename Spigot-Server-Patches/{0420-Guard-against-serializing-mismatching-chunk-coordina.patch => 0419-Guard-against-serializing-mismatching-chunk-coordina.patch} (98%)
 rename Spigot-Server-Patches/{0421-Optimise-IEntityAccess-getPlayerByUUID.patch => 0420-Optimise-IEntityAccess-getPlayerByUUID.patch} (96%)
 rename Spigot-Server-Patches/{0422-Fix-items-not-falling-correctly.patch => 0421-Fix-items-not-falling-correctly.patch} (95%)
 rename Spigot-Server-Patches/{0423-Lag-compensate-eating.patch => 0422-Lag-compensate-eating.patch} (98%)
 rename Spigot-Server-Patches/{0424-Optimize-call-to-getFluid-for-explosions.patch => 0423-Optimize-call-to-getFluid-for-explosions.patch} (94%)
 rename Spigot-Server-Patches/{0425-Fix-last-firework-in-stack-not-having-effects-when-d.patch => 0424-Fix-last-firework-in-stack-not-having-effects-when-d.patch} (95%)
 rename Spigot-Server-Patches/{0426-Activation-Range-Improvements.patch => 0425-Activation-Range-Improvements.patch} (99%)
 rename Spigot-Server-Patches/{0427-Add-effect-to-block-break-naturally.patch => 0426-Add-effect-to-block-break-naturally.patch} (95%)
 rename Spigot-Server-Patches/{0428-Tracking-Range-Improvements.patch => 0427-Tracking-Range-Improvements.patch} (97%)
 rename Spigot-Server-Patches/{0429-Fix-comparator-behavior-for-EntityPhanton-goal.patch => 0428-Fix-comparator-behavior-for-EntityPhanton-goal.patch} (93%)
 rename Spigot-Server-Patches/{0430-Fix-items-vanishing-through-end-portal.patch => 0429-Fix-items-vanishing-through-end-portal.patch} (94%)
 rename Spigot-Server-Patches/{0431-Seed-based-feature-search.patch => 0430-Seed-based-feature-search.patch} (98%)
 rename Spigot-Server-Patches/{0432-Bees-get-gravity-in-void.-Fixes-MC-167279.patch => 0431-Bees-get-gravity-in-void.-Fixes-MC-167279.patch} (97%)
 rename Spigot-Server-Patches/{0433-Optimise-getChunkAt-calls-for-loaded-chunks.patch => 0432-Optimise-getChunkAt-calls-for-loaded-chunks.patch} (97%)
 rename Spigot-Server-Patches/{0434-Be-more-tolerant-of-invalid-attributes.patch => 0433-Be-more-tolerant-of-invalid-attributes.patch} (96%)
 rename Spigot-Server-Patches/{0435-Allow-overriding-the-java-version-check.patch => 0434-Allow-overriding-the-java-version-check.patch} (93%)
 rename Spigot-Server-Patches/{0436-Add-ThrownEggHatchEvent.patch => 0435-Add-ThrownEggHatchEvent.patch} (95%)
 rename Spigot-Server-Patches/{0437-Optimise-random-block-ticking.patch => 0436-Optimise-random-block-ticking.patch} (99%)
 rename Spigot-Server-Patches/{0438-Entity-Jump-API.patch => 0437-Entity-Jump-API.patch} (98%)
 rename Spigot-Server-Patches/{0439-Add-option-to-nerf-pigmen-from-nether-portals.patch => 0438-Add-option-to-nerf-pigmen-from-nether-portals.patch} (97%)
 rename Spigot-Server-Patches/{0440-Make-the-GUI-graph-fancier.patch => 0439-Make-the-GUI-graph-fancier.patch} (99%)
 rename Spigot-Server-Patches/{0441-Backport-fix-for-MC-167561.patch => 0440-Backport-fix-for-MC-167561.patch} (97%)
 rename Spigot-Server-Patches/{0442-add-hand-to-BlockMultiPlaceEvent.patch => 0441-add-hand-to-BlockMultiPlaceEvent.patch} (95%)
 rename Spigot-Server-Patches/{0443-Prevent-teleporting-dead-entities.patch => 0442-Prevent-teleporting-dead-entities.patch} (93%)
 rename Spigot-Server-Patches/{0444-Validate-tripwire-hook-placement-before-update.patch => 0443-Validate-tripwire-hook-placement-before-update.patch} (93%)
 rename Spigot-Server-Patches/{0445-Add-option-to-allow-iron-golems-to-spawn-in-air.patch => 0444-Add-option-to-allow-iron-golems-to-spawn-in-air.patch} (96%)
 rename Spigot-Server-Patches/{0446-Configurable-chance-of-villager-zombie-infection.patch => 0445-Configurable-chance-of-villager-zombie-infection.patch} (97%)
 rename Spigot-Server-Patches/{0447-Optimise-Chunk-getFluid.patch => 0446-Optimise-Chunk-getFluid.patch} (97%)
 rename Spigot-Server-Patches/{0448-Optimise-TickListServer-by-rewriting-it.patch => 0447-Optimise-TickListServer-by-rewriting-it.patch} (99%)
 rename Spigot-Server-Patches/{0449-Reduce-entity-tracker-updates-on-move.patch => 0448-Reduce-entity-tracker-updates-on-move.patch} (99%)
 rename Spigot-Server-Patches/{0450-Pillager-patrol-spawn-settings-and-per-player-option.patch => 0449-Pillager-patrol-spawn-settings-and-per-player-option.patch} (99%)
 rename Spigot-Server-Patches/{0451-Ensure-Entity-is-never-double-registered.patch => 0450-Ensure-Entity-is-never-double-registered.patch} (97%)
 rename Spigot-Server-Patches/{0452-Fix-unregistering-entities-from-unloading-chunks.patch => 0451-Fix-unregistering-entities-from-unloading-chunks.patch} (95%)
 rename Spigot-Server-Patches/{0453-Remote-Connections-shouldn-t-hold-up-shutdown.patch => 0452-Remote-Connections-shouldn-t-hold-up-shutdown.patch} (94%)
 rename Spigot-Server-Patches/{0454-Do-not-allow-bees-to-load-chunks-for-beehives.patch => 0453-Do-not-allow-bees-to-load-chunks-for-beehives.patch} (97%)
 rename Spigot-Server-Patches/{0455-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch => 0454-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch} (97%)
 rename Spigot-Server-Patches/{0456-Optimize-Collision-Chunk-lookup-and-avoid-loading-fa.patch => 0455-Optimize-Collision-Chunk-lookup-and-avoid-loading-fa.patch} (97%)
 rename Spigot-Server-Patches/{0457-Don-t-tick-dead-players.patch => 0456-Don-t-tick-dead-players.patch} (93%)
 rename Spigot-Server-Patches/{0458-Dead-Player-s-shouldn-t-be-able-to-move.patch => 0457-Dead-Player-s-shouldn-t-be-able-to-move.patch} (93%)
 rename Spigot-Server-Patches/{0459-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch => 0458-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch} (99%)
 rename Spigot-Server-Patches/{0460-Don-t-load-chunks-when-attempting-to-unload-a-chunk.patch => 0459-Don-t-load-chunks-when-attempting-to-unload-a-chunk.patch} (96%)
 rename Spigot-Server-Patches/{0461-Increase-Light-Queue-Size.patch => 0460-Increase-Light-Queue-Size.patch} (96%)
 rename Spigot-Server-Patches/{0462-Speed-up-processing-of-chunk-loads-and-generation.patch => 0461-Speed-up-processing-of-chunk-loads-and-generation.patch} (99%)
 rename Spigot-Server-Patches/{0463-Don-t-move-existing-players-to-world-spawn.patch => 0462-Don-t-move-existing-players-to-world-spawn.patch} (97%)
 rename Spigot-Server-Patches/{0464-Add-tick-times-API-and-mspt-command.patch => 0463-Add-tick-times-API-and-mspt-command.patch} (98%)
 rename Spigot-Server-Patches/{0465-Expose-MinecraftServer-isRunning.patch => 0464-Expose-MinecraftServer-isRunning.patch} (93%)
 rename Spigot-Server-Patches/{0466-Implement-Chunk-Priority-Urgency-System-for-World-Ge.patch => 0465-Implement-Chunk-Priority-Urgency-System-for-World-Ge.patch} (99%)
 rename Spigot-Server-Patches/{0467-Remove-streams-from-Mob-AI-System.patch => 0466-Remove-streams-from-Mob-AI-System.patch} (99%)

diff --git a/Spigot-Server-Patches/0265-Implement-Expanded-ArmorStand-API.patch b/Spigot-Server-Patches/0264-Implement-Expanded-ArmorStand-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0265-Implement-Expanded-ArmorStand-API.patch
rename to Spigot-Server-Patches/0264-Implement-Expanded-ArmorStand-API.patch
index 3c64e0a2f..9cbdd7ce2 100644
--- a/Spigot-Server-Patches/0265-Implement-Expanded-ArmorStand-API.patch
+++ b/Spigot-Server-Patches/0264-Implement-Expanded-ArmorStand-API.patch
@@ -1,4 +1,4 @@
-From 3a95b20452b90efc74f4d8f24e7629e8692ba9c4 Mon Sep 17 00:00:00 2001
+From f7d2d3848b7823289d0174fe9ea68ba4205690a0 Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Thu, 26 Jul 2018 02:25:46 -0400
 Subject: [PATCH] Implement Expanded ArmorStand API
diff --git a/Spigot-Server-Patches/0264-MC-111480-Start-Entity-ID-s-at-1.patch b/Spigot-Server-Patches/0264-MC-111480-Start-Entity-ID-s-at-1.patch
deleted file mode 100644
index 98b940360..000000000
--- a/Spigot-Server-Patches/0264-MC-111480-Start-Entity-ID-s-at-1.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 9f9684fcca3fb42a4e44d5f0853e606323266fc0 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sun, 29 Jul 2018 22:58:47 -0400
-Subject: [PATCH] MC-111480: Start Entity ID's at 1
-
-DataWatchers that store Entity ID's treat 0 as special,
-and can break things such as Elytra Fireworks.
-
-diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 33cd7f7b40..f54fc61aa5 100644
---- a/src/main/java/net/minecraft/server/Entity.java
-+++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -93,7 +93,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
-     // CraftBukkit end
- 
-     protected static final Logger LOGGER = LogManager.getLogger();
--    private static final AtomicInteger entityCount = new AtomicInteger();
-+    private static final AtomicInteger entityCount = new AtomicInteger(1); // paper - start entity count from 1
-     private static final List<ItemStack> c = Collections.emptyList();
-     private static final AxisAlignedBB d = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.0D, 0.0D, 0.0D);
-     private static double e = 1.0D;
--- 
-2.25.1
-
diff --git a/Spigot-Server-Patches/0266-AnvilDamageEvent.patch b/Spigot-Server-Patches/0265-AnvilDamageEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0266-AnvilDamageEvent.patch
rename to Spigot-Server-Patches/0265-AnvilDamageEvent.patch
index 2d0dc4d05..23cbc951a 100644
--- a/Spigot-Server-Patches/0266-AnvilDamageEvent.patch
+++ b/Spigot-Server-Patches/0265-AnvilDamageEvent.patch
@@ -1,4 +1,4 @@
-From 4cd6e3dd2122d3311283a969eae5f8fdba3f1895 Mon Sep 17 00:00:00 2001
+From 69ea740d1362a02b4de939322a3113f3594ba7cc Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 20 Jul 2018 23:37:03 -0500
 Subject: [PATCH] AnvilDamageEvent
diff --git a/Spigot-Server-Patches/0267-Add-TNTPrimeEvent.patch b/Spigot-Server-Patches/0266-Add-TNTPrimeEvent.patch
similarity index 99%
rename from Spigot-Server-Patches/0267-Add-TNTPrimeEvent.patch
rename to Spigot-Server-Patches/0266-Add-TNTPrimeEvent.patch
index 667251c99..c64076a49 100644
--- a/Spigot-Server-Patches/0267-Add-TNTPrimeEvent.patch
+++ b/Spigot-Server-Patches/0266-Add-TNTPrimeEvent.patch
@@ -1,4 +1,4 @@
-From ac17c29e5d0e7e952156b4321fc9dcb6f9752104 Mon Sep 17 00:00:00 2001
+From 93ec0f7901814f5559baa4ba4210a1818164472f Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Mon, 16 Jul 2018 00:05:05 +0300
 Subject: [PATCH] Add TNTPrimeEvent
diff --git a/Spigot-Server-Patches/0268-Break-up-and-make-tab-spam-limits-configurable.patch b/Spigot-Server-Patches/0267-Break-up-and-make-tab-spam-limits-configurable.patch
similarity index 98%
rename from Spigot-Server-Patches/0268-Break-up-and-make-tab-spam-limits-configurable.patch
rename to Spigot-Server-Patches/0267-Break-up-and-make-tab-spam-limits-configurable.patch
index f55001b6a..7437f7602 100644
--- a/Spigot-Server-Patches/0268-Break-up-and-make-tab-spam-limits-configurable.patch
+++ b/Spigot-Server-Patches/0267-Break-up-and-make-tab-spam-limits-configurable.patch
@@ -1,4 +1,4 @@
-From 616c1a4d73f502e9274d5a9598ee92d5a0cd329a Mon Sep 17 00:00:00 2001
+From a8320c956406ed8dfca64375d720c32d49bf7c52 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 29 Jul 2018 05:02:15 +0100
 Subject: [PATCH] Break up and make tab spam limits configurable
diff --git a/Spigot-Server-Patches/0269-Add-hand-to-bucket-events.patch b/Spigot-Server-Patches/0268-Add-hand-to-bucket-events.patch
similarity index 99%
rename from Spigot-Server-Patches/0269-Add-hand-to-bucket-events.patch
rename to Spigot-Server-Patches/0268-Add-hand-to-bucket-events.patch
index 7425b7402..006f7d086 100644
--- a/Spigot-Server-Patches/0269-Add-hand-to-bucket-events.patch
+++ b/Spigot-Server-Patches/0268-Add-hand-to-bucket-events.patch
@@ -1,4 +1,4 @@
-From 92f9b971217b4956efdf05ceb465d9c7340cae18 Mon Sep 17 00:00:00 2001
+From 600e0f4800c2155415302ce757b65bf79854dabf Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 2 Aug 2018 08:44:35 -0500
 Subject: [PATCH] Add hand to bucket events
diff --git a/Spigot-Server-Patches/0270-MC-135506-Experience-should-save-as-Integers.patch b/Spigot-Server-Patches/0269-MC-135506-Experience-should-save-as-Integers.patch
similarity index 95%
rename from Spigot-Server-Patches/0270-MC-135506-Experience-should-save-as-Integers.patch
rename to Spigot-Server-Patches/0269-MC-135506-Experience-should-save-as-Integers.patch
index b0e4ac8e3..590a5648b 100644
--- a/Spigot-Server-Patches/0270-MC-135506-Experience-should-save-as-Integers.patch
+++ b/Spigot-Server-Patches/0269-MC-135506-Experience-should-save-as-Integers.patch
@@ -1,4 +1,4 @@
-From 83d34d895d415d49ae79fffb773502ee2c61192d Mon Sep 17 00:00:00 2001
+From a059499a952e1ce9d0d4512cf3f47241d44a6588 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 3 Aug 2018 00:04:54 -0400
 Subject: [PATCH] MC-135506: Experience should save as Integers
diff --git a/Spigot-Server-Patches/0271-Fix-client-rendering-skulls-from-same-user.patch b/Spigot-Server-Patches/0270-Fix-client-rendering-skulls-from-same-user.patch
similarity index 98%
rename from Spigot-Server-Patches/0271-Fix-client-rendering-skulls-from-same-user.patch
rename to Spigot-Server-Patches/0270-Fix-client-rendering-skulls-from-same-user.patch
index 1c89a3dd9..d951fda7b 100644
--- a/Spigot-Server-Patches/0271-Fix-client-rendering-skulls-from-same-user.patch
+++ b/Spigot-Server-Patches/0270-Fix-client-rendering-skulls-from-same-user.patch
@@ -1,4 +1,4 @@
-From 82671363bc4c58aba1d8e858d9d3e45a4d54d99c Mon Sep 17 00:00:00 2001
+From 3261b570ff6eaa68dec1814e27557f05b55f4f82 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 22 Nov 2016 00:40:42 -0500
 Subject: [PATCH] Fix client rendering skulls from same user
diff --git a/Spigot-Server-Patches/0272-Add-Early-Warning-Feature-to-WatchDog.patch b/Spigot-Server-Patches/0271-Add-Early-Warning-Feature-to-WatchDog.patch
similarity index 99%
rename from Spigot-Server-Patches/0272-Add-Early-Warning-Feature-to-WatchDog.patch
rename to Spigot-Server-Patches/0271-Add-Early-Warning-Feature-to-WatchDog.patch
index d188fd665..70982a4b7 100644
--- a/Spigot-Server-Patches/0272-Add-Early-Warning-Feature-to-WatchDog.patch
+++ b/Spigot-Server-Patches/0271-Add-Early-Warning-Feature-to-WatchDog.patch
@@ -1,4 +1,4 @@
-From 2c9bd68d76c1e49ab6325805eb74c4ffdb03d408 Mon Sep 17 00:00:00 2001
+From 3dceaa4c5ffc0cf8a6fdbb0c3807dcef7c642938 Mon Sep 17 00:00:00 2001
 From: miclebrick <miclebrick@outlook.com>
 Date: Wed, 8 Aug 2018 15:30:52 -0400
 Subject: [PATCH] Add Early Warning Feature to WatchDog
diff --git a/Spigot-Server-Patches/0273-Make-EnderDragon-implement-Mob.patch b/Spigot-Server-Patches/0272-Make-EnderDragon-implement-Mob.patch
similarity index 95%
rename from Spigot-Server-Patches/0273-Make-EnderDragon-implement-Mob.patch
rename to Spigot-Server-Patches/0272-Make-EnderDragon-implement-Mob.patch
index 2478c75b2..1df45095f 100644
--- a/Spigot-Server-Patches/0273-Make-EnderDragon-implement-Mob.patch
+++ b/Spigot-Server-Patches/0272-Make-EnderDragon-implement-Mob.patch
@@ -1,4 +1,4 @@
-From 28c01fd1a4550e06222223cc31bdfc06cee5c664 Mon Sep 17 00:00:00 2001
+From 21ada7c53742cac07c0ec0f034a73d6c0135df49 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 10 Aug 2018 22:11:49 -0400
 Subject: [PATCH] Make EnderDragon implement Mob
diff --git a/Spigot-Server-Patches/0274-Use-ConcurrentHashMap-in-JsonList.patch b/Spigot-Server-Patches/0273-Use-ConcurrentHashMap-in-JsonList.patch
similarity index 98%
rename from Spigot-Server-Patches/0274-Use-ConcurrentHashMap-in-JsonList.patch
rename to Spigot-Server-Patches/0273-Use-ConcurrentHashMap-in-JsonList.patch
index dd7fc6f9e..ecacd64b6 100644
--- a/Spigot-Server-Patches/0274-Use-ConcurrentHashMap-in-JsonList.patch
+++ b/Spigot-Server-Patches/0273-Use-ConcurrentHashMap-in-JsonList.patch
@@ -1,4 +1,4 @@
-From 6ab48e593321679760a30c18cd39fc513e68d0f9 Mon Sep 17 00:00:00 2001
+From 8c73232c2470b81a1f291eb84e712488deabb722 Mon Sep 17 00:00:00 2001
 From: egg82 <phantom_zero@ymail.com>
 Date: Tue, 7 Aug 2018 01:24:23 -0600
 Subject: [PATCH] Use ConcurrentHashMap in JsonList
diff --git a/Spigot-Server-Patches/0275-Use-a-Queue-for-Queueing-Commands.patch b/Spigot-Server-Patches/0274-Use-a-Queue-for-Queueing-Commands.patch
similarity index 96%
rename from Spigot-Server-Patches/0275-Use-a-Queue-for-Queueing-Commands.patch
rename to Spigot-Server-Patches/0274-Use-a-Queue-for-Queueing-Commands.patch
index 4bb89c2b0..3b93cea93 100644
--- a/Spigot-Server-Patches/0275-Use-a-Queue-for-Queueing-Commands.patch
+++ b/Spigot-Server-Patches/0274-Use-a-Queue-for-Queueing-Commands.patch
@@ -1,4 +1,4 @@
-From 5b5eae01e944b6381ce8b0b2e1171b8db52d21d0 Mon Sep 17 00:00:00 2001
+From 35f21b9dfa9c886560a329181a4ddb1fd1c81305 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 12 Aug 2018 02:33:39 -0400
 Subject: [PATCH] Use a Queue for Queueing Commands
diff --git a/Spigot-Server-Patches/0276-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/Spigot-Server-Patches/0275-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
similarity index 95%
rename from Spigot-Server-Patches/0276-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
rename to Spigot-Server-Patches/0275-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
index 457bc9515..cf5c5844f 100644
--- a/Spigot-Server-Patches/0276-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
+++ b/Spigot-Server-Patches/0275-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
@@ -1,4 +1,4 @@
-From 3857606d6edee62ac7bd5527964aabfa335a94eb Mon Sep 17 00:00:00 2001
+From 7f8d66cab05b5ab4c3d993c6059a836de7c83f66 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 15 Aug 2018 01:16:34 -0400
 Subject: [PATCH] Ability to get Tile Entities from a chunk without snapshots
diff --git a/Spigot-Server-Patches/0277-Allow-disabling-armour-stand-ticking.patch b/Spigot-Server-Patches/0276-Allow-disabling-armour-stand-ticking.patch
similarity index 99%
rename from Spigot-Server-Patches/0277-Allow-disabling-armour-stand-ticking.patch
rename to Spigot-Server-Patches/0276-Allow-disabling-armour-stand-ticking.patch
index 35548c438..62c4939a0 100644
--- a/Spigot-Server-Patches/0277-Allow-disabling-armour-stand-ticking.patch
+++ b/Spigot-Server-Patches/0276-Allow-disabling-armour-stand-ticking.patch
@@ -1,4 +1,4 @@
-From bdb8fea3be1eb50e8eb8d4d2fbc52c447133912d Mon Sep 17 00:00:00 2001
+From c557cf35b3b59be8567caaaae4323d6add65ed0b Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 15 Aug 2018 01:26:09 -0700
 Subject: [PATCH] Allow disabling armour stand ticking
diff --git a/Spigot-Server-Patches/0278-Optimize-BlockPosition-helper-methods.patch b/Spigot-Server-Patches/0277-Optimize-BlockPosition-helper-methods.patch
similarity index 98%
rename from Spigot-Server-Patches/0278-Optimize-BlockPosition-helper-methods.patch
rename to Spigot-Server-Patches/0277-Optimize-BlockPosition-helper-methods.patch
index a124b9561..d40d8213f 100644
--- a/Spigot-Server-Patches/0278-Optimize-BlockPosition-helper-methods.patch
+++ b/Spigot-Server-Patches/0277-Optimize-BlockPosition-helper-methods.patch
@@ -1,4 +1,4 @@
-From 67b0feff4e6eee9190683b4ddff17cbd348930ad Mon Sep 17 00:00:00 2001
+From 48a58dc3035fea5f4492338ceff26b6c441bec39 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Wed, 15 Aug 2018 12:05:12 -0700
 Subject: [PATCH] Optimize BlockPosition helper methods
diff --git a/Spigot-Server-Patches/0279-Send-nearby-packets-from-world-player-list-not-serve.patch b/Spigot-Server-Patches/0278-Send-nearby-packets-from-world-player-list-not-serve.patch
similarity index 98%
rename from Spigot-Server-Patches/0279-Send-nearby-packets-from-world-player-list-not-serve.patch
rename to Spigot-Server-Patches/0278-Send-nearby-packets-from-world-player-list-not-serve.patch
index dc8b4ada7..da18ff43c 100644
--- a/Spigot-Server-Patches/0279-Send-nearby-packets-from-world-player-list-not-serve.patch
+++ b/Spigot-Server-Patches/0278-Send-nearby-packets-from-world-player-list-not-serve.patch
@@ -1,11 +1,11 @@
-From be762fa13b5569eac6f06b15842bfc42526004e8 Mon Sep 17 00:00:00 2001
+From 46abe17c2e2707fc80b5d0625708b27a48c0b396 Mon Sep 17 00:00:00 2001
 From: Mystiflow <mystiflow@gmail.com>
 Date: Fri, 6 Jul 2018 13:21:30 +0100
 Subject: [PATCH] Send nearby packets from world player list not server list
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index fd0f5c6f29..e46436623c 100644
+index 442673b13f..36d31d271c 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -923,8 +923,25 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0280-Restore-vanlla-default-mob-spawn-range.patch b/Spigot-Server-Patches/0279-Restore-vanlla-default-mob-spawn-range.patch
similarity index 87%
rename from Spigot-Server-Patches/0280-Restore-vanlla-default-mob-spawn-range.patch
rename to Spigot-Server-Patches/0279-Restore-vanlla-default-mob-spawn-range.patch
index d5901e66e..52de3fa5c 100644
--- a/Spigot-Server-Patches/0280-Restore-vanlla-default-mob-spawn-range.patch
+++ b/Spigot-Server-Patches/0279-Restore-vanlla-default-mob-spawn-range.patch
@@ -1,11 +1,11 @@
-From c911b88a291cef7dc60a6d192a00a7931fbf92df Mon Sep 17 00:00:00 2001
+From 471f3825a6d6ea9bf405009a92f3fe8854cd1759 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 18 Aug 2018 12:43:16 -0400
 Subject: [PATCH] Restore vanlla default mob-spawn-range
 
 
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 4965a48c30..58767972a3 100644
+index 3cd66886cd..5e932a5d97 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -165,7 +165,7 @@ public class SpigotWorldConfig
diff --git a/Spigot-Server-Patches/0281-Optimize-CraftBlockData-Creation.patch b/Spigot-Server-Patches/0280-Optimize-CraftBlockData-Creation.patch
similarity index 97%
rename from Spigot-Server-Patches/0281-Optimize-CraftBlockData-Creation.patch
rename to Spigot-Server-Patches/0280-Optimize-CraftBlockData-Creation.patch
index 1aa61f40c..e14c80cd1 100644
--- a/Spigot-Server-Patches/0281-Optimize-CraftBlockData-Creation.patch
+++ b/Spigot-Server-Patches/0280-Optimize-CraftBlockData-Creation.patch
@@ -1,4 +1,4 @@
-From f19d7150bb322b5d488224876504e75d2d552a32 Mon Sep 17 00:00:00 2001
+From 60ad61e55d2f381ce48a5f4d2a44d77877dc1bd3 Mon Sep 17 00:00:00 2001
 From: miclebrick <miclebrick@outlook.com>
 Date: Thu, 23 Aug 2018 11:45:32 -0400
 Subject: [PATCH] Optimize CraftBlockData Creation
diff --git a/Spigot-Server-Patches/0282-Fix-MC-124320.patch b/Spigot-Server-Patches/0281-Fix-MC-124320.patch
similarity index 97%
rename from Spigot-Server-Patches/0282-Fix-MC-124320.patch
rename to Spigot-Server-Patches/0281-Fix-MC-124320.patch
index 4dc9d580a..0d25c0332 100644
--- a/Spigot-Server-Patches/0282-Fix-MC-124320.patch
+++ b/Spigot-Server-Patches/0281-Fix-MC-124320.patch
@@ -1,4 +1,4 @@
-From f8f9db78567e05bcfddf53d78eace9c68e264f06 Mon Sep 17 00:00:00 2001
+From f387340ba8c69c04a286d4ffebab07d10a3ca591 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 23 Aug 2018 09:25:30 -0500
 Subject: [PATCH] Fix MC-124320
diff --git a/Spigot-Server-Patches/0283-Slime-Pathfinder-Events.patch b/Spigot-Server-Patches/0282-Slime-Pathfinder-Events.patch
similarity index 99%
rename from Spigot-Server-Patches/0283-Slime-Pathfinder-Events.patch
rename to Spigot-Server-Patches/0282-Slime-Pathfinder-Events.patch
index fb73644b9..f1fef5d0d 100644
--- a/Spigot-Server-Patches/0283-Slime-Pathfinder-Events.patch
+++ b/Spigot-Server-Patches/0282-Slime-Pathfinder-Events.patch
@@ -1,4 +1,4 @@
-From 028e81f39e8dba06b7545dd3e1ca2f03f418fd1d Mon Sep 17 00:00:00 2001
+From 526dc2b7c2f5b56821bf60d31fc92513924a6498 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 24 Aug 2018 08:18:42 -0500
 Subject: [PATCH] Slime Pathfinder Events
diff --git a/Spigot-Server-Patches/0284-Configurable-speed-for-water-flowing-over-lava.patch b/Spigot-Server-Patches/0283-Configurable-speed-for-water-flowing-over-lava.patch
similarity index 98%
rename from Spigot-Server-Patches/0284-Configurable-speed-for-water-flowing-over-lava.patch
rename to Spigot-Server-Patches/0283-Configurable-speed-for-water-flowing-over-lava.patch
index a31f010a0..cb05d5f50 100644
--- a/Spigot-Server-Patches/0284-Configurable-speed-for-water-flowing-over-lava.patch
+++ b/Spigot-Server-Patches/0283-Configurable-speed-for-water-flowing-over-lava.patch
@@ -1,4 +1,4 @@
-From 48b10e7eb503408b8f63ec9e868350e216aae173 Mon Sep 17 00:00:00 2001
+From 58cfd40eafa75f38b2534a7e0a26b3b3c25ffd18 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 8 Aug 2018 16:33:21 -0600
 Subject: [PATCH] Configurable speed for water flowing over lava
diff --git a/Spigot-Server-Patches/0285-Optimize-RegistryMaterials.patch b/Spigot-Server-Patches/0284-Optimize-RegistryMaterials.patch
similarity index 95%
rename from Spigot-Server-Patches/0285-Optimize-RegistryMaterials.patch
rename to Spigot-Server-Patches/0284-Optimize-RegistryMaterials.patch
index 1af9119c1..fe2a6b4ae 100644
--- a/Spigot-Server-Patches/0285-Optimize-RegistryMaterials.patch
+++ b/Spigot-Server-Patches/0284-Optimize-RegistryMaterials.patch
@@ -1,4 +1,4 @@
-From 8bbb89f0b32b1a529635883cffb52fb70625ee8f Mon Sep 17 00:00:00 2001
+From 722a5fcb53b393d0a7292ca42756ab09fb294be9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 26 Aug 2018 20:49:50 -0400
 Subject: [PATCH] Optimize RegistryMaterials
diff --git a/Spigot-Server-Patches/0286-Add-PhantomPreSpawnEvent.patch b/Spigot-Server-Patches/0285-Add-PhantomPreSpawnEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0286-Add-PhantomPreSpawnEvent.patch
rename to Spigot-Server-Patches/0285-Add-PhantomPreSpawnEvent.patch
index 3dba6c439..fca441d5d 100644
--- a/Spigot-Server-Patches/0286-Add-PhantomPreSpawnEvent.patch
+++ b/Spigot-Server-Patches/0285-Add-PhantomPreSpawnEvent.patch
@@ -1,4 +1,4 @@
-From cb51204c355b37eae0d0820cc85acb9fa7b11467 Mon Sep 17 00:00:00 2001
+From 9c2d55e826a2238f476f6ca0624ef55a7ae5cc4d Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 25 Aug 2018 19:56:51 -0500
 Subject: [PATCH] Add PhantomPreSpawnEvent
diff --git a/Spigot-Server-Patches/0287-Add-More-Creeper-API.patch b/Spigot-Server-Patches/0286-Add-More-Creeper-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0287-Add-More-Creeper-API.patch
rename to Spigot-Server-Patches/0286-Add-More-Creeper-API.patch
index 3470f77fc..8a13fadf8 100644
--- a/Spigot-Server-Patches/0287-Add-More-Creeper-API.patch
+++ b/Spigot-Server-Patches/0286-Add-More-Creeper-API.patch
@@ -1,4 +1,4 @@
-From 48c2bb78cc29f4da95824f400bcdfd333994466b Mon Sep 17 00:00:00 2001
+From 06d8f45f06b194608244981d47063e49d2d34abe Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 24 Aug 2018 11:50:26 -0500
 Subject: [PATCH] Add More Creeper API
diff --git a/Spigot-Server-Patches/0288-Inventory-removeItemAnySlot.patch b/Spigot-Server-Patches/0287-Inventory-removeItemAnySlot.patch
similarity index 97%
rename from Spigot-Server-Patches/0288-Inventory-removeItemAnySlot.patch
rename to Spigot-Server-Patches/0287-Inventory-removeItemAnySlot.patch
index c13511b41..7677accff 100644
--- a/Spigot-Server-Patches/0288-Inventory-removeItemAnySlot.patch
+++ b/Spigot-Server-Patches/0287-Inventory-removeItemAnySlot.patch
@@ -1,4 +1,4 @@
-From c54f91cb3681cd81ef89544504730fa65bb5eb7e Mon Sep 17 00:00:00 2001
+From dfefab1e8a9782e07b19cab09b33353ff0cc7a91 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 28 Aug 2018 23:04:15 -0400
 Subject: [PATCH] Inventory#removeItemAnySlot
diff --git a/Spigot-Server-Patches/0289-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/Spigot-Server-Patches/0288-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
similarity index 94%
rename from Spigot-Server-Patches/0289-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
rename to Spigot-Server-Patches/0288-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
index a845cfc90..aa4a75b02 100644
--- a/Spigot-Server-Patches/0289-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
+++ b/Spigot-Server-Patches/0288-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
@@ -1,4 +1,4 @@
-From 523bdbc83ec8dc203433f72bbd67ce75c186a262 Mon Sep 17 00:00:00 2001
+From b94ad02de37cef49e2e9940d81fc7d23f1f41322 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sun, 2 Sep 2018 19:34:33 -0700
 Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted
diff --git a/Spigot-Server-Patches/0290-Add-ray-tracing-methods-to-LivingEntity.patch b/Spigot-Server-Patches/0289-Add-ray-tracing-methods-to-LivingEntity.patch
similarity index 98%
rename from Spigot-Server-Patches/0290-Add-ray-tracing-methods-to-LivingEntity.patch
rename to Spigot-Server-Patches/0289-Add-ray-tracing-methods-to-LivingEntity.patch
index 5eb0b7800..e117588a2 100644
--- a/Spigot-Server-Patches/0290-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/Spigot-Server-Patches/0289-Add-ray-tracing-methods-to-LivingEntity.patch
@@ -1,4 +1,4 @@
-From e4d0ccbc0c6b7d1738314e6c8404ec56d7f7ddbd Mon Sep 17 00:00:00 2001
+From c64179e5ccdcee7c33334fdd66243bcbf69f7a61 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 3 Sep 2018 18:20:03 -0500
 Subject: [PATCH] Add ray tracing methods to LivingEntity
diff --git a/Spigot-Server-Patches/0291-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-Server-Patches/0290-Expose-attack-cooldown-methods-for-Player.patch
similarity index 96%
rename from Spigot-Server-Patches/0291-Expose-attack-cooldown-methods-for-Player.patch
rename to Spigot-Server-Patches/0290-Expose-attack-cooldown-methods-for-Player.patch
index 58ab5614e..8a5513ea1 100644
--- a/Spigot-Server-Patches/0291-Expose-attack-cooldown-methods-for-Player.patch
+++ b/Spigot-Server-Patches/0290-Expose-attack-cooldown-methods-for-Player.patch
@@ -1,4 +1,4 @@
-From d3f0982c20b5697f277e68580cd3425cd0752636 Mon Sep 17 00:00:00 2001
+From a6a1c9d5fa82bfa5253abd4beb164014cbdfa7d1 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 4 Sep 2018 15:02:00 -0500
 Subject: [PATCH] Expose attack cooldown methods for Player
diff --git a/Spigot-Server-Patches/0292-Improve-death-events.patch b/Spigot-Server-Patches/0291-Improve-death-events.patch
similarity index 99%
rename from Spigot-Server-Patches/0292-Improve-death-events.patch
rename to Spigot-Server-Patches/0291-Improve-death-events.patch
index 3259c7175..b90173ab6 100644
--- a/Spigot-Server-Patches/0292-Improve-death-events.patch
+++ b/Spigot-Server-Patches/0291-Improve-death-events.patch
@@ -1,4 +1,4 @@
-From ca7b8f78b8472dfa962351fd96f0265b5a49746b Mon Sep 17 00:00:00 2001
+From 03d1317242420df40cad6417971e8dfa7791c318 Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Tue, 21 Aug 2018 01:39:35 +0100
 Subject: [PATCH] Improve death events
@@ -27,7 +27,7 @@ index 6daa400d27..38fe29f8a2 100644
          int i = this.f ? 300 : 100;
  
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index f54fc61aa5..fd78f647eb 100644
+index 33cd7f7b40..09c5760571 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1503,6 +1503,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/Spigot-Server-Patches/0293-Allow-chests-to-be-placed-with-NBT-data.patch b/Spigot-Server-Patches/0292-Allow-chests-to-be-placed-with-NBT-data.patch
similarity index 96%
rename from Spigot-Server-Patches/0293-Allow-chests-to-be-placed-with-NBT-data.patch
rename to Spigot-Server-Patches/0292-Allow-chests-to-be-placed-with-NBT-data.patch
index 210e7a8bc..c52c37a8d 100644
--- a/Spigot-Server-Patches/0293-Allow-chests-to-be-placed-with-NBT-data.patch
+++ b/Spigot-Server-Patches/0292-Allow-chests-to-be-placed-with-NBT-data.patch
@@ -1,4 +1,4 @@
-From 04bb3f2b694c437495e3ffec8af2679964f1484f Mon Sep 17 00:00:00 2001
+From 8d04bf71f2799f76748dda29368b353de66a2da0 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 8 Sep 2018 18:43:31 -0500
 Subject: [PATCH] Allow chests to be placed with NBT data
diff --git a/Spigot-Server-Patches/0294-Mob-Pathfinding-API.patch b/Spigot-Server-Patches/0293-Mob-Pathfinding-API.patch
similarity index 99%
rename from Spigot-Server-Patches/0294-Mob-Pathfinding-API.patch
rename to Spigot-Server-Patches/0293-Mob-Pathfinding-API.patch
index 25524dd73..e4bbfc9b8 100644
--- a/Spigot-Server-Patches/0294-Mob-Pathfinding-API.patch
+++ b/Spigot-Server-Patches/0293-Mob-Pathfinding-API.patch
@@ -1,4 +1,4 @@
-From 95b1d64ff38307c80fb25b6f813466ffde17bd68 Mon Sep 17 00:00:00 2001
+From bc7c2e7e49e26c3c2070d414fa8453c50468abff Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 9 Sep 2018 13:30:00 -0400
 Subject: [PATCH] Mob Pathfinding API
diff --git a/Spigot-Server-Patches/0295-Prevent-chunk-loading-from-Fluid-Flowing.patch b/Spigot-Server-Patches/0294-Prevent-chunk-loading-from-Fluid-Flowing.patch
similarity index 98%
rename from Spigot-Server-Patches/0295-Prevent-chunk-loading-from-Fluid-Flowing.patch
rename to Spigot-Server-Patches/0294-Prevent-chunk-loading-from-Fluid-Flowing.patch
index 80d72fef8..c7c1a3204 100644
--- a/Spigot-Server-Patches/0295-Prevent-chunk-loading-from-Fluid-Flowing.patch
+++ b/Spigot-Server-Patches/0294-Prevent-chunk-loading-from-Fluid-Flowing.patch
@@ -1,4 +1,4 @@
-From 9c33f37c35626da82ad4810afee694f7a6512d81 Mon Sep 17 00:00:00 2001
+From 9ce6409bc92570018aff1d20ccf60dc430b76b88 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 10 Sep 2018 23:36:16 -0400
 Subject: [PATCH] Prevent chunk loading from Fluid Flowing
diff --git a/Spigot-Server-Patches/0296-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/Spigot-Server-Patches/0295-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
similarity index 99%
rename from Spigot-Server-Patches/0296-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
rename to Spigot-Server-Patches/0295-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
index 506cc5479..52cb69f8a 100644
--- a/Spigot-Server-Patches/0296-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
+++ b/Spigot-Server-Patches/0295-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
@@ -1,4 +1,4 @@
-From 0c6ead87f10abf0b7bb5e23c1a77a315db6cc7b4 Mon Sep 17 00:00:00 2001
+From 4d15c26db34cd2a7a986333bf5c9c651ad0ad7f5 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Wed, 12 Sep 2018 18:53:55 +0300
 Subject: [PATCH] Implement an API for CanPlaceOn and CanDestroy NBT values
diff --git a/Spigot-Server-Patches/0297-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/Spigot-Server-Patches/0296-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
similarity index 98%
rename from Spigot-Server-Patches/0297-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
rename to Spigot-Server-Patches/0296-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
index ab153963d..dae6057f8 100644
--- a/Spigot-Server-Patches/0297-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
+++ b/Spigot-Server-Patches/0296-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
@@ -1,4 +1,4 @@
-From 9e440f52edf791ae1293f568237a20aae50f998d Mon Sep 17 00:00:00 2001
+From 58c7ca3b9948d2c9baaf262cef5eff7028eacc55 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 10 Sep 2018 23:56:36 -0400
 Subject: [PATCH] Prevent Mob AI Rules from Loading Chunks
diff --git a/Spigot-Server-Patches/0298-Prevent-mob-spawning-from-loading-generating-chunks.patch b/Spigot-Server-Patches/0297-Prevent-mob-spawning-from-loading-generating-chunks.patch
similarity index 97%
rename from Spigot-Server-Patches/0298-Prevent-mob-spawning-from-loading-generating-chunks.patch
rename to Spigot-Server-Patches/0297-Prevent-mob-spawning-from-loading-generating-chunks.patch
index 0ae71e339..fedfec6c8 100644
--- a/Spigot-Server-Patches/0298-Prevent-mob-spawning-from-loading-generating-chunks.patch
+++ b/Spigot-Server-Patches/0297-Prevent-mob-spawning-from-loading-generating-chunks.patch
@@ -1,4 +1,4 @@
-From ff844cab72c6f166b921da1773b942ede16dab47 Mon Sep 17 00:00:00 2001
+From 62a5fbd83eb1ff11054f452ffcaae5ac6765c40e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 12 Sep 2018 21:12:57 -0400
 Subject: [PATCH] Prevent mob spawning from loading/generating chunks
diff --git a/Spigot-Server-Patches/0299-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/Spigot-Server-Patches/0298-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 97%
rename from Spigot-Server-Patches/0299-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to Spigot-Server-Patches/0298-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
index b88b6a845..2288a6cad 100644
--- a/Spigot-Server-Patches/0299-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
+++ b/Spigot-Server-Patches/0298-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
@@ -1,4 +1,4 @@
-From cc3a409afd2873bb3f2d588ff235b7625691cd34 Mon Sep 17 00:00:00 2001
+From 12f2a8dde886fa81a863880a11ae83f1e5c7773e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 12 Sep 2018 21:47:01 -0400
 Subject: [PATCH] Optimize Biome Mob Lookups for Mob Spawning
diff --git a/Spigot-Server-Patches/0300-Implement-furnace-cook-speed-multiplier-API.patch b/Spigot-Server-Patches/0299-Implement-furnace-cook-speed-multiplier-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0300-Implement-furnace-cook-speed-multiplier-API.patch
rename to Spigot-Server-Patches/0299-Implement-furnace-cook-speed-multiplier-API.patch
index 89cd85101..2f3124f38 100644
--- a/Spigot-Server-Patches/0300-Implement-furnace-cook-speed-multiplier-API.patch
+++ b/Spigot-Server-Patches/0299-Implement-furnace-cook-speed-multiplier-API.patch
@@ -1,4 +1,4 @@
-From 88cb06b8d501c297c00efe89140f24caadc3aaed Mon Sep 17 00:00:00 2001
+From bca5d9e6222ebe8e36e70c5ee952bbf8074c200f Mon Sep 17 00:00:00 2001
 From: Tassu <git@tassu.me>
 Date: Thu, 13 Sep 2018 08:45:21 +0300
 Subject: [PATCH] Implement furnace cook speed multiplier API
diff --git a/Spigot-Server-Patches/0301-Support-Overriding-World-Seeds.patch b/Spigot-Server-Patches/0300-Support-Overriding-World-Seeds.patch
similarity index 98%
rename from Spigot-Server-Patches/0301-Support-Overriding-World-Seeds.patch
rename to Spigot-Server-Patches/0300-Support-Overriding-World-Seeds.patch
index 212f3de49..233d7647f 100644
--- a/Spigot-Server-Patches/0301-Support-Overriding-World-Seeds.patch
+++ b/Spigot-Server-Patches/0300-Support-Overriding-World-Seeds.patch
@@ -1,4 +1,4 @@
-From de69a052afbc2390ff58f9b67148837bd757d72f Mon Sep 17 00:00:00 2001
+From 7e93a6e76fe86b6d50d0dcc9a60f12e0da99d8fc Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 17 Sep 2018 23:05:31 -0400
 Subject: [PATCH] Support Overriding World Seeds
diff --git a/Spigot-Server-Patches/0302-Optimize-Server-World-Map.patch b/Spigot-Server-Patches/0301-Optimize-Server-World-Map.patch
similarity index 99%
rename from Spigot-Server-Patches/0302-Optimize-Server-World-Map.patch
rename to Spigot-Server-Patches/0301-Optimize-Server-World-Map.patch
index 2b1f0f5f4..d60ba3dc9 100644
--- a/Spigot-Server-Patches/0302-Optimize-Server-World-Map.patch
+++ b/Spigot-Server-Patches/0301-Optimize-Server-World-Map.patch
@@ -1,4 +1,4 @@
-From 8184e437f219efda2783cf7d358b941c13e90e03 Mon Sep 17 00:00:00 2001
+From a4cf872539ce7580502003219769c1fdad3d2700 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 17 Sep 2018 23:37:31 -0400
 Subject: [PATCH] Optimize Server World Map
diff --git a/Spigot-Server-Patches/0303-PreSpawnerSpawnEvent.patch b/Spigot-Server-Patches/0302-PreSpawnerSpawnEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0303-PreSpawnerSpawnEvent.patch
rename to Spigot-Server-Patches/0302-PreSpawnerSpawnEvent.patch
index cf974a844..c420824e6 100644
--- a/Spigot-Server-Patches/0303-PreSpawnerSpawnEvent.patch
+++ b/Spigot-Server-Patches/0302-PreSpawnerSpawnEvent.patch
@@ -1,4 +1,4 @@
-From 98051a7d9fb79c342e2259e7c535519f52061e29 Mon Sep 17 00:00:00 2001
+From f88d977fa19df0f4beddb9a9cca47ac9f91945cd Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Tue, 18 Sep 2018 23:53:23 +0100
 Subject: [PATCH] PreSpawnerSpawnEvent
diff --git a/Spigot-Server-Patches/0304-Catch-JsonParseException-in-Entity-and-TE-names.patch b/Spigot-Server-Patches/0303-Catch-JsonParseException-in-Entity-and-TE-names.patch
similarity index 97%
rename from Spigot-Server-Patches/0304-Catch-JsonParseException-in-Entity-and-TE-names.patch
rename to Spigot-Server-Patches/0303-Catch-JsonParseException-in-Entity-and-TE-names.patch
index 766c41aef..d2379d0d9 100644
--- a/Spigot-Server-Patches/0304-Catch-JsonParseException-in-Entity-and-TE-names.patch
+++ b/Spigot-Server-Patches/0303-Catch-JsonParseException-in-Entity-and-TE-names.patch
@@ -1,4 +1,4 @@
-From 7e783e91153c239146ee984badea0c033ea615a2 Mon Sep 17 00:00:00 2001
+From 2cd049636d660c5856911661734574438c3c61e2 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 22 Sep 2018 15:56:59 -0400
 Subject: [PATCH] Catch JsonParseException in Entity and TE names
@@ -26,7 +26,7 @@ index 7867122974..ef2a496eda 100644
  
          if (nbttagcompound.hasKeyOfType("TrackOutput", 1)) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index fd78f647eb..1e3e541c8b 100644
+index 09c5760571..d1ab124fe1 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1679,7 +1679,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/Spigot-Server-Patches/0305-Avoid-dimension-id-collisions.patch b/Spigot-Server-Patches/0304-Avoid-dimension-id-collisions.patch
similarity index 94%
rename from Spigot-Server-Patches/0305-Avoid-dimension-id-collisions.patch
rename to Spigot-Server-Patches/0304-Avoid-dimension-id-collisions.patch
index c3389a1d4..798109a0f 100644
--- a/Spigot-Server-Patches/0305-Avoid-dimension-id-collisions.patch
+++ b/Spigot-Server-Patches/0304-Avoid-dimension-id-collisions.patch
@@ -1,4 +1,4 @@
-From ad93ef8902abf87b5cd3b70f55807599c8ffdfed Mon Sep 17 00:00:00 2001
+From fa42338dad126ebf5de33faa164321e0c4262811 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 25 Sep 2018 06:53:43 +0200
 Subject: [PATCH] Avoid dimension id collisions
diff --git a/Spigot-Server-Patches/0306-Honor-EntityAgeable.ageLock.patch b/Spigot-Server-Patches/0305-Honor-EntityAgeable.ageLock.patch
similarity index 91%
rename from Spigot-Server-Patches/0306-Honor-EntityAgeable.ageLock.patch
rename to Spigot-Server-Patches/0305-Honor-EntityAgeable.ageLock.patch
index 26efcb486..50430cb16 100644
--- a/Spigot-Server-Patches/0306-Honor-EntityAgeable.ageLock.patch
+++ b/Spigot-Server-Patches/0305-Honor-EntityAgeable.ageLock.patch
@@ -1,4 +1,4 @@
-From d5a58173728d826ac19eb1150ef13424b1165147 Mon Sep 17 00:00:00 2001
+From 7e39e279493c6f61eb99fd3cd85df24f637e5610 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 23 Sep 2018 20:59:53 -0500
 Subject: [PATCH] Honor EntityAgeable.ageLock
diff --git a/Spigot-Server-Patches/0307-Configurable-connection-throttle-kick-message.patch b/Spigot-Server-Patches/0306-Configurable-connection-throttle-kick-message.patch
similarity index 97%
rename from Spigot-Server-Patches/0307-Configurable-connection-throttle-kick-message.patch
rename to Spigot-Server-Patches/0306-Configurable-connection-throttle-kick-message.patch
index 4aa4c066f..d76a2a399 100644
--- a/Spigot-Server-Patches/0307-Configurable-connection-throttle-kick-message.patch
+++ b/Spigot-Server-Patches/0306-Configurable-connection-throttle-kick-message.patch
@@ -1,4 +1,4 @@
-From e7407ee9e0e00f9709317d36e552a2fe988bfa53 Mon Sep 17 00:00:00 2001
+From baa13d99b6486a715485bc884a8fbb46fb8b4b72 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Tue, 2 Oct 2018 09:57:50 +0100
 Subject: [PATCH] Configurable connection throttle kick message
diff --git a/Spigot-Server-Patches/0308-Hook-into-CB-plugin-rewrites.patch b/Spigot-Server-Patches/0307-Hook-into-CB-plugin-rewrites.patch
similarity index 99%
rename from Spigot-Server-Patches/0308-Hook-into-CB-plugin-rewrites.patch
rename to Spigot-Server-Patches/0307-Hook-into-CB-plugin-rewrites.patch
index 4efcc8106..e17df9149 100644
--- a/Spigot-Server-Patches/0308-Hook-into-CB-plugin-rewrites.patch
+++ b/Spigot-Server-Patches/0307-Hook-into-CB-plugin-rewrites.patch
@@ -1,4 +1,4 @@
-From 5238949ad78e91f119b0e1d78a4951194a67ca96 Mon Sep 17 00:00:00 2001
+From 7135a3b8ff00bb8d89cc92d2042a1e8584bef361 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Wed, 3 Oct 2018 20:09:18 -0400
 Subject: [PATCH] Hook into CB plugin rewrites
diff --git a/Spigot-Server-Patches/0309-Allow-setting-the-vex-s-summoner.patch b/Spigot-Server-Patches/0308-Allow-setting-the-vex-s-summoner.patch
similarity index 95%
rename from Spigot-Server-Patches/0309-Allow-setting-the-vex-s-summoner.patch
rename to Spigot-Server-Patches/0308-Allow-setting-the-vex-s-summoner.patch
index 1ae889754..6741e4433 100644
--- a/Spigot-Server-Patches/0309-Allow-setting-the-vex-s-summoner.patch
+++ b/Spigot-Server-Patches/0308-Allow-setting-the-vex-s-summoner.patch
@@ -1,4 +1,4 @@
-From 55c94c32765cc11e78fac1e0bf531a91e3e81d65 Mon Sep 17 00:00:00 2001
+From 8e566fa097a632ed13c96649953fece395650d19 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 6 Oct 2018 21:47:44 -0500
 Subject: [PATCH] Allow setting the vex's summoner
diff --git a/Spigot-Server-Patches/0310-Add-sun-related-API.patch b/Spigot-Server-Patches/0309-Add-sun-related-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0310-Add-sun-related-API.patch
rename to Spigot-Server-Patches/0309-Add-sun-related-API.patch
index 4ecf79284..b61357d6b 100644
--- a/Spigot-Server-Patches/0310-Add-sun-related-API.patch
+++ b/Spigot-Server-Patches/0309-Add-sun-related-API.patch
@@ -1,4 +1,4 @@
-From 9d32a271041db2a4754d38f9966c678924995b07 Mon Sep 17 00:00:00 2001
+From f61767388b25a94579dfd532dd2ce11b65870c3f Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 Oct 2018 00:54:21 -0500
 Subject: [PATCH] Add sun related API
diff --git a/Spigot-Server-Patches/0311-Check-Drowned-for-Villager-Aggression-Config.patch b/Spigot-Server-Patches/0310-Check-Drowned-for-Villager-Aggression-Config.patch
similarity index 95%
rename from Spigot-Server-Patches/0311-Check-Drowned-for-Villager-Aggression-Config.patch
rename to Spigot-Server-Patches/0310-Check-Drowned-for-Villager-Aggression-Config.patch
index 4d66c671c..53962686e 100644
--- a/Spigot-Server-Patches/0311-Check-Drowned-for-Villager-Aggression-Config.patch
+++ b/Spigot-Server-Patches/0310-Check-Drowned-for-Villager-Aggression-Config.patch
@@ -1,4 +1,4 @@
-From 7bace2287242102008345548aaf3f2a5a09a3d3b Mon Sep 17 00:00:00 2001
+From eab9f638506950fbaf6c57a3abbde9981bcbfdbd Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Wed, 10 Oct 2018 21:22:44 -0500
 Subject: [PATCH] Check Drowned for Villager Aggression Config
diff --git a/Spigot-Server-Patches/0312-Here-s-Johnny.patch b/Spigot-Server-Patches/0311-Here-s-Johnny.patch
similarity index 96%
rename from Spigot-Server-Patches/0312-Here-s-Johnny.patch
rename to Spigot-Server-Patches/0311-Here-s-Johnny.patch
index cd5ed161e..0903eb922 100644
--- a/Spigot-Server-Patches/0312-Here-s-Johnny.patch
+++ b/Spigot-Server-Patches/0311-Here-s-Johnny.patch
@@ -1,4 +1,4 @@
-From 011777340f55c95aba2000abd9a90f8db31e3193 Mon Sep 17 00:00:00 2001
+From 05a987e75e5b75f12edb023cf70737020f1748b1 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 12 Oct 2018 01:37:22 -0500
 Subject: [PATCH] Here's Johnny!
diff --git a/Spigot-Server-Patches/0313-Turtle-API.patch b/Spigot-Server-Patches/0312-Turtle-API.patch
similarity index 99%
rename from Spigot-Server-Patches/0313-Turtle-API.patch
rename to Spigot-Server-Patches/0312-Turtle-API.patch
index a3c0c7865..42dd42fdf 100644
--- a/Spigot-Server-Patches/0313-Turtle-API.patch
+++ b/Spigot-Server-Patches/0312-Turtle-API.patch
@@ -1,4 +1,4 @@
-From 12f979440f824e4a17a24f115ae4d06f024f4c07 Mon Sep 17 00:00:00 2001
+From 98df26a22cd07c9cfb2394c69888a7305456d715 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 29 Sep 2018 16:08:23 -0500
 Subject: [PATCH] Turtle API
diff --git a/Spigot-Server-Patches/0314-Limit-lightning-strike-effect-distance.patch b/Spigot-Server-Patches/0313-Limit-lightning-strike-effect-distance.patch
similarity index 98%
rename from Spigot-Server-Patches/0314-Limit-lightning-strike-effect-distance.patch
rename to Spigot-Server-Patches/0313-Limit-lightning-strike-effect-distance.patch
index 53994ce64..9261167e0 100644
--- a/Spigot-Server-Patches/0314-Limit-lightning-strike-effect-distance.patch
+++ b/Spigot-Server-Patches/0313-Limit-lightning-strike-effect-distance.patch
@@ -1,4 +1,4 @@
-From 79d4abf1d8eda7376c97f073e70b15fc58b8efa4 Mon Sep 17 00:00:00 2001
+From 1c9e14d9d0bbcce702c47f2efc1e186569d91553 Mon Sep 17 00:00:00 2001
 From: Trigary <trigary0@gmail.com>
 Date: Fri, 14 Sep 2018 17:42:08 +0200
 Subject: [PATCH] Limit lightning strike effect distance
diff --git a/Spigot-Server-Patches/0315-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/Spigot-Server-Patches/0314-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
similarity index 96%
rename from Spigot-Server-Patches/0315-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
rename to Spigot-Server-Patches/0314-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
index 726898a4d..ad4ad2267 100644
--- a/Spigot-Server-Patches/0315-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
+++ b/Spigot-Server-Patches/0314-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
@@ -1,4 +1,4 @@
-From 7c1fc4cf725d23c3a31727ab1cce1192153f49b8 Mon Sep 17 00:00:00 2001
+From b202ec7c549246810a3383a5808201ec16d9d7f3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 17 Oct 2018 19:17:27 -0400
 Subject: [PATCH] MC-50319: Check other worlds for shooter of projectiles
diff --git a/Spigot-Server-Patches/0316-Call-player-spectator-target-events.patch b/Spigot-Server-Patches/0315-Call-player-spectator-target-events.patch
similarity index 98%
rename from Spigot-Server-Patches/0316-Call-player-spectator-target-events.patch
rename to Spigot-Server-Patches/0315-Call-player-spectator-target-events.patch
index 432b54e4e..e9e654b63 100644
--- a/Spigot-Server-Patches/0316-Call-player-spectator-target-events.patch
+++ b/Spigot-Server-Patches/0315-Call-player-spectator-target-events.patch
@@ -1,4 +1,4 @@
-From 10c4e065d6969593212d3373bc14bbe315c450ac Mon Sep 17 00:00:00 2001
+From 095ce8a4d451ea69a0a90b675c452d149e5e16bf Mon Sep 17 00:00:00 2001
 From: Caleb Bassham <caleb.bassham@gmail.com>
 Date: Fri, 28 Sep 2018 02:32:19 -0500
 Subject: [PATCH] Call player spectator target events
diff --git a/Spigot-Server-Patches/0317-Add-Velocity-IP-Forwarding-Support.patch b/Spigot-Server-Patches/0316-Add-Velocity-IP-Forwarding-Support.patch
similarity index 99%
rename from Spigot-Server-Patches/0317-Add-Velocity-IP-Forwarding-Support.patch
rename to Spigot-Server-Patches/0316-Add-Velocity-IP-Forwarding-Support.patch
index ae82d8404..77f5998b8 100644
--- a/Spigot-Server-Patches/0317-Add-Velocity-IP-Forwarding-Support.patch
+++ b/Spigot-Server-Patches/0316-Add-Velocity-IP-Forwarding-Support.patch
@@ -1,4 +1,4 @@
-From f2b8e4ff03e18854cf4601dc1e62f4a3e3a1e82a Mon Sep 17 00:00:00 2001
+From 92f5e873a95b17352ff6ae5aa9208ee84bdb9d8a Mon Sep 17 00:00:00 2001
 From: Andrew Steinborn <git@steinborn.me>
 Date: Mon, 8 Oct 2018 14:36:14 -0400
 Subject: [PATCH] Add Velocity IP Forwarding Support
diff --git a/Spigot-Server-Patches/0318-Add-more-Witch-API.patch b/Spigot-Server-Patches/0317-Add-more-Witch-API.patch
similarity index 99%
rename from Spigot-Server-Patches/0318-Add-more-Witch-API.patch
rename to Spigot-Server-Patches/0317-Add-more-Witch-API.patch
index 98c5dfef1..2c81d6b83 100644
--- a/Spigot-Server-Patches/0318-Add-more-Witch-API.patch
+++ b/Spigot-Server-Patches/0317-Add-more-Witch-API.patch
@@ -1,4 +1,4 @@
-From 4acf1c53ac792724a04aeede4de22392461eda41 Mon Sep 17 00:00:00 2001
+From 6aa29962c816baf7a46b97c736bad234ce2ec55d Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 12 Oct 2018 14:10:46 -0500
 Subject: [PATCH] Add more Witch API
diff --git a/Spigot-Server-Patches/0319-Fix-MC-93764.patch b/Spigot-Server-Patches/0318-Fix-MC-93764.patch
similarity index 91%
rename from Spigot-Server-Patches/0319-Fix-MC-93764.patch
rename to Spigot-Server-Patches/0318-Fix-MC-93764.patch
index 2f59ce339..bfcecb07e 100644
--- a/Spigot-Server-Patches/0319-Fix-MC-93764.patch
+++ b/Spigot-Server-Patches/0318-Fix-MC-93764.patch
@@ -1,4 +1,4 @@
-From c1caad4782cc4319c9f8d68485e639b12e653197 Mon Sep 17 00:00:00 2001
+From 47dfcc3fd16277c4472ec1912ea2006f2da19e09 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 19 Oct 2018 19:38:45 -0500
 Subject: [PATCH] Fix MC-93764
diff --git a/Spigot-Server-Patches/0320-Add-option-to-prevent-players-from-moving-into-unloa.patch b/Spigot-Server-Patches/0319-Add-option-to-prevent-players-from-moving-into-unloa.patch
similarity index 98%
rename from Spigot-Server-Patches/0320-Add-option-to-prevent-players-from-moving-into-unloa.patch
rename to Spigot-Server-Patches/0319-Add-option-to-prevent-players-from-moving-into-unloa.patch
index 42e60c6f8..28ed9b346 100644
--- a/Spigot-Server-Patches/0320-Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/Spigot-Server-Patches/0319-Add-option-to-prevent-players-from-moving-into-unloa.patch
@@ -1,4 +1,4 @@
-From d49d31920a9bb9d474e9b3903c537546d055776c Mon Sep 17 00:00:00 2001
+From 53224f0dc8fd78c98a02c57d270a2c2593f767c0 Mon Sep 17 00:00:00 2001
 From: Gabriele C <sgdc3.mail@gmail.com>
 Date: Mon, 22 Oct 2018 17:34:10 +0200
 Subject: [PATCH] Add option to prevent players from moving into unloaded
diff --git a/Spigot-Server-Patches/0321-Reset-players-airTicks-on-respawn.patch b/Spigot-Server-Patches/0320-Reset-players-airTicks-on-respawn.patch
similarity index 92%
rename from Spigot-Server-Patches/0321-Reset-players-airTicks-on-respawn.patch
rename to Spigot-Server-Patches/0320-Reset-players-airTicks-on-respawn.patch
index c3c32c4ef..b6c009103 100644
--- a/Spigot-Server-Patches/0321-Reset-players-airTicks-on-respawn.patch
+++ b/Spigot-Server-Patches/0320-Reset-players-airTicks-on-respawn.patch
@@ -1,11 +1,11 @@
-From 17d9d277e189ac50ebdde96cac36a33d1df9da68 Mon Sep 17 00:00:00 2001
+From e54c8056fb073740526d17f1794828961f8dc842 Mon Sep 17 00:00:00 2001
 From: GreenMeanie <GreenMeanieMC@gmail.com>
 Date: Sat, 20 Oct 2018 22:34:02 -0400
 Subject: [PATCH] Reset players airTicks on respawn
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 1e3e541c8b..641492c7ca 100644
+index d1ab124fe1..3a3e491aff 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2330,6 +2330,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/Spigot-Server-Patches/0322-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/Spigot-Server-Patches/0321-Don-t-sleep-after-profile-lookups-if-not-needed.patch
similarity index 96%
rename from Spigot-Server-Patches/0322-Don-t-sleep-after-profile-lookups-if-not-needed.patch
rename to Spigot-Server-Patches/0321-Don-t-sleep-after-profile-lookups-if-not-needed.patch
index b59b12e5c..f46323e9c 100644
--- a/Spigot-Server-Patches/0322-Don-t-sleep-after-profile-lookups-if-not-needed.patch
+++ b/Spigot-Server-Patches/0321-Don-t-sleep-after-profile-lookups-if-not-needed.patch
@@ -1,4 +1,4 @@
-From 357f80a56ea4cd564371545473218d56cf352568 Mon Sep 17 00:00:00 2001
+From 813471f797a35fb892b11b8089776bc36edce6dc Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 23 Oct 2018 20:25:05 -0400
 Subject: [PATCH] Don't sleep after profile lookups if not needed
diff --git a/Spigot-Server-Patches/0323-Use-more-reasonable-thread-count-default-for-bootstr.patch b/Spigot-Server-Patches/0322-Use-more-reasonable-thread-count-default-for-bootstr.patch
similarity index 92%
rename from Spigot-Server-Patches/0323-Use-more-reasonable-thread-count-default-for-bootstr.patch
rename to Spigot-Server-Patches/0322-Use-more-reasonable-thread-count-default-for-bootstr.patch
index 8fb6d052e..6ebdbb1ec 100644
--- a/Spigot-Server-Patches/0323-Use-more-reasonable-thread-count-default-for-bootstr.patch
+++ b/Spigot-Server-Patches/0322-Use-more-reasonable-thread-count-default-for-bootstr.patch
@@ -1,4 +1,4 @@
-From eb7d83283a255cb73f5d68acfba8135e22f4fd52 Mon Sep 17 00:00:00 2001
+From 41e625fe50d2add3c4e9744d6b5270b1bde3ac3f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 23 Oct 2018 23:14:38 -0400
 Subject: [PATCH] Use more reasonable thread count default for bootstrap
diff --git a/Spigot-Server-Patches/0324-Optimize-World-Time-Updates.patch b/Spigot-Server-Patches/0323-Optimize-World-Time-Updates.patch
similarity index 97%
rename from Spigot-Server-Patches/0324-Optimize-World-Time-Updates.patch
rename to Spigot-Server-Patches/0323-Optimize-World-Time-Updates.patch
index 34ec7d47d..b8e0c469e 100644
--- a/Spigot-Server-Patches/0324-Optimize-World-Time-Updates.patch
+++ b/Spigot-Server-Patches/0323-Optimize-World-Time-Updates.patch
@@ -1,4 +1,4 @@
-From 6d75cea2b9d376c88f37e79e922d107e7574b6b6 Mon Sep 17 00:00:00 2001
+From e9816376a1d29e4ae9a7bc1d1a9f0d40cab43354 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 2 Nov 2018 23:11:51 -0400
 Subject: [PATCH] Optimize World Time Updates
diff --git a/Spigot-Server-Patches/0325-Restore-custom-InventoryHolder-support.patch b/Spigot-Server-Patches/0324-Restore-custom-InventoryHolder-support.patch
similarity index 96%
rename from Spigot-Server-Patches/0325-Restore-custom-InventoryHolder-support.patch
rename to Spigot-Server-Patches/0324-Restore-custom-InventoryHolder-support.patch
index 2241bb035..8b0da674d 100644
--- a/Spigot-Server-Patches/0325-Restore-custom-InventoryHolder-support.patch
+++ b/Spigot-Server-Patches/0324-Restore-custom-InventoryHolder-support.patch
@@ -1,4 +1,4 @@
-From 53393b9aea966f8b9a8fd2b125c21649ef1df8fc Mon Sep 17 00:00:00 2001
+From c0dcec02da12365b74f7f2b0170dd1899fc14bb7 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Mon, 5 Nov 2018 04:23:51 +0000
 Subject: [PATCH] Restore custom InventoryHolder support
diff --git a/Spigot-Server-Patches/0326-Use-Vanilla-Minecart-Speeds.patch b/Spigot-Server-Patches/0325-Use-Vanilla-Minecart-Speeds.patch
similarity index 94%
rename from Spigot-Server-Patches/0326-Use-Vanilla-Minecart-Speeds.patch
rename to Spigot-Server-Patches/0325-Use-Vanilla-Minecart-Speeds.patch
index 635dd4e07..8f2985b4e 100644
--- a/Spigot-Server-Patches/0326-Use-Vanilla-Minecart-Speeds.patch
+++ b/Spigot-Server-Patches/0325-Use-Vanilla-Minecart-Speeds.patch
@@ -1,4 +1,4 @@
-From 2673398c97674531a69317266f27b285d6617c6c Mon Sep 17 00:00:00 2001
+From 332cf801b21dadd3c77412f1d3cc3ca6d6a25d6d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 8 Nov 2018 21:33:09 -0500
 Subject: [PATCH] Use Vanilla Minecart Speeds
diff --git a/Spigot-Server-Patches/0327-Fix-SpongeAbsortEvent-handling.patch b/Spigot-Server-Patches/0326-Fix-SpongeAbsortEvent-handling.patch
similarity index 97%
rename from Spigot-Server-Patches/0327-Fix-SpongeAbsortEvent-handling.patch
rename to Spigot-Server-Patches/0326-Fix-SpongeAbsortEvent-handling.patch
index 7e3d43a8a..7731f550f 100644
--- a/Spigot-Server-Patches/0327-Fix-SpongeAbsortEvent-handling.patch
+++ b/Spigot-Server-Patches/0326-Fix-SpongeAbsortEvent-handling.patch
@@ -1,4 +1,4 @@
-From dd0df9983806142f810d20979d0db8e6a56c2aad Mon Sep 17 00:00:00 2001
+From ac16b004e207f9a86e29ac11ea2392a9fe275be5 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 10 Nov 2018 05:15:21 +0000
 Subject: [PATCH] Fix SpongeAbsortEvent handling
diff --git a/Spigot-Server-Patches/0328-Don-t-allow-digging-into-unloaded-chunks.patch b/Spigot-Server-Patches/0327-Don-t-allow-digging-into-unloaded-chunks.patch
similarity index 94%
rename from Spigot-Server-Patches/0328-Don-t-allow-digging-into-unloaded-chunks.patch
rename to Spigot-Server-Patches/0327-Don-t-allow-digging-into-unloaded-chunks.patch
index 2d33b369e..c26a49cda 100644
--- a/Spigot-Server-Patches/0328-Don-t-allow-digging-into-unloaded-chunks.patch
+++ b/Spigot-Server-Patches/0327-Don-t-allow-digging-into-unloaded-chunks.patch
@@ -1,4 +1,4 @@
-From 731817567aecff1ae213cabc80dd80618d12256d Mon Sep 17 00:00:00 2001
+From 3d0505501e290200e593976d9619ba105ce59ae8 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 11 Nov 2018 21:01:09 +0000
 Subject: [PATCH] Don't allow digging into unloaded chunks
diff --git a/Spigot-Server-Patches/0329-Optimize-redstone-algorithm.patch b/Spigot-Server-Patches/0328-Optimize-redstone-algorithm.patch
similarity index 99%
rename from Spigot-Server-Patches/0329-Optimize-redstone-algorithm.patch
rename to Spigot-Server-Patches/0328-Optimize-redstone-algorithm.patch
index 4e86956c0..4c521a6bd 100644
--- a/Spigot-Server-Patches/0329-Optimize-redstone-algorithm.patch
+++ b/Spigot-Server-Patches/0328-Optimize-redstone-algorithm.patch
@@ -1,4 +1,4 @@
-From b4f055c1105153cdc03fa5f44c502994f252f4d3 Mon Sep 17 00:00:00 2001
+From a8c80c7d1e2066c0a2aed62b8fa0efccc37ef66a Mon Sep 17 00:00:00 2001
 From: theosib <millerti@172.16.221.1>
 Date: Thu, 27 Sep 2018 01:43:35 -0600
 Subject: [PATCH] Optimize redstone algorithm
diff --git a/Spigot-Server-Patches/0330-force-entity-dismount-during-teleportation.patch b/Spigot-Server-Patches/0329-force-entity-dismount-during-teleportation.patch
similarity index 98%
rename from Spigot-Server-Patches/0330-force-entity-dismount-during-teleportation.patch
rename to Spigot-Server-Patches/0329-force-entity-dismount-during-teleportation.patch
index d4cb7a50e..6f0ebd191 100644
--- a/Spigot-Server-Patches/0330-force-entity-dismount-during-teleportation.patch
+++ b/Spigot-Server-Patches/0329-force-entity-dismount-during-teleportation.patch
@@ -1,4 +1,4 @@
-From df5ca0d0a5055f49eed16e679cd9632f70ceff81 Mon Sep 17 00:00:00 2001
+From ed8345957ab34aedb3eb62c8cf3d9dc962f0cd9e Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Thu, 15 Nov 2018 13:38:37 +0000
 Subject: [PATCH] force entity dismount during teleportation
@@ -20,7 +20,7 @@ this is going to be the best soultion all around.
 Improvements/suggestions welcome!
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 641492c7ca..ffeee60a86 100644
+index 3a3e491aff..725fa9501a 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2031,12 +2031,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/Spigot-Server-Patches/0331-Book-Size-Limits.patch b/Spigot-Server-Patches/0330-Book-Size-Limits.patch
similarity index 98%
rename from Spigot-Server-Patches/0331-Book-Size-Limits.patch
rename to Spigot-Server-Patches/0330-Book-Size-Limits.patch
index 6603d56d6..35371bf7e 100644
--- a/Spigot-Server-Patches/0331-Book-Size-Limits.patch
+++ b/Spigot-Server-Patches/0330-Book-Size-Limits.patch
@@ -1,4 +1,4 @@
-From 3277fdb918a44aed04cc28d36e3c4f2139f4d2aa Mon Sep 17 00:00:00 2001
+From db659b4e9b70634837cf09d17cb6e055b7ad668a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 16 Nov 2018 23:08:50 -0500
 Subject: [PATCH] Book Size Limits
diff --git a/Spigot-Server-Patches/0332-Make-the-default-permission-message-configurable.patch b/Spigot-Server-Patches/0331-Make-the-default-permission-message-configurable.patch
similarity index 97%
rename from Spigot-Server-Patches/0332-Make-the-default-permission-message-configurable.patch
rename to Spigot-Server-Patches/0331-Make-the-default-permission-message-configurable.patch
index de0e33198..b0db1aa28 100644
--- a/Spigot-Server-Patches/0332-Make-the-default-permission-message-configurable.patch
+++ b/Spigot-Server-Patches/0331-Make-the-default-permission-message-configurable.patch
@@ -1,4 +1,4 @@
-From c6ecec6f74ecb1b38a98c0b32ea741630dd2017a Mon Sep 17 00:00:00 2001
+From da76f31bf800fea5577d30739e3f68517a74ec91 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 18 Nov 2018 19:49:56 +0000
 Subject: [PATCH] Make the default permission message configurable
diff --git a/Spigot-Server-Patches/0333-Add-more-Zombie-API.patch b/Spigot-Server-Patches/0332-Add-more-Zombie-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0333-Add-more-Zombie-API.patch
rename to Spigot-Server-Patches/0332-Add-more-Zombie-API.patch
index c6f989740..9d33875e4 100644
--- a/Spigot-Server-Patches/0333-Add-more-Zombie-API.patch
+++ b/Spigot-Server-Patches/0332-Add-more-Zombie-API.patch
@@ -1,4 +1,4 @@
-From 403c3e442ffe65b277e9e3030749dcbdd59664a9 Mon Sep 17 00:00:00 2001
+From 175e7af024d3ae22be48e4d67c4b237f087e9306 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 Oct 2018 04:29:59 -0500
 Subject: [PATCH] Add more Zombie API
diff --git a/Spigot-Server-Patches/0334-Prevent-rayTrace-from-loading-chunks.patch b/Spigot-Server-Patches/0333-Prevent-rayTrace-from-loading-chunks.patch
similarity index 95%
rename from Spigot-Server-Patches/0334-Prevent-rayTrace-from-loading-chunks.patch
rename to Spigot-Server-Patches/0333-Prevent-rayTrace-from-loading-chunks.patch
index 0e7fb50ce..563a4509e 100644
--- a/Spigot-Server-Patches/0334-Prevent-rayTrace-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0333-Prevent-rayTrace-from-loading-chunks.patch
@@ -1,4 +1,4 @@
-From 0b18f2ae0645cbe0db754c2d68e86cac35d6c836 Mon Sep 17 00:00:00 2001
+From 5985527f4345b183208d5a6f326a4336eb810416 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 26 Nov 2018 19:21:58 -0500
 Subject: [PATCH] Prevent rayTrace from loading chunks
diff --git a/Spigot-Server-Patches/0335-Handle-Large-Packets-disconnecting-client.patch b/Spigot-Server-Patches/0334-Handle-Large-Packets-disconnecting-client.patch
similarity index 98%
rename from Spigot-Server-Patches/0335-Handle-Large-Packets-disconnecting-client.patch
rename to Spigot-Server-Patches/0334-Handle-Large-Packets-disconnecting-client.patch
index b289c22b3..35d041abd 100644
--- a/Spigot-Server-Patches/0335-Handle-Large-Packets-disconnecting-client.patch
+++ b/Spigot-Server-Patches/0334-Handle-Large-Packets-disconnecting-client.patch
@@ -1,4 +1,4 @@
-From 6c662634eb0563619c0725e6915126ad8811a468 Mon Sep 17 00:00:00 2001
+From 38c5ca35ef0e93061e3572da435d968100aead5c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 27 Nov 2018 21:18:06 -0500
 Subject: [PATCH] Handle Large Packets disconnecting client
diff --git a/Spigot-Server-Patches/0336-Lazy-init-world-storage-in-CraftOfflinePlayer.patch b/Spigot-Server-Patches/0335-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
similarity index 97%
rename from Spigot-Server-Patches/0336-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
rename to Spigot-Server-Patches/0335-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
index 5cda3991b..86b667b2a 100644
--- a/Spigot-Server-Patches/0336-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
+++ b/Spigot-Server-Patches/0335-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
@@ -1,4 +1,4 @@
-From 484723eb66e15561e7b4ff672d91d24758e48aea Mon Sep 17 00:00:00 2001
+From a64eb1d41d7d75ceeceadb4dfe0307e231b60e50 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Tue, 11 Dec 2018 22:25:07 -0500
 Subject: [PATCH] Lazy init world storage in CraftOfflinePlayer
diff --git a/Spigot-Server-Patches/0337-Add-PlayerConnectionCloseEvent.patch b/Spigot-Server-Patches/0336-Add-PlayerConnectionCloseEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0337-Add-PlayerConnectionCloseEvent.patch
rename to Spigot-Server-Patches/0336-Add-PlayerConnectionCloseEvent.patch
index 0f2c20bbb..7bfa17111 100644
--- a/Spigot-Server-Patches/0337-Add-PlayerConnectionCloseEvent.patch
+++ b/Spigot-Server-Patches/0336-Add-PlayerConnectionCloseEvent.patch
@@ -1,4 +1,4 @@
-From 817b29c60b194d49647cc3c94974d940c28d0e1b Mon Sep 17 00:00:00 2001
+From 39cd996cf4bcdece253f77243ecf6638af78ff74 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sun, 7 Oct 2018 12:05:28 -0700
 Subject: [PATCH] Add PlayerConnectionCloseEvent
diff --git a/Spigot-Server-Patches/0338-Prevent-Enderman-from-loading-chunks.patch b/Spigot-Server-Patches/0337-Prevent-Enderman-from-loading-chunks.patch
similarity index 97%
rename from Spigot-Server-Patches/0338-Prevent-Enderman-from-loading-chunks.patch
rename to Spigot-Server-Patches/0337-Prevent-Enderman-from-loading-chunks.patch
index d42ff7932..14b2e60f9 100644
--- a/Spigot-Server-Patches/0338-Prevent-Enderman-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0337-Prevent-Enderman-from-loading-chunks.patch
@@ -1,4 +1,4 @@
-From 310587904068d7184d634eab7f33c6e978542953 Mon Sep 17 00:00:00 2001
+From 38489df9a2a4dd7caedc7b5385749d1e7fb78703 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Tue, 18 Dec 2018 02:15:08 +0000
 Subject: [PATCH] Prevent Enderman from loading chunks
diff --git a/Spigot-Server-Patches/0339-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/Spigot-Server-Patches/0338-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
similarity index 99%
rename from Spigot-Server-Patches/0339-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
rename to Spigot-Server-Patches/0338-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index 3571f0767..d315eab1f 100644
--- a/Spigot-Server-Patches/0339-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/Spigot-Server-Patches/0338-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
@@ -1,4 +1,4 @@
-From c928eba40d86d3ade8444532b94e47808fe56775 Mon Sep 17 00:00:00 2001
+From af96603b4d31b17edc58d90400da2df981b4932c Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Wed, 2 Jan 2019 00:35:43 -0600
 Subject: [PATCH] Add APIs to replace OfflinePlayer#getLastPlayed
diff --git a/Spigot-Server-Patches/0340-Fix-PlayerEditBookEvent.patch b/Spigot-Server-Patches/0339-Fix-PlayerEditBookEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0340-Fix-PlayerEditBookEvent.patch
rename to Spigot-Server-Patches/0339-Fix-PlayerEditBookEvent.patch
index 17b9c9d5b..f1e1fcc86 100644
--- a/Spigot-Server-Patches/0340-Fix-PlayerEditBookEvent.patch
+++ b/Spigot-Server-Patches/0339-Fix-PlayerEditBookEvent.patch
@@ -1,4 +1,4 @@
-From e4ed1181f339cd1c902b1f47268f8d5d3d68b191 Mon Sep 17 00:00:00 2001
+From cb895d9ef28baa9eca87bf0ab6c4ffc5d49eff14 Mon Sep 17 00:00:00 2001
 From: Michael Himing <mhiming@gmail.com>
 Date: Sun, 16 Dec 2018 13:07:33 +1100
 Subject: [PATCH] Fix PlayerEditBookEvent
diff --git a/Spigot-Server-Patches/0341-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/Spigot-Server-Patches/0340-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
similarity index 93%
rename from Spigot-Server-Patches/0341-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
rename to Spigot-Server-Patches/0340-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
index b5f924473..cbaadc6be 100644
--- a/Spigot-Server-Patches/0341-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
+++ b/Spigot-Server-Patches/0340-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
@@ -1,4 +1,4 @@
-From 78db660f3d889b2346cf6167b5b5fc544f061ebc Mon Sep 17 00:00:00 2001
+From fac0d7bfd9a2c93b2a61baa37d7cee02aec014e7 Mon Sep 17 00:00:00 2001
 From: connorhartley <vectrixu+gh@gmail.com>
 Date: Mon, 7 Jan 2019 14:43:48 -0600
 Subject: [PATCH] Workaround for vehicle tracking issue on disconnect
diff --git a/Spigot-Server-Patches/0342-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch b/Spigot-Server-Patches/0341-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
similarity index 97%
rename from Spigot-Server-Patches/0342-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
rename to Spigot-Server-Patches/0341-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
index 9af25b26a..21faa7e2c 100644
--- a/Spigot-Server-Patches/0342-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
+++ b/Spigot-Server-Patches/0341-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
@@ -1,4 +1,4 @@
-From d578f08ab7c144a50ac7a067718d0a49e9657fc1 Mon Sep 17 00:00:00 2001
+From ebc1eb3de305cf0b98f73393720644ea03401224 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Thu, 31 Jan 2019 16:33:36 -0500
 Subject: [PATCH] Fire BlockPistonRetractEvent for all empty pistons
diff --git a/Spigot-Server-Patches/0343-Block-Entity-remove-from-being-called-on-Players.patch b/Spigot-Server-Patches/0342-Block-Entity-remove-from-being-called-on-Players.patch
similarity index 95%
rename from Spigot-Server-Patches/0343-Block-Entity-remove-from-being-called-on-Players.patch
rename to Spigot-Server-Patches/0342-Block-Entity-remove-from-being-called-on-Players.patch
index 66f635160..7926f1c72 100644
--- a/Spigot-Server-Patches/0343-Block-Entity-remove-from-being-called-on-Players.patch
+++ b/Spigot-Server-Patches/0342-Block-Entity-remove-from-being-called-on-Players.patch
@@ -1,4 +1,4 @@
-From 27539df92037f2eecee6e1d40e45bace83eb5c6c Mon Sep 17 00:00:00 2001
+From c2ac22ee75bd70d2152f658ddca26413cc42205d Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Mon, 4 Feb 2019 23:33:24 -0500
 Subject: [PATCH] Block Entity#remove from being called on Players
diff --git a/Spigot-Server-Patches/0344-BlockDestroyEvent.patch b/Spigot-Server-Patches/0343-BlockDestroyEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0344-BlockDestroyEvent.patch
rename to Spigot-Server-Patches/0343-BlockDestroyEvent.patch
index 2a2ecc8f6..07277dd94 100644
--- a/Spigot-Server-Patches/0344-BlockDestroyEvent.patch
+++ b/Spigot-Server-Patches/0343-BlockDestroyEvent.patch
@@ -1,4 +1,4 @@
-From b96a59506a52801bea29becdcc56226ec18af104 Mon Sep 17 00:00:00 2001
+From 930523925b6c5f64a063b4eb2df1370df5e8d88d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 6 Feb 2019 00:20:33 -0500
 Subject: [PATCH] BlockDestroyEvent
diff --git a/Spigot-Server-Patches/0345-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/Spigot-Server-Patches/0344-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
similarity index 97%
rename from Spigot-Server-Patches/0345-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
rename to Spigot-Server-Patches/0344-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
index b56befc16..896a6728b 100644
--- a/Spigot-Server-Patches/0345-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
+++ b/Spigot-Server-Patches/0344-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
@@ -1,4 +1,4 @@
-From ee7d60b9b3c1f68c95c61c3822229dc61b9f2919 Mon Sep 17 00:00:00 2001
+From 79da921ef85c44ed1bc70889ac955d542f0fb452 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Jan 2019 00:08:15 -0500
 Subject: [PATCH] Fix Custom Shapeless Custom Crafting Recipes
diff --git a/Spigot-Server-Patches/0346-Fix-sign-edit-memory-leak.patch b/Spigot-Server-Patches/0345-Fix-sign-edit-memory-leak.patch
similarity index 97%
rename from Spigot-Server-Patches/0346-Fix-sign-edit-memory-leak.patch
rename to Spigot-Server-Patches/0345-Fix-sign-edit-memory-leak.patch
index c6daa1aea..ba39df2c7 100644
--- a/Spigot-Server-Patches/0346-Fix-sign-edit-memory-leak.patch
+++ b/Spigot-Server-Patches/0345-Fix-sign-edit-memory-leak.patch
@@ -1,4 +1,4 @@
-From e6fe80f05b58ef14d0b08b642a78738f02396df0 Mon Sep 17 00:00:00 2001
+From 38b2e675fc3e77dacdf24eb33857598447942b39 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 28 Feb 2019 00:15:28 -0500
 Subject: [PATCH] Fix sign edit memory leak
diff --git a/Spigot-Server-Patches/0347-Limit-Client-Sign-length-more.patch b/Spigot-Server-Patches/0346-Limit-Client-Sign-length-more.patch
similarity index 97%
rename from Spigot-Server-Patches/0347-Limit-Client-Sign-length-more.patch
rename to Spigot-Server-Patches/0346-Limit-Client-Sign-length-more.patch
index 90f33bde3..c3118c832 100644
--- a/Spigot-Server-Patches/0347-Limit-Client-Sign-length-more.patch
+++ b/Spigot-Server-Patches/0346-Limit-Client-Sign-length-more.patch
@@ -1,4 +1,4 @@
-From 2a139e9bff6e0fade16b208fb980f5d81baf59b9 Mon Sep 17 00:00:00 2001
+From 96d0de5d2d8d82e89bfdb3af9ed885034516c34c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 27 Feb 2019 22:18:40 -0500
 Subject: [PATCH] Limit Client Sign length more
diff --git a/Spigot-Server-Patches/0348-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/Spigot-Server-Patches/0347-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
similarity index 95%
rename from Spigot-Server-Patches/0348-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
rename to Spigot-Server-Patches/0347-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
index 5e9c0e598..88efe9b8e 100644
--- a/Spigot-Server-Patches/0348-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
+++ b/Spigot-Server-Patches/0347-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
@@ -1,4 +1,4 @@
-From 637aecc80350e9ff1caaf82c66031b83347eb13b Mon Sep 17 00:00:00 2001
+From 5d8bd0865903c86671778b54e097386e96e13210 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 2 Mar 2019 11:11:29 -0500
 Subject: [PATCH] Don't check ConvertSigns boolean every sign save
diff --git a/Spigot-Server-Patches/0349-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch b/Spigot-Server-Patches/0348-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
similarity index 98%
rename from Spigot-Server-Patches/0349-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
rename to Spigot-Server-Patches/0348-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
index f63ad3121..c925ece51 100644
--- a/Spigot-Server-Patches/0349-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
+++ b/Spigot-Server-Patches/0348-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
@@ -1,4 +1,4 @@
-From 9e4aa7107314e194495592ea74715008dd3b7fb4 Mon Sep 17 00:00:00 2001
+From 2a1d90013689f1f5bed00af8adc6806b3b1a4db8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 2 Mar 2019 14:55:01 -0500
 Subject: [PATCH] Handle Excessive Signs in Chunks creating too large of
diff --git a/Spigot-Server-Patches/0350-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch b/Spigot-Server-Patches/0349-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
similarity index 96%
rename from Spigot-Server-Patches/0350-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
rename to Spigot-Server-Patches/0349-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
index 5e9874bbc..2e840a339 100644
--- a/Spigot-Server-Patches/0350-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
+++ b/Spigot-Server-Patches/0349-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
@@ -1,4 +1,4 @@
-From 4158af0b55c5eb77140471ab1226affbceab7e34 Mon Sep 17 00:00:00 2001
+From 77559ec5ca428a33d370386d46d80248c0513047 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 2 Mar 2019 16:12:35 -0500
 Subject: [PATCH] MC-145260: Fix Whitelist On/Off inconsistency
@@ -23,7 +23,7 @@ index 8570e38f42..c97be42dd7 100644
          this.e = flag;
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 659ce21818..62d8075971 100644
+index 4d6ac8f85c..89d34716fe 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -62,7 +62,7 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0351-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/Spigot-Server-Patches/0350-Set-Zombie-last-tick-at-start-of-drowning-process.patch
similarity index 93%
rename from Spigot-Server-Patches/0351-Set-Zombie-last-tick-at-start-of-drowning-process.patch
rename to Spigot-Server-Patches/0350-Set-Zombie-last-tick-at-start-of-drowning-process.patch
index 6fb1b9b00..a576985b9 100644
--- a/Spigot-Server-Patches/0351-Set-Zombie-last-tick-at-start-of-drowning-process.patch
+++ b/Spigot-Server-Patches/0350-Set-Zombie-last-tick-at-start-of-drowning-process.patch
@@ -1,4 +1,4 @@
-From acb56c4cf6eb06a4145906fea74407247e7b4843 Mon Sep 17 00:00:00 2001
+From d33081d4c7e3db6105cc7ded22015021b6bb8e3c Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Mon, 4 Mar 2019 02:23:28 -0500
 Subject: [PATCH] Set Zombie last tick at start of drowning process
diff --git a/Spigot-Server-Patches/0352-Allow-Saving-of-Oversized-Chunks.patch b/Spigot-Server-Patches/0351-Allow-Saving-of-Oversized-Chunks.patch
similarity index 99%
rename from Spigot-Server-Patches/0352-Allow-Saving-of-Oversized-Chunks.patch
rename to Spigot-Server-Patches/0351-Allow-Saving-of-Oversized-Chunks.patch
index 32265dd7d..8b62c0471 100644
--- a/Spigot-Server-Patches/0352-Allow-Saving-of-Oversized-Chunks.patch
+++ b/Spigot-Server-Patches/0351-Allow-Saving-of-Oversized-Chunks.patch
@@ -1,4 +1,4 @@
-From 8459076d6ce5365b5b1b2223954b63cd345d8458 Mon Sep 17 00:00:00 2001
+From 4da595d4d95ebd293ece231aab793da63c791c42 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 15 Feb 2019 01:08:19 -0500
 Subject: [PATCH] Allow Saving of Oversized Chunks
diff --git a/Spigot-Server-Patches/0353-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/Spigot-Server-Patches/0352-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
similarity index 87%
rename from Spigot-Server-Patches/0353-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
rename to Spigot-Server-Patches/0352-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
index 85bb8492b..c50be27ac 100644
--- a/Spigot-Server-Patches/0353-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
+++ b/Spigot-Server-Patches/0352-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
@@ -1,11 +1,11 @@
-From 0c2fa6c8784074f1661af8293202ede417687567 Mon Sep 17 00:00:00 2001
+From 2faf410dd3c2a1b07dad08bffb642784b10df72b Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Wed, 13 Mar 2019 20:08:09 +0200
 Subject: [PATCH] Call WhitelistToggleEvent when whitelist is toggled
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 62d8075971..9d715d891d 100644
+index 89d34716fe..4b3083499b 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1035,6 +1035,7 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0354-Add-LivingEntity-getTargetEntity.patch b/Spigot-Server-Patches/0353-Add-LivingEntity-getTargetEntity.patch
similarity index 98%
rename from Spigot-Server-Patches/0354-Add-LivingEntity-getTargetEntity.patch
rename to Spigot-Server-Patches/0353-Add-LivingEntity-getTargetEntity.patch
index 95025ea69..73426216c 100644
--- a/Spigot-Server-Patches/0354-Add-LivingEntity-getTargetEntity.patch
+++ b/Spigot-Server-Patches/0353-Add-LivingEntity-getTargetEntity.patch
@@ -1,4 +1,4 @@
-From 42a1a2cfcf34d8a784356b24b3bee76f62a82b8b Mon Sep 17 00:00:00 2001
+From 6cea97953487471b8053d2becf0061ed3ef30b34 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 22 Sep 2018 00:33:08 -0500
 Subject: [PATCH] Add LivingEntity#getTargetEntity
@@ -46,7 +46,7 @@ index 4f60b931a1..c950139c0f 100644
          double[] adouble = new double[]{1.0D};
          double d0 = vec3d1.x - vec3d.x;
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index ffeee60a86..69bc9dae0d 100644
+index 725fa9501a..427d66ed01 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1475,6 +1475,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/Spigot-Server-Patches/0355-Use-proper-max-length-when-serialising-BungeeCord-te.patch b/Spigot-Server-Patches/0354-Use-proper-max-length-when-serialising-BungeeCord-te.patch
similarity index 96%
rename from Spigot-Server-Patches/0355-Use-proper-max-length-when-serialising-BungeeCord-te.patch
rename to Spigot-Server-Patches/0354-Use-proper-max-length-when-serialising-BungeeCord-te.patch
index 05e996c89..b856c131d 100644
--- a/Spigot-Server-Patches/0355-Use-proper-max-length-when-serialising-BungeeCord-te.patch
+++ b/Spigot-Server-Patches/0354-Use-proper-max-length-when-serialising-BungeeCord-te.patch
@@ -1,4 +1,4 @@
-From 79a52da2e13be31fd550ffd6b4a585acda7111e7 Mon Sep 17 00:00:00 2001
+From 08b268c6de6abaff45d1253df1932a1894679bd4 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 20 Mar 2019 21:19:29 -0700
 Subject: [PATCH] Use proper max length when serialising BungeeCord text
diff --git a/Spigot-Server-Patches/0356-Entity-getEntitySpawnReason.patch b/Spigot-Server-Patches/0355-Entity-getEntitySpawnReason.patch
similarity index 97%
rename from Spigot-Server-Patches/0356-Entity-getEntitySpawnReason.patch
rename to Spigot-Server-Patches/0355-Entity-getEntitySpawnReason.patch
index fba1564e6..05dfe9404 100644
--- a/Spigot-Server-Patches/0356-Entity-getEntitySpawnReason.patch
+++ b/Spigot-Server-Patches/0355-Entity-getEntitySpawnReason.patch
@@ -1,4 +1,4 @@
-From 1a338ddfa521b1e56ca2a8b6aad3297d38df88bf Mon Sep 17 00:00:00 2001
+From 585d008042ae90e61944244bb3715fa4e8272f44 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 24 Mar 2019 00:24:52 -0400
 Subject: [PATCH] Entity#getEntitySpawnReason
@@ -10,7 +10,7 @@ persistenting Living Entity, SPAWNER for spawners,
 or DEFAULT since data was not stored.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 69bc9dae0d..1a20f105b5 100644
+index 427d66ed01..bb1fd6e46c 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -72,6 +72,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -59,7 +59,7 @@ index 69bc9dae0d..1a20f105b5 100644
  
          } catch (Throwable throwable) {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 9d715d891d..49437f2124 100644
+index 4b3083499b..d726cefe1a 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -251,7 +251,7 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0357-Update-entity-Metadata-for-all-tracked-players.patch b/Spigot-Server-Patches/0356-Update-entity-Metadata-for-all-tracked-players.patch
similarity index 96%
rename from Spigot-Server-Patches/0357-Update-entity-Metadata-for-all-tracked-players.patch
rename to Spigot-Server-Patches/0356-Update-entity-Metadata-for-all-tracked-players.patch
index aa3ddad50..e0f171fe4 100644
--- a/Spigot-Server-Patches/0357-Update-entity-Metadata-for-all-tracked-players.patch
+++ b/Spigot-Server-Patches/0356-Update-entity-Metadata-for-all-tracked-players.patch
@@ -1,4 +1,4 @@
-From fb02d10f272867f3e97c90e44c560a96ebdba057 Mon Sep 17 00:00:00 2001
+From 11b9ee1047c2291b8e8f991ae05c1bacd92d9a63 Mon Sep 17 00:00:00 2001
 From: AgentTroll <woodyc40@gmail.com>
 Date: Fri, 22 Mar 2019 22:24:03 -0700
 Subject: [PATCH] Update entity Metadata for all tracked players
diff --git a/Spigot-Server-Patches/0358-Fire-event-on-GS4-query.patch b/Spigot-Server-Patches/0357-Fire-event-on-GS4-query.patch
similarity index 99%
rename from Spigot-Server-Patches/0358-Fire-event-on-GS4-query.patch
rename to Spigot-Server-Patches/0357-Fire-event-on-GS4-query.patch
index a403f192c..6a51ffd85 100644
--- a/Spigot-Server-Patches/0358-Fire-event-on-GS4-query.patch
+++ b/Spigot-Server-Patches/0357-Fire-event-on-GS4-query.patch
@@ -1,4 +1,4 @@
-From 0d8d79a4c81abb054f62614331c21d3d3ca2b54a Mon Sep 17 00:00:00 2001
+From 3f0676ca98dc3ff25441c09cabd17cbc1855313c Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Sun, 17 Mar 2019 21:46:56 +0200
 Subject: [PATCH] Fire event on GS4 query
diff --git a/Spigot-Server-Patches/0359-Implement-PlayerPostRespawnEvent.patch b/Spigot-Server-Patches/0358-Implement-PlayerPostRespawnEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0359-Implement-PlayerPostRespawnEvent.patch
rename to Spigot-Server-Patches/0358-Implement-PlayerPostRespawnEvent.patch
index 765cf95e6..d8bb2ba80 100644
--- a/Spigot-Server-Patches/0359-Implement-PlayerPostRespawnEvent.patch
+++ b/Spigot-Server-Patches/0358-Implement-PlayerPostRespawnEvent.patch
@@ -1,11 +1,11 @@
-From 202ebb42cea4c461c61a68e1d10449257092f24b Mon Sep 17 00:00:00 2001
+From 16943450aa9676846eb8d7ce6d609583e9e320fc Mon Sep 17 00:00:00 2001
 From: MisterVector <whizkid3000@hotmail.com>
 Date: Fri, 26 Oct 2018 21:31:00 -0700
 Subject: [PATCH] Implement PlayerPostRespawnEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 49437f2124..68e089a4b6 100644
+index d726cefe1a..752d45e5bd 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -638,9 +638,14 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0360-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/Spigot-Server-Patches/0359-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
similarity index 95%
rename from Spigot-Server-Patches/0360-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
rename to Spigot-Server-Patches/0359-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
index 036b4b1cb..2641e4c99 100644
--- a/Spigot-Server-Patches/0360-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
+++ b/Spigot-Server-Patches/0359-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
@@ -1,4 +1,4 @@
-From 52fffe0243ede3145bcdf5a5b12ca21504cc98fe Mon Sep 17 00:00:00 2001
+From 69e0e85fd31309f4c7ade11a217a4def957b78af Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 24 Mar 2019 18:09:20 -0400
 Subject: [PATCH] don't go below 0 for pickupDelay, breaks picking up items
diff --git a/Spigot-Server-Patches/0361-Implement-getters-and-setters-for-EntityItem-owner-a.patch b/Spigot-Server-Patches/0360-Implement-getters-and-setters-for-EntityItem-owner-a.patch
similarity index 95%
rename from Spigot-Server-Patches/0361-Implement-getters-and-setters-for-EntityItem-owner-a.patch
rename to Spigot-Server-Patches/0360-Implement-getters-and-setters-for-EntityItem-owner-a.patch
index 51df6490d..8b3cd5152 100644
--- a/Spigot-Server-Patches/0361-Implement-getters-and-setters-for-EntityItem-owner-a.patch
+++ b/Spigot-Server-Patches/0360-Implement-getters-and-setters-for-EntityItem-owner-a.patch
@@ -1,4 +1,4 @@
-From 76d722bc00e385c91b6eafbef22e327d0164ceac Mon Sep 17 00:00:00 2001
+From 9c2b27fc37317aaf12277c08ca07644b995b8dee Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 6 Oct 2018 20:54:23 -0500
 Subject: [PATCH] Implement getters and setters for EntityItem owner and
diff --git a/Spigot-Server-Patches/0362-Server-Tick-Events.patch b/Spigot-Server-Patches/0361-Server-Tick-Events.patch
similarity index 95%
rename from Spigot-Server-Patches/0362-Server-Tick-Events.patch
rename to Spigot-Server-Patches/0361-Server-Tick-Events.patch
index 478c53df0..5a3e1d1ea 100644
--- a/Spigot-Server-Patches/0362-Server-Tick-Events.patch
+++ b/Spigot-Server-Patches/0361-Server-Tick-Events.patch
@@ -1,4 +1,4 @@
-From de744a76882cd1dcede8acef0c51adaf42d9f839 Mon Sep 17 00:00:00 2001
+From d5722f66c199ff95a1b76847328dd2934273e73e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 27 Mar 2019 22:48:45 -0400
 Subject: [PATCH] Server Tick Events
diff --git a/Spigot-Server-Patches/0363-PlayerDeathEvent-getItemsToKeep.patch b/Spigot-Server-Patches/0362-PlayerDeathEvent-getItemsToKeep.patch
similarity index 97%
rename from Spigot-Server-Patches/0363-PlayerDeathEvent-getItemsToKeep.patch
rename to Spigot-Server-Patches/0362-PlayerDeathEvent-getItemsToKeep.patch
index e29a11c1b..00ed48f99 100644
--- a/Spigot-Server-Patches/0363-PlayerDeathEvent-getItemsToKeep.patch
+++ b/Spigot-Server-Patches/0362-PlayerDeathEvent-getItemsToKeep.patch
@@ -1,4 +1,4 @@
-From 0963bc06c2375acce010e07318a5d9b8484f6907 Mon Sep 17 00:00:00 2001
+From cfa54b0815b077321661dcbaf49d41c2e16eb497 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 27 Mar 2019 23:01:33 -0400
 Subject: [PATCH] PlayerDeathEvent#getItemsToKeep
diff --git a/Spigot-Server-Patches/0364-Optimize-Captured-TileEntity-Lookup.patch b/Spigot-Server-Patches/0363-Optimize-Captured-TileEntity-Lookup.patch
similarity index 95%
rename from Spigot-Server-Patches/0364-Optimize-Captured-TileEntity-Lookup.patch
rename to Spigot-Server-Patches/0363-Optimize-Captured-TileEntity-Lookup.patch
index d66f9e765..b04537487 100644
--- a/Spigot-Server-Patches/0364-Optimize-Captured-TileEntity-Lookup.patch
+++ b/Spigot-Server-Patches/0363-Optimize-Captured-TileEntity-Lookup.patch
@@ -1,4 +1,4 @@
-From 841b144f150fe75079d02574ac325f788a9e5850 Mon Sep 17 00:00:00 2001
+From 6ba90383f58206d360a8043e7927113239b436f4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 6 Apr 2019 10:16:48 -0400
 Subject: [PATCH] Optimize Captured TileEntity Lookup
diff --git a/Spigot-Server-Patches/0365-Add-Heightmap-API.patch b/Spigot-Server-Patches/0364-Add-Heightmap-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0365-Add-Heightmap-API.patch
rename to Spigot-Server-Patches/0364-Add-Heightmap-API.patch
index a3496744c..1d1f0d29e 100644
--- a/Spigot-Server-Patches/0365-Add-Heightmap-API.patch
+++ b/Spigot-Server-Patches/0364-Add-Heightmap-API.patch
@@ -1,4 +1,4 @@
-From 7e86e575ff29520947a3189b43852d7a9992c07f Mon Sep 17 00:00:00 2001
+From 407a6470c7e6faa1b563a16712aba379398990ac Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Tue, 1 Jan 2019 02:22:01 -0800
 Subject: [PATCH] Add Heightmap API
diff --git a/Spigot-Server-Patches/0366-Mob-Spawner-API-Enhancements.patch b/Spigot-Server-Patches/0365-Mob-Spawner-API-Enhancements.patch
similarity index 98%
rename from Spigot-Server-Patches/0366-Mob-Spawner-API-Enhancements.patch
rename to Spigot-Server-Patches/0365-Mob-Spawner-API-Enhancements.patch
index 65bafdccf..0ece25b73 100644
--- a/Spigot-Server-Patches/0366-Mob-Spawner-API-Enhancements.patch
+++ b/Spigot-Server-Patches/0365-Mob-Spawner-API-Enhancements.patch
@@ -1,4 +1,4 @@
-From 65f0a4c0694845e231c667a4ac588011c715f692 Mon Sep 17 00:00:00 2001
+From a4d72597610be0cfb08ccf73fd863892731d46e9 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 19 Apr 2019 12:41:13 -0500
 Subject: [PATCH] Mob Spawner API Enhancements
diff --git a/Spigot-Server-Patches/0367-Per-Player-View-Distance-API-placeholders.patch b/Spigot-Server-Patches/0366-Per-Player-View-Distance-API-placeholders.patch
similarity index 98%
rename from Spigot-Server-Patches/0367-Per-Player-View-Distance-API-placeholders.patch
rename to Spigot-Server-Patches/0366-Per-Player-View-Distance-API-placeholders.patch
index 5e2ce2320..20e593a0f 100644
--- a/Spigot-Server-Patches/0367-Per-Player-View-Distance-API-placeholders.patch
+++ b/Spigot-Server-Patches/0366-Per-Player-View-Distance-API-placeholders.patch
@@ -1,4 +1,4 @@
-From 2a81df36a55f67d76e13b88d85dc3797549dbd45 Mon Sep 17 00:00:00 2001
+From d5fe9fe9b7f7ed62789c6eaa9a67510eef7d2dd8 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Mon, 6 May 2019 01:29:25 -0400
 Subject: [PATCH] Per-Player View Distance API placeholders
diff --git a/Spigot-Server-Patches/0368-Fix-CB-call-to-changed-postToMainThread-method.patch b/Spigot-Server-Patches/0367-Fix-CB-call-to-changed-postToMainThread-method.patch
similarity index 92%
rename from Spigot-Server-Patches/0368-Fix-CB-call-to-changed-postToMainThread-method.patch
rename to Spigot-Server-Patches/0367-Fix-CB-call-to-changed-postToMainThread-method.patch
index 83955b70f..fbcb6216f 100644
--- a/Spigot-Server-Patches/0368-Fix-CB-call-to-changed-postToMainThread-method.patch
+++ b/Spigot-Server-Patches/0367-Fix-CB-call-to-changed-postToMainThread-method.patch
@@ -1,4 +1,4 @@
-From 68788693b68920cfea5f3efe0901f3bc7e8cb222 Mon Sep 17 00:00:00 2001
+From e96270768357f78e042b5ee4143cc6a95fd562ca Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Fri, 10 May 2019 18:38:19 +0100
 Subject: [PATCH] Fix CB call to changed postToMainThread method
diff --git a/Spigot-Server-Patches/0369-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/Spigot-Server-Patches/0368-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
similarity index 96%
rename from Spigot-Server-Patches/0369-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
rename to Spigot-Server-Patches/0368-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
index 27f269615..dced1c60d 100644
--- a/Spigot-Server-Patches/0369-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
+++ b/Spigot-Server-Patches/0368-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
@@ -1,4 +1,4 @@
-From 0b061b69e8b47759afb34347b3a0d4da109741ce Mon Sep 17 00:00:00 2001
+From 5fb55d4d75761439ea15bfa10059465998b930f0 Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Sat, 27 Apr 2019 20:00:43 +0100
 Subject: [PATCH] Fix sounds when item frames are modified (MC-123450)
diff --git a/Spigot-Server-Patches/0370-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch b/Spigot-Server-Patches/0369-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
similarity index 97%
rename from Spigot-Server-Patches/0370-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
rename to Spigot-Server-Patches/0369-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
index 2f64fd821..312e03e26 100644
--- a/Spigot-Server-Patches/0370-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
+++ b/Spigot-Server-Patches/0369-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
@@ -1,4 +1,4 @@
-From 5c1cea009bcee4988d6e2d2673d9146de87d27c5 Mon Sep 17 00:00:00 2001
+From 658f9513fa8791f6ad42b16e8b09c2bfd3fbb0c5 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Mon, 13 May 2019 21:10:59 -0700
 Subject: [PATCH] Fix CraftServer#isPrimaryThread and MinecraftServer
diff --git a/Spigot-Server-Patches/0371-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch b/Spigot-Server-Patches/0370-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
similarity index 97%
rename from Spigot-Server-Patches/0371-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
rename to Spigot-Server-Patches/0370-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
index bb573637b..e25cad221 100644
--- a/Spigot-Server-Patches/0371-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
+++ b/Spigot-Server-Patches/0370-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
@@ -1,4 +1,4 @@
-From 0d5276bef7c6bf3b3cf49c93bea589ca1c54e17e Mon Sep 17 00:00:00 2001
+From f28f9895015697f5e61f96c16a5cdd4d3b233b89 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 28 Sep 2018 21:49:53 -0400
 Subject: [PATCH] Fix issues with entity loss due to unloaded chunks
diff --git a/Spigot-Server-Patches/0372-Duplicate-UUID-Resolve-Option.patch b/Spigot-Server-Patches/0371-Duplicate-UUID-Resolve-Option.patch
similarity index 99%
rename from Spigot-Server-Patches/0372-Duplicate-UUID-Resolve-Option.patch
rename to Spigot-Server-Patches/0371-Duplicate-UUID-Resolve-Option.patch
index 993b6cf14..13ee58884 100644
--- a/Spigot-Server-Patches/0372-Duplicate-UUID-Resolve-Option.patch
+++ b/Spigot-Server-Patches/0371-Duplicate-UUID-Resolve-Option.patch
@@ -1,4 +1,4 @@
-From 692223e06a0a25f01d8622e42040e981a24c8cfe Mon Sep 17 00:00:00 2001
+From 13d90986642ffb54bd12030747a85e3462c90f94 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Jul 2018 14:27:34 -0400
 Subject: [PATCH] Duplicate UUID Resolve Option
@@ -93,7 +93,7 @@ index a51de83cf5..c263a8250d 100644
  
          int k = MathHelper.floor(entity.locY() / 16.0D);
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 1a20f105b5..d522d7238d 100644
+index bb1fd6e46c..0900db052d 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2747,6 +2747,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/Spigot-Server-Patches/0373-improve-CraftWorld-isChunkLoaded.patch b/Spigot-Server-Patches/0372-improve-CraftWorld-isChunkLoaded.patch
similarity index 96%
rename from Spigot-Server-Patches/0373-improve-CraftWorld-isChunkLoaded.patch
rename to Spigot-Server-Patches/0372-improve-CraftWorld-isChunkLoaded.patch
index 7a5808c60..66cc86930 100644
--- a/Spigot-Server-Patches/0373-improve-CraftWorld-isChunkLoaded.patch
+++ b/Spigot-Server-Patches/0372-improve-CraftWorld-isChunkLoaded.patch
@@ -1,4 +1,4 @@
-From cffa12c996fd375a43a440ef15fec62f764a6c85 Mon Sep 17 00:00:00 2001
+From 2f00323ef6fcbc1b61c76194e2ce8a58135d3f1e Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Tue, 21 May 2019 02:34:04 +0100
 Subject: [PATCH] improve CraftWorld#isChunkLoaded
diff --git a/Spigot-Server-Patches/0374-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0373-Configurable-Keep-Spawn-Loaded-range-per-world.patch
similarity index 99%
rename from Spigot-Server-Patches/0374-Configurable-Keep-Spawn-Loaded-range-per-world.patch
rename to Spigot-Server-Patches/0373-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index 78ce4fafd..e90a94cbf 100644
--- a/Spigot-Server-Patches/0374-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/Spigot-Server-Patches/0373-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -1,4 +1,4 @@
-From 4f2c7b51c1f4e3843157f9465b39581b7509f6f3 Mon Sep 17 00:00:00 2001
+From da4c5cfa55eba970207231a87c45c13846d89a17 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 13 Sep 2014 23:14:43 -0400
 Subject: [PATCH] Configurable Keep Spawn Loaded range per world
diff --git a/Spigot-Server-Patches/0375-Fix-some-generation-concurrency-issues.patch b/Spigot-Server-Patches/0374-Fix-some-generation-concurrency-issues.patch
similarity index 98%
rename from Spigot-Server-Patches/0375-Fix-some-generation-concurrency-issues.patch
rename to Spigot-Server-Patches/0374-Fix-some-generation-concurrency-issues.patch
index ac838435b..af9e510f9 100644
--- a/Spigot-Server-Patches/0375-Fix-some-generation-concurrency-issues.patch
+++ b/Spigot-Server-Patches/0374-Fix-some-generation-concurrency-issues.patch
@@ -1,11 +1,11 @@
-From b1742ef0975ffc23be4a35f33960fc7848aa7753 Mon Sep 17 00:00:00 2001
+From be5f000f5c59b88258d9b1273007515bda9836f4 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Fri, 24 May 2019 07:53:16 +0100
 Subject: [PATCH] Fix some generation concurrency issues
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 20d9dd839c..18e0ca2c78 100644
+index 983bc1c7d9..8cf3c10274 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -86,6 +86,23 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
diff --git a/Spigot-Server-Patches/0376-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch b/Spigot-Server-Patches/0375-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
similarity index 93%
rename from Spigot-Server-Patches/0376-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
rename to Spigot-Server-Patches/0375-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
index 78c003538..7fe342100 100644
--- a/Spigot-Server-Patches/0376-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
+++ b/Spigot-Server-Patches/0375-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
@@ -1,4 +1,4 @@
-From f5defa4d12aeb4c9f7e900afe4cb4170884fa900 Mon Sep 17 00:00:00 2001
+From 9c8ad00d6f2c35c90a6ea7456dbd66c157506fd6 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Mon, 27 May 2019 17:35:39 -0500
 Subject: [PATCH] MC-114618 - Fix EntityAreaEffectCloud from going negative
diff --git a/Spigot-Server-Patches/0377-ChunkMapDistance-CME.patch b/Spigot-Server-Patches/0376-ChunkMapDistance-CME.patch
similarity index 97%
rename from Spigot-Server-Patches/0377-ChunkMapDistance-CME.patch
rename to Spigot-Server-Patches/0376-ChunkMapDistance-CME.patch
index 29413bd2c..16ad2326c 100644
--- a/Spigot-Server-Patches/0377-ChunkMapDistance-CME.patch
+++ b/Spigot-Server-Patches/0376-ChunkMapDistance-CME.patch
@@ -1,4 +1,4 @@
-From ec5bb794058e28e30c5a7afe1a70cbad3da5f928 Mon Sep 17 00:00:00 2001
+From b9c0bd9dfda24d2d8db34b601dabbb466639cf6c Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Wed, 29 May 2019 04:01:22 +0100
 Subject: [PATCH] ChunkMapDistance CME
diff --git a/Spigot-Server-Patches/0378-Implement-CraftBlockSoundGroup.patch b/Spigot-Server-Patches/0377-Implement-CraftBlockSoundGroup.patch
similarity index 98%
rename from Spigot-Server-Patches/0378-Implement-CraftBlockSoundGroup.patch
rename to Spigot-Server-Patches/0377-Implement-CraftBlockSoundGroup.patch
index ea0998d8c..e022d2a31 100644
--- a/Spigot-Server-Patches/0378-Implement-CraftBlockSoundGroup.patch
+++ b/Spigot-Server-Patches/0377-Implement-CraftBlockSoundGroup.patch
@@ -1,4 +1,4 @@
-From 37d8141044995e54c81c0a78e57fe42706d5a56d Mon Sep 17 00:00:00 2001
+From 39473cb0f58e3e9b728d37631b40a72cb89d6387 Mon Sep 17 00:00:00 2001
 From: simpleauthority <jacob@algorithmjunkie.com>
 Date: Tue, 28 May 2019 03:48:51 -0700
 Subject: [PATCH] Implement CraftBlockSoundGroup
diff --git a/Spigot-Server-Patches/0379-Chunk-debug-command.patch b/Spigot-Server-Patches/0378-Chunk-debug-command.patch
similarity index 99%
rename from Spigot-Server-Patches/0379-Chunk-debug-command.patch
rename to Spigot-Server-Patches/0378-Chunk-debug-command.patch
index 1795d77a4..adc08db36 100644
--- a/Spigot-Server-Patches/0379-Chunk-debug-command.patch
+++ b/Spigot-Server-Patches/0378-Chunk-debug-command.patch
@@ -1,4 +1,4 @@
-From f21f94bb91e6b5c4c5fcb51e0e73ea9eef9f2b17 Mon Sep 17 00:00:00 2001
+From e80674dfeb36acd8ef36c64f9f26c6ee636744d7 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sat, 1 Jun 2019 13:00:55 -0700
 Subject: [PATCH] Chunk debug command
@@ -412,7 +412,7 @@ index c4bbee7d6a..b6d3870063 100644
      private int dirtyCount;
      private int r;
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 5763538905..584bd24bbc 100644
+index 863c47b761..cdab5ab6be 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -58,7 +58,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
diff --git a/Spigot-Server-Patches/0380-incremental-chunk-saving.patch b/Spigot-Server-Patches/0379-incremental-chunk-saving.patch
similarity index 99%
rename from Spigot-Server-Patches/0380-incremental-chunk-saving.patch
rename to Spigot-Server-Patches/0379-incremental-chunk-saving.patch
index e3d6d988c..a459b5f12 100644
--- a/Spigot-Server-Patches/0380-incremental-chunk-saving.patch
+++ b/Spigot-Server-Patches/0379-incremental-chunk-saving.patch
@@ -1,4 +1,4 @@
-From 80e4c341779cc350d41323b5999f8a9e3466b5e8 Mon Sep 17 00:00:00 2001
+From f1212c1d28b0b35e5da33608445d82ae346049c9 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 9 Jun 2019 03:53:22 +0100
 Subject: [PATCH] incremental chunk saving
@@ -29,7 +29,7 @@ index 071e5e7f72..4867615215 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 3882e5b2a6..4d300699f1 100644
+index c263a8250d..1709f9b842 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -42,7 +42,7 @@ public class Chunk implements IChunkAccess {
@@ -175,7 +175,7 @@ index b6d3870063..66a389a67e 100644
      public void a(ProtoChunkExtension protochunkextension) {
          for (int i = 0; i < this.statusFutures.length(); ++i) {
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 584bd24bbc..3712f495ff 100644
+index cdab5ab6be..18c71609c0 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -331,6 +331,64 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
diff --git a/Spigot-Server-Patches/0381-Catch-exceptions-from-dispenser-entity-spawns.patch b/Spigot-Server-Patches/0380-Catch-exceptions-from-dispenser-entity-spawns.patch
similarity index 95%
rename from Spigot-Server-Patches/0381-Catch-exceptions-from-dispenser-entity-spawns.patch
rename to Spigot-Server-Patches/0380-Catch-exceptions-from-dispenser-entity-spawns.patch
index c23a14d77..e45fb90e9 100644
--- a/Spigot-Server-Patches/0381-Catch-exceptions-from-dispenser-entity-spawns.patch
+++ b/Spigot-Server-Patches/0380-Catch-exceptions-from-dispenser-entity-spawns.patch
@@ -1,4 +1,4 @@
-From ad50f1fb2f72b4296313cc93fa2eea6c87f5227e Mon Sep 17 00:00:00 2001
+From 3bb7c7752643d0567ddf3e1c62772718ea61082d Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Mon, 10 Jun 2019 09:36:40 +0100
 Subject: [PATCH] Catch exceptions from dispenser entity spawns
diff --git a/Spigot-Server-Patches/0382-Fix-World-isChunkGenerated-calls.patch b/Spigot-Server-Patches/0381-Fix-World-isChunkGenerated-calls.patch
similarity index 99%
rename from Spigot-Server-Patches/0382-Fix-World-isChunkGenerated-calls.patch
rename to Spigot-Server-Patches/0381-Fix-World-isChunkGenerated-calls.patch
index 9226bef87..8fbff22c8 100644
--- a/Spigot-Server-Patches/0382-Fix-World-isChunkGenerated-calls.patch
+++ b/Spigot-Server-Patches/0381-Fix-World-isChunkGenerated-calls.patch
@@ -1,4 +1,4 @@
-From 5b3af622326725cd97c9e82774308d0c4de5311a Mon Sep 17 00:00:00 2001
+From e0e23d9f89865a8a275e2565116251f127b2e325 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sat, 15 Jun 2019 08:54:33 -0700
 Subject: [PATCH] Fix World#isChunkGenerated calls
@@ -132,7 +132,7 @@ index 66a389a67e..027a6b0fd2 100644
  
      public CompletableFuture<Either<IChunkAccess, PlayerChunk.Failure>> getStatusFutureUnchecked(ChunkStatus chunkstatus) {
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 3712f495ff..ef8418ffa7 100644
+index 18c71609c0..57b1341b5a 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -968,12 +968,62 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
diff --git a/Spigot-Server-Patches/0383-Show-blockstate-location-if-we-failed-to-read-it.patch b/Spigot-Server-Patches/0382-Show-blockstate-location-if-we-failed-to-read-it.patch
similarity index 95%
rename from Spigot-Server-Patches/0383-Show-blockstate-location-if-we-failed-to-read-it.patch
rename to Spigot-Server-Patches/0382-Show-blockstate-location-if-we-failed-to-read-it.patch
index f624b4895..8058b30dd 100644
--- a/Spigot-Server-Patches/0383-Show-blockstate-location-if-we-failed-to-read-it.patch
+++ b/Spigot-Server-Patches/0382-Show-blockstate-location-if-we-failed-to-read-it.patch
@@ -1,4 +1,4 @@
-From 1ed157a45d625ae410cfb62bbd3e73b66dd2fbc3 Mon Sep 17 00:00:00 2001
+From 38f140a4ea31987265cf2094a6c6362628208d25 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sat, 15 Jun 2019 10:28:25 -0700
 Subject: [PATCH] Show blockstate location if we failed to read it
diff --git a/Spigot-Server-Patches/0384-Log-other-thread-in-DataPaletteBlock-lock-failure.patch b/Spigot-Server-Patches/0383-Log-other-thread-in-DataPaletteBlock-lock-failure.patch
similarity index 97%
rename from Spigot-Server-Patches/0384-Log-other-thread-in-DataPaletteBlock-lock-failure.patch
rename to Spigot-Server-Patches/0383-Log-other-thread-in-DataPaletteBlock-lock-failure.patch
index 20ec10258..1c2a271b2 100644
--- a/Spigot-Server-Patches/0384-Log-other-thread-in-DataPaletteBlock-lock-failure.patch
+++ b/Spigot-Server-Patches/0383-Log-other-thread-in-DataPaletteBlock-lock-failure.patch
@@ -1,4 +1,4 @@
-From 3520722457d35bfd4abfb320ca04c8729b163968 Mon Sep 17 00:00:00 2001
+From 5a41ad7f8e1268ded303d8ba566a40502433e7bf Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Fri, 21 Jun 2019 14:42:48 -0700
 Subject: [PATCH] Log other thread in DataPaletteBlock lock failure
diff --git a/Spigot-Server-Patches/0385-Use-ChunkStatus-cache-when-saving-protochunks.patch b/Spigot-Server-Patches/0384-Use-ChunkStatus-cache-when-saving-protochunks.patch
similarity index 92%
rename from Spigot-Server-Patches/0385-Use-ChunkStatus-cache-when-saving-protochunks.patch
rename to Spigot-Server-Patches/0384-Use-ChunkStatus-cache-when-saving-protochunks.patch
index 6178e84b2..2bb295e2f 100644
--- a/Spigot-Server-Patches/0385-Use-ChunkStatus-cache-when-saving-protochunks.patch
+++ b/Spigot-Server-Patches/0384-Use-ChunkStatus-cache-when-saving-protochunks.patch
@@ -1,4 +1,4 @@
-From 5e741da63b4734810a9c9bfbd5828965cee2de0d Mon Sep 17 00:00:00 2001
+From bbbed5212480412ebe981d0b25cbd1ef9d4941ff Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sat, 22 Jun 2019 04:20:47 -0700
 Subject: [PATCH] Use ChunkStatus cache when saving protochunks
@@ -7,7 +7,7 @@ The cache should contain the chunk status when saving. If not it
 will load it.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index ef8418ffa7..02ed8c6c4c 100644
+index 57b1341b5a..5ac370720c 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -844,8 +844,10 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
diff --git a/Spigot-Server-Patches/0386-Anti-Xray.patch b/Spigot-Server-Patches/0385-Anti-Xray.patch
similarity index 99%
rename from Spigot-Server-Patches/0386-Anti-Xray.patch
rename to Spigot-Server-Patches/0385-Anti-Xray.patch
index 1a56ae0d2..b64e19def 100644
--- a/Spigot-Server-Patches/0386-Anti-Xray.patch
+++ b/Spigot-Server-Patches/0385-Anti-Xray.patch
@@ -1,4 +1,4 @@
-From 6191ccae334276d01e31aa639fc754b25854c7ba Mon Sep 17 00:00:00 2001
+From 833bdad19f788c3c40f284e503720e1e81243374 Mon Sep 17 00:00:00 2001
 From: stonar96 <minecraft.stonar96@gmail.com>
 Date: Mon, 20 Aug 2018 03:03:58 +0200
 Subject: [PATCH] Anti-Xray
diff --git a/Spigot-Server-Patches/0387-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/Spigot-Server-Patches/0386-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
similarity index 97%
rename from Spigot-Server-Patches/0387-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
rename to Spigot-Server-Patches/0386-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
index c29e2ccfc..a02457282 100644
--- a/Spigot-Server-Patches/0387-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
+++ b/Spigot-Server-Patches/0386-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
@@ -1,4 +1,4 @@
-From 988b4a05a083db3da33efdba123a6d330c532cea Mon Sep 17 00:00:00 2001
+From 8a3cab357aaf9232a086f008f2158887c257d1b0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 24 Mar 2019 01:01:32 -0400
 Subject: [PATCH] Only count Natural Spawned mobs towards natural spawn mob
diff --git a/Spigot-Server-Patches/0388-Configurable-projectile-relative-velocity.patch b/Spigot-Server-Patches/0387-Configurable-projectile-relative-velocity.patch
similarity index 98%
rename from Spigot-Server-Patches/0388-Configurable-projectile-relative-velocity.patch
rename to Spigot-Server-Patches/0387-Configurable-projectile-relative-velocity.patch
index 77f8aa143..fbb560484 100644
--- a/Spigot-Server-Patches/0388-Configurable-projectile-relative-velocity.patch
+++ b/Spigot-Server-Patches/0387-Configurable-projectile-relative-velocity.patch
@@ -1,4 +1,4 @@
-From df08dc112e0d5250d40584be973c83c8e58ee7bf Mon Sep 17 00:00:00 2001
+From 9c600848edf2e857b7707069147b95a898360396 Mon Sep 17 00:00:00 2001
 From: Lucavon <lucavonlp@gmail.com>
 Date: Tue, 23 Jul 2019 20:29:20 -0500
 Subject: [PATCH] Configurable projectile relative velocity
diff --git a/Spigot-Server-Patches/0389-Mark-entities-as-being-ticked-when-notifying-navigat.patch b/Spigot-Server-Patches/0388-Mark-entities-as-being-ticked-when-notifying-navigat.patch
similarity index 94%
rename from Spigot-Server-Patches/0389-Mark-entities-as-being-ticked-when-notifying-navigat.patch
rename to Spigot-Server-Patches/0388-Mark-entities-as-being-ticked-when-notifying-navigat.patch
index 94ebdbeb4..deff373d6 100644
--- a/Spigot-Server-Patches/0389-Mark-entities-as-being-ticked-when-notifying-navigat.patch
+++ b/Spigot-Server-Patches/0388-Mark-entities-as-being-ticked-when-notifying-navigat.patch
@@ -1,4 +1,4 @@
-From e13217dabc3ea14bc352d1da77110ec7c82a4a0d Mon Sep 17 00:00:00 2001
+From b36f4cd63953f9f0b356992b12ee81457f519ae8 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 28 Jul 2019 00:51:11 +0100
 Subject: [PATCH] Mark entities as being ticked when notifying navigation
diff --git a/Spigot-Server-Patches/0390-offset-item-frame-ticking.patch b/Spigot-Server-Patches/0389-offset-item-frame-ticking.patch
similarity index 92%
rename from Spigot-Server-Patches/0390-offset-item-frame-ticking.patch
rename to Spigot-Server-Patches/0389-offset-item-frame-ticking.patch
index 38c9b1da0..e95cc5ecb 100644
--- a/Spigot-Server-Patches/0390-offset-item-frame-ticking.patch
+++ b/Spigot-Server-Patches/0389-offset-item-frame-ticking.patch
@@ -1,4 +1,4 @@
-From 34782a9ff535618847d62da25b61e6f896741c69 Mon Sep 17 00:00:00 2001
+From 22a45ee7caf6a6cca7a4f7ca181420942dfee4cb Mon Sep 17 00:00:00 2001
 From: kickash32 <kickash32@gmail.com>
 Date: Tue, 30 Jul 2019 03:17:16 +0500
 Subject: [PATCH] offset item frame ticking
diff --git a/Spigot-Server-Patches/0391-Avoid-hopper-searches-if-there-are-no-items.patch b/Spigot-Server-Patches/0390-Avoid-hopper-searches-if-there-are-no-items.patch
similarity index 98%
rename from Spigot-Server-Patches/0391-Avoid-hopper-searches-if-there-are-no-items.patch
rename to Spigot-Server-Patches/0390-Avoid-hopper-searches-if-there-are-no-items.patch
index c5ba3e0ef..bdda1e9a0 100644
--- a/Spigot-Server-Patches/0391-Avoid-hopper-searches-if-there-are-no-items.patch
+++ b/Spigot-Server-Patches/0390-Avoid-hopper-searches-if-there-are-no-items.patch
@@ -1,4 +1,4 @@
-From 881b367b809850a9bb9325fca91e6ccc0184b224 Mon Sep 17 00:00:00 2001
+From 7b9a7ead4ba22db5f1cc54426ecc22b63e05b4c4 Mon Sep 17 00:00:00 2001
 From: CullanP <cullanpage@gmail.com>
 Date: Thu, 3 Mar 2016 02:13:38 -0600
 Subject: [PATCH] Avoid hopper searches if there are no items
diff --git a/Spigot-Server-Patches/0392-Asynchronous-chunk-IO-and-loading.patch b/Spigot-Server-Patches/0391-Asynchronous-chunk-IO-and-loading.patch
similarity index 99%
rename from Spigot-Server-Patches/0392-Asynchronous-chunk-IO-and-loading.patch
rename to Spigot-Server-Patches/0391-Asynchronous-chunk-IO-and-loading.patch
index 8a67f5cf4..89211c348 100644
--- a/Spigot-Server-Patches/0392-Asynchronous-chunk-IO-and-loading.patch
+++ b/Spigot-Server-Patches/0391-Asynchronous-chunk-IO-and-loading.patch
@@ -1,4 +1,4 @@
-From b8eb5c25128518b9fe63d9acdd1bbb794cb8fc90 Mon Sep 17 00:00:00 2001
+From 8507a6807398fadc4ead7cc3c3089a62d36aec06 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sat, 13 Jul 2019 09:23:10 -0700
 Subject: [PATCH] Asynchronous chunk IO and loading
diff --git a/Spigot-Server-Patches/0393-Use-getChunkIfLoadedImmediately-in-places.patch b/Spigot-Server-Patches/0392-Use-getChunkIfLoadedImmediately-in-places.patch
similarity index 98%
rename from Spigot-Server-Patches/0393-Use-getChunkIfLoadedImmediately-in-places.patch
rename to Spigot-Server-Patches/0392-Use-getChunkIfLoadedImmediately-in-places.patch
index ef656417b..19aa24198 100644
--- a/Spigot-Server-Patches/0393-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/Spigot-Server-Patches/0392-Use-getChunkIfLoadedImmediately-in-places.patch
@@ -1,4 +1,4 @@
-From 08aa512a01483a552bb3d8eb61e5c8dd1a2277d0 Mon Sep 17 00:00:00 2001
+From fd02b1c0ca26abfaf871efe7c26a20e2514c5279 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Mon, 8 Jul 2019 00:13:36 -0700
 Subject: [PATCH] Use getChunkIfLoadedImmediately in places
diff --git a/Spigot-Server-Patches/0394-Reduce-sync-loads.patch b/Spigot-Server-Patches/0393-Reduce-sync-loads.patch
similarity index 99%
rename from Spigot-Server-Patches/0394-Reduce-sync-loads.patch
rename to Spigot-Server-Patches/0393-Reduce-sync-loads.patch
index a8cee84db..0d09d54e9 100644
--- a/Spigot-Server-Patches/0394-Reduce-sync-loads.patch
+++ b/Spigot-Server-Patches/0393-Reduce-sync-loads.patch
@@ -1,4 +1,4 @@
-From f51f7c9e3c06a2a82d79d3f62367bcc61c9929b5 Mon Sep 17 00:00:00 2001
+From c58275b04b6ddcdfbcf2f946e97f3a9c90f1edc4 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Fri, 19 Jul 2019 03:29:14 -0700
 Subject: [PATCH] Reduce sync loads
diff --git a/Spigot-Server-Patches/0395-Implement-alternative-item-despawn-rate.patch b/Spigot-Server-Patches/0394-Implement-alternative-item-despawn-rate.patch
similarity index 98%
rename from Spigot-Server-Patches/0395-Implement-alternative-item-despawn-rate.patch
rename to Spigot-Server-Patches/0394-Implement-alternative-item-despawn-rate.patch
index 9ec774313..87327a53f 100644
--- a/Spigot-Server-Patches/0395-Implement-alternative-item-despawn-rate.patch
+++ b/Spigot-Server-Patches/0394-Implement-alternative-item-despawn-rate.patch
@@ -1,4 +1,4 @@
-From b6baed69504752bc3b904ca9e085dce23cfe78f5 Mon Sep 17 00:00:00 2001
+From 9e6a651010098df37353f4d2f6f3c6ce89182cb9 Mon Sep 17 00:00:00 2001
 From: kickash32 <kickash32@gmail.com>
 Date: Mon, 3 Jun 2019 02:02:39 -0400
 Subject: [PATCH] Implement alternative item-despawn-rate
diff --git a/Spigot-Server-Patches/0396-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch b/Spigot-Server-Patches/0395-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
similarity index 97%
rename from Spigot-Server-Patches/0396-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
rename to Spigot-Server-Patches/0395-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
index 4c5972d82..41437bbc9 100644
--- a/Spigot-Server-Patches/0396-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
+++ b/Spigot-Server-Patches/0395-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
@@ -1,4 +1,4 @@
-From 7656819871f3bf85bbabcd0dc304de0a9395c5f2 Mon Sep 17 00:00:00 2001
+From 3474c24b380f6df551116da960d0ed8fe062f0bc Mon Sep 17 00:00:00 2001
 From: Paul Sauve <paul@burngames.net>
 Date: Sun, 14 Jul 2019 21:05:03 -0500
 Subject: [PATCH] Do less work if we have a custom Bukkit generator
diff --git a/Spigot-Server-Patches/0397-Fix-MC-158900.patch b/Spigot-Server-Patches/0396-Fix-MC-158900.patch
similarity index 93%
rename from Spigot-Server-Patches/0397-Fix-MC-158900.patch
rename to Spigot-Server-Patches/0396-Fix-MC-158900.patch
index 9af4b2223..3c6807275 100644
--- a/Spigot-Server-Patches/0397-Fix-MC-158900.patch
+++ b/Spigot-Server-Patches/0396-Fix-MC-158900.patch
@@ -1,4 +1,4 @@
-From 3bffd97ff78312d40deee2f861d9bdf0fa48e35c Mon Sep 17 00:00:00 2001
+From ac5d3d0a349ea262929aba1502a14a07f9f0b052 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Tue, 13 Aug 2019 06:35:17 -0700
 Subject: [PATCH] Fix MC-158900
@@ -7,7 +7,7 @@ The problem was we were checking isExpired() on the entry, but if it
 was expired at that point, then it would be null.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 68e089a4b6..f702619aa2 100644
+index 752d45e5bd..9a33045e03 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -513,8 +513,10 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0398-implement-optional-per-player-mob-spawns.patch b/Spigot-Server-Patches/0397-implement-optional-per-player-mob-spawns.patch
similarity index 99%
rename from Spigot-Server-Patches/0398-implement-optional-per-player-mob-spawns.patch
rename to Spigot-Server-Patches/0397-implement-optional-per-player-mob-spawns.patch
index f07358a08..5d4ac6f8a 100644
--- a/Spigot-Server-Patches/0398-implement-optional-per-player-mob-spawns.patch
+++ b/Spigot-Server-Patches/0397-implement-optional-per-player-mob-spawns.patch
@@ -1,4 +1,4 @@
-From a44b0cbdb1f82a9f0b9cda228ed70be91d281827 Mon Sep 17 00:00:00 2001
+From 3cf6f732b741c5e5208019f92c9454efc2e96e84 Mon Sep 17 00:00:00 2001
 From: kickash32 <kickash32@gmail.com>
 Date: Mon, 19 Aug 2019 01:27:58 +0500
 Subject: [PATCH] implement optional per player mob spawns
@@ -631,7 +631,7 @@ index d00b687d25..07a2310b18 100644
          return this.cs;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
-index 79f8549660..4100e367a4 100644
+index 8427ee2ee8..0f04bcc8b7 100644
 --- a/src/main/java/net/minecraft/server/EntityTypes.java
 +++ b/src/main/java/net/minecraft/server/EntityTypes.java
 @@ -254,6 +254,7 @@ public class EntityTypes<T extends Entity> {
@@ -643,7 +643,7 @@ index 79f8549660..4100e367a4 100644
          return this.bb;
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 893c542f57..09440fffb5 100644
+index 7e5fa016c7..f564502f81 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -78,7 +78,8 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
diff --git a/Spigot-Server-Patches/0399-Prevent-consuming-the-wrong-itemstack.patch b/Spigot-Server-Patches/0398-Prevent-consuming-the-wrong-itemstack.patch
similarity index 97%
rename from Spigot-Server-Patches/0399-Prevent-consuming-the-wrong-itemstack.patch
rename to Spigot-Server-Patches/0398-Prevent-consuming-the-wrong-itemstack.patch
index 14a1f1e52..4ce4c9278 100644
--- a/Spigot-Server-Patches/0399-Prevent-consuming-the-wrong-itemstack.patch
+++ b/Spigot-Server-Patches/0398-Prevent-consuming-the-wrong-itemstack.patch
@@ -1,4 +1,4 @@
-From 7308ea37d709dcfe69c85d3c87113c4f851c0dab Mon Sep 17 00:00:00 2001
+From fdd66862c76fa14fd7cd5f9449fbce1cec56f601 Mon Sep 17 00:00:00 2001
 From: kickash32 <kickash32@gmail.com>
 Date: Mon, 19 Aug 2019 19:42:35 +0500
 Subject: [PATCH] Prevent consuming the wrong itemstack
diff --git a/Spigot-Server-Patches/0400-only-add-passanger-entities-once-from-spawners.patch b/Spigot-Server-Patches/0399-only-add-passanger-entities-once-from-spawners.patch
similarity index 93%
rename from Spigot-Server-Patches/0400-only-add-passanger-entities-once-from-spawners.patch
rename to Spigot-Server-Patches/0399-only-add-passanger-entities-once-from-spawners.patch
index 8e8176228..b2c1065ca 100644
--- a/Spigot-Server-Patches/0400-only-add-passanger-entities-once-from-spawners.patch
+++ b/Spigot-Server-Patches/0399-only-add-passanger-entities-once-from-spawners.patch
@@ -1,4 +1,4 @@
-From 15089fad66207986bd6e4c8d5c13e2703257c2f9 Mon Sep 17 00:00:00 2001
+From 90d9dab79320f5b466ca585c1f4ea44ed260c5f5 Mon Sep 17 00:00:00 2001
 From: kickash32 <kickash32@gmail.com>
 Date: Wed, 21 Aug 2019 23:57:32 +0500
 Subject: [PATCH] only add passanger entities once from spawners
diff --git a/Spigot-Server-Patches/0401-Fix-nether-portal-creation.patch b/Spigot-Server-Patches/0400-Fix-nether-portal-creation.patch
similarity index 94%
rename from Spigot-Server-Patches/0401-Fix-nether-portal-creation.patch
rename to Spigot-Server-Patches/0400-Fix-nether-portal-creation.patch
index 60979d8a1..7c583c24a 100644
--- a/Spigot-Server-Patches/0401-Fix-nether-portal-creation.patch
+++ b/Spigot-Server-Patches/0400-Fix-nether-portal-creation.patch
@@ -1,4 +1,4 @@
-From 5945813c901ff9b1ad210e730722daba084c3860 Mon Sep 17 00:00:00 2001
+From 52bcf883ebaa9220d2c61e926d828aba017a3ce7 Mon Sep 17 00:00:00 2001
 From: Michael Himing <mhiming@gmail.com>
 Date: Mon, 9 Sep 2019 13:21:17 +1000
 Subject: [PATCH] Fix nether portal creation
diff --git a/Spigot-Server-Patches/0402-Generator-Settings.patch b/Spigot-Server-Patches/0401-Generator-Settings.patch
similarity index 97%
rename from Spigot-Server-Patches/0402-Generator-Settings.patch
rename to Spigot-Server-Patches/0401-Generator-Settings.patch
index 332c2e8dc..cfcea2571 100644
--- a/Spigot-Server-Patches/0402-Generator-Settings.patch
+++ b/Spigot-Server-Patches/0401-Generator-Settings.patch
@@ -1,4 +1,4 @@
-From 4aed92cee22e319f384a427bd5c5c1673ae385e6 Mon Sep 17 00:00:00 2001
+From 72ac50d4f38a7d0cddf54a8cd65a6f2fe859c3f9 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 02:17:54 -0600
 Subject: [PATCH] Generator Settings
diff --git a/Spigot-Server-Patches/0403-Fix-zero-tick-instant-grow-farms-MC-113809.patch b/Spigot-Server-Patches/0402-Fix-zero-tick-instant-grow-farms-MC-113809.patch
similarity index 98%
rename from Spigot-Server-Patches/0403-Fix-zero-tick-instant-grow-farms-MC-113809.patch
rename to Spigot-Server-Patches/0402-Fix-zero-tick-instant-grow-farms-MC-113809.patch
index e322bb3d8..5f4ce0203 100644
--- a/Spigot-Server-Patches/0403-Fix-zero-tick-instant-grow-farms-MC-113809.patch
+++ b/Spigot-Server-Patches/0402-Fix-zero-tick-instant-grow-farms-MC-113809.patch
@@ -1,4 +1,4 @@
-From 9642fa9a93c2e513dab17a997e7f019bb34ee2c2 Mon Sep 17 00:00:00 2001
+From 711007d790acf13e0b26d42ce75eab081a256429 Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Sun, 15 Sep 2019 11:32:32 -0500
 Subject: [PATCH] Fix zero-tick instant grow farms MC-113809
diff --git a/Spigot-Server-Patches/0404-Fix-MC-161754.patch b/Spigot-Server-Patches/0403-Fix-MC-161754.patch
similarity index 94%
rename from Spigot-Server-Patches/0404-Fix-MC-161754.patch
rename to Spigot-Server-Patches/0403-Fix-MC-161754.patch
index 1bcdc9020..d104dc2ee 100644
--- a/Spigot-Server-Patches/0404-Fix-MC-161754.patch
+++ b/Spigot-Server-Patches/0403-Fix-MC-161754.patch
@@ -1,4 +1,4 @@
-From e34bb48d8cefd150e384790e6128c08b11bde7d5 Mon Sep 17 00:00:00 2001
+From 77fe3e47d075a5f2c6dac7f8006bfd5e0aa4ae12 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Tue, 24 Sep 2019 16:03:00 -0700
 Subject: [PATCH] Fix MC-161754
diff --git a/Spigot-Server-Patches/0405-Performance-improvement-for-Chunk.getEntities.patch b/Spigot-Server-Patches/0404-Performance-improvement-for-Chunk.getEntities.patch
similarity index 96%
rename from Spigot-Server-Patches/0405-Performance-improvement-for-Chunk.getEntities.patch
rename to Spigot-Server-Patches/0404-Performance-improvement-for-Chunk.getEntities.patch
index 3fee29e68..3b1bb587b 100644
--- a/Spigot-Server-Patches/0405-Performance-improvement-for-Chunk.getEntities.patch
+++ b/Spigot-Server-Patches/0404-Performance-improvement-for-Chunk.getEntities.patch
@@ -1,4 +1,4 @@
-From db61d8ce7b1c103a0ba6b74b48a06f27e3d1d99d Mon Sep 17 00:00:00 2001
+From 75355d218f600873bfd21563025d7f360756f61e Mon Sep 17 00:00:00 2001
 From: wea_ondara <wea_ondara@alpenblock.net>
 Date: Thu, 10 Oct 2019 11:29:42 +0200
 Subject: [PATCH] Performance improvement for Chunk.getEntities
diff --git a/Spigot-Server-Patches/0406-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch b/Spigot-Server-Patches/0405-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
similarity index 96%
rename from Spigot-Server-Patches/0406-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
rename to Spigot-Server-Patches/0405-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
index d6ef480ce..c2cfdf8b2 100644
--- a/Spigot-Server-Patches/0406-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
+++ b/Spigot-Server-Patches/0405-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
@@ -1,4 +1,4 @@
-From d055e05bdd02b20d1d2b1266787f428a8527c3df Mon Sep 17 00:00:00 2001
+From b8d814cbd4832a8f69086c4be4805c9346c91174 Mon Sep 17 00:00:00 2001
 From: MisterErwin <git@askarian.net>
 Date: Wed, 30 Oct 2019 16:57:54 +0100
 Subject: [PATCH] Fix spawning of hanging entities that are not ItemFrames and
diff --git a/Spigot-Server-Patches/0407-Expose-the-internal-current-tick.patch b/Spigot-Server-Patches/0406-Expose-the-internal-current-tick.patch
similarity index 92%
rename from Spigot-Server-Patches/0407-Expose-the-internal-current-tick.patch
rename to Spigot-Server-Patches/0406-Expose-the-internal-current-tick.patch
index 158a12b79..31721b6bf 100644
--- a/Spigot-Server-Patches/0407-Expose-the-internal-current-tick.patch
+++ b/Spigot-Server-Patches/0406-Expose-the-internal-current-tick.patch
@@ -1,4 +1,4 @@
-From da367fd5acb5812bd97c4396986a55fca6c9f312 Mon Sep 17 00:00:00 2001
+From ed47733c5d7d9f81a02775f62ba2403a0521307e Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 20 Apr 2019 19:47:34 -0500
 Subject: [PATCH] Expose the internal current tick
diff --git a/Spigot-Server-Patches/0408-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch b/Spigot-Server-Patches/0407-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
similarity index 93%
rename from Spigot-Server-Patches/0408-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
rename to Spigot-Server-Patches/0407-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
index 868476b0e..1128e8472 100644
--- a/Spigot-Server-Patches/0408-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
+++ b/Spigot-Server-Patches/0407-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
@@ -1,4 +1,4 @@
-From 5b5deacf62e8846d423a59a9663fbad3d338a19f Mon Sep 17 00:00:00 2001
+From 631ad401d7370f5c8adff5fc9bfc27ef0df910ed Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Wed, 9 Oct 2019 21:51:43 -0500
 Subject: [PATCH] Fix stuck in sneak when changing worlds (MC-10657)
@@ -18,7 +18,7 @@ index 07a2310b18..cb795aa733 100644
              PlayerChangedWorldEvent changeEvent = new PlayerChangedWorldEvent(this.getBukkitEntity(), worldserver.getWorld());
              this.world.getServer().getPluginManager().callEvent(changeEvent);
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index f702619aa2..7b79ee4fe5 100644
+index 9a33045e03..f37be4b76b 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -729,6 +729,8 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0409-Add-option-to-disable-pillager-patrols.patch b/Spigot-Server-Patches/0408-Add-option-to-disable-pillager-patrols.patch
similarity index 96%
rename from Spigot-Server-Patches/0409-Add-option-to-disable-pillager-patrols.patch
rename to Spigot-Server-Patches/0408-Add-option-to-disable-pillager-patrols.patch
index 23198578f..40727b3bc 100644
--- a/Spigot-Server-Patches/0409-Add-option-to-disable-pillager-patrols.patch
+++ b/Spigot-Server-Patches/0408-Add-option-to-disable-pillager-patrols.patch
@@ -1,4 +1,4 @@
-From e572bfa9a239f981e4d298d0650fcdfa241944ba Mon Sep 17 00:00:00 2001
+From bca4c8d4e91d59bf919df50953f0d20c81bbce84 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Wed, 9 Oct 2019 21:46:15 -0500
 Subject: [PATCH] Add option to disable pillager patrols
diff --git a/Spigot-Server-Patches/0410-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch b/Spigot-Server-Patches/0409-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
similarity index 96%
rename from Spigot-Server-Patches/0410-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
rename to Spigot-Server-Patches/0409-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
index 63ecd06d8..16a7207e8 100644
--- a/Spigot-Server-Patches/0410-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
+++ b/Spigot-Server-Patches/0409-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
@@ -1,4 +1,4 @@
-From 21f8797ce8ad59efb6af642edb535963e3ac6aa4 Mon Sep 17 00:00:00 2001
+From 647617806e5119fabd4cdf467618f147868ffe40 Mon Sep 17 00:00:00 2001
 From: Lukasz Derlatka <toranktto@gmail.com>
 Date: Mon, 11 Nov 2019 16:08:13 +0100
 Subject: [PATCH] Fix AssertionError when player hand set to empty type
diff --git a/Spigot-Server-Patches/0411-PlayerLaunchProjectileEvent.patch b/Spigot-Server-Patches/0410-PlayerLaunchProjectileEvent.patch
similarity index 99%
rename from Spigot-Server-Patches/0411-PlayerLaunchProjectileEvent.patch
rename to Spigot-Server-Patches/0410-PlayerLaunchProjectileEvent.patch
index ee680a961..5e6795cd6 100644
--- a/Spigot-Server-Patches/0411-PlayerLaunchProjectileEvent.patch
+++ b/Spigot-Server-Patches/0410-PlayerLaunchProjectileEvent.patch
@@ -1,4 +1,4 @@
-From a4dc5c42909b4ea232dcb14bab10f40606096a83 Mon Sep 17 00:00:00 2001
+From f7056ab44ef4c40bef43cbdd770237fe141d1b9c Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 21 Jul 2018 03:11:03 -0500
 Subject: [PATCH] PlayerLaunchProjectileEvent
diff --git a/Spigot-Server-Patches/0412-Add-CraftMagicNumbers.isSupportedApiVersion.patch b/Spigot-Server-Patches/0411-Add-CraftMagicNumbers.isSupportedApiVersion.patch
similarity index 93%
rename from Spigot-Server-Patches/0412-Add-CraftMagicNumbers.isSupportedApiVersion.patch
rename to Spigot-Server-Patches/0411-Add-CraftMagicNumbers.isSupportedApiVersion.patch
index 8e1e1151a..e087918b1 100644
--- a/Spigot-Server-Patches/0412-Add-CraftMagicNumbers.isSupportedApiVersion.patch
+++ b/Spigot-Server-Patches/0411-Add-CraftMagicNumbers.isSupportedApiVersion.patch
@@ -1,4 +1,4 @@
-From f07120150be02845ba7a14230069da801f4a2572 Mon Sep 17 00:00:00 2001
+From 36e38d4d0c8fc1b3d2800a2a9ee5a68ecbaded82 Mon Sep 17 00:00:00 2001
 From: BlackHole <black-hole@live.com>
 Date: Sun, 15 Dec 2019 19:12:39 +0100
 Subject: [PATCH] Add CraftMagicNumbers.isSupportedApiVersion()
diff --git a/Spigot-Server-Patches/0413-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/Spigot-Server-Patches/0412-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
similarity index 95%
rename from Spigot-Server-Patches/0413-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
rename to Spigot-Server-Patches/0412-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
index f32861d98..d7e001e65 100644
--- a/Spigot-Server-Patches/0413-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
+++ b/Spigot-Server-Patches/0412-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
@@ -1,4 +1,4 @@
-From e9ac1c4a7bdece5b499fa30cfe7fd0ff613e7abb Mon Sep 17 00:00:00 2001
+From c13102ae41fc879d4ff91d91ecf9d5bb143542d5 Mon Sep 17 00:00:00 2001
 From: Callahan <mr.callahhh@gmail.com>
 Date: Mon, 13 Jan 2020 23:47:28 -0600
 Subject: [PATCH] Prevent sync chunk loads when villagers try to find beds
diff --git a/Spigot-Server-Patches/0414-Fix-spawn-radius-being-treated-as-0.patch b/Spigot-Server-Patches/0413-Fix-spawn-radius-being-treated-as-0.patch
similarity index 94%
rename from Spigot-Server-Patches/0414-Fix-spawn-radius-being-treated-as-0.patch
rename to Spigot-Server-Patches/0413-Fix-spawn-radius-being-treated-as-0.patch
index 09a9a4216..2e81beb7b 100644
--- a/Spigot-Server-Patches/0414-Fix-spawn-radius-being-treated-as-0.patch
+++ b/Spigot-Server-Patches/0413-Fix-spawn-radius-being-treated-as-0.patch
@@ -1,4 +1,4 @@
-From cf4451063f1210acedb01773eb1aa2ff6968dce1 Mon Sep 17 00:00:00 2001
+From bfdd0144274156e1434535c3a8a6ba9f73d1c4af Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 15 Dec 2019 19:41:28 +0000
 Subject: [PATCH] Fix spawn radius being treated as 0
diff --git a/Spigot-Server-Patches/0415-MC-145656-Fix-Follow-Range-Initial-Target.patch b/Spigot-Server-Patches/0414-MC-145656-Fix-Follow-Range-Initial-Target.patch
similarity index 97%
rename from Spigot-Server-Patches/0415-MC-145656-Fix-Follow-Range-Initial-Target.patch
rename to Spigot-Server-Patches/0414-MC-145656-Fix-Follow-Range-Initial-Target.patch
index c70ec7a73..f8aa22e3b 100644
--- a/Spigot-Server-Patches/0415-MC-145656-Fix-Follow-Range-Initial-Target.patch
+++ b/Spigot-Server-Patches/0414-MC-145656-Fix-Follow-Range-Initial-Target.patch
@@ -1,4 +1,4 @@
-From 50c525844c440587c3d5db2156496ff5e735769c Mon Sep 17 00:00:00 2001
+From 72ab983023c1c81a21dad07fe7ae8d4e30e7a21b Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Wed, 18 Dec 2019 22:21:35 -0600
 Subject: [PATCH] MC-145656 Fix Follow Range Initial Target
diff --git a/Spigot-Server-Patches/0416-Optimize-Hoppers.patch b/Spigot-Server-Patches/0415-Optimize-Hoppers.patch
similarity index 99%
rename from Spigot-Server-Patches/0416-Optimize-Hoppers.patch
rename to Spigot-Server-Patches/0415-Optimize-Hoppers.patch
index ab97e4f3c..334a818c7 100644
--- a/Spigot-Server-Patches/0416-Optimize-Hoppers.patch
+++ b/Spigot-Server-Patches/0415-Optimize-Hoppers.patch
@@ -1,4 +1,4 @@
-From 911e27555a901f53c5bc34176e127b8808e5daa0 Mon Sep 17 00:00:00 2001
+From 9c89bf80da3a0ca0d30a7de179d8398b12777906 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 27 Apr 2016 22:09:52 -0400
 Subject: [PATCH] Optimize Hoppers
diff --git a/Spigot-Server-Patches/0417-PlayerDeathEvent-shouldDropExperience.patch b/Spigot-Server-Patches/0416-PlayerDeathEvent-shouldDropExperience.patch
similarity index 93%
rename from Spigot-Server-Patches/0417-PlayerDeathEvent-shouldDropExperience.patch
rename to Spigot-Server-Patches/0416-PlayerDeathEvent-shouldDropExperience.patch
index fa87ad676..f31d1b53f 100644
--- a/Spigot-Server-Patches/0417-PlayerDeathEvent-shouldDropExperience.patch
+++ b/Spigot-Server-Patches/0416-PlayerDeathEvent-shouldDropExperience.patch
@@ -1,4 +1,4 @@
-From f331bf391d0495a17ebe7710c2ba75c57233259e Mon Sep 17 00:00:00 2001
+From f69a886da46f2fe2badf02b451da3e405e2deaaa Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Tue, 24 Dec 2019 00:35:42 +0000
 Subject: [PATCH] PlayerDeathEvent#shouldDropExperience
diff --git a/Spigot-Server-Patches/0418-Prevent-bees-loading-chunks-checking-hive-position.patch b/Spigot-Server-Patches/0417-Prevent-bees-loading-chunks-checking-hive-position.patch
similarity index 93%
rename from Spigot-Server-Patches/0418-Prevent-bees-loading-chunks-checking-hive-position.patch
rename to Spigot-Server-Patches/0417-Prevent-bees-loading-chunks-checking-hive-position.patch
index 2afbdee33..fa36a74fa 100644
--- a/Spigot-Server-Patches/0418-Prevent-bees-loading-chunks-checking-hive-position.patch
+++ b/Spigot-Server-Patches/0417-Prevent-bees-loading-chunks-checking-hive-position.patch
@@ -1,4 +1,4 @@
-From 6d561399f8b39b4f67d3954edf09a016ef68029b Mon Sep 17 00:00:00 2001
+From 21817bbd719b9c1953c02f1c73585ce7da13c7f5 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 5 Jan 2020 17:24:34 -0600
 Subject: [PATCH] Prevent bees loading chunks checking hive position
diff --git a/Spigot-Server-Patches/0419-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/Spigot-Server-Patches/0418-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
similarity index 96%
rename from Spigot-Server-Patches/0419-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
rename to Spigot-Server-Patches/0418-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
index 7fff88f1f..0a6cb2d3c 100644
--- a/Spigot-Server-Patches/0419-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
+++ b/Spigot-Server-Patches/0418-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
@@ -1,4 +1,4 @@
-From c28c84eb3d7ad3354b88a6a37d82175886ea1dab Mon Sep 17 00:00:00 2001
+From b143c1419c9a9926109ad99459dd39a9b9305492 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Nov 2016 20:28:12 -0400
 Subject: [PATCH] Don't load Chunks from Hoppers and other things
diff --git a/Spigot-Server-Patches/0420-Guard-against-serializing-mismatching-chunk-coordina.patch b/Spigot-Server-Patches/0419-Guard-against-serializing-mismatching-chunk-coordina.patch
similarity index 98%
rename from Spigot-Server-Patches/0420-Guard-against-serializing-mismatching-chunk-coordina.patch
rename to Spigot-Server-Patches/0419-Guard-against-serializing-mismatching-chunk-coordina.patch
index cac26b3b3..96447aad5 100644
--- a/Spigot-Server-Patches/0420-Guard-against-serializing-mismatching-chunk-coordina.patch
+++ b/Spigot-Server-Patches/0419-Guard-against-serializing-mismatching-chunk-coordina.patch
@@ -1,4 +1,4 @@
-From 539334aa6023e765089a038d32526ad711ea849e Mon Sep 17 00:00:00 2001
+From 4b891aa3952bbe6638b3f53cfdbfac9963beade1 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Fri, 27 Dec 2019 09:42:26 -0800
 Subject: [PATCH] Guard against serializing mismatching chunk coordinate
diff --git a/Spigot-Server-Patches/0421-Optimise-IEntityAccess-getPlayerByUUID.patch b/Spigot-Server-Patches/0420-Optimise-IEntityAccess-getPlayerByUUID.patch
similarity index 96%
rename from Spigot-Server-Patches/0421-Optimise-IEntityAccess-getPlayerByUUID.patch
rename to Spigot-Server-Patches/0420-Optimise-IEntityAccess-getPlayerByUUID.patch
index 6f462d892..f6fb0dccf 100644
--- a/Spigot-Server-Patches/0421-Optimise-IEntityAccess-getPlayerByUUID.patch
+++ b/Spigot-Server-Patches/0420-Optimise-IEntityAccess-getPlayerByUUID.patch
@@ -1,4 +1,4 @@
-From 831fe8a7ae7ea10450845bbfdc2a762e7ed5547f Mon Sep 17 00:00:00 2001
+From c2485e31048f64dd588fb07035d07857eee9a4f9 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sat, 11 Jan 2020 21:50:56 -0800
 Subject: [PATCH] Optimise IEntityAccess#getPlayerByUUID
diff --git a/Spigot-Server-Patches/0422-Fix-items-not-falling-correctly.patch b/Spigot-Server-Patches/0421-Fix-items-not-falling-correctly.patch
similarity index 95%
rename from Spigot-Server-Patches/0422-Fix-items-not-falling-correctly.patch
rename to Spigot-Server-Patches/0421-Fix-items-not-falling-correctly.patch
index 0c84334f6..022965e49 100644
--- a/Spigot-Server-Patches/0422-Fix-items-not-falling-correctly.patch
+++ b/Spigot-Server-Patches/0421-Fix-items-not-falling-correctly.patch
@@ -1,4 +1,4 @@
-From 95477a4ceeee6324764efddc624e8699eec73b0e Mon Sep 17 00:00:00 2001
+From f2f2fa12a9451ecaa6f906dbf3fd3071b811027e Mon Sep 17 00:00:00 2001
 From: AJMFactsheets <AJMFactsheets@gmail.com>
 Date: Fri, 17 Jan 2020 17:17:54 -0600
 Subject: [PATCH] Fix items not falling correctly
diff --git a/Spigot-Server-Patches/0423-Lag-compensate-eating.patch b/Spigot-Server-Patches/0422-Lag-compensate-eating.patch
similarity index 98%
rename from Spigot-Server-Patches/0423-Lag-compensate-eating.patch
rename to Spigot-Server-Patches/0422-Lag-compensate-eating.patch
index 29e0d6f2f..bee19befe 100644
--- a/Spigot-Server-Patches/0423-Lag-compensate-eating.patch
+++ b/Spigot-Server-Patches/0422-Lag-compensate-eating.patch
@@ -1,4 +1,4 @@
-From 16644e48fb418cf0374ddf5dd2486a1a00662344 Mon Sep 17 00:00:00 2001
+From 213c82c527c37253ab7ba81bbeb47897b795286b Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Tue, 14 Jan 2020 15:28:28 -0800
 Subject: [PATCH] Lag compensate eating
diff --git a/Spigot-Server-Patches/0424-Optimize-call-to-getFluid-for-explosions.patch b/Spigot-Server-Patches/0423-Optimize-call-to-getFluid-for-explosions.patch
similarity index 94%
rename from Spigot-Server-Patches/0424-Optimize-call-to-getFluid-for-explosions.patch
rename to Spigot-Server-Patches/0423-Optimize-call-to-getFluid-for-explosions.patch
index c0b559332..b60721071 100644
--- a/Spigot-Server-Patches/0424-Optimize-call-to-getFluid-for-explosions.patch
+++ b/Spigot-Server-Patches/0423-Optimize-call-to-getFluid-for-explosions.patch
@@ -1,4 +1,4 @@
-From 6a2d991ef0fa23591d77554e268d8ded9ec933a9 Mon Sep 17 00:00:00 2001
+From 8a3dbc76f917025bdc7428312c606e3d1afac9a1 Mon Sep 17 00:00:00 2001
 From: BrodyBeckwith <brody@beckwith.dev>
 Date: Tue, 14 Jan 2020 17:49:03 -0500
 Subject: [PATCH] Optimize call to getFluid for explosions
diff --git a/Spigot-Server-Patches/0425-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/Spigot-Server-Patches/0424-Fix-last-firework-in-stack-not-having-effects-when-d.patch
similarity index 95%
rename from Spigot-Server-Patches/0425-Fix-last-firework-in-stack-not-having-effects-when-d.patch
rename to Spigot-Server-Patches/0424-Fix-last-firework-in-stack-not-having-effects-when-d.patch
index 02250aa66..59ab3bb7a 100644
--- a/Spigot-Server-Patches/0425-Fix-last-firework-in-stack-not-having-effects-when-d.patch
+++ b/Spigot-Server-Patches/0424-Fix-last-firework-in-stack-not-having-effects-when-d.patch
@@ -1,4 +1,4 @@
-From 9bf99cd290145fe1b957bd023d69559190eb6102 Mon Sep 17 00:00:00 2001
+From 43f35bfb65ee5746781bc85d5a0e7a8578f54f17 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Fri, 17 Jan 2020 18:44:55 -0800
 Subject: [PATCH] Fix last firework in stack not having effects when dispensed
diff --git a/Spigot-Server-Patches/0426-Activation-Range-Improvements.patch b/Spigot-Server-Patches/0425-Activation-Range-Improvements.patch
similarity index 99%
rename from Spigot-Server-Patches/0426-Activation-Range-Improvements.patch
rename to Spigot-Server-Patches/0425-Activation-Range-Improvements.patch
index 70dd6504a..673c629df 100644
--- a/Spigot-Server-Patches/0426-Activation-Range-Improvements.patch
+++ b/Spigot-Server-Patches/0425-Activation-Range-Improvements.patch
@@ -1,4 +1,4 @@
-From 5d149308c170326343337431e4c888a7b3284eb7 Mon Sep 17 00:00:00 2001
+From b8bdaa2d7bf5cd8c85ddd82c7238113f1e6ecadc Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 13 May 2016 01:38:06 -0400
 Subject: [PATCH] Activation Range Improvements
@@ -10,7 +10,7 @@ Fixes and adds new Immunities to improve gameplay behavior
 Adds water Mobs to activation range config and nerfs fish
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index d522d7238d..3a248dbe37 100644
+index 0900db052d..a550a81bea 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -192,6 +192,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -210,7 +210,7 @@ index 5a8c60ad90..29657fed75 100644
          return this.c;
      }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 92601c581c..f4cb669740 100644
+index 92601c581c..795817177a 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -3,11 +3,15 @@ package org.spigotmc;
@@ -472,7 +472,7 @@ index 92601c581c..f4cb669740 100644
              isActive = false;
          }
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 58767972a3..3ceeed3f99 100644
+index 5e932a5d97..1b42ba94c0 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -180,6 +180,7 @@ public class SpigotWorldConfig
diff --git a/Spigot-Server-Patches/0427-Add-effect-to-block-break-naturally.patch b/Spigot-Server-Patches/0426-Add-effect-to-block-break-naturally.patch
similarity index 95%
rename from Spigot-Server-Patches/0427-Add-effect-to-block-break-naturally.patch
rename to Spigot-Server-Patches/0426-Add-effect-to-block-break-naturally.patch
index 90d29315b..39a2426a4 100644
--- a/Spigot-Server-Patches/0427-Add-effect-to-block-break-naturally.patch
+++ b/Spigot-Server-Patches/0426-Add-effect-to-block-break-naturally.patch
@@ -1,4 +1,4 @@
-From 35a827f49ab54b6a22b3962455cce40b3e58bbc6 Mon Sep 17 00:00:00 2001
+From daeb8d3e87a60e271dd268ec936ade1d59498ad5 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 2 Jan 2020 12:25:07 -0600
 Subject: [PATCH] Add effect to block break naturally
diff --git a/Spigot-Server-Patches/0428-Tracking-Range-Improvements.patch b/Spigot-Server-Patches/0427-Tracking-Range-Improvements.patch
similarity index 97%
rename from Spigot-Server-Patches/0428-Tracking-Range-Improvements.patch
rename to Spigot-Server-Patches/0427-Tracking-Range-Improvements.patch
index d68007997..685c1325a 100644
--- a/Spigot-Server-Patches/0428-Tracking-Range-Improvements.patch
+++ b/Spigot-Server-Patches/0427-Tracking-Range-Improvements.patch
@@ -1,4 +1,4 @@
-From 0cfd2d9c26e2d1b12f6b3900812fc4e678a26a9e Mon Sep 17 00:00:00 2001
+From 1f07c6a5d2d4635e93ac87228d4e2e3c7ea61430 Mon Sep 17 00:00:00 2001
 From: kickash32 <kickash32@gmail.com>
 Date: Sat, 21 Dec 2019 15:22:09 -0500
 Subject: [PATCH] Tracking Range Improvements
diff --git a/Spigot-Server-Patches/0429-Fix-comparator-behavior-for-EntityPhanton-goal.patch b/Spigot-Server-Patches/0428-Fix-comparator-behavior-for-EntityPhanton-goal.patch
similarity index 93%
rename from Spigot-Server-Patches/0429-Fix-comparator-behavior-for-EntityPhanton-goal.patch
rename to Spigot-Server-Patches/0428-Fix-comparator-behavior-for-EntityPhanton-goal.patch
index 2d3f2becc..58ac7e4fb 100644
--- a/Spigot-Server-Patches/0429-Fix-comparator-behavior-for-EntityPhanton-goal.patch
+++ b/Spigot-Server-Patches/0428-Fix-comparator-behavior-for-EntityPhanton-goal.patch
@@ -1,4 +1,4 @@
-From de1e7537f385c4ab4f0e527bc584e5c4fbef834e Mon Sep 17 00:00:00 2001
+From 53b723ce4574f5bd4cee02a2cceb3a5d83bcc8e8 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Wed, 22 Jan 2020 21:00:21 +0000
 Subject: [PATCH] Fix comparator behavior for EntityPhanton goal
diff --git a/Spigot-Server-Patches/0430-Fix-items-vanishing-through-end-portal.patch b/Spigot-Server-Patches/0429-Fix-items-vanishing-through-end-portal.patch
similarity index 94%
rename from Spigot-Server-Patches/0430-Fix-items-vanishing-through-end-portal.patch
rename to Spigot-Server-Patches/0429-Fix-items-vanishing-through-end-portal.patch
index fcd34a04b..412fc6030 100644
--- a/Spigot-Server-Patches/0430-Fix-items-vanishing-through-end-portal.patch
+++ b/Spigot-Server-Patches/0429-Fix-items-vanishing-through-end-portal.patch
@@ -1,4 +1,4 @@
-From dc179d975ef48acea548ee3a424345f87051255f Mon Sep 17 00:00:00 2001
+From f77100dc057c84378f22ee9a6f81baef5b45aff9 Mon Sep 17 00:00:00 2001
 From: AJMFactsheets <AJMFactsheets@gmail.com>
 Date: Wed, 22 Jan 2020 19:52:28 -0600
 Subject: [PATCH] Fix items vanishing through end portal
@@ -13,7 +13,7 @@ Quickly loading the exact world spawn chunk before searching the
 heightmap resolves the issue without having to load all spawn chunks.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 3a248dbe37..d81ae00fb4 100644
+index a550a81bea..0e7641a3c5 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2610,6 +2610,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/Spigot-Server-Patches/0431-Seed-based-feature-search.patch b/Spigot-Server-Patches/0430-Seed-based-feature-search.patch
similarity index 98%
rename from Spigot-Server-Patches/0431-Seed-based-feature-search.patch
rename to Spigot-Server-Patches/0430-Seed-based-feature-search.patch
index 1082d5ec0..f2c4fc6d5 100644
--- a/Spigot-Server-Patches/0431-Seed-based-feature-search.patch
+++ b/Spigot-Server-Patches/0430-Seed-based-feature-search.patch
@@ -1,4 +1,4 @@
-From fdb38218344d17d0c1e95241e8cda505fcdc9b39 Mon Sep 17 00:00:00 2001
+From 823b5632845b58d065f16e1c394f81f555a5ff54 Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Mon, 13 Jan 2020 15:40:32 +0100
 Subject: [PATCH] Seed based feature search
diff --git a/Spigot-Server-Patches/0432-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/Spigot-Server-Patches/0431-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
similarity index 97%
rename from Spigot-Server-Patches/0432-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
rename to Spigot-Server-Patches/0431-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
index c4dfa1414..da18f6ea8 100644
--- a/Spigot-Server-Patches/0432-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
+++ b/Spigot-Server-Patches/0431-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
@@ -1,4 +1,4 @@
-From c59143f80f48492711b15e2ec0812415c0000222 Mon Sep 17 00:00:00 2001
+From 2cacd4e68e9aabc007d3c824d5cb8a33861e9271 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 26 Jan 2020 16:30:19 -0600
 Subject: [PATCH] Bees get gravity in void. Fixes MC-167279
diff --git a/Spigot-Server-Patches/0433-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/Spigot-Server-Patches/0432-Optimise-getChunkAt-calls-for-loaded-chunks.patch
similarity index 97%
rename from Spigot-Server-Patches/0433-Optimise-getChunkAt-calls-for-loaded-chunks.patch
rename to Spigot-Server-Patches/0432-Optimise-getChunkAt-calls-for-loaded-chunks.patch
index de35629a0..777763458 100644
--- a/Spigot-Server-Patches/0433-Optimise-getChunkAt-calls-for-loaded-chunks.patch
+++ b/Spigot-Server-Patches/0432-Optimise-getChunkAt-calls-for-loaded-chunks.patch
@@ -1,4 +1,4 @@
-From 294aff4679183b8e0dfa6b15c51d25f449bbff5a Mon Sep 17 00:00:00 2001
+From f37966fdd4021864d1c618fc26616b1676b62b21 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sat, 25 Jan 2020 17:04:35 -0800
 Subject: [PATCH] Optimise getChunkAt calls for loaded chunks
@@ -65,7 +65,7 @@ index a6529cefe8..8412feef6b 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 803fe43be1..601a68ad60 100644
+index 79d8c7ba31..28b6c9a083 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -259,6 +259,14 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
diff --git a/Spigot-Server-Patches/0434-Be-more-tolerant-of-invalid-attributes.patch b/Spigot-Server-Patches/0433-Be-more-tolerant-of-invalid-attributes.patch
similarity index 96%
rename from Spigot-Server-Patches/0434-Be-more-tolerant-of-invalid-attributes.patch
rename to Spigot-Server-Patches/0433-Be-more-tolerant-of-invalid-attributes.patch
index 02b7ae988..f209e6e87 100644
--- a/Spigot-Server-Patches/0434-Be-more-tolerant-of-invalid-attributes.patch
+++ b/Spigot-Server-Patches/0433-Be-more-tolerant-of-invalid-attributes.patch
@@ -1,4 +1,4 @@
-From 61ba1e4e6a02527b8bd1e309d69341df4737cdcc Mon Sep 17 00:00:00 2001
+From d6b478fe125e2072087f272e7defcb99aebb9ac5 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Thu, 6 Feb 2020 19:20:27 -0600
 Subject: [PATCH] Be more tolerant of invalid attributes
diff --git a/Spigot-Server-Patches/0435-Allow-overriding-the-java-version-check.patch b/Spigot-Server-Patches/0434-Allow-overriding-the-java-version-check.patch
similarity index 93%
rename from Spigot-Server-Patches/0435-Allow-overriding-the-java-version-check.patch
rename to Spigot-Server-Patches/0434-Allow-overriding-the-java-version-check.patch
index b7b7b5652..8487de2ab 100644
--- a/Spigot-Server-Patches/0435-Allow-overriding-the-java-version-check.patch
+++ b/Spigot-Server-Patches/0434-Allow-overriding-the-java-version-check.patch
@@ -1,4 +1,4 @@
-From e6cc9f8e5ccd3daa114e8add01970e96833ad583 Mon Sep 17 00:00:00 2001
+From 64f6d0314b31df7ffda6e8b0e3ff8b76c7fdf7b2 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Sat, 8 Feb 2020 18:02:24 -0600
 Subject: [PATCH] Allow overriding the java version check
diff --git a/Spigot-Server-Patches/0436-Add-ThrownEggHatchEvent.patch b/Spigot-Server-Patches/0435-Add-ThrownEggHatchEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0436-Add-ThrownEggHatchEvent.patch
rename to Spigot-Server-Patches/0435-Add-ThrownEggHatchEvent.patch
index 9c3840ac2..b03ae43a9 100644
--- a/Spigot-Server-Patches/0436-Add-ThrownEggHatchEvent.patch
+++ b/Spigot-Server-Patches/0435-Add-ThrownEggHatchEvent.patch
@@ -1,4 +1,4 @@
-From 4a261730fa0c2e357a133319c2b4f24fe18c3b22 Mon Sep 17 00:00:00 2001
+From c80e29b93a947435c6c116a8b60761dfb581034f Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 9 Feb 2020 00:19:05 -0600
 Subject: [PATCH] Add ThrownEggHatchEvent
diff --git a/Spigot-Server-Patches/0437-Optimise-random-block-ticking.patch b/Spigot-Server-Patches/0436-Optimise-random-block-ticking.patch
similarity index 99%
rename from Spigot-Server-Patches/0437-Optimise-random-block-ticking.patch
rename to Spigot-Server-Patches/0436-Optimise-random-block-ticking.patch
index 88e9ecb45..0ce1dbf66 100644
--- a/Spigot-Server-Patches/0437-Optimise-random-block-ticking.patch
+++ b/Spigot-Server-Patches/0436-Optimise-random-block-ticking.patch
@@ -1,4 +1,4 @@
-From a9e20c5c7a618f765b43d7ce1358544b702855f5 Mon Sep 17 00:00:00 2001
+From 792977fcd27894bf9917653289f4bce50b05da9a Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Mon, 27 Jan 2020 21:28:00 -0800
 Subject: [PATCH] Optimise random block ticking
diff --git a/Spigot-Server-Patches/0438-Entity-Jump-API.patch b/Spigot-Server-Patches/0437-Entity-Jump-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0438-Entity-Jump-API.patch
rename to Spigot-Server-Patches/0437-Entity-Jump-API.patch
index 051566055..76eed20ac 100644
--- a/Spigot-Server-Patches/0438-Entity-Jump-API.patch
+++ b/Spigot-Server-Patches/0437-Entity-Jump-API.patch
@@ -1,4 +1,4 @@
-From 0d0cea11394985fe44a5350be8cbf500c7808f0d Mon Sep 17 00:00:00 2001
+From 18d72de455e23b867f32d474c79b89b10b13e760 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 8 Feb 2020 23:26:11 -0600
 Subject: [PATCH] Entity Jump API
diff --git a/Spigot-Server-Patches/0439-Add-option-to-nerf-pigmen-from-nether-portals.patch b/Spigot-Server-Patches/0438-Add-option-to-nerf-pigmen-from-nether-portals.patch
similarity index 97%
rename from Spigot-Server-Patches/0439-Add-option-to-nerf-pigmen-from-nether-portals.patch
rename to Spigot-Server-Patches/0438-Add-option-to-nerf-pigmen-from-nether-portals.patch
index 1d6fd53d8..b9a6c9ec9 100644
--- a/Spigot-Server-Patches/0439-Add-option-to-nerf-pigmen-from-nether-portals.patch
+++ b/Spigot-Server-Patches/0438-Add-option-to-nerf-pigmen-from-nether-portals.patch
@@ -1,4 +1,4 @@
-From df039154461af35a836cf8c2e82799e69e79da73 Mon Sep 17 00:00:00 2001
+From 892ccd374ab4490d2ad82035497e602ed508bac4 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 7 Feb 2020 14:36:56 -0600
 Subject: [PATCH] Add option to nerf pigmen from nether portals
@@ -32,7 +32,7 @@ index 2dc3ab4cfa..09c7c13183 100644
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index d81ae00fb4..c4879ac569 100644
+index 0e7641a3c5..65457c89ad 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -194,6 +194,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/Spigot-Server-Patches/0440-Make-the-GUI-graph-fancier.patch b/Spigot-Server-Patches/0439-Make-the-GUI-graph-fancier.patch
similarity index 99%
rename from Spigot-Server-Patches/0440-Make-the-GUI-graph-fancier.patch
rename to Spigot-Server-Patches/0439-Make-the-GUI-graph-fancier.patch
index ff95f266a..f2c70074b 100644
--- a/Spigot-Server-Patches/0440-Make-the-GUI-graph-fancier.patch
+++ b/Spigot-Server-Patches/0439-Make-the-GUI-graph-fancier.patch
@@ -1,4 +1,4 @@
-From ce778d326095785bae1ad18ad9ac142b89dd5fe5 Mon Sep 17 00:00:00 2001
+From 6bd58858cded988e0053545cdabdf162025d64ed Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 2 Feb 2020 04:00:40 -0600
 Subject: [PATCH] Make the GUI graph fancier
diff --git a/Spigot-Server-Patches/0441-Backport-fix-for-MC-167561.patch b/Spigot-Server-Patches/0440-Backport-fix-for-MC-167561.patch
similarity index 97%
rename from Spigot-Server-Patches/0441-Backport-fix-for-MC-167561.patch
rename to Spigot-Server-Patches/0440-Backport-fix-for-MC-167561.patch
index d88e32c06..183d08ed6 100644
--- a/Spigot-Server-Patches/0441-Backport-fix-for-MC-167561.patch
+++ b/Spigot-Server-Patches/0440-Backport-fix-for-MC-167561.patch
@@ -1,4 +1,4 @@
-From a771840c788dc386f8900388be089f64ee09d3bc Mon Sep 17 00:00:00 2001
+From 902c9f78865921d9e06e464a984700dbf8639471 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Fri, 21 Feb 2020 18:44:28 +0000
 Subject: [PATCH] Backport fix for MC-167561
diff --git a/Spigot-Server-Patches/0442-add-hand-to-BlockMultiPlaceEvent.patch b/Spigot-Server-Patches/0441-add-hand-to-BlockMultiPlaceEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0442-add-hand-to-BlockMultiPlaceEvent.patch
rename to Spigot-Server-Patches/0441-add-hand-to-BlockMultiPlaceEvent.patch
index 0ff4b983b..c7b14177a 100644
--- a/Spigot-Server-Patches/0442-add-hand-to-BlockMultiPlaceEvent.patch
+++ b/Spigot-Server-Patches/0441-add-hand-to-BlockMultiPlaceEvent.patch
@@ -1,4 +1,4 @@
-From 966fe904a22a7edc74dd42abe7df98b6c7cfdbb6 Mon Sep 17 00:00:00 2001
+From 7159e91b7362da3846bd0897d777355a27f9c4fc Mon Sep 17 00:00:00 2001
 From: Trigary <trigary0@gmail.com>
 Date: Sun, 1 Mar 2020 22:43:24 +0100
 Subject: [PATCH] add hand to BlockMultiPlaceEvent
diff --git a/Spigot-Server-Patches/0443-Prevent-teleporting-dead-entities.patch b/Spigot-Server-Patches/0442-Prevent-teleporting-dead-entities.patch
similarity index 93%
rename from Spigot-Server-Patches/0443-Prevent-teleporting-dead-entities.patch
rename to Spigot-Server-Patches/0442-Prevent-teleporting-dead-entities.patch
index dfb2c27ed..fdc40ea4e 100644
--- a/Spigot-Server-Patches/0443-Prevent-teleporting-dead-entities.patch
+++ b/Spigot-Server-Patches/0442-Prevent-teleporting-dead-entities.patch
@@ -1,4 +1,4 @@
-From 0657657d8c6bb67a9a79759b6ebe159bd5dd1f1b Mon Sep 17 00:00:00 2001
+From 2cd566c1bfc56f87f20708d45bac4b5210473d75 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Tue, 3 Mar 2020 05:26:40 +0000
 Subject: [PATCH] Prevent teleporting dead entities
diff --git a/Spigot-Server-Patches/0444-Validate-tripwire-hook-placement-before-update.patch b/Spigot-Server-Patches/0443-Validate-tripwire-hook-placement-before-update.patch
similarity index 93%
rename from Spigot-Server-Patches/0444-Validate-tripwire-hook-placement-before-update.patch
rename to Spigot-Server-Patches/0443-Validate-tripwire-hook-placement-before-update.patch
index eb49d7f47..87181519e 100644
--- a/Spigot-Server-Patches/0444-Validate-tripwire-hook-placement-before-update.patch
+++ b/Spigot-Server-Patches/0443-Validate-tripwire-hook-placement-before-update.patch
@@ -1,4 +1,4 @@
-From 3ac27f90c6ee5434144f901658f139553b1e7e9e Mon Sep 17 00:00:00 2001
+From be6a46dbf9ececbcf25d7b384ca2377e47ad70c5 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 7 Mar 2020 00:07:51 +0000
 Subject: [PATCH] Validate tripwire hook placement before update
diff --git a/Spigot-Server-Patches/0445-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/Spigot-Server-Patches/0444-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
similarity index 96%
rename from Spigot-Server-Patches/0445-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
rename to Spigot-Server-Patches/0444-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
index 724149252..8c8b377ce 100644
--- a/Spigot-Server-Patches/0445-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
+++ b/Spigot-Server-Patches/0444-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
@@ -1,4 +1,4 @@
-From 118cf30d531fda11fe6f0aaf2216398db423c722 Mon Sep 17 00:00:00 2001
+From 25917aa455833a1607267e1448ad705c00a35370 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 13 Apr 2019 16:50:58 -0500
 Subject: [PATCH] Add option to allow iron golems to spawn in air
diff --git a/Spigot-Server-Patches/0446-Configurable-chance-of-villager-zombie-infection.patch b/Spigot-Server-Patches/0445-Configurable-chance-of-villager-zombie-infection.patch
similarity index 97%
rename from Spigot-Server-Patches/0446-Configurable-chance-of-villager-zombie-infection.patch
rename to Spigot-Server-Patches/0445-Configurable-chance-of-villager-zombie-infection.patch
index 73e3244d2..5778f4423 100644
--- a/Spigot-Server-Patches/0446-Configurable-chance-of-villager-zombie-infection.patch
+++ b/Spigot-Server-Patches/0445-Configurable-chance-of-villager-zombie-infection.patch
@@ -1,4 +1,4 @@
-From 3d37a5266fe83310993240e1f562b6d3fc9eece2 Mon Sep 17 00:00:00 2001
+From 9f450f16e1e3907c45fd8b045979049fe1f083ae Mon Sep 17 00:00:00 2001
 From: Zero <zero@cock.li>
 Date: Sat, 22 Feb 2020 16:10:31 -0500
 Subject: [PATCH] Configurable chance of villager zombie infection
diff --git a/Spigot-Server-Patches/0447-Optimise-Chunk-getFluid.patch b/Spigot-Server-Patches/0446-Optimise-Chunk-getFluid.patch
similarity index 97%
rename from Spigot-Server-Patches/0447-Optimise-Chunk-getFluid.patch
rename to Spigot-Server-Patches/0446-Optimise-Chunk-getFluid.patch
index 1bbaee60d..225508c18 100644
--- a/Spigot-Server-Patches/0447-Optimise-Chunk-getFluid.patch
+++ b/Spigot-Server-Patches/0446-Optimise-Chunk-getFluid.patch
@@ -1,4 +1,4 @@
-From a6af38e8706ccaf50b12123df1681533fa07c20e Mon Sep 17 00:00:00 2001
+From 417ce6b10c697730ddb86c920dadefa1f06b3796 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Tue, 14 Jan 2020 14:59:08 -0800
 Subject: [PATCH] Optimise Chunk#getFluid
diff --git a/Spigot-Server-Patches/0448-Optimise-TickListServer-by-rewriting-it.patch b/Spigot-Server-Patches/0447-Optimise-TickListServer-by-rewriting-it.patch
similarity index 99%
rename from Spigot-Server-Patches/0448-Optimise-TickListServer-by-rewriting-it.patch
rename to Spigot-Server-Patches/0447-Optimise-TickListServer-by-rewriting-it.patch
index 24b7fb27e..3dcb4c129 100644
--- a/Spigot-Server-Patches/0448-Optimise-TickListServer-by-rewriting-it.patch
+++ b/Spigot-Server-Patches/0447-Optimise-TickListServer-by-rewriting-it.patch
@@ -1,4 +1,4 @@
-From beac857bf39ee6363dd4dfe1a1f5445acadb8fb9 Mon Sep 17 00:00:00 2001
+From 37ec5b6997cb9ba61792aa97b8cc9bbcfc45e186 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Fri, 14 Feb 2020 01:24:39 -0800
 Subject: [PATCH] Optimise TickListServer by rewriting it
diff --git a/Spigot-Server-Patches/0449-Reduce-entity-tracker-updates-on-move.patch b/Spigot-Server-Patches/0448-Reduce-entity-tracker-updates-on-move.patch
similarity index 99%
rename from Spigot-Server-Patches/0449-Reduce-entity-tracker-updates-on-move.patch
rename to Spigot-Server-Patches/0448-Reduce-entity-tracker-updates-on-move.patch
index ecfbcb6ab..7e6e2fef7 100644
--- a/Spigot-Server-Patches/0449-Reduce-entity-tracker-updates-on-move.patch
+++ b/Spigot-Server-Patches/0448-Reduce-entity-tracker-updates-on-move.patch
@@ -1,4 +1,4 @@
-From 60f5236d5a6774790e2fa2ff30d2d5b848d5b98d Mon Sep 17 00:00:00 2001
+From 0fc9d917fe39a561141036c82cca603f2640c7d0 Mon Sep 17 00:00:00 2001
 From: froobynooby <froobynooby@froobworld.com>
 Date: Thu, 20 Feb 2020 15:50:49 +0930
 Subject: [PATCH] Reduce entity tracker updates on move
diff --git a/Spigot-Server-Patches/0450-Pillager-patrol-spawn-settings-and-per-player-option.patch b/Spigot-Server-Patches/0449-Pillager-patrol-spawn-settings-and-per-player-option.patch
similarity index 99%
rename from Spigot-Server-Patches/0450-Pillager-patrol-spawn-settings-and-per-player-option.patch
rename to Spigot-Server-Patches/0449-Pillager-patrol-spawn-settings-and-per-player-option.patch
index c953e0d61..210fae14f 100644
--- a/Spigot-Server-Patches/0450-Pillager-patrol-spawn-settings-and-per-player-option.patch
+++ b/Spigot-Server-Patches/0449-Pillager-patrol-spawn-settings-and-per-player-option.patch
@@ -1,4 +1,4 @@
-From 86f414d0e872878eb09a240b516ccf652040d8d7 Mon Sep 17 00:00:00 2001
+From dabf61ab5256d8b3950ee2b2cb1e37c856119e8d Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Sat, 1 Feb 2020 16:50:39 +0100
 Subject: [PATCH] Pillager patrol spawn settings and per player options
diff --git a/Spigot-Server-Patches/0451-Ensure-Entity-is-never-double-registered.patch b/Spigot-Server-Patches/0450-Ensure-Entity-is-never-double-registered.patch
similarity index 97%
rename from Spigot-Server-Patches/0451-Ensure-Entity-is-never-double-registered.patch
rename to Spigot-Server-Patches/0450-Ensure-Entity-is-never-double-registered.patch
index 950d9f7bd..9263b8d6a 100644
--- a/Spigot-Server-Patches/0451-Ensure-Entity-is-never-double-registered.patch
+++ b/Spigot-Server-Patches/0450-Ensure-Entity-is-never-double-registered.patch
@@ -1,4 +1,4 @@
-From 76dfeec0aa423c46709031d9cf9b2985d4fe5cd8 Mon Sep 17 00:00:00 2001
+From 1c031ccb73652467d8913abedaebe704625644f1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 29 Mar 2020 18:26:14 -0400
 Subject: [PATCH] Ensure Entity is never double registered
@@ -11,7 +11,7 @@ Vs behavior of non ticking of just overwriting state.
 We will now simply log a warning when this happens instead of crashing the server.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 3d1d93a8b4..862a64b6fd 100644
+index 65457c89ad..6571cf1eee 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -59,6 +59,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/Spigot-Server-Patches/0452-Fix-unregistering-entities-from-unloading-chunks.patch b/Spigot-Server-Patches/0451-Fix-unregistering-entities-from-unloading-chunks.patch
similarity index 95%
rename from Spigot-Server-Patches/0452-Fix-unregistering-entities-from-unloading-chunks.patch
rename to Spigot-Server-Patches/0451-Fix-unregistering-entities-from-unloading-chunks.patch
index 04a13d9e0..35db2bd07 100644
--- a/Spigot-Server-Patches/0452-Fix-unregistering-entities-from-unloading-chunks.patch
+++ b/Spigot-Server-Patches/0451-Fix-unregistering-entities-from-unloading-chunks.patch
@@ -1,4 +1,4 @@
-From 55a0a2dd95e11c1f38c0399c0b02d0acb32acfb4 Mon Sep 17 00:00:00 2001
+From 220db8b8d7cd74b1bff9fe451108c20ffe9d01ac Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 31 Mar 2020 03:01:45 -0400
 Subject: [PATCH] Fix unregistering entities from unloading chunks
diff --git a/Spigot-Server-Patches/0453-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/Spigot-Server-Patches/0452-Remote-Connections-shouldn-t-hold-up-shutdown.patch
similarity index 94%
rename from Spigot-Server-Patches/0453-Remote-Connections-shouldn-t-hold-up-shutdown.patch
rename to Spigot-Server-Patches/0452-Remote-Connections-shouldn-t-hold-up-shutdown.patch
index 1e832e564..885b54061 100644
--- a/Spigot-Server-Patches/0453-Remote-Connections-shouldn-t-hold-up-shutdown.patch
+++ b/Spigot-Server-Patches/0452-Remote-Connections-shouldn-t-hold-up-shutdown.patch
@@ -1,4 +1,4 @@
-From b1bbdd9a261ca276de15ee8394e26188066934f7 Mon Sep 17 00:00:00 2001
+From 40d7404c77c19e8716c0f775cec4e0a62def396a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 31 Mar 2020 03:50:42 -0400
 Subject: [PATCH] Remote Connections shouldn't hold up shutdown
diff --git a/Spigot-Server-Patches/0454-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/Spigot-Server-Patches/0453-Do-not-allow-bees-to-load-chunks-for-beehives.patch
similarity index 97%
rename from Spigot-Server-Patches/0454-Do-not-allow-bees-to-load-chunks-for-beehives.patch
rename to Spigot-Server-Patches/0453-Do-not-allow-bees-to-load-chunks-for-beehives.patch
index b577a50e4..aafa752d4 100644
--- a/Spigot-Server-Patches/0454-Do-not-allow-bees-to-load-chunks-for-beehives.patch
+++ b/Spigot-Server-Patches/0453-Do-not-allow-bees-to-load-chunks-for-beehives.patch
@@ -1,4 +1,4 @@
-From 5a1b4b784b89d2420f6d8a1b45e1748c800974fb Mon Sep 17 00:00:00 2001
+From 310aae79b405e0a6edf082650ab962e78ea49419 Mon Sep 17 00:00:00 2001
 From: chickeneer <Paperchickeneer@gmail.com>
 Date: Tue, 17 Mar 2020 14:18:50 -0500
 Subject: [PATCH] Do not allow bees to load chunks for beehives
diff --git a/Spigot-Server-Patches/0455-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/Spigot-Server-Patches/0454-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
similarity index 97%
rename from Spigot-Server-Patches/0455-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
rename to Spigot-Server-Patches/0454-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
index 3475dcfa0..0eb15416d 100644
--- a/Spigot-Server-Patches/0455-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
+++ b/Spigot-Server-Patches/0454-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
@@ -1,4 +1,4 @@
-From 962e7da640e2e9a75a8c83908019edddcae3829b Mon Sep 17 00:00:00 2001
+From 90fd57417baaed7e89b69b50d566f1c709867214 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 2 Apr 2020 01:42:39 -0400
 Subject: [PATCH] Prevent Double PlayerChunkMap adds crashing server
diff --git a/Spigot-Server-Patches/0456-Optimize-Collision-Chunk-lookup-and-avoid-loading-fa.patch b/Spigot-Server-Patches/0455-Optimize-Collision-Chunk-lookup-and-avoid-loading-fa.patch
similarity index 97%
rename from Spigot-Server-Patches/0456-Optimize-Collision-Chunk-lookup-and-avoid-loading-fa.patch
rename to Spigot-Server-Patches/0455-Optimize-Collision-Chunk-lookup-and-avoid-loading-fa.patch
index 5fc70d00c..03553e083 100644
--- a/Spigot-Server-Patches/0456-Optimize-Collision-Chunk-lookup-and-avoid-loading-fa.patch
+++ b/Spigot-Server-Patches/0455-Optimize-Collision-Chunk-lookup-and-avoid-loading-fa.patch
@@ -1,4 +1,4 @@
-From f6d2192e47570cffa14bbbdab869f0b5b6b64480 Mon Sep 17 00:00:00 2001
+From 9cbd4431e864f4aec5b27d1a38170ac38cb58f49 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 2 Apr 2020 02:37:57 -0400
 Subject: [PATCH] Optimize Collision Chunk lookup and avoid loading far chunks
diff --git a/Spigot-Server-Patches/0457-Don-t-tick-dead-players.patch b/Spigot-Server-Patches/0456-Don-t-tick-dead-players.patch
similarity index 93%
rename from Spigot-Server-Patches/0457-Don-t-tick-dead-players.patch
rename to Spigot-Server-Patches/0456-Don-t-tick-dead-players.patch
index ad3efcd62..7d3a00d9c 100644
--- a/Spigot-Server-Patches/0457-Don-t-tick-dead-players.patch
+++ b/Spigot-Server-Patches/0456-Don-t-tick-dead-players.patch
@@ -1,4 +1,4 @@
-From d2462ffcb109088a92453395be60af2f8d1bc0b8 Mon Sep 17 00:00:00 2001
+From a67f9741d7c7d35f3408b12b30eebfe2383a2173 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 2 Apr 2020 17:16:48 -0400
 Subject: [PATCH] Don't tick dead players
diff --git a/Spigot-Server-Patches/0458-Dead-Player-s-shouldn-t-be-able-to-move.patch b/Spigot-Server-Patches/0457-Dead-Player-s-shouldn-t-be-able-to-move.patch
similarity index 93%
rename from Spigot-Server-Patches/0458-Dead-Player-s-shouldn-t-be-able-to-move.patch
rename to Spigot-Server-Patches/0457-Dead-Player-s-shouldn-t-be-able-to-move.patch
index 9652d71e5..c5706e55b 100644
--- a/Spigot-Server-Patches/0458-Dead-Player-s-shouldn-t-be-able-to-move.patch
+++ b/Spigot-Server-Patches/0457-Dead-Player-s-shouldn-t-be-able-to-move.patch
@@ -1,4 +1,4 @@
-From abbbd696fcbb14464f8b2b29c3050377e9c7e313 Mon Sep 17 00:00:00 2001
+From 9c3bb8f984d90d1cd524373bd6da84595fc401d9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 2 Apr 2020 19:31:16 -0400
 Subject: [PATCH] Dead Player's shouldn't be able to move
diff --git a/Spigot-Server-Patches/0459-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch b/Spigot-Server-Patches/0458-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
similarity index 99%
rename from Spigot-Server-Patches/0459-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
rename to Spigot-Server-Patches/0458-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
index 8b14b9488..501c1382c 100644
--- a/Spigot-Server-Patches/0459-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
+++ b/Spigot-Server-Patches/0458-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
@@ -1,4 +1,4 @@
-From 4134905d5d67b984c29785aa279cd0fb91c73140 Mon Sep 17 00:00:00 2001
+From 0334ff412d2daf9879c4bed4f7a948163a6e4de6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 8 Apr 2020 03:06:30 -0400
 Subject: [PATCH] Optimize PlayerChunkMap memory use for visibleChunks
diff --git a/Spigot-Server-Patches/0460-Don-t-load-chunks-when-attempting-to-unload-a-chunk.patch b/Spigot-Server-Patches/0459-Don-t-load-chunks-when-attempting-to-unload-a-chunk.patch
similarity index 96%
rename from Spigot-Server-Patches/0460-Don-t-load-chunks-when-attempting-to-unload-a-chunk.patch
rename to Spigot-Server-Patches/0459-Don-t-load-chunks-when-attempting-to-unload-a-chunk.patch
index 6d7f616fa..34c9e4a9c 100644
--- a/Spigot-Server-Patches/0460-Don-t-load-chunks-when-attempting-to-unload-a-chunk.patch
+++ b/Spigot-Server-Patches/0459-Don-t-load-chunks-when-attempting-to-unload-a-chunk.patch
@@ -1,4 +1,4 @@
-From 26c14df6c071265aaf95a7cb16fdecc0fb8caddc Mon Sep 17 00:00:00 2001
+From b4cee43a0e0e462c614612c41e7154d2ec56703a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 8 Apr 2020 21:07:08 -0400
 Subject: [PATCH] Don't load chunks when attempting to unload a chunk
diff --git a/Spigot-Server-Patches/0461-Increase-Light-Queue-Size.patch b/Spigot-Server-Patches/0460-Increase-Light-Queue-Size.patch
similarity index 96%
rename from Spigot-Server-Patches/0461-Increase-Light-Queue-Size.patch
rename to Spigot-Server-Patches/0460-Increase-Light-Queue-Size.patch
index a70889637..cb7d7579e 100644
--- a/Spigot-Server-Patches/0461-Increase-Light-Queue-Size.patch
+++ b/Spigot-Server-Patches/0460-Increase-Light-Queue-Size.patch
@@ -1,4 +1,4 @@
-From e1153f57b2ad89bb3036887742013b493efb2117 Mon Sep 17 00:00:00 2001
+From b9783e90e9975c0990f18e92a0c4fd0e15f9772e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 8 Apr 2020 21:24:05 -0400
 Subject: [PATCH] Increase Light Queue Size
diff --git a/Spigot-Server-Patches/0462-Speed-up-processing-of-chunk-loads-and-generation.patch b/Spigot-Server-Patches/0461-Speed-up-processing-of-chunk-loads-and-generation.patch
similarity index 99%
rename from Spigot-Server-Patches/0462-Speed-up-processing-of-chunk-loads-and-generation.patch
rename to Spigot-Server-Patches/0461-Speed-up-processing-of-chunk-loads-and-generation.patch
index 3009eff80..5595a1298 100644
--- a/Spigot-Server-Patches/0462-Speed-up-processing-of-chunk-loads-and-generation.patch
+++ b/Spigot-Server-Patches/0461-Speed-up-processing-of-chunk-loads-and-generation.patch
@@ -1,4 +1,4 @@
-From 665aad14dce0eb101630440132805dccc9f2aefe Mon Sep 17 00:00:00 2001
+From a7827fe0ade0d2345c605f97c29de347ae9b9068 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 9 Apr 2020 00:09:26 -0400
 Subject: [PATCH] Speed up processing of chunk loads and generation
diff --git a/Spigot-Server-Patches/0463-Don-t-move-existing-players-to-world-spawn.patch b/Spigot-Server-Patches/0462-Don-t-move-existing-players-to-world-spawn.patch
similarity index 97%
rename from Spigot-Server-Patches/0463-Don-t-move-existing-players-to-world-spawn.patch
rename to Spigot-Server-Patches/0462-Don-t-move-existing-players-to-world-spawn.patch
index e0250e453..0ebdd17b3 100644
--- a/Spigot-Server-Patches/0463-Don-t-move-existing-players-to-world-spawn.patch
+++ b/Spigot-Server-Patches/0462-Don-t-move-existing-players-to-world-spawn.patch
@@ -1,4 +1,4 @@
-From 404a073a8857173b0ce83f1defeda6ec6fe3049c Mon Sep 17 00:00:00 2001
+From 32a7fbdd5eb09cbfb7138e95e1510318b8f3685c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 9 Apr 2020 21:20:33 -0400
 Subject: [PATCH] Don't move existing players to world spawn
diff --git a/Spigot-Server-Patches/0464-Add-tick-times-API-and-mspt-command.patch b/Spigot-Server-Patches/0463-Add-tick-times-API-and-mspt-command.patch
similarity index 98%
rename from Spigot-Server-Patches/0464-Add-tick-times-API-and-mspt-command.patch
rename to Spigot-Server-Patches/0463-Add-tick-times-API-and-mspt-command.patch
index c834ec9b4..eb3cac1a9 100644
--- a/Spigot-Server-Patches/0464-Add-tick-times-API-and-mspt-command.patch
+++ b/Spigot-Server-Patches/0463-Add-tick-times-API-and-mspt-command.patch
@@ -1,4 +1,4 @@
-From cfb50538f4ae30ec9bef1c562944e001e795b106 Mon Sep 17 00:00:00 2001
+From d59d2987b177789993dfb2f403ff895ba0097548 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 5 Apr 2020 22:23:14 -0500
 Subject: [PATCH] Add tick times API and /mspt command
diff --git a/Spigot-Server-Patches/0465-Expose-MinecraftServer-isRunning.patch b/Spigot-Server-Patches/0464-Expose-MinecraftServer-isRunning.patch
similarity index 93%
rename from Spigot-Server-Patches/0465-Expose-MinecraftServer-isRunning.patch
rename to Spigot-Server-Patches/0464-Expose-MinecraftServer-isRunning.patch
index 1014d4c9e..278ed4a5e 100644
--- a/Spigot-Server-Patches/0465-Expose-MinecraftServer-isRunning.patch
+++ b/Spigot-Server-Patches/0464-Expose-MinecraftServer-isRunning.patch
@@ -1,4 +1,4 @@
-From 8c8cada8283a3fa73fa0089b4f554244442e48a0 Mon Sep 17 00:00:00 2001
+From 54f024d408679baaaaad219aeb853145ca144554 Mon Sep 17 00:00:00 2001
 From: JRoy <joshroy126@gmail.com>
 Date: Fri, 10 Apr 2020 21:24:12 -0400
 Subject: [PATCH] Expose MinecraftServer#isRunning
diff --git a/Spigot-Server-Patches/0466-Implement-Chunk-Priority-Urgency-System-for-World-Ge.patch b/Spigot-Server-Patches/0465-Implement-Chunk-Priority-Urgency-System-for-World-Ge.patch
similarity index 99%
rename from Spigot-Server-Patches/0466-Implement-Chunk-Priority-Urgency-System-for-World-Ge.patch
rename to Spigot-Server-Patches/0465-Implement-Chunk-Priority-Urgency-System-for-World-Ge.patch
index 8fcac9fb8..5c3d57196 100644
--- a/Spigot-Server-Patches/0466-Implement-Chunk-Priority-Urgency-System-for-World-Ge.patch
+++ b/Spigot-Server-Patches/0465-Implement-Chunk-Priority-Urgency-System-for-World-Ge.patch
@@ -1,4 +1,4 @@
-From e5f47c1c4318542b46e6297c40cd2b5ac306ffb9 Mon Sep 17 00:00:00 2001
+From dbdeade181e9720106c3ac60c465319597d3518a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 11 Apr 2020 03:56:07 -0400
 Subject: [PATCH] Implement Chunk Priority / Urgency System for World Gen
diff --git a/Spigot-Server-Patches/0467-Remove-streams-from-Mob-AI-System.patch b/Spigot-Server-Patches/0466-Remove-streams-from-Mob-AI-System.patch
similarity index 99%
rename from Spigot-Server-Patches/0467-Remove-streams-from-Mob-AI-System.patch
rename to Spigot-Server-Patches/0466-Remove-streams-from-Mob-AI-System.patch
index ec9860540..56f695fef 100644
--- a/Spigot-Server-Patches/0467-Remove-streams-from-Mob-AI-System.patch
+++ b/Spigot-Server-Patches/0466-Remove-streams-from-Mob-AI-System.patch
@@ -1,4 +1,4 @@
-From 31cd409fd68946bc43008a237ff6627c905d6633 Mon Sep 17 00:00:00 2001
+From a8fd3e2cf63e7e90ff0a8b6ee253b067fcf606f2 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <spottedleaf@spottedleaf.dev>
 Date: Mon, 6 Apr 2020 17:53:29 -0700
 Subject: [PATCH] Remove streams from Mob AI System