From 89a1469d3f74061b350f846caf9a929243a94a2b Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Tue, 14 May 2019 14:54:32 -0700
Subject: [PATCH] Resolve memory leak involving TileEntities

Their chunk is set to null before removal, so we kept them around.
---
 ...0248-Configurable-Bed-Search-Radius.patch} |  6 +++---
 ...I.patch => 0249-Vex-getSummoner-API.patch} |  6 +++---
 ...ventory-when-cancelling-PlayerInter.patch} |  4 ++--
 ...e-the-Entity-Random-seed-for-squids.patch} |  4 ++--
 ...illa-entity-warnings-for-duplicates.patch} |  4 ++--
 ...-if-stack-size-above-max-stack-size.patch} |  4 ++--
 ...54-Use-asynchronous-Log4j-2-loggers.patch} |  6 +++---
 ...more-information-to-Entity.toString.patch} |  4 ++--
 ...es-option-to-debug-dupe-uuid-issues.patch} | 10 +++++-----
 ...ts.patch => 0257-EnderDragon-Events.patch} |  8 ++++----
 ...atch => 0258-PlayerElytraBoostEvent.patch} |  4 ++--
 ...=> 0259-PlayerLaunchProjectileEvent.patch} | 14 ++++++-------
 ...Speedup-BlockPos-by-fixing-inlining.patch} |  6 +++---
 ...tch => 0261-Don-t-save-Proto-Chunks.patch} |  4 ++--
 ...patch => 0262-Optimize-RegistryID.c.patch} |  4 ++--
 ...-armor-stands-from-doing-entity-loo.patch} |  8 ++++----
 ...-Vanished-players-don-t-have-rights.patch} | 12 +++++------
 ...anytime-entities-change-to-guarante.patch} |  4 ++--
 ...d-some-Debug-to-Chunk-Entity-slices.patch} |  6 +++---
 ...atch => 0267-EntityTransformedEvent.patch} | 10 +++++-----
 ...tch => 0268-SkeletonHorse-Additions.patch} |  8 ++++----
 ...event-Saving-Bad-entities-to-chunks.patch} |  4 ++--
 ...n-t-call-getItemMeta-on-hasItemMeta.patch} |  6 +++---
 ...ad-Entities-in-entityList-iteration.patch} | 12 +++++------
 ...-use-a-versioned-world-folder-for-t.patch} |  8 ++++----
 ...73-MC-111480-Start-Entity-ID-s-at-1.patch} |  4 ++--
 ...4-Implement-Expanded-ArmorStand-API.patch} |  6 +++---
 ...vent.patch => 0275-AnvilDamageEvent.patch} |  4 ++--
 ...ent.patch => 0276-Add-TNTPrimeEvent.patch} |  8 ++++----
 ...d-make-tab-spam-limits-configurable.patch} |  6 +++---
 ...h => 0278-Add-hand-to-bucket-events.patch} |  8 ++++----
 ...-Experience-should-save-as-Integers.patch} |  4 ++--
 ...ent-rendering-skulls-from-same-user.patch} | 10 +++++-----
 ...d-Early-Warning-Feature-to-WatchDog.patch} | 12 +++++------
 ...0282-Make-EnderDragon-implement-Mob.patch} |  4 ++--
 ...ect-and-repair-corrupt-Region-Files.patch} |  4 ++--
 ...4-Use-ConcurrentHashMap-in-JsonList.patch} |  4 ++--
 ...5-Use-a-Queue-for-Queueing-Commands.patch} |  4 ++--
 ...le-Entities-from-a-chunk-without-sn.patch} |  4 ++--
 ...llow-disabling-armour-stand-ticking.patch} | 10 +++++-----
 ...timize-BlockPosition-helper-methods.patch} |  4 ++--
 ...ts-from-world-player-list-not-serve.patch} | 12 +++++------
 ...tore-vanlla-default-mob-spawn-range.patch} |  4 ++--
 ...pers.patch => 0291-Optimize-Hoppers.patch} | 12 +++++------
 ...92-Optimize-CraftBlockData-Creation.patch} |  6 +++---
 ...-124320.patch => 0293-Fix-MC-124320.patch} |  6 +++---
 ...tch => 0294-Slime-Pathfinder-Events.patch} |  6 +++---
 ...e-speed-for-water-flowing-over-lava.patch} |  6 +++---
 ... => 0296-Optimize-RegistryMaterials.patch} |  4 ++--
 ...ch => 0297-Add-PhantomPreSpawnEvent.patch} |  8 ++++----
 ....patch => 0298-Add-More-Creeper-API.patch} |  6 +++---
 ...=> 0299-Inventory-removeItemAnySlot.patch} |  4 ++--
 ...oadChunk-int-int-false-load-unconve.patch} |  4 ++--
 ...ray-tracing-methods-to-LivingEntity.patch} |  6 +++---
 ...-attack-cooldown-methods-for-Player.patch} |  6 +++---
 ....patch => 0303-Improve-death-events.patch} | 20 +++++++++----------
 ...w-chests-to-be-placed-with-NBT-data.patch} |  6 +++---
 ...I.patch => 0305-Mob-Pathfinding-API.patch} | 12 +++++------
 ...nt-chunk-loading-from-Fluid-Flowing.patch} |  4 ++--
 ...for-CanPlaceOn-and-CanDestroy-NBT-v.patch} |  6 +++---
 ...nt-Mob-AI-Rules-from-Loading-Chunks.patch} |  8 ++++----
 ...ning-from-loading-generating-chunks.patch} |  4 ++--
 ...-Biome-Mob-Lookups-for-Mob-Spawning.patch} |  4 ++--
 ...t-furnace-cook-speed-multiplier-API.patch} |  6 +++---
 ...0312-Support-Overriding-World-Seeds.patch} | 10 +++++-----
 ...h => 0313-Optimize-Server-World-Map.patch} |  6 +++---
 ....patch => 0314-PreSpawnerSpawnEvent.patch} |  4 ++--
 ...rseException-in-Entity-and-TE-names.patch} | 12 +++++------
 ... 0316-Avoid-dimension-id-collisions.patch} |  4 ++--
 ...=> 0317-Honor-EntityAgeable.ageLock.patch} |  4 ++--
 ...-recheck-type-after-setting-a-block.patch} |  4 ++--
 ...le-connection-throttle-kick-message.patch} |  6 +++---
 ...> 0320-Hook-into-CB-plugin-rewrites.patch} |  4 ++--
 ...21-Allow-setting-the-vex-s-summoner.patch} |  6 +++---
 ...I.patch => 0322-Add-sun-related-API.patch} | 10 +++++-----
 ...wned-for-Villager-Aggression-Config.patch} |  4 ++--
 ...-Johnny.patch => 0324-Here-s-Johnny.patch} |  6 +++---
 ...Turtle-API.patch => 0325-Turtle-API.patch} |  6 +++---
 ...it-lightning-strike-effect-distance.patch} | 10 +++++-----
 ...her-worlds-for-shooter-of-projectil.patch} |  4 ++--
 ...Call-player-spectator-target-events.patch} |  4 ++--
 ...-Add-Velocity-IP-Forwarding-Support.patch} | 16 +++++++--------
 ...PI.patch => 0330-Add-more-Witch-API.patch} |  6 +++---
 ...MC-93764.patch => 0331-Fix-MC-93764.patch} |  4 ++--
 ...vent-players-from-moving-into-unloa.patch} |  6 +++---
 ...3-Reset-players-airTicks-on-respawn.patch} |  6 +++---
 ...-area-unicode-characters-from-signs.patch} |  4 ++--
 ...after-profile-lookups-if-not-needed.patch} |  4 ++--
 ...le-thread-count-default-for-bootstr.patch} |  4 ++--
 ...id-item-for-enchantment-checks-on-b.patch} |  4 ++--
 ...=> 0338-Optimize-World-Time-Updates.patch} |  4 ++--
 ...tore-custom-InventoryHolder-support.patch} |  4 ++--
 ...=> 0340-Use-Vanilla-Minecart-Speeds.patch} |  4 ++--
 ...0341-Fix-SpongeAbsortEvent-handling.patch} |  6 +++---
 ...-allow-digging-into-unloaded-chunks.patch} |  4 ++--
 ...=> 0343-Optimize-redstone-algorithm.patch} | 12 +++++------
 ...ntity-dismount-during-teleportation.patch} | 10 +++++-----
 ...mits.patch => 0345-Book-Size-Limits.patch} |  6 +++---
 ...ult-permission-message-configurable.patch} |  6 +++---
 ...I.patch => 0347-Add-more-Zombie-API.patch} |  8 ++++----
 ...revent-rayTrace-from-loading-chunks.patch} |  4 ++--
 ...-Large-Packets-disconnecting-client.patch} | 12 +++++------
 ...world-storage-in-CraftOfflinePlayer.patch} |  4 ++--
 ...0351-Add-PlayerConnectionCloseEvent.patch} |  6 +++---
 ...revent-Enderman-from-loading-chunks.patch} |  4 ++--
 ...replace-OfflinePlayer-getLastPlayed.patch} | 10 +++++-----
 ...tch => 0354-Fix-PlayerEditBookEvent.patch} |  4 ++--
 ...ehicle-tracking-issue-on-disconnect.patch} |  4 ++--
 ...nRetractEvent-for-all-empty-pistons.patch} |  4 ++--
 ...remove-from-being-called-on-Players.patch} |  4 ++--
 ...58-Allow-Saving-of-Oversized-Chunks.patch} | 10 +++++-----
 ...ent.patch => 0359-BlockDestroyEvent.patch} |  4 ++--
 ...m-Shapeless-Custom-Crafting-Recipes.patch} |  4 ++--
 ...h => 0361-Fix-sign-edit-memory-leak.patch} |  6 +++---
 ... 0362-Limit-Client-Sign-length-more.patch} |  4 ++--
 ...onvertSigns-boolean-every-sign-save.patch} |  4 ++--
 ...Signs-in-Chunks-creating-too-large-.patch} |  8 ++++----
 ...-Fix-Whitelist-On-Off-inconsistency.patch} |  6 +++---
 ...t-tick-at-start-of-drowning-process.patch} |  4 ++--
 ...ggleEvent-when-whitelist-is-toggled.patch} |  4 ++--
 ...68-Add-LivingEntity-getTargetEntity.patch} | 12 +++++------
 ...ngth-when-serialising-BungeeCord-te.patch} |  4 ++--
 ...=> 0370-Entity-getEntitySpawnReason.patch} | 10 +++++-----
 ...ty-Metadata-for-all-tracked-players.patch} |  6 +++---
 ...tch => 0372-Fire-event-on-GS4-query.patch} |  8 ++++----
 ...73-Implement-PlayerPostRespawnEvent.patch} |  4 ++--
 ...for-pickupDelay-breaks-picking-up-i.patch} |  4 ++--
 ...-and-setters-for-EntityItem-owner-a.patch} |  4 ++--
 ...ts.patch => 0376-Server-Tick-Events.patch} |  4 ++--
 ...377-PlayerDeathEvent-getItemsToKeep.patch} |  4 ++--
 ...78-Optimize-Persistent-Data-Loading.patch} |  4 ++--
 ...s-to-fire-only-after-the-server-plu.patch} |  6 +++---
 ...ion-files-more-reliable-to-write-to.patch} |  4 ++--
 ...mize-GameRules-to-use-LinkedHashMap.patch} |  6 +++---
 ...Optimize-Captured-TileEntity-Lookup.patch} |  6 +++---
 ...API.patch => 0383-Add-Heightmap-API.patch} |  6 +++---
 ...4-Handle-bad-chunks-more-gracefully.patch} |  4 ++--
 ...> 0385-Mob-Spawner-API-Enhancements.patch} |  6 +++---
 ...-t-NPE-on-dimensionmanager-toString.patch} |  4 ++--
 ...ayer-View-Distance-API-placeholders.patch} |  8 ++++----
 ...tch => 0388-Async-Chunk-placeholder.patch} |  4 ++--
 ...-to-changed-postToMainThread-method.patch} |  4 ++--
 ...-item-frames-are-modified-MC-123450.patch} |  6 +++---
 ...se-RegionFiles-when-they-get-evicte.patch} |  4 ++--
 ...392-Fix-CraftServer-isPrimaryThread.patch} |  2 +-
 ...ups-for-Entity-TileEntity-Current-Ch.patch |  6 ++++++
 146 files changed, 450 insertions(+), 444 deletions(-)
 rename Spigot-Server-Patches/{0249-Configurable-Bed-Search-Radius.patch => 0248-Configurable-Bed-Search-Radius.patch} (97%)
 rename Spigot-Server-Patches/{0250-Vex-getSummoner-API.patch => 0249-Vex-getSummoner-API.patch} (92%)
 rename Spigot-Server-Patches/{0251-Refresh-player-inventory-when-cancelling-PlayerInter.patch => 0250-Refresh-player-inventory-when-cancelling-PlayerInter.patch} (92%)
 rename Spigot-Server-Patches/{0252-Don-t-change-the-Entity-Random-seed-for-squids.patch => 0251-Don-t-change-the-Entity-Random-seed-for-squids.patch} (88%)
 rename Spigot-Server-Patches/{0253-Re-add-vanilla-entity-warnings-for-duplicates.patch => 0252-Re-add-vanilla-entity-warnings-for-duplicates.patch} (92%)
 rename Spigot-Server-Patches/{0254-Avoid-item-merge-if-stack-size-above-max-stack-size.patch => 0253-Avoid-item-merge-if-stack-size-above-max-stack-size.patch} (90%)
 rename Spigot-Server-Patches/{0255-Use-asynchronous-Log4j-2-loggers.patch => 0254-Use-asynchronous-Log4j-2-loggers.patch} (88%)
 rename Spigot-Server-Patches/{0256-add-more-information-to-Entity.toString.patch => 0255-add-more-information-to-Entity.toString.patch} (93%)
 rename Spigot-Server-Patches/{0257-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch => 0256-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch} (96%)
 rename Spigot-Server-Patches/{0258-EnderDragon-Events.patch => 0257-EnderDragon-Events.patch} (95%)
 rename Spigot-Server-Patches/{0259-PlayerElytraBoostEvent.patch => 0258-PlayerElytraBoostEvent.patch} (94%)
 rename Spigot-Server-Patches/{0260-PlayerLaunchProjectileEvent.patch => 0259-PlayerLaunchProjectileEvent.patch} (98%)
 rename Spigot-Server-Patches/{0261-Speedup-BlockPos-by-fixing-inlining.patch => 0260-Speedup-BlockPos-by-fixing-inlining.patch} (98%)
 rename Spigot-Server-Patches/{0262-Don-t-save-Proto-Chunks.patch => 0261-Don-t-save-Proto-Chunks.patch} (91%)
 rename Spigot-Server-Patches/{0263-Optimize-RegistryID.c.patch => 0262-Optimize-RegistryID.c.patch} (95%)
 rename Spigot-Server-Patches/{0264-Option-to-prevent-armor-stands-from-doing-entity-loo.patch => 0263-Option-to-prevent-armor-stands-from-doing-entity-loo.patch} (89%)
 rename Spigot-Server-Patches/{0265-Vanished-players-don-t-have-rights.patch => 0264-Vanished-players-don-t-have-rights.patch} (95%)
 rename Spigot-Server-Patches/{0266-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch => 0265-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch} (89%)
 rename Spigot-Server-Patches/{0267-Add-some-Debug-to-Chunk-Entity-slices.patch => 0266-Add-some-Debug-to-Chunk-Entity-slices.patch} (95%)
 rename Spigot-Server-Patches/{0268-EntityTransformedEvent.patch => 0267-EntityTransformedEvent.patch} (95%)
 rename Spigot-Server-Patches/{0269-SkeletonHorse-Additions.patch => 0268-SkeletonHorse-Additions.patch} (94%)
 rename Spigot-Server-Patches/{0270-Prevent-Saving-Bad-entities-to-chunks.patch => 0269-Prevent-Saving-Bad-entities-to-chunks.patch} (96%)
 rename Spigot-Server-Patches/{0271-Don-t-call-getItemMeta-on-hasItemMeta.patch => 0270-Don-t-call-getItemMeta-on-hasItemMeta.patch} (97%)
 rename Spigot-Server-Patches/{0272-Ignore-Dead-Entities-in-entityList-iteration.patch => 0271-Ignore-Dead-Entities-in-entityList-iteration.patch} (96%)
 rename Spigot-Server-Patches/{0273-Provide-option-to-use-a-versioned-world-folder-for-t.patch => 0272-Provide-option-to-use-a-versioned-world-folder-for-t.patch} (98%)
 rename Spigot-Server-Patches/{0274-MC-111480-Start-Entity-ID-s-at-1.patch => 0273-MC-111480-Start-Entity-ID-s-at-1.patch} (91%)
 rename Spigot-Server-Patches/{0275-Implement-Expanded-ArmorStand-API.patch => 0274-Implement-Expanded-ArmorStand-API.patch} (97%)
 rename Spigot-Server-Patches/{0276-AnvilDamageEvent.patch => 0275-AnvilDamageEvent.patch} (94%)
 rename Spigot-Server-Patches/{0277-Add-TNTPrimeEvent.patch => 0276-Add-TNTPrimeEvent.patch} (97%)
 rename Spigot-Server-Patches/{0278-Break-up-and-make-tab-spam-limits-configurable.patch => 0277-Break-up-and-make-tab-spam-limits-configurable.patch} (97%)
 rename Spigot-Server-Patches/{0279-Add-hand-to-bucket-events.patch => 0278-Add-hand-to-bucket-events.patch} (98%)
 rename Spigot-Server-Patches/{0280-MC-135506-Experience-should-save-as-Integers.patch => 0279-MC-135506-Experience-should-save-as-Integers.patch} (92%)
 rename Spigot-Server-Patches/{0281-Fix-client-rendering-skulls-from-same-user.patch => 0280-Fix-client-rendering-skulls-from-same-user.patch} (96%)
 rename Spigot-Server-Patches/{0282-Add-Early-Warning-Feature-to-WatchDog.patch => 0281-Add-Early-Warning-Feature-to-WatchDog.patch} (97%)
 rename Spigot-Server-Patches/{0283-Make-EnderDragon-implement-Mob.patch => 0282-Make-EnderDragon-implement-Mob.patch} (93%)
 rename Spigot-Server-Patches/{0284-Detect-and-repair-corrupt-Region-Files.patch => 0283-Detect-and-repair-corrupt-Region-Files.patch} (98%)
 rename Spigot-Server-Patches/{0285-Use-ConcurrentHashMap-in-JsonList.patch => 0284-Use-ConcurrentHashMap-in-JsonList.patch} (97%)
 rename Spigot-Server-Patches/{0286-Use-a-Queue-for-Queueing-Commands.patch => 0285-Use-a-Queue-for-Queueing-Commands.patch} (94%)
 rename Spigot-Server-Patches/{0287-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch => 0286-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch} (92%)
 rename Spigot-Server-Patches/{0288-Allow-disabling-armour-stand-ticking.patch => 0287-Allow-disabling-armour-stand-ticking.patch} (98%)
 rename Spigot-Server-Patches/{0289-Optimize-BlockPosition-helper-methods.patch => 0288-Optimize-BlockPosition-helper-methods.patch} (97%)
 rename Spigot-Server-Patches/{0290-Send-nearby-packets-from-world-player-list-not-serve.patch => 0289-Send-nearby-packets-from-world-player-list-not-serve.patch} (94%)
 rename Spigot-Server-Patches/{0291-Restore-vanlla-default-mob-spawn-range.patch => 0290-Restore-vanlla-default-mob-spawn-range.patch} (87%)
 rename Spigot-Server-Patches/{0292-Optimize-Hoppers.patch => 0291-Optimize-Hoppers.patch} (98%)
 rename Spigot-Server-Patches/{0293-Optimize-CraftBlockData-Creation.patch => 0292-Optimize-CraftBlockData-Creation.patch} (94%)
 rename Spigot-Server-Patches/{0294-Fix-MC-124320.patch => 0293-Fix-MC-124320.patch} (95%)
 rename Spigot-Server-Patches/{0295-Slime-Pathfinder-Events.patch => 0294-Slime-Pathfinder-Events.patch} (98%)
 rename Spigot-Server-Patches/{0296-Configurable-speed-for-water-flowing-over-lava.patch => 0295-Configurable-speed-for-water-flowing-over-lava.patch} (96%)
 rename Spigot-Server-Patches/{0297-Optimize-RegistryMaterials.patch => 0296-Optimize-RegistryMaterials.patch} (94%)
 rename Spigot-Server-Patches/{0298-Add-PhantomPreSpawnEvent.patch => 0297-Add-PhantomPreSpawnEvent.patch} (96%)
 rename Spigot-Server-Patches/{0299-Add-More-Creeper-API.patch => 0298-Add-More-Creeper-API.patch} (95%)
 rename Spigot-Server-Patches/{0300-Inventory-removeItemAnySlot.patch => 0299-Inventory-removeItemAnySlot.patch} (95%)
 rename Spigot-Server-Patches/{0301-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch => 0300-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch} (91%)
 rename Spigot-Server-Patches/{0302-Add-ray-tracing-methods-to-LivingEntity.patch => 0301-Add-ray-tracing-methods-to-LivingEntity.patch} (96%)
 rename Spigot-Server-Patches/{0303-Expose-attack-cooldown-methods-for-Player.patch => 0302-Expose-attack-cooldown-methods-for-Player.patch} (93%)
 rename Spigot-Server-Patches/{0304-Improve-death-events.patch => 0303-Improve-death-events.patch} (98%)
 rename Spigot-Server-Patches/{0305-Allow-chests-to-be-placed-with-NBT-data.patch => 0304-Allow-chests-to-be-placed-with-NBT-data.patch} (91%)
 rename Spigot-Server-Patches/{0306-Mob-Pathfinding-API.patch => 0305-Mob-Pathfinding-API.patch} (97%)
 rename Spigot-Server-Patches/{0307-Prevent-chunk-loading-from-Fluid-Flowing.patch => 0306-Prevent-chunk-loading-from-Fluid-Flowing.patch} (97%)
 rename Spigot-Server-Patches/{0308-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch => 0307-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch} (99%)
 rename Spigot-Server-Patches/{0309-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch => 0308-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch} (96%)
 rename Spigot-Server-Patches/{0310-Prevent-mob-spawning-from-loading-generating-chunks.patch => 0309-Prevent-mob-spawning-from-loading-generating-chunks.patch} (95%)
 rename Spigot-Server-Patches/{0311-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch => 0310-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch} (96%)
 rename Spigot-Server-Patches/{0312-Implement-furnace-cook-speed-multiplier-API.patch => 0311-Implement-furnace-cook-speed-multiplier-API.patch} (96%)
 rename Spigot-Server-Patches/{0313-Support-Overriding-World-Seeds.patch => 0312-Support-Overriding-World-Seeds.patch} (96%)
 rename Spigot-Server-Patches/{0314-Optimize-Server-World-Map.patch => 0313-Optimize-Server-World-Map.patch} (98%)
 rename Spigot-Server-Patches/{0315-PreSpawnerSpawnEvent.patch => 0314-PreSpawnerSpawnEvent.patch} (94%)
 rename Spigot-Server-Patches/{0316-Catch-JsonParseException-in-Entity-and-TE-names.patch => 0315-Catch-JsonParseException-in-Entity-and-TE-names.patch} (95%)
 rename Spigot-Server-Patches/{0317-Avoid-dimension-id-collisions.patch => 0316-Avoid-dimension-id-collisions.patch} (91%)
 rename Spigot-Server-Patches/{0318-Honor-EntityAgeable.ageLock.patch => 0317-Honor-EntityAgeable.ageLock.patch} (86%)
 rename Spigot-Server-Patches/{0319-Don-t-recheck-type-after-setting-a-block.patch => 0318-Don-t-recheck-type-after-setting-a-block.patch} (92%)
 rename Spigot-Server-Patches/{0320-Configurable-connection-throttle-kick-message.patch => 0319-Configurable-connection-throttle-kick-message.patch} (94%)
 rename Spigot-Server-Patches/{0321-Hook-into-CB-plugin-rewrites.patch => 0320-Hook-into-CB-plugin-rewrites.patch} (98%)
 rename Spigot-Server-Patches/{0322-Allow-setting-the-vex-s-summoner.patch => 0321-Allow-setting-the-vex-s-summoner.patch} (90%)
 rename Spigot-Server-Patches/{0323-Add-sun-related-API.patch => 0322-Add-sun-related-API.patch} (91%)
 rename Spigot-Server-Patches/{0324-Check-Drowned-for-Villager-Aggression-Config.patch => 0323-Check-Drowned-for-Villager-Aggression-Config.patch} (93%)
 rename Spigot-Server-Patches/{0325-Here-s-Johnny.patch => 0324-Here-s-Johnny.patch} (92%)
 rename Spigot-Server-Patches/{0326-Turtle-API.patch => 0325-Turtle-API.patch} (98%)
 rename Spigot-Server-Patches/{0327-Limit-lightning-strike-effect-distance.patch => 0326-Limit-lightning-strike-effect-distance.patch} (95%)
 rename Spigot-Server-Patches/{0328-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch => 0327-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch} (94%)
 rename Spigot-Server-Patches/{0329-Call-player-spectator-target-events.patch => 0328-Call-player-spectator-target-events.patch} (96%)
 rename Spigot-Server-Patches/{0330-Add-Velocity-IP-Forwarding-Support.patch => 0329-Add-Velocity-IP-Forwarding-Support.patch} (97%)
 rename Spigot-Server-Patches/{0331-Add-more-Witch-API.patch => 0330-Add-more-Witch-API.patch} (98%)
 rename Spigot-Server-Patches/{0332-Fix-MC-93764.patch => 0331-Fix-MC-93764.patch} (86%)
 rename Spigot-Server-Patches/{0333-Add-option-to-prevent-players-from-moving-into-unloa.patch => 0332-Add-option-to-prevent-players-from-moving-into-unloa.patch} (96%)
 rename Spigot-Server-Patches/{0334-Reset-players-airTicks-on-respawn.patch => 0333-Reset-players-airTicks-on-respawn.patch} (89%)
 rename Spigot-Server-Patches/{0335-Strip-private-area-unicode-characters-from-signs.patch => 0334-Strip-private-area-unicode-characters-from-signs.patch} (97%)
 rename Spigot-Server-Patches/{0336-Don-t-sleep-after-profile-lookups-if-not-needed.patch => 0335-Don-t-sleep-after-profile-lookups-if-not-needed.patch} (94%)
 rename Spigot-Server-Patches/{0337-Use-more-reasonable-thread-count-default-for-bootstr.patch => 0336-Use-more-reasonable-thread-count-default-for-bootstr.patch} (89%)
 rename Spigot-Server-Patches/{0338-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch => 0337-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch} (94%)
 rename Spigot-Server-Patches/{0339-Optimize-World-Time-Updates.patch => 0338-Optimize-World-Time-Updates.patch} (96%)
 rename Spigot-Server-Patches/{0340-Restore-custom-InventoryHolder-support.patch => 0339-Restore-custom-InventoryHolder-support.patch} (95%)
 rename Spigot-Server-Patches/{0341-Use-Vanilla-Minecart-Speeds.patch => 0340-Use-Vanilla-Minecart-Speeds.patch} (91%)
 rename Spigot-Server-Patches/{0342-Fix-SpongeAbsortEvent-handling.patch => 0341-Fix-SpongeAbsortEvent-handling.patch} (93%)
 rename Spigot-Server-Patches/{0343-Don-t-allow-digging-into-unloaded-chunks.patch => 0342-Don-t-allow-digging-into-unloaded-chunks.patch} (91%)
 rename Spigot-Server-Patches/{0344-Optimize-redstone-algorithm.patch => 0343-Optimize-redstone-algorithm.patch} (99%)
 rename Spigot-Server-Patches/{0345-force-entity-dismount-during-teleportation.patch => 0344-force-entity-dismount-during-teleportation.patch} (96%)
 rename Spigot-Server-Patches/{0346-Book-Size-Limits.patch => 0345-Book-Size-Limits.patch} (96%)
 rename Spigot-Server-Patches/{0347-Make-the-default-permission-message-configurable.patch => 0346-Make-the-default-permission-message-configurable.patch} (94%)
 rename Spigot-Server-Patches/{0348-Add-more-Zombie-API.patch => 0347-Add-more-Zombie-API.patch} (96%)
 rename Spigot-Server-Patches/{0349-Prevent-rayTrace-from-loading-chunks.patch => 0348-Prevent-rayTrace-from-loading-chunks.patch} (93%)
 rename Spigot-Server-Patches/{0350-Handle-Large-Packets-disconnecting-client.patch => 0349-Handle-Large-Packets-disconnecting-client.patch} (95%)
 rename Spigot-Server-Patches/{0351-Lazy-init-world-storage-in-CraftOfflinePlayer.patch => 0350-Lazy-init-world-storage-in-CraftOfflinePlayer.patch} (96%)
 rename Spigot-Server-Patches/{0352-Add-PlayerConnectionCloseEvent.patch => 0351-Add-PlayerConnectionCloseEvent.patch} (97%)
 rename Spigot-Server-Patches/{0353-Prevent-Enderman-from-loading-chunks.patch => 0352-Prevent-Enderman-from-loading-chunks.patch} (95%)
 rename Spigot-Server-Patches/{0354-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch => 0353-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch} (96%)
 rename Spigot-Server-Patches/{0355-Fix-PlayerEditBookEvent.patch => 0354-Fix-PlayerEditBookEvent.patch} (94%)
 rename Spigot-Server-Patches/{0356-Workaround-for-vehicle-tracking-issue-on-disconnect.patch => 0355-Workaround-for-vehicle-tracking-issue-on-disconnect.patch} (90%)
 rename Spigot-Server-Patches/{0357-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch => 0356-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch} (96%)
 rename Spigot-Server-Patches/{0358-Block-Entity-remove-from-being-called-on-Players.patch => 0357-Block-Entity-remove-from-being-called-on-Players.patch} (93%)
 rename Spigot-Server-Patches/{0359-Allow-Saving-of-Oversized-Chunks.patch => 0358-Allow-Saving-of-Oversized-Chunks.patch} (99%)
 rename Spigot-Server-Patches/{0360-BlockDestroyEvent.patch => 0359-BlockDestroyEvent.patch} (95%)
 rename Spigot-Server-Patches/{0361-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch => 0360-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch} (96%)
 rename Spigot-Server-Patches/{0362-Fix-sign-edit-memory-leak.patch => 0361-Fix-sign-edit-memory-leak.patch} (94%)
 rename Spigot-Server-Patches/{0363-Limit-Client-Sign-length-more.patch => 0362-Limit-Client-Sign-length-more.patch} (96%)
 rename Spigot-Server-Patches/{0364-Don-t-check-ConvertSigns-boolean-every-sign-save.patch => 0363-Don-t-check-ConvertSigns-boolean-every-sign-save.patch} (93%)
 rename Spigot-Server-Patches/{0365-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch => 0364-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch} (95%)
 rename Spigot-Server-Patches/{0366-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch => 0365-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch} (95%)
 rename Spigot-Server-Patches/{0367-Set-Zombie-last-tick-at-start-of-drowning-process.patch => 0366-Set-Zombie-last-tick-at-start-of-drowning-process.patch} (89%)
 rename Spigot-Server-Patches/{0368-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch => 0367-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch} (87%)
 rename Spigot-Server-Patches/{0369-Add-LivingEntity-getTargetEntity.patch => 0368-Add-LivingEntity-getTargetEntity.patch} (96%)
 rename Spigot-Server-Patches/{0370-Use-proper-max-length-when-serialising-BungeeCord-te.patch => 0369-Use-proper-max-length-when-serialising-BungeeCord-te.patch} (94%)
 rename Spigot-Server-Patches/{0371-Entity-getEntitySpawnReason.patch => 0370-Entity-getEntitySpawnReason.patch} (96%)
 rename Spigot-Server-Patches/{0372-Update-entity-Metadata-for-all-tracked-players.patch => 0371-Update-entity-Metadata-for-all-tracked-players.patch} (92%)
 rename Spigot-Server-Patches/{0373-Fire-event-on-GS4-query.patch => 0372-Fire-event-on-GS4-query.patch} (98%)
 rename Spigot-Server-Patches/{0374-Implement-PlayerPostRespawnEvent.patch => 0373-Implement-PlayerPostRespawnEvent.patch} (95%)
 rename Spigot-Server-Patches/{0375-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch => 0374-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch} (93%)
 rename Spigot-Server-Patches/{0376-Implement-getters-and-setters-for-EntityItem-owner-a.patch => 0375-Implement-getters-and-setters-for-EntityItem-owner-a.patch} (93%)
 rename Spigot-Server-Patches/{0377-Server-Tick-Events.patch => 0376-Server-Tick-Events.patch} (93%)
 rename Spigot-Server-Patches/{0378-PlayerDeathEvent-getItemsToKeep.patch => 0377-PlayerDeathEvent-getItemsToKeep.patch} (96%)
 rename Spigot-Server-Patches/{0379-Optimize-Persistent-Data-Loading.patch => 0378-Optimize-Persistent-Data-Loading.patch} (96%)
 rename Spigot-Server-Patches/{0380-Allow-login-events-to-fire-only-after-the-server-plu.patch => 0379-Allow-login-events-to-fire-only-after-the-server-plu.patch} (95%)
 rename Spigot-Server-Patches/{0381-Make-region-files-more-reliable-to-write-to.patch => 0380-Make-region-files-more-reliable-to-write-to.patch} (98%)
 rename Spigot-Server-Patches/{0382-Optimize-GameRules-to-use-LinkedHashMap.patch => 0381-Optimize-GameRules-to-use-LinkedHashMap.patch} (96%)
 rename Spigot-Server-Patches/{0383-Optimize-Captured-TileEntity-Lookup.patch => 0382-Optimize-Captured-TileEntity-Lookup.patch} (89%)
 rename Spigot-Server-Patches/{0384-Add-Heightmap-API.patch => 0383-Add-Heightmap-API.patch} (94%)
 rename Spigot-Server-Patches/{0385-Handle-bad-chunks-more-gracefully.patch => 0384-Handle-bad-chunks-more-gracefully.patch} (96%)
 rename Spigot-Server-Patches/{0386-Mob-Spawner-API-Enhancements.patch => 0385-Mob-Spawner-API-Enhancements.patch} (97%)
 rename Spigot-Server-Patches/{0387-don-t-NPE-on-dimensionmanager-toString.patch => 0386-don-t-NPE-on-dimensionmanager-toString.patch} (95%)
 rename Spigot-Server-Patches/{0388-Per-Player-View-Distance-API-placeholders.patch => 0387-Per-Player-View-Distance-API-placeholders.patch} (95%)
 rename Spigot-Server-Patches/{0389-Async-Chunk-placeholder.patch => 0388-Async-Chunk-placeholder.patch} (92%)
 rename Spigot-Server-Patches/{0390-Fix-CB-call-to-changed-postToMainThread-method.patch => 0389-Fix-CB-call-to-changed-postToMainThread-method.patch} (88%)
 rename Spigot-Server-Patches/{0391-Fix-sounds-when-item-frames-are-modified-MC-123450.patch => 0390-Fix-sounds-when-item-frames-are-modified-MC-123450.patch} (92%)
 rename Spigot-Server-Patches/{0392-Fix-MC-151674-Close-RegionFiles-when-they-get-evicte.patch => 0391-Fix-MC-151674-Close-RegionFiles-when-they-get-evicte.patch} (89%)
 rename Spigot-Server-Patches/{0393-Fix-CraftServer-isPrimaryThread.patch => 0392-Fix-CraftServer-isPrimaryThread.patch} (94%)
 rename {Spigot-Server-Patches => removed/1.14}/0248-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch (96%)

diff --git a/Spigot-Server-Patches/0249-Configurable-Bed-Search-Radius.patch b/Spigot-Server-Patches/0248-Configurable-Bed-Search-Radius.patch
similarity index 97%
rename from Spigot-Server-Patches/0249-Configurable-Bed-Search-Radius.patch
rename to Spigot-Server-Patches/0248-Configurable-Bed-Search-Radius.patch
index 1a2fb77145..205643462b 100644
--- a/Spigot-Server-Patches/0249-Configurable-Bed-Search-Radius.patch
+++ b/Spigot-Server-Patches/0248-Configurable-Bed-Search-Radius.patch
@@ -1,4 +1,4 @@
-From 3594eb0377ceba8b900106232665a5a88440a9ca Mon Sep 17 00:00:00 2001
+From 41222eb065b39b4d29971c7d1b570ebca24305c0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 15:22:06 -0400
 Subject: [PATCH] Configurable Bed Search Radius
@@ -10,7 +10,7 @@ player at their bed should it of became obstructed.
 Defaults to vanilla 1.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 3294fbbea..83e54cb90 100644
+index 3294fbbeaf..83e54cb904 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -375,4 +375,15 @@ public class PaperWorldConfig {
@@ -30,7 +30,7 @@ index 3294fbbea..83e54cb90 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockBed.java b/src/main/java/net/minecraft/server/BlockBed.java
-index 3ef19c0c2..07e530666 100644
+index 3ef19c0c2e..07e530666e 100644
 --- a/src/main/java/net/minecraft/server/BlockBed.java
 +++ b/src/main/java/net/minecraft/server/BlockBed.java
 @@ -171,6 +171,58 @@ public class BlockBed extends BlockFacingHorizontal implements ITileEntity {
diff --git a/Spigot-Server-Patches/0250-Vex-getSummoner-API.patch b/Spigot-Server-Patches/0249-Vex-getSummoner-API.patch
similarity index 92%
rename from Spigot-Server-Patches/0250-Vex-getSummoner-API.patch
rename to Spigot-Server-Patches/0249-Vex-getSummoner-API.patch
index e53b9d9bc9..8fec71eeba 100644
--- a/Spigot-Server-Patches/0250-Vex-getSummoner-API.patch
+++ b/Spigot-Server-Patches/0249-Vex-getSummoner-API.patch
@@ -1,4 +1,4 @@
-From 6632389d447a05bff72b0ec4fa3c3d2c798caa3d Mon Sep 17 00:00:00 2001
+From 031e2b3a398bd8d0bb64f2b939bf29b870492469 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 15:30:22 -0400
 Subject: [PATCH] Vex#getSummoner API
@@ -6,7 +6,7 @@ Subject: [PATCH] Vex#getSummoner API
 Get's the NPC that summoned this Vex
 
 diff --git a/src/main/java/net/minecraft/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java
-index ecfc057a1..83e022c91 100644
+index ecfc057a18..83e022c91b 100644
 --- a/src/main/java/net/minecraft/server/EntityVex.java
 +++ b/src/main/java/net/minecraft/server/EntityVex.java
 @@ -92,6 +92,7 @@ public class EntityVex extends EntityMonster {
@@ -18,7 +18,7 @@ index ecfc057a1..83e022c91 100644
          return this.c;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
-index 737a37b6f..169c951ec 100644
+index 737a37b6fe..169c951ec3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
 @@ -1,8 +1,10 @@
diff --git a/Spigot-Server-Patches/0251-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/Spigot-Server-Patches/0250-Refresh-player-inventory-when-cancelling-PlayerInter.patch
similarity index 92%
rename from Spigot-Server-Patches/0251-Refresh-player-inventory-when-cancelling-PlayerInter.patch
rename to Spigot-Server-Patches/0250-Refresh-player-inventory-when-cancelling-PlayerInter.patch
index 42d9167501..040c13e5e7 100644
--- a/Spigot-Server-Patches/0251-Refresh-player-inventory-when-cancelling-PlayerInter.patch
+++ b/Spigot-Server-Patches/0250-Refresh-player-inventory-when-cancelling-PlayerInter.patch
@@ -1,4 +1,4 @@
-From 18e9e428c7d662cd27c7c7591dc214e6a7e062fb Mon Sep 17 00:00:00 2001
+From f3e0cb55c655bae2f08eefec86a03c00b2b0a865 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Fri, 13 Jul 2018 14:54:43 +0200
 Subject: [PATCH] Refresh player inventory when cancelling
@@ -16,7 +16,7 @@ Refresh the player inventory when PlayerInteractEntityEvent is
 cancelled to avoid this problem.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 0385eced6..4c99a321b 100644
+index 0385eced64..4c99a321b7 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1964,6 +1964,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0252-Don-t-change-the-Entity-Random-seed-for-squids.patch b/Spigot-Server-Patches/0251-Don-t-change-the-Entity-Random-seed-for-squids.patch
similarity index 88%
rename from Spigot-Server-Patches/0252-Don-t-change-the-Entity-Random-seed-for-squids.patch
rename to Spigot-Server-Patches/0251-Don-t-change-the-Entity-Random-seed-for-squids.patch
index aa4da9fd5c..bd5390eeb2 100644
--- a/Spigot-Server-Patches/0252-Don-t-change-the-Entity-Random-seed-for-squids.patch
+++ b/Spigot-Server-Patches/0251-Don-t-change-the-Entity-Random-seed-for-squids.patch
@@ -1,11 +1,11 @@
-From 35068abb2ee387a5b2084fb360aea4299a461c0e Mon Sep 17 00:00:00 2001
+From ae6b17a6485b10d0dee2b5e291f8a559abc9123a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 19 Jul 2018 01:05:00 -0400
 Subject: [PATCH] Don't change the Entity Random seed for squids
 
 
 diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
-index d5dff4b88..77c0ed42f 100644
+index d5dff4b88c..77c0ed42f4 100644
 --- a/src/main/java/net/minecraft/server/EntitySquid.java
 +++ b/src/main/java/net/minecraft/server/EntitySquid.java
 @@ -19,7 +19,7 @@ public class EntitySquid extends EntityWaterAnimal {
diff --git a/Spigot-Server-Patches/0253-Re-add-vanilla-entity-warnings-for-duplicates.patch b/Spigot-Server-Patches/0252-Re-add-vanilla-entity-warnings-for-duplicates.patch
similarity index 92%
rename from Spigot-Server-Patches/0253-Re-add-vanilla-entity-warnings-for-duplicates.patch
rename to Spigot-Server-Patches/0252-Re-add-vanilla-entity-warnings-for-duplicates.patch
index ffc3040955..cc2ac5eb05 100644
--- a/Spigot-Server-Patches/0253-Re-add-vanilla-entity-warnings-for-duplicates.patch
+++ b/Spigot-Server-Patches/0252-Re-add-vanilla-entity-warnings-for-duplicates.patch
@@ -1,4 +1,4 @@
-From 00e013d504b64b9a0df93973e81e71e15df41e73 Mon Sep 17 00:00:00 2001
+From 127bfea5a9352e569678cfff0289d97192b7134d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 19 Jul 2018 01:08:05 -0400
 Subject: [PATCH] Re-add vanilla entity warnings for duplicates
@@ -8,7 +8,7 @@ These are a critical sign that somethin went wrong, and you've lost some data...
 We should kind of know about these things you know.
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 340460a33..d384d3526 100644
+index 067379252d..bac458fa54 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -966,7 +966,8 @@ public class WorldServer extends World {
diff --git a/Spigot-Server-Patches/0254-Avoid-item-merge-if-stack-size-above-max-stack-size.patch b/Spigot-Server-Patches/0253-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
similarity index 90%
rename from Spigot-Server-Patches/0254-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
rename to Spigot-Server-Patches/0253-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
index a07b744eab..cc972328a7 100644
--- a/Spigot-Server-Patches/0254-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
+++ b/Spigot-Server-Patches/0253-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
@@ -1,11 +1,11 @@
-From e60fd4f27a55cae981e417d4ccbde0f508450b1b Mon Sep 17 00:00:00 2001
+From b4e4fa6908e7d18c22bb6975982b0abb7dac2b3e Mon Sep 17 00:00:00 2001
 From: Hugo Manrique <hugmanrique@gmail.com>
 Date: Mon, 16 Jul 2018 12:42:20 +0200
 Subject: [PATCH] Avoid item merge if stack size above max stack size
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index bda5ea463..ddd1f6307 100644
+index bda5ea4632..ddd1f63073 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -168,6 +168,10 @@ public class EntityItem extends Entity {
diff --git a/Spigot-Server-Patches/0255-Use-asynchronous-Log4j-2-loggers.patch b/Spigot-Server-Patches/0254-Use-asynchronous-Log4j-2-loggers.patch
similarity index 88%
rename from Spigot-Server-Patches/0255-Use-asynchronous-Log4j-2-loggers.patch
rename to Spigot-Server-Patches/0254-Use-asynchronous-Log4j-2-loggers.patch
index 44b43024dc..caaab158cd 100644
--- a/Spigot-Server-Patches/0255-Use-asynchronous-Log4j-2-loggers.patch
+++ b/Spigot-Server-Patches/0254-Use-asynchronous-Log4j-2-loggers.patch
@@ -1,11 +1,11 @@
-From 5433e0ac79c4fcc7dbdb754079d60da2aa88d0b6 Mon Sep 17 00:00:00 2001
+From 795db2797f8881fc60d2c1b4056fe909dfe75074 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Tue, 17 Jul 2018 16:42:17 +0200
 Subject: [PATCH] Use asynchronous Log4j 2 loggers
 
 
 diff --git a/pom.xml b/pom.xml
-index 3d2065fd7..e01d95f17 100644
+index 3d2065fd75..e01d95f17d 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -74,6 +74,13 @@
@@ -24,7 +24,7 @@ index 3d2065fd7..e01d95f17 100644
              <artifactId>asm</artifactId>
 diff --git a/src/main/resources/log4j2.component.properties b/src/main/resources/log4j2.component.properties
 new file mode 100644
-index 000000000..ee7c90784
+index 0000000000..ee7c90784c
 --- /dev/null
 +++ b/src/main/resources/log4j2.component.properties
 @@ -0,0 +1 @@
diff --git a/Spigot-Server-Patches/0256-add-more-information-to-Entity.toString.patch b/Spigot-Server-Patches/0255-add-more-information-to-Entity.toString.patch
similarity index 93%
rename from Spigot-Server-Patches/0256-add-more-information-to-Entity.toString.patch
rename to Spigot-Server-Patches/0255-add-more-information-to-Entity.toString.patch
index c162d03fd9..4aa1c24b9a 100644
--- a/Spigot-Server-Patches/0256-add-more-information-to-Entity.toString.patch
+++ b/Spigot-Server-Patches/0255-add-more-information-to-Entity.toString.patch
@@ -1,4 +1,4 @@
-From bd19e69fc49193f372723ce173ffb18846f950c2 Mon Sep 17 00:00:00 2001
+From 940fc083c72e8d8dea0d86c313a5a01fe433f7fc Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 19 Jul 2018 01:13:28 -0400
 Subject: [PATCH] add more information to Entity.toString()
@@ -6,7 +6,7 @@ Subject: [PATCH] add more information to Entity.toString()
 UUID, ticks lived, valid, dead
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index a428ca262..26003866d 100644
+index a428ca2624..26003866d2 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2437,7 +2437,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/Spigot-Server-Patches/0257-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/Spigot-Server-Patches/0256-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
similarity index 96%
rename from Spigot-Server-Patches/0257-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
rename to Spigot-Server-Patches/0256-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
index 7787d45d22..0678ccef6b 100644
--- a/Spigot-Server-Patches/0257-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
+++ b/Spigot-Server-Patches/0256-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
@@ -1,4 +1,4 @@
-From f727a659738d4a109e1571b04b2eaf3c30e8a970 Mon Sep 17 00:00:00 2001
+From 683211e1a74f6011ac424bbed783ed5d09429951 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Jul 2018 08:25:40 -0400
 Subject: [PATCH] Add Debug Entities option to debug dupe uuid issues
@@ -6,7 +6,7 @@ Subject: [PATCH] Add Debug Entities option to debug dupe uuid issues
 Add -Ddebug.entities=true to your JVM flags to gain more information
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 26003866d..54d025bf7 100644
+index 26003866d2..54d025bf7d 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -75,6 +75,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -19,7 +19,7 @@ index 26003866d..54d025bf7 100644
          if (bukkitEntity == null) {
              bukkitEntity = CraftEntity.getEntity(world.getServer(), this);
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index ae04198c9..c7bc4cc36 100644
+index ae04198c95..c7bc4cc363 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -874,6 +874,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -40,7 +40,7 @@ index ae04198c9..c7bc4cc36 100644
  
      protected void g() {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 0e9530ea5..00b7d90d7 100644
+index e3de634893..db0c520394 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -68,6 +68,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
@@ -52,7 +52,7 @@ index 0e9530ea5..00b7d90d7 100644
      public boolean captureBlockStates = false;
      public boolean captureTreeGeneration = false;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index d384d3526..6f298d737 100644
+index bac458fa54..957ca12e4a 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -69,6 +69,9 @@ public class WorldServer extends World {
diff --git a/Spigot-Server-Patches/0258-EnderDragon-Events.patch b/Spigot-Server-Patches/0257-EnderDragon-Events.patch
similarity index 95%
rename from Spigot-Server-Patches/0258-EnderDragon-Events.patch
rename to Spigot-Server-Patches/0257-EnderDragon-Events.patch
index 6a3bed5b43..9dd0182517 100644
--- a/Spigot-Server-Patches/0258-EnderDragon-Events.patch
+++ b/Spigot-Server-Patches/0257-EnderDragon-Events.patch
@@ -1,11 +1,11 @@
-From 382fde1bd1af7b8ce095534b5ac7d585a2b3f1fe Mon Sep 17 00:00:00 2001
+From 6895d564dbcdf151c559133974d76b1c22552c24 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 21 Jul 2018 01:51:27 -0500
 Subject: [PATCH] EnderDragon Events
 
 
 diff --git a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
-index 4ab310cd6..90f6d58dd 100644
+index 4ab310cd6b..90f6d58ddd 100644
 --- a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
 +++ b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
 @@ -65,7 +65,9 @@ public class DragonControllerLandedFlame extends AbstractDragonControllerLanded
@@ -28,7 +28,7 @@ index 4ab310cd6..90f6d58dd 100644
      public void e() {
          if (this.d != null) {
 diff --git a/src/main/java/net/minecraft/server/DragonControllerStrafe.java b/src/main/java/net/minecraft/server/DragonControllerStrafe.java
-index b46660576..bf15964e7 100644
+index b466605762..bf15964e78 100644
 --- a/src/main/java/net/minecraft/server/DragonControllerStrafe.java
 +++ b/src/main/java/net/minecraft/server/DragonControllerStrafe.java
 @@ -68,7 +68,9 @@ public class DragonControllerStrafe extends AbstractDragonController {
@@ -42,7 +42,7 @@ index b46660576..bf15964e7 100644
                          if (this.d != null) {
                              while (!this.d.b()) {
 diff --git a/src/main/java/net/minecraft/server/EntityDragonFireball.java b/src/main/java/net/minecraft/server/EntityDragonFireball.java
-index 239be99c5..2195b83ce 100644
+index 239be99c51..2195b83ce2 100644
 --- a/src/main/java/net/minecraft/server/EntityDragonFireball.java
 +++ b/src/main/java/net/minecraft/server/EntityDragonFireball.java
 @@ -40,8 +40,10 @@ public class EntityDragonFireball extends EntityFireball {
diff --git a/Spigot-Server-Patches/0259-PlayerElytraBoostEvent.patch b/Spigot-Server-Patches/0258-PlayerElytraBoostEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0259-PlayerElytraBoostEvent.patch
rename to Spigot-Server-Patches/0258-PlayerElytraBoostEvent.patch
index 662c1908be..aea4e37a13 100644
--- a/Spigot-Server-Patches/0259-PlayerElytraBoostEvent.patch
+++ b/Spigot-Server-Patches/0258-PlayerElytraBoostEvent.patch
@@ -1,11 +1,11 @@
-From 6d6fa4bfda778a486c9e10d9395d3e326ec19978 Mon Sep 17 00:00:00 2001
+From 9383864ec9d2e19b7038d6e6b11b3b711a16e614 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 21 Jul 2018 01:59:59 -0500
 Subject: [PATCH] PlayerElytraBoostEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java
-index aea46ffae..9e86ef4ce 100644
+index aea46ffae5..9e86ef4ce2 100644
 --- a/src/main/java/net/minecraft/server/ItemFireworks.java
 +++ b/src/main/java/net/minecraft/server/ItemFireworks.java
 @@ -35,11 +35,16 @@ public class ItemFireworks extends Item {
diff --git a/Spigot-Server-Patches/0260-PlayerLaunchProjectileEvent.patch b/Spigot-Server-Patches/0259-PlayerLaunchProjectileEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0260-PlayerLaunchProjectileEvent.patch
rename to Spigot-Server-Patches/0259-PlayerLaunchProjectileEvent.patch
index d86b2cbdca..b7ee7649d5 100644
--- a/Spigot-Server-Patches/0260-PlayerLaunchProjectileEvent.patch
+++ b/Spigot-Server-Patches/0259-PlayerLaunchProjectileEvent.patch
@@ -1,11 +1,11 @@
-From 8b926ae73aeaf598f61257a8bd177cbabc3d3f90 Mon Sep 17 00:00:00 2001
+From 594478a4810ff512d5eb66427cc6648714a770d9 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/src/main/java/net/minecraft/server/ItemEgg.java b/src/main/java/net/minecraft/server/ItemEgg.java
-index 2bdb65bf8..f526af45f 100644
+index 2bdb65bf87..f526af45fb 100644
 --- a/src/main/java/net/minecraft/server/ItemEgg.java
 +++ b/src/main/java/net/minecraft/server/ItemEgg.java
 @@ -10,17 +10,35 @@ public class ItemEgg extends Item {
@@ -46,7 +46,7 @@ index 2bdb65bf8..f526af45f 100644
  
          entityhuman.b(StatisticList.ITEM_USED.b(this));
 diff --git a/src/main/java/net/minecraft/server/ItemEnderPearl.java b/src/main/java/net/minecraft/server/ItemEnderPearl.java
-index eb5f62dec..e8e52d726 100644
+index eb5f62dec2..e8e52d726e 100644
 --- a/src/main/java/net/minecraft/server/ItemEnderPearl.java
 +++ b/src/main/java/net/minecraft/server/ItemEnderPearl.java
 @@ -16,7 +16,19 @@ public class ItemEnderPearl extends Item {
@@ -94,7 +94,7 @@ index eb5f62dec..e8e52d726 100644
          entityhuman.b(StatisticList.ITEM_USED.b(this));
          return new InteractionResultWrapper<>(EnumInteractionResult.SUCCESS, itemstack);
 diff --git a/src/main/java/net/minecraft/server/ItemExpBottle.java b/src/main/java/net/minecraft/server/ItemExpBottle.java
-index 35f842ede..eb626a6f0 100644
+index 35f842ede5..eb626a6f05 100644
 --- a/src/main/java/net/minecraft/server/ItemExpBottle.java
 +++ b/src/main/java/net/minecraft/server/ItemExpBottle.java
 @@ -9,18 +9,35 @@ public class ItemExpBottle extends Item {
@@ -136,7 +136,7 @@ index 35f842ede..eb626a6f0 100644
  
          entityhuman.b(StatisticList.ITEM_USED.b(this));
 diff --git a/src/main/java/net/minecraft/server/ItemLingeringPotion.java b/src/main/java/net/minecraft/server/ItemLingeringPotion.java
-index e3683bdae..f3ad1cd6d 100644
+index e3683bdaef..f3ad1cd6d3 100644
 --- a/src/main/java/net/minecraft/server/ItemLingeringPotion.java
 +++ b/src/main/java/net/minecraft/server/ItemLingeringPotion.java
 @@ -9,15 +9,40 @@ public class ItemLingeringPotion extends ItemPotion {
@@ -182,7 +182,7 @@ index e3683bdae..f3ad1cd6d 100644
  
          entityhuman.b(StatisticList.ITEM_USED.b(this));
 diff --git a/src/main/java/net/minecraft/server/ItemSnowball.java b/src/main/java/net/minecraft/server/ItemSnowball.java
-index 624989dd7..c119785b7 100644
+index 624989dd7b..c119785b78 100644
 --- a/src/main/java/net/minecraft/server/ItemSnowball.java
 +++ b/src/main/java/net/minecraft/server/ItemSnowball.java
 @@ -23,15 +23,23 @@ public class ItemSnowball extends Item {
@@ -215,7 +215,7 @@ index 624989dd7..c119785b7 100644
          // CraftBukkit end
  
 diff --git a/src/main/java/net/minecraft/server/ItemSplashPotion.java b/src/main/java/net/minecraft/server/ItemSplashPotion.java
-index e267e43fe..fa6d627db 100644
+index e267e43fe5..fa6d627db4 100644
 --- a/src/main/java/net/minecraft/server/ItemSplashPotion.java
 +++ b/src/main/java/net/minecraft/server/ItemSplashPotion.java
 @@ -9,15 +9,39 @@ public class ItemSplashPotion extends ItemPotion {
diff --git a/Spigot-Server-Patches/0261-Speedup-BlockPos-by-fixing-inlining.patch b/Spigot-Server-Patches/0260-Speedup-BlockPos-by-fixing-inlining.patch
similarity index 98%
rename from Spigot-Server-Patches/0261-Speedup-BlockPos-by-fixing-inlining.patch
rename to Spigot-Server-Patches/0260-Speedup-BlockPos-by-fixing-inlining.patch
index 2a08e2ba1e..3e4ccaeb51 100644
--- a/Spigot-Server-Patches/0261-Speedup-BlockPos-by-fixing-inlining.patch
+++ b/Spigot-Server-Patches/0260-Speedup-BlockPos-by-fixing-inlining.patch
@@ -1,4 +1,4 @@
-From 5a73aca979f463c09266b54e433b9b3278e84410 Mon Sep 17 00:00:00 2001
+From b5a51584adeb6c21dd7e08e08deaf7a1caa6727e Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Wed, 30 Nov 2016 20:56:58 -0600
 Subject: [PATCH] Speedup BlockPos by fixing inlining
@@ -21,7 +21,7 @@ This is based upon conclusions drawn from inspecting the assenmbly generated byt
 They had 'callq' (invoke) instead of 'mov' (get from memory) instructions.
 
 diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java
-index 7cb46d7a9..e96428bb2 100644
+index 7cb46d7a9c..e96428bb2b 100644
 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java
 @@ -7,22 +7,22 @@ import javax.annotation.concurrent.Immutable;
@@ -101,7 +101,7 @@ index 7cb46d7a9..e96428bb2 100644
          return (int) (f + f1 + f2);
      }
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 64700b97c..a5e5a4eba 100644
+index 64700b97c0..a5e5a4ebae 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -335,11 +335,12 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali
diff --git a/Spigot-Server-Patches/0262-Don-t-save-Proto-Chunks.patch b/Spigot-Server-Patches/0261-Don-t-save-Proto-Chunks.patch
similarity index 91%
rename from Spigot-Server-Patches/0262-Don-t-save-Proto-Chunks.patch
rename to Spigot-Server-Patches/0261-Don-t-save-Proto-Chunks.patch
index 4f9dab4798..2f36f3efd6 100644
--- a/Spigot-Server-Patches/0262-Don-t-save-Proto-Chunks.patch
+++ b/Spigot-Server-Patches/0261-Don-t-save-Proto-Chunks.patch
@@ -1,4 +1,4 @@
-From ed67334df5a2a8de34f26d811784a3e0d5eadb91 Mon Sep 17 00:00:00 2001
+From e4d1232c82e9f706a4e6f3ca918109cedfeb3121 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 22 Jul 2018 21:21:41 -0400
 Subject: [PATCH] Don't save Proto Chunks
@@ -8,7 +8,7 @@ the loadChunk method refuses to acknoledge they exists, and will restart
 a new chunk generation process to begin with, so saving them serves no benefit.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index c7bc4cc36..2244d65ee 100644
+index c7bc4cc363..2244d65ee6 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -588,6 +588,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
diff --git a/Spigot-Server-Patches/0263-Optimize-RegistryID.c.patch b/Spigot-Server-Patches/0262-Optimize-RegistryID.c.patch
similarity index 95%
rename from Spigot-Server-Patches/0263-Optimize-RegistryID.c.patch
rename to Spigot-Server-Patches/0262-Optimize-RegistryID.c.patch
index 207511deb6..786dbab496 100644
--- a/Spigot-Server-Patches/0263-Optimize-RegistryID.c.patch
+++ b/Spigot-Server-Patches/0262-Optimize-RegistryID.c.patch
@@ -1,4 +1,4 @@
-From f13f9afbbbefc4ebfa6874671d36e43c935e3204 Mon Sep 17 00:00:00 2001
+From 72176dd7071a4145bdb6a9f0eb962a0f96a14e9c Mon Sep 17 00:00:00 2001
 From: Andrew Steinborn <git@steinborn.me>
 Date: Mon, 23 Jul 2018 13:08:19 -0400
 Subject: [PATCH] Optimize RegistryID.c()
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize RegistryID.c()
 This is a frequent hotspot for world loading/saving.
 
 diff --git a/src/main/java/net/minecraft/server/RegistryID.java b/src/main/java/net/minecraft/server/RegistryID.java
-index e15d28671..e8a48b9a4 100644
+index e15d286710..e8a48b9a4c 100644
 --- a/src/main/java/net/minecraft/server/RegistryID.java
 +++ b/src/main/java/net/minecraft/server/RegistryID.java
 @@ -14,12 +14,14 @@ public class RegistryID<K> implements Registry<K> {
diff --git a/Spigot-Server-Patches/0264-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/0263-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
similarity index 89%
rename from Spigot-Server-Patches/0264-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
rename to Spigot-Server-Patches/0263-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
index 0269c258a4..efdfd74ff1 100644
--- a/Spigot-Server-Patches/0264-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/Spigot-Server-Patches/0263-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
@@ -1,11 +1,11 @@
-From f3277440873f3265faba99f17287e1be66c0d469 Mon Sep 17 00:00:00 2001
+From f8153d56e39989b43ad547558d86ae105f3a3aab Mon Sep 17 00:00:00 2001
 From: Hugo Manrique <hugmanrique@gmail.com>
 Date: Mon, 23 Jul 2018 12:57:39 +0200
 Subject: [PATCH] Option to prevent armor stands from doing entity lookups
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 83e54cb90..f06bb3ae1 100644
+index 83e54cb904..f06bb3ae19 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -326,6 +326,11 @@ public class PaperWorldConfig {
@@ -21,10 +21,10 @@ index 83e54cb90..f06bb3ae1 100644
      private void maxEntityCollision() {
          maxCollisionsPerEntity = getInt( "max-entity-collisions", this.spigotConfig.getInt("max-entity-collisions", 8) );
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 00b7d90d7..31ffc57c9 100644
+index db0c520394..8bb2e1bf0f 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -871,6 +871,14 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
+@@ -869,6 +869,14 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
          }
      }
  
diff --git a/Spigot-Server-Patches/0265-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0264-Vanished-players-don-t-have-rights.patch
similarity index 95%
rename from Spigot-Server-Patches/0265-Vanished-players-don-t-have-rights.patch
rename to Spigot-Server-Patches/0264-Vanished-players-don-t-have-rights.patch
index cf8a47e589..28d9926807 100644
--- a/Spigot-Server-Patches/0265-Vanished-players-don-t-have-rights.patch
+++ b/Spigot-Server-Patches/0264-Vanished-players-don-t-have-rights.patch
@@ -1,11 +1,11 @@
-From 6f0adf29a75988289f235bc55a15c65749d26fcd Mon Sep 17 00:00:00 2001
+From 6d025cbfd76dcd75563b7a6b2a7e02e4c2eeb7a1 Mon Sep 17 00:00:00 2001
 From: Hugo Manrique <hugmanrique@gmail.com>
 Date: Mon, 23 Jul 2018 14:22:26 +0200
 Subject: [PATCH] Vanished players don't have rights
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 54d025bf7..e3b1ebe62 100644
+index 54d025bf7d..e3b1ebe629 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -97,7 +97,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -18,7 +18,7 @@ index 54d025bf7..e3b1ebe62 100644
      protected int j;
      private Entity vehicle;
 diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
-index ee22bb038..e5a013ffd 100644
+index ee22bb0387..e5a013ffd2 100644
 --- a/src/main/java/net/minecraft/server/IEntityAccess.java
 +++ b/src/main/java/net/minecraft/server/IEntityAccess.java
 @@ -22,9 +22,18 @@ public interface IEntityAccess {
@@ -41,7 +41,7 @@ index ee22bb038..e5a013ffd 100644
              return VoxelShapes.c(voxelshape, VoxelShapes.a(entity1.getBoundingBox()), OperatorBoolean.AND);
          });
 diff --git a/src/main/java/net/minecraft/server/IWorldReader.java b/src/main/java/net/minecraft/server/IWorldReader.java
-index 452b2b2d2..7019d4ae9 100644
+index 452b2b2d28..7019d4ae99 100644
 --- a/src/main/java/net/minecraft/server/IWorldReader.java
 +++ b/src/main/java/net/minecraft/server/IWorldReader.java
 @@ -99,7 +99,12 @@ public interface IWorldReader extends IIBlockAccess {
@@ -58,7 +58,7 @@ index 452b2b2d2..7019d4ae9 100644
  
          return voxelshape.isEmpty() || this.a((Entity) null, voxelshape.a((double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ()));
 diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java
-index 59b1e6ce2..b90cc6652 100644
+index 59b1e6ce2e..b90cc6652b 100644
 --- a/src/main/java/net/minecraft/server/ItemBlock.java
 +++ b/src/main/java/net/minecraft/server/ItemBlock.java
 @@ -126,7 +126,8 @@ public class ItemBlock extends Item {
@@ -72,7 +72,7 @@ index 59b1e6ce2..b90cc6652 100644
  
          BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(blockactioncontext.getWorld(), blockactioncontext.getClickPosition()), player, CraftBlockData.fromData(iblockdata), defaultReturn);
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index ceffcec72..b39886c5d 100644
+index ceffcec720..b39886c5d0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1120,6 +1120,14 @@ public class CraftEventFactory {
diff --git a/Spigot-Server-Patches/0266-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch b/Spigot-Server-Patches/0265-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
similarity index 89%
rename from Spigot-Server-Patches/0266-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
rename to Spigot-Server-Patches/0265-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
index 3bdff12f37..a1c26fb0ce 100644
--- a/Spigot-Server-Patches/0266-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
+++ b/Spigot-Server-Patches/0265-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
@@ -1,4 +1,4 @@
-From 99005843982ad2e93d78f12cfedc8f10344741a1 Mon Sep 17 00:00:00 2001
+From 050b9d851f88b5d429c2af21566ad1c5a00c42de Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 23 Jul 2018 22:18:31 -0400
 Subject: [PATCH] Mark chunk dirty anytime entities change to guarantee it
@@ -6,7 +6,7 @@ Subject: [PATCH] Mark chunk dirty anytime entities change to guarantee it
 
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 7382a47d8..8a8c8f4e8 100644
+index 7382a47d8c..8a8c8f4e88 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -411,6 +411,7 @@ public class Chunk implements IChunkAccess {
diff --git a/Spigot-Server-Patches/0267-Add-some-Debug-to-Chunk-Entity-slices.patch b/Spigot-Server-Patches/0266-Add-some-Debug-to-Chunk-Entity-slices.patch
similarity index 95%
rename from Spigot-Server-Patches/0267-Add-some-Debug-to-Chunk-Entity-slices.patch
rename to Spigot-Server-Patches/0266-Add-some-Debug-to-Chunk-Entity-slices.patch
index 40e17b3fef..95385950b7 100644
--- a/Spigot-Server-Patches/0267-Add-some-Debug-to-Chunk-Entity-slices.patch
+++ b/Spigot-Server-Patches/0266-Add-some-Debug-to-Chunk-Entity-slices.patch
@@ -1,4 +1,4 @@
-From bcc772b0a83f8c5a792ff5439b4220238a7665e1 Mon Sep 17 00:00:00 2001
+From 7d914605d5222acf7321f74a6bfa36d8d20ec3dc Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 23 Jul 2018 22:44:23 -0400
 Subject: [PATCH] Add some Debug to Chunk Entity slices
@@ -9,7 +9,7 @@ This should hopefully avoid duplicate entities ever being created
 if the entity was to end up in 2 different chunk slices
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 8a8c8f4e8..fd91cf839 100644
+index 8a8c8f4e88..fd91cf8393 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -403,6 +403,25 @@ public class Chunk implements IChunkAccess {
@@ -57,7 +57,7 @@ index 8a8c8f4e8..fd91cf839 100644
              return;
          }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index e3b1ebe62..2484eb0ff 100644
+index e3b1ebe629..2484eb0ffd 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -67,6 +67,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/Spigot-Server-Patches/0268-EntityTransformedEvent.patch b/Spigot-Server-Patches/0267-EntityTransformedEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0268-EntityTransformedEvent.patch
rename to Spigot-Server-Patches/0267-EntityTransformedEvent.patch
index 1cd3770eb5..04bb3ae2c8 100644
--- a/Spigot-Server-Patches/0268-EntityTransformedEvent.patch
+++ b/Spigot-Server-Patches/0267-EntityTransformedEvent.patch
@@ -1,11 +1,11 @@
-From 9445ddab593fabafef6dda16ad36326e013cf29d Mon Sep 17 00:00:00 2001
+From 842e70df880203be20a474b4d34105c5e47ec387 Mon Sep 17 00:00:00 2001
 From: Anthony MacAllister <anthonymmacallister@gmail.com>
 Date: Thu, 26 Jul 2018 15:30:03 -0400
 Subject: [PATCH] EntityTransformedEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java
-index bb3493c14..de787d861 100644
+index bb3493c14f..de787d8614 100644
 --- a/src/main/java/net/minecraft/server/EntityMushroomCow.java
 +++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java
 @@ -101,6 +101,7 @@ public class EntityMushroomCow extends EntityCow {
@@ -17,7 +17,7 @@ index bb3493c14..de787d861 100644
  
                      this.die(); // CraftBukkit - from above
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 53e2266a9..f2b46d4e3 100644
+index 53e2266a99..f2b46d4e3b 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -596,6 +596,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -29,7 +29,7 @@ index 53e2266a9..f2b46d4e3 100644
          // CraftBukkit end
          this.die();
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 4cb305ff2..171c1ae4a 100644
+index 4cb305ff28..171c1ae4ad 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -247,6 +247,7 @@ public class EntityZombie extends EntityMonster {
@@ -49,7 +49,7 @@ index 4cb305ff2..171c1ae4a 100644
              this.world.addEntity(entityzombievillager, CreatureSpawnEvent.SpawnReason.INFECTION); // CraftBukkit - add SpawnReason
              // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java
-index b5d079233..a857d70e9 100644
+index b5d0792332..a857d70e98 100644
 --- a/src/main/java/net/minecraft/server/EntityZombieVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java
 @@ -157,6 +157,7 @@ public class EntityZombieVillager extends EntityZombie implements VillagerDataHo
diff --git a/Spigot-Server-Patches/0269-SkeletonHorse-Additions.patch b/Spigot-Server-Patches/0268-SkeletonHorse-Additions.patch
similarity index 94%
rename from Spigot-Server-Patches/0269-SkeletonHorse-Additions.patch
rename to Spigot-Server-Patches/0268-SkeletonHorse-Additions.patch
index 7b6c30d098..05cdc7a332 100644
--- a/Spigot-Server-Patches/0269-SkeletonHorse-Additions.patch
+++ b/Spigot-Server-Patches/0268-SkeletonHorse-Additions.patch
@@ -1,11 +1,11 @@
-From 9fadebcc1ea54b2f9fcbb43035eadd4c4a6c0ed0 Mon Sep 17 00:00:00 2001
+From 12804043aa8b6dbe1e09df215fdd14b4ce33b110 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 27 Jul 2018 22:36:31 -0500
 Subject: [PATCH] SkeletonHorse Additions
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
-index 9ac34dfa8..b96726456 100644
+index 9ac34dfa8c..b967264562 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
 @@ -6,7 +6,7 @@ public class EntityHorseSkeleton extends EntityHorseAbstract {
@@ -31,7 +31,7 @@ index 9ac34dfa8..b96726456 100644
          if (flag != this.bK) {
              this.bK = flag;
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
-index 7b0a6f82f..f09374413 100644
+index 7b0a6f82fb..f093744136 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
 @@ -15,6 +15,7 @@ public class PathfinderGoalHorseTrap extends PathfinderGoal {
@@ -43,7 +43,7 @@ index 7b0a6f82f..f09374413 100644
  
          this.a.r(false);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java
-index e822c2200..2a7d1d4ec 100644
+index e822c2200d..2a7d1d4ec2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java
 @@ -26,4 +26,26 @@ public class CraftSkeletonHorse extends CraftAbstractHorse implements SkeletonHo
diff --git a/Spigot-Server-Patches/0270-Prevent-Saving-Bad-entities-to-chunks.patch b/Spigot-Server-Patches/0269-Prevent-Saving-Bad-entities-to-chunks.patch
similarity index 96%
rename from Spigot-Server-Patches/0270-Prevent-Saving-Bad-entities-to-chunks.patch
rename to Spigot-Server-Patches/0269-Prevent-Saving-Bad-entities-to-chunks.patch
index 07d6d683e3..1fc1aeba37 100644
--- a/Spigot-Server-Patches/0270-Prevent-Saving-Bad-entities-to-chunks.patch
+++ b/Spigot-Server-Patches/0269-Prevent-Saving-Bad-entities-to-chunks.patch
@@ -1,4 +1,4 @@
-From fc1b1b28585b3818324213da7edaff5c56a43479 Mon Sep 17 00:00:00 2001
+From 491ddba93727b3dcf83e066b54dd33d9759adabb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 26 Jul 2018 00:11:12 -0400
 Subject: [PATCH] Prevent Saving Bad entities to chunks
@@ -18,7 +18,7 @@ an invalid entity.
 This should reduce log occurrences of dupe uuid messages.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 2b8148fbd..9038d17fd 100644
+index 2b8148fbda..9038d17fde 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -332,6 +332,7 @@ public class ChunkRegionLoader {
diff --git a/Spigot-Server-Patches/0271-Don-t-call-getItemMeta-on-hasItemMeta.patch b/Spigot-Server-Patches/0270-Don-t-call-getItemMeta-on-hasItemMeta.patch
similarity index 97%
rename from Spigot-Server-Patches/0271-Don-t-call-getItemMeta-on-hasItemMeta.patch
rename to Spigot-Server-Patches/0270-Don-t-call-getItemMeta-on-hasItemMeta.patch
index 676399e256..82990a1685 100644
--- a/Spigot-Server-Patches/0271-Don-t-call-getItemMeta-on-hasItemMeta.patch
+++ b/Spigot-Server-Patches/0270-Don-t-call-getItemMeta-on-hasItemMeta.patch
@@ -1,4 +1,4 @@
-From bd63bbb39ceefcad0b0dfb88f447461de4738dab Mon Sep 17 00:00:00 2001
+From f0b06a840addc891ecede4b0a2d6c58b1ae85515 Mon Sep 17 00:00:00 2001
 From: Hugo Manrique <hugmanrique@gmail.com>
 Date: Thu, 26 Jul 2018 14:10:23 +0200
 Subject: [PATCH] Don't call getItemMeta on hasItemMeta
@@ -11,7 +11,7 @@ Returns true if getDamage() == 0 or has damage tag or other tag is set.
 Check the `ItemMetaTest#testTaggedButNotMeta` method to see how this method behaves.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 1609e6bbb..8a6a13537 100644
+index 1609e6bbb6..8a6a135372 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -536,7 +536,7 @@ public final class CraftItemStack extends ItemStack {
@@ -24,7 +24,7 @@ index 1609e6bbb..8a6a13537 100644
  
      static boolean hasItemMeta(net.minecraft.server.ItemStack item) {
 diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
-index 2a0852675..f30f74312 100644
+index 2a0852675b..f30f743121 100644
 --- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
 +++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
 @@ -4,6 +4,7 @@ import static org.hamcrest.Matchers.*;
diff --git a/Spigot-Server-Patches/0272-Ignore-Dead-Entities-in-entityList-iteration.patch b/Spigot-Server-Patches/0271-Ignore-Dead-Entities-in-entityList-iteration.patch
similarity index 96%
rename from Spigot-Server-Patches/0272-Ignore-Dead-Entities-in-entityList-iteration.patch
rename to Spigot-Server-Patches/0271-Ignore-Dead-Entities-in-entityList-iteration.patch
index fdd1c7d766..b9213a4644 100644
--- a/Spigot-Server-Patches/0272-Ignore-Dead-Entities-in-entityList-iteration.patch
+++ b/Spigot-Server-Patches/0271-Ignore-Dead-Entities-in-entityList-iteration.patch
@@ -1,4 +1,4 @@
-From 359367a6f4bf33da4fdeec175017cf835ff03bc6 Mon Sep 17 00:00:00 2001
+From a7f1b83ec26d41f82f0a4255f947ba8fef27f882 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 28 Jul 2018 12:18:27 -0400
 Subject: [PATCH] Ignore Dead Entities in entityList iteration
@@ -11,7 +11,7 @@ This will ensure that dead entities are skipped from iteration since
 they shouldn't of been in the list in the first place.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-index ce190d88d..352a39dcb 100644
+index ce190d88d6..352a39dcb3 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
 @@ -176,6 +176,7 @@ public class PaperCommand extends Command {
@@ -23,7 +23,7 @@ index ce190d88d..352a39dcb 100644
                      MutablePair<Integer, Map<ChunkCoordIntPair, Integer>> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap()));
                      ChunkCoordIntPair chunk = new ChunkCoordIntPair(e.getChunkX(), e.getChunkZ());
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index fd91cf839..2b4ad100e 100644
+index fd91cf8393..2b4ad100e0 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -643,6 +643,7 @@ public class Chunk implements IChunkAccess {
@@ -51,7 +51,7 @@ index fd91cf839..2b4ad100e 100644
                  if (oclass.isInstance(t0) && t0.getBoundingBox().c(axisalignedbb) && (predicate == null || predicate.test(t0))) { // Spigot - instance check
                      list.add(t0);
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 2484eb0ff..622160ff4 100644
+index 2484eb0ffd..622160ff4e 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -126,6 +126,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -63,7 +63,7 @@ index 2484eb0ff..622160ff4 100644
      private float av;
      private float aw;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 6f298d737..74917a3b1 100644
+index 957ca12e4a..364f26b556 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -836,6 +836,7 @@ public class WorldServer extends World {
@@ -91,7 +91,7 @@ index 6f298d737..74917a3b1 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 9a9c5a93e..20f7c44b6 100644
+index 9a9c5a93e6..20f7c44b65 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -847,6 +847,7 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0273-Provide-option-to-use-a-versioned-world-folder-for-t.patch b/Spigot-Server-Patches/0272-Provide-option-to-use-a-versioned-world-folder-for-t.patch
similarity index 98%
rename from Spigot-Server-Patches/0273-Provide-option-to-use-a-versioned-world-folder-for-t.patch
rename to Spigot-Server-Patches/0272-Provide-option-to-use-a-versioned-world-folder-for-t.patch
index 5f68095d8c..11a1ff3955 100644
--- a/Spigot-Server-Patches/0273-Provide-option-to-use-a-versioned-world-folder-for-t.patch
+++ b/Spigot-Server-Patches/0272-Provide-option-to-use-a-versioned-world-folder-for-t.patch
@@ -1,4 +1,4 @@
-From 041dd87c43cf13c216c0820f5c22d5b8cf3eb49b Mon Sep 17 00:00:00 2001
+From 0c747969dc199cf6e1a914b30a64c294078e8749 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 29 Jul 2018 15:48:50 -0400
 Subject: [PATCH] Provide option to use a versioned world folder for testing
@@ -19,7 +19,7 @@ may be some delay there, but region files are only copied on demand.
 This is highly experiemental so backup your world before relying on this to not modify it
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index a9b71c85d..8c3880c83 100644
+index a9b71c85d5..8c3880c838 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -13,6 +13,7 @@ import java.util.List;
@@ -59,7 +59,7 @@ index a9b71c85d..8c3880c83 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index 6425b14f2..990d34efd 100644
+index 6425b14f2c..990d34efde 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -10,13 +10,41 @@ import java.io.IOException;
@@ -163,7 +163,7 @@ index 6425b14f2..990d34efd 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
-index 350ac42d6..eaae44686 100644
+index 350ac42d6b..eaae446861 100644
 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
 +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
 @@ -31,6 +31,58 @@ public class WorldNBTStorage implements IPlayerFileData {
diff --git a/Spigot-Server-Patches/0274-MC-111480-Start-Entity-ID-s-at-1.patch b/Spigot-Server-Patches/0273-MC-111480-Start-Entity-ID-s-at-1.patch
similarity index 91%
rename from Spigot-Server-Patches/0274-MC-111480-Start-Entity-ID-s-at-1.patch
rename to Spigot-Server-Patches/0273-MC-111480-Start-Entity-ID-s-at-1.patch
index b238e2c9a4..6ce78531ed 100644
--- a/Spigot-Server-Patches/0274-MC-111480-Start-Entity-ID-s-at-1.patch
+++ b/Spigot-Server-Patches/0273-MC-111480-Start-Entity-ID-s-at-1.patch
@@ -1,4 +1,4 @@
-From 5612bef1b06db635c34ca0ee56936e82e53459b2 Mon Sep 17 00:00:00 2001
+From a42c3271ebaa68a39a5ab5f426f91de7a9528d9c 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
@@ -7,7 +7,7 @@ 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 622160ff4..e1c793aad 100644
+index 622160ff4e..e1c793aad5 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -92,7 +92,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/Spigot-Server-Patches/0275-Implement-Expanded-ArmorStand-API.patch b/Spigot-Server-Patches/0274-Implement-Expanded-ArmorStand-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0275-Implement-Expanded-ArmorStand-API.patch
rename to Spigot-Server-Patches/0274-Implement-Expanded-ArmorStand-API.patch
index 7403be2538..89631b4600 100644
--- a/Spigot-Server-Patches/0275-Implement-Expanded-ArmorStand-API.patch
+++ b/Spigot-Server-Patches/0274-Implement-Expanded-ArmorStand-API.patch
@@ -1,4 +1,4 @@
-From 7e20108512afe0d71890499c0e478c517bdb8b83 Mon Sep 17 00:00:00 2001
+From ac627e942e7d52d39d98ee92cbee0c16c853d60e 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
@@ -8,7 +8,7 @@ Add the following:
 - Enable/Disable slot interactions
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 916eaa7b9..00ff1e80d 100644
+index 916eaa7b90..00ff1e80de 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -36,7 +36,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -29,7 +29,7 @@ index 916eaa7b9..00ff1e80d 100644
          return (this.bE & 1 << enumitemslot.c()) != 0 || enumitemslot.a() == EnumItemSlot.Function.HAND && !this.hasArms();
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-index 124c3185b..9f5c3b92e 100644
+index 124c3185bc..9f5c3b92e3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 @@ -30,11 +30,13 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
diff --git a/Spigot-Server-Patches/0276-AnvilDamageEvent.patch b/Spigot-Server-Patches/0275-AnvilDamageEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0276-AnvilDamageEvent.patch
rename to Spigot-Server-Patches/0275-AnvilDamageEvent.patch
index e92d2b5dd7..9905e2c8dc 100644
--- a/Spigot-Server-Patches/0276-AnvilDamageEvent.patch
+++ b/Spigot-Server-Patches/0275-AnvilDamageEvent.patch
@@ -1,11 +1,11 @@
-From b57c867923c316a4532d92b23eea8f00b2c70046 Mon Sep 17 00:00:00 2001
+From 4dc9d56762d4f1da8a2af8923e803f7e7f8bff73 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/src/main/java/net/minecraft/server/ContainerAnvil.java b/src/main/java/net/minecraft/server/ContainerAnvil.java
-index ada5cf982..9e73e731b 100644
+index ada5cf982e..9e73e731b5 100644
 --- a/src/main/java/net/minecraft/server/ContainerAnvil.java
 +++ b/src/main/java/net/minecraft/server/ContainerAnvil.java
 @@ -85,6 +85,16 @@ public class ContainerAnvil extends Container {
diff --git a/Spigot-Server-Patches/0277-Add-TNTPrimeEvent.patch b/Spigot-Server-Patches/0276-Add-TNTPrimeEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0277-Add-TNTPrimeEvent.patch
rename to Spigot-Server-Patches/0276-Add-TNTPrimeEvent.patch
index 8fc05e8715..2dae214c33 100644
--- a/Spigot-Server-Patches/0277-Add-TNTPrimeEvent.patch
+++ b/Spigot-Server-Patches/0276-Add-TNTPrimeEvent.patch
@@ -1,11 +1,11 @@
-From c67e9c23bbe0f37866002b4a84be8e0e144e7d0a Mon Sep 17 00:00:00 2001
+From 30f65ec54840c18c24d0a459f73d77de7cd6d3c4 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/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java
-index f769df41a..087535caf 100644
+index f769df41a6..087535caf9 100644
 --- a/src/main/java/net/minecraft/server/BlockFire.java
 +++ b/src/main/java/net/minecraft/server/BlockFire.java
 @@ -2,6 +2,7 @@ package net.minecraft.server;
@@ -39,7 +39,7 @@ index f769df41a..087535caf 100644
              }
          }
 diff --git a/src/main/java/net/minecraft/server/BlockTNT.java b/src/main/java/net/minecraft/server/BlockTNT.java
-index 013fa3524..7e534417b 100644
+index 013fa35241..7e534417ba 100644
 --- a/src/main/java/net/minecraft/server/BlockTNT.java
 +++ b/src/main/java/net/minecraft/server/BlockTNT.java
 @@ -1,6 +1,7 @@
@@ -114,7 +114,7 @@ index 013fa3524..7e534417b 100644
                  world.a(blockposition, false);
              }
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index d42d4e83e..9ada10cc7 100644
+index d42d4e83ef..9ada10cc73 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -11,6 +11,7 @@ import org.bukkit.craftbukkit.block.CraftBlock;
diff --git a/Spigot-Server-Patches/0278-Break-up-and-make-tab-spam-limits-configurable.patch b/Spigot-Server-Patches/0277-Break-up-and-make-tab-spam-limits-configurable.patch
similarity index 97%
rename from Spigot-Server-Patches/0278-Break-up-and-make-tab-spam-limits-configurable.patch
rename to Spigot-Server-Patches/0277-Break-up-and-make-tab-spam-limits-configurable.patch
index d73a274f14..d86861dc7e 100644
--- a/Spigot-Server-Patches/0278-Break-up-and-make-tab-spam-limits-configurable.patch
+++ b/Spigot-Server-Patches/0277-Break-up-and-make-tab-spam-limits-configurable.patch
@@ -1,4 +1,4 @@
-From a52d0d7dbfa1059beaf5343bf01a9a00ef1c25d6 Mon Sep 17 00:00:00 2001
+From c7fd6f4d00a7b5a70cb146a6b6cdd587665b172d 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
@@ -22,7 +22,7 @@ to take the burden of this into their own hand without having to rely on
 plugins doing unsafe things.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 8c3880c83..d773ef5b0 100644
+index 8c3880c838..d773ef5b0d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -311,4 +311,18 @@ public class PaperConfig {
@@ -45,7 +45,7 @@ index 8c3880c83..d773ef5b0 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 4c99a321b..07e9abda9 100644
+index 4c99a321b7..07e9abda96 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -76,6 +76,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0279-Add-hand-to-bucket-events.patch b/Spigot-Server-Patches/0278-Add-hand-to-bucket-events.patch
similarity index 98%
rename from Spigot-Server-Patches/0279-Add-hand-to-bucket-events.patch
rename to Spigot-Server-Patches/0278-Add-hand-to-bucket-events.patch
index 260e4a9976..a7c05a359a 100644
--- a/Spigot-Server-Patches/0279-Add-hand-to-bucket-events.patch
+++ b/Spigot-Server-Patches/0278-Add-hand-to-bucket-events.patch
@@ -1,11 +1,11 @@
-From e601e535b8d90cf48e04a2275c8c54489c702d69 Mon Sep 17 00:00:00 2001
+From b083584ee954bf4198666f4e4ed2e68db35fae72 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/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
-index a17738f9f..d2c2e3cc3 100644
+index a17738f9ff..d2c2e3cc33 100644
 --- a/src/main/java/net/minecraft/server/EntityCow.java
 +++ b/src/main/java/net/minecraft/server/EntityCow.java
 @@ -62,7 +62,7 @@ public class EntityCow extends EntityAnimal {
@@ -18,7 +18,7 @@ index a17738f9f..d2c2e3cc3 100644
              if (event.isCancelled()) {
                  return false;
 diff --git a/src/main/java/net/minecraft/server/ItemBucket.java b/src/main/java/net/minecraft/server/ItemBucket.java
-index cb2891411..5dc967f8b 100644
+index cb28914118..5dc967f8ba 100644
 --- a/src/main/java/net/minecraft/server/ItemBucket.java
 +++ b/src/main/java/net/minecraft/server/ItemBucket.java
 @@ -39,7 +39,7 @@ public class ItemBucket extends Item {
@@ -67,7 +67,7 @@ index cb2891411..5dc967f8b 100644
                          ((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutBlockChange(world, blockposition)); // SPIGOT-4238: needed when looking through entity
                          ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory(); // SPIGOT-4541
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index b39886c5d..9380b4953 100644
+index b39886c5d0..9380b4953f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -354,6 +354,20 @@ public class CraftEventFactory {
diff --git a/Spigot-Server-Patches/0280-MC-135506-Experience-should-save-as-Integers.patch b/Spigot-Server-Patches/0279-MC-135506-Experience-should-save-as-Integers.patch
similarity index 92%
rename from Spigot-Server-Patches/0280-MC-135506-Experience-should-save-as-Integers.patch
rename to Spigot-Server-Patches/0279-MC-135506-Experience-should-save-as-Integers.patch
index 22183a497d..c5a728f5f8 100644
--- a/Spigot-Server-Patches/0280-MC-135506-Experience-should-save-as-Integers.patch
+++ b/Spigot-Server-Patches/0279-MC-135506-Experience-should-save-as-Integers.patch
@@ -1,11 +1,11 @@
-From 3d7cbb58d3a12b7d4d5cbca380f25337c7186d61 Mon Sep 17 00:00:00 2001
+From 86cc4d27c6c9b1f4295f5f516d1b327e13b88856 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/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index 64d71a9a2..65c996961 100644
+index 64d71a9a2a..65c9969613 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -204,7 +204,7 @@ public class EntityExperienceOrb extends Entity {
diff --git a/Spigot-Server-Patches/0281-Fix-client-rendering-skulls-from-same-user.patch b/Spigot-Server-Patches/0280-Fix-client-rendering-skulls-from-same-user.patch
similarity index 96%
rename from Spigot-Server-Patches/0281-Fix-client-rendering-skulls-from-same-user.patch
rename to Spigot-Server-Patches/0280-Fix-client-rendering-skulls-from-same-user.patch
index 40245a5970..cef788cd88 100644
--- a/Spigot-Server-Patches/0281-Fix-client-rendering-skulls-from-same-user.patch
+++ b/Spigot-Server-Patches/0280-Fix-client-rendering-skulls-from-same-user.patch
@@ -1,4 +1,4 @@
-From f02d6679d5a68fdd5878e7d68a18e42391915a3b Mon Sep 17 00:00:00 2001
+From e1f63e935ea51043e1b30c5f7876aa27643e2826 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
@@ -12,7 +12,7 @@ This allows the client to render multiple skull textures from the same user,
 for when different skins were used when skull was made.
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 2acd02f2f..ca1bd0299 100644
+index 2acd02f2f4..ca1bd02995 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -54,7 +54,7 @@ public final class ItemStack {
@@ -25,7 +25,7 @@ index 2acd02f2f..ca1bd0299 100644
      private EntityItemFrame i;
      private ShapeDetectorBlock j;
 diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java
-index 0d67676f7..fa2d3ce8c 100644
+index 0d67676f7d..fa2d3ce8cb 100644
 --- a/src/main/java/net/minecraft/server/PacketDataSerializer.java
 +++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java
 @@ -253,6 +253,15 @@ public class PacketDataSerializer extends ByteBuf {
@@ -62,7 +62,7 @@ index 0d67676f7..fa2d3ce8c 100644
              }
              // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
-index 363ab5da1..d19a30ad8 100644
+index 363ab5da12..d19a30ad87 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 @@ -51,6 +51,7 @@ public class PacketPlayOutMapChunk implements Packet<PacketListenerPlayOut> {
@@ -74,7 +74,7 @@ index 363ab5da1..d19a30ad8 100644
                  this.f.add(nbttagcompound);
              }
 diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java
-index f6a80a00f..5306574e5 100644
+index f6a80a00f4..5306574e55 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySkull.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySkull.java
 @@ -142,9 +142,37 @@ public class TileEntitySkull extends TileEntity /*implements ITickable*/ { // Pa
diff --git a/Spigot-Server-Patches/0282-Add-Early-Warning-Feature-to-WatchDog.patch b/Spigot-Server-Patches/0281-Add-Early-Warning-Feature-to-WatchDog.patch
similarity index 97%
rename from Spigot-Server-Patches/0282-Add-Early-Warning-Feature-to-WatchDog.patch
rename to Spigot-Server-Patches/0281-Add-Early-Warning-Feature-to-WatchDog.patch
index f825905232..6ab7a4d389 100644
--- a/Spigot-Server-Patches/0282-Add-Early-Warning-Feature-to-WatchDog.patch
+++ b/Spigot-Server-Patches/0281-Add-Early-Warning-Feature-to-WatchDog.patch
@@ -1,4 +1,4 @@
-From 1348f0740b628fbbcc2f6bca3b18dcd9f679b999 Mon Sep 17 00:00:00 2001
+From 756307a54e45d15f96f071b2f955c68181f56441 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
@@ -9,7 +9,7 @@ thread dumps at an interval until the point of crash.
 This will help diagnose what was going on in that time before the crash.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index d773ef5b0..833659bbb 100644
+index d773ef5b0d..833659bbb2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -25,6 +25,7 @@ import org.bukkit.configuration.file.YamlConfiguration;
@@ -36,7 +36,7 @@ index d773ef5b0..833659bbb 100644
      public static int tabSpamLimit = 500;
      private static void tabSpamLimiters() {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ea3d9e9af..9b11fd838 100644
+index ea3d9e9afa..9b11fd838b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -847,6 +847,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -48,7 +48,7 @@ index ea3d9e9af..9b11fd838 100644
                  long start = System.nanoTime(), curTime, wait, tickSection = start; // Paper - Further improve server tick loop
                  lastTick = start - TICK_TIME; // Paper
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4fe8e198f..770dbf605 100644
+index 4fe8e198f2..770dbf6052 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -754,6 +754,7 @@ public final class CraftServer implements Server {
@@ -68,7 +68,7 @@ index 4fe8e198f..770dbf605 100644
  
      @Override
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 6c5430ff9..4b8581f0e 100644
+index 6c5430ff94..4b8581f0ed 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -225,7 +225,7 @@ public class SpigotConfig
@@ -81,7 +81,7 @@ index 6c5430ff9..4b8581f0e 100644
  
      public static boolean bungee;
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index 9532aada8..a1d93200e 100644
+index 9532aada82..a1d93200e6 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -5,6 +5,7 @@ import java.lang.management.MonitorInfo;
diff --git a/Spigot-Server-Patches/0283-Make-EnderDragon-implement-Mob.patch b/Spigot-Server-Patches/0282-Make-EnderDragon-implement-Mob.patch
similarity index 93%
rename from Spigot-Server-Patches/0283-Make-EnderDragon-implement-Mob.patch
rename to Spigot-Server-Patches/0282-Make-EnderDragon-implement-Mob.patch
index a38e3f870a..3c8c726c1e 100644
--- a/Spigot-Server-Patches/0283-Make-EnderDragon-implement-Mob.patch
+++ b/Spigot-Server-Patches/0282-Make-EnderDragon-implement-Mob.patch
@@ -1,11 +1,11 @@
-From 89218536bfa31888b2d562669ae0bd41258a8358 Mon Sep 17 00:00:00 2001
+From 038cd7f34628d8e3c4712879305f52cbc05ef016 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/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java
-index cc115cc36..4947249da 100644
+index cc115cc368..4947249da2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java
 @@ -1,17 +1,18 @@
diff --git a/Spigot-Server-Patches/0284-Detect-and-repair-corrupt-Region-Files.patch b/Spigot-Server-Patches/0283-Detect-and-repair-corrupt-Region-Files.patch
similarity index 98%
rename from Spigot-Server-Patches/0284-Detect-and-repair-corrupt-Region-Files.patch
rename to Spigot-Server-Patches/0283-Detect-and-repair-corrupt-Region-Files.patch
index f54ad9e5e8..ab2f28086d 100644
--- a/Spigot-Server-Patches/0284-Detect-and-repair-corrupt-Region-Files.patch
+++ b/Spigot-Server-Patches/0283-Detect-and-repair-corrupt-Region-Files.patch
@@ -1,4 +1,4 @@
-From a2b6a6be1167a19be210fd71878a492081f010f9 Mon Sep 17 00:00:00 2001
+From 1907814dffa81dcc72a3072d1d75c6b98ea6aae1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 11 Aug 2018 00:49:20 -0400
 Subject: [PATCH] Detect and repair corrupt Region Files
@@ -11,7 +11,7 @@ I don't know why mojang only checks for 4096, when anything less than 8192 is a
 But to be safe, it will attempt to back up the file.
 
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index 4e6288e8b..e68f90194 100644
+index 4e6288e8bb..e68f901943 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -27,13 +27,13 @@ public class RegionFile implements AutoCloseable {
diff --git a/Spigot-Server-Patches/0285-Use-ConcurrentHashMap-in-JsonList.patch b/Spigot-Server-Patches/0284-Use-ConcurrentHashMap-in-JsonList.patch
similarity index 97%
rename from Spigot-Server-Patches/0285-Use-ConcurrentHashMap-in-JsonList.patch
rename to Spigot-Server-Patches/0284-Use-ConcurrentHashMap-in-JsonList.patch
index 1693485338..b554d6fc9e 100644
--- a/Spigot-Server-Patches/0285-Use-ConcurrentHashMap-in-JsonList.patch
+++ b/Spigot-Server-Patches/0284-Use-ConcurrentHashMap-in-JsonList.patch
@@ -1,4 +1,4 @@
-From beb8d7152eb7655368b1dffaab07ce6b87f84ef7 Mon Sep 17 00:00:00 2001
+From 00cace922105b799fc3723606102a64381927a37 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
@@ -25,7 +25,7 @@ The point of this is readability, but does have a side-benefit of a small microp
 Finally, added a couple obfhelpers for the modified code
 
 diff --git a/src/main/java/net/minecraft/server/JsonList.java b/src/main/java/net/minecraft/server/JsonList.java
-index 04f98167d..c169d0176 100644
+index 04f98167d3..c169d01762 100644
 --- a/src/main/java/net/minecraft/server/JsonList.java
 +++ b/src/main/java/net/minecraft/server/JsonList.java
 @@ -35,7 +35,8 @@ public class JsonList<K, V extends JsonListEntry<K>> {
diff --git a/Spigot-Server-Patches/0286-Use-a-Queue-for-Queueing-Commands.patch b/Spigot-Server-Patches/0285-Use-a-Queue-for-Queueing-Commands.patch
similarity index 94%
rename from Spigot-Server-Patches/0286-Use-a-Queue-for-Queueing-Commands.patch
rename to Spigot-Server-Patches/0285-Use-a-Queue-for-Queueing-Commands.patch
index 76fffee092..6b391c3363 100644
--- a/Spigot-Server-Patches/0286-Use-a-Queue-for-Queueing-Commands.patch
+++ b/Spigot-Server-Patches/0285-Use-a-Queue-for-Queueing-Commands.patch
@@ -1,4 +1,4 @@
-From 70e516c89bb8e424cd543ebda4909204a0f57d56 Mon Sep 17 00:00:00 2001
+From aefc2a0f2769affc8daa6457811693f98a76b9a9 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Use a Queue for Queueing Commands
 Lists are bad as Queues mmmkay.
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index c2c676e3b..3d452fe0e 100644
+index c2c676e3bb..3d452fe0e3 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -41,7 +41,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
diff --git a/Spigot-Server-Patches/0287-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/Spigot-Server-Patches/0286-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
similarity index 92%
rename from Spigot-Server-Patches/0287-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
rename to Spigot-Server-Patches/0286-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
index bdb4963a12..f89de4e2c9 100644
--- a/Spigot-Server-Patches/0287-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
+++ b/Spigot-Server-Patches/0286-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
@@ -1,11 +1,11 @@
-From 804b51b0c2d1eb8c487871cf51c16674646ce4d7 Mon Sep 17 00:00:00 2001
+From 7855ba905d6a0b15bf63b0843cb124c1cd93c642 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/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-index 323f5bf28..f1db08c88 100644
+index 323f5bf289..f1db08c880 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 @@ -118,6 +118,11 @@ public class CraftChunk implements Chunk {
diff --git a/Spigot-Server-Patches/0288-Allow-disabling-armour-stand-ticking.patch b/Spigot-Server-Patches/0287-Allow-disabling-armour-stand-ticking.patch
similarity index 98%
rename from Spigot-Server-Patches/0288-Allow-disabling-armour-stand-ticking.patch
rename to Spigot-Server-Patches/0287-Allow-disabling-armour-stand-ticking.patch
index 58b8d0c673..506a5b342e 100644
--- a/Spigot-Server-Patches/0288-Allow-disabling-armour-stand-ticking.patch
+++ b/Spigot-Server-Patches/0287-Allow-disabling-armour-stand-ticking.patch
@@ -1,11 +1,11 @@
-From 110cbaa658e6539f2e153735527e95d03e74273f Mon Sep 17 00:00:00 2001
+From 26e203adbd97c6c3f06225898c3a404fafc5bf0b 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/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index f06bb3ae1..a5b4f9990 100644
+index f06bb3ae19..a5b4f99901 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -391,4 +391,10 @@ public class PaperWorldConfig {
@@ -20,7 +20,7 @@ index f06bb3ae1..a5b4f9990 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 00ff1e80d..5c35909eb 100644
+index 00ff1e80de..5c35909eb2 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -44,6 +44,11 @@ public class EntityArmorStand extends EntityLiving {
@@ -140,7 +140,7 @@ index 00ff1e80d..5c35909eb 100644
  
      public Vector3f r() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index d52c0d81d..6334d3dea 100644
+index d52c0d81dc..6334d3dea4 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2259,52 +2259,7 @@ public abstract class EntityLiving extends Entity {
@@ -256,7 +256,7 @@ index d52c0d81d..6334d3dea 100644
          float f2 = MathHelper.g(f - this.aK);
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-index 9f5c3b92e..07ce93f17 100644
+index 9f5c3b92e3..07ce93f17c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 @@ -297,5 +297,15 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
diff --git a/Spigot-Server-Patches/0289-Optimize-BlockPosition-helper-methods.patch b/Spigot-Server-Patches/0288-Optimize-BlockPosition-helper-methods.patch
similarity index 97%
rename from Spigot-Server-Patches/0289-Optimize-BlockPosition-helper-methods.patch
rename to Spigot-Server-Patches/0288-Optimize-BlockPosition-helper-methods.patch
index db4e820961..748dc980d3 100644
--- a/Spigot-Server-Patches/0289-Optimize-BlockPosition-helper-methods.patch
+++ b/Spigot-Server-Patches/0288-Optimize-BlockPosition-helper-methods.patch
@@ -1,4 +1,4 @@
-From 92b340b1290f3257cd825dc7b19ebccf24674c5e Mon Sep 17 00:00:00 2001
+From 79c849ce04f1493659885a9ba00fcd9eb7a978e0 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize BlockPosition helper methods
 Resolves #1338
 
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index a5e5a4eba..6ed584f8d 100644
+index a5e5a4ebae..6ed584f8dd 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -134,55 +134,72 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali
diff --git a/Spigot-Server-Patches/0290-Send-nearby-packets-from-world-player-list-not-serve.patch b/Spigot-Server-Patches/0289-Send-nearby-packets-from-world-player-list-not-serve.patch
similarity index 94%
rename from Spigot-Server-Patches/0290-Send-nearby-packets-from-world-player-list-not-serve.patch
rename to Spigot-Server-Patches/0289-Send-nearby-packets-from-world-player-list-not-serve.patch
index 2a52608552..a96283d6da 100644
--- a/Spigot-Server-Patches/0290-Send-nearby-packets-from-world-player-list-not-serve.patch
+++ b/Spigot-Server-Patches/0289-Send-nearby-packets-from-world-player-list-not-serve.patch
@@ -1,11 +1,11 @@
-From bc54ff3205320313f9632d0b77303e50b602839e Mon Sep 17 00:00:00 2001
+From a0dcb1421e802ad36276cf8ace778c55f8199777 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 006f7b8b9..af437120e 100644
+index 006f7b8b9f..af437120ec 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -922,8 +922,25 @@ public abstract class PlayerList {
@@ -46,10 +46,10 @@ index 006f7b8b9..af437120e 100644
                  double d5 = d1 - entityplayer.locY;
                  double d6 = d2 - entityplayer.locZ;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 74917a3b1..892c49506 100644
+index 364f26b556..9860175ec4 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -1182,7 +1182,7 @@ public class WorldServer extends World {
+@@ -1179,7 +1179,7 @@ public class WorldServer extends World {
          }
          // CraftBukkit end
          this.globalEntityList.add(entitylightning);
@@ -58,7 +58,7 @@ index 74917a3b1..892c49506 100644
      }
  
      @Override
-@@ -1314,7 +1314,7 @@ public class WorldServer extends World {
+@@ -1311,7 +1311,7 @@ public class WorldServer extends World {
              BlockActionData blockactiondata = (BlockActionData) this.J.removeFirst();
  
              if (this.a(blockactiondata)) {
@@ -68,7 +68,7 @@ index 74917a3b1..892c49506 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 20f7c44b6..9601d412a 100644
+index 20f7c44b65..9601d412ab 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1910,7 +1910,7 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0291-Restore-vanlla-default-mob-spawn-range.patch b/Spigot-Server-Patches/0290-Restore-vanlla-default-mob-spawn-range.patch
similarity index 87%
rename from Spigot-Server-Patches/0291-Restore-vanlla-default-mob-spawn-range.patch
rename to Spigot-Server-Patches/0290-Restore-vanlla-default-mob-spawn-range.patch
index 9b00d36c26..68b26ffd80 100644
--- a/Spigot-Server-Patches/0291-Restore-vanlla-default-mob-spawn-range.patch
+++ b/Spigot-Server-Patches/0290-Restore-vanlla-default-mob-spawn-range.patch
@@ -1,11 +1,11 @@
-From 4c96032b5b18ebc5509bf2fb920bf682f22bd52b Mon Sep 17 00:00:00 2001
+From 1d6b7fcd69eb411a3d49314954fc80054cab1d52 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 9a51c0ef7..c2bf481a6 100644
+index 9a51c0ef7a..c2bf481a60 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -152,7 +152,7 @@ public class SpigotWorldConfig
diff --git a/Spigot-Server-Patches/0292-Optimize-Hoppers.patch b/Spigot-Server-Patches/0291-Optimize-Hoppers.patch
similarity index 98%
rename from Spigot-Server-Patches/0292-Optimize-Hoppers.patch
rename to Spigot-Server-Patches/0291-Optimize-Hoppers.patch
index 312b91033f..52155f57ce 100644
--- a/Spigot-Server-Patches/0292-Optimize-Hoppers.patch
+++ b/Spigot-Server-Patches/0291-Optimize-Hoppers.patch
@@ -1,4 +1,4 @@
-From 0a9775472f2a516c4e0c2481c409b04495c7d745 Mon Sep 17 00:00:00 2001
+From 30231c8e9b612ba94f005574d442dd816b601455 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
@@ -11,7 +11,7 @@ Subject: [PATCH] Optimize Hoppers
 * Skip subsequent InventoryMoveItemEvents if a plugin does not use the item after first event fire for an iteration
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index a5b4f9990..2b5402b00 100644
+index a5b4f99901..2b5402b009 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -360,6 +360,15 @@ public class PaperWorldConfig {
@@ -31,7 +31,7 @@ index a5b4f9990..2b5402b00 100644
      private void disableSprintInterruptionOnAttack() {
          disableSprintInterruptionOnAttack = getBoolean("game-mechanics.disable-sprint-interruption-on-attack", false);
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index ca1bd0299..2d83c9e79 100644
+index ca1bd02995..2d83c9e79c 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -482,8 +482,9 @@ public final class ItemStack {
@@ -47,7 +47,7 @@ index ca1bd0299..2d83c9e79 100644
          itemstack.d(this.C());
          if (this.tag != null) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 9b11fd838..6a3776091 100644
+index 9b11fd838b..6a3776091e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1135,6 +1135,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -59,7 +59,7 @@ index 9b11fd838..6a3776091 100644
              if (true || worldserver.worldProvider.getDimensionManager() == DimensionManager.OVERWORLD || this.getAllowNether()) { // CraftBukkit
                  this.methodProfiler.a(() -> {
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 9f31f071b..6bddb2736 100644
+index 9f31f071bb..6bddb27365 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -62,6 +62,7 @@ public abstract class TileEntity implements KeyedObject { // Paper
@@ -79,7 +79,7 @@ index 9f31f071b..6bddb2736 100644
              this.world.b(this.position, this);
              if (!this.c.isAir()) {
 diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
-index 0555bae5a..452e46cad 100644
+index 0555bae5aa..452e46cad7 100644
 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java
 +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
 @@ -189,6 +189,153 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
diff --git a/Spigot-Server-Patches/0293-Optimize-CraftBlockData-Creation.patch b/Spigot-Server-Patches/0292-Optimize-CraftBlockData-Creation.patch
similarity index 94%
rename from Spigot-Server-Patches/0293-Optimize-CraftBlockData-Creation.patch
rename to Spigot-Server-Patches/0292-Optimize-CraftBlockData-Creation.patch
index 2d77dc4015..9208a367f3 100644
--- a/Spigot-Server-Patches/0293-Optimize-CraftBlockData-Creation.patch
+++ b/Spigot-Server-Patches/0292-Optimize-CraftBlockData-Creation.patch
@@ -1,4 +1,4 @@
-From 74ef4c8fafe6b57b0fbb47c7a3d4e0e026d37385 Mon Sep 17 00:00:00 2001
+From ed020cefa418b0ec20f621bbce505ffb319c0de1 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
@@ -7,7 +7,7 @@ Avoids a hashmap lookup by cacheing a reference to the CraftBlockData
 and cloning it when one is needed.
 
 diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java
-index 0f4aa698a..c66cabe82 100644
+index 0f4aa698aa..c66cabe82f 100644
 --- a/src/main/java/net/minecraft/server/IBlockData.java
 +++ b/src/main/java/net/minecraft/server/IBlockData.java
 @@ -4,6 +4,8 @@ import com.google.common.collect.ImmutableMap;
@@ -36,7 +36,7 @@ index 0f4aa698a..c66cabe82 100644
          return this.getBlock().l(this);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
-index c1666a9ba..3c29abd52 100644
+index c1666a9baf..3c29abd525 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
 @@ -539,7 +539,17 @@ public class CraftBlockData implements BlockData {
diff --git a/Spigot-Server-Patches/0294-Fix-MC-124320.patch b/Spigot-Server-Patches/0293-Fix-MC-124320.patch
similarity index 95%
rename from Spigot-Server-Patches/0294-Fix-MC-124320.patch
rename to Spigot-Server-Patches/0293-Fix-MC-124320.patch
index e5c251dda7..f5cff0eff2 100644
--- a/Spigot-Server-Patches/0294-Fix-MC-124320.patch
+++ b/Spigot-Server-Patches/0293-Fix-MC-124320.patch
@@ -1,11 +1,11 @@
-From 7d10f9c126cac888c661923da63c6a6775dc761c Mon Sep 17 00:00:00 2001
+From 0d60a09b2e5e12c669cbbb0880c8ac78ee63c3c2 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/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index dedb063de..8d69a1556 100644
+index dedb063de8..8d69a1556a 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -168,6 +168,7 @@ public class Block implements IMaterial {
@@ -17,7 +17,7 @@ index dedb063de..8d69a1556 100644
          IBlockData iblockdata1 = iblockdata;
          BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition();
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index 79d23f152..ad1553f6e 100644
+index 79d23f1522..ad1553f6e9 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -335,8 +335,9 @@ public class EntityEnderman extends EntityMonster {
diff --git a/Spigot-Server-Patches/0295-Slime-Pathfinder-Events.patch b/Spigot-Server-Patches/0294-Slime-Pathfinder-Events.patch
similarity index 98%
rename from Spigot-Server-Patches/0295-Slime-Pathfinder-Events.patch
rename to Spigot-Server-Patches/0294-Slime-Pathfinder-Events.patch
index c34a065fdc..91a899e0c7 100644
--- a/Spigot-Server-Patches/0295-Slime-Pathfinder-Events.patch
+++ b/Spigot-Server-Patches/0294-Slime-Pathfinder-Events.patch
@@ -1,11 +1,11 @@
-From 4fb60ec90eef434b7450ae50d23e5a415b53068b Mon Sep 17 00:00:00 2001
+From 57c6b03b5166380b8f24dfaee2ad8d2851bbf8fd 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/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java
-index 96cf4bcce..e28c0673d 100644
+index 96cf4bccea..e28c0673dd 100644
 --- a/src/main/java/net/minecraft/server/EntitySlime.java
 +++ b/src/main/java/net/minecraft/server/EntitySlime.java
 @@ -2,6 +2,14 @@ package net.minecraft.server;
@@ -147,7 +147,7 @@ index 96cf4bcce..e28c0673d 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
-index ce6ed6e89..6e9f1b66d 100644
+index ce6ed6e890..6e9f1b66df 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
 @@ -35,4 +35,14 @@ public class CraftSlime extends CraftMob implements Slime {
diff --git a/Spigot-Server-Patches/0296-Configurable-speed-for-water-flowing-over-lava.patch b/Spigot-Server-Patches/0295-Configurable-speed-for-water-flowing-over-lava.patch
similarity index 96%
rename from Spigot-Server-Patches/0296-Configurable-speed-for-water-flowing-over-lava.patch
rename to Spigot-Server-Patches/0295-Configurable-speed-for-water-flowing-over-lava.patch
index 999a1ae96b..b7132342f9 100644
--- a/Spigot-Server-Patches/0296-Configurable-speed-for-water-flowing-over-lava.patch
+++ b/Spigot-Server-Patches/0295-Configurable-speed-for-water-flowing-over-lava.patch
@@ -1,11 +1,11 @@
-From efe87209c910375ab5cd2d916b907e26f63ce57f Mon Sep 17 00:00:00 2001
+From e239a54a6ced679fb3e92c1caa50abd682ce598d 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/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 2b5402b00..2c27be63e 100644
+index 2b5402b009..2c27be63ea 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -401,6 +401,12 @@ public class PaperWorldConfig {
@@ -22,7 +22,7 @@ index 2b5402b00..2c27be63e 100644
      private void armorStandTick() {
          this.armorStandTick = this.getBoolean("armor-stands-tick", this.armorStandTick);
 diff --git a/src/main/java/net/minecraft/server/BlockFluids.java b/src/main/java/net/minecraft/server/BlockFluids.java
-index 44e00339f..b4616f259 100644
+index 44e00339f2..b4616f259e 100644
 --- a/src/main/java/net/minecraft/server/BlockFluids.java
 +++ b/src/main/java/net/minecraft/server/BlockFluids.java
 @@ -70,11 +70,27 @@ public class BlockFluids extends Block implements IFluidSource {
diff --git a/Spigot-Server-Patches/0297-Optimize-RegistryMaterials.patch b/Spigot-Server-Patches/0296-Optimize-RegistryMaterials.patch
similarity index 94%
rename from Spigot-Server-Patches/0297-Optimize-RegistryMaterials.patch
rename to Spigot-Server-Patches/0296-Optimize-RegistryMaterials.patch
index c831336007..e69c1dfd1c 100644
--- a/Spigot-Server-Patches/0297-Optimize-RegistryMaterials.patch
+++ b/Spigot-Server-Patches/0296-Optimize-RegistryMaterials.patch
@@ -1,4 +1,4 @@
-From da428268d2e5594cecb0cbf38d51f6c3021d6af0 Mon Sep 17 00:00:00 2001
+From 61f14ee6694a89bbd6a0888d95535aa7ade9d667 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
@@ -8,7 +8,7 @@ Use larger initial sizes to increase bucket capacity on the BiMap
 BiMap.get was seen to be using a good bit of CPU time.
 
 diff --git a/src/main/java/net/minecraft/server/RegistryMaterials.java b/src/main/java/net/minecraft/server/RegistryMaterials.java
-index f291e05b2..fed38e6ef 100644
+index f291e05b26..fed38e6ef0 100644
 --- a/src/main/java/net/minecraft/server/RegistryMaterials.java
 +++ b/src/main/java/net/minecraft/server/RegistryMaterials.java
 @@ -16,9 +16,9 @@ import org.apache.logging.log4j.Logger;
diff --git a/Spigot-Server-Patches/0298-Add-PhantomPreSpawnEvent.patch b/Spigot-Server-Patches/0297-Add-PhantomPreSpawnEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0298-Add-PhantomPreSpawnEvent.patch
rename to Spigot-Server-Patches/0297-Add-PhantomPreSpawnEvent.patch
index 93f262d664..89cd2f7f15 100644
--- a/Spigot-Server-Patches/0298-Add-PhantomPreSpawnEvent.patch
+++ b/Spigot-Server-Patches/0297-Add-PhantomPreSpawnEvent.patch
@@ -1,11 +1,11 @@
-From 94bfe89904dde5bfaadb0e759c2a590a629106fd Mon Sep 17 00:00:00 2001
+From 08def75c3cf04fd95baa56cb28f25c27f7005909 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/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
-index e5ed5a3dc..e5d032d02 100644
+index e5ed5a3dcc..e5d032d02b 100644
 --- a/src/main/java/net/minecraft/server/EntityPhantom.java
 +++ b/src/main/java/net/minecraft/server/EntityPhantom.java
 @@ -129,6 +129,11 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@@ -48,7 +48,7 @@ index e5ed5a3dc..e5d032d02 100644
  
          private final PathfinderTargetCondition b;
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
-index 9f64d81c6..1818e7c38 100644
+index 9f64d81c64..1818e7c384 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
 @@ -50,8 +50,17 @@ public class MobSpawnerPhantom {
@@ -71,7 +71,7 @@ index 9f64d81c6..1818e7c38 100644
                                                  groupdataentity = entityphantom.prepare(worldserver, difficultydamagescaler, EnumMobSpawn.NATURAL, groupdataentity, (NBTTagCompound) null);
                                                  worldserver.addEntity(entityphantom, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.NATURAL); // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
-index 9f9ee9239..2b9731369 100644
+index 9f9ee92390..2b97313694 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
 @@ -35,4 +35,10 @@ public class CraftPhantom extends CraftFlying implements Phantom {
diff --git a/Spigot-Server-Patches/0299-Add-More-Creeper-API.patch b/Spigot-Server-Patches/0298-Add-More-Creeper-API.patch
similarity index 95%
rename from Spigot-Server-Patches/0299-Add-More-Creeper-API.patch
rename to Spigot-Server-Patches/0298-Add-More-Creeper-API.patch
index cdc0ce6843..ac3b6ef221 100644
--- a/Spigot-Server-Patches/0299-Add-More-Creeper-API.patch
+++ b/Spigot-Server-Patches/0298-Add-More-Creeper-API.patch
@@ -1,11 +1,11 @@
-From 8dd46e3c15d3dafdeda826cfa52bc05e2772df74 Mon Sep 17 00:00:00 2001
+From 7f389a7f31a6f26910ff135b6c4cf67b376a36bb 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/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
-index 29569805c..0c2c3c730 100644
+index 29569805cb..0c2c3c7308 100644
 --- a/src/main/java/net/minecraft/server/EntityCreeper.java
 +++ b/src/main/java/net/minecraft/server/EntityCreeper.java
 @@ -13,7 +13,7 @@ public class EntityCreeper extends EntityMonster {
@@ -47,7 +47,7 @@ index 29569805c..0c2c3c730 100644
  
      public boolean canCauseHeadDrop() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
-index 796ee9e40..2d38823c5 100644
+index 796ee9e40d..2d38823c57 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
 @@ -78,4 +78,22 @@ public class CraftCreeper extends CraftMonster implements Creeper {
diff --git a/Spigot-Server-Patches/0300-Inventory-removeItemAnySlot.patch b/Spigot-Server-Patches/0299-Inventory-removeItemAnySlot.patch
similarity index 95%
rename from Spigot-Server-Patches/0300-Inventory-removeItemAnySlot.patch
rename to Spigot-Server-Patches/0299-Inventory-removeItemAnySlot.patch
index f0eacd9f7a..2a42d787fe 100644
--- a/Spigot-Server-Patches/0300-Inventory-removeItemAnySlot.patch
+++ b/Spigot-Server-Patches/0299-Inventory-removeItemAnySlot.patch
@@ -1,11 +1,11 @@
-From a93fab3b32dae7412e4c3e7806f964c636d31820 Mon Sep 17 00:00:00 2001
+From 6a2062ad2420c5f42f60a08a82abfab2d379d9fa 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/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-index 7e0a20d1d..c3516de7f 100644
+index 7e0a20d1d7..c3516de7f4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
 @@ -223,10 +223,16 @@ public class CraftInventory implements Inventory {
diff --git a/Spigot-Server-Patches/0301-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/Spigot-Server-Patches/0300-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
similarity index 91%
rename from Spigot-Server-Patches/0301-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
rename to Spigot-Server-Patches/0300-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
index 28dd0196d9..b8ff2ef3e9 100644
--- a/Spigot-Server-Patches/0301-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
+++ b/Spigot-Server-Patches/0300-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
@@ -1,4 +1,4 @@
-From 6a510bdc5a0312814acd7e8781d89d38a2b00f40 Mon Sep 17 00:00:00 2001
+From 3169b20390f624a3819d11623cf93f7c37327a49 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 9601d412a..ca41b6d6b 100644
+index 9601d412ab..ca41b6d6ba 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -478,7 +478,7 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0302-Add-ray-tracing-methods-to-LivingEntity.patch b/Spigot-Server-Patches/0301-Add-ray-tracing-methods-to-LivingEntity.patch
similarity index 96%
rename from Spigot-Server-Patches/0302-Add-ray-tracing-methods-to-LivingEntity.patch
rename to Spigot-Server-Patches/0301-Add-ray-tracing-methods-to-LivingEntity.patch
index 3991369dea..0d0a461fe0 100644
--- a/Spigot-Server-Patches/0302-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/Spigot-Server-Patches/0301-Add-ray-tracing-methods-to-LivingEntity.patch
@@ -1,11 +1,11 @@
-From 6382bfe981164038843888357877fb72abddcace Mon Sep 17 00:00:00 2001
+From 4070628e412e583070ec7f89a113ee798abcb66c 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/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 6334d3dea..ef24896c0 100644
+index 6334d3dea4..ef24896c0f 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -3170,6 +3170,23 @@ public abstract class EntityLiving extends Entity {
@@ -33,7 +33,7 @@ index 6334d3dea..ef24896c0 100644
  
      public int getShieldBlockingDelay() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 00fae6840..4233ffe65 100644
+index 00fae68408..4233ffe654 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -179,6 +179,28 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/Spigot-Server-Patches/0303-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-Server-Patches/0302-Expose-attack-cooldown-methods-for-Player.patch
similarity index 93%
rename from Spigot-Server-Patches/0303-Expose-attack-cooldown-methods-for-Player.patch
rename to Spigot-Server-Patches/0302-Expose-attack-cooldown-methods-for-Player.patch
index 6abfad98ff..ae80b2c998 100644
--- a/Spigot-Server-Patches/0303-Expose-attack-cooldown-methods-for-Player.patch
+++ b/Spigot-Server-Patches/0302-Expose-attack-cooldown-methods-for-Player.patch
@@ -1,11 +1,11 @@
-From 29dac3a1b697140395f243de7a281f933480d558 Mon Sep 17 00:00:00 2001
+From 57ebaabf637c0aca1bd24a3c908e4a78452226ed 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/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index d1a7a873b..2f614dfb6 100644
+index d1a7a873b9..2f614dfb6b 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -2003,14 +2003,17 @@ public abstract class EntityHuman extends EntityLiving {
@@ -27,7 +27,7 @@ index d1a7a873b..2f614dfb6 100644
          this.aD = 0;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ba60ece45..0386452a8 100644
+index ba60ece457..0386452a8d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1908,6 +1908,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0304-Improve-death-events.patch b/Spigot-Server-Patches/0303-Improve-death-events.patch
similarity index 98%
rename from Spigot-Server-Patches/0304-Improve-death-events.patch
rename to Spigot-Server-Patches/0303-Improve-death-events.patch
index 9d67224887..3a9cae048c 100644
--- a/Spigot-Server-Patches/0304-Improve-death-events.patch
+++ b/Spigot-Server-Patches/0303-Improve-death-events.patch
@@ -1,4 +1,4 @@
-From bce84891d0934ab524e6f577621772faffc88e31 Mon Sep 17 00:00:00 2001
+From 808f26b2ce12112b0dedd5a06f2f4d58bebaedef 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
@@ -15,7 +15,7 @@ items and experience which is otherwise only properly possible by using
 internal code.
 
 diff --git a/src/main/java/net/minecraft/server/CombatTracker.java b/src/main/java/net/minecraft/server/CombatTracker.java
-index 20db76abd..a148cd437 100644
+index 20db76abd7..a148cd437c 100644
 --- a/src/main/java/net/minecraft/server/CombatTracker.java
 +++ b/src/main/java/net/minecraft/server/CombatTracker.java
 @@ -175,6 +175,7 @@ public class CombatTracker {
@@ -27,7 +27,7 @@ index 20db76abd..a148cd437 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 e1c793aad..b060a74a1 100644
+index e1c793aad5..b060a74a1e 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1463,6 +1463,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -47,7 +47,7 @@ index e1c793aad..b060a74a1 100644
  
      protected void i(double d0, double d1, double d2) {
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 5c35909eb..19ba4e059 100644
+index 5c35909eb2..19ba4e059f 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -675,7 +675,8 @@ public class EntityArmorStand extends EntityLiving {
@@ -61,7 +61,7 @@ index 5c35909eb..19ba4e059 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java
-index 87091d804..77643413f 100644
+index 87091d8045..77643413f3 100644
 --- a/src/main/java/net/minecraft/server/EntityFox.java
 +++ b/src/main/java/net/minecraft/server/EntityFox.java
 @@ -597,15 +597,25 @@ public class EntityFox extends EntityAnimal {
@@ -94,7 +94,7 @@ index 87091d804..77643413f 100644
  
      public static boolean a(EntityFox entityfox, EntityLiving entityliving) {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index ef24896c0..2631e9a4b 100644
+index ef24896c0f..2631e9a4ba 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -85,7 +85,7 @@ public abstract class EntityLiving extends Entity {
@@ -249,7 +249,7 @@ index ef24896c0..2631e9a4b 100644
          return this.isBaby() ? (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.5F : (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index d46ddba34..0f3be967e 100644
+index d46ddba341..0f3be967e5 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -75,6 +75,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -300,7 +300,7 @@ index d46ddba34..0f3be967e 100644
          }
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftSound.java b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
-index 73cb64e09..9f317ff2e 100644
+index 73cb64e09d..9f317ff2e8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftSound.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
 @@ -806,6 +806,22 @@ public enum CraftSound {
@@ -327,7 +327,7 @@ index 73cb64e09..9f317ff2e 100644
          this.minecraftKey = minecraftKey;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0386452a8..deacc2187 100644
+index 0386452a8d..deacc21873 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1712,7 +1712,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -348,7 +348,7 @@ index 0386452a8..deacc2187 100644
  
      public void injectScaledMaxHealth(Collection<AttributeInstance> collection, boolean force) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 9380b4953..781bf2b42 100644
+index 9380b4953f..781bf2b42f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -720,9 +720,16 @@ public class CraftEventFactory {
diff --git a/Spigot-Server-Patches/0305-Allow-chests-to-be-placed-with-NBT-data.patch b/Spigot-Server-Patches/0304-Allow-chests-to-be-placed-with-NBT-data.patch
similarity index 91%
rename from Spigot-Server-Patches/0305-Allow-chests-to-be-placed-with-NBT-data.patch
rename to Spigot-Server-Patches/0304-Allow-chests-to-be-placed-with-NBT-data.patch
index e8505ca09b..ce4f97ea9e 100644
--- a/Spigot-Server-Patches/0305-Allow-chests-to-be-placed-with-NBT-data.patch
+++ b/Spigot-Server-Patches/0304-Allow-chests-to-be-placed-with-NBT-data.patch
@@ -1,11 +1,11 @@
-From 7e6b225f5a6ab33236a0fa8e938cdac876bc64bd Mon Sep 17 00:00:00 2001
+From 76e46a384be86466049b90d85aeff048a6b91794 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/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 2d83c9e79..dec589463 100644
+index 2d83c9e79c..dec5894637 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -235,6 +235,7 @@ public final class ItemStack {
@@ -17,7 +17,7 @@ index 2d83c9e79..dec589463 100644
                      for (BlockState blockstate : blocks) {
                          blockstate.update(true, false);
 diff --git a/src/main/java/net/minecraft/server/TileEntityChest.java b/src/main/java/net/minecraft/server/TileEntityChest.java
-index d606e2e4f..f9f9183da 100644
+index d606e2e4fd..f9f9183daa 100644
 --- a/src/main/java/net/minecraft/server/TileEntityChest.java
 +++ b/src/main/java/net/minecraft/server/TileEntityChest.java
 @@ -308,7 +308,7 @@ public class TileEntityChest extends TileEntityLootable { // Paper - Remove ITic
diff --git a/Spigot-Server-Patches/0306-Mob-Pathfinding-API.patch b/Spigot-Server-Patches/0305-Mob-Pathfinding-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0306-Mob-Pathfinding-API.patch
rename to Spigot-Server-Patches/0305-Mob-Pathfinding-API.patch
index 3c3ecb3a68..385c37bf7b 100644
--- a/Spigot-Server-Patches/0306-Mob-Pathfinding-API.patch
+++ b/Spigot-Server-Patches/0305-Mob-Pathfinding-API.patch
@@ -1,4 +1,4 @@
-From dcd722dbbe2dc22a1cba041ae490d1da46d84429 Mon Sep 17 00:00:00 2001
+From ea30d1b969577bd6f08afb4541f442ec4732e353 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
@@ -7,7 +7,7 @@ Implements Pathfinding API for mobs
 
 diff --git a/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java b/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java
 new file mode 100644
-index 000000000..f68a07cb9
+index 0000000000..f68a07cb96
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java
 @@ -0,0 +1,111 @@
@@ -123,7 +123,7 @@ index 000000000..f68a07cb9
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
-index 6cc142383..1bf7ead71 100644
+index 6cc1423837..1bf7ead714 100644
 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java
 +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
 @@ -69,7 +69,7 @@ public abstract class NavigationAbstract {
@@ -170,7 +170,7 @@ index 6cc142383..1bf7ead71 100644
          this.pathfindFailures = 0; this.lastFailure = 0; // Paper - Pathfinding optimizations
          this.c = null;
 diff --git a/src/main/java/net/minecraft/server/PathEntity.java b/src/main/java/net/minecraft/server/PathEntity.java
-index f1d94420c..5fdb60180 100644
+index f1d94420c8..5fdb601801 100644
 --- a/src/main/java/net/minecraft/server/PathEntity.java
 +++ b/src/main/java/net/minecraft/server/PathEntity.java
 @@ -5,11 +5,12 @@ import javax.annotation.Nullable;
@@ -208,7 +208,7 @@ index f1d94420c..5fdb60180 100644
  
          return new Vec3D((double) pathpoint.a, (double) pathpoint.b, (double) pathpoint.c);
 diff --git a/src/main/java/net/minecraft/server/PathPoint.java b/src/main/java/net/minecraft/server/PathPoint.java
-index 955152ef4..4e2cef8f6 100644
+index 955152ef4e..4e2cef8f67 100644
 --- a/src/main/java/net/minecraft/server/PathPoint.java
 +++ b/src/main/java/net/minecraft/server/PathPoint.java
 @@ -2,9 +2,9 @@ package net.minecraft.server;
@@ -225,7 +225,7 @@ index 955152ef4..4e2cef8f6 100644
      public int d = -1;
      public float e;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-index 5bf1cd06f..53c2d154e 100644
+index 5bf1cd06fa..53c2d154ed 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 @@ -12,8 +12,11 @@ import org.bukkit.loot.LootTable;
diff --git a/Spigot-Server-Patches/0307-Prevent-chunk-loading-from-Fluid-Flowing.patch b/Spigot-Server-Patches/0306-Prevent-chunk-loading-from-Fluid-Flowing.patch
similarity index 97%
rename from Spigot-Server-Patches/0307-Prevent-chunk-loading-from-Fluid-Flowing.patch
rename to Spigot-Server-Patches/0306-Prevent-chunk-loading-from-Fluid-Flowing.patch
index 8a26a440fa..bc99e64de6 100644
--- a/Spigot-Server-Patches/0307-Prevent-chunk-loading-from-Fluid-Flowing.patch
+++ b/Spigot-Server-Patches/0306-Prevent-chunk-loading-from-Fluid-Flowing.patch
@@ -1,11 +1,11 @@
-From cb9bc772781cdbbbe129929c0054df90d7ecbc34 Mon Sep 17 00:00:00 2001
+From 2cededad82edc0d12c8b78ddd01dde479630f6ad 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/src/main/java/net/minecraft/server/FluidTypeFlowing.java b/src/main/java/net/minecraft/server/FluidTypeFlowing.java
-index c76fa0b4b..5f1514360 100644
+index c76fa0b4bf..5f15143603 100644
 --- a/src/main/java/net/minecraft/server/FluidTypeFlowing.java
 +++ b/src/main/java/net/minecraft/server/FluidTypeFlowing.java
 @@ -178,7 +178,8 @@ public abstract class FluidTypeFlowing extends FluidType {
diff --git a/Spigot-Server-Patches/0308-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/Spigot-Server-Patches/0307-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
similarity index 99%
rename from Spigot-Server-Patches/0308-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
rename to Spigot-Server-Patches/0307-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
index d071dee617..923f8f8d36 100644
--- a/Spigot-Server-Patches/0308-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
+++ b/Spigot-Server-Patches/0307-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
@@ -1,11 +1,11 @@
-From 9150274ca0d7bca90eb19dda095074435328e565 Mon Sep 17 00:00:00 2001
+From bcab389ca1ab07d529fc53068b3a5fd1bb620378 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/src/main/java/net/minecraft/server/ArgumentBlock.java b/src/main/java/net/minecraft/server/ArgumentBlock.java
-index 3a215dea4..ea93452e6 100644
+index 3a215dea43..ea93452e6d 100644
 --- a/src/main/java/net/minecraft/server/ArgumentBlock.java
 +++ b/src/main/java/net/minecraft/server/ArgumentBlock.java
 @@ -43,7 +43,7 @@ public class ArgumentBlock {
@@ -32,7 +32,7 @@ index 3a215dea4..ea93452e6 100644
          this.s = this::l;
          if (this.i.canRead() && this.i.peek() == '#') {
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 159037fc3..9dcf2d20f 100644
+index 159037fc3e..9dcf2d20f2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -86,6 +86,12 @@ import org.bukkit.persistence.PersistentDataContainer;
diff --git a/Spigot-Server-Patches/0309-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/Spigot-Server-Patches/0308-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
similarity index 96%
rename from Spigot-Server-Patches/0309-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
rename to Spigot-Server-Patches/0308-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
index 5232605151..b2fbe66c31 100644
--- a/Spigot-Server-Patches/0309-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
+++ b/Spigot-Server-Patches/0308-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
@@ -1,11 +1,11 @@
-From db28398df075be84961aecfbc0101c8a75bbb8e9 Mon Sep 17 00:00:00 2001
+From d2a70df6e26a1fd7dee1650cc5448d30b828b73a 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/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java b/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java
-index ce9318c57..541d97344 100644
+index ce9318c575..541d97344e 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java
 @@ -12,11 +12,13 @@ public class PathfinderGoalRemoveBlock extends PathfinderGoalGotoTarget {
@@ -53,7 +53,7 @@ index ce9318c57..541d97344 100644
          return block == this.g && iworldreader.getType(blockposition.up()).isAir() && iworldreader.getType(blockposition.up(2)).isAir();
      }
 diff --git a/src/main/java/net/minecraft/server/RandomPositionGenerator.java b/src/main/java/net/minecraft/server/RandomPositionGenerator.java
-index b286934aa..c7e25e2be 100644
+index b286934aa8..c7e25e2be8 100644
 --- a/src/main/java/net/minecraft/server/RandomPositionGenerator.java
 +++ b/src/main/java/net/minecraft/server/RandomPositionGenerator.java
 @@ -93,6 +93,7 @@ public class RandomPositionGenerator {
@@ -74,7 +74,7 @@ index b286934aa..c7e25e2be 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 31ffc57c9..830780b49 100644
+index 8bb2e1bf0f..5220ea0994 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -647,6 +647,16 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
diff --git a/Spigot-Server-Patches/0310-Prevent-mob-spawning-from-loading-generating-chunks.patch b/Spigot-Server-Patches/0309-Prevent-mob-spawning-from-loading-generating-chunks.patch
similarity index 95%
rename from Spigot-Server-Patches/0310-Prevent-mob-spawning-from-loading-generating-chunks.patch
rename to Spigot-Server-Patches/0309-Prevent-mob-spawning-from-loading-generating-chunks.patch
index 47365b9d6e..80072b34bb 100644
--- a/Spigot-Server-Patches/0310-Prevent-mob-spawning-from-loading-generating-chunks.patch
+++ b/Spigot-Server-Patches/0309-Prevent-mob-spawning-from-loading-generating-chunks.patch
@@ -1,4 +1,4 @@
-From ca76c23078d05476c1e3ebf58fedf94349e791df Mon Sep 17 00:00:00 2001
+From 7a9fa948ba5ff3fbe51bf1ec22f5f06a3ea0c091 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent mob spawning from loading/generating chunks
 also prevents if out of world border bounds
 
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index 14e2f3ca7..5824cbba6 100644
+index 14e2f3ca71..5824cbba67 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -25,9 +25,9 @@ public final class SpawnerCreature {
diff --git a/Spigot-Server-Patches/0311-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/Spigot-Server-Patches/0310-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 96%
rename from Spigot-Server-Patches/0311-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to Spigot-Server-Patches/0310-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
index a757c2b9bf..a89e3f402b 100644
--- a/Spigot-Server-Patches/0311-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
+++ b/Spigot-Server-Patches/0310-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
@@ -1,4 +1,4 @@
-From 1e47f305ac479df81f14a237fd06207f33e2cb40 Mon Sep 17 00:00:00 2001
+From 531922c361738780d5ad940b3417d385268439f3 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize Biome Mob Lookups for Mob Spawning
 Uses an EnumMap as well as a Set paired List for O(1) contains calls.
 
 diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java
-index 9a839d654..72eb669c5 100644
+index 9a839d6540..72eb669c50 100644
 --- a/src/main/java/net/minecraft/server/BiomeBase.java
 +++ b/src/main/java/net/minecraft/server/BiomeBase.java
 @@ -38,7 +38,7 @@ public abstract class BiomeBase {
diff --git a/Spigot-Server-Patches/0312-Implement-furnace-cook-speed-multiplier-API.patch b/Spigot-Server-Patches/0311-Implement-furnace-cook-speed-multiplier-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0312-Implement-furnace-cook-speed-multiplier-API.patch
rename to Spigot-Server-Patches/0311-Implement-furnace-cook-speed-multiplier-API.patch
index 9542d8ce66..eaa501ad66 100644
--- a/Spigot-Server-Patches/0312-Implement-furnace-cook-speed-multiplier-API.patch
+++ b/Spigot-Server-Patches/0311-Implement-furnace-cook-speed-multiplier-API.patch
@@ -1,4 +1,4 @@
-From 27520fa921bec839d7426ff7a8ebeec05cf974c3 Mon Sep 17 00:00:00 2001
+From 88622e1383001ad29592cc4e6fd9dba28f849c7b 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement furnace cook speed multiplier API
 Signed-off-by: Tassu <git@tassu.me>
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java
-index be16fe9a9..b9f3a952e 100644
+index be16fe9a9e..b9f3a952e8 100644
 --- a/src/main/java/net/minecraft/server/TileEntityFurnace.java
 +++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java
 @@ -8,6 +8,7 @@ import java.util.Map;
@@ -57,7 +57,7 @@ index be16fe9a9..b9f3a952e 100644
                          this.cookTimeTotal = this.getRecipeCookingTime();
                          this.burn(irecipe);
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java b/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java
-index 9cc67915c..1ce10ea04 100644
+index 9cc67915ca..1ce10ea049 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java
 @@ -63,4 +63,18 @@ public class CraftFurnace<T extends TileEntityFurnace> extends CraftContainer<T>
diff --git a/Spigot-Server-Patches/0313-Support-Overriding-World-Seeds.patch b/Spigot-Server-Patches/0312-Support-Overriding-World-Seeds.patch
similarity index 96%
rename from Spigot-Server-Patches/0313-Support-Overriding-World-Seeds.patch
rename to Spigot-Server-Patches/0312-Support-Overriding-World-Seeds.patch
index 9b21028038..67ba127604 100644
--- a/Spigot-Server-Patches/0313-Support-Overriding-World-Seeds.patch
+++ b/Spigot-Server-Patches/0312-Support-Overriding-World-Seeds.patch
@@ -1,4 +1,4 @@
-From 8fa7e6f90ba36f6a7533c57bb79dd28abf31bd0c Mon Sep 17 00:00:00 2001
+From 29e65558defe03fa9e5b995a8cbad3a1db22a687 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
@@ -15,7 +15,7 @@ This seed will end up being saved to the world data file, so it is
 a permanent change in that it won't go back if you remove it from paper.yml
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 833659bbb..ffb18902f 100644
+index 833659bbb2..ffb18902ff 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -11,6 +11,7 @@ import java.lang.reflect.Modifier;
@@ -59,7 +59,7 @@ index 833659bbb..ffb18902f 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 6a3776091..0209330ad 100644
+index 6a3776091e..0209330ad4 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -363,7 +363,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -72,7 +72,7 @@ index 6a3776091..0209330ad 100644
  
              if (j == 0) {
 diff --git a/src/main/java/net/minecraft/server/WorldData.java b/src/main/java/net/minecraft/server/WorldData.java
-index 9ecd412ae..eb1464983 100644
+index 9ecd412ae3..eb14649830 100644
 --- a/src/main/java/net/minecraft/server/WorldData.java
 +++ b/src/main/java/net/minecraft/server/WorldData.java
 @@ -116,7 +116,7 @@ public class WorldData {
@@ -85,7 +85,7 @@ index 9ecd412ae..eb1464983 100644
              String s = nbttagcompound.getString("generatorName");
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 770dbf605..2e03556f2 100644
+index 770dbf6052..2e03556f2b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -985,7 +985,7 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0314-Optimize-Server-World-Map.patch b/Spigot-Server-Patches/0313-Optimize-Server-World-Map.patch
similarity index 98%
rename from Spigot-Server-Patches/0314-Optimize-Server-World-Map.patch
rename to Spigot-Server-Patches/0313-Optimize-Server-World-Map.patch
index acbbedf51e..7ecf418529 100644
--- a/Spigot-Server-Patches/0314-Optimize-Server-World-Map.patch
+++ b/Spigot-Server-Patches/0313-Optimize-Server-World-Map.patch
@@ -1,4 +1,4 @@
-From 10c1e39559a9a997f292adef016965d76262dfd2 Mon Sep 17 00:00:00 2001
+From fe9c34162b8ad9499acf895ef24bae9ea09cced2 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
@@ -21,7 +21,7 @@ known NMS used methods, but we can add more if naughty plugins are found later.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldMap.java b/src/main/java/com/destroystokyo/paper/PaperWorldMap.java
 new file mode 100644
-index 000000000..6bb2f98b4
+index 0000000000..6bb2f98b45
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldMap.java
 @@ -0,0 +1,191 @@
@@ -217,7 +217,7 @@ index 000000000..6bb2f98b4
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0209330ad..0a02dece6 100644
+index 0209330ad4..0a02dece68 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -78,7 +78,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
diff --git a/Spigot-Server-Patches/0315-PreSpawnerSpawnEvent.patch b/Spigot-Server-Patches/0314-PreSpawnerSpawnEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0315-PreSpawnerSpawnEvent.patch
rename to Spigot-Server-Patches/0314-PreSpawnerSpawnEvent.patch
index 7285d9f8bc..83c008361f 100644
--- a/Spigot-Server-Patches/0315-PreSpawnerSpawnEvent.patch
+++ b/Spigot-Server-Patches/0314-PreSpawnerSpawnEvent.patch
@@ -1,4 +1,4 @@
-From 2e24ac06e3a238982ad6c4f8a997c4b7cfccf3a5 Mon Sep 17 00:00:00 2001
+From d5b65eb227e255c2ec85ed6bdcb4bd04a6c7f4d4 Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Tue, 18 Sep 2018 23:53:23 +0100
 Subject: [PATCH] PreSpawnerSpawnEvent
@@ -9,7 +9,7 @@ SpawnerSpawnEvent gets called instead of the CreatureSpawnEvent for
 spawners.
 
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index 55764deec..dbb8098d6 100644
+index 55764deec4..dbb8098d6c 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -108,11 +108,11 @@ public abstract class MobSpawnerAbstract {
diff --git a/Spigot-Server-Patches/0316-Catch-JsonParseException-in-Entity-and-TE-names.patch b/Spigot-Server-Patches/0315-Catch-JsonParseException-in-Entity-and-TE-names.patch
similarity index 95%
rename from Spigot-Server-Patches/0316-Catch-JsonParseException-in-Entity-and-TE-names.patch
rename to Spigot-Server-Patches/0315-Catch-JsonParseException-in-Entity-and-TE-names.patch
index 780a20f081..8db2fec6e5 100644
--- a/Spigot-Server-Patches/0316-Catch-JsonParseException-in-Entity-and-TE-names.patch
+++ b/Spigot-Server-Patches/0315-Catch-JsonParseException-in-Entity-and-TE-names.patch
@@ -1,4 +1,4 @@
-From 7002617ae09ca1a57ca7a72648b528047e78b358 Mon Sep 17 00:00:00 2001
+From 091bf5c1ff4b65cdb0a60a83545e5f42724c0f46 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
@@ -13,7 +13,7 @@ Shulkers) may need to be changed in order for it to re-save properly
 No more crashing though.
 
 diff --git a/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java b/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java
-index 4b7aefb7a..9e568d5d1 100644
+index 4b7aefb7a7..9e568d5d15 100644
 --- a/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java
 +++ b/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java
 @@ -56,7 +56,7 @@ public abstract class CommandBlockListenerAbstract implements ICommandListener {
@@ -26,7 +26,7 @@ index 4b7aefb7a..9e568d5d1 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 b060a74a1..b1cf9b85f 100644
+index b060a74a1e..b1cf9b85fa 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1647,7 +1647,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -39,7 +39,7 @@ index b060a74a1..b1cf9b85f 100644
  
                      this.setCustomNameVisible(nbttagcompound.getBoolean("CustomNameVisible"));
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index 6d278a0da..ec3732193 100644
+index 6d278a0da5..ec3732193f 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -339,4 +339,19 @@ public final class MCUtil {
@@ -63,7 +63,7 @@ index 6d278a0da..ec3732193 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/TileEntityBanner.java b/src/main/java/net/minecraft/server/TileEntityBanner.java
-index 1f26d8a02..12264c4d0 100644
+index 1f26d8a022..12264c4d03 100644
 --- a/src/main/java/net/minecraft/server/TileEntityBanner.java
 +++ b/src/main/java/net/minecraft/server/TileEntityBanner.java
 @@ -57,7 +57,7 @@ public class TileEntityBanner extends TileEntity implements INamableTileEntity {
@@ -76,7 +76,7 @@ index 1f26d8a02..12264c4d0 100644
  
          if (this.hasWorld()) {
 diff --git a/src/main/java/net/minecraft/server/TileEntityContainer.java b/src/main/java/net/minecraft/server/TileEntityContainer.java
-index 3590b4e31..ea7d5a430 100644
+index 3590b4e317..ea7d5a430a 100644
 --- a/src/main/java/net/minecraft/server/TileEntityContainer.java
 +++ b/src/main/java/net/minecraft/server/TileEntityContainer.java
 @@ -17,7 +17,7 @@ public abstract class TileEntityContainer extends TileEntity implements IInvento
diff --git a/Spigot-Server-Patches/0317-Avoid-dimension-id-collisions.patch b/Spigot-Server-Patches/0316-Avoid-dimension-id-collisions.patch
similarity index 91%
rename from Spigot-Server-Patches/0317-Avoid-dimension-id-collisions.patch
rename to Spigot-Server-Patches/0316-Avoid-dimension-id-collisions.patch
index b02bc31d20..fd8137ba48 100644
--- a/Spigot-Server-Patches/0317-Avoid-dimension-id-collisions.patch
+++ b/Spigot-Server-Patches/0316-Avoid-dimension-id-collisions.patch
@@ -1,4 +1,4 @@
-From 2b69d7f4b9412f29bb5dd3f7e9e2f9c4c5933a9d Mon Sep 17 00:00:00 2001
+From 5e1bf74c8276c66d67df69c4482c4a11727b0c7f 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
@@ -8,7 +8,7 @@ we would reuse an existing dimension id, if some other dimension was
 unloaded before.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2e03556f2..467583f1d 100644
+index 2e03556f2b..467583f1dc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -971,7 +971,7 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0318-Honor-EntityAgeable.ageLock.patch b/Spigot-Server-Patches/0317-Honor-EntityAgeable.ageLock.patch
similarity index 86%
rename from Spigot-Server-Patches/0318-Honor-EntityAgeable.ageLock.patch
rename to Spigot-Server-Patches/0317-Honor-EntityAgeable.ageLock.patch
index 0e530d9b57..8afbdef2f0 100644
--- a/Spigot-Server-Patches/0318-Honor-EntityAgeable.ageLock.patch
+++ b/Spigot-Server-Patches/0317-Honor-EntityAgeable.ageLock.patch
@@ -1,11 +1,11 @@
-From f833510f284d253f645486538ee2048dfe2bd5c4 Mon Sep 17 00:00:00 2001
+From ec2beef52dccd22c1ade05df0dd2f9e31ab01dcf 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/src/main/java/net/minecraft/server/EntityAgeable.java b/src/main/java/net/minecraft/server/EntityAgeable.java
-index da9740a99..e87754ef3 100644
+index da9740a99e..e87754ef33 100644
 --- a/src/main/java/net/minecraft/server/EntityAgeable.java
 +++ b/src/main/java/net/minecraft/server/EntityAgeable.java
 @@ -85,6 +85,7 @@ public abstract class EntityAgeable extends EntityCreature {
diff --git a/Spigot-Server-Patches/0319-Don-t-recheck-type-after-setting-a-block.patch b/Spigot-Server-Patches/0318-Don-t-recheck-type-after-setting-a-block.patch
similarity index 92%
rename from Spigot-Server-Patches/0319-Don-t-recheck-type-after-setting-a-block.patch
rename to Spigot-Server-Patches/0318-Don-t-recheck-type-after-setting-a-block.patch
index ae416cfb0e..387e95177c 100644
--- a/Spigot-Server-Patches/0319-Don-t-recheck-type-after-setting-a-block.patch
+++ b/Spigot-Server-Patches/0318-Don-t-recheck-type-after-setting-a-block.patch
@@ -1,4 +1,4 @@
-From 16d3083eb4af5bfbf22050fa5efdc52452a4304d Mon Sep 17 00:00:00 2001
+From c595e875930c977f0a9f09219edaababa90bb387 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 28 Sep 2018 22:27:33 -0400
 Subject: [PATCH] Don't recheck type after setting a block
@@ -16,7 +16,7 @@ be having data corruption issues anyways.
 This provides a small boost to all setType calls.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 2b4ad100e..4d96e4fb1 100644
+index 2b4ad100e0..4d96e4fb12 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -339,7 +339,7 @@ public class Chunk implements IChunkAccess {
diff --git a/Spigot-Server-Patches/0320-Configurable-connection-throttle-kick-message.patch b/Spigot-Server-Patches/0319-Configurable-connection-throttle-kick-message.patch
similarity index 94%
rename from Spigot-Server-Patches/0320-Configurable-connection-throttle-kick-message.patch
rename to Spigot-Server-Patches/0319-Configurable-connection-throttle-kick-message.patch
index f58c753b76..604fef9362 100644
--- a/Spigot-Server-Patches/0320-Configurable-connection-throttle-kick-message.patch
+++ b/Spigot-Server-Patches/0319-Configurable-connection-throttle-kick-message.patch
@@ -1,11 +1,11 @@
-From 397f0632ca0d9587e4ccc3eb585fcf72126c6f03 Mon Sep 17 00:00:00 2001
+From b969c7eaa41704ba0fdc242a143211138dc6af72 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/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index ffb18902f..2d3861c18 100644
+index ffb18902ff..2d3861c184 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -275,6 +275,11 @@ public class PaperConfig {
@@ -21,7 +21,7 @@ index ffb18902f..2d3861c18 100644
      private static void savePlayerData() {
          savePlayerData = getBoolean("settings.save-player-data", savePlayerData);
 diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
-index da88978db..1dad79620 100644
+index da88978db7..1dad796206 100644
 --- a/src/main/java/net/minecraft/server/HandshakeListener.java
 +++ b/src/main/java/net/minecraft/server/HandshakeListener.java
 @@ -38,7 +38,7 @@ public class HandshakeListener implements PacketHandshakingInListener {
diff --git a/Spigot-Server-Patches/0321-Hook-into-CB-plugin-rewrites.patch b/Spigot-Server-Patches/0320-Hook-into-CB-plugin-rewrites.patch
similarity index 98%
rename from Spigot-Server-Patches/0321-Hook-into-CB-plugin-rewrites.patch
rename to Spigot-Server-Patches/0320-Hook-into-CB-plugin-rewrites.patch
index bd29aec027..f2b1f0b9cb 100644
--- a/Spigot-Server-Patches/0321-Hook-into-CB-plugin-rewrites.patch
+++ b/Spigot-Server-Patches/0320-Hook-into-CB-plugin-rewrites.patch
@@ -1,4 +1,4 @@
-From 04d90bf82be6f7b17fa6cf1a15b57a8f2e186c47 Mon Sep 17 00:00:00 2001
+From a10cc485d4ce5bb1f614e74963dc97692abca5c8 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
@@ -8,7 +8,7 @@ our own relocation. Also lets us rewrite NMS calls for when we're
 debugging in an IDE pre-relocate.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
-index 467b2d938..61f102355 100644
+index 467b2d9385..61f1023557 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
 @@ -6,7 +6,9 @@ import java.io.FileOutputStream;
diff --git a/Spigot-Server-Patches/0322-Allow-setting-the-vex-s-summoner.patch b/Spigot-Server-Patches/0321-Allow-setting-the-vex-s-summoner.patch
similarity index 90%
rename from Spigot-Server-Patches/0322-Allow-setting-the-vex-s-summoner.patch
rename to Spigot-Server-Patches/0321-Allow-setting-the-vex-s-summoner.patch
index 39227feabb..d4001b73c5 100644
--- a/Spigot-Server-Patches/0322-Allow-setting-the-vex-s-summoner.patch
+++ b/Spigot-Server-Patches/0321-Allow-setting-the-vex-s-summoner.patch
@@ -1,11 +1,11 @@
-From a9e0d1a0128455b66e09c38a5c2e1426a17e3c2e Mon Sep 17 00:00:00 2001
+From c371b06835ba7f1737b542fa364b3ec39254289f 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/src/main/java/net/minecraft/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java
-index 83e022c91..c56933068 100644
+index 83e022c91b..c569330689 100644
 --- a/src/main/java/net/minecraft/server/EntityVex.java
 +++ b/src/main/java/net/minecraft/server/EntityVex.java
 @@ -133,6 +133,7 @@ public class EntityVex extends EntityMonster {
@@ -17,7 +17,7 @@ index 83e022c91..c56933068 100644
          this.c = entityinsentient;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
-index 169c951ec..2f7df3074 100644
+index 169c951ec3..2f7df3074f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
 @@ -23,6 +23,10 @@ public class CraftVex extends CraftMonster implements Vex {
diff --git a/Spigot-Server-Patches/0323-Add-sun-related-API.patch b/Spigot-Server-Patches/0322-Add-sun-related-API.patch
similarity index 91%
rename from Spigot-Server-Patches/0323-Add-sun-related-API.patch
rename to Spigot-Server-Patches/0322-Add-sun-related-API.patch
index cea9e63d05..c516b20634 100644
--- a/Spigot-Server-Patches/0323-Add-sun-related-API.patch
+++ b/Spigot-Server-Patches/0322-Add-sun-related-API.patch
@@ -1,11 +1,11 @@
-From 86fd77f780aa41b7cc576b4bdf0e61a5cf60f961 Mon Sep 17 00:00:00 2001
+From 66e8f1ef21328f9fa61ce7f5f9adc8e923cc835a 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/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index f1621a9e9..a8318c88a 100644
+index f1621a9e9d..a8318c88af 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -1330,6 +1330,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -17,7 +17,7 @@ index f1621a9e9..a8318c88a 100644
          if (this.world.J() && !this.world.isClientSide) {
              float f = this.aE();
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 830780b49..fee14bb6d 100644
+index 5220ea0994..70e5552cd9 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -669,6 +669,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
@@ -29,7 +29,7 @@ index 830780b49..fee14bb6d 100644
          return this.d < 4;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index ca41b6d6b..073400f23 100644
+index ca41b6d6ba..073400f23f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -740,6 +740,13 @@ public class CraftWorld implements World {
@@ -47,7 +47,7 @@ index ca41b6d6b..073400f23 100644
      public boolean createExplosion(double x, double y, double z, float power) {
          return createExplosion(x, y, z, power, false, true);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-index 53c2d154e..56c233872 100644
+index 53c2d154ed..56c233872b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 @@ -68,4 +68,11 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {
diff --git a/Spigot-Server-Patches/0324-Check-Drowned-for-Villager-Aggression-Config.patch b/Spigot-Server-Patches/0323-Check-Drowned-for-Villager-Aggression-Config.patch
similarity index 93%
rename from Spigot-Server-Patches/0324-Check-Drowned-for-Villager-Aggression-Config.patch
rename to Spigot-Server-Patches/0323-Check-Drowned-for-Villager-Aggression-Config.patch
index 37ce95542d..726b33b0e4 100644
--- a/Spigot-Server-Patches/0324-Check-Drowned-for-Villager-Aggression-Config.patch
+++ b/Spigot-Server-Patches/0323-Check-Drowned-for-Villager-Aggression-Config.patch
@@ -1,11 +1,11 @@
-From 3a093eec87f06eca566b10f21c8ecb4fab5805ea Mon Sep 17 00:00:00 2001
+From cfad07b95d70ee56f185c2563f24b38f1c0b8918 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/src/main/java/net/minecraft/server/EntityDrowned.java b/src/main/java/net/minecraft/server/EntityDrowned.java
-index 3d41af863..817769764 100644
+index 3d41af8637..8177697644 100644
 --- a/src/main/java/net/minecraft/server/EntityDrowned.java
 +++ b/src/main/java/net/minecraft/server/EntityDrowned.java
 @@ -29,7 +29,7 @@ public class EntityDrowned extends EntityZombie implements IRangedEntity {
diff --git a/Spigot-Server-Patches/0325-Here-s-Johnny.patch b/Spigot-Server-Patches/0324-Here-s-Johnny.patch
similarity index 92%
rename from Spigot-Server-Patches/0325-Here-s-Johnny.patch
rename to Spigot-Server-Patches/0324-Here-s-Johnny.patch
index 51762c5de3..85e3fa4469 100644
--- a/Spigot-Server-Patches/0325-Here-s-Johnny.patch
+++ b/Spigot-Server-Patches/0324-Here-s-Johnny.patch
@@ -1,11 +1,11 @@
-From f3d0b16716045edf78c0abf479f5382c2ec6d3aa Mon Sep 17 00:00:00 2001
+From 0f3ec7603cd6c59d24a99af91e63846ece172b86 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/src/main/java/net/minecraft/server/EntityVindicator.java b/src/main/java/net/minecraft/server/EntityVindicator.java
-index dbd189afe..9d3c37dce 100644
+index dbd189afe6..9d3c37dce9 100644
 --- a/src/main/java/net/minecraft/server/EntityVindicator.java
 +++ b/src/main/java/net/minecraft/server/EntityVindicator.java
 @@ -11,7 +11,7 @@ public class EntityVindicator extends EntityIllagerAbstract {
@@ -18,7 +18,7 @@ index dbd189afe..9d3c37dce 100644
      public EntityVindicator(EntityTypes<? extends EntityVindicator> entitytypes, World world) {
          super(entitytypes, world);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java
-index 951d47929..5ff957ced 100644
+index 951d479298..5ff957ced7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java
 @@ -25,4 +25,14 @@ public class CraftVindicator extends CraftIllager implements Vindicator {
diff --git a/Spigot-Server-Patches/0326-Turtle-API.patch b/Spigot-Server-Patches/0325-Turtle-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0326-Turtle-API.patch
rename to Spigot-Server-Patches/0325-Turtle-API.patch
index 03891a6493..72dee78720 100644
--- a/Spigot-Server-Patches/0326-Turtle-API.patch
+++ b/Spigot-Server-Patches/0325-Turtle-API.patch
@@ -1,11 +1,11 @@
-From d37a4df25157249bd33e4ddb13976849176aeb4d Mon Sep 17 00:00:00 2001
+From bff3057f1d84be16a1918b764bb88974bb39c217 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/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java
-index 1b4933c07..b7929c5c4 100644
+index 1b4933c077..b7929c5c46 100644
 --- a/src/main/java/net/minecraft/server/EntityTurtle.java
 +++ b/src/main/java/net/minecraft/server/EntityTurtle.java
 @@ -27,51 +27,63 @@ public class EntityTurtle extends EntityAnimal {
@@ -104,7 +104,7 @@ index 1b4933c07..b7929c5c4 100644
  
          @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
-index 123a2c75c..8edcf7af6 100644
+index 123a2c75ca..8edcf7af65 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
 @@ -1,6 +1,8 @@
diff --git a/Spigot-Server-Patches/0327-Limit-lightning-strike-effect-distance.patch b/Spigot-Server-Patches/0326-Limit-lightning-strike-effect-distance.patch
similarity index 95%
rename from Spigot-Server-Patches/0327-Limit-lightning-strike-effect-distance.patch
rename to Spigot-Server-Patches/0326-Limit-lightning-strike-effect-distance.patch
index 228fbd5296..ba9b5bd3d6 100644
--- a/Spigot-Server-Patches/0327-Limit-lightning-strike-effect-distance.patch
+++ b/Spigot-Server-Patches/0326-Limit-lightning-strike-effect-distance.patch
@@ -1,11 +1,11 @@
-From b83a25415627e39b211dd487f01524f92ff960dd Mon Sep 17 00:00:00 2001
+From c34bcd8c7a806455fe6d53d9d65b84632a89e9d9 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/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 2c27be63e..fb44fccc9 100644
+index 2c27be63ea..fb44fccc92 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -234,6 +234,28 @@ public class PaperWorldConfig {
@@ -38,7 +38,7 @@ index 2c27be63e..fb44fccc9 100644
      public boolean firePhysicsEventForRedstone = false;
      private void firePhysicsEventForRedstone() {
 diff --git a/src/main/java/net/minecraft/server/EntityLightning.java b/src/main/java/net/minecraft/server/EntityLightning.java
-index adf68d165..fbcda86b3 100644
+index adf68d1650..fbcda86b38 100644
 --- a/src/main/java/net/minecraft/server/EntityLightning.java
 +++ b/src/main/java/net/minecraft/server/EntityLightning.java
 @@ -64,6 +64,17 @@ public class EntityLightning extends Entity {
@@ -69,10 +69,10 @@ index adf68d165..fbcda86b3 100644
  
          --this.lifeTicks;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 892c49506..661ea58b8 100644
+index 9860175ec4..9c4ef2e004 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -1182,7 +1182,7 @@ public class WorldServer extends World {
+@@ -1179,7 +1179,7 @@ public class WorldServer extends World {
          }
          // CraftBukkit end
          this.globalEntityList.add(entitylightning);
diff --git a/Spigot-Server-Patches/0328-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/Spigot-Server-Patches/0327-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
similarity index 94%
rename from Spigot-Server-Patches/0328-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
rename to Spigot-Server-Patches/0327-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
index d7e4f875aa..1d968cc5e2 100644
--- a/Spigot-Server-Patches/0328-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
+++ b/Spigot-Server-Patches/0327-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
@@ -1,4 +1,4 @@
-From 6e2c48ed3c978e78e0d74fd0d0048dfd1765980d Mon Sep 17 00:00:00 2001
+From 5b343a1fa590b5869013aca47839c69e10490ab2 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
@@ -11,7 +11,7 @@ If the projectile fails to find the shooter in the current world, check
 other worlds.
 
 diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
-index c19828ed5..7deeaa083 100644
+index c19828ed56..7deeaa0834 100644
 --- a/src/main/java/net/minecraft/server/EntityProjectile.java
 +++ b/src/main/java/net/minecraft/server/EntityProjectile.java
 @@ -213,11 +213,21 @@ public abstract class EntityProjectile extends Entity implements IProjectile {
diff --git a/Spigot-Server-Patches/0329-Call-player-spectator-target-events.patch b/Spigot-Server-Patches/0328-Call-player-spectator-target-events.patch
similarity index 96%
rename from Spigot-Server-Patches/0329-Call-player-spectator-target-events.patch
rename to Spigot-Server-Patches/0328-Call-player-spectator-target-events.patch
index b6b9ed3ad1..33fcee4a77 100644
--- a/Spigot-Server-Patches/0329-Call-player-spectator-target-events.patch
+++ b/Spigot-Server-Patches/0328-Call-player-spectator-target-events.patch
@@ -1,11 +1,11 @@
-From c4bb29d6e705e5938f85ba2c2448daa843c234b6 Mon Sep 17 00:00:00 2001
+From 2b82315c71a9bcb8c7007800a2efa8324085212d 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/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 0f3be967e..1c1c3a9b5 100644
+index 0f3be967e5..1c1c3a9b58 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -60,7 +60,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0330-Add-Velocity-IP-Forwarding-Support.patch b/Spigot-Server-Patches/0329-Add-Velocity-IP-Forwarding-Support.patch
similarity index 97%
rename from Spigot-Server-Patches/0330-Add-Velocity-IP-Forwarding-Support.patch
rename to Spigot-Server-Patches/0329-Add-Velocity-IP-Forwarding-Support.patch
index c1b7dce876..2ae0d75f57 100644
--- a/Spigot-Server-Patches/0330-Add-Velocity-IP-Forwarding-Support.patch
+++ b/Spigot-Server-Patches/0329-Add-Velocity-IP-Forwarding-Support.patch
@@ -1,4 +1,4 @@
-From 2438891aab7c354df7549a2b71c7bc7989795293 Mon Sep 17 00:00:00 2001
+From 0f101912f19d2a84b07a04113b992fe2f058fafd 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
@@ -14,7 +14,7 @@ forwarding, and is integrated into the Minecraft login process by using the 1.13
 login plugin message packet.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 2d3861c18..a79cba50e 100644
+index 2d3861c184..a79cba50e0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -8,6 +8,7 @@ import java.io.IOException;
@@ -55,7 +55,7 @@ index 2d3861c18..a79cba50e 100644
  }
 diff --git a/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java b/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java
 new file mode 100644
-index 000000000..fdd8708f9
+index 0000000000..fdd8708f97
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java
 @@ -0,0 +1,67 @@
@@ -127,7 +127,7 @@ index 000000000..fdd8708f9
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index d4d752ddb..5d46a975e 100644
+index d4d752ddb4..5d46a975e3 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -42,6 +42,7 @@ public class LoginListener implements PacketLoginInListener {
@@ -203,7 +203,7 @@ index d4d752ddb..5d46a975e 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 6c5544807..38386d588 100644
+index 6c55448078..38386d5886 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -46,7 +46,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -216,7 +216,7 @@ index 6c5544807..38386d588 100644
      public java.util.UUID spoofedUUID;
      public com.mojang.authlib.properties.Property[] spoofedProfile;
 diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java
-index fa2d3ce8c..dac560c63 100644
+index fa2d3ce8cb..dac560c63f 100644
 --- a/src/main/java/net/minecraft/server/PacketDataSerializer.java
 +++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java
 @@ -140,6 +140,7 @@ public class PacketDataSerializer extends ByteBuf {
@@ -244,7 +244,7 @@ index fa2d3ce8c..dac560c63 100644
          int j = this.i();
  
 diff --git a/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java b/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java
-index 4d1f44139..c1ca6f950 100644
+index 4d1f441395..c1ca6f9501 100644
 --- a/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java
 +++ b/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java
 @@ -4,8 +4,8 @@ import java.io.IOException;
@@ -259,7 +259,7 @@ index 4d1f44139..c1ca6f950 100644
      public PacketLoginInCustomPayload() {}
  
 diff --git a/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java b/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java
-index ae74dc9e1..7eb230f1b 100644
+index ae74dc9e18..7eb230f1b2 100644
 --- a/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java
 +++ b/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java
 @@ -10,6 +10,14 @@ public class PacketLoginOutCustomPayload implements Packet<PacketLoginOutListene
diff --git a/Spigot-Server-Patches/0331-Add-more-Witch-API.patch b/Spigot-Server-Patches/0330-Add-more-Witch-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0331-Add-more-Witch-API.patch
rename to Spigot-Server-Patches/0330-Add-more-Witch-API.patch
index ae12f64046..f10671aea8 100644
--- a/Spigot-Server-Patches/0331-Add-more-Witch-API.patch
+++ b/Spigot-Server-Patches/0330-Add-more-Witch-API.patch
@@ -1,11 +1,11 @@
-From 0e8d054718a2058311545e3c11b1c5ef9675112a Mon Sep 17 00:00:00 2001
+From 2ab7cfc5a693f04477456c63977e582c74724653 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/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
-index ae9efb72c..3cbb34a0c 100644
+index ae9efb72c1..3cbb34a0ce 100644
 --- a/src/main/java/net/minecraft/server/EntityWitch.java
 +++ b/src/main/java/net/minecraft/server/EntityWitch.java
 @@ -1,5 +1,11 @@
@@ -96,7 +96,7 @@ index ae9efb72c..3cbb34a0c 100644
      public SoundEffect dW() {
          return SoundEffects.ENTITY_WITCH_CELEBRATE;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
-index bae107e76..b43a2bbd5 100644
+index bae107e76e..b43a2bbd5b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
 @@ -1,12 +1,18 @@
diff --git a/Spigot-Server-Patches/0332-Fix-MC-93764.patch b/Spigot-Server-Patches/0331-Fix-MC-93764.patch
similarity index 86%
rename from Spigot-Server-Patches/0332-Fix-MC-93764.patch
rename to Spigot-Server-Patches/0331-Fix-MC-93764.patch
index a557655d4a..888bccd70d 100644
--- a/Spigot-Server-Patches/0332-Fix-MC-93764.patch
+++ b/Spigot-Server-Patches/0331-Fix-MC-93764.patch
@@ -1,11 +1,11 @@
-From b99595bced24c8b10e641089ee1b81b81c89f35f Mon Sep 17 00:00:00 2001
+From f45f3b13ae7da7619a327e8b3ccb8ebf9add5feb 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/src/main/java/net/minecraft/server/WorldProviderTheEnd.java b/src/main/java/net/minecraft/server/WorldProviderTheEnd.java
-index 715faef17..b97408cff 100644
+index 715faef171..b97408cffa 100644
 --- a/src/main/java/net/minecraft/server/WorldProviderTheEnd.java
 +++ b/src/main/java/net/minecraft/server/WorldProviderTheEnd.java
 @@ -27,7 +27,7 @@ public class WorldProviderTheEnd extends WorldProvider {
diff --git a/Spigot-Server-Patches/0333-Add-option-to-prevent-players-from-moving-into-unloa.patch b/Spigot-Server-Patches/0332-Add-option-to-prevent-players-from-moving-into-unloa.patch
similarity index 96%
rename from Spigot-Server-Patches/0333-Add-option-to-prevent-players-from-moving-into-unloa.patch
rename to Spigot-Server-Patches/0332-Add-option-to-prevent-players-from-moving-into-unloa.patch
index 042e226edd..ca469cb322 100644
--- a/Spigot-Server-Patches/0333-Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/Spigot-Server-Patches/0332-Add-option-to-prevent-players-from-moving-into-unloa.patch
@@ -1,4 +1,4 @@
-From a46f8e0c304dc2f0dee724d7ac35f09b965ffbe0 Mon Sep 17 00:00:00 2001
+From 99e2e5d7f90954efd632c54d186ae0ab54189f95 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Add option to prevent players from moving into unloaded
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index fb44fccc9..ad793ffa3 100644
+index fb44fccc92..ad793ffa38 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -434,4 +434,9 @@ public class PaperWorldConfig {
@@ -20,7 +20,7 @@ index fb44fccc9..ad793ffa3 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 07e9abda9..4ba13da1a 100644
+index 07e9abda96..4ba13da1ad 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -347,6 +347,13 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0334-Reset-players-airTicks-on-respawn.patch b/Spigot-Server-Patches/0333-Reset-players-airTicks-on-respawn.patch
similarity index 89%
rename from Spigot-Server-Patches/0334-Reset-players-airTicks-on-respawn.patch
rename to Spigot-Server-Patches/0333-Reset-players-airTicks-on-respawn.patch
index ac80bf2e98..b4d1c94d3d 100644
--- a/Spigot-Server-Patches/0334-Reset-players-airTicks-on-respawn.patch
+++ b/Spigot-Server-Patches/0333-Reset-players-airTicks-on-respawn.patch
@@ -1,11 +1,11 @@
-From cf8dc731a198046af0f477ff9d04e31265c31a14 Mon Sep 17 00:00:00 2001
+From 20e1ffb268c190adc3e0712329f59e8e4d73c5bf 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 b1cf9b85f..91a7925dd 100644
+index b1cf9b85fa..91a7925dd2 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2268,7 +2268,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -18,7 +18,7 @@ index b1cf9b85f..91a7925dd 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 1c1c3a9b5..e1f618684 100644
+index 1c1c3a9b58..e1f618684c 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1857,6 +1857,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0335-Strip-private-area-unicode-characters-from-signs.patch b/Spigot-Server-Patches/0334-Strip-private-area-unicode-characters-from-signs.patch
similarity index 97%
rename from Spigot-Server-Patches/0335-Strip-private-area-unicode-characters-from-signs.patch
rename to Spigot-Server-Patches/0334-Strip-private-area-unicode-characters-from-signs.patch
index ac76be1529..04dcac25a2 100644
--- a/Spigot-Server-Patches/0335-Strip-private-area-unicode-characters-from-signs.patch
+++ b/Spigot-Server-Patches/0334-Strip-private-area-unicode-characters-from-signs.patch
@@ -1,4 +1,4 @@
-From 7d88f5608cfd251ea0135286fadbce3017465eb2 Mon Sep 17 00:00:00 2001
+From 6a1366240d0a49be8672b204580a3d4193a40a13 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Tue, 23 Oct 2018 20:53:43 -0400
 Subject: [PATCH] Strip private area unicode characters from signs
@@ -20,7 +20,7 @@ think of no reason to use it.
 Fixes GH-1571
 
 diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
-index 626ba9b17..7b5d534f4 100644
+index 626ba9b178..7b5d534f4b 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySign.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySign.java
 @@ -14,6 +14,11 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
diff --git a/Spigot-Server-Patches/0336-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/Spigot-Server-Patches/0335-Don-t-sleep-after-profile-lookups-if-not-needed.patch
similarity index 94%
rename from Spigot-Server-Patches/0336-Don-t-sleep-after-profile-lookups-if-not-needed.patch
rename to Spigot-Server-Patches/0335-Don-t-sleep-after-profile-lookups-if-not-needed.patch
index 315febab15..f25ba2496f 100644
--- a/Spigot-Server-Patches/0336-Don-t-sleep-after-profile-lookups-if-not-needed.patch
+++ b/Spigot-Server-Patches/0335-Don-t-sleep-after-profile-lookups-if-not-needed.patch
@@ -1,4 +1,4 @@
-From 8a65bcf0402b43faf4d94299e205b1de8d8e15e8 Mon Sep 17 00:00:00 2001
+From 5c1b8e438091417fb534c03794eec54f8c26af7c 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
@@ -7,7 +7,7 @@ Mojang was sleeping even if we had no more requests to go after
 the current one finished, resulting in 100ms lost per profile lookup
 
 diff --git a/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java b/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java
-index 71e48e87b..23f1447cf 100644
+index 71e48e87b4..23f1447cfc 100644
 --- a/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java
 +++ b/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java
 @@ -42,6 +42,7 @@ public class YggdrasilGameProfileRepository implements GameProfileRepository {
diff --git a/Spigot-Server-Patches/0337-Use-more-reasonable-thread-count-default-for-bootstr.patch b/Spigot-Server-Patches/0336-Use-more-reasonable-thread-count-default-for-bootstr.patch
similarity index 89%
rename from Spigot-Server-Patches/0337-Use-more-reasonable-thread-count-default-for-bootstr.patch
rename to Spigot-Server-Patches/0336-Use-more-reasonable-thread-count-default-for-bootstr.patch
index 052a929c14..402ccba679 100644
--- a/Spigot-Server-Patches/0337-Use-more-reasonable-thread-count-default-for-bootstr.patch
+++ b/Spigot-Server-Patches/0336-Use-more-reasonable-thread-count-default-for-bootstr.patch
@@ -1,11 +1,11 @@
-From b8d8a3ccf38dc16afce3222d25187059256fca24 Mon Sep 17 00:00:00 2001
+From d9a13a84b740aab1f61ec78a2c2ae1bc18a670b6 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/src/main/java/net/minecraft/server/SystemUtils.java b/src/main/java/net/minecraft/server/SystemUtils.java
-index 5fae5a123..6bc576f10 100644
+index 5fae5a1233..6bc576f10f 100644
 --- a/src/main/java/net/minecraft/server/SystemUtils.java
 +++ b/src/main/java/net/minecraft/server/SystemUtils.java
 @@ -66,7 +66,7 @@ public class SystemUtils {
diff --git a/Spigot-Server-Patches/0338-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch b/Spigot-Server-Patches/0337-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
similarity index 94%
rename from Spigot-Server-Patches/0338-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
rename to Spigot-Server-Patches/0337-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
index e0ba5bfa10..a9f686020a 100644
--- a/Spigot-Server-Patches/0338-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
+++ b/Spigot-Server-Patches/0337-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
@@ -1,4 +1,4 @@
-From a78ed2192a056e3311e6745b0962666697315077 Mon Sep 17 00:00:00 2001
+From 22ac6a9266824514c0c7d87f1baf447a49931824 Mon Sep 17 00:00:00 2001
 From: MisterVector <whizkid3000@hotmail.com>
 Date: Thu, 1 Nov 2018 14:50:05 -0700
 Subject: [PATCH] MC-136865: Use valid item for enchantment checks on block
@@ -13,7 +13,7 @@ keep the clone of the item used to a non empty value so it represents
 the item used.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index f692da609..5bc8bd7cd 100644
+index f692da609b..5bc8bd7cdc 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -354,10 +354,11 @@ public class PlayerInteractManager {
diff --git a/Spigot-Server-Patches/0339-Optimize-World-Time-Updates.patch b/Spigot-Server-Patches/0338-Optimize-World-Time-Updates.patch
similarity index 96%
rename from Spigot-Server-Patches/0339-Optimize-World-Time-Updates.patch
rename to Spigot-Server-Patches/0338-Optimize-World-Time-Updates.patch
index 7c3a22fd53..ce3874169e 100644
--- a/Spigot-Server-Patches/0339-Optimize-World-Time-Updates.patch
+++ b/Spigot-Server-Patches/0338-Optimize-World-Time-Updates.patch
@@ -1,4 +1,4 @@
-From 1a9a458d2db1bb48a62b9b8f009459e508263d3b Mon Sep 17 00:00:00 2001
+From c9287ae57a9e0346476aad606cead3bad2dfa3eb 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
@@ -8,7 +8,7 @@ the updates per world, so that we can re-use the same packet
 object for every player unless they have per-player time enabled.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0a02dece6..1858e956b 100644
+index 0a02dece68..1858e956b5 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1119,12 +1119,24 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
diff --git a/Spigot-Server-Patches/0340-Restore-custom-InventoryHolder-support.patch b/Spigot-Server-Patches/0339-Restore-custom-InventoryHolder-support.patch
similarity index 95%
rename from Spigot-Server-Patches/0340-Restore-custom-InventoryHolder-support.patch
rename to Spigot-Server-Patches/0339-Restore-custom-InventoryHolder-support.patch
index 7790c6b565..b1d4f26150 100644
--- a/Spigot-Server-Patches/0340-Restore-custom-InventoryHolder-support.patch
+++ b/Spigot-Server-Patches/0339-Restore-custom-InventoryHolder-support.patch
@@ -1,4 +1,4 @@
-From 4a37b045c016897214bc00dceabedbeb5f3957f1 Mon Sep 17 00:00:00 2001
+From ee0341ae9aeb64368eefaf5090e8097b62df28d5 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
@@ -17,7 +17,7 @@ will always work as intended in the past, those without will create implementati
 based inventories.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java b/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java
-index 9957ed040..ae280dd40 100644
+index 9957ed0402..ae280dd40b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java
 @@ -39,10 +39,20 @@ public final class CraftInventoryCreator {
diff --git a/Spigot-Server-Patches/0341-Use-Vanilla-Minecart-Speeds.patch b/Spigot-Server-Patches/0340-Use-Vanilla-Minecart-Speeds.patch
similarity index 91%
rename from Spigot-Server-Patches/0341-Use-Vanilla-Minecart-Speeds.patch
rename to Spigot-Server-Patches/0340-Use-Vanilla-Minecart-Speeds.patch
index a98dfe6b4a..9e595f3729 100644
--- a/Spigot-Server-Patches/0341-Use-Vanilla-Minecart-Speeds.patch
+++ b/Spigot-Server-Patches/0340-Use-Vanilla-Minecart-Speeds.patch
@@ -1,4 +1,4 @@
-From 40bdfc69e61ae7de077f81d346584a706c2de5b2 Mon Sep 17 00:00:00 2001
+From b21ba787ad72df2d5a2797af54899858b1f1d2b3 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Use Vanilla Minecart Speeds
 CraftBukkit changed the values on flying speed, restore back to vanilla
 
 diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
-index 6fc332dbf..828a8711d 100644
+index 6fc332dbff..828a8711d1 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 @@ -35,9 +35,9 @@ public abstract class EntityMinecartAbstract extends Entity {
diff --git a/Spigot-Server-Patches/0342-Fix-SpongeAbsortEvent-handling.patch b/Spigot-Server-Patches/0341-Fix-SpongeAbsortEvent-handling.patch
similarity index 93%
rename from Spigot-Server-Patches/0342-Fix-SpongeAbsortEvent-handling.patch
rename to Spigot-Server-Patches/0341-Fix-SpongeAbsortEvent-handling.patch
index e178fd7492..ff0404fc06 100644
--- a/Spigot-Server-Patches/0342-Fix-SpongeAbsortEvent-handling.patch
+++ b/Spigot-Server-Patches/0341-Fix-SpongeAbsortEvent-handling.patch
@@ -1,4 +1,4 @@
-From bd5ffdf5d23fd7077da1ef8e76177882e41c3004 Mon Sep 17 00:00:00 2001
+From f9882d938dfe10a599af85e4e17bab06157305cd 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix SpongeAbsortEvent handling
 Only process drops when the block is actually going to be removed
 
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index 8d69a1556..5b98c5255 100644
+index 8d69a1556a..5b98c52559 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -473,7 +473,7 @@ public class Block implements IMaterial {
@@ -19,7 +19,7 @@ index 8d69a1556..5b98c5255 100644
          if (world instanceof WorldServer) {
              a(iblockdata, (WorldServer) world, blockposition, tileentity).forEach((itemstack) -> {
 diff --git a/src/main/java/net/minecraft/server/BlockSponge.java b/src/main/java/net/minecraft/server/BlockSponge.java
-index 4e281ce6d..6a64af71b 100644
+index 4e281ce6dd..6a64af71b9 100644
 --- a/src/main/java/net/minecraft/server/BlockSponge.java
 +++ b/src/main/java/net/minecraft/server/BlockSponge.java
 @@ -113,8 +113,11 @@ public class BlockSponge extends Block {
diff --git a/Spigot-Server-Patches/0343-Don-t-allow-digging-into-unloaded-chunks.patch b/Spigot-Server-Patches/0342-Don-t-allow-digging-into-unloaded-chunks.patch
similarity index 91%
rename from Spigot-Server-Patches/0343-Don-t-allow-digging-into-unloaded-chunks.patch
rename to Spigot-Server-Patches/0342-Don-t-allow-digging-into-unloaded-chunks.patch
index 1430109cee..5196d896f5 100644
--- a/Spigot-Server-Patches/0343-Don-t-allow-digging-into-unloaded-chunks.patch
+++ b/Spigot-Server-Patches/0342-Don-t-allow-digging-into-unloaded-chunks.patch
@@ -1,11 +1,11 @@
-From 8258ab7472f39b956fb975a6a6f756616bb74f1d Mon Sep 17 00:00:00 2001
+From bfbeaf6410c9fb749622b3a8aeca49c6926c2705 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/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 4ba13da1a..a887be15c 100644
+index 4ba13da1ad..a887be15cc 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1246,6 +1246,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0344-Optimize-redstone-algorithm.patch b/Spigot-Server-Patches/0343-Optimize-redstone-algorithm.patch
similarity index 99%
rename from Spigot-Server-Patches/0344-Optimize-redstone-algorithm.patch
rename to Spigot-Server-Patches/0343-Optimize-redstone-algorithm.patch
index cdc006699b..1edefcd8dc 100644
--- a/Spigot-Server-Patches/0344-Optimize-redstone-algorithm.patch
+++ b/Spigot-Server-Patches/0343-Optimize-redstone-algorithm.patch
@@ -1,4 +1,4 @@
-From 43705821706467660596aa9b64e3f2342e7a6ed3 Mon Sep 17 00:00:00 2001
+From d74e7d03f12f94e8e34a22c6c998581f2571877a 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
@@ -19,7 +19,7 @@ Aside from making the obvious class/function renames and obfhelpers I didn't nee
 Just added Bukkit's event system and took a few liberties with dead code and comment misspellings.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index ad793ffa3..ef882b897 100644
+index ad793ffa38..ef882b897f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -439,4 +439,14 @@ public class PaperWorldConfig {
@@ -39,7 +39,7 @@ index ad793ffa3..ef882b897 100644
  }
 diff --git a/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java
 new file mode 100644
-index 000000000..cf5661f1c
+index 0000000000..cf5661f1c5
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java
 @@ -0,0 +1,912 @@
@@ -956,7 +956,7 @@ index 000000000..cf5661f1c
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/BlockRedstoneWire.java b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
-index da903f74b..aa35e0d06 100644
+index da903f74b6..aa35e0d061 100644
 --- a/src/main/java/net/minecraft/server/BlockRedstoneWire.java
 +++ b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
 @@ -1,5 +1,7 @@
@@ -1124,7 +1124,7 @@ index da903f74b..aa35e0d06 100644
                  c(iblockdata, world, blockposition);
                  world.a(blockposition, false);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index fee14bb6d..388692c32 100644
+index 70e5552cd9..d20077892b 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -548,6 +548,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
@@ -1135,7 +1135,7 @@ index fee14bb6d..388692c32 100644
      public void a(BlockPosition blockposition, Block block, BlockPosition blockposition1) {
          if (!this.isClientSide) {
              IBlockData iblockdata = this.getType(blockposition);
-@@ -1306,6 +1307,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
+@@ -1304,6 +1305,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
          return this.getBlockFacePower(blockposition.down(), EnumDirection.DOWN) > 0 ? true : (this.getBlockFacePower(blockposition.up(), EnumDirection.UP) > 0 ? true : (this.getBlockFacePower(blockposition.north(), EnumDirection.NORTH) > 0 ? true : (this.getBlockFacePower(blockposition.south(), EnumDirection.SOUTH) > 0 ? true : (this.getBlockFacePower(blockposition.west(), EnumDirection.WEST) > 0 ? true : this.getBlockFacePower(blockposition.east(), EnumDirection.EAST) > 0))));
      }
  
diff --git a/Spigot-Server-Patches/0345-force-entity-dismount-during-teleportation.patch b/Spigot-Server-Patches/0344-force-entity-dismount-during-teleportation.patch
similarity index 96%
rename from Spigot-Server-Patches/0345-force-entity-dismount-during-teleportation.patch
rename to Spigot-Server-Patches/0344-force-entity-dismount-during-teleportation.patch
index 0896e5861e..62a9e24d9d 100644
--- a/Spigot-Server-Patches/0345-force-entity-dismount-during-teleportation.patch
+++ b/Spigot-Server-Patches/0344-force-entity-dismount-during-teleportation.patch
@@ -1,4 +1,4 @@
-From 3b9e28226a8ab1060744b350de7445df15849a5a Mon Sep 17 00:00:00 2001
+From 5c064b2fb3998d445755cb7ca2855cc244a5d501 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 91a7925dd..c71dc3614 100644
+index 91a7925dd2..c71dc36141 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1990,12 +1990,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -72,7 +72,7 @@ index 91a7925dd..c71dc3614 100644
              if (event.isCancelled()) {
                  return false;
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 2f614dfb6..4bea5f1ea 100644
+index 2f614dfb6b..4bea5f1ea2 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -937,9 +937,11 @@ public abstract class EntityHuman extends EntityLiving {
@@ -91,7 +91,7 @@ index 2f614dfb6..4bea5f1ea 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 2631e9a4b..75608c8a1 100644
+index 2631e9a4ba..75608c8a1e 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2661,11 +2661,13 @@ public abstract class EntityLiving extends Entity {
@@ -112,7 +112,7 @@ index 2631e9a4b..75608c8a1 100644
              this.B(entity);
          }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index e1f618684..0c289f23b 100644
+index e1f618684c..0c289f23b0 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -997,11 +997,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0346-Book-Size-Limits.patch b/Spigot-Server-Patches/0345-Book-Size-Limits.patch
similarity index 96%
rename from Spigot-Server-Patches/0346-Book-Size-Limits.patch
rename to Spigot-Server-Patches/0345-Book-Size-Limits.patch
index 8b5bbf966c..e6804fa1be 100644
--- a/Spigot-Server-Patches/0346-Book-Size-Limits.patch
+++ b/Spigot-Server-Patches/0345-Book-Size-Limits.patch
@@ -1,4 +1,4 @@
-From c335294d30c27c8a13d79692ee1ad4dc2345967c Mon Sep 17 00:00:00 2001
+From 7e0b5cde3d4df722b9ada5763458b8a7d6fb03c3 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Book Size Limits
 Puts some limits on the size of books.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index a79cba50e..e5e41c662 100644
+index a79cba50e0..e5e41c6621 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -375,4 +375,11 @@ public class PaperConfig {
@@ -22,7 +22,7 @@ index a79cba50e..e5e41c662 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index a887be15c..baab1a88a 100644
+index a887be15cc..baab1a88a4 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -14,6 +14,7 @@ import java.util.Iterator;
diff --git a/Spigot-Server-Patches/0347-Make-the-default-permission-message-configurable.patch b/Spigot-Server-Patches/0346-Make-the-default-permission-message-configurable.patch
similarity index 94%
rename from Spigot-Server-Patches/0347-Make-the-default-permission-message-configurable.patch
rename to Spigot-Server-Patches/0346-Make-the-default-permission-message-configurable.patch
index b58c7c937b..0ec05908f7 100644
--- a/Spigot-Server-Patches/0347-Make-the-default-permission-message-configurable.patch
+++ b/Spigot-Server-Patches/0346-Make-the-default-permission-message-configurable.patch
@@ -1,11 +1,11 @@
-From c44b0f8d58232a141fcb2cff363d947afbe5be5a Mon Sep 17 00:00:00 2001
+From 6b0f9cbc19378091d7fa2bb49d775035bb858e32 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/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index e5e41c662..8942a06bf 100644
+index e5e41c6621..8942a06bfe 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -21,6 +21,7 @@ import java.util.regex.Pattern;
@@ -29,7 +29,7 @@ index e5e41c662..8942a06bf 100644
      private static void savePlayerData() {
          savePlayerData = getBoolean("settings.save-player-data", savePlayerData);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 467583f1d..050bf3eb4 100644
+index 467583f1dc..050bf3eb48 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2123,6 +2123,11 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0348-Add-more-Zombie-API.patch b/Spigot-Server-Patches/0347-Add-more-Zombie-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0348-Add-more-Zombie-API.patch
rename to Spigot-Server-Patches/0347-Add-more-Zombie-API.patch
index ce1bdad4d5..ed55a076a0 100644
--- a/Spigot-Server-Patches/0348-Add-more-Zombie-API.patch
+++ b/Spigot-Server-Patches/0347-Add-more-Zombie-API.patch
@@ -1,11 +1,11 @@
-From 7685c146ffe17dc7cab2d4ef3b1512602b06a1a0 Mon Sep 17 00:00:00 2001
+From d6295b76112bd2ac3352086abd6c732a6b18a181 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/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index a8318c88a..ba90cdef1 100644
+index a8318c88af..ba90cdef16 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -1250,6 +1250,8 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -18,7 +18,7 @@ index a8318c88a..ba90cdef1 100644
          byte b0 = (Byte) this.datawatcher.get(EntityInsentient.b);
  
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 171c1ae4a..b20fe8e52 100644
+index 171c1ae4ad..b20fe8e521 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -31,6 +31,7 @@ public class EntityZombie extends EntityMonster {
@@ -92,7 +92,7 @@ index 171c1ae4a..b20fe8e52 100644
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
-index 0429cf020..c4320dbb6 100644
+index 0429cf020e..c4320dbb67 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
 @@ -80,4 +80,41 @@ public class CraftZombie extends CraftMonster implements Zombie {
diff --git a/Spigot-Server-Patches/0349-Prevent-rayTrace-from-loading-chunks.patch b/Spigot-Server-Patches/0348-Prevent-rayTrace-from-loading-chunks.patch
similarity index 93%
rename from Spigot-Server-Patches/0349-Prevent-rayTrace-from-loading-chunks.patch
rename to Spigot-Server-Patches/0348-Prevent-rayTrace-from-loading-chunks.patch
index 704bbefd87..80482082aa 100644
--- a/Spigot-Server-Patches/0349-Prevent-rayTrace-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0348-Prevent-rayTrace-from-loading-chunks.patch
@@ -1,4 +1,4 @@
-From be94bed55b001c7e5c9b87298d67d1dc06cced88 Mon Sep 17 00:00:00 2001
+From f127a303c3ae9dcd3d5bc6e9b9e7ed2ff807de0d 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
@@ -7,7 +7,7 @@ ray tracing into an unloaded chunk should be treated as a miss
 this saves a ton of lag for when AI tries to raytrace near unloaded chunks.
 
 diff --git a/src/main/java/net/minecraft/server/IBlockAccess.java b/src/main/java/net/minecraft/server/IBlockAccess.java
-index 6e365f402..b1423a3c8 100644
+index 6e365f402c..b1423a3c8d 100644
 --- a/src/main/java/net/minecraft/server/IBlockAccess.java
 +++ b/src/main/java/net/minecraft/server/IBlockAccess.java
 @@ -27,7 +27,15 @@ public interface IBlockAccess {
diff --git a/Spigot-Server-Patches/0350-Handle-Large-Packets-disconnecting-client.patch b/Spigot-Server-Patches/0349-Handle-Large-Packets-disconnecting-client.patch
similarity index 95%
rename from Spigot-Server-Patches/0350-Handle-Large-Packets-disconnecting-client.patch
rename to Spigot-Server-Patches/0349-Handle-Large-Packets-disconnecting-client.patch
index d14b4f26e6..64302d3022 100644
--- a/Spigot-Server-Patches/0350-Handle-Large-Packets-disconnecting-client.patch
+++ b/Spigot-Server-Patches/0349-Handle-Large-Packets-disconnecting-client.patch
@@ -1,4 +1,4 @@
-From ca88dedb52175740a645146bde3b6784d3ffcd4f Mon Sep 17 00:00:00 2001
+From 8e7a7b2614ec2d78ca9e58e2fe997e177484211e 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
@@ -7,7 +7,7 @@ If a players inventory is too big to send in a single packet,
 split the inventory set into multiple packets instead.
 
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 38386d588..2c28b97d8 100644
+index 38386d5886..2c28b97d81 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -99,6 +99,15 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -27,7 +27,7 @@ index 38386d588..2c28b97d8 100644
              NetworkManager.LOGGER.debug("Skipping packet due to errors", throwable.getCause());
          } else {
 diff --git a/src/main/java/net/minecraft/server/Packet.java b/src/main/java/net/minecraft/server/Packet.java
-index 601d4d0fa..2d8e6a2f4 100644
+index 601d4d0fa2..2d8e6a2f4a 100644
 --- a/src/main/java/net/minecraft/server/Packet.java
 +++ b/src/main/java/net/minecraft/server/Packet.java
 @@ -10,6 +10,12 @@ public interface Packet<T extends PacketListener> {
@@ -44,7 +44,7 @@ index 601d4d0fa..2d8e6a2f4 100644
          return false;
      }
 diff --git a/src/main/java/net/minecraft/server/PacketEncoder.java b/src/main/java/net/minecraft/server/PacketEncoder.java
-index 63c4dbd32..b0cfef52c 100644
+index 63c4dbd327..b0cfef52cb 100644
 --- a/src/main/java/net/minecraft/server/PacketEncoder.java
 +++ b/src/main/java/net/minecraft/server/PacketEncoder.java
 @@ -49,7 +49,31 @@ public class PacketEncoder extends MessageToByteEncoder<Packet<?>> {
@@ -80,7 +80,7 @@ index 63c4dbd32..b0cfef52c 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
-index d19a30ad8..58eccd9c6 100644
+index d19a30ad87..58eccd9c63 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 @@ -68,7 +68,7 @@ public class PacketPlayOutMapChunk implements Packet<PacketListenerPlayOut> {
@@ -93,7 +93,7 @@ index d19a30ad8..58eccd9c6 100644
          } else {
              this.e = new byte[i];
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutWindowItems.java b/src/main/java/net/minecraft/server/PacketPlayOutWindowItems.java
-index f7c365567..631234324 100644
+index f7c3655671..631234324d 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutWindowItems.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutWindowItems.java
 @@ -9,6 +9,15 @@ public class PacketPlayOutWindowItems implements Packet<PacketListenerPlayOut> {
diff --git a/Spigot-Server-Patches/0351-Lazy-init-world-storage-in-CraftOfflinePlayer.patch b/Spigot-Server-Patches/0350-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
similarity index 96%
rename from Spigot-Server-Patches/0351-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
rename to Spigot-Server-Patches/0350-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
index 251fad69f6..8428145815 100644
--- a/Spigot-Server-Patches/0351-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
+++ b/Spigot-Server-Patches/0350-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
@@ -1,4 +1,4 @@
-From c373f08dbad4eeed6518929abf85ad106deadc74 Mon Sep 17 00:00:00 2001
+From 5ab540d5887122ac61e1034dfd8ce562e9e32218 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
@@ -8,7 +8,7 @@ worlds loaded. This is typically a rare occurrence but probably one that
 should be covered as best we can.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-index 6a448c02e..c1ef1c950 100644
+index 6a448c02ec..c1ef1c950d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 @@ -25,12 +25,12 @@ import org.bukkit.plugin.Plugin;
diff --git a/Spigot-Server-Patches/0352-Add-PlayerConnectionCloseEvent.patch b/Spigot-Server-Patches/0351-Add-PlayerConnectionCloseEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0352-Add-PlayerConnectionCloseEvent.patch
rename to Spigot-Server-Patches/0351-Add-PlayerConnectionCloseEvent.patch
index 53e645abac..2fafac2fc7 100644
--- a/Spigot-Server-Patches/0352-Add-PlayerConnectionCloseEvent.patch
+++ b/Spigot-Server-Patches/0351-Add-PlayerConnectionCloseEvent.patch
@@ -1,4 +1,4 @@
-From 8a063d13d5f6ef5a85cdd458baec125a33fa26df Mon Sep 17 00:00:00 2001
+From ba2d6430df5fb8d58e303d546dce4e71798811b1 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
@@ -34,7 +34,7 @@ how PlayerPreLoginEvent interacts with PlayerConnectionCloseEvent
 is undefined.
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 5d46a975e..9e4bc2405 100644
+index 5d46a975e3..9e4bc24058 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -35,9 +35,9 @@ public class LoginListener implements PacketLoginInListener {
@@ -50,7 +50,7 @@ index 5d46a975e..9e4bc2405 100644
      private SecretKey loginKey;
      private EntityPlayer l;
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 2c28b97d8..1b0643c27 100644
+index 2c28b97d81..1b0643c27f 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -346,6 +346,26 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
diff --git a/Spigot-Server-Patches/0353-Prevent-Enderman-from-loading-chunks.patch b/Spigot-Server-Patches/0352-Prevent-Enderman-from-loading-chunks.patch
similarity index 95%
rename from Spigot-Server-Patches/0353-Prevent-Enderman-from-loading-chunks.patch
rename to Spigot-Server-Patches/0352-Prevent-Enderman-from-loading-chunks.patch
index d4fdcbb7d6..d7eb065467 100644
--- a/Spigot-Server-Patches/0353-Prevent-Enderman-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0352-Prevent-Enderman-from-loading-chunks.patch
@@ -1,11 +1,11 @@
-From ac4e7b05b9c8a792585e21bb9384155e410d27d9 Mon Sep 17 00:00:00 2001
+From 7599364b4f73d4e92a7e2b4323c51306a6b8ce48 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/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index ad1553f6e..c6a2e0839 100644
+index ad1553f6e9..c6a2e0839b 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -325,7 +325,8 @@ public class EntityEnderman extends EntityMonster {
diff --git a/Spigot-Server-Patches/0354-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/Spigot-Server-Patches/0353-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
similarity index 96%
rename from Spigot-Server-Patches/0354-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
rename to Spigot-Server-Patches/0353-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index ebb9d7710b..62a3ebd20a 100644
--- a/Spigot-Server-Patches/0354-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/Spigot-Server-Patches/0353-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
@@ -1,4 +1,4 @@
-From 1278518ef157890ac490119fc70833b5fab86187 Mon Sep 17 00:00:00 2001
+From d2c2dd3a0df3a1d1a5ca748716d162716eb836c9 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
@@ -16,7 +16,7 @@ intent to remove) and replace it with two new methods, clearly named and
 documented as to their purpose.
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 0c289f23b..3c7fa3b34 100644
+index 0c289f23b0..3c7fa3b349 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -75,6 +75,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -28,7 +28,7 @@ index 0c289f23b..3c7fa3b34 100644
      public boolean queueHealthUpdatePacket = false;
      public net.minecraft.server.PacketPlayOutUpdateHealth queuedHealthUpdatePacket;
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index af437120e..1eae8057d 100644
+index af437120ec..1eae8057d0 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -94,6 +94,7 @@ public abstract class PlayerList {
@@ -40,7 +40,7 @@ index af437120e..1eae8057d 100644
          UserCache usercache = this.server.getUserCache();
          GameProfile gameprofile1 = usercache.a(gameprofile.getId());
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-index c1ef1c950..3824180ee 100644
+index c1ef1c950d..3824180ee5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 @@ -256,6 +256,61 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
@@ -106,7 +106,7 @@ index c1ef1c950..3824180ee 100644
      public Location getBedSpawnLocation() {
          NBTTagCompound data = getData();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index deacc2187..367e8cfc1 100644
+index deacc21873..367e8cfc13 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -137,6 +137,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0355-Fix-PlayerEditBookEvent.patch b/Spigot-Server-Patches/0354-Fix-PlayerEditBookEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0355-Fix-PlayerEditBookEvent.patch
rename to Spigot-Server-Patches/0354-Fix-PlayerEditBookEvent.patch
index 3a49bee5f0..945e45e543 100644
--- a/Spigot-Server-Patches/0355-Fix-PlayerEditBookEvent.patch
+++ b/Spigot-Server-Patches/0354-Fix-PlayerEditBookEvent.patch
@@ -1,4 +1,4 @@
-From 491f3663daa40e7a223147f6d323a44a46047cda Mon Sep 17 00:00:00 2001
+From 236d977d53c277ae3a7a4ac600b2c93e56b6d189 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
@@ -10,7 +10,7 @@ it impossible to properly cancel the event or modify the book meta
 cancelled writing
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index baab1a88a..f007290ff 100644
+index baab1a88a4..f007290ff0 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -860,9 +860,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0356-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/Spigot-Server-Patches/0355-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
similarity index 90%
rename from Spigot-Server-Patches/0356-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
rename to Spigot-Server-Patches/0355-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
index 21d03536f0..57313505d5 100644
--- a/Spigot-Server-Patches/0356-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
+++ b/Spigot-Server-Patches/0355-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
@@ -1,11 +1,11 @@
-From a03f4dfcbb5c767e33b2dd41499f2a955088bb47 Mon Sep 17 00:00:00 2001
+From 709d97714a7449c91512bc641ce6d4653c7ffa0b 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/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 3c7fa3b34..3ecf18379 100644
+index 3c7fa3b349..3ecf18379b 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1280,6 +1280,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0357-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch b/Spigot-Server-Patches/0356-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
similarity index 96%
rename from Spigot-Server-Patches/0357-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
rename to Spigot-Server-Patches/0356-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
index 9864ce35a5..683ce1c5cc 100644
--- a/Spigot-Server-Patches/0357-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
+++ b/Spigot-Server-Patches/0356-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
@@ -1,4 +1,4 @@
-From 46f75f3330ad19cc82b7bc3525856742ccdb5b31 Mon Sep 17 00:00:00 2001
+From 9438fd1db331f86db760d2f942f659a505b31973 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
@@ -24,7 +24,7 @@ Instead we opt to remove the check entirely so that the event fires for
 all piston types.
 
 diff --git a/src/main/java/net/minecraft/server/BlockPiston.java b/src/main/java/net/minecraft/server/BlockPiston.java
-index 141006e36..78603d2cb 100644
+index 141006e36e..78603d2cb5 100644
 --- a/src/main/java/net/minecraft/server/BlockPiston.java
 +++ b/src/main/java/net/minecraft/server/BlockPiston.java
 @@ -121,7 +121,7 @@ public class BlockPiston extends BlockDirectional {
diff --git a/Spigot-Server-Patches/0358-Block-Entity-remove-from-being-called-on-Players.patch b/Spigot-Server-Patches/0357-Block-Entity-remove-from-being-called-on-Players.patch
similarity index 93%
rename from Spigot-Server-Patches/0358-Block-Entity-remove-from-being-called-on-Players.patch
rename to Spigot-Server-Patches/0357-Block-Entity-remove-from-being-called-on-Players.patch
index d70a230ea4..78487fcaf2 100644
--- a/Spigot-Server-Patches/0358-Block-Entity-remove-from-being-called-on-Players.patch
+++ b/Spigot-Server-Patches/0357-Block-Entity-remove-from-being-called-on-Players.patch
@@ -1,4 +1,4 @@
-From 3f5b27d7d97cd84fd839f1452df1fbf9175f1d01 Mon Sep 17 00:00:00 2001
+From 1b9103d031521eed6d96097e4ab35ac01333b83c 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
@@ -12,7 +12,7 @@ Player we will look at limiting the scope of this change. It appears to
 be unintentional in the few cases we've seen so far.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 367e8cfc1..c020d0b4e 100644
+index 367e8cfc13..c020d0b4e6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1953,6 +1953,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0359-Allow-Saving-of-Oversized-Chunks.patch b/Spigot-Server-Patches/0358-Allow-Saving-of-Oversized-Chunks.patch
similarity index 99%
rename from Spigot-Server-Patches/0359-Allow-Saving-of-Oversized-Chunks.patch
rename to Spigot-Server-Patches/0358-Allow-Saving-of-Oversized-Chunks.patch
index f9f029e573..9f6a65556a 100644
--- a/Spigot-Server-Patches/0359-Allow-Saving-of-Oversized-Chunks.patch
+++ b/Spigot-Server-Patches/0358-Allow-Saving-of-Oversized-Chunks.patch
@@ -1,4 +1,4 @@
-From 6600a81e2e68c4369bee74bb358ce39c6edfcb55 Mon Sep 17 00:00:00 2001
+From b2b0e6b7957bca3f54f5c603b2afd5bb6bfe9ff9 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
@@ -31,7 +31,7 @@ this fix, as the data will remain in the oversized file. Once the server returns
 to a jar with this fix, the data will be restored.
 
 diff --git a/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java b/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java
-index 9fd8a75da..d49afd622 100644
+index 9fd8a75dae..d49afd622e 100644
 --- a/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java
 +++ b/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java
 @@ -69,6 +69,7 @@ public class NBTCompressedStreamTools {
@@ -51,7 +51,7 @@ index 9fd8a75da..d49afd622 100644
          a((NBTBase) nbttagcompound, dataoutput);
      }
 diff --git a/src/main/java/net/minecraft/server/NBTTagList.java b/src/main/java/net/minecraft/server/NBTTagList.java
-index b7c94fe23..80eea5dfb 100644
+index b7c94fe238..80eea5dfbd 100644
 --- a/src/main/java/net/minecraft/server/NBTTagList.java
 +++ b/src/main/java/net/minecraft/server/NBTTagList.java
 @@ -11,7 +11,7 @@ import java.util.Objects;
@@ -64,7 +64,7 @@ index b7c94fe23..80eea5dfb 100644
  
      public NBTTagList() {}
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index e68f90194..ed2ccebb2 100644
+index e68f901943..ed2ccebb23 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -23,7 +23,7 @@ public class RegionFile implements AutoCloseable {
@@ -286,7 +286,7 @@ index e68f90194..ed2ccebb2 100644
 +
  }
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index 990d34efd..b61864641 100644
+index 990d34efde..b61864641c 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -47,6 +47,7 @@ public abstract class RegionFileCache implements AutoCloseable {
diff --git a/Spigot-Server-Patches/0360-BlockDestroyEvent.patch b/Spigot-Server-Patches/0359-BlockDestroyEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0360-BlockDestroyEvent.patch
rename to Spigot-Server-Patches/0359-BlockDestroyEvent.patch
index 8956d075d4..9396f9b3ec 100644
--- a/Spigot-Server-Patches/0360-BlockDestroyEvent.patch
+++ b/Spigot-Server-Patches/0359-BlockDestroyEvent.patch
@@ -1,4 +1,4 @@
-From 1113f9e96c05daefa52eb617e4166abad06a9201 Mon Sep 17 00:00:00 2001
+From b62be4ac2b918c05a97124cdae6401f612efa109 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 6 Feb 2019 00:20:33 -0500
 Subject: [PATCH] BlockDestroyEvent
@@ -11,7 +11,7 @@ floating in the air.
 This can replace many uses of BlockPhysicsEvent
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 388692c32..98f9ac7de 100644
+index d20077892b..774bb4d0d7 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -478,8 +478,20 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
diff --git a/Spigot-Server-Patches/0361-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/Spigot-Server-Patches/0360-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
similarity index 96%
rename from Spigot-Server-Patches/0361-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
rename to Spigot-Server-Patches/0360-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
index 0a7ecb7652..062e471d42 100644
--- a/Spigot-Server-Patches/0361-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
+++ b/Spigot-Server-Patches/0360-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
@@ -1,4 +1,4 @@
-From 840ad42258da7577373eb2094ca7a20c3896ec2a Mon Sep 17 00:00:00 2001
+From 05d405ce34b2fe9a91a6305cd708d9ff0a3c3a9e 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
@@ -10,7 +10,7 @@ This made the Bukkit RecipeChoice API not work for Shapeless.
 This reimplements vanilla logic using the same test logic as Shaped
 
 diff --git a/src/main/java/net/minecraft/server/ShapelessRecipes.java b/src/main/java/net/minecraft/server/ShapelessRecipes.java
-index 070fc1e3e..691e697d6 100644
+index 070fc1e3ec..691e697d68 100644
 --- a/src/main/java/net/minecraft/server/ShapelessRecipes.java
 +++ b/src/main/java/net/minecraft/server/ShapelessRecipes.java
 @@ -63,16 +63,46 @@ public class ShapelessRecipes implements RecipeCrafting {
diff --git a/Spigot-Server-Patches/0362-Fix-sign-edit-memory-leak.patch b/Spigot-Server-Patches/0361-Fix-sign-edit-memory-leak.patch
similarity index 94%
rename from Spigot-Server-Patches/0362-Fix-sign-edit-memory-leak.patch
rename to Spigot-Server-Patches/0361-Fix-sign-edit-memory-leak.patch
index d30729c6f1..d1a27bdf05 100644
--- a/Spigot-Server-Patches/0362-Fix-sign-edit-memory-leak.patch
+++ b/Spigot-Server-Patches/0361-Fix-sign-edit-memory-leak.patch
@@ -1,4 +1,4 @@
-From 0b005e5589525440cfe05fa94ebc7136896400ab Mon Sep 17 00:00:00 2001
+From d98ebeb1b9251fb9a29a2b688724908225faee4a 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix sign edit memory leak
 when a player edits a sign, a reference to their Entity is never cleand up.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index f007290ff..7c9cd1aa4 100644
+index f007290ff0..7c9cd1aa42 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2561,7 +2561,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -19,7 +19,7 @@ index f007290ff..7c9cd1aa4 100644
                  this.sendPacket(tileentity.getUpdatePacket()); // CraftBukkit
                  return;
 diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
-index 7b5d534f4..daf0aeb43 100644
+index 7b5d534f4b..daf0aeb43f 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySign.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySign.java
 @@ -17,6 +17,7 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
diff --git a/Spigot-Server-Patches/0363-Limit-Client-Sign-length-more.patch b/Spigot-Server-Patches/0362-Limit-Client-Sign-length-more.patch
similarity index 96%
rename from Spigot-Server-Patches/0363-Limit-Client-Sign-length-more.patch
rename to Spigot-Server-Patches/0362-Limit-Client-Sign-length-more.patch
index a6f4811efe..c21d561fb1 100644
--- a/Spigot-Server-Patches/0363-Limit-Client-Sign-length-more.patch
+++ b/Spigot-Server-Patches/0362-Limit-Client-Sign-length-more.patch
@@ -1,4 +1,4 @@
-From 9743720c4d499892237680e2472ac9e2fae6b334 Mon Sep 17 00:00:00 2001
+From 6cd478dfbae308da5489325346df18951a5d6d31 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
@@ -22,7 +22,7 @@ it only impacts data sent from the client.
 Set -DPaper.maxSignLength=XX to change limit or -1 to disable
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 7c9cd1aa4..09030abc7 100644
+index 7c9cd1aa42..09030abc72 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -103,6 +103,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0364-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/Spigot-Server-Patches/0363-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
similarity index 93%
rename from Spigot-Server-Patches/0364-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
rename to Spigot-Server-Patches/0363-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
index 6c6af290a8..b3c8f94992 100644
--- a/Spigot-Server-Patches/0364-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
+++ b/Spigot-Server-Patches/0363-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
@@ -1,4 +1,4 @@
-From 1034846e7d49d8a9e34206ab37e640b2f16a74ad Mon Sep 17 00:00:00 2001
+From 5ee2afbaf65b8670c794b5306e0f10304743b500 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
@@ -7,7 +7,7 @@ property lookups arent super cheap. they synchronize, validate
 and check security managers.
 
 diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
-index daf0aeb43..91c99222d 100644
+index daf0aeb43f..91c99222d5 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySign.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySign.java
 @@ -18,6 +18,7 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
diff --git a/Spigot-Server-Patches/0365-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch b/Spigot-Server-Patches/0364-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
similarity index 95%
rename from Spigot-Server-Patches/0365-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
rename to Spigot-Server-Patches/0364-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
index 6ec5dcf50d..bf19370075 100644
--- a/Spigot-Server-Patches/0365-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
+++ b/Spigot-Server-Patches/0364-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
@@ -1,4 +1,4 @@
-From ad75d8048af225ed023b51771054e5590bd13e68 Mon Sep 17 00:00:00 2001
+From 7aa4af6a4e6cfee98040ac4af12e1220dddfa134 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
@@ -11,7 +11,7 @@ Use -DPaper.excessiveSignsLimit=500 to configure that limit, or -1
 to disable the limit and let your players be abused.
 
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 1b0643c27..4766f7b77 100644
+index 1b0643c27f..4766f7b773 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -220,6 +220,15 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -31,7 +31,7 @@ index 1b0643c27..4766f7b77 100644
  
      private void sendPacketQueue() { this.o(); } // Paper - OBFHELPER
 diff --git a/src/main/java/net/minecraft/server/Packet.java b/src/main/java/net/minecraft/server/Packet.java
-index 2d8e6a2f4..8d0965a05 100644
+index 2d8e6a2f4a..8d0965a053 100644
 --- a/src/main/java/net/minecraft/server/Packet.java
 +++ b/src/main/java/net/minecraft/server/Packet.java
 @@ -11,6 +11,7 @@ public interface Packet<T extends PacketListener> {
@@ -43,7 +43,7 @@ index 2d8e6a2f4..8d0965a05 100644
          return false;
      }
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
-index 58eccd9c6..ef71a1feb 100644
+index 58eccd9c63..ef71a1feb3 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 @@ -20,6 +20,15 @@ public class PacketPlayOutMapChunk implements Packet<PacketListenerPlayOut> {
diff --git a/Spigot-Server-Patches/0366-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch b/Spigot-Server-Patches/0365-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
similarity index 95%
rename from Spigot-Server-Patches/0366-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
rename to Spigot-Server-Patches/0365-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
index 908145a658..2b31253bf9 100644
--- a/Spigot-Server-Patches/0366-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
+++ b/Spigot-Server-Patches/0365-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
@@ -1,4 +1,4 @@
-From 89e715f84dbd1e1af5f92e1305ed4cbe28f11643 Mon Sep 17 00:00:00 2001
+From 622dfad995b0a662dc75e3859a04add3f2313a93 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
@@ -11,7 +11,7 @@ everything to the Whitelist object.
 https://github.com/PaperMC/Paper/issues/1880
 
 diff --git a/src/main/java/net/minecraft/server/JsonList.java b/src/main/java/net/minecraft/server/JsonList.java
-index c169d0176..55bc4b265 100644
+index c169d01762..55bc4b265d 100644
 --- a/src/main/java/net/minecraft/server/JsonList.java
 +++ b/src/main/java/net/minecraft/server/JsonList.java
 @@ -64,6 +64,7 @@ public class JsonList<K, V extends JsonListEntry<K>> {
@@ -23,7 +23,7 @@ index c169d0176..55bc4b265 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 1eae8057d..e6c894463 100644
+index 1eae8057d0..e6c894463b 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/0367-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/Spigot-Server-Patches/0366-Set-Zombie-last-tick-at-start-of-drowning-process.patch
similarity index 89%
rename from Spigot-Server-Patches/0367-Set-Zombie-last-tick-at-start-of-drowning-process.patch
rename to Spigot-Server-Patches/0366-Set-Zombie-last-tick-at-start-of-drowning-process.patch
index 4d63b2fc3e..651b98aa9c 100644
--- a/Spigot-Server-Patches/0367-Set-Zombie-last-tick-at-start-of-drowning-process.patch
+++ b/Spigot-Server-Patches/0366-Set-Zombie-last-tick-at-start-of-drowning-process.patch
@@ -1,4 +1,4 @@
-From 58afd3fbe341b0e72cde79ca176a8dae8fdd67e0 Mon Sep 17 00:00:00 2001
+From 518ebacc7fb81152b0939838165905f9283a9fae 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Set Zombie last tick at start of drowning process
 Fixes GH-1887
 
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index b20fe8e52..40a796384 100644
+index b20fe8e521..40a796384c 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -167,6 +167,7 @@ public class EntityZombie extends EntityMonster {
diff --git a/Spigot-Server-Patches/0368-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/Spigot-Server-Patches/0367-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
similarity index 87%
rename from Spigot-Server-Patches/0368-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
rename to Spigot-Server-Patches/0367-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
index 679621dee9..af57c32abb 100644
--- a/Spigot-Server-Patches/0368-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
+++ b/Spigot-Server-Patches/0367-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
@@ -1,11 +1,11 @@
-From 9c7cd0871e1fb54da242899be23a5c54841f1148 Mon Sep 17 00:00:00 2001
+From cbc0d518569f1a16bde39faa584d8d0b4296555e 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 e6c894463..ce66596c6 100644
+index e6c894463b..ce66596c63 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1034,6 +1034,7 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0369-Add-LivingEntity-getTargetEntity.patch b/Spigot-Server-Patches/0368-Add-LivingEntity-getTargetEntity.patch
similarity index 96%
rename from Spigot-Server-Patches/0369-Add-LivingEntity-getTargetEntity.patch
rename to Spigot-Server-Patches/0368-Add-LivingEntity-getTargetEntity.patch
index ecfef71232..b290384fd7 100644
--- a/Spigot-Server-Patches/0369-Add-LivingEntity-getTargetEntity.patch
+++ b/Spigot-Server-Patches/0368-Add-LivingEntity-getTargetEntity.patch
@@ -1,11 +1,11 @@
-From d8ae1979c8d8088ae4086bdb8bb0e5314599fe51 Mon Sep 17 00:00:00 2001
+From f71e8ef7e536ec1e46004526107ec07adcbd1bca 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
 
 
 diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java
-index b38fc50bb..d02c77664 100644
+index b38fc50bb7..d02c77664c 100644
 --- a/src/main/java/net/minecraft/server/AxisAlignedBB.java
 +++ b/src/main/java/net/minecraft/server/AxisAlignedBB.java
 @@ -108,6 +108,7 @@ public class AxisAlignedBB {
@@ -46,7 +46,7 @@ index b38fc50bb..d02c77664 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 c71dc3614..a49d02da1 100644
+index c71dc36141..a49d02da16 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1443,6 +1443,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -66,7 +66,7 @@ index c71dc3614..a49d02da1 100644
          return 0.0F;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 75608c8a1..75d845a75 100644
+index 75608c8a1e..75d845a75b 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -3217,6 +3217,37 @@ public abstract class EntityLiving extends Entity {
@@ -108,7 +108,7 @@ index 75608c8a1..75d845a75 100644
  
      public int getShieldBlockingDelay() {
 diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
-index 035d70419..2ebcbe17c 100644
+index 035d70419d..2ebcbe17ce 100644
 --- a/src/main/java/net/minecraft/server/IEntitySelector.java
 +++ b/src/main/java/net/minecraft/server/IEntitySelector.java
 @@ -18,6 +18,7 @@ public final class IEntitySelector {
@@ -120,7 +120,7 @@ index 035d70419..2ebcbe17c 100644
          return !entity.t();
      };
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 4233ffe65..b85385ba4 100644
+index 4233ffe654..b85385ba41 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -199,6 +199,33 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/Spigot-Server-Patches/0370-Use-proper-max-length-when-serialising-BungeeCord-te.patch b/Spigot-Server-Patches/0369-Use-proper-max-length-when-serialising-BungeeCord-te.patch
similarity index 94%
rename from Spigot-Server-Patches/0370-Use-proper-max-length-when-serialising-BungeeCord-te.patch
rename to Spigot-Server-Patches/0369-Use-proper-max-length-when-serialising-BungeeCord-te.patch
index a0bf677e3a..d0d51e6963 100644
--- a/Spigot-Server-Patches/0370-Use-proper-max-length-when-serialising-BungeeCord-te.patch
+++ b/Spigot-Server-Patches/0369-Use-proper-max-length-when-serialising-BungeeCord-te.patch
@@ -1,4 +1,4 @@
-From 6456d7d5076e856e3f5fefbdfb3ced5aab8502b7 Mon Sep 17 00:00:00 2001
+From d284af28a559df6f8ab0be5674fa0f715ecfa701 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Use proper max length when serialising BungeeCord text
 
 
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutChat.java b/src/main/java/net/minecraft/server/PacketPlayOutChat.java
-index 0ab611564..f7b2095bb 100644
+index 0ab611564e..f7b2095bb7 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutChat.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutChat.java
 @@ -3,7 +3,7 @@ package net.minecraft.server;
diff --git a/Spigot-Server-Patches/0371-Entity-getEntitySpawnReason.patch b/Spigot-Server-Patches/0370-Entity-getEntitySpawnReason.patch
similarity index 96%
rename from Spigot-Server-Patches/0371-Entity-getEntitySpawnReason.patch
rename to Spigot-Server-Patches/0370-Entity-getEntitySpawnReason.patch
index dec6f57774..9ec8b1b9c6 100644
--- a/Spigot-Server-Patches/0371-Entity-getEntitySpawnReason.patch
+++ b/Spigot-Server-Patches/0370-Entity-getEntitySpawnReason.patch
@@ -1,4 +1,4 @@
-From 0e5de1c6ae53d6eba93f429dfdb092e7dc485272 Mon Sep 17 00:00:00 2001
+From 154e3869c553cef65f52964538deb8c1a003a4c6 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 a49d02da1..d02e48a86 100644
+index a49d02da16..d02e48a864 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -68,6 +68,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -59,7 +59,7 @@ index a49d02da1..d02e48a86 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 ce66596c6..5645147da 100644
+index ce66596c63..5645147dad 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -250,7 +250,7 @@ public abstract class PlayerList {
@@ -72,7 +72,7 @@ index ce66596c6..5645147da 100644
              });
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 661ea58b8..101f4ee5d 100644
+index 9c4ef2e004..1a01e5e696 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -932,6 +932,7 @@ public class WorldServer extends World {
@@ -84,7 +84,7 @@ index 661ea58b8..101f4ee5d 100644
          if (entity.dead) {
              // Paper start
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 52f72e147..11a3e7b69 100644
+index 52f72e1471..11a3e7b699 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1053,5 +1053,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/Spigot-Server-Patches/0372-Update-entity-Metadata-for-all-tracked-players.patch b/Spigot-Server-Patches/0371-Update-entity-Metadata-for-all-tracked-players.patch
similarity index 92%
rename from Spigot-Server-Patches/0372-Update-entity-Metadata-for-all-tracked-players.patch
rename to Spigot-Server-Patches/0371-Update-entity-Metadata-for-all-tracked-players.patch
index b62769def0..0d6f979986 100644
--- a/Spigot-Server-Patches/0372-Update-entity-Metadata-for-all-tracked-players.patch
+++ b/Spigot-Server-Patches/0371-Update-entity-Metadata-for-all-tracked-players.patch
@@ -1,11 +1,11 @@
-From 4fc311bca01094a96da585c3517be8a95a60e037 Mon Sep 17 00:00:00 2001
+From 05fc2dc2d5f9b5d6924440d433732dcdc4e17793 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/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index afd8748da..17b6ab57c 100644
+index afd8748da8..17b6ab57c2 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -379,6 +379,12 @@ public class EntityTrackerEntry {
@@ -22,7 +22,7 @@ index afd8748da..17b6ab57c 100644
          this.f.accept(packet);
          if (this.tracker instanceof EntityPlayer) {
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 09030abc7..5b4576388 100644
+index 09030abc72..5b45763886 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2021,7 +2021,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0373-Fire-event-on-GS4-query.patch b/Spigot-Server-Patches/0372-Fire-event-on-GS4-query.patch
similarity index 98%
rename from Spigot-Server-Patches/0373-Fire-event-on-GS4-query.patch
rename to Spigot-Server-Patches/0372-Fire-event-on-GS4-query.patch
index ca81e35ca1..603c21df5e 100644
--- a/Spigot-Server-Patches/0373-Fire-event-on-GS4-query.patch
+++ b/Spigot-Server-Patches/0372-Fire-event-on-GS4-query.patch
@@ -1,11 +1,11 @@
-From a3c3387cd562cea592c735a98e4774f91020c3cb Mon Sep 17 00:00:00 2001
+From 90d0981dc9a0304ad67936976b2d7c5ea1fe9240 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/src/main/java/net/minecraft/server/RemoteConnectionThread.java b/src/main/java/net/minecraft/server/RemoteConnectionThread.java
-index 66bfbcf02..d821ef9a7 100644
+index 66bfbcf02b..d821ef9a75 100644
 --- a/src/main/java/net/minecraft/server/RemoteConnectionThread.java
 +++ b/src/main/java/net/minecraft/server/RemoteConnectionThread.java
 @@ -15,7 +15,7 @@ public abstract class RemoteConnectionThread implements Runnable {
@@ -26,7 +26,7 @@ index 66bfbcf02..d821ef9a7 100644
          return this.b.getPlayerCount();
      }
 diff --git a/src/main/java/net/minecraft/server/RemoteStatusListener.java b/src/main/java/net/minecraft/server/RemoteStatusListener.java
-index ddb4ba489..3770334fc 100644
+index ddb4ba4899..3770334fc4 100644
 --- a/src/main/java/net/minecraft/server/RemoteStatusListener.java
 +++ b/src/main/java/net/minecraft/server/RemoteStatusListener.java
 @@ -21,19 +21,19 @@ public class RemoteStatusListener extends RemoteConnectionThread {
@@ -184,7 +184,7 @@ index ddb4ba489..3770334fc 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/RemoteStatusReply.java b/src/main/java/net/minecraft/server/RemoteStatusReply.java
-index 848b5c3f0..73efea7e1 100644
+index 848b5c3f0e..73efea7e13 100644
 --- a/src/main/java/net/minecraft/server/RemoteStatusReply.java
 +++ b/src/main/java/net/minecraft/server/RemoteStatusReply.java
 @@ -18,15 +18,27 @@ public class RemoteStatusReply {
diff --git a/Spigot-Server-Patches/0374-Implement-PlayerPostRespawnEvent.patch b/Spigot-Server-Patches/0373-Implement-PlayerPostRespawnEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0374-Implement-PlayerPostRespawnEvent.patch
rename to Spigot-Server-Patches/0373-Implement-PlayerPostRespawnEvent.patch
index 71d400067d..286a2e3aa7 100644
--- a/Spigot-Server-Patches/0374-Implement-PlayerPostRespawnEvent.patch
+++ b/Spigot-Server-Patches/0373-Implement-PlayerPostRespawnEvent.patch
@@ -1,11 +1,11 @@
-From ffae7d08159aaa41e9dcfe2353f3d02ae8537fe7 Mon Sep 17 00:00:00 2001
+From 5057b229edc8e9d414519384ee84b39ba724b9a1 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 5645147da..0e7e47f83 100644
+index 5645147dad..0e7e47f831 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -637,9 +637,14 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0375-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/Spigot-Server-Patches/0374-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
similarity index 93%
rename from Spigot-Server-Patches/0375-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
rename to Spigot-Server-Patches/0374-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
index 0ca6621664..166d20b192 100644
--- a/Spigot-Server-Patches/0375-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
+++ b/Spigot-Server-Patches/0374-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
@@ -1,4 +1,4 @@
-From dd3bf068fbdf1e9b24be75713abd4e983459a481 Mon Sep 17 00:00:00 2001
+From 77eb39ea85dc028b915820c1531380c8593aecb0 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
@@ -6,7 +6,7 @@ Subject: [PATCH] don't go below 0 for pickupDelay, breaks picking up items
 vanilla checks for == 0
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index ddd1f6307..7e9256314 100644
+index ddd1f63073..7e92563141 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -59,6 +59,7 @@ public class EntityItem extends Entity {
diff --git a/Spigot-Server-Patches/0376-Implement-getters-and-setters-for-EntityItem-owner-a.patch b/Spigot-Server-Patches/0375-Implement-getters-and-setters-for-EntityItem-owner-a.patch
similarity index 93%
rename from Spigot-Server-Patches/0376-Implement-getters-and-setters-for-EntityItem-owner-a.patch
rename to Spigot-Server-Patches/0375-Implement-getters-and-setters-for-EntityItem-owner-a.patch
index c47d57a130..7b6666a80d 100644
--- a/Spigot-Server-Patches/0376-Implement-getters-and-setters-for-EntityItem-owner-a.patch
+++ b/Spigot-Server-Patches/0375-Implement-getters-and-setters-for-EntityItem-owner-a.patch
@@ -1,4 +1,4 @@
-From 86a985dcf01260eb221879345473b4267009d7f8 Mon Sep 17 00:00:00 2001
+From 3a4e0fed30ccf8820ec84bb3444ded71f83f394c 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement getters and setters for EntityItem owner and
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-index 3f552b590..cb756b1ba 100644
+index 3f552b5905..cb756b1ba0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 @@ -8,6 +8,11 @@ import org.bukkit.entity.EntityType;
diff --git a/Spigot-Server-Patches/0377-Server-Tick-Events.patch b/Spigot-Server-Patches/0376-Server-Tick-Events.patch
similarity index 93%
rename from Spigot-Server-Patches/0377-Server-Tick-Events.patch
rename to Spigot-Server-Patches/0376-Server-Tick-Events.patch
index 208d5ed84d..1f555a5e58 100644
--- a/Spigot-Server-Patches/0377-Server-Tick-Events.patch
+++ b/Spigot-Server-Patches/0376-Server-Tick-Events.patch
@@ -1,4 +1,4 @@
-From 0939ef5dc79de68937f15014d63ae095ab9bcc3d Mon Sep 17 00:00:00 2001
+From 052028998cb5bca8e8150a97019a6e4b35f06582 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Server Tick Events
 Fires event at start and end of a server tick
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1858e956b..6e77fa35b 100644
+index 1858e956b5..6e77fa35b4 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1050,6 +1050,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
diff --git a/Spigot-Server-Patches/0378-PlayerDeathEvent-getItemsToKeep.patch b/Spigot-Server-Patches/0377-PlayerDeathEvent-getItemsToKeep.patch
similarity index 96%
rename from Spigot-Server-Patches/0378-PlayerDeathEvent-getItemsToKeep.patch
rename to Spigot-Server-Patches/0377-PlayerDeathEvent-getItemsToKeep.patch
index 182a6b4526..1e477edccb 100644
--- a/Spigot-Server-Patches/0378-PlayerDeathEvent-getItemsToKeep.patch
+++ b/Spigot-Server-Patches/0377-PlayerDeathEvent-getItemsToKeep.patch
@@ -1,4 +1,4 @@
-From 882e169413c81c7166e3f15b7f5d82b8c7c1b999 Mon Sep 17 00:00:00 2001
+From 2fa468c9eee8b156f63928940ae0eb765982ff80 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
@@ -8,7 +8,7 @@ Exposes a mutable array on items a player should keep on death
 Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 3ecf18379..e9f158d8e 100644
+index 3ecf18379b..e9f158d8ec 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -508,6 +508,46 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0379-Optimize-Persistent-Data-Loading.patch b/Spigot-Server-Patches/0378-Optimize-Persistent-Data-Loading.patch
similarity index 96%
rename from Spigot-Server-Patches/0379-Optimize-Persistent-Data-Loading.patch
rename to Spigot-Server-Patches/0378-Optimize-Persistent-Data-Loading.patch
index a7e8198baf..6f25a2de25 100644
--- a/Spigot-Server-Patches/0379-Optimize-Persistent-Data-Loading.patch
+++ b/Spigot-Server-Patches/0378-Optimize-Persistent-Data-Loading.patch
@@ -1,4 +1,4 @@
-From eed90fc4e6231fca13003863b1c1a8db975e48e3 Mon Sep 17 00:00:00 2001
+From 605b5f638b3d6eccd0324ddcc92eb75956972222 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 29 Mar 2019 01:25:11 -0400
 Subject: [PATCH] Optimize Persistent Data Loading
@@ -14,7 +14,7 @@ These files take a long time to convert on large worlds and crashes the server.
 Additionally, cache the result of a file being missing so we don't keep spam checking it.
 
 diff --git a/src/main/java/net/minecraft/server/WorldPersistentData.java b/src/main/java/net/minecraft/server/WorldPersistentData.java
-index 47a4ea998..62081349f 100644
+index 47a4ea9985..62081349f1 100644
 --- a/src/main/java/net/minecraft/server/WorldPersistentData.java
 +++ b/src/main/java/net/minecraft/server/WorldPersistentData.java
 @@ -26,6 +26,7 @@ public class WorldPersistentData {
diff --git a/Spigot-Server-Patches/0380-Allow-login-events-to-fire-only-after-the-server-plu.patch b/Spigot-Server-Patches/0379-Allow-login-events-to-fire-only-after-the-server-plu.patch
similarity index 95%
rename from Spigot-Server-Patches/0380-Allow-login-events-to-fire-only-after-the-server-plu.patch
rename to Spigot-Server-Patches/0379-Allow-login-events-to-fire-only-after-the-server-plu.patch
index 85e2be75e8..48bdb29d19 100644
--- a/Spigot-Server-Patches/0380-Allow-login-events-to-fire-only-after-the-server-plu.patch
+++ b/Spigot-Server-Patches/0379-Allow-login-events-to-fire-only-after-the-server-plu.patch
@@ -1,4 +1,4 @@
-From df4584e81bbed5243a3d0bd9a4132518e1a71bed Mon Sep 17 00:00:00 2001
+From 0418b980eb03e413cbefe1533d029549047dff03 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sun, 31 Mar 2019 22:02:24 -0700
 Subject: [PATCH] Allow login events to fire only after the server plugins are
@@ -7,7 +7,7 @@ Subject: [PATCH] Allow login events to fire only after the server plugins are
 Event threads will simply block until they're ready to accept.
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 9e4bc2405..028c23dbe 100644
+index 9e4bc24058..028c23dbe6 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -285,6 +285,36 @@ public class LoginListener implements PacketLoginInListener {
@@ -56,7 +56,7 @@ index 9e4bc2405..028c23dbe 100644
                              java.net.InetAddress address = ((java.net.InetSocketAddress) networkManager.getSocketAddress()).getAddress();
                              java.util.UUID uniqueId = i.getId();
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 6e77fa35b..70f730996 100644
+index 6e77fa35b4..70f730996c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -462,6 +462,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
diff --git a/Spigot-Server-Patches/0381-Make-region-files-more-reliable-to-write-to.patch b/Spigot-Server-Patches/0380-Make-region-files-more-reliable-to-write-to.patch
similarity index 98%
rename from Spigot-Server-Patches/0381-Make-region-files-more-reliable-to-write-to.patch
rename to Spigot-Server-Patches/0380-Make-region-files-more-reliable-to-write-to.patch
index 0828232f75..630c862fbb 100644
--- a/Spigot-Server-Patches/0381-Make-region-files-more-reliable-to-write-to.patch
+++ b/Spigot-Server-Patches/0380-Make-region-files-more-reliable-to-write-to.patch
@@ -1,4 +1,4 @@
-From cb6935ecc7e790e1fa0a4f7e1230a311b17b962b Mon Sep 17 00:00:00 2001
+From 363f40d7ee877b98e842212646be030bdd252b33 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Mon, 1 Apr 2019 18:57:32 -0700
 Subject: [PATCH] Make region files more reliable to write to
@@ -37,7 +37,7 @@ affect save performance if the startup flag is used (especially on
 HDDs).
 
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index ed2ccebb2..2e14d8465 100644
+index ed2ccebb23..2e14d84657 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -29,7 +29,7 @@ public class RegionFile implements AutoCloseable {
diff --git a/Spigot-Server-Patches/0382-Optimize-GameRules-to-use-LinkedHashMap.patch b/Spigot-Server-Patches/0381-Optimize-GameRules-to-use-LinkedHashMap.patch
similarity index 96%
rename from Spigot-Server-Patches/0382-Optimize-GameRules-to-use-LinkedHashMap.patch
rename to Spigot-Server-Patches/0381-Optimize-GameRules-to-use-LinkedHashMap.patch
index 05b054512e..998a7ae5ec 100644
--- a/Spigot-Server-Patches/0382-Optimize-GameRules-to-use-LinkedHashMap.patch
+++ b/Spigot-Server-Patches/0381-Optimize-GameRules-to-use-LinkedHashMap.patch
@@ -1,4 +1,4 @@
-From 7f6af3d7949b464786340f3a11cd7678bdb35680 Mon Sep 17 00:00:00 2001
+From 514b1351f36fbbfdd06fb0648db70ebc14168c7c Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Thu, 4 Apr 2019 17:55:05 -0700
 Subject: [PATCH] Optimize GameRules to use LinkedHashMap
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize GameRules to use LinkedHashMap
 Previously TreeMap was used which has poor get(K) performance.
 
 diff --git a/src/main/java/net/minecraft/server/GameRules.java b/src/main/java/net/minecraft/server/GameRules.java
-index 3de9d264d..c6a800474 100644
+index 3de9d264db..c6a8004745 100644
 --- a/src/main/java/net/minecraft/server/GameRules.java
 +++ b/src/main/java/net/minecraft/server/GameRules.java
 @@ -17,7 +17,17 @@ import javax.annotation.Nullable;
@@ -49,7 +49,7 @@ index 3de9d264d..c6a800474 100644
      }
  
 diff --git a/src/test/java/org/bukkit/GameRuleTest.java b/src/test/java/org/bukkit/GameRuleTest.java
-index 1ed0f4cf2..40edb8d66 100644
+index 1ed0f4cf2b..40edb8d668 100644
 --- a/src/test/java/org/bukkit/GameRuleTest.java
 +++ b/src/test/java/org/bukkit/GameRuleTest.java
 @@ -21,7 +21,7 @@ public class GameRuleTest {
diff --git a/Spigot-Server-Patches/0383-Optimize-Captured-TileEntity-Lookup.patch b/Spigot-Server-Patches/0382-Optimize-Captured-TileEntity-Lookup.patch
similarity index 89%
rename from Spigot-Server-Patches/0383-Optimize-Captured-TileEntity-Lookup.patch
rename to Spigot-Server-Patches/0382-Optimize-Captured-TileEntity-Lookup.patch
index 0a5595b416..ebbaa62d67 100644
--- a/Spigot-Server-Patches/0383-Optimize-Captured-TileEntity-Lookup.patch
+++ b/Spigot-Server-Patches/0382-Optimize-Captured-TileEntity-Lookup.patch
@@ -1,4 +1,4 @@
-From 931a4ab5fd5f003c2ea96f932a2054b8ac5623c6 Mon Sep 17 00:00:00 2001
+From 2e3ddf2b9f6fc45c46e1a4f4cb4f5eb4cc7f9658 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
@@ -10,10 +10,10 @@ Optimize to check if the captured list even has values in it, and also to
 just do a get call since the value can never be null.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 98f9ac7de..8f8bc28a1 100644
+index 774bb4d0d7..ad58d4fd63 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1053,12 +1053,13 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
+@@ -1051,12 +1051,13 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
              return null;
          } else {
              // CraftBukkit start
diff --git a/Spigot-Server-Patches/0384-Add-Heightmap-API.patch b/Spigot-Server-Patches/0383-Add-Heightmap-API.patch
similarity index 94%
rename from Spigot-Server-Patches/0384-Add-Heightmap-API.patch
rename to Spigot-Server-Patches/0383-Add-Heightmap-API.patch
index 583f5db64a..7dd6e59614 100644
--- a/Spigot-Server-Patches/0384-Add-Heightmap-API.patch
+++ b/Spigot-Server-Patches/0383-Add-Heightmap-API.patch
@@ -1,11 +1,11 @@
-From 5a098ad86885033e772180ab1512eded5323753d Mon Sep 17 00:00:00 2001
+From 7c5eec90c34e721e60e2aee5e6c4a763a9fae1f8 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/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 8f8bc28a1..bcd397127 100644
+index ad58d4fd63..c04d73e738 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -617,8 +617,8 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
@@ -20,7 +20,7 @@ index 8f8bc28a1..bcd397127 100644
  
          if (i >= -30000000 && j >= -30000000 && i < 30000000 && j < 30000000) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 073400f23..e18ae24bf 100644
+index 073400f23f..e18ae24bf8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -317,6 +317,29 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0385-Handle-bad-chunks-more-gracefully.patch b/Spigot-Server-Patches/0384-Handle-bad-chunks-more-gracefully.patch
similarity index 96%
rename from Spigot-Server-Patches/0385-Handle-bad-chunks-more-gracefully.patch
rename to Spigot-Server-Patches/0384-Handle-bad-chunks-more-gracefully.patch
index 0fc51cf840..664e29ebaf 100644
--- a/Spigot-Server-Patches/0385-Handle-bad-chunks-more-gracefully.patch
+++ b/Spigot-Server-Patches/0384-Handle-bad-chunks-more-gracefully.patch
@@ -1,4 +1,4 @@
-From d8b88fa191c6889982feff85a41cdcfc7207b11c Mon Sep 17 00:00:00 2001
+From 6e248206df5c4aa4a405b1bdb795caa90eee3717 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Mon, 15 Apr 2019 02:24:52 +0100
 Subject: [PATCH] Handle bad chunks more gracefully
@@ -15,7 +15,7 @@ Should Mojang choose to alter this behavior in the future, this change
 will simply defer to whatever that new behavior is.
 
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index b61864641..d39d49944 100644
+index b61864641c..d39d49944a 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -171,8 +171,21 @@ public abstract class RegionFileCache implements AutoCloseable {
diff --git a/Spigot-Server-Patches/0386-Mob-Spawner-API-Enhancements.patch b/Spigot-Server-Patches/0385-Mob-Spawner-API-Enhancements.patch
similarity index 97%
rename from Spigot-Server-Patches/0386-Mob-Spawner-API-Enhancements.patch
rename to Spigot-Server-Patches/0385-Mob-Spawner-API-Enhancements.patch
index bcd9ef9933..c675f70f26 100644
--- a/Spigot-Server-Patches/0386-Mob-Spawner-API-Enhancements.patch
+++ b/Spigot-Server-Patches/0385-Mob-Spawner-API-Enhancements.patch
@@ -1,11 +1,11 @@
-From 748fd8addd85852e68cf2df3eddc548c571af9b0 Mon Sep 17 00:00:00 2001
+From eb0d9d309338bc3b69b969a53e39ec7d5840c519 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/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index dbb8098d6..e9bcb5aba 100644
+index dbb8098d6c..e9bcb5abaa 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -46,6 +46,7 @@ public abstract class MobSpawnerAbstract {
@@ -82,7 +82,7 @@ index dbb8098d6..e9bcb5aba 100644
              nbttagcompound.setShort("MaxNearbyEntities", (short) this.maxNearbyEntities);
              nbttagcompound.setShort("RequiredPlayerRange", (short) this.requiredPlayerRange);
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java b/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java
-index 5c4c3c70c..e78e3804b 100644
+index 5c4c3c70c7..e78e3804ba 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java
 @@ -121,4 +121,16 @@ public class CraftCreatureSpawner extends CraftBlockEntityState<TileEntityMobSpa
diff --git a/Spigot-Server-Patches/0387-don-t-NPE-on-dimensionmanager-toString.patch b/Spigot-Server-Patches/0386-don-t-NPE-on-dimensionmanager-toString.patch
similarity index 95%
rename from Spigot-Server-Patches/0387-don-t-NPE-on-dimensionmanager-toString.patch
rename to Spigot-Server-Patches/0386-don-t-NPE-on-dimensionmanager-toString.patch
index a08385342e..2869dc6254 100644
--- a/Spigot-Server-Patches/0387-don-t-NPE-on-dimensionmanager-toString.patch
+++ b/Spigot-Server-Patches/0386-don-t-NPE-on-dimensionmanager-toString.patch
@@ -1,4 +1,4 @@
-From 405b66362d347ad7dd90b62b8359a1d5aa9abf48 Mon Sep 17 00:00:00 2001
+From 31bc897990cb6ff4b075db19b5d0ea01c1fff72c Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Mon, 22 Apr 2019 19:51:14 +0100
 Subject: [PATCH] don't NPE on dimensionmanager toString
@@ -14,7 +14,7 @@ this is not super elegant, but is the only route that promises not to
 break stuff.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 050bf3eb4..56e8a613e 100644
+index 050bf3eb48..56e8a613e9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -997,7 +997,12 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0388-Per-Player-View-Distance-API-placeholders.patch b/Spigot-Server-Patches/0387-Per-Player-View-Distance-API-placeholders.patch
similarity index 95%
rename from Spigot-Server-Patches/0388-Per-Player-View-Distance-API-placeholders.patch
rename to Spigot-Server-Patches/0387-Per-Player-View-Distance-API-placeholders.patch
index f29cbf2c50..e7e0ecc409 100644
--- a/Spigot-Server-Patches/0388-Per-Player-View-Distance-API-placeholders.patch
+++ b/Spigot-Server-Patches/0387-Per-Player-View-Distance-API-placeholders.patch
@@ -1,4 +1,4 @@
-From 6eb897728c2cf8982d1406ed268ce608f1b04ad8 Mon Sep 17 00:00:00 2001
+From 49167247737ec67ab21c839af1e5fbd9f9d7a2f7 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
@@ -7,7 +7,7 @@ I hope to look at this more in-depth soon. It appears doable.
 However this should not block the update.
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index 9ada10cc7..5751d39e0 100644
+index 9ada10cc73..5751d39e0b 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -570,9 +570,9 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
@@ -23,7 +23,7 @@ index 9ada10cc7..5751d39e0 100644
                      double deltaX = this.locX - player.locX;
                      double deltaZ = this.locZ - player.locZ;
 diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java
-index 48b22894a..dbd854206 100644
+index 48b22894aa..dbd8542069 100644
 --- a/src/main/java/net/minecraft/server/EntityWither.java
 +++ b/src/main/java/net/minecraft/server/EntityWither.java
 @@ -208,9 +208,9 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@@ -39,7 +39,7 @@ index 48b22894a..dbd854206 100644
                      double deltaX = this.locX - player.locX;
                      double deltaZ = this.locZ - player.locZ;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index c020d0b4e..9f267414d 100644
+index c020d0b4e6..9f267414da 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1962,6 +1962,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0389-Async-Chunk-placeholder.patch b/Spigot-Server-Patches/0388-Async-Chunk-placeholder.patch
similarity index 92%
rename from Spigot-Server-Patches/0389-Async-Chunk-placeholder.patch
rename to Spigot-Server-Patches/0388-Async-Chunk-placeholder.patch
index cbc2129118..7d169b23d0 100644
--- a/Spigot-Server-Patches/0389-Async-Chunk-placeholder.patch
+++ b/Spigot-Server-Patches/0388-Async-Chunk-placeholder.patch
@@ -1,4 +1,4 @@
-From 08d847cb80c0a7ba3b44f0ac6a9a0a91a45c6321 Mon Sep 17 00:00:00 2001
+From 4cf29ed50520132d31997b2949e84a1c49230ee6 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Mon, 6 May 2019 12:29:24 -0700
 Subject: [PATCH] Async Chunk placeholder
@@ -6,7 +6,7 @@ Subject: [PATCH] Async Chunk placeholder
 Until we figure out Mojang's ticket system.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index e18ae24bf..a263d8e7f 100644
+index e18ae24bf8..a263d8e7fb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -14,6 +14,7 @@ import java.util.Objects;
diff --git a/Spigot-Server-Patches/0390-Fix-CB-call-to-changed-postToMainThread-method.patch b/Spigot-Server-Patches/0389-Fix-CB-call-to-changed-postToMainThread-method.patch
similarity index 88%
rename from Spigot-Server-Patches/0390-Fix-CB-call-to-changed-postToMainThread-method.patch
rename to Spigot-Server-Patches/0389-Fix-CB-call-to-changed-postToMainThread-method.patch
index ecbeedd929..930458affb 100644
--- a/Spigot-Server-Patches/0390-Fix-CB-call-to-changed-postToMainThread-method.patch
+++ b/Spigot-Server-Patches/0389-Fix-CB-call-to-changed-postToMainThread-method.patch
@@ -1,11 +1,11 @@
-From 29410d90a8787024ecddceec646e7d5c650aa3f9 Mon Sep 17 00:00:00 2001
+From 733d3eb66ee8920c77578595f977d82590ab30a1 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/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 5b4576388..e517e9f9f 100644
+index 5b45763886..e517e9f9fc 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -282,7 +282,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0391-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/Spigot-Server-Patches/0390-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
similarity index 92%
rename from Spigot-Server-Patches/0391-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
rename to Spigot-Server-Patches/0390-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
index bf550088e4..e67831ff1a 100644
--- a/Spigot-Server-Patches/0391-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
+++ b/Spigot-Server-Patches/0390-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
@@ -1,4 +1,4 @@
-From 4cf4195808543f331efd8e40cad8235fad0b8d72 Mon Sep 17 00:00:00 2001
+From fbe26512308005f01514a79f68e76aebbe5a9cec 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)
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix sounds when item frames are modified (MC-123450)
 This also fixes the adding sound playing when the item frame direction is changed.
 
 diff --git a/src/main/java/net/minecraft/server/EntityItemFrame.java b/src/main/java/net/minecraft/server/EntityItemFrame.java
-index 816f7ae6b..3064bce49 100644
+index 816f7ae6b7..3064bce494 100644
 --- a/src/main/java/net/minecraft/server/EntityItemFrame.java
 +++ b/src/main/java/net/minecraft/server/EntityItemFrame.java
 @@ -211,7 +211,7 @@ public class EntityItemFrame extends EntityHanging {
@@ -19,7 +19,7 @@ index 816f7ae6b..3064bce49 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
-index 70127520a..712ec431f 100644
+index 70127520a2..712ec431f0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
 @@ -49,7 +49,7 @@ public class CraftItemFrame extends CraftHanging implements ItemFrame {
diff --git a/Spigot-Server-Patches/0392-Fix-MC-151674-Close-RegionFiles-when-they-get-evicte.patch b/Spigot-Server-Patches/0391-Fix-MC-151674-Close-RegionFiles-when-they-get-evicte.patch
similarity index 89%
rename from Spigot-Server-Patches/0392-Fix-MC-151674-Close-RegionFiles-when-they-get-evicte.patch
rename to Spigot-Server-Patches/0391-Fix-MC-151674-Close-RegionFiles-when-they-get-evicte.patch
index dd4076f651..32fc2c4981 100644
--- a/Spigot-Server-Patches/0392-Fix-MC-151674-Close-RegionFiles-when-they-get-evicte.patch
+++ b/Spigot-Server-Patches/0391-Fix-MC-151674-Close-RegionFiles-when-they-get-evicte.patch
@@ -1,4 +1,4 @@
-From b35691f592e433ffc5ad25a09639b337d923996c Mon Sep 17 00:00:00 2001
+From 9400e672953ac9c9f40ca2537f19dbc205c435c8 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sun, 12 May 2019 19:25:53 -0700
 Subject: [PATCH] Fix MC-151674 Close RegionFiles when they get evicted from
@@ -7,7 +7,7 @@ Subject: [PATCH] Fix MC-151674 Close RegionFiles when they get evicted from
 https://bugs.mojang.com/browse/MC-151674
 
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index d39d49944..e0bfa39c3 100644
+index d39d49944a..e0bfa39c33 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -56,7 +56,7 @@ public abstract class RegionFileCache implements AutoCloseable {
diff --git a/Spigot-Server-Patches/0393-Fix-CraftServer-isPrimaryThread.patch b/Spigot-Server-Patches/0392-Fix-CraftServer-isPrimaryThread.patch
similarity index 94%
rename from Spigot-Server-Patches/0393-Fix-CraftServer-isPrimaryThread.patch
rename to Spigot-Server-Patches/0392-Fix-CraftServer-isPrimaryThread.patch
index a647e04862..69a1179fc2 100644
--- a/Spigot-Server-Patches/0393-Fix-CraftServer-isPrimaryThread.patch
+++ b/Spigot-Server-Patches/0392-Fix-CraftServer-isPrimaryThread.patch
@@ -1,4 +1,4 @@
-From 6895a8604cf3ee8ae64a698e1f5a4d298121c848 Mon Sep 17 00:00:00 2001
+From 58bd3f963e4a6fd77a487467bc320544314acd83 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
diff --git a/Spigot-Server-Patches/0248-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch b/removed/1.14/0248-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
similarity index 96%
rename from Spigot-Server-Patches/0248-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
rename to removed/1.14/0248-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
index 4466a805f8..4f577fcdd5 100644
--- a/Spigot-Server-Patches/0248-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
+++ b/removed/1.14/0248-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
@@ -3,12 +3,18 @@ From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 03:39:51 -0400
 Subject: [PATCH] Avoid Chunk Lookups for Entity/TileEntity Current Chunk
 
+SPECIAL 1.14.1 NOTE: 
+This patch caused a memory leak since the tile entity's chunk was set to null
+before it was removed. Ensure this issue is resolved!
+
 In many places where we simply want the current chunk the entity
 is in, instead of doing a hashmap lookup for it, we now have access
 to the object directly on the Entity/TileEntity object we can directly grab.
 
 Use that local value instead to reduce lookups in many hot places.
 
+
+
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
 index e3de63489..0e9530ea5 100644
 --- a/src/main/java/net/minecraft/server/World.java