From 8ed2992da98d1fca8839190fa75f6a585d3836e7 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach@zachbr.io>
Date: Fri, 14 Dec 2018 20:17:27 -0500
Subject: [PATCH] Make scan-for-legacy-ender-dragon config work again

Portion of diff was dropped in the mappings update commit.

Also remove the option to remove invalid statistics. The server will
automatically do this now as of... 1.13?, our option wasn't even doing anything.
---
 ...-option-to-remove-invalid-statistics.patch | 47 -------------------
 ...8-Properly-fix-item-duplication-bug.patch} |  4 +-
 ...=> 0159-String-based-Action-Bar-API.patch} |  8 ++--
 ...-API-s.patch => 0160-Firework-API-s.patch} | 12 ++---
 ... 0161-PlayerTeleportEndGatewayEvent.patch} |  6 +--
 ... => 0162-ShulkerBox-Dupe-Prevention.patch} |  6 +--
 ...ovide-E-TE-Chunk-count-stat-methods.patch} |  6 +--
 ...h => 0164-Enforce-Sync-Player-Saves.patch} |  6 +--
 ... => 0165-Enforce-Sync-Chunk-Unloads.patch} |  6 +--
 ...low-entities-to-ride-themselves-572.patch} |  6 +--
 ...atch => 0167-Fix-block-break-desync.patch} |  4 +-
 ...I-for-Reason-Source-Triggering-play.patch} |  4 +-
 ...patch => 0169-Cap-Entity-Collisions.patch} |  2 +-
 ...-CraftScheduler-Async-Task-Debugger.patch} |  6 +--
 ...g.patch => 0171-Shame-on-you-Mojang.patch} |  6 +--
 ...ore-aggressive-in-the-chunk-unload-.patch} |  4 +-
 ...> 0173-Do-not-let-armorstands-drown.patch} |  4 +-
 ...e-async-calls-to-restart-the-server.patch} | 10 ++--
 ...roperty-to-disable-book-size-limits.patch} |  6 +--
 ...e-parrots-stay-on-shoulders-despite.patch} |  2 +-
 ...-option-to-prevent-player-names-fro.patch} | 12 ++---
 ...leAppender-for-console-improvements.patch} |  4 +-
 ...rable-option-to-disable-creeper-lin.patch} |  2 +-
 ....patch => 0180-Item-canEntityPickup.patch} | 10 ++--
 ...layerPickupItemEvent-setFlyAtPlayer.patch} |  6 +--
 ...> 0182-PlayerAttemptPickupItemEvent.patch} |  6 +--
 ...tch => 0183-Add-UnknownCommandEvent.patch} |  6 +--
 ...tch => 0184-Basic-PlayerProfile-API.patch} |  8 ++--
 ... 0185-Shoulder-Entities-Release-API.patch} |  4 +-
 ...patch => 0186-Profile-Lookup-Events.patch} |  4 +-
 ...layer-logins-during-server-shutdown.patch} |  6 +--
 ...patch => 0188-Entity-fromMobSpawner.patch} |  8 ++--
 ...0189-Fix-Anvil-Level-sync-to-client.patch} |  4 +-
 ...ages-for-getTileEntity-in-order-to-.patch} |  6 +--
 ...1-Improve-the-Saddle-API-for-Horses.patch} | 10 ++--
 ...plement-ensureServerConversions-API.patch} |  4 +-
 ...> 0193-Implement-getI18NDisplayName.patch} |  4 +-
 ...ving-disabled-before-unloading-all-.patch} |  6 +--
 ...=> 0195-ProfileWhitelistVerifyEvent.patch} |  6 +--
 ...ch => 0196-Fix-this-stupid-bullshit.patch} |  4 +-
 ...wns-should-honor-nametags-and-leash.patch} |  6 +--
 ...mer-when-spawner-event-is-cancelled.patch} |  6 +--
 ...9-Fix-MC-117075-TE-Unload-Lag-Spike.patch} |  6 +--
 ...a-custom-authentication-servers-dow.patch} |  8 ++--
 ...atch => 0201-LivingEntity-setKiller.patch} |  4 +-
 ...ms-to-redirect-System.out-err-to-lo.patch} |  8 ++--
 ...-prefixes-using-Log4J-configuration.patch} | 10 ++--
 ...Include-Log4J2-SLF4J-implementation.patch} |  6 +--
 ...efix-for-various-plugins-bypassing-.patch} |  6 +--
 ...t.patch => 0206-Add-PlayerJumpEvent.patch} |  4 +-
 ...-handle-PacketPlayInKeepAlive-async.patch} |  4 +-
 ...t-protocol-version-and-virtual-host.patch} |  4 +-
 ...t-serverside-behavior-of-keepalives.patch} |  6 +--
 ...ith-fastutil-s-ObjectOpenHashSet-in.patch} |  6 +--
 ...Effects-only-to-players-who-can-see.patch} |  4 +-
 ...maximum-exp-value-when-merging-orbs.patch} |  2 +-
 ... => 0213-Add-PlayerArmorChangeEvent.patch} |  4 +-
 ...om-being-processed-when-the-player-.patch} |  6 +--
 ...-implementations-for-captured-block.patch} |  6 +--
 ...get-a-BlockState-without-a-snapshot.patch} |  6 +--
 ...patch => 0217-AsyncTabCompleteEvent.patch} |  8 ++--
 ...18-Avoid-NPE-in-PathfinderGoalTempt.patch} |  6 +--
 ...=> 0219-PlayerPickupExperienceEvent.patch} |  6 +--
 ...tch => 0220-ExperienceOrbMergeEvent.patch} |  6 +--
 ...-Ability-to-apply-mending-to-XP-API.patch} | 12 ++---
 ...rable-Chunks-Sends-per-Tick-setting.patch} |  2 +-
 ...onfigurable-Max-Chunk-Gens-per-Tick.patch} |  2 +-
 ...max-squid-spawn-height-configurable.patch} |  2 +-
 ...patch => 0225-PreCreatureSpawnEvent.patch} |  8 ++--
 ...-PlayerNaturallySpawnCreaturesEvent.patch} |  6 +--
 ...Add-setPlayerProfile-API-for-Skulls.patch} |  4 +-
 ...> 0228-Fill-Profile-Property-Events.patch} |  6 +--
 ...layerAdvancementCriterionGrantEvent.patch} |  6 +--
 ...ch => 0230-Add-ArmorStand-Item-Meta.patch} |  4 +-
 ...Extend-Player-Interact-cancellation.patch} |  6 +--
 ... 0232-Tameable-getOwnerUniqueId-API.patch} |  8 ++--
 ...-crits-helps-mitigate-hacked-client.patch} |  6 +--
 ...ing-location-from-InventoryEnderChe.patch} |  6 +--
 ...ted-Ice-from-loading-holding-chunks.patch} |  6 +--
 ...e-Explicit-Network-Manager-Flushing.patch} |  6 +--
 ...t-extended-PaperServerListPingEvent.patch} | 18 +++----
 ... 0238-Improved-Async-Task-Scheduler.patch} |  8 ++--
 ...-PlayerProfile-in-AsyncPreLoginEven.patch} |  6 +--
 ...-PortalCreateEvent-for-exit-portals.patch} |  4 +-
 ...=> 0241-Player.setPlayerProfile-API.patch} | 10 ++--
 ...h => 0242-Fix-Dragon-Server-Crashes.patch} |  6 +--
 ...patch => 0243-getPlayerUniqueId-API.patch} |  6 +--
 ...ake-player-data-saving-configurable.patch} |  8 ++--
 ...e-legacy-ping-handler-more-reliable.patch} |  6 +--
 ...erverListPingEvent-for-legacy-pings.patch} |  8 ++--
 ...7-Flag-to-disable-the-channel-limit.patch} |  6 +--
 ...-method-to-open-already-placed-sign.patch} |  6 +--
 ...oad-version-history-at-server-start.patch} |  6 +--
 ...rable-sprint-interruption-on-attack.patch} |  2 +-
 ...allowed-colored-signs-to-be-created.patch} |  4 +-
 ...t.patch => 0252-EndermanEscapeEvent.patch} |  6 +--
 ...h => 0253-Enderman.teleportRandomly.patch} |  8 ++--
 ...254-Block-Enderpearl-Travel-Exploit.patch} |  2 +-
 ...d.spawnParticle-API-and-add-Builder.patch} |  8 ++--
 ...h => 0256-EndermanAttackPlayerEvent.patch} |  6 +--
 ...tch => 0257-WitchConsumePotionEvent.patch} |  6 +--
 ...patch => 0258-WitchThrowPotionEvent.patch} |  6 +--
 ...tem-entities-with-World.spawnEntity.patch} |  6 +--
 ...ages-loading-chunks-for-door-checks.patch} |  2 +-
 ...patch => 0261-WitchReadyPotionEvent.patch} |  6 +--
 ...262-ItemStack-getMaxItemUseDuration.patch} |  8 ++--
 ...ement-EntityTeleportEndGatewayEvent.patch} |  6 +--
 ...d-flag-on-cancel-of-Explosion-Event.patch} |  6 +--
 ...move-entities-on-dimension-teleport.patch} |  8 ++--
 ...ch => 0266-Fix-CraftEntity-hashCode.patch} |  4 +-
 ...e-Alternative-LootPool-Luck-Formula.patch} |  8 ++--
 ...ls-when-failing-to-save-player-data.patch} |  6 +--
 ...-shield-blocking-delay-configurable.patch} |  2 +-
 ...cipes-in-RecipeBook-to-avoid-data-e.patch} |  4 +-
 ...nt-consumeArrow-and-getArrowItem-AP.patch} |  4 +-
 ...patch => 0272-PlayerReadyArrowEvent.patch} |  6 +--
 ...-EntityShootBowEvent-for-Illusioner.patch} |  6 +--
 ...lement-EntityKnockbackByEntityEvent.patch} |  6 +--
 ...patch => 0275-Expand-Explosions-API.patch} |  6 +--
 ...vingEntity-Hand-Raised-Item-Use-API.patch} |  4 +-
 ...-API.patch => 0277-RangedEntity-API.patch} |  6 +--
 ...eHitEvent-to-include-the-BlockFace-.patch} |  4 +-
 ...o-disable-ender-dragon-legacy-check.patch} | 18 +++++--
 ...-Implement-World.getEntity-UUID-API.patch} |  6 +--
 ...0281-InventoryCloseEvent-Reason-API.patch} |  6 +--
 ...ps-for-Entity-TileEntity-Current-Ch.patch} |  8 ++--
 ...0283-Configurable-Bed-Search-Radius.patch} |  2 +-
 ...I.patch => 0284-Vex-getSummoner-API.patch} |  8 ++--
 ...ventory-when-cancelling-PlayerInter.patch} |  4 +-
 ...e-the-Entity-Random-seed-for-squids.patch} |  6 +--
 ...illa-entity-warnings-for-duplicates.patch} |  6 +--
 ...pawn-if-entity-is-in-a-chunk-schedu.patch} |  4 +-
 ...-if-stack-size-above-max-stack-size.patch} |  6 +--
 ...90-Use-asynchronous-Log4j-2-loggers.patch} |  8 ++--
 ...more-information-to-Entity.toString.patch} |  4 +-
 ...es-option-to-debug-dupe-uuid-issues.patch} | 10 ++--
 ...ts.patch => 0293-EnderDragon-Events.patch} | 10 ++--
 ...atch => 0294-PlayerElytraBoostEvent.patch} |  6 +--
 ...=> 0295-PlayerLaunchProjectileEvent.patch} | 16 +++----
 ... 0296-Duplicate-UUID-Resolve-Option.patch} |  2 +-
 ...Speedup-BlockPos-by-fixing-inlining.patch} |  8 ++--
 ...tch => 0298-Don-t-save-Proto-Chunks.patch} |  8 ++--
 ...patch => 0299-Optimize-RegistryID.c.patch} |  6 +--
 ...-armor-stands-from-doing-entity-loo.patch} |  2 +-
 ...-Vanished-players-don-t-have-rights.patch} |  4 +-
 ...anytime-entities-change-to-guarante.patch} |  6 +--
 ...d-some-Debug-to-Chunk-Entity-slices.patch} |  8 ++--
 ... => 0304-Optimize-Region-File-Cache.patch} |  6 +--
 ...atch => 0305-EntityTransformedEvent.patch} |  4 +-
 ...tch => 0306-SkeletonHorse-Additions.patch} | 10 ++--
 ...event-Saving-Bad-entities-to-chunks.patch} |  6 +--
 ...n-t-call-getItemMeta-on-hasItemMeta.patch} |  4 +-
 ...ocess-chunk-removal-in-removeEntity.patch} |  6 +--
 ...ad-Entities-in-entityList-iteration.patch} | 12 ++---
 ...-use-a-versioned-world-folder-for-t.patch} | 10 ++--
 ...12-MC-111480-Start-Entity-ID-s-at-1.patch} |  6 +--
 ...3-Implement-Expanded-ArmorStand-API.patch} |  4 +-
 ...vent.patch => 0314-AnvilDamageEvent.patch} |  6 +--
 ...ld-EntityHuman-Lookup-Optimizations.patch} |  6 +--
 ...ent.patch => 0316-Add-TNTPrimeEvent.patch} |  4 +-
 ...d-make-tab-spam-limits-configurable.patch} | 10 ++--
 ...ortation-adjustment-math-more-accur.patch} | 12 ++---
 ...h => 0319-Add-hand-to-bucket-events.patch} |  4 +-
 ...-Experience-should-save-as-Integers.patch} |  6 +--
 ...h => 0321-Entity-add-to-world-fixes.patch} | 10 ++--
 ...ent-rendering-skulls-from-same-user.patch} | 12 ++---
 ...d-Early-Warning-Feature-to-WatchDog.patch} |  6 +--
 ...0324-Make-EnderDragon-implement-Mob.patch} |  6 +--
 ...ect-and-repair-corrupt-Region-Files.patch} |  6 +--
 ...6-Use-ConcurrentHashMap-in-JsonList.patch} |  6 +--
 ...7-Use-a-Queue-for-Queueing-Commands.patch} |  6 +--
 ...le-Entities-from-a-chunk-without-sn.patch} |  6 +--
 ...llow-disabling-armour-stand-ticking.patch} |  2 +-
 ...timize-BlockPosition-helper-methods.patch} |  6 +--
 ...ts-from-world-player-list-not-serve.patch} | 12 ++---
 ...0332-Cache-World-Entity-Type-counts.patch} | 14 +++---
 ...tore-vanlla-default-mob-spawn-range.patch} |  6 +--
 ...pers.patch => 0334-Optimize-Hoppers.patch} |  2 +-
 ...35-Optimize-CraftBlockData-Creation.patch} | 10 ++--
 ...-124320.patch => 0336-Fix-MC-124320.patch} |  8 ++--
 ...tch => 0337-Slime-Pathfinder-Events.patch} |  4 +-
 ...d-source-block-to-BlockPhysicsEvent.patch} |  6 +--
 ...0-Anti-Xray.patch => 0339-Anti-Xray.patch} |  2 +-
 ...e-speed-for-water-flowing-over-lava.patch} |  2 +-
 ... => 0341-Optimize-RegistryMaterials.patch} |  6 +--
 ...ch => 0342-Add-PhantomPreSpawnEvent.patch} | 10 ++--
 ....patch => 0343-Add-More-Creeper-API.patch} |  4 +-
 ...44-Implement-Force-Loaded-Chunk-API.patch} |  8 ++--
 ...=> 0345-Inventory-removeItemAnySlot.patch} |  6 +--
 ...ptimize-getChunkIfLoaded-type-calls.patch} |  4 +-
 ...47-Don-t-double-add-golems-to-world.patch} |  6 +--
 ...fix-newlines-in-spigot-tab-list-API.patch} |  8 ++--
 ...oadChunk-int-int-false-load-unconve.patch} |  6 +--
 ...ray-tracing-methods-to-LivingEntity.patch} |  4 +-
 ...-attack-cooldown-methods-for-Player.patch} |  4 +-
 ...-load-entity-AABB-to-prevent-wobble.patch} |  6 +--
 ....patch => 0353-Improve-death-events.patch} |  4 +-
 ...w-chests-to-be-placed-with-NBT-data.patch} |  4 +-
 ...I.patch => 0355-Mob-Pathfinding-API.patch} |  4 +-
 ...nt-chunk-loading-from-Fluid-Flowing.patch} |  4 +-
 ...for-CanPlaceOn-and-CanDestroy-NBT-v.patch} |  4 +-
 ...nt-Mob-AI-Rules-from-Loading-Chunks.patch} |  4 +-
 ...ning-from-loading-generating-chunks.patch} |  6 +--
 ...-Biome-Mob-Lookups-for-Mob-Spawning.patch} |  6 +--
 ...Optimize-and-Fix-ExpiringMap-Issues.patch} |  4 +-
 ...t-furnace-cook-speed-multiplier-API.patch} |  6 +--
 ...0363-Support-Overriding-World-Seeds.patch} |  6 +--
 ...h => 0364-Optimize-Server-World-Map.patch} |  6 +--
 ....patch => 0365-PreSpawnerSpawnEvent.patch} |  6 +--
 ...rseException-in-Entity-and-TE-names.patch} |  4 +-
 ... 0367-Avoid-dimension-id-collisions.patch} |  2 +-
 ...=> 0368-Honor-EntityAgeable.ageLock.patch} |  6 +--
 ...-Async-Chunk-Loading-and-Generation.patch} |  6 +--
 ...-Dimension-NBT-field-in-Entity-data.patch} |  6 +--
 ... 0371-Optimize-Light-Recalculations.patch} |  6 +--
 ...-entity-loss-due-to-unloaded-chunks.patch} |  4 +-
 ...-recheck-type-after-setting-a-block.patch} |  6 +--
 ...> 0374-Fix-Sending-Chunks-to-Client.patch} |  6 +--
 ...le-connection-throttle-kick-message.patch} | 10 ++--
 ...Fix-FileIOThread-concurrency-issues.patch} |  4 +-
 ...7-Don-t-update-snapshot-blockstates.patch} |  4 +-
 ...> 0378-Hook-into-CB-plugin-rewrites.patch} |  4 +-
 ...79-Allow-setting-the-vex-s-summoner.patch} |  6 +--
 ...80-Add-LivingEntity-getTargetEntity.patch} |  4 +-
 ...I.patch => 0381-Add-sun-related-API.patch} |  4 +-
 ...wned-for-Villager-Aggression-Config.patch} |  4 +-
 ...-Johnny.patch => 0383-Here-s-Johnny.patch} |  4 +-
 ...Turtle-API.patch => 0384-Turtle-API.patch} |  4 +-
 ...ire-EntityCombustEvent-for-phantoms.patch} |  6 +--
 ...it-lightning-strike-effect-distance.patch} |  8 ++--
 ...-and-setters-for-EntityItem-owner-a.patch} |  6 +--
 ...her-worlds-for-shooter-of-projectil.patch} |  6 +--
 ...Call-player-spectator-target-events.patch} |  6 +--
 ...-Add-Velocity-IP-Forwarding-Support.patch} | 10 ++--
 ...PI.patch => 0391-Add-more-Witch-API.patch} |  4 +-
 ...MC-93764.patch => 0392-Fix-MC-93764.patch} |  4 +-
 ...item-tag-if-interaction-is-canceled.patch} |  4 +-
 ...vent-players-from-moving-into-unloa.patch} |  2 +-
 ...5-Reset-players-airTicks-on-respawn.patch} |  8 ++--
 ...-area-unicode-characters-from-signs.patch} |  4 +-
 ...after-profile-lookups-if-not-needed.patch} |  4 +-
 ...le-thread-count-default-for-bootstr.patch} |  6 +--
 ...Use-EntityTypes-for-living-entities.patch} |  8 ++--
 ...id-item-for-enchantment-checks-on-b.patch} |  4 +-
 ...=> 0401-Optimize-World-Time-Updates.patch} |  6 +--
 ...tore-custom-InventoryHolder-support.patch} |  4 +-
 ...=> 0403-Use-Vanilla-Minecart-Speeds.patch} |  6 +--
 ...0404-Fix-SpongeAbsortEvent-handling.patch} |  6 +--
 ...-allow-digging-into-unloaded-chunks.patch} |  4 +-
 ...=> 0406-Optimize-redstone-algorithm.patch} |  2 +-
 ...ntity-dismount-during-teleportation.patch} |  4 +-
 ...mits.patch => 0408-Book-Size-Limits.patch} |  8 ++--
 ...ult-permission-message-configurable.patch} |  6 +--
 ...I.patch => 0410-Add-more-Zombie-API.patch} |  4 +-
 ...t-which-we-ll-consider-an-attackabl.patch} |  4 +-
 ...revent-rayTrace-from-loading-chunks.patch} |  4 +-
 ...-Large-Packets-disconnecting-client.patch} |  4 +-
 ...world-storage-in-CraftOfflinePlayer.patch} |  2 +-
 ...0415-Add-PlayerConnectionCloseEvent.patch} |  2 +-
 259 files changed, 763 insertions(+), 800 deletions(-)
 delete mode 100644 Spigot-Server-Patches/0158-Add-option-to-remove-invalid-statistics.patch
 rename Spigot-Server-Patches/{0159-Properly-fix-item-duplication-bug.patch => 0158-Properly-fix-item-duplication-bug.patch} (95%)
 rename Spigot-Server-Patches/{0160-String-based-Action-Bar-API.patch => 0159-String-based-Action-Bar-API.patch} (94%)
 rename Spigot-Server-Patches/{0161-Firework-API-s.patch => 0160-Firework-API-s.patch} (96%)
 rename Spigot-Server-Patches/{0162-PlayerTeleportEndGatewayEvent.patch => 0161-PlayerTeleportEndGatewayEvent.patch} (92%)
 rename Spigot-Server-Patches/{0163-ShulkerBox-Dupe-Prevention.patch => 0162-ShulkerBox-Dupe-Prevention.patch} (90%)
 rename Spigot-Server-Patches/{0164-Provide-E-TE-Chunk-count-stat-methods.patch => 0163-Provide-E-TE-Chunk-count-stat-methods.patch} (93%)
 rename Spigot-Server-Patches/{0165-Enforce-Sync-Player-Saves.patch => 0164-Enforce-Sync-Player-Saves.patch} (90%)
 rename Spigot-Server-Patches/{0166-Enforce-Sync-Chunk-Unloads.patch => 0165-Enforce-Sync-Chunk-Unloads.patch} (92%)
 rename Spigot-Server-Patches/{0167-Don-t-allow-entities-to-ride-themselves-572.patch => 0166-Don-t-allow-entities-to-ride-themselves-572.patch} (88%)
 rename Spigot-Server-Patches/{0168-Fix-block-break-desync.patch => 0167-Fix-block-break-desync.patch} (93%)
 rename Spigot-Server-Patches/{0169-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch => 0168-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch} (99%)
 rename Spigot-Server-Patches/{0170-Cap-Entity-Collisions.patch => 0169-Cap-Entity-Collisions.patch} (97%)
 rename Spigot-Server-Patches/{0171-Remove-CraftScheduler-Async-Task-Debugger.patch => 0170-Remove-CraftScheduler-Async-Task-Debugger.patch} (96%)
 rename Spigot-Server-Patches/{0172-Shame-on-you-Mojang.patch => 0171-Shame-on-you-Mojang.patch} (91%)
 rename Spigot-Server-Patches/{0173-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch => 0172-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch} (94%)
 rename Spigot-Server-Patches/{0174-Do-not-let-armorstands-drown.patch => 0173-Do-not-let-armorstands-drown.patch} (96%)
 rename Spigot-Server-Patches/{0175-Properly-handle-async-calls-to-restart-the-server.patch => 0174-Properly-handle-async-calls-to-restart-the-server.patch} (98%)
 rename Spigot-Server-Patches/{0176-Add-system-property-to-disable-book-size-limits.patch => 0175-Add-system-property-to-disable-book-size-limits.patch} (96%)
 rename Spigot-Server-Patches/{0177-Add-option-to-make-parrots-stay-on-shoulders-despite.patch => 0176-Add-option-to-make-parrots-stay-on-shoulders-despite.patch} (97%)
 rename Spigot-Server-Patches/{0178-Add-configuration-option-to-prevent-player-names-fro.patch => 0177-Add-configuration-option-to-prevent-player-names-fro.patch} (81%)
 rename Spigot-Server-Patches/{0179-Use-TerminalConsoleAppender-for-console-improvements.patch => 0178-Use-TerminalConsoleAppender-for-console-improvements.patch} (99%)
 rename Spigot-Server-Patches/{0180-provide-a-configurable-option-to-disable-creeper-lin.patch => 0179-provide-a-configurable-option-to-disable-creeper-lin.patch} (96%)
 rename Spigot-Server-Patches/{0181-Item-canEntityPickup.patch => 0180-Item-canEntityPickup.patch} (92%)
 rename Spigot-Server-Patches/{0182-PlayerPickupItemEvent-setFlyAtPlayer.patch => 0181-PlayerPickupItemEvent-setFlyAtPlayer.patch} (95%)
 rename Spigot-Server-Patches/{0183-PlayerAttemptPickupItemEvent.patch => 0182-PlayerAttemptPickupItemEvent.patch} (93%)
 rename Spigot-Server-Patches/{0184-Add-UnknownCommandEvent.patch => 0183-Add-UnknownCommandEvent.patch} (93%)
 rename Spigot-Server-Patches/{0185-Basic-PlayerProfile-API.patch => 0184-Basic-PlayerProfile-API.patch} (99%)
 rename Spigot-Server-Patches/{0186-Shoulder-Entities-Release-API.patch => 0185-Shoulder-Entities-Release-API.patch} (98%)
 rename Spigot-Server-Patches/{0187-Profile-Lookup-Events.patch => 0186-Profile-Lookup-Events.patch} (98%)
 rename Spigot-Server-Patches/{0188-Block-player-logins-during-server-shutdown.patch => 0187-Block-player-logins-during-server-shutdown.patch} (90%)
 rename Spigot-Server-Patches/{0189-Entity-fromMobSpawner.patch => 0188-Entity-fromMobSpawner.patch} (96%)
 rename Spigot-Server-Patches/{0190-Fix-Anvil-Level-sync-to-client.patch => 0189-Fix-Anvil-Level-sync-to-client.patch} (96%)
 rename Spigot-Server-Patches/{0191-Add-missing-coverages-for-getTileEntity-in-order-to-.patch => 0190-Add-missing-coverages-for-getTileEntity-in-order-to-.patch} (90%)
 rename Spigot-Server-Patches/{0192-Improve-the-Saddle-API-for-Horses.patch => 0191-Improve-the-Saddle-API-for-Horses.patch} (94%)
 rename Spigot-Server-Patches/{0193-Implement-ensureServerConversions-API.patch => 0192-Implement-ensureServerConversions-API.patch} (93%)
 rename Spigot-Server-Patches/{0194-Implement-getI18NDisplayName.patch => 0193-Implement-getI18NDisplayName.patch} (96%)
 rename Spigot-Server-Patches/{0195-GH-806-Respect-saving-disabled-before-unloading-all-.patch => 0194-GH-806-Respect-saving-disabled-before-unloading-all-.patch} (90%)
 rename Spigot-Server-Patches/{0196-ProfileWhitelistVerifyEvent.patch => 0195-ProfileWhitelistVerifyEvent.patch} (96%)
 rename Spigot-Server-Patches/{0197-Fix-this-stupid-bullshit.patch => 0196-Fix-this-stupid-bullshit.patch} (95%)
 rename Spigot-Server-Patches/{0198-Ocelot-despawns-should-honor-nametags-and-leash.patch => 0197-Ocelot-despawns-should-honor-nametags-and-leash.patch} (88%)
 rename Spigot-Server-Patches/{0199-Reset-spawner-timer-when-spawner-event-is-cancelled.patch => 0198-Reset-spawner-timer-when-spawner-event-is-cancelled.patch} (92%)
 rename Spigot-Server-Patches/{0200-Fix-MC-117075-TE-Unload-Lag-Spike.patch => 0199-Fix-MC-117075-TE-Unload-Lag-Spike.patch} (91%)
 rename Spigot-Server-Patches/{0201-Allow-specifying-a-custom-authentication-servers-dow.patch => 0200-Allow-specifying-a-custom-authentication-servers-dow.patch} (93%)
 rename Spigot-Server-Patches/{0202-LivingEntity-setKiller.patch => 0201-LivingEntity-setKiller.patch} (94%)
 rename Spigot-Server-Patches/{0203-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch => 0202-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch} (93%)
 rename Spigot-Server-Patches/{0204-Handle-plugin-prefixes-using-Log4J-configuration.patch => 0203-Handle-plugin-prefixes-using-Log4J-configuration.patch} (95%)
 rename Spigot-Server-Patches/{0205-Include-Log4J2-SLF4J-implementation.patch => 0204-Include-Log4J2-SLF4J-implementation.patch} (86%)
 rename Spigot-Server-Patches/{0206-Disable-logger-prefix-for-various-plugins-bypassing-.patch => 0205-Disable-logger-prefix-for-various-plugins-bypassing-.patch} (95%)
 rename Spigot-Server-Patches/{0207-Add-PlayerJumpEvent.patch => 0206-Add-PlayerJumpEvent.patch} (98%)
 rename Spigot-Server-Patches/{0208-handle-PacketPlayInKeepAlive-async.patch => 0207-handle-PacketPlayInKeepAlive-async.patch} (96%)
 rename Spigot-Server-Patches/{0209-Expose-client-protocol-version-and-virtual-host.patch => 0208-Expose-client-protocol-version-and-virtual-host.patch} (98%)
 rename Spigot-Server-Patches/{0210-revert-serverside-behavior-of-keepalives.patch => 0209-revert-serverside-behavior-of-keepalives.patch} (97%)
 rename Spigot-Server-Patches/{0211-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch => 0210-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch} (92%)
 rename Spigot-Server-Patches/{0212-Send-attack-SoundEffects-only-to-players-who-can-see.patch => 0211-Send-attack-SoundEffects-only-to-players-who-can-see.patch} (98%)
 rename Spigot-Server-Patches/{0213-Option-for-maximum-exp-value-when-merging-orbs.patch => 0212-Option-for-maximum-exp-value-when-merging-orbs.patch} (98%)
 rename Spigot-Server-Patches/{0214-Add-PlayerArmorChangeEvent.patch => 0213-Add-PlayerArmorChangeEvent.patch} (97%)
 rename Spigot-Server-Patches/{0215-Prevent-logins-from-being-processed-when-the-player-.patch => 0214-Prevent-logins-from-being-processed-when-the-player-.patch} (90%)
 rename Spigot-Server-Patches/{0216-use-CB-BlockState-implementations-for-captured-block.patch => 0215-use-CB-BlockState-implementations-for-captured-block.patch} (94%)
 rename Spigot-Server-Patches/{0217-API-to-get-a-BlockState-without-a-snapshot.patch => 0216-API-to-get-a-BlockState-without-a-snapshot.patch} (98%)
 rename Spigot-Server-Patches/{0218-AsyncTabCompleteEvent.patch => 0217-AsyncTabCompleteEvent.patch} (98%)
 rename Spigot-Server-Patches/{0219-Avoid-NPE-in-PathfinderGoalTempt.patch => 0218-Avoid-NPE-in-PathfinderGoalTempt.patch} (88%)
 rename Spigot-Server-Patches/{0220-PlayerPickupExperienceEvent.patch => 0219-PlayerPickupExperienceEvent.patch} (91%)
 rename Spigot-Server-Patches/{0221-ExperienceOrbMergeEvent.patch => 0220-ExperienceOrbMergeEvent.patch} (93%)
 rename Spigot-Server-Patches/{0222-Ability-to-apply-mending-to-XP-API.patch => 0221-Ability-to-apply-mending-to-XP-API.patch} (95%)
 rename Spigot-Server-Patches/{0223-Configurable-Chunks-Sends-per-Tick-setting.patch => 0222-Configurable-Chunks-Sends-per-Tick-setting.patch} (96%)
 rename Spigot-Server-Patches/{0224-Configurable-Max-Chunk-Gens-per-Tick.patch => 0223-Configurable-Max-Chunk-Gens-per-Tick.patch} (98%)
 rename Spigot-Server-Patches/{0225-Make-max-squid-spawn-height-configurable.patch => 0224-Make-max-squid-spawn-height-configurable.patch} (96%)
 rename Spigot-Server-Patches/{0226-PreCreatureSpawnEvent.patch => 0225-PreCreatureSpawnEvent.patch} (97%)
 rename Spigot-Server-Patches/{0227-PlayerNaturallySpawnCreaturesEvent.patch => 0226-PlayerNaturallySpawnCreaturesEvent.patch} (93%)
 rename Spigot-Server-Patches/{0228-Add-setPlayerProfile-API-for-Skulls.patch => 0227-Add-setPlayerProfile-API-for-Skulls.patch} (97%)
 rename Spigot-Server-Patches/{0229-Fill-Profile-Property-Events.patch => 0228-Fill-Profile-Property-Events.patch} (94%)
 rename Spigot-Server-Patches/{0230-PlayerAdvancementCriterionGrantEvent.patch => 0229-PlayerAdvancementCriterionGrantEvent.patch} (90%)
 rename Spigot-Server-Patches/{0231-Add-ArmorStand-Item-Meta.patch => 0230-Add-ArmorStand-Item-Meta.patch} (99%)
 rename Spigot-Server-Patches/{0232-Extend-Player-Interact-cancellation.patch => 0231-Extend-Player-Interact-cancellation.patch} (97%)
 rename Spigot-Server-Patches/{0233-Tameable-getOwnerUniqueId-API.patch => 0232-Tameable-getOwnerUniqueId-API.patch} (91%)
 rename Spigot-Server-Patches/{0234-Toggleable-player-crits-helps-mitigate-hacked-client.patch => 0233-Toggleable-player-crits-helps-mitigate-hacked-client.patch} (94%)
 rename Spigot-Server-Patches/{0235-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch => 0234-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch} (91%)
 rename Spigot-Server-Patches/{0236-Prevent-Frosted-Ice-from-loading-holding-chunks.patch => 0235-Prevent-Frosted-Ice-from-loading-holding-chunks.patch} (94%)
 rename Spigot-Server-Patches/{0237-Disable-Explicit-Network-Manager-Flushing.patch => 0236-Disable-Explicit-Network-Manager-Flushing.patch} (93%)
 rename Spigot-Server-Patches/{0238-Implement-extended-PaperServerListPingEvent.patch => 0237-Implement-extended-PaperServerListPingEvent.patch} (97%)
 rename Spigot-Server-Patches/{0239-Improved-Async-Task-Scheduler.patch => 0238-Improved-Async-Task-Scheduler.patch} (99%)
 rename Spigot-Server-Patches/{0240-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch => 0239-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch} (95%)
 rename Spigot-Server-Patches/{0241-Call-PortalCreateEvent-for-exit-portals.patch => 0240-Call-PortalCreateEvent-for-exit-portals.patch} (98%)
 rename Spigot-Server-Patches/{0242-Player.setPlayerProfile-API.patch => 0241-Player.setPlayerProfile-API.patch} (97%)
 rename Spigot-Server-Patches/{0243-Fix-Dragon-Server-Crashes.patch => 0242-Fix-Dragon-Server-Crashes.patch} (92%)
 rename Spigot-Server-Patches/{0244-getPlayerUniqueId-API.patch => 0243-getPlayerUniqueId-API.patch} (94%)
 rename Spigot-Server-Patches/{0245-Make-player-data-saving-configurable.patch => 0244-Make-player-data-saving-configurable.patch} (92%)
 rename Spigot-Server-Patches/{0246-Make-legacy-ping-handler-more-reliable.patch => 0245-Make-legacy-ping-handler-more-reliable.patch} (98%)
 rename Spigot-Server-Patches/{0247-Call-PaperServerListPingEvent-for-legacy-pings.patch => 0246-Call-PaperServerListPingEvent-for-legacy-pings.patch} (98%)
 rename Spigot-Server-Patches/{0248-Flag-to-disable-the-channel-limit.patch => 0247-Flag-to-disable-the-channel-limit.patch} (94%)
 rename Spigot-Server-Patches/{0249-Add-method-to-open-already-placed-sign.patch => 0248-Add-method-to-open-already-placed-sign.patch} (92%)
 rename Spigot-Server-Patches/{0250-Load-version-history-at-server-start.patch => 0249-Load-version-history-at-server-start.patch} (88%)
 rename Spigot-Server-Patches/{0251-Configurable-sprint-interruption-on-attack.patch => 0250-Configurable-sprint-interruption-on-attack.patch} (96%)
 rename Spigot-Server-Patches/{0252-Fix-exploit-that-allowed-colored-signs-to-be-created.patch => 0251-Fix-exploit-that-allowed-colored-signs-to-be-created.patch} (94%)
 rename Spigot-Server-Patches/{0253-EndermanEscapeEvent.patch => 0252-EndermanEscapeEvent.patch} (97%)
 rename Spigot-Server-Patches/{0254-Enderman.teleportRandomly.patch => 0253-Enderman.teleportRandomly.patch} (91%)
 rename Spigot-Server-Patches/{0255-Block-Enderpearl-Travel-Exploit.patch => 0254-Block-Enderpearl-Travel-Exploit.patch} (97%)
 rename Spigot-Server-Patches/{0256-Expand-World.spawnParticle-API-and-add-Builder.patch => 0255-Expand-World.spawnParticle-API-and-add-Builder.patch} (96%)
 rename Spigot-Server-Patches/{0257-EndermanAttackPlayerEvent.patch => 0256-EndermanAttackPlayerEvent.patch} (92%)
 rename Spigot-Server-Patches/{0258-WitchConsumePotionEvent.patch => 0257-WitchConsumePotionEvent.patch} (92%)
 rename Spigot-Server-Patches/{0259-WitchThrowPotionEvent.patch => 0258-WitchThrowPotionEvent.patch} (93%)
 rename Spigot-Server-Patches/{0260-Allow-spawning-Item-entities-with-World.spawnEntity.patch => 0259-Allow-spawning-Item-entities-with-World.spawnEntity.patch} (92%)
 rename Spigot-Server-Patches/{0261-Configurable-Villages-loading-chunks-for-door-checks.patch => 0260-Configurable-Villages-loading-chunks-for-door-checks.patch} (98%)
 rename Spigot-Server-Patches/{0262-WitchReadyPotionEvent.patch => 0261-WitchReadyPotionEvent.patch} (93%)
 rename Spigot-Server-Patches/{0263-ItemStack-getMaxItemUseDuration.patch => 0262-ItemStack-getMaxItemUseDuration.patch} (91%)
 rename Spigot-Server-Patches/{0264-Implement-EntityTeleportEndGatewayEvent.patch => 0263-Implement-EntityTeleportEndGatewayEvent.patch} (94%)
 rename Spigot-Server-Patches/{0265-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch => 0264-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch} (93%)
 rename Spigot-Server-Patches/{0266-Properly-remove-entities-on-dimension-teleport.patch => 0265-Properly-remove-entities-on-dimension-teleport.patch} (93%)
 rename Spigot-Server-Patches/{0267-Fix-CraftEntity-hashCode.patch => 0266-Fix-CraftEntity-hashCode.patch} (96%)
 rename Spigot-Server-Patches/{0268-Configurable-Alternative-LootPool-Luck-Formula.patch => 0267-Configurable-Alternative-LootPool-Luck-Formula.patch} (96%)
 rename Spigot-Server-Patches/{0269-Print-Error-details-when-failing-to-save-player-data.patch => 0268-Print-Error-details-when-failing-to-save-player-data.patch} (88%)
 rename Spigot-Server-Patches/{0270-Make-shield-blocking-delay-configurable.patch => 0269-Make-shield-blocking-delay-configurable.patch} (97%)
 rename Spigot-Server-Patches/{0271-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch => 0270-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch} (95%)
 rename Spigot-Server-Patches/{0272-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch => 0271-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch} (98%)
 rename Spigot-Server-Patches/{0273-PlayerReadyArrowEvent.patch => 0272-PlayerReadyArrowEvent.patch} (97%)
 rename Spigot-Server-Patches/{0274-Fire-EntityShootBowEvent-for-Illusioner.patch => 0273-Fire-EntityShootBowEvent-for-Illusioner.patch} (92%)
 rename Spigot-Server-Patches/{0275-Implement-EntityKnockbackByEntityEvent.patch => 0274-Implement-EntityKnockbackByEntityEvent.patch} (94%)
 rename Spigot-Server-Patches/{0276-Expand-Explosions-API.patch => 0275-Expand-Explosions-API.patch} (91%)
 rename Spigot-Server-Patches/{0277-LivingEntity-Hand-Raised-Item-Use-API.patch => 0276-LivingEntity-Hand-Raised-Item-Use-API.patch} (96%)
 rename Spigot-Server-Patches/{0278-RangedEntity-API.patch => 0277-RangedEntity-API.patch} (98%)
 rename Spigot-Server-Patches/{0279-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch => 0278-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch} (94%)
 rename Spigot-Server-Patches/{0280-Add-config-to-disable-ender-dragon-legacy-check.patch => 0279-Add-config-to-disable-ender-dragon-legacy-check.patch} (75%)
 rename Spigot-Server-Patches/{0281-Implement-World.getEntity-UUID-API.patch => 0280-Implement-World.getEntity-UUID-API.patch} (88%)
 rename Spigot-Server-Patches/{0282-InventoryCloseEvent-Reason-API.patch => 0281-InventoryCloseEvent-Reason-API.patch} (98%)
 rename Spigot-Server-Patches/{0283-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch => 0282-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch} (96%)
 rename Spigot-Server-Patches/{0284-Configurable-Bed-Search-Radius.patch => 0283-Configurable-Bed-Search-Radius.patch} (98%)
 rename Spigot-Server-Patches/{0285-Vex-getSummoner-API.patch => 0284-Vex-getSummoner-API.patch} (91%)
 rename Spigot-Server-Patches/{0286-Refresh-player-inventory-when-cancelling-PlayerInter.patch => 0285-Refresh-player-inventory-when-cancelling-PlayerInter.patch} (95%)
 rename Spigot-Server-Patches/{0287-Don-t-change-the-Entity-Random-seed-for-squids.patch => 0286-Don-t-change-the-Entity-Random-seed-for-squids.patch} (87%)
 rename Spigot-Server-Patches/{0288-Re-add-vanilla-entity-warnings-for-duplicates.patch => 0287-Re-add-vanilla-entity-warnings-for-duplicates.patch} (92%)
 rename Spigot-Server-Patches/{0289-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch => 0288-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch} (94%)
 rename Spigot-Server-Patches/{0290-Avoid-item-merge-if-stack-size-above-max-stack-size.patch => 0289-Avoid-item-merge-if-stack-size-above-max-stack-size.patch} (89%)
 rename Spigot-Server-Patches/{0291-Use-asynchronous-Log4j-2-loggers.patch => 0290-Use-asynchronous-Log4j-2-loggers.patch} (87%)
 rename Spigot-Server-Patches/{0292-add-more-information-to-Entity.toString.patch => 0291-add-more-information-to-Entity.toString.patch} (95%)
 rename Spigot-Server-Patches/{0293-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch => 0292-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch} (96%)
 rename Spigot-Server-Patches/{0294-EnderDragon-Events.patch => 0293-EnderDragon-Events.patch} (95%)
 rename Spigot-Server-Patches/{0295-PlayerElytraBoostEvent.patch => 0294-PlayerElytraBoostEvent.patch} (94%)
 rename Spigot-Server-Patches/{0296-PlayerLaunchProjectileEvent.patch => 0295-PlayerLaunchProjectileEvent.patch} (98%)
 rename Spigot-Server-Patches/{0297-Duplicate-UUID-Resolve-Option.patch => 0296-Duplicate-UUID-Resolve-Option.patch} (99%)
 rename Spigot-Server-Patches/{0298-Speedup-BlockPos-by-fixing-inlining.patch => 0297-Speedup-BlockPos-by-fixing-inlining.patch} (98%)
 rename Spigot-Server-Patches/{0299-Don-t-save-Proto-Chunks.patch => 0298-Don-t-save-Proto-Chunks.patch} (93%)
 rename Spigot-Server-Patches/{0300-Optimize-RegistryID.c.patch => 0299-Optimize-RegistryID.c.patch} (94%)
 rename Spigot-Server-Patches/{0301-Option-to-prevent-armor-stands-from-doing-entity-loo.patch => 0300-Option-to-prevent-armor-stands-from-doing-entity-loo.patch} (96%)
 rename Spigot-Server-Patches/{0302-Vanished-players-don-t-have-rights.patch => 0301-Vanished-players-don-t-have-rights.patch} (98%)
 rename Spigot-Server-Patches/{0303-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch => 0302-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch} (89%)
 rename Spigot-Server-Patches/{0304-Add-some-Debug-to-Chunk-Entity-slices.patch => 0303-Add-some-Debug-to-Chunk-Entity-slices.patch} (96%)
 rename Spigot-Server-Patches/{0305-Optimize-Region-File-Cache.patch => 0304-Optimize-Region-File-Cache.patch} (96%)
 rename Spigot-Server-Patches/{0306-EntityTransformedEvent.patch => 0305-EntityTransformedEvent.patch} (98%)
 rename Spigot-Server-Patches/{0307-SkeletonHorse-Additions.patch => 0306-SkeletonHorse-Additions.patch} (94%)
 rename Spigot-Server-Patches/{0308-Prevent-Saving-Bad-entities-to-chunks.patch => 0307-Prevent-Saving-Bad-entities-to-chunks.patch} (95%)
 rename Spigot-Server-Patches/{0309-Don-t-call-getItemMeta-on-hasItemMeta.patch => 0308-Don-t-call-getItemMeta-on-hasItemMeta.patch} (98%)
 rename Spigot-Server-Patches/{0310-Always-process-chunk-removal-in-removeEntity.patch => 0309-Always-process-chunk-removal-in-removeEntity.patch} (93%)
 rename Spigot-Server-Patches/{0311-Ignore-Dead-Entities-in-entityList-iteration.patch => 0310-Ignore-Dead-Entities-in-entityList-iteration.patch} (96%)
 rename Spigot-Server-Patches/{0312-Provide-option-to-use-a-versioned-world-folder-for-t.patch => 0311-Provide-option-to-use-a-versioned-world-folder-for-t.patch} (98%)
 rename Spigot-Server-Patches/{0313-MC-111480-Start-Entity-ID-s-at-1.patch => 0312-MC-111480-Start-Entity-ID-s-at-1.patch} (91%)
 rename Spigot-Server-Patches/{0314-Implement-Expanded-ArmorStand-API.patch => 0313-Implement-Expanded-ArmorStand-API.patch} (98%)
 rename Spigot-Server-Patches/{0315-AnvilDamageEvent.patch => 0314-AnvilDamageEvent.patch} (94%)
 rename Spigot-Server-Patches/{0316-World-EntityHuman-Lookup-Optimizations.patch => 0315-World-EntityHuman-Lookup-Optimizations.patch} (96%)
 rename Spigot-Server-Patches/{0317-Add-TNTPrimeEvent.patch => 0316-Add-TNTPrimeEvent.patch} (99%)
 rename Spigot-Server-Patches/{0318-Break-up-and-make-tab-spam-limits-configurable.patch => 0317-Break-up-and-make-tab-spam-limits-configurable.patch} (95%)
 rename Spigot-Server-Patches/{0319-Make-portal-teleportation-adjustment-math-more-accur.patch => 0318-Make-portal-teleportation-adjustment-math-more-accur.patch} (95%)
 rename Spigot-Server-Patches/{0320-Add-hand-to-bucket-events.patch => 0319-Add-hand-to-bucket-events.patch} (99%)
 rename Spigot-Server-Patches/{0321-MC-135506-Experience-should-save-as-Integers.patch => 0320-MC-135506-Experience-should-save-as-Integers.patch} (91%)
 rename Spigot-Server-Patches/{0322-Entity-add-to-world-fixes.patch => 0321-Entity-add-to-world-fixes.patch} (95%)
 rename Spigot-Server-Patches/{0323-Fix-client-rendering-skulls-from-same-user.patch => 0322-Fix-client-rendering-skulls-from-same-user.patch} (95%)
 rename Spigot-Server-Patches/{0324-Add-Early-Warning-Feature-to-WatchDog.patch => 0323-Add-Early-Warning-Feature-to-WatchDog.patch} (98%)
 rename Spigot-Server-Patches/{0325-Make-EnderDragon-implement-Mob.patch => 0324-Make-EnderDragon-implement-Mob.patch} (92%)
 rename Spigot-Server-Patches/{0326-Detect-and-repair-corrupt-Region-Files.patch => 0325-Detect-and-repair-corrupt-Region-Files.patch} (97%)
 rename Spigot-Server-Patches/{0327-Use-ConcurrentHashMap-in-JsonList.patch => 0326-Use-ConcurrentHashMap-in-JsonList.patch} (97%)
 rename Spigot-Server-Patches/{0328-Use-a-Queue-for-Queueing-Commands.patch => 0327-Use-a-Queue-for-Queueing-Commands.patch} (94%)
 rename Spigot-Server-Patches/{0329-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch => 0328-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch} (92%)
 rename Spigot-Server-Patches/{0330-Allow-disabling-armour-stand-ticking.patch => 0329-Allow-disabling-armour-stand-ticking.patch} (99%)
 rename Spigot-Server-Patches/{0331-Optimize-BlockPosition-helper-methods.patch => 0330-Optimize-BlockPosition-helper-methods.patch} (98%)
 rename Spigot-Server-Patches/{0332-Send-nearby-packets-from-world-player-list-not-serve.patch => 0331-Send-nearby-packets-from-world-player-list-not-serve.patch} (97%)
 rename Spigot-Server-Patches/{0333-Cache-World-Entity-Type-counts.patch => 0332-Cache-World-Entity-Type-counts.patch} (96%)
 rename Spigot-Server-Patches/{0334-Restore-vanlla-default-mob-spawn-range.patch => 0333-Restore-vanlla-default-mob-spawn-range.patch} (86%)
 rename Spigot-Server-Patches/{0335-Optimize-Hoppers.patch => 0334-Optimize-Hoppers.patch} (99%)
 rename Spigot-Server-Patches/{0336-Optimize-CraftBlockData-Creation.patch => 0335-Optimize-CraftBlockData-Creation.patch} (94%)
 rename Spigot-Server-Patches/{0337-Fix-MC-124320.patch => 0336-Fix-MC-124320.patch} (95%)
 rename Spigot-Server-Patches/{0338-Slime-Pathfinder-Events.patch => 0337-Slime-Pathfinder-Events.patch} (98%)
 rename Spigot-Server-Patches/{0339-Add-source-block-to-BlockPhysicsEvent.patch => 0338-Add-source-block-to-BlockPhysicsEvent.patch} (92%)
 rename Spigot-Server-Patches/{0340-Anti-Xray.patch => 0339-Anti-Xray.patch} (99%)
 rename Spigot-Server-Patches/{0341-Configurable-speed-for-water-flowing-over-lava.patch => 0340-Configurable-speed-for-water-flowing-over-lava.patch} (98%)
 rename Spigot-Server-Patches/{0342-Optimize-RegistryMaterials.patch => 0341-Optimize-RegistryMaterials.patch} (91%)
 rename Spigot-Server-Patches/{0343-Add-PhantomPreSpawnEvent.patch => 0342-Add-PhantomPreSpawnEvent.patch} (95%)
 rename Spigot-Server-Patches/{0344-Add-More-Creeper-API.patch => 0343-Add-More-Creeper-API.patch} (97%)
 rename Spigot-Server-Patches/{0345-Implement-Force-Loaded-Chunk-API.patch => 0344-Implement-Force-Loaded-Chunk-API.patch} (91%)
 rename Spigot-Server-Patches/{0346-Inventory-removeItemAnySlot.patch => 0345-Inventory-removeItemAnySlot.patch} (95%)
 rename Spigot-Server-Patches/{0347-Optimize-getChunkIfLoaded-type-calls.patch => 0346-Optimize-getChunkIfLoaded-type-calls.patch} (98%)
 rename Spigot-Server-Patches/{0348-Don-t-double-add-golems-to-world.patch => 0347-Don-t-double-add-golems-to-world.patch} (89%)
 rename Spigot-Server-Patches/{0349-fix-newlines-in-spigot-tab-list-API.patch => 0348-fix-newlines-in-spigot-tab-list-API.patch} (94%)
 rename Spigot-Server-Patches/{0350-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch => 0349-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch} (89%)
 rename Spigot-Server-Patches/{0351-Add-ray-tracing-methods-to-LivingEntity.patch => 0350-Add-ray-tracing-methods-to-LivingEntity.patch} (98%)
 rename Spigot-Server-Patches/{0352-Expose-attack-cooldown-methods-for-Player.patch => 0351-Expose-attack-cooldown-methods-for-Player.patch} (96%)
 rename Spigot-Server-Patches/{0353-MC-2025-Save-and-load-entity-AABB-to-prevent-wobble.patch => 0352-MC-2025-Save-and-load-entity-AABB-to-prevent-wobble.patch} (98%)
 rename Spigot-Server-Patches/{0354-Improve-death-events.patch => 0353-Improve-death-events.patch} (99%)
 rename Spigot-Server-Patches/{0355-Allow-chests-to-be-placed-with-NBT-data.patch => 0354-Allow-chests-to-be-placed-with-NBT-data.patch} (96%)
 rename Spigot-Server-Patches/{0356-Mob-Pathfinding-API.patch => 0355-Mob-Pathfinding-API.patch} (99%)
 rename Spigot-Server-Patches/{0357-Prevent-chunk-loading-from-Fluid-Flowing.patch => 0356-Prevent-chunk-loading-from-Fluid-Flowing.patch} (98%)
 rename Spigot-Server-Patches/{0358-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch => 0357-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch} (99%)
 rename Spigot-Server-Patches/{0359-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch => 0358-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch} (98%)
 rename Spigot-Server-Patches/{0360-Prevent-mob-spawning-from-loading-generating-chunks.patch => 0359-Prevent-mob-spawning-from-loading-generating-chunks.patch} (95%)
 rename Spigot-Server-Patches/{0361-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch => 0360-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch} (96%)
 rename Spigot-Server-Patches/{0362-Optimize-and-Fix-ExpiringMap-Issues.patch => 0361-Optimize-and-Fix-ExpiringMap-Issues.patch} (99%)
 rename Spigot-Server-Patches/{0363-Implement-furnace-cook-speed-multiplier-API.patch => 0362-Implement-furnace-cook-speed-multiplier-API.patch} (97%)
 rename Spigot-Server-Patches/{0364-Support-Overriding-World-Seeds.patch => 0363-Support-Overriding-World-Seeds.patch} (97%)
 rename Spigot-Server-Patches/{0365-Optimize-Server-World-Map.patch => 0364-Optimize-Server-World-Map.patch} (98%)
 rename Spigot-Server-Patches/{0366-PreSpawnerSpawnEvent.patch => 0365-PreSpawnerSpawnEvent.patch} (93%)
 rename Spigot-Server-Patches/{0367-Catch-JsonParseException-in-Entity-and-TE-names.patch => 0366-Catch-JsonParseException-in-Entity-and-TE-names.patch} (99%)
 rename Spigot-Server-Patches/{0368-Avoid-dimension-id-collisions.patch => 0367-Avoid-dimension-id-collisions.patch} (94%)
 rename Spigot-Server-Patches/{0369-Honor-EntityAgeable.ageLock.patch => 0368-Honor-EntityAgeable.ageLock.patch} (85%)
 rename Spigot-Server-Patches/{0370-Async-Chunk-Loading-and-Generation.patch => 0369-Async-Chunk-Loading-and-Generation.patch} (99%)
 rename Spigot-Server-Patches/{0371-Ignore-Dimension-NBT-field-in-Entity-data.patch => 0370-Ignore-Dimension-NBT-field-in-Entity-data.patch} (92%)
 rename Spigot-Server-Patches/{0372-Optimize-Light-Recalculations.patch => 0371-Optimize-Light-Recalculations.patch} (96%)
 rename Spigot-Server-Patches/{0373-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch => 0372-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch} (96%)
 rename Spigot-Server-Patches/{0374-Don-t-recheck-type-after-setting-a-block.patch => 0373-Don-t-recheck-type-after-setting-a-block.patch} (92%)
 rename Spigot-Server-Patches/{0375-Fix-Sending-Chunks-to-Client.patch => 0374-Fix-Sending-Chunks-to-Client.patch} (95%)
 rename Spigot-Server-Patches/{0376-Configurable-connection-throttle-kick-message.patch => 0375-Configurable-connection-throttle-kick-message.patch} (92%)
 rename Spigot-Server-Patches/{0377-Fix-FileIOThread-concurrency-issues.patch => 0376-Fix-FileIOThread-concurrency-issues.patch} (95%)
 rename Spigot-Server-Patches/{0378-Don-t-update-snapshot-blockstates.patch => 0377-Don-t-update-snapshot-blockstates.patch} (93%)
 rename Spigot-Server-Patches/{0379-Hook-into-CB-plugin-rewrites.patch => 0378-Hook-into-CB-plugin-rewrites.patch} (99%)
 rename Spigot-Server-Patches/{0380-Allow-setting-the-vex-s-summoner.patch => 0379-Allow-setting-the-vex-s-summoner.patch} (92%)
 rename Spigot-Server-Patches/{0381-Add-LivingEntity-getTargetEntity.patch => 0380-Add-LivingEntity-getTargetEntity.patch} (99%)
 rename Spigot-Server-Patches/{0382-Add-sun-related-API.patch => 0381-Add-sun-related-API.patch} (97%)
 rename Spigot-Server-Patches/{0383-Check-Drowned-for-Villager-Aggression-Config.patch => 0382-Check-Drowned-for-Villager-Aggression-Config.patch} (96%)
 rename Spigot-Server-Patches/{0384-Here-s-Johnny.patch => 0383-Here-s-Johnny.patch} (95%)
 rename Spigot-Server-Patches/{0385-Turtle-API.patch => 0384-Turtle-API.patch} (98%)
 rename Spigot-Server-Patches/{0386-Fire-EntityCombustEvent-for-phantoms.patch => 0385-Fire-EntityCombustEvent-for-phantoms.patch} (89%)
 rename Spigot-Server-Patches/{0387-Limit-lightning-strike-effect-distance.patch => 0386-Limit-lightning-strike-effect-distance.patch} (97%)
 rename Spigot-Server-Patches/{0388-Implement-getters-and-setters-for-EntityItem-owner-a.patch => 0387-Implement-getters-and-setters-for-EntityItem-owner-a.patch} (95%)
 rename Spigot-Server-Patches/{0389-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch => 0388-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch} (94%)
 rename Spigot-Server-Patches/{0390-Call-player-spectator-target-events.patch => 0389-Call-player-spectator-target-events.patch} (96%)
 rename Spigot-Server-Patches/{0391-Add-Velocity-IP-Forwarding-Support.patch => 0390-Add-Velocity-IP-Forwarding-Support.patch} (98%)
 rename Spigot-Server-Patches/{0392-Add-more-Witch-API.patch => 0391-Add-more-Witch-API.patch} (99%)
 rename Spigot-Server-Patches/{0393-Fix-MC-93764.patch => 0392-Fix-MC-93764.patch} (90%)
 rename Spigot-Server-Patches/{0394-Don-t-modify-item-tag-if-interaction-is-canceled.patch => 0393-Don-t-modify-item-tag-if-interaction-is-canceled.patch} (97%)
 rename Spigot-Server-Patches/{0395-Add-option-to-prevent-players-from-moving-into-unloa.patch => 0394-Add-option-to-prevent-players-from-moving-into-unloa.patch} (98%)
 rename Spigot-Server-Patches/{0396-Reset-players-airTicks-on-respawn.patch => 0395-Reset-players-airTicks-on-respawn.patch} (89%)
 rename Spigot-Server-Patches/{0397-Strip-private-area-unicode-characters-from-signs.patch => 0396-Strip-private-area-unicode-characters-from-signs.patch} (98%)
 rename Spigot-Server-Patches/{0398-Don-t-sleep-after-profile-lookups-if-not-needed.patch => 0397-Don-t-sleep-after-profile-lookups-if-not-needed.patch} (95%)
 rename Spigot-Server-Patches/{0399-Use-more-reasonable-thread-count-default-for-bootstr.patch => 0398-Use-more-reasonable-thread-count-default-for-bootstr.patch} (91%)
 rename Spigot-Server-Patches/{0400-Use-EntityTypes-for-living-entities.patch => 0399-Use-EntityTypes-for-living-entities.patch} (99%)
 rename Spigot-Server-Patches/{0401-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch => 0400-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch} (96%)
 rename Spigot-Server-Patches/{0402-Optimize-World-Time-Updates.patch => 0401-Optimize-World-Time-Updates.patch} (96%)
 rename Spigot-Server-Patches/{0403-Restore-custom-InventoryHolder-support.patch => 0402-Restore-custom-InventoryHolder-support.patch} (96%)
 rename Spigot-Server-Patches/{0404-Use-Vanilla-Minecart-Speeds.patch => 0403-Use-Vanilla-Minecart-Speeds.patch} (91%)
 rename Spigot-Server-Patches/{0405-Fix-SpongeAbsortEvent-handling.patch => 0404-Fix-SpongeAbsortEvent-handling.patch} (94%)
 rename Spigot-Server-Patches/{0406-Don-t-allow-digging-into-unloaded-chunks.patch => 0405-Don-t-allow-digging-into-unloaded-chunks.patch} (94%)
 rename Spigot-Server-Patches/{0407-Optimize-redstone-algorithm.patch => 0406-Optimize-redstone-algorithm.patch} (99%)
 rename Spigot-Server-Patches/{0408-force-entity-dismount-during-teleportation.patch => 0407-force-entity-dismount-during-teleportation.patch} (98%)
 rename Spigot-Server-Patches/{0409-Book-Size-Limits.patch => 0408-Book-Size-Limits.patch} (95%)
 rename Spigot-Server-Patches/{0410-Make-the-default-permission-message-configurable.patch => 0409-Make-the-default-permission-message-configurable.patch} (93%)
 rename Spigot-Server-Patches/{0411-Add-more-Zombie-API.patch => 0410-Add-more-Zombie-API.patch} (98%)
 rename Spigot-Server-Patches/{0412-limit-the-range-at-which-we-ll-consider-an-attackabl.patch => 0411-limit-the-range-at-which-we-ll-consider-an-attackabl.patch} (96%)
 rename Spigot-Server-Patches/{0413-Prevent-rayTrace-from-loading-chunks.patch => 0412-Prevent-rayTrace-from-loading-chunks.patch} (96%)
 rename Spigot-Server-Patches/{0414-Handle-Large-Packets-disconnecting-client.patch => 0413-Handle-Large-Packets-disconnecting-client.patch} (98%)
 rename Spigot-Server-Patches/{0415-Lazy-init-world-storage-in-CraftOfflinePlayer.patch => 0414-Lazy-init-world-storage-in-CraftOfflinePlayer.patch} (97%)
 rename Spigot-Server-Patches/{0416-Add-PlayerConnectionCloseEvent.patch => 0415-Add-PlayerConnectionCloseEvent.patch} (98%)

diff --git a/Spigot-Server-Patches/0158-Add-option-to-remove-invalid-statistics.patch b/Spigot-Server-Patches/0158-Add-option-to-remove-invalid-statistics.patch
deleted file mode 100644
index c1b8c8764..000000000
--- a/Spigot-Server-Patches/0158-Add-option-to-remove-invalid-statistics.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 1f59c8b7e5a197c0e92316d0d94a9abccea522bf Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Tue, 20 Dec 2016 23:09:21 -0600
-Subject: [PATCH] Add option to remove invalid statistics
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index ae3d0f8f7..6b92ea437 100644
---- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -280,4 +280,13 @@ public class PaperConfig {
-             maxPlayerAutoSavePerTick = (playerAutoSaveRate == -1 || playerAutoSaveRate > 100) ? 10 : 20;
-         }
-     }
-+
-+    public static boolean removeInvalidStatistics = false;
-+    private static void removeInvalidStatistics() {
-+        if (version < 12) {
-+            boolean oldValue = getBoolean("remove-invalid-statistics", false);
-+            set("settings.remove-invalid-statistics", oldValue);
-+        }
-+        removeInvalidStatistics = getBoolean("settings.remove-invalid-statistics", false);
-+    }
- }
-diff --git a/src/main/java/net/minecraft/server/ServerStatisticManager.java b/src/main/java/net/minecraft/server/ServerStatisticManager.java
-index 4ddc33ca5..3ecd69786 100644
---- a/src/main/java/net/minecraft/server/ServerStatisticManager.java
-+++ b/src/main/java/net/minecraft/server/ServerStatisticManager.java
-@@ -83,6 +83,7 @@ public class ServerStatisticManager extends StatisticManager {
-         try {
-             JsonReader jsonreader = new JsonReader(new StringReader(s));
-             Throwable throwable = null;
-+            java.util.List<String> invalidStats = com.google.common.collect.Lists.newArrayList(); // Paper
- 
-             try {
-                 jsonreader.setLenient(false);
-@@ -120,6 +121,7 @@ public class ServerStatisticManager extends StatisticManager {
- 
-                                             if (statistic == null) {
-                                                 ServerStatisticManager.b.warn("Invalid statistic in {}: Don't know what {} is", this.d, s2);
-+                                                if (com.destroystokyo.paper.PaperConfig.removeInvalidStatistics) invalidStats.add(s2); // Paper
-                                             } else {
-                                                 this.a.put(statistic, nbttagcompound2.getInt(s2));
-                                             }
--- 
-2.19.2
-
diff --git a/Spigot-Server-Patches/0159-Properly-fix-item-duplication-bug.patch b/Spigot-Server-Patches/0158-Properly-fix-item-duplication-bug.patch
similarity index 95%
rename from Spigot-Server-Patches/0159-Properly-fix-item-duplication-bug.patch
rename to Spigot-Server-Patches/0158-Properly-fix-item-duplication-bug.patch
index 470b2ea17..0d7bb8f6a 100644
--- a/Spigot-Server-Patches/0159-Properly-fix-item-duplication-bug.patch
+++ b/Spigot-Server-Patches/0158-Properly-fix-item-duplication-bug.patch
@@ -1,4 +1,4 @@
-From 2e2a5e39152f5951b37a6e851906618b81937a2d Mon Sep 17 00:00:00 2001
+From c6826e0393670c1f2020fa57a8efa20ffc10a690 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Tue, 27 Dec 2016 01:57:57 +0000
 Subject: [PATCH] Properly fix item duplication bug
@@ -32,5 +32,5 @@ index 6530b6be8..553f76b81 100644
      // CraftBukkit end
  }
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0160-String-based-Action-Bar-API.patch b/Spigot-Server-Patches/0159-String-based-Action-Bar-API.patch
similarity index 94%
rename from Spigot-Server-Patches/0160-String-based-Action-Bar-API.patch
rename to Spigot-Server-Patches/0159-String-based-Action-Bar-API.patch
index d4542a863..9aef10189 100644
--- a/Spigot-Server-Patches/0160-String-based-Action-Bar-API.patch
+++ b/Spigot-Server-Patches/0159-String-based-Action-Bar-API.patch
@@ -1,11 +1,11 @@
-From 4327088027d158125707cbc83a6e8528359caf57 Mon Sep 17 00:00:00 2001
+From 0d984d092d2501eb061c821b72120350a3e77d7c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 27 Dec 2016 15:02:42 -0500
 Subject: [PATCH] String based Action Bar API
 
 
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index faec947224..dce1417aff 100644
+index c97e116aa..e1af5c488 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -2,6 +2,7 @@ package net.minecraft.server;
@@ -42,7 +42,7 @@ index faec947224..dce1417aff 100644
      public static boolean isMainThread() {
          return MinecraftServer.getServer().isMainThread();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7c1444dff2..1ddbb4329d 100644
+index 1f21e54ab..05070285b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -209,6 +209,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -65,5 +65,5 @@ index 7c1444dff2..1ddbb4329d 100644
      public void setPlayerListHeaderFooter(BaseComponent[] header, BaseComponent[] footer) {
           if (header != null) {
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0161-Firework-API-s.patch b/Spigot-Server-Patches/0160-Firework-API-s.patch
similarity index 96%
rename from Spigot-Server-Patches/0161-Firework-API-s.patch
rename to Spigot-Server-Patches/0160-Firework-API-s.patch
index 8603f5415..efdf078c3 100644
--- a/Spigot-Server-Patches/0161-Firework-API-s.patch
+++ b/Spigot-Server-Patches/0160-Firework-API-s.patch
@@ -1,11 +1,11 @@
-From 38fd6ea28a3b7560f0ec309f7bfa7ea6571c8655 Mon Sep 17 00:00:00 2001
+From 97fdbff7671b0ebe0afce23f07c242959fb53481 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 28 Dec 2016 01:18:33 -0500
 Subject: [PATCH] Firework API's
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityFireworks.java b/src/main/java/net/minecraft/server/EntityFireworks.java
-index 6e2592e96d..7ff57d9cda 100644
+index 1fa527fe4..3d9dd50d7 100644
 --- a/src/main/java/net/minecraft/server/EntityFireworks.java
 +++ b/src/main/java/net/minecraft/server/EntityFireworks.java
 @@ -2,6 +2,8 @@ package net.minecraft.server;
@@ -54,7 +54,7 @@ index 6e2592e96d..7ff57d9cda 100644
  
      public boolean bk() {
 diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java
-index 936faccbf8..d971bbc76c 100644
+index 936faccbf..d971bbc76 100644
 --- a/src/main/java/net/minecraft/server/ItemFireworks.java
 +++ b/src/main/java/net/minecraft/server/ItemFireworks.java
 @@ -14,6 +14,7 @@ public class ItemFireworks extends Item {
@@ -74,7 +74,7 @@ index 936faccbf8..d971bbc76c 100644
                  if (!entityhuman.abilities.canInstantlyBuild) {
                      itemstack.subtract(1);
 diff --git a/src/main/java/net/minecraft/server/NBTTagCompound.java b/src/main/java/net/minecraft/server/NBTTagCompound.java
-index 2a66a30264..6046e3e7b9 100644
+index db4e4b859..49280bd60 100644
 --- a/src/main/java/net/minecraft/server/NBTTagCompound.java
 +++ b/src/main/java/net/minecraft/server/NBTTagCompound.java
 @@ -101,7 +101,7 @@ public class NBTTagCompound implements NBTBase {
@@ -87,7 +87,7 @@ index 2a66a30264..6046e3e7b9 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
-index 7b3b206823..b39e33f4f0 100644
+index 7b3b20682..b39e33f4f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
 @@ -1,6 +1,7 @@
@@ -130,5 +130,5 @@ index 7b3b206823..b39e33f4f0 100644
 +    // Paper end
  }
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0162-PlayerTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0161-PlayerTeleportEndGatewayEvent.patch
similarity index 92%
rename from Spigot-Server-Patches/0162-PlayerTeleportEndGatewayEvent.patch
rename to Spigot-Server-Patches/0161-PlayerTeleportEndGatewayEvent.patch
index 4288a133b..d1ef2ac37 100644
--- a/Spigot-Server-Patches/0162-PlayerTeleportEndGatewayEvent.patch
+++ b/Spigot-Server-Patches/0161-PlayerTeleportEndGatewayEvent.patch
@@ -1,4 +1,4 @@
-From f8d41615a68e7ccdf94eff4ab5fe3d84ebb58149 Mon Sep 17 00:00:00 2001
+From 44bfbea03ead23fa4f965221541ea75158baca92 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 31 Dec 2016 21:44:50 -0500
 Subject: [PATCH] PlayerTeleportEndGatewayEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] PlayerTeleportEndGatewayEvent
 Allows you to access the Gateway being used in a teleport event
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityEndGateway.java b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
-index 2a17115ac6..b36dcb4d7d 100644
+index 1d934170f..af71c7c48 100644
 --- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 +++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 @@ -126,7 +126,7 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick
@@ -19,5 +19,5 @@ index 2a17115ac6..b36dcb4d7d 100644
                      if (teleEvent.isCancelled()) {
                          return;
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0163-ShulkerBox-Dupe-Prevention.patch b/Spigot-Server-Patches/0162-ShulkerBox-Dupe-Prevention.patch
similarity index 90%
rename from Spigot-Server-Patches/0163-ShulkerBox-Dupe-Prevention.patch
rename to Spigot-Server-Patches/0162-ShulkerBox-Dupe-Prevention.patch
index d74bada12..8f2846684 100644
--- a/Spigot-Server-Patches/0163-ShulkerBox-Dupe-Prevention.patch
+++ b/Spigot-Server-Patches/0162-ShulkerBox-Dupe-Prevention.patch
@@ -1,4 +1,4 @@
-From e618f0e07ba700822b5535b70b756e9b1c37664a Mon Sep 17 00:00:00 2001
+From e80a8c46c6462f6ab527d9ab29be39f9b904c84e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 2 Jan 2017 16:32:56 -0500
 Subject: [PATCH] ShulkerBox Dupe Prevention
@@ -7,7 +7,7 @@ This ensures that Shulker Boxes can never drop their contents twice, and
 that the inventory is cleared incase it some how also got saved to the world.
 
 diff --git a/src/main/java/net/minecraft/server/BlockShulkerBox.java b/src/main/java/net/minecraft/server/BlockShulkerBox.java
-index 82b4d82c0e..d00bd9d610 100644
+index de8fc8bba..978c9954d 100644
 --- a/src/main/java/net/minecraft/server/BlockShulkerBox.java
 +++ b/src/main/java/net/minecraft/server/BlockShulkerBox.java
 @@ -100,6 +100,7 @@ public class BlockShulkerBox extends BlockTileEntity {
@@ -19,5 +19,5 @@ index 82b4d82c0e..d00bd9d610 100644
              }
              world.updateAdjacentComparators(blockposition, iblockdata.getBlock());
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0164-Provide-E-TE-Chunk-count-stat-methods.patch b/Spigot-Server-Patches/0163-Provide-E-TE-Chunk-count-stat-methods.patch
similarity index 93%
rename from Spigot-Server-Patches/0164-Provide-E-TE-Chunk-count-stat-methods.patch
rename to Spigot-Server-Patches/0163-Provide-E-TE-Chunk-count-stat-methods.patch
index 9fd42dd2a..8a16c7867 100644
--- a/Spigot-Server-Patches/0164-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/Spigot-Server-Patches/0163-Provide-E-TE-Chunk-count-stat-methods.patch
@@ -1,4 +1,4 @@
-From 3b2f3e7b47b162860acc8996994b710c83082a64 Mon Sep 17 00:00:00 2001
+From 5a5b6bd59f789ea63dab28946a3bb4f88293a24f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 Jan 2017 15:24:46 -0500
 Subject: [PATCH] Provide E/TE/Chunk count stat methods
@@ -7,7 +7,7 @@ Provides counts without the ineffeciency of using .getEntities().size()
 which creates copy of the collections.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 0b3de7a76..e0d91ff69 100644
+index f0e974dff..bcfe4c1da 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -87,6 +87,29 @@ public class CraftWorld implements World {
@@ -41,5 +41,5 @@ index 0b3de7a76..e0d91ff69 100644
  
      public CraftWorld(WorldServer world, ChunkGenerator gen, Environment env) {
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0165-Enforce-Sync-Player-Saves.patch b/Spigot-Server-Patches/0164-Enforce-Sync-Player-Saves.patch
similarity index 90%
rename from Spigot-Server-Patches/0165-Enforce-Sync-Player-Saves.patch
rename to Spigot-Server-Patches/0164-Enforce-Sync-Player-Saves.patch
index 80fbd508b..ae16a2a17 100644
--- a/Spigot-Server-Patches/0165-Enforce-Sync-Player-Saves.patch
+++ b/Spigot-Server-Patches/0164-Enforce-Sync-Player-Saves.patch
@@ -1,4 +1,4 @@
-From 2a263f5083a6f68a1411638b82d48cddf7c608e4 Mon Sep 17 00:00:00 2001
+From c46ecb0b1a3747bc0c0b3c67b37e2a8d739aba66 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 Jan 2017 15:41:58 -0500
 Subject: [PATCH] Enforce Sync Player Saves
@@ -7,7 +7,7 @@ Saving players async is extremely dangerous. This will force it to main
 the same way we handle async chunk loads.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 7d778ff3e0..06ce2af1e6 100644
+index 1259ec9d6..b10ac733f 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1215,6 +1215,7 @@ public abstract class PlayerList {
@@ -27,5 +27,5 @@ index 7d778ff3e0..06ce2af1e6 100644
      // Paper end
  
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0166-Enforce-Sync-Chunk-Unloads.patch b/Spigot-Server-Patches/0165-Enforce-Sync-Chunk-Unloads.patch
similarity index 92%
rename from Spigot-Server-Patches/0166-Enforce-Sync-Chunk-Unloads.patch
rename to Spigot-Server-Patches/0165-Enforce-Sync-Chunk-Unloads.patch
index 2b4a767de..8dad36aec 100644
--- a/Spigot-Server-Patches/0166-Enforce-Sync-Chunk-Unloads.patch
+++ b/Spigot-Server-Patches/0165-Enforce-Sync-Chunk-Unloads.patch
@@ -1,4 +1,4 @@
-From 759515324317d0bb197271d3904fff448cbd9aa7 Mon Sep 17 00:00:00 2001
+From c199e596d1cda4b002a08669e4352b0ecba893eb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 Jan 2017 16:06:44 -0500
 Subject: [PATCH] Enforce Sync Chunk Unloads
@@ -7,7 +7,7 @@ Unloading Chunks async is extremely dangerous. This will force it to main
 the same way we handle async chunk loads.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index e0d91ff69..dbc8dc4b9 100644
+index bcfe4c1da..3a30349f4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -235,6 +235,7 @@ public class CraftWorld implements World {
@@ -27,5 +27,5 @@ index e0d91ff69..dbc8dc4b9 100644
  
      public boolean regenerateChunk(int x, int z) {
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0167-Don-t-allow-entities-to-ride-themselves-572.patch b/Spigot-Server-Patches/0166-Don-t-allow-entities-to-ride-themselves-572.patch
similarity index 88%
rename from Spigot-Server-Patches/0167-Don-t-allow-entities-to-ride-themselves-572.patch
rename to Spigot-Server-Patches/0166-Don-t-allow-entities-to-ride-themselves-572.patch
index d114e2851..28a9fcea0 100644
--- a/Spigot-Server-Patches/0167-Don-t-allow-entities-to-ride-themselves-572.patch
+++ b/Spigot-Server-Patches/0166-Don-t-allow-entities-to-ride-themselves-572.patch
@@ -1,11 +1,11 @@
-From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
+From 058e8cad776e0ad46d4c4d966a5beb412db85f34 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Sun, 8 Jan 2017 04:31:36 +0000
 Subject: [PATCH] Don't allow entities to ride themselves - #572
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 3c07995a1..04cd6350c 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2077,6 +2077,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -17,5 +17,5 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
              throw new IllegalStateException("Use x.startRiding(y), not y.addPassenger(x)");
          } else {
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0168-Fix-block-break-desync.patch b/Spigot-Server-Patches/0167-Fix-block-break-desync.patch
similarity index 93%
rename from Spigot-Server-Patches/0168-Fix-block-break-desync.patch
rename to Spigot-Server-Patches/0167-Fix-block-break-desync.patch
index 84fafe7b5..7ab0d227d 100644
--- a/Spigot-Server-Patches/0168-Fix-block-break-desync.patch
+++ b/Spigot-Server-Patches/0167-Fix-block-break-desync.patch
@@ -1,4 +1,4 @@
-From 1a44a092ae83a6bd26aa99853dc7e7076329992d Mon Sep 17 00:00:00 2001
+From 61acbcb04d8ab4e38ff284f67680f73979d5b137 Mon Sep 17 00:00:00 2001
 From: Michael Himing <mhiming@gmail.com>
 Date: Sun, 8 Jan 2017 18:50:35 +1100
 Subject: [PATCH] Fix block break desync
@@ -18,5 +18,5 @@ index 553f76b81..03b986bfa 100644
              } else if (blockposition.getY() >= this.minecraftServer.getMaxBuildHeight()) {
                  return;
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0169-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/Spigot-Server-Patches/0168-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
similarity index 99%
rename from Spigot-Server-Patches/0169-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
rename to Spigot-Server-Patches/0168-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index 9dd6b9f32..792dbdd15 100644
--- a/Spigot-Server-Patches/0169-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/Spigot-Server-Patches/0168-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@@ -1,4 +1,4 @@
-From 0bd7c165024bdd1dca19cb06ee1d731bedcd34c2 Mon Sep 17 00:00:00 2001
+From ed3e84df8aeeedde312bc586cd7216a2a9d85c0e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 16:31:46 -0500
 Subject: [PATCH] ExperienceOrbs API for Reason/Source/Triggering player
@@ -257,5 +257,5 @@ index 3a09cab3d..3302af0e4 100644
      public EntityExperienceOrb getHandle() {
          return (EntityExperienceOrb) entity;
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0170-Cap-Entity-Collisions.patch b/Spigot-Server-Patches/0169-Cap-Entity-Collisions.patch
similarity index 97%
rename from Spigot-Server-Patches/0170-Cap-Entity-Collisions.patch
rename to Spigot-Server-Patches/0169-Cap-Entity-Collisions.patch
index 3089e1bc8..3ef0a37d5 100644
--- a/Spigot-Server-Patches/0170-Cap-Entity-Collisions.patch
+++ b/Spigot-Server-Patches/0169-Cap-Entity-Collisions.patch
@@ -1,4 +1,4 @@
-From ccb735e983f8aeaee26011afd4004292fcb6c902 Mon Sep 17 00:00:00 2001
+From 7892fe99c3195ea12ed4d882c053f2fa4bbba3c1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 22 Jan 2017 18:07:56 -0500
 Subject: [PATCH] Cap Entity Collisions
diff --git a/Spigot-Server-Patches/0171-Remove-CraftScheduler-Async-Task-Debugger.patch b/Spigot-Server-Patches/0170-Remove-CraftScheduler-Async-Task-Debugger.patch
similarity index 96%
rename from Spigot-Server-Patches/0171-Remove-CraftScheduler-Async-Task-Debugger.patch
rename to Spigot-Server-Patches/0170-Remove-CraftScheduler-Async-Task-Debugger.patch
index 213ef6f96..79ca337fe 100644
--- a/Spigot-Server-Patches/0171-Remove-CraftScheduler-Async-Task-Debugger.patch
+++ b/Spigot-Server-Patches/0170-Remove-CraftScheduler-Async-Task-Debugger.patch
@@ -1,4 +1,4 @@
-From f5086788419d64e74ca4647a8e34d439837a6f65 Mon Sep 17 00:00:00 2001
+From 9656eb24104944d9832febd4350401ee4178bfc6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 5 Feb 2017 00:04:04 -0500
 Subject: [PATCH] Remove CraftScheduler Async Task Debugger
@@ -9,7 +9,7 @@ One report of a suspected memory leak with the system.
 This adds additional overhead to asynchronous task dispatching
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 3f43d9eeab..5f228373e3 100644
+index e76882b8e..8963168ed 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -85,8 +85,8 @@ public class CraftScheduler implements BukkitScheduler {
@@ -58,5 +58,5 @@ index 3f43d9eeab..5f228373e3 100644
  
      @Deprecated
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0172-Shame-on-you-Mojang.patch b/Spigot-Server-Patches/0171-Shame-on-you-Mojang.patch
similarity index 91%
rename from Spigot-Server-Patches/0172-Shame-on-you-Mojang.patch
rename to Spigot-Server-Patches/0171-Shame-on-you-Mojang.patch
index adea18a36..393a67155 100644
--- a/Spigot-Server-Patches/0172-Shame-on-you-Mojang.patch
+++ b/Spigot-Server-Patches/0171-Shame-on-you-Mojang.patch
@@ -1,4 +1,4 @@
-From 8d6e913bba8c42ec058c9bee03f22a2f43b4418f Mon Sep 17 00:00:00 2001
+From f0c1975cdbe87b4d2bba6c6cb2fc081b0d026433 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 5 Feb 2017 19:17:28 -0500
 Subject: [PATCH] Shame on you Mojang
@@ -12,7 +12,7 @@ This then triggers async chunk loads!
 What in the hell were you thinking?
 
 diff --git a/src/main/java/net/minecraft/server/BlockBeacon.java b/src/main/java/net/minecraft/server/BlockBeacon.java
-index 7148ea3692..6d4e82b404 100644
+index 7148ea369..6d4e82b40 100644
 --- a/src/main/java/net/minecraft/server/BlockBeacon.java
 +++ b/src/main/java/net/minecraft/server/BlockBeacon.java
 @@ -46,7 +46,7 @@ public class BlockBeacon extends BlockTileEntity {
@@ -34,5 +34,5 @@ index 7148ea3692..6d4e82b404 100644
      }
  }
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0173-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch b/Spigot-Server-Patches/0172-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
similarity index 94%
rename from Spigot-Server-Patches/0173-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
rename to Spigot-Server-Patches/0172-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
index 27bae689f..71e96d178 100644
--- a/Spigot-Server-Patches/0173-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
+++ b/Spigot-Server-Patches/0172-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
@@ -1,4 +1,4 @@
-From 63b46cf991a70de400e6f4f162c9f7860200973a Mon Sep 17 00:00:00 2001
+From 7c287d67fafef3b966a88602b803b14f44ce4188 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 7 Feb 2017 16:55:35 -0600
 Subject: [PATCH] Make targetSize more aggressive in the chunk unload queue
@@ -18,5 +18,5 @@ index 570ddc1a8..3854464e8 100644
  
                  LongIterator longiterator = this.unloadQueue.iterator();
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0174-Do-not-let-armorstands-drown.patch b/Spigot-Server-Patches/0173-Do-not-let-armorstands-drown.patch
similarity index 96%
rename from Spigot-Server-Patches/0174-Do-not-let-armorstands-drown.patch
rename to Spigot-Server-Patches/0173-Do-not-let-armorstands-drown.patch
index 2345ee077..57565458d 100644
--- a/Spigot-Server-Patches/0174-Do-not-let-armorstands-drown.patch
+++ b/Spigot-Server-Patches/0173-Do-not-let-armorstands-drown.patch
@@ -1,4 +1,4 @@
-From df943e565391509876e8ad06bbe47a9b0a2560f7 Mon Sep 17 00:00:00 2001
+From a1e7d68d0ae7f38e6b94e715c5a87a8af234c71d Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 18 Feb 2017 19:29:58 -0600
 Subject: [PATCH] Do not let armorstands drown
@@ -41,5 +41,5 @@ index be0a3f38e..a6457e870 100644
                      if (this.getAirTicks() == -20) {
                          this.setAirTicks(0);
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0175-Properly-handle-async-calls-to-restart-the-server.patch b/Spigot-Server-Patches/0174-Properly-handle-async-calls-to-restart-the-server.patch
similarity index 98%
rename from Spigot-Server-Patches/0175-Properly-handle-async-calls-to-restart-the-server.patch
rename to Spigot-Server-Patches/0174-Properly-handle-async-calls-to-restart-the-server.patch
index 3b55a5907..88cbe7bec 100644
--- a/Spigot-Server-Patches/0175-Properly-handle-async-calls-to-restart-the-server.patch
+++ b/Spigot-Server-Patches/0174-Properly-handle-async-calls-to-restart-the-server.patch
@@ -1,4 +1,4 @@
-From 9f61283f8da8c7033bc081f086dbaca6bb987824 Mon Sep 17 00:00:00 2001
+From 43480f765c8ce2abba530e068f7d17448fe4b92a Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 12 May 2017 23:34:11 -0500
 Subject: [PATCH] Properly handle async calls to restart the server
@@ -30,7 +30,7 @@ will have plugins and worlds saving to the disk has a high potential to result
 in corruption/dataloss.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a547ee5ca1..8d345a0502 100644
+index acdfb0e1e..a1a574023 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -90,6 +90,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -68,7 +68,7 @@ index a547ee5ca1..8d345a0502 100644
      private boolean aT() {
          return System.nanoTime() - lastTick + catchupTime < TICK_TIME; // Paper - improved "are we lagging" check to match our own
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 06ce2af1e6..e61a638752 100644
+index b10ac733f..3f96443eb 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1333,10 +1333,15 @@ public abstract class PlayerList {
@@ -97,7 +97,7 @@ index 06ce2af1e6..e61a638752 100644
      // CraftBukkit start
      public void sendMessage(IChatBaseComponent[] iChatBaseComponents) {
 diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java
-index 947c43a5d0..f15fd9f370 100644
+index 947c43a5d..f15fd9f37 100644
 --- a/src/main/java/org/spigotmc/RestartCommand.java
 +++ b/src/main/java/org/spigotmc/RestartCommand.java
 @@ -46,88 +46,123 @@ public class RestartCommand extends Command
@@ -296,5 +296,5 @@ index 947c43a5d0..f15fd9f370 100644
      }
  }
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0176-Add-system-property-to-disable-book-size-limits.patch b/Spigot-Server-Patches/0175-Add-system-property-to-disable-book-size-limits.patch
similarity index 96%
rename from Spigot-Server-Patches/0176-Add-system-property-to-disable-book-size-limits.patch
rename to Spigot-Server-Patches/0175-Add-system-property-to-disable-book-size-limits.patch
index 9c5bd060a..5c48346f6 100644
--- a/Spigot-Server-Patches/0176-Add-system-property-to-disable-book-size-limits.patch
+++ b/Spigot-Server-Patches/0175-Add-system-property-to-disable-book-size-limits.patch
@@ -1,4 +1,4 @@
-From dd36b59cafdc53476976450108b186568f4ad908 Mon Sep 17 00:00:00 2001
+From 3105668521742bb253d9380fb45fcb8cce56e8cd Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 13 May 2017 20:11:21 -0500
 Subject: [PATCH] Add system property to disable book size limits
@@ -11,7 +11,7 @@ to make books with as much data as they want. Do not use this without
 limiting incoming data from packets in some other way.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
-index 6ff1a2dcd6..64a9399527 100644
+index a23ec1461..20cddd506 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
 @@ -40,6 +40,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
@@ -57,5 +57,5 @@ index 6ff1a2dcd6..64a9399527 100644
              }
  
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0177-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/Spigot-Server-Patches/0176-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
similarity index 97%
rename from Spigot-Server-Patches/0177-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
rename to Spigot-Server-Patches/0176-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
index 8152f5d83..e46bee6f5 100644
--- a/Spigot-Server-Patches/0177-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/Spigot-Server-Patches/0176-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
@@ -1,4 +1,4 @@
-From d137a62193d8957f4827a0fd88c9dc1ffb3ec296 Mon Sep 17 00:00:00 2001
+From 2567e9bea1e84723a4bd29eb7c83ff61e016e429 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 16 May 2017 21:29:08 -0500
 Subject: [PATCH] Add option to make parrots stay on shoulders despite movement
diff --git a/Spigot-Server-Patches/0178-Add-configuration-option-to-prevent-player-names-fro.patch b/Spigot-Server-Patches/0177-Add-configuration-option-to-prevent-player-names-fro.patch
similarity index 81%
rename from Spigot-Server-Patches/0178-Add-configuration-option-to-prevent-player-names-fro.patch
rename to Spigot-Server-Patches/0177-Add-configuration-option-to-prevent-player-names-fro.patch
index 1c8ec5e94..b5e040616 100644
--- a/Spigot-Server-Patches/0178-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/Spigot-Server-Patches/0177-Add-configuration-option-to-prevent-player-names-fro.patch
@@ -1,4 +1,4 @@
-From e7c21d8261cf07245b54ac31b545edc05deb4eb8 Mon Sep 17 00:00:00 2001
+From 1d4727137de48e632ae85472704bb0cf5b165115 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Fri, 9 Jun 2017 07:24:34 -0700
 Subject: [PATCH] Add configuration option to prevent player names from being
@@ -6,12 +6,12 @@ Subject: [PATCH] Add configuration option to prevent player names from being
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 6b92ea437..963096fb3 100644
+index 9f8b43d2a..3f59e060b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -289,4 +289,9 @@ public class PaperConfig {
+@@ -280,4 +280,9 @@ public class PaperConfig {
+             maxPlayerAutoSavePerTick = (playerAutoSaveRate == -1 || playerAutoSaveRate > 100) ? 10 : 20;
          }
-         removeInvalidStatistics = getBoolean("settings.remove-invalid-statistics", false);
      }
 +
 +    public static boolean suggestPlayersWhenNullTabCompletions = true;
@@ -20,7 +20,7 @@ index 6b92ea437..963096fb3 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 67dd3b908..b671e17c8 100644
+index 5ec283f5d..ba702591a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2101,5 +2101,10 @@ public final class CraftServer implements Server {
@@ -35,5 +35,5 @@ index 67dd3b908..b671e17c8 100644
      // Paper end
  }
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0179-Use-TerminalConsoleAppender-for-console-improvements.patch b/Spigot-Server-Patches/0178-Use-TerminalConsoleAppender-for-console-improvements.patch
similarity index 99%
rename from Spigot-Server-Patches/0179-Use-TerminalConsoleAppender-for-console-improvements.patch
rename to Spigot-Server-Patches/0178-Use-TerminalConsoleAppender-for-console-improvements.patch
index 34002e1d6..a03a24775 100644
--- a/Spigot-Server-Patches/0179-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/Spigot-Server-Patches/0178-Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -1,4 +1,4 @@
-From fc463a63b1182b9104003f32905dd6b61f567a45 Mon Sep 17 00:00:00 2001
+From eeaa1bd05811d93b423295ef79a28377e7af0b8d Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Fri, 9 Jun 2017 19:03:43 +0200
 Subject: [PATCH] Use TerminalConsoleAppender for console improvements
@@ -588,5 +588,5 @@ index 5cee8f00e..08b6bb7f9 100644
              <AppenderRef ref="TerminalConsole" level="info"/>
          </Root>
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0180-provide-a-configurable-option-to-disable-creeper-lin.patch b/Spigot-Server-Patches/0179-provide-a-configurable-option-to-disable-creeper-lin.patch
similarity index 96%
rename from Spigot-Server-Patches/0180-provide-a-configurable-option-to-disable-creeper-lin.patch
rename to Spigot-Server-Patches/0179-provide-a-configurable-option-to-disable-creeper-lin.patch
index 9cebcd8db..096d1bce8 100644
--- a/Spigot-Server-Patches/0180-provide-a-configurable-option-to-disable-creeper-lin.patch
+++ b/Spigot-Server-Patches/0179-provide-a-configurable-option-to-disable-creeper-lin.patch
@@ -1,4 +1,4 @@
-From cce5d1e0dec1f229b70a547a10fa32e296d3fdc3 Mon Sep 17 00:00:00 2001
+From 71d83d49a94f00f87c916b14071cc7e2d0ed53c1 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 11 Jun 2017 21:01:18 +0100
 Subject: [PATCH] provide a configurable option to disable creeper lingering
diff --git a/Spigot-Server-Patches/0181-Item-canEntityPickup.patch b/Spigot-Server-Patches/0180-Item-canEntityPickup.patch
similarity index 92%
rename from Spigot-Server-Patches/0181-Item-canEntityPickup.patch
rename to Spigot-Server-Patches/0180-Item-canEntityPickup.patch
index 8acaf5c61..d3b5fa116 100644
--- a/Spigot-Server-Patches/0181-Item-canEntityPickup.patch
+++ b/Spigot-Server-Patches/0180-Item-canEntityPickup.patch
@@ -1,11 +1,11 @@
-From 1ab48f50256eaea71822fe4b181bfbb22bbb7f72 Mon Sep 17 00:00:00 2001
+From a0e86f8577578e900b88631dbb12e3ee8ffd4d7b Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 5 May 2017 03:57:17 -0500
 Subject: [PATCH] Item#canEntityPickup
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 41a4962e94..200d46a8a0 100644
+index 4ec79ccdb..a28aa016c 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -529,6 +529,11 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -21,7 +21,7 @@ index 41a4962e94..200d46a8a0 100644
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index 5be2d93146..5446ff3e82 100644
+index 3c30cd5b3..ac0f38e12 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -13,6 +13,7 @@ public class EntityItem extends Entity {
@@ -33,7 +33,7 @@ index 5be2d93146..5446ff3e82 100644
      private UUID f;
      private UUID g;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-index a17a537d69..1df17f09bb 100644
+index a17a537d6..1df17f09b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 @@ -37,6 +37,16 @@ public class CraftItem extends CraftEntity implements Item {
@@ -54,5 +54,5 @@ index a17a537d69..1df17f09bb 100644
      public String toString() {
          return "CraftItem";
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0182-PlayerPickupItemEvent-setFlyAtPlayer.patch b/Spigot-Server-Patches/0181-PlayerPickupItemEvent-setFlyAtPlayer.patch
similarity index 95%
rename from Spigot-Server-Patches/0182-PlayerPickupItemEvent-setFlyAtPlayer.patch
rename to Spigot-Server-Patches/0181-PlayerPickupItemEvent-setFlyAtPlayer.patch
index 6a4659790..9122e85b2 100644
--- a/Spigot-Server-Patches/0182-PlayerPickupItemEvent-setFlyAtPlayer.patch
+++ b/Spigot-Server-Patches/0181-PlayerPickupItemEvent-setFlyAtPlayer.patch
@@ -1,11 +1,11 @@
-From df7bf328a6c36551758f3a52f2ec36c3a380afb1 Mon Sep 17 00:00:00 2001
+From 8e87c447aeaf60619c17d4800980fedcb2fdfb52 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 May 2017 06:26:09 -0500
 Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index 3e70a06397..d9d52a63d8 100644
+index ac0f38e12..c18654256 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -308,6 +308,7 @@ public class EntityItem extends Entity {
@@ -43,5 +43,5 @@ index 3e70a06397..d9d52a63d8 100644
                      this.die();
                      itemstack.setCount(i);
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0183-PlayerAttemptPickupItemEvent.patch b/Spigot-Server-Patches/0182-PlayerAttemptPickupItemEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0183-PlayerAttemptPickupItemEvent.patch
rename to Spigot-Server-Patches/0182-PlayerAttemptPickupItemEvent.patch
index a81e07d9c..dd1c875af 100644
--- a/Spigot-Server-Patches/0183-PlayerAttemptPickupItemEvent.patch
+++ b/Spigot-Server-Patches/0182-PlayerAttemptPickupItemEvent.patch
@@ -1,11 +1,11 @@
-From 9c188947d2debdea36e4796d455b317400fb7bd3 Mon Sep 17 00:00:00 2001
+From beb52bdc2048cc886d469c876fbac60eefbe1091 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 11 Jun 2017 16:30:30 -0500
 Subject: [PATCH] PlayerAttemptPickupItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index d9d52a63d8..946e59753e 100644
+index c18654256..0b4cab0af 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -7,6 +7,7 @@ import javax.annotation.Nullable;
@@ -40,5 +40,5 @@ index d9d52a63d8..946e59753e 100644
                  itemstack.setCount(canHold);
                  // Call legacy event
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0184-Add-UnknownCommandEvent.patch b/Spigot-Server-Patches/0183-Add-UnknownCommandEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0184-Add-UnknownCommandEvent.patch
rename to Spigot-Server-Patches/0183-Add-UnknownCommandEvent.patch
index 833523a20..7ad4f2f25 100644
--- a/Spigot-Server-Patches/0184-Add-UnknownCommandEvent.patch
+++ b/Spigot-Server-Patches/0183-Add-UnknownCommandEvent.patch
@@ -1,11 +1,11 @@
-From 0319cf8b364a3ccb8c8e282402132324106cea46 Mon Sep 17 00:00:00 2001
+From c8f278f4c0620be9cbd282756ffea604fcdc5ae5 Mon Sep 17 00:00:00 2001
 From: Sweepyoface <github@sweepy.pw>
 Date: Sat, 17 Jun 2017 18:48:21 -0400
 Subject: [PATCH] Add UnknownCommandEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7d7f7aa6f..0a4f18a6c 100644
+index 97fa98d2c..873170864 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -83,6 +83,7 @@ import org.bukkit.craftbukkit.util.Versioning;
@@ -32,5 +32,5 @@ index 7d7f7aa6f..0a4f18a6c 100644
          // Spigot end
  
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0185-Basic-PlayerProfile-API.patch b/Spigot-Server-Patches/0184-Basic-PlayerProfile-API.patch
similarity index 99%
rename from Spigot-Server-Patches/0185-Basic-PlayerProfile-API.patch
rename to Spigot-Server-Patches/0184-Basic-PlayerProfile-API.patch
index 22bac2ca6..f86b2e1af 100644
--- a/Spigot-Server-Patches/0185-Basic-PlayerProfile-API.patch
+++ b/Spigot-Server-Patches/0184-Basic-PlayerProfile-API.patch
@@ -1,4 +1,4 @@
-From 848a15e3d2e2154829285ceb64f36cb085541e8f Mon Sep 17 00:00:00 2001
+From 3fdf826658a104dd664d8178cecd9f402e5cd17d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 15 Jan 2018 22:11:48 -0500
 Subject: [PATCH] Basic PlayerProfile API
@@ -429,7 +429,7 @@ index e1af5c488..0ef5ad116 100644
       * Calculates distance between 2 entities
       * @param e1
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 64a3dafe6..12b1b1db7 100644
+index ce1805062..34ba382a4 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1189,7 +1189,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -486,7 +486,7 @@ index a47a51a41..4c476f757 100644
  
          private UserCacheEntry(GameProfile gameprofile, Date date) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0a4f18a6c..2d034beae 100644
+index 873170864..72da1fe81 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -162,6 +162,10 @@ import org.bukkit.event.server.ServerLoadEvent;
@@ -523,5 +523,5 @@ index 0a4f18a6c..2d034beae 100644
      // Paper end
  }
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0186-Shoulder-Entities-Release-API.patch b/Spigot-Server-Patches/0185-Shoulder-Entities-Release-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0186-Shoulder-Entities-Release-API.patch
rename to Spigot-Server-Patches/0185-Shoulder-Entities-Release-API.patch
index d83791571..ba71eef1d 100644
--- a/Spigot-Server-Patches/0186-Shoulder-Entities-Release-API.patch
+++ b/Spigot-Server-Patches/0185-Shoulder-Entities-Release-API.patch
@@ -1,4 +1,4 @@
-From ff3ab20478e71d9a45131040a17d5d0ee10edad4 Mon Sep 17 00:00:00 2001
+From 80ab0c3282b4be60a0f0703fd4341aae2bc71fed Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 17 Jun 2017 15:18:30 -0400
 Subject: [PATCH] Shoulder Entities Release API
@@ -99,5 +99,5 @@ index be00d79e8..755d288ed 100644
      public boolean discoverRecipe(NamespacedKey recipe) {
          return discoverRecipes(Arrays.asList(recipe)) != 0;
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0187-Profile-Lookup-Events.patch b/Spigot-Server-Patches/0186-Profile-Lookup-Events.patch
similarity index 98%
rename from Spigot-Server-Patches/0187-Profile-Lookup-Events.patch
rename to Spigot-Server-Patches/0186-Profile-Lookup-Events.patch
index f86830714..bc085cf34 100644
--- a/Spigot-Server-Patches/0187-Profile-Lookup-Events.patch
+++ b/Spigot-Server-Patches/0186-Profile-Lookup-Events.patch
@@ -1,4 +1,4 @@
-From 3a6c7455737ff1a22df6a359d0a65c72b2c77c04 Mon Sep 17 00:00:00 2001
+From 55c3f1f54797809a5ac5ef73753d9c4ae16edb65 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 17 Jun 2017 17:00:32 -0400
 Subject: [PATCH] Profile Lookup Events
@@ -81,5 +81,5 @@ index 3bcdb8f93..bb9894318 100644
      }
  }
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0188-Block-player-logins-during-server-shutdown.patch b/Spigot-Server-Patches/0187-Block-player-logins-during-server-shutdown.patch
similarity index 90%
rename from Spigot-Server-Patches/0188-Block-player-logins-during-server-shutdown.patch
rename to Spigot-Server-Patches/0187-Block-player-logins-during-server-shutdown.patch
index c40c1eea9..a68ffad63 100644
--- a/Spigot-Server-Patches/0188-Block-player-logins-during-server-shutdown.patch
+++ b/Spigot-Server-Patches/0187-Block-player-logins-during-server-shutdown.patch
@@ -1,11 +1,11 @@
-From 7961a44c32429c4b9ba1ca80f5dd68e3fb253db0 Mon Sep 17 00:00:00 2001
+From 912a05f471cf950cf051635db0bc1a1dc4836711 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 2 Jul 2017 21:35:56 -0500
 Subject: [PATCH] Block player logins during server shutdown
 
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 19ac21e38..8bbea9624 100644
+index bb08200e7..90d1096e5 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -50,6 +50,12 @@ public class LoginListener implements PacketLoginInListener, ITickable {
@@ -22,5 +22,5 @@ index 19ac21e38..8bbea9624 100644
              this.b();
          } else if (this.g == LoginListener.EnumProtocolState.DELAY_ACCEPT) {
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0189-Entity-fromMobSpawner.patch b/Spigot-Server-Patches/0188-Entity-fromMobSpawner.patch
similarity index 96%
rename from Spigot-Server-Patches/0189-Entity-fromMobSpawner.patch
rename to Spigot-Server-Patches/0188-Entity-fromMobSpawner.patch
index 9331b5cd5..8ca59c2a0 100644
--- a/Spigot-Server-Patches/0189-Entity-fromMobSpawner.patch
+++ b/Spigot-Server-Patches/0188-Entity-fromMobSpawner.patch
@@ -1,11 +1,11 @@
-From 2954712fa48765b5b56059acb6ff7a3337e582ca Mon Sep 17 00:00:00 2001
+From 13bc4086ea4079765780171471980e6003f2a62d Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 18 Jun 2017 18:17:05 -0500
 Subject: [PATCH] Entity#fromMobSpawner()
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 9565b7527..5b7f0215f 100644
+index e26c9ee28..07a64966e 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -184,6 +184,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -37,7 +37,7 @@ index 9565b7527..5b7f0215f 100644
  
          } catch (Throwable throwable) {
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index ba4301346..7f84957bb 100644
+index ce43b4bc5..98065d6b0 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -115,6 +115,7 @@ public abstract class MobSpawnerAbstract {
@@ -64,5 +64,5 @@ index 2858f11ee..5689f8390 100644
      // Paper end
  }
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0190-Fix-Anvil-Level-sync-to-client.patch b/Spigot-Server-Patches/0189-Fix-Anvil-Level-sync-to-client.patch
similarity index 96%
rename from Spigot-Server-Patches/0190-Fix-Anvil-Level-sync-to-client.patch
rename to Spigot-Server-Patches/0189-Fix-Anvil-Level-sync-to-client.patch
index 7cbc50511..bcfa733f7 100644
--- a/Spigot-Server-Patches/0190-Fix-Anvil-Level-sync-to-client.patch
+++ b/Spigot-Server-Patches/0189-Fix-Anvil-Level-sync-to-client.patch
@@ -1,4 +1,4 @@
-From 185c3ae637464f75ca6bfae9daacbe24f5b5093f Mon Sep 17 00:00:00 2001
+From 704e788ddc7c522ef2437e1e3f0cfbd9ada64b85 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 11 Jul 2017 23:17:57 -0400
 Subject: [PATCH] Fix Anvil Level sync to client
@@ -42,5 +42,5 @@ index 05070285b..0df834fc1 100644
          return true;
      }
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0191-Add-missing-coverages-for-getTileEntity-in-order-to-.patch b/Spigot-Server-Patches/0190-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
similarity index 90%
rename from Spigot-Server-Patches/0191-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
rename to Spigot-Server-Patches/0190-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
index 074e93af1..de3bd233c 100644
--- a/Spigot-Server-Patches/0191-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
+++ b/Spigot-Server-Patches/0190-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
@@ -1,4 +1,4 @@
-From 27561c26a78ebee8146b8e4f040496bddde42e64 Mon Sep 17 00:00:00 2001
+From a9c576e831952dc4651dbad0ca7e64f188a4f94a Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 22 Jul 2017 15:22:59 +0100
 Subject: [PATCH] Add missing coverages for getTileEntity in order to attempt
@@ -6,7 +6,7 @@ Subject: [PATCH] Add missing coverages for getTileEntity in order to attempt
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index f9b4f314ce..65fe50882b 100644
+index b5b1a2637..b80315bc5 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -234,6 +234,13 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -24,5 +24,5 @@ index f9b4f314ce..65fe50882b 100644
          return result;
      }
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0192-Improve-the-Saddle-API-for-Horses.patch b/Spigot-Server-Patches/0191-Improve-the-Saddle-API-for-Horses.patch
similarity index 94%
rename from Spigot-Server-Patches/0192-Improve-the-Saddle-API-for-Horses.patch
rename to Spigot-Server-Patches/0191-Improve-the-Saddle-API-for-Horses.patch
index a2e6083eb..bd8d701a9 100644
--- a/Spigot-Server-Patches/0192-Improve-the-Saddle-API-for-Horses.patch
+++ b/Spigot-Server-Patches/0191-Improve-the-Saddle-API-for-Horses.patch
@@ -1,4 +1,4 @@
-From b024c6904375e8248a5bcdbc6d29d4c9a1f3fcba Mon Sep 17 00:00:00 2001
+From 85ec0814325c3a54b11db44f173f4239975d47fb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 10 Dec 2016 16:24:06 -0500
 Subject: [PATCH] Improve the Saddle API for Horses
@@ -7,7 +7,7 @@ Not all horses with Saddles have armor. This lets us break up the horses with sa
 and access their saddle state separately from an interface shared with Armor.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
-index 14d0416802..e56bef3340 100644
+index 14d041680..e56bef334 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
 @@ -6,6 +6,7 @@ import net.minecraft.server.EntityHorseAbstract;
@@ -27,7 +27,7 @@ index 14d0416802..e56bef3340 100644
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java
-index 173818e682..2f68524049 100644
+index 173818e68..2f6852404 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java
 @@ -4,7 +4,7 @@ import net.minecraft.server.IInventory;
@@ -41,7 +41,7 @@ index 173818e682..2f68524049 100644
          super(inventory);
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java
 new file mode 100644
-index 0000000000..99cfbaf90b
+index 000000000..99cfbaf90
 --- /dev/null
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java
 @@ -0,0 +1,15 @@
@@ -61,5 +61,5 @@ index 0000000000..99cfbaf90b
 +
 +}
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0193-Implement-ensureServerConversions-API.patch b/Spigot-Server-Patches/0192-Implement-ensureServerConversions-API.patch
similarity index 93%
rename from Spigot-Server-Patches/0193-Implement-ensureServerConversions-API.patch
rename to Spigot-Server-Patches/0192-Implement-ensureServerConversions-API.patch
index c04d27700..dab09b776 100644
--- a/Spigot-Server-Patches/0193-Implement-ensureServerConversions-API.patch
+++ b/Spigot-Server-Patches/0192-Implement-ensureServerConversions-API.patch
@@ -1,4 +1,4 @@
-From 28e876d491ba820cc07a15dae470563eba5b7e31 Mon Sep 17 00:00:00 2001
+From 101bcf13b1aef3fa2e0e3b952e403005e9fb5edd Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 May 2016 22:43:12 -0400
 Subject: [PATCH] Implement ensureServerConversions API
@@ -22,5 +22,5 @@ index 52041caed..f5fa58d6c 100644
 +    // Paper end
  }
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0194-Implement-getI18NDisplayName.patch b/Spigot-Server-Patches/0193-Implement-getI18NDisplayName.patch
similarity index 96%
rename from Spigot-Server-Patches/0194-Implement-getI18NDisplayName.patch
rename to Spigot-Server-Patches/0193-Implement-getI18NDisplayName.patch
index c05e5b49e..74bce8178 100644
--- a/Spigot-Server-Patches/0194-Implement-getI18NDisplayName.patch
+++ b/Spigot-Server-Patches/0193-Implement-getI18NDisplayName.patch
@@ -1,4 +1,4 @@
-From b1af484d9a636ef9e977a8584f4c3a9f08f54ed0 Mon Sep 17 00:00:00 2001
+From 22cff63dd8b19e091581b367580ce88e89a22a75 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 May 2016 23:59:38 -0400
 Subject: [PATCH] Implement getI18NDisplayName
@@ -48,5 +48,5 @@ index f5fa58d6c..3a6e6f687 100644
      // Paper end
  }
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0195-GH-806-Respect-saving-disabled-before-unloading-all-.patch b/Spigot-Server-Patches/0194-GH-806-Respect-saving-disabled-before-unloading-all-.patch
similarity index 90%
rename from Spigot-Server-Patches/0195-GH-806-Respect-saving-disabled-before-unloading-all-.patch
rename to Spigot-Server-Patches/0194-GH-806-Respect-saving-disabled-before-unloading-all-.patch
index 5eda4d5a4..e2f2b087f 100644
--- a/Spigot-Server-Patches/0195-GH-806-Respect-saving-disabled-before-unloading-all-.patch
+++ b/Spigot-Server-Patches/0194-GH-806-Respect-saving-disabled-before-unloading-all-.patch
@@ -1,4 +1,4 @@
-From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
+From 0cdc623700a1b50c3acea53bb5dafa30c1d4b9ae Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 27 Jul 2017 00:06:43 -0400
 Subject: [PATCH] GH-806: Respect saving disabled before unloading all chunks
@@ -9,7 +9,7 @@ This behavior causes a save to occur even though saving was supposed to be turne
 It's triggered when Hell/End worlds are empty of players.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index e5605c309..9d971a9c5 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -194,7 +194,7 @@ public class PlayerChunkMap {
@@ -22,5 +22,5 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
              }
              } // Paper timing
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0196-ProfileWhitelistVerifyEvent.patch b/Spigot-Server-Patches/0195-ProfileWhitelistVerifyEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0196-ProfileWhitelistVerifyEvent.patch
rename to Spigot-Server-Patches/0195-ProfileWhitelistVerifyEvent.patch
index 8024ea6a8..919e51a2e 100644
--- a/Spigot-Server-Patches/0196-ProfileWhitelistVerifyEvent.patch
+++ b/Spigot-Server-Patches/0195-ProfileWhitelistVerifyEvent.patch
@@ -1,11 +1,11 @@
-From af4db5029b964c6798b837610a64d2adc9052174 Mon Sep 17 00:00:00 2001
+From 63e0e80ed62f23b45e71807d7247928949feb339 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 3 Jul 2017 18:11:10 -0500
 Subject: [PATCH] ProfileWhitelistVerifyEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index de549d207c..6bdeb2cc90 100644
+index fb9b0835b..64a86b699 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -544,9 +544,9 @@ public abstract class PlayerList {
@@ -48,5 +48,5 @@ index de549d207c..6bdeb2cc90 100644
      public boolean isOp(GameProfile gameprofile) {
          return this.operators.d(gameprofile) || this.server.H() && this.server.getWorldServer(DimensionManager.OVERWORLD).getWorldData().u() && this.server.G().equalsIgnoreCase(gameprofile.getName()) || this.u;
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0197-Fix-this-stupid-bullshit.patch b/Spigot-Server-Patches/0196-Fix-this-stupid-bullshit.patch
similarity index 95%
rename from Spigot-Server-Patches/0197-Fix-this-stupid-bullshit.patch
rename to Spigot-Server-Patches/0196-Fix-this-stupid-bullshit.patch
index 293fef1a4..4e12336eb 100644
--- a/Spigot-Server-Patches/0197-Fix-this-stupid-bullshit.patch
+++ b/Spigot-Server-Patches/0196-Fix-this-stupid-bullshit.patch
@@ -1,4 +1,4 @@
-From 4f58e975be7c2202435ea860d5e962941c021d0a Mon Sep 17 00:00:00 2001
+From afa4f9949f3ab39721d6d341ff2fda03ab44c855 Mon Sep 17 00:00:00 2001
 From: DemonWav <demonwav@gmail.com>
 Date: Sun, 6 Aug 2017 17:17:53 -0500
 Subject: [PATCH] Fix this stupid bullshit
@@ -29,5 +29,5 @@ index b174a4efa..c9a6b5afb 100644
                  }
  
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0198-Ocelot-despawns-should-honor-nametags-and-leash.patch b/Spigot-Server-Patches/0197-Ocelot-despawns-should-honor-nametags-and-leash.patch
similarity index 88%
rename from Spigot-Server-Patches/0198-Ocelot-despawns-should-honor-nametags-and-leash.patch
rename to Spigot-Server-Patches/0197-Ocelot-despawns-should-honor-nametags-and-leash.patch
index 05611236b..30b3f716b 100644
--- a/Spigot-Server-Patches/0198-Ocelot-despawns-should-honor-nametags-and-leash.patch
+++ b/Spigot-Server-Patches/0197-Ocelot-despawns-should-honor-nametags-and-leash.patch
@@ -1,11 +1,11 @@
-From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
+From 57f01552ff909b09dde2830a199e523ebf74d855 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 31 Jul 2017 01:54:40 -0500
 Subject: [PATCH] Ocelot despawns should honor nametags and leash
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 9fc35730a..2a5a5516a 100644
 --- a/src/main/java/net/minecraft/server/EntityOcelot.java
 +++ b/src/main/java/net/minecraft/server/EntityOcelot.java
 @@ -61,7 +61,7 @@ public class EntityOcelot extends EntityTameableAnimal {
@@ -18,5 +18,5 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
  
      protected void initAttributes() {
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0199-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/Spigot-Server-Patches/0198-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
similarity index 92%
rename from Spigot-Server-Patches/0199-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
rename to Spigot-Server-Patches/0198-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
index 9d67f17b0..cbf57fe00 100644
--- a/Spigot-Server-Patches/0199-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
+++ b/Spigot-Server-Patches/0198-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
@@ -1,11 +1,11 @@
-From 07ceae1ae72511ececf469231511c23d7be7a550 Mon Sep 17 00:00:00 2001
+From 57d7b3c61b1932a8b1e32158546d62f0e1007c82 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 31 Jul 2017 01:45:19 -0500
 Subject: [PATCH] Reset spawner timer when spawner event is cancelled
 
 
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index 72b12d869e..408ef423e9 100644
+index 98065d6b0..027ba7191 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -121,6 +121,9 @@ public abstract class MobSpawnerAbstract {
@@ -28,5 +28,5 @@ index 72b12d869e..408ef423e9 100644
                  }
  
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0200-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/Spigot-Server-Patches/0199-Fix-MC-117075-TE-Unload-Lag-Spike.patch
similarity index 91%
rename from Spigot-Server-Patches/0200-Fix-MC-117075-TE-Unload-Lag-Spike.patch
rename to Spigot-Server-Patches/0199-Fix-MC-117075-TE-Unload-Lag-Spike.patch
index 3f0083f7a..3622c5ccd 100644
--- a/Spigot-Server-Patches/0200-Fix-MC-117075-TE-Unload-Lag-Spike.patch
+++ b/Spigot-Server-Patches/0199-Fix-MC-117075-TE-Unload-Lag-Spike.patch
@@ -1,11 +1,11 @@
-From dfe68b605eafeba30f3fb064ce05d08c96e63349 Mon Sep 17 00:00:00 2001
+From c5f69b14314ce7cd684e89b68e01fd1eb66e7de1 Mon Sep 17 00:00:00 2001
 From: mezz <tehgeek@gmail.com>
 Date: Wed, 9 Aug 2017 17:51:22 -0500
 Subject: [PATCH] Fix MC-117075: TE Unload Lag Spike
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 785611f0e2..b17215edf4 100644
+index c92df00e8..44ed34174 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1323,7 +1323,11 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -22,5 +22,5 @@ index 785611f0e2..b17215edf4 100644
              this.tileEntityListUnload.clear();
          }
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0201-Allow-specifying-a-custom-authentication-servers-dow.patch b/Spigot-Server-Patches/0200-Allow-specifying-a-custom-authentication-servers-dow.patch
similarity index 93%
rename from Spigot-Server-Patches/0201-Allow-specifying-a-custom-authentication-servers-dow.patch
rename to Spigot-Server-Patches/0200-Allow-specifying-a-custom-authentication-servers-dow.patch
index 486be9bce..123781dcf 100644
--- a/Spigot-Server-Patches/0201-Allow-specifying-a-custom-authentication-servers-dow.patch
+++ b/Spigot-Server-Patches/0200-Allow-specifying-a-custom-authentication-servers-dow.patch
@@ -1,4 +1,4 @@
-From ed7f8a0d3ff1263fbea81d77508bfe18f275606b Mon Sep 17 00:00:00 2001
+From 879525f34fe5bcee534a7b250b04d87a6190503e Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 17 Aug 2017 16:08:20 -0700
 Subject: [PATCH] Allow specifying a custom "authentication servers down" kick
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow specifying a custom "authentication servers down" kick
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 963096fb3..a499578db 100644
+index 3f59e060b..305a1258f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -1,5 +1,6 @@
@@ -16,7 +16,7 @@ index 963096fb3..a499578db 100644
  import com.google.common.base.Throwables;
  
  import java.io.File;
-@@ -294,4 +295,9 @@ public class PaperConfig {
+@@ -285,4 +286,9 @@ public class PaperConfig {
      private static void suggestPlayersWhenNull() {
          suggestPlayersWhenNullTabCompletions = getBoolean("settings.suggest-player-names-when-null-tab-completions", suggestPlayersWhenNullTabCompletions);
      }
@@ -42,5 +42,5 @@ index 90d1096e5..b682b3a43 100644
                              LoginListener.c.error("Couldn't verify username because servers are unavailable");
                          }
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0202-LivingEntity-setKiller.patch b/Spigot-Server-Patches/0201-LivingEntity-setKiller.patch
similarity index 94%
rename from Spigot-Server-Patches/0202-LivingEntity-setKiller.patch
rename to Spigot-Server-Patches/0201-LivingEntity-setKiller.patch
index 7e4d269f2..8481c7918 100644
--- a/Spigot-Server-Patches/0202-LivingEntity-setKiller.patch
+++ b/Spigot-Server-Patches/0201-LivingEntity-setKiller.patch
@@ -1,4 +1,4 @@
-From 00cd9b171c9374b53c83a5f08df068c2c749740f Mon Sep 17 00:00:00 2001
+From bd1155c27e1a0fa98e542d14396d71befd73985d Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 31 Jul 2017 01:49:48 -0500
 Subject: [PATCH] LivingEntity#setKiller
@@ -26,5 +26,5 @@ index 716eda990..2f96842bb 100644
          return addPotionEffect(effect, false);
      }
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0203-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch b/Spigot-Server-Patches/0202-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
similarity index 93%
rename from Spigot-Server-Patches/0203-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
rename to Spigot-Server-Patches/0202-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
index f925446cf..3795c8176 100644
--- a/Spigot-Server-Patches/0203-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
+++ b/Spigot-Server-Patches/0202-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
@@ -1,4 +1,4 @@
-From bd9ca6e169ebb2bfa1848f3ca94291a7c0beddc5 Mon Sep 17 00:00:00 2001
+From c4e09d0639b742ae0ac2e4a0ccec89eb9f34cf16 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Mon, 18 Sep 2017 12:00:03 +0200
 Subject: [PATCH] Use Log4j IOStreams to redirect System.out/err to logger
@@ -12,7 +12,7 @@ results in a separate line, even though it should not result in
 a line break. Log4j's implementation handles it correctly.
 
 diff --git a/pom.xml b/pom.xml
-index d93a180de9..815f9ef393 100644
+index ea08d7d98..f34ca2285 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -62,6 +62,11 @@
@@ -28,7 +28,7 @@ index d93a180de9..815f9ef393 100644
              <groupId>org.ow2.asm</groupId>
              <artifactId>asm</artifactId>
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 9fdb6d100b..674609cad3 100644
+index 908127630..fb9db65ee 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -131,8 +131,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -45,5 +45,5 @@ index 9fdb6d100b..674609cad3 100644
  
          thread.setDaemon(true);
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0204-Handle-plugin-prefixes-using-Log4J-configuration.patch b/Spigot-Server-Patches/0203-Handle-plugin-prefixes-using-Log4J-configuration.patch
similarity index 95%
rename from Spigot-Server-Patches/0204-Handle-plugin-prefixes-using-Log4J-configuration.patch
rename to Spigot-Server-Patches/0203-Handle-plugin-prefixes-using-Log4J-configuration.patch
index 19cfa33fa..08412e823 100644
--- a/Spigot-Server-Patches/0204-Handle-plugin-prefixes-using-Log4J-configuration.patch
+++ b/Spigot-Server-Patches/0203-Handle-plugin-prefixes-using-Log4J-configuration.patch
@@ -1,4 +1,4 @@
-From 45e1223c049ddcb41d076b94e742adf299b762eb Mon Sep 17 00:00:00 2001
+From 23440a8f025c817ae8d4040543e1b98c74a271d6 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Thu, 21 Sep 2017 16:14:55 +0200
 Subject: [PATCH] Handle plugin prefixes using Log4J configuration
@@ -15,7 +15,7 @@ This may cause additional prefixes to be disabled for plugins bypassing
 the plugin logger.
 
 diff --git a/pom.xml b/pom.xml
-index 815f9ef393..ed920ac4a0 100644
+index f34ca2285..70966a76a 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -60,7 +60,7 @@
@@ -28,7 +28,7 @@ index 815f9ef393..ed920ac4a0 100644
          <dependency>
              <groupId>org.apache.logging.log4j</groupId>
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 9dca5aeda1..9584950c63 100644
+index 9dca5aeda..9584950c6 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -292,7 +292,7 @@ public class SpigotConfig
@@ -41,7 +41,7 @@ index 9dca5aeda1..9584950c63 100644
  
      public static int playerShuffle;
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 08b6bb7f97..9f8334376f 100644
+index 08b6bb7f9..9f8334376 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
 @@ -2,10 +2,22 @@
@@ -70,5 +70,5 @@ index 08b6bb7f97..9f8334376f 100644
                  <TimeBasedTriggeringPolicy />
                  <OnStartupTriggeringPolicy />
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0205-Include-Log4J2-SLF4J-implementation.patch b/Spigot-Server-Patches/0204-Include-Log4J2-SLF4J-implementation.patch
similarity index 86%
rename from Spigot-Server-Patches/0205-Include-Log4J2-SLF4J-implementation.patch
rename to Spigot-Server-Patches/0204-Include-Log4J2-SLF4J-implementation.patch
index ceeeee21b..5b97c9830 100644
--- a/Spigot-Server-Patches/0205-Include-Log4J2-SLF4J-implementation.patch
+++ b/Spigot-Server-Patches/0204-Include-Log4J2-SLF4J-implementation.patch
@@ -1,11 +1,11 @@
-From 2c68f0bd180e1a053dd2b9e87ff0f4e1d18ca09a Mon Sep 17 00:00:00 2001
+From 5059a539b473c09efe4b060eb59f100b935d1dba Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Thu, 21 Sep 2017 16:33:35 +0200
 Subject: [PATCH] Include Log4J2 SLF4J implementation
 
 
 diff --git a/pom.xml b/pom.xml
-index ed920ac4a0..b28f8e0929 100644
+index 70966a76a..f4dcd8564 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -62,6 +62,12 @@
@@ -22,5 +22,5 @@ index ed920ac4a0..b28f8e0929 100644
              <groupId>org.apache.logging.log4j</groupId>
              <artifactId>log4j-iostreams</artifactId>
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0206-Disable-logger-prefix-for-various-plugins-bypassing-.patch b/Spigot-Server-Patches/0205-Disable-logger-prefix-for-various-plugins-bypassing-.patch
similarity index 95%
rename from Spigot-Server-Patches/0206-Disable-logger-prefix-for-various-plugins-bypassing-.patch
rename to Spigot-Server-Patches/0205-Disable-logger-prefix-for-various-plugins-bypassing-.patch
index 44f60774d..611b41ccc 100644
--- a/Spigot-Server-Patches/0206-Disable-logger-prefix-for-various-plugins-bypassing-.patch
+++ b/Spigot-Server-Patches/0205-Disable-logger-prefix-for-various-plugins-bypassing-.patch
@@ -1,4 +1,4 @@
-From 5d4638bf1ac248bb211637ffb67ab6bbc61d4d38 Mon Sep 17 00:00:00 2001
+From 86fbf17a43556c991f01060a506a28a6b43523ec Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Sat, 23 Sep 2017 21:07:20 +0200
 Subject: [PATCH] Disable logger prefix for various plugins bypassing the
@@ -11,7 +11,7 @@ log. Disable the logger prefix for these plugins so the messages
 show up correctly.
 
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 9f8334376f..6711e6dff9 100644
+index 9f8334376..6711e6dff 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
 @@ -5,7 +5,8 @@
@@ -35,5 +35,5 @@ index 9f8334376f..6711e6dff9 100644
                  </LoggerNamePatternSelector>
              </PatternLayout>
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0207-Add-PlayerJumpEvent.patch b/Spigot-Server-Patches/0206-Add-PlayerJumpEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0207-Add-PlayerJumpEvent.patch
rename to Spigot-Server-Patches/0206-Add-PlayerJumpEvent.patch
index da33476e6..bc6622ba3 100644
--- a/Spigot-Server-Patches/0207-Add-PlayerJumpEvent.patch
+++ b/Spigot-Server-Patches/0206-Add-PlayerJumpEvent.patch
@@ -1,4 +1,4 @@
-From 17efa308f6cc4e7956119385e5668d65c1de9269 Mon Sep 17 00:00:00 2001
+From e2f61ee9a4bb38cdfd61fc9340e1b7042b04d1a6 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 28 Sep 2017 17:21:44 -0400
 Subject: [PATCH] Add PlayerJumpEvent
@@ -66,5 +66,5 @@ index c8b251e69..00751a9d9 100644
  
                              this.player.move(EnumMoveType.PLAYER, d7, d8, d9);
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0208-handle-PacketPlayInKeepAlive-async.patch b/Spigot-Server-Patches/0207-handle-PacketPlayInKeepAlive-async.patch
similarity index 96%
rename from Spigot-Server-Patches/0208-handle-PacketPlayInKeepAlive-async.patch
rename to Spigot-Server-Patches/0207-handle-PacketPlayInKeepAlive-async.patch
index c0849f788..1fa05ef26 100644
--- a/Spigot-Server-Patches/0208-handle-PacketPlayInKeepAlive-async.patch
+++ b/Spigot-Server-Patches/0207-handle-PacketPlayInKeepAlive-async.patch
@@ -1,4 +1,4 @@
-From 24f3bb70b4cad919e75878a444a0dde1bdabb956 Mon Sep 17 00:00:00 2001
+From 2b86a7eb79d741932c7ca5359af1ac0dd3cd00d9 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Thu, 5 Oct 2017 01:54:07 +0100
 Subject: [PATCH] handle PacketPlayInKeepAlive async
@@ -40,5 +40,5 @@ index 00751a9d9..587f00286 100644
  
      }
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0209-Expose-client-protocol-version-and-virtual-host.patch b/Spigot-Server-Patches/0208-Expose-client-protocol-version-and-virtual-host.patch
similarity index 98%
rename from Spigot-Server-Patches/0209-Expose-client-protocol-version-and-virtual-host.patch
rename to Spigot-Server-Patches/0208-Expose-client-protocol-version-and-virtual-host.patch
index cd78b0cb5..adb3cf25d 100644
--- a/Spigot-Server-Patches/0209-Expose-client-protocol-version-and-virtual-host.patch
+++ b/Spigot-Server-Patches/0208-Expose-client-protocol-version-and-virtual-host.patch
@@ -1,4 +1,4 @@
-From 8ad7c912b5de1105857c07212ab0716f9f728506 Mon Sep 17 00:00:00 2001
+From 6bf21e9e7e77096e056c5631818d9a490dc849b6 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Tue, 10 Oct 2017 18:45:20 +0200
 Subject: [PATCH] Expose client protocol version and virtual host
@@ -136,5 +136,5 @@ index 0df834fc1..8046a2a5f 100644
      public double getEyeHeight(boolean ignorePose) {
          if (ignorePose) {
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0210-revert-serverside-behavior-of-keepalives.patch b/Spigot-Server-Patches/0209-revert-serverside-behavior-of-keepalives.patch
similarity index 97%
rename from Spigot-Server-Patches/0210-revert-serverside-behavior-of-keepalives.patch
rename to Spigot-Server-Patches/0209-revert-serverside-behavior-of-keepalives.patch
index 95694f798..0ce355f85 100644
--- a/Spigot-Server-Patches/0210-revert-serverside-behavior-of-keepalives.patch
+++ b/Spigot-Server-Patches/0209-revert-serverside-behavior-of-keepalives.patch
@@ -1,4 +1,4 @@
-From 064858ed1b41ea7941a517f4307786f75836865a Mon Sep 17 00:00:00 2001
+From 68c17de42dd9181bf40c9da2053c577a5896e86b Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 15 Oct 2017 00:29:07 +0100
 Subject: [PATCH] revert serverside behavior of keepalives
@@ -17,7 +17,7 @@ from networking or during connections flood of chunk packets on slower clients,
  at the cost of dead connections being kept open for longer.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 35a98bde1c..62b7f24b5a 100644
+index 587f00286..870b59ce1 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -71,7 +71,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -74,5 +74,5 @@ index 35a98bde1c..62b7f24b5a 100644
          this.minecraftServer.methodProfiler.e();
          // CraftBukkit start
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0211-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch b/Spigot-Server-Patches/0210-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
similarity index 92%
rename from Spigot-Server-Patches/0211-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
rename to Spigot-Server-Patches/0210-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
index 46aa4d450..0e7f1c6a1 100644
--- a/Spigot-Server-Patches/0211-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
+++ b/Spigot-Server-Patches/0210-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
@@ -1,4 +1,4 @@
-From 87ff1130c173155c8c30225d7a91e3dd8a56e96e Mon Sep 17 00:00:00 2001
+From 82e0fec9fd1526ee71c3ff93a7f13729452a45f8 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Fri, 20 Oct 2017 04:33:45 +0200
 Subject: [PATCH] Replace HashSet with fastutil's ObjectOpenHashSet in
@@ -13,7 +13,7 @@ ObjectOpenHashSet never uses compareTo(), so the inconsistencies of NextTickList
 Fixes https://github.com/PaperMC/Paper/issues/588
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/HashTreeSet.java b/src/main/java/org/bukkit/craftbukkit/util/HashTreeSet.java
-index 80a5c29f3b..cd864c4047 100644
+index 80a5c29f3..cd864c404 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/HashTreeSet.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/HashTreeSet.java
 @@ -8,7 +8,7 @@ import java.util.TreeSet;
@@ -26,5 +26,5 @@ index 80a5c29f3b..cd864c4047 100644
  
      public HashTreeSet() {
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0212-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/Spigot-Server-Patches/0211-Send-attack-SoundEffects-only-to-players-who-can-see.patch
similarity index 98%
rename from Spigot-Server-Patches/0212-Send-attack-SoundEffects-only-to-players-who-can-see.patch
rename to Spigot-Server-Patches/0211-Send-attack-SoundEffects-only-to-players-who-can-see.patch
index 06acd166b..8571c4037 100644
--- a/Spigot-Server-Patches/0212-Send-attack-SoundEffects-only-to-players-who-can-see.patch
+++ b/Spigot-Server-Patches/0211-Send-attack-SoundEffects-only-to-players-who-can-see.patch
@@ -1,4 +1,4 @@
-From 0295ed3932dbebe229b0494888da7ab598fe1d1b Mon Sep 17 00:00:00 2001
+From 810b13008981b065074f558ab5e3e406504f9c9a Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 31 Oct 2017 03:26:18 +0100
 Subject: [PATCH] Send attack SoundEffects only to players who can see the
@@ -89,5 +89,5 @@ index 44ed34174..c1ede0651 100644
          for (int i = 0; i < this.v.size(); ++i) {
              ((IWorldAccess) this.v.get(i)).a(entityhuman, soundeffect, soundcategory, d0, d1, d2, f, f1);
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0213-Option-for-maximum-exp-value-when-merging-orbs.patch b/Spigot-Server-Patches/0212-Option-for-maximum-exp-value-when-merging-orbs.patch
similarity index 98%
rename from Spigot-Server-Patches/0213-Option-for-maximum-exp-value-when-merging-orbs.patch
rename to Spigot-Server-Patches/0212-Option-for-maximum-exp-value-when-merging-orbs.patch
index bb715f87b..a6523a381 100644
--- a/Spigot-Server-Patches/0213-Option-for-maximum-exp-value-when-merging-orbs.patch
+++ b/Spigot-Server-Patches/0212-Option-for-maximum-exp-value-when-merging-orbs.patch
@@ -1,4 +1,4 @@
-From 56adb5bd9b7aa2531ce2f3f063f755a948a03449 Mon Sep 17 00:00:00 2001
+From db27a9af2843c90224bd268bdc1ace22fcca28e0 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 10 Nov 2017 23:03:12 -0500
 Subject: [PATCH] Option for maximum exp value when merging orbs
diff --git a/Spigot-Server-Patches/0214-Add-PlayerArmorChangeEvent.patch b/Spigot-Server-Patches/0213-Add-PlayerArmorChangeEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0214-Add-PlayerArmorChangeEvent.patch
rename to Spigot-Server-Patches/0213-Add-PlayerArmorChangeEvent.patch
index c57c53195..cafea882c 100644
--- a/Spigot-Server-Patches/0214-Add-PlayerArmorChangeEvent.patch
+++ b/Spigot-Server-Patches/0213-Add-PlayerArmorChangeEvent.patch
@@ -1,4 +1,4 @@
-From 1297209afca38458f9f9f91d4dcbc873a3865d83 Mon Sep 17 00:00:00 2001
+From 5c51a9da0fcb134769342e0df890ca2eba28db0f Mon Sep 17 00:00:00 2001
 From: pkt77 <parkerkt77@gmail.com>
 Date: Fri, 10 Nov 2017 23:46:34 -0500
 Subject: [PATCH] Add PlayerArmorChangeEvent
@@ -42,5 +42,5 @@ index a13515a7f..bad1020c0 100644
          return this.g;
      }
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0215-Prevent-logins-from-being-processed-when-the-player-.patch b/Spigot-Server-Patches/0214-Prevent-logins-from-being-processed-when-the-player-.patch
similarity index 90%
rename from Spigot-Server-Patches/0215-Prevent-logins-from-being-processed-when-the-player-.patch
rename to Spigot-Server-Patches/0214-Prevent-logins-from-being-processed-when-the-player-.patch
index 71944f416..a78fe5ca7 100644
--- a/Spigot-Server-Patches/0215-Prevent-logins-from-being-processed-when-the-player-.patch
+++ b/Spigot-Server-Patches/0214-Prevent-logins-from-being-processed-when-the-player-.patch
@@ -1,4 +1,4 @@
-From 6f93bb5e5f2bfb8117f9c93f7797e32d704293d4 Mon Sep 17 00:00:00 2001
+From e106aa50619ecca4bba2cfefef7aa059f6e71cb3 Mon Sep 17 00:00:00 2001
 From: killme <killme-git@ibts.me>
 Date: Sun, 12 Nov 2017 19:40:01 +0100
 Subject: [PATCH] Prevent logins from being processed when the player has
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent logins from being processed when the player has
 
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 10c82107d4..1380a14274 100644
+index b682b3a43..30be39b0c 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -57,7 +57,11 @@ public class LoginListener implements PacketLoginInListener, ITickable {
@@ -23,5 +23,5 @@ index 10c82107d4..1380a14274 100644
              EntityPlayer entityplayer = this.server.getPlayerList().a(this.i.getId());
  
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0216-use-CB-BlockState-implementations-for-captured-block.patch b/Spigot-Server-Patches/0215-use-CB-BlockState-implementations-for-captured-block.patch
similarity index 94%
rename from Spigot-Server-Patches/0216-use-CB-BlockState-implementations-for-captured-block.patch
rename to Spigot-Server-Patches/0215-use-CB-BlockState-implementations-for-captured-block.patch
index 4381f88bc..c42faf879 100644
--- a/Spigot-Server-Patches/0216-use-CB-BlockState-implementations-for-captured-block.patch
+++ b/Spigot-Server-Patches/0215-use-CB-BlockState-implementations-for-captured-block.patch
@@ -1,4 +1,4 @@
-From ff6e4c55a7fc5a3980d77e8b648537098b3974b7 Mon Sep 17 00:00:00 2001
+From 9b9fe2b3f6f190b099ab4e5400f6a60cd2ac759d Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Thu, 16 Nov 2017 12:12:41 +0000
 Subject: [PATCH] use CB BlockState implementations for captured blocks
@@ -18,7 +18,7 @@ the blockstate that will be valid for restoration, as opposed to dropping
 information on restoration when the event is cancelled.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 564f2aecdf..f80f075287 100644
+index 15e07ce84..2ddc3f050 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -401,7 +401,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -31,5 +31,5 @@ index 564f2aecdf..f80f075287 100644
              }
              // CraftBukkit end
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0217-API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-Server-Patches/0216-API-to-get-a-BlockState-without-a-snapshot.patch
similarity index 98%
rename from Spigot-Server-Patches/0217-API-to-get-a-BlockState-without-a-snapshot.patch
rename to Spigot-Server-Patches/0216-API-to-get-a-BlockState-without-a-snapshot.patch
index 675c7b11c..32cfd5934 100644
--- a/Spigot-Server-Patches/0217-API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/Spigot-Server-Patches/0216-API-to-get-a-BlockState-without-a-snapshot.patch
@@ -1,4 +1,4 @@
-From 4a344899f2509f7795b5146bc8fad27228eab907 Mon Sep 17 00:00:00 2001
+From a598a45a2d27aa5cf843f0de44e3dc056571e6a1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 6 Nov 2017 21:08:22 -0500
 Subject: [PATCH] API to get a BlockState without a snapshot
@@ -39,7 +39,7 @@ index b3c5766a2..29fe031d8 100644
          return null;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 3dbeb376f..6dd92ced9 100644
+index 1fadbf054..96cbaef52 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -274,6 +274,20 @@ public class CraftBlock implements Block {
@@ -131,5 +131,5 @@ index e6f86cc4b..3a8f64360 100644
  
      @Override
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0218-AsyncTabCompleteEvent.patch b/Spigot-Server-Patches/0217-AsyncTabCompleteEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0218-AsyncTabCompleteEvent.patch
rename to Spigot-Server-Patches/0217-AsyncTabCompleteEvent.patch
index 0caa3dc61..2178b5aae 100644
--- a/Spigot-Server-Patches/0218-AsyncTabCompleteEvent.patch
+++ b/Spigot-Server-Patches/0217-AsyncTabCompleteEvent.patch
@@ -1,4 +1,4 @@
-From 908f9b6cdd09ef8ecc8a4bb17e1d4036afa1a5f7 Mon Sep 17 00:00:00 2001
+From 5c19fb1b13f0e281aaf374a427335215bf77b770 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 26 Nov 2017 13:19:58 -0500
 Subject: [PATCH] AsyncTabCompleteEvent
@@ -14,7 +14,7 @@ completion, such as offline players.
 Also adds isCommand and getLocation to the sync TabCompleteEvent
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 5693c15fb..a82ec4853 100644
+index 870b59ce1..371513042 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -508,10 +508,10 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -68,7 +68,7 @@ index 5693c15fb..a82ec4853 100644
  
      public void a(PacketPlayInSetCommandBlock packetplayinsetcommandblock) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2d034beae..2c6d488d2 100644
+index 72da1fe81..07364554a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1722,7 +1722,7 @@ public final class CraftServer implements Server {
@@ -125,5 +125,5 @@ index 1e3aae3b8..95d13c146 100644
          Waitable<List<String>> waitable = new Waitable<List<String>>() {
              @Override
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0219-Avoid-NPE-in-PathfinderGoalTempt.patch b/Spigot-Server-Patches/0218-Avoid-NPE-in-PathfinderGoalTempt.patch
similarity index 88%
rename from Spigot-Server-Patches/0219-Avoid-NPE-in-PathfinderGoalTempt.patch
rename to Spigot-Server-Patches/0218-Avoid-NPE-in-PathfinderGoalTempt.patch
index 9a4977e22..7681e51a6 100644
--- a/Spigot-Server-Patches/0219-Avoid-NPE-in-PathfinderGoalTempt.patch
+++ b/Spigot-Server-Patches/0218-Avoid-NPE-in-PathfinderGoalTempt.patch
@@ -1,11 +1,11 @@
-From 3bea380a901c68260b6eaf2225129a68c2e1f882 Mon Sep 17 00:00:00 2001
+From 109389523c9af61ab6f0655f9ae68269f8fe752f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 29 Nov 2017 22:18:54 -0500
 Subject: [PATCH] Avoid NPE in PathfinderGoalTempt
 
 
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalTempt.java b/src/main/java/net/minecraft/server/PathfinderGoalTempt.java
-index 8ca996e652..1b82479418 100644
+index 8ca996e65..1b8247941 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalTempt.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalTempt.java
 @@ -52,7 +52,7 @@ public class PathfinderGoalTempt extends PathfinderGoal {
@@ -18,5 +18,5 @@ index 8ca996e652..1b82479418 100644
          }
      }
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0220-PlayerPickupExperienceEvent.patch b/Spigot-Server-Patches/0219-PlayerPickupExperienceEvent.patch
similarity index 91%
rename from Spigot-Server-Patches/0220-PlayerPickupExperienceEvent.patch
rename to Spigot-Server-Patches/0219-PlayerPickupExperienceEvent.patch
index ee09c8541..42672a90f 100644
--- a/Spigot-Server-Patches/0220-PlayerPickupExperienceEvent.patch
+++ b/Spigot-Server-Patches/0219-PlayerPickupExperienceEvent.patch
@@ -1,4 +1,4 @@
-From ce5a7f73bb7a1d74c0ccd47ad9425dc765b8af3c Mon Sep 17 00:00:00 2001
+From ebc7081b58b5d456f4bc6346d65e20b3319ac661 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 22:02:53 -0500
 Subject: [PATCH] PlayerPickupExperienceEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] PlayerPickupExperienceEvent
 Allows plugins to cancel a player picking up an experience orb
 
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index 31c8d4bc86..dcef63bb1f 100644
+index dfd6230b2..73205b2f7 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -218,7 +218,7 @@ public class EntityExperienceOrb extends Entity {
@@ -19,5 +19,5 @@ index 31c8d4bc86..dcef63bb1f 100644
                  entityhuman.receive(this, 1);
                  ItemStack itemstack = EnchantmentManager.b(Enchantments.G, (EntityLiving) entityhuman);
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0221-ExperienceOrbMergeEvent.patch b/Spigot-Server-Patches/0220-ExperienceOrbMergeEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0221-ExperienceOrbMergeEvent.patch
rename to Spigot-Server-Patches/0220-ExperienceOrbMergeEvent.patch
index 97aee2fbb..a1ea80302 100644
--- a/Spigot-Server-Patches/0221-ExperienceOrbMergeEvent.patch
+++ b/Spigot-Server-Patches/0220-ExperienceOrbMergeEvent.patch
@@ -1,4 +1,4 @@
-From 1733fa91a63015f99c127379c07cd56e1397a1ad Mon Sep 17 00:00:00 2001
+From e7daf06af73e4ae7aec0982e034bd1ef4d35718f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 22:57:26 -0500
 Subject: [PATCH] ExperienceOrbMergeEvent
@@ -8,7 +8,7 @@ Plugins can cancel this if they want to ensure experience orbs do not lose impor
 metadata such as spawn reason, or conditionally move data from source to target.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f80f075287..7cf4a9c11e 100644
+index 2ddc3f050..a14518ba6 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1042,7 +1042,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -21,5 +21,5 @@ index f80f075287..7cf4a9c11e 100644
                              if ((int) newTotal < 0) continue; // Overflow
                              if (maxValue > 0 && newTotal > (long)maxValue) {
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0222-Ability-to-apply-mending-to-XP-API.patch b/Spigot-Server-Patches/0221-Ability-to-apply-mending-to-XP-API.patch
similarity index 95%
rename from Spigot-Server-Patches/0222-Ability-to-apply-mending-to-XP-API.patch
rename to Spigot-Server-Patches/0221-Ability-to-apply-mending-to-XP-API.patch
index 42b7e4f1c..5828e8d52 100644
--- a/Spigot-Server-Patches/0222-Ability-to-apply-mending-to-XP-API.patch
+++ b/Spigot-Server-Patches/0221-Ability-to-apply-mending-to-XP-API.patch
@@ -1,4 +1,4 @@
-From 39b86fa69e8d2d6404b044b90c923f766294834e Mon Sep 17 00:00:00 2001
+From 362bcce7edac6cda9d4b8f998e760386a1a41ed6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 20 Dec 2017 17:36:49 -0500
 Subject: [PATCH] Ability to apply mending to XP API
@@ -10,7 +10,7 @@ of giving the player experience points.
 Both an API To standalone mend, and apply mending logic to .giveExp has been added.
 
 diff --git a/src/main/java/net/minecraft/server/EnchantmentManager.java b/src/main/java/net/minecraft/server/EnchantmentManager.java
-index fd6df39f17..f03aef2fed 100644
+index fd6df39f1..f03aef2fe 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentManager.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentManager.java
 @@ -223,6 +223,7 @@ public class EnchantmentManager {
@@ -22,7 +22,7 @@ index fd6df39f17..f03aef2fed 100644
          List<ItemStack> list = enchantment.a(entityliving);// Paper - decompile fix
          if (list.isEmpty()) {
 diff --git a/src/main/java/net/minecraft/server/Enchantments.java b/src/main/java/net/minecraft/server/Enchantments.java
-index 8cfb38b826..44b2d428b3 100644
+index 8cfb38b82..44b2d428b 100644
 --- a/src/main/java/net/minecraft/server/Enchantments.java
 +++ b/src/main/java/net/minecraft/server/Enchantments.java
 @@ -35,7 +35,7 @@ public class Enchantments {
@@ -35,7 +35,7 @@ index 8cfb38b826..44b2d428b3 100644
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index dcef63bb1f..53cfc10017 100644
+index 73205b2f7..69d4dc9ab 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -246,10 +246,12 @@ public class EntityExperienceOrb extends Entity {
@@ -52,7 +52,7 @@ index dcef63bb1f..53cfc10017 100644
          return i * 2;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0d76a42997..1c40f17ce9 100644
+index 8046a2a5f..45f7a4143 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1023,8 +1023,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -97,5 +97,5 @@ index 0d76a42997..1c40f17ce9 100644
      }
  
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0223-Configurable-Chunks-Sends-per-Tick-setting.patch b/Spigot-Server-Patches/0222-Configurable-Chunks-Sends-per-Tick-setting.patch
similarity index 96%
rename from Spigot-Server-Patches/0223-Configurable-Chunks-Sends-per-Tick-setting.patch
rename to Spigot-Server-Patches/0222-Configurable-Chunks-Sends-per-Tick-setting.patch
index 4447487a3..49ca26dd4 100644
--- a/Spigot-Server-Patches/0223-Configurable-Chunks-Sends-per-Tick-setting.patch
+++ b/Spigot-Server-Patches/0222-Configurable-Chunks-Sends-per-Tick-setting.patch
@@ -1,4 +1,4 @@
-From d1d3428265a603b62246b4a89b859957f01eaeb7 Mon Sep 17 00:00:00 2001
+From 7dfa55ecb28018b9084160369d510a4384ed4495 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 1 Jan 2018 15:41:59 -0500
 Subject: [PATCH] Configurable Chunks Sends per Tick setting
diff --git a/Spigot-Server-Patches/0224-Configurable-Max-Chunk-Gens-per-Tick.patch b/Spigot-Server-Patches/0223-Configurable-Max-Chunk-Gens-per-Tick.patch
similarity index 98%
rename from Spigot-Server-Patches/0224-Configurable-Max-Chunk-Gens-per-Tick.patch
rename to Spigot-Server-Patches/0223-Configurable-Max-Chunk-Gens-per-Tick.patch
index cbe3a0659..8383bab80 100644
--- a/Spigot-Server-Patches/0224-Configurable-Max-Chunk-Gens-per-Tick.patch
+++ b/Spigot-Server-Patches/0223-Configurable-Max-Chunk-Gens-per-Tick.patch
@@ -1,4 +1,4 @@
-From e09aa94bd74a5ae4edc39367df7b8d1f562351c1 Mon Sep 17 00:00:00 2001
+From f8f4c08e6822205bb69f8318ba136fab257a2f2d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 1 Jan 2018 16:10:24 -0500
 Subject: [PATCH] Configurable Max Chunk Gens per Tick
diff --git a/Spigot-Server-Patches/0225-Make-max-squid-spawn-height-configurable.patch b/Spigot-Server-Patches/0224-Make-max-squid-spawn-height-configurable.patch
similarity index 96%
rename from Spigot-Server-Patches/0225-Make-max-squid-spawn-height-configurable.patch
rename to Spigot-Server-Patches/0224-Make-max-squid-spawn-height-configurable.patch
index 65ca31c18..15c9ad9a5 100644
--- a/Spigot-Server-Patches/0225-Make-max-squid-spawn-height-configurable.patch
+++ b/Spigot-Server-Patches/0224-Make-max-squid-spawn-height-configurable.patch
@@ -1,4 +1,4 @@
-From 8d22094e65f7e5e6d047591be201629bd123f290 Mon Sep 17 00:00:00 2001
+From 4fbd76666feb1e20f70b79f9deb27fb273113035 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 11 Jan 2018 16:47:28 -0600
 Subject: [PATCH] Make max squid spawn height configurable
diff --git a/Spigot-Server-Patches/0226-PreCreatureSpawnEvent.patch b/Spigot-Server-Patches/0225-PreCreatureSpawnEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0226-PreCreatureSpawnEvent.patch
rename to Spigot-Server-Patches/0225-PreCreatureSpawnEvent.patch
index e1e1f271c..005881b6a 100644
--- a/Spigot-Server-Patches/0226-PreCreatureSpawnEvent.patch
+++ b/Spigot-Server-Patches/0225-PreCreatureSpawnEvent.patch
@@ -1,4 +1,4 @@
-From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
+From 6603f05cfc10b4537aa3ca2627062193db6e2d9f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 14 Jan 2018 17:01:31 -0500
 Subject: [PATCH] PreCreatureSpawnEvent
@@ -15,7 +15,7 @@ instead and save a lot of server resources.
 See: https://github.com/PaperMC/Paper/issues/917
 
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 027ba7191..eca3f85ad 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -1,6 +1,7 @@
@@ -56,7 +56,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
  
                      if (entity == null) {
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 1ff5dcd85..d1715fdfb 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -164,10 +164,30 @@ public final class SpawnerCreature {
@@ -92,5 +92,5 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
                                                                      entityinsentient = (EntityInsentient) biomebase_biomemeta.b.a((World) worldserver);
                                                                  } catch (Exception exception) {
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0227-PlayerNaturallySpawnCreaturesEvent.patch b/Spigot-Server-Patches/0226-PlayerNaturallySpawnCreaturesEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0227-PlayerNaturallySpawnCreaturesEvent.patch
rename to Spigot-Server-Patches/0226-PlayerNaturallySpawnCreaturesEvent.patch
index 8843ee604..3cde68fad 100644
--- a/Spigot-Server-Patches/0227-PlayerNaturallySpawnCreaturesEvent.patch
+++ b/Spigot-Server-Patches/0226-PlayerNaturallySpawnCreaturesEvent.patch
@@ -1,4 +1,4 @@
-From c2e105f84b7417ae201d9c23ccc2b819aa0dfa48 Mon Sep 17 00:00:00 2001
+From 9682a401a3cf8adc29ee2cf949ecc43701d644d1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 14 Jan 2018 17:36:02 -0500
 Subject: [PATCH] PlayerNaturallySpawnCreaturesEvent
@@ -9,7 +9,7 @@ from triggering monster spawns on a server.
 Also a highly more effecient way to blanket block spawns in a world
 
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index 3f6bcbbd76..95d98b65cf 100644
+index d1715fdfb..72cd9ba58 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -47,6 +47,15 @@ public final class SpawnerCreature {
@@ -29,5 +29,5 @@ index 3f6bcbbd76..95d98b65cf 100644
                      for (int i1 = -b0; i1 <= b0; ++i1) {
                          for (k = -b0; k <= b0; ++k) {
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0228-Add-setPlayerProfile-API-for-Skulls.patch b/Spigot-Server-Patches/0227-Add-setPlayerProfile-API-for-Skulls.patch
similarity index 97%
rename from Spigot-Server-Patches/0228-Add-setPlayerProfile-API-for-Skulls.patch
rename to Spigot-Server-Patches/0227-Add-setPlayerProfile-API-for-Skulls.patch
index fbcb0667d..ca870b245 100644
--- a/Spigot-Server-Patches/0228-Add-setPlayerProfile-API-for-Skulls.patch
+++ b/Spigot-Server-Patches/0227-Add-setPlayerProfile-API-for-Skulls.patch
@@ -1,4 +1,4 @@
-From fcf7838985692e85f2b8dc0451b53c608c21e454 Mon Sep 17 00:00:00 2001
+From 9aa37315aed4ddfdf70e53317d110d12eb948049 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 19 Jan 2018 00:36:25 -0500
 Subject: [PATCH] Add setPlayerProfile API for Skulls
@@ -90,5 +90,5 @@ index 2ea2a355b..398cf958c 100644
      public OfflinePlayer getOwningPlayer() {
          if (hasOwner()) {
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0229-Fill-Profile-Property-Events.patch b/Spigot-Server-Patches/0228-Fill-Profile-Property-Events.patch
similarity index 94%
rename from Spigot-Server-Patches/0229-Fill-Profile-Property-Events.patch
rename to Spigot-Server-Patches/0228-Fill-Profile-Property-Events.patch
index 0e37f11cf..7f2383a62 100644
--- a/Spigot-Server-Patches/0229-Fill-Profile-Property-Events.patch
+++ b/Spigot-Server-Patches/0228-Fill-Profile-Property-Events.patch
@@ -1,4 +1,4 @@
-From e7c6b3cc9faa0245c366ec6c840ff76155c6a3fa Mon Sep 17 00:00:00 2001
+From 7d4063a7135c1bb7d09900fde86a070b13290d82 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 2 Jan 2018 00:31:26 -0500
 Subject: [PATCH] Fill Profile Property Events
@@ -11,7 +11,7 @@ If Mojang API does need to be hit, event fire so you can get the results.
 This is useful for implementing a ProfileCache for Player Skulls
 
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
-index 4b2a67423f..61cfdf73c8 100644
+index 4b2a67423..61cfdf73c 100644
 --- a/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
 @@ -1,5 +1,7 @@
@@ -40,5 +40,5 @@ index 4b2a67423f..61cfdf73c8 100644
  
      @Override
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0230-PlayerAdvancementCriterionGrantEvent.patch b/Spigot-Server-Patches/0229-PlayerAdvancementCriterionGrantEvent.patch
similarity index 90%
rename from Spigot-Server-Patches/0230-PlayerAdvancementCriterionGrantEvent.patch
rename to Spigot-Server-Patches/0229-PlayerAdvancementCriterionGrantEvent.patch
index d47980f7f..6eb36a20a 100644
--- a/Spigot-Server-Patches/0230-PlayerAdvancementCriterionGrantEvent.patch
+++ b/Spigot-Server-Patches/0229-PlayerAdvancementCriterionGrantEvent.patch
@@ -1,11 +1,11 @@
-From f7db7b5bf402cd0f61de0918d6e5b1b66763f1b8 Mon Sep 17 00:00:00 2001
+From 0b6035594dd684f00ad974a6eccc316657341c06 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 19 Jan 2018 08:15:29 -0600
 Subject: [PATCH] PlayerAdvancementCriterionGrantEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
-index eff9589320..26eaa9be90 100644
+index 9b5a4f469..5cb3a605d 100644
 --- a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
 +++ b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
 @@ -232,6 +232,12 @@ public class AdvancementDataPlayer {
@@ -22,5 +22,5 @@ index eff9589320..26eaa9be90 100644
              this.i.add(advancement);
              flag = true;
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0231-Add-ArmorStand-Item-Meta.patch b/Spigot-Server-Patches/0230-Add-ArmorStand-Item-Meta.patch
similarity index 99%
rename from Spigot-Server-Patches/0231-Add-ArmorStand-Item-Meta.patch
rename to Spigot-Server-Patches/0230-Add-ArmorStand-Item-Meta.patch
index 1e2a13fa9..5e370672b 100644
--- a/Spigot-Server-Patches/0231-Add-ArmorStand-Item-Meta.patch
+++ b/Spigot-Server-Patches/0230-Add-ArmorStand-Item-Meta.patch
@@ -1,4 +1,4 @@
-From 11eb46a5745a6872cb071f7f2f23f1df432313af Mon Sep 17 00:00:00 2001
+From 0159128a90741991f54ab7f3851bfe6435d27ffd Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 27 Jan 2018 17:04:14 -0500
 Subject: [PATCH] Add ArmorStand Item Meta
@@ -414,5 +414,5 @@ index 65b8123a8..0ad0004b9 100644
  
          assertThat("Forgotten test?", providers, hasSize(ItemStackTest.COMPOUND_MATERIALS.length - 4/* Normal item meta, skulls, eggs and tile entities */));
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0232-Extend-Player-Interact-cancellation.patch b/Spigot-Server-Patches/0231-Extend-Player-Interact-cancellation.patch
similarity index 97%
rename from Spigot-Server-Patches/0232-Extend-Player-Interact-cancellation.patch
rename to Spigot-Server-Patches/0231-Extend-Player-Interact-cancellation.patch
index 17e20a9e6..56e903fc3 100644
--- a/Spigot-Server-Patches/0232-Extend-Player-Interact-cancellation.patch
+++ b/Spigot-Server-Patches/0231-Extend-Player-Interact-cancellation.patch
@@ -1,4 +1,4 @@
-From 45b4f0ecce04b20a1e43f1a985155ef35e8d33db Mon Sep 17 00:00:00 2001
+From 72636b631f801d3c4b26d04d911d471581daceb7 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 11 Feb 2018 10:43:46 +0000
 Subject: [PATCH] Extend Player Interact cancellation
@@ -13,7 +13,7 @@ Update adjacent blocks of doors, double plants, pistons and beds
 when cancelling interaction.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index aa7780eff5..23223e89d3 100644
+index aa7780eff..23223e89d 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -111,6 +111,11 @@ public class PlayerInteractManager {
@@ -55,5 +55,5 @@ index aa7780eff5..23223e89d3 100644
              enuminteractionresult = (event.useItemInHand() != Event.Result.ALLOW) ? EnumInteractionResult.SUCCESS : EnumInteractionResult.PASS;
          } else if (this.gamemode == EnumGamemode.SPECTATOR) {
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0233-Tameable-getOwnerUniqueId-API.patch b/Spigot-Server-Patches/0232-Tameable-getOwnerUniqueId-API.patch
similarity index 91%
rename from Spigot-Server-Patches/0233-Tameable-getOwnerUniqueId-API.patch
rename to Spigot-Server-Patches/0232-Tameable-getOwnerUniqueId-API.patch
index a31ab3e04..8a7c023ff 100644
--- a/Spigot-Server-Patches/0233-Tameable-getOwnerUniqueId-API.patch
+++ b/Spigot-Server-Patches/0232-Tameable-getOwnerUniqueId-API.patch
@@ -1,4 +1,4 @@
-From 0caca786108d71c213532dbb058efd5f5bb3a771 Mon Sep 17 00:00:00 2001
+From f29a7edad856cf6587e90c89fcdf5ec08d504e16 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 24 Feb 2018 01:14:55 -0500
 Subject: [PATCH] Tameable#getOwnerUniqueId API
@@ -7,7 +7,7 @@ This is faster if all you need is the UUID, as .getOwner() will cause
 an OfflinePlayer to be loaded from disk.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
-index e56bef3340..cc9d432e7f 100644
+index e56bef334..cc9d432e7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
 @@ -83,6 +83,9 @@ public abstract class CraftAbstractHorse extends CraftAnimals implements Abstrac
@@ -21,7 +21,7 @@ index e56bef3340..cc9d432e7f 100644
          return getHandle().getOwnerUUID();
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
-index eaaebeab83..2e959321b5 100644
+index eaaebeab8..2e959321b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
 @@ -18,6 +18,9 @@ public class CraftTameableAnimal extends CraftAnimals implements Tameable, Creat
@@ -35,5 +35,5 @@ index eaaebeab83..2e959321b5 100644
          try {
              return getHandle().getOwnerUUID();
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0234-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/Spigot-Server-Patches/0233-Toggleable-player-crits-helps-mitigate-hacked-client.patch
similarity index 94%
rename from Spigot-Server-Patches/0234-Toggleable-player-crits-helps-mitigate-hacked-client.patch
rename to Spigot-Server-Patches/0233-Toggleable-player-crits-helps-mitigate-hacked-client.patch
index 160073d78..8436b9302 100644
--- a/Spigot-Server-Patches/0234-Toggleable-player-crits-helps-mitigate-hacked-client.patch
+++ b/Spigot-Server-Patches/0233-Toggleable-player-crits-helps-mitigate-hacked-client.patch
@@ -1,11 +1,11 @@
-From 23502bc44acab3ad3bd991dff952cb88df286940 Mon Sep 17 00:00:00 2001
+From 9be837a19033cb6b1fb3b5e48593cd0dd20c86c3 Mon Sep 17 00:00:00 2001
 From: MiniDigger <admin@minidigger.me>
 Date: Sat, 10 Mar 2018 00:50:24 +0100
 Subject: [PATCH] Toggleable player crits, helps mitigate hacked clients.
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 67b4d576a..02c52958c 100644
+index 313dd9891..56226bc86 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -182,6 +182,11 @@ public class PaperWorldConfig {
@@ -33,5 +33,5 @@ index 4aa8e85ab..d5adc0a24 100644
                      if (flag2) {
                          f *= 1.5F;
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0235-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch b/Spigot-Server-Patches/0234-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
similarity index 91%
rename from Spigot-Server-Patches/0235-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
rename to Spigot-Server-Patches/0234-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
index f87a9c0ff..bb4ffb1bc 100644
--- a/Spigot-Server-Patches/0235-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
+++ b/Spigot-Server-Patches/0234-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
@@ -1,4 +1,4 @@
-From 7ecd398e6b9b995538cc6c56cfe1cd5a605dd523 Mon Sep 17 00:00:00 2001
+From cd3976494de750293984da5f012611ef3de358fd Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 10 Mar 2018 13:03:49 +0000
 Subject: [PATCH] Fix NPE when getting location from InventoryEnderChest opened
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix NPE when getting location from InventoryEnderChest opened
 
 
 diff --git a/src/main/java/net/minecraft/server/InventoryEnderChest.java b/src/main/java/net/minecraft/server/InventoryEnderChest.java
-index ac81d3f86b..f50bae0123 100644
+index ac81d3f86..f50bae012 100644
 --- a/src/main/java/net/minecraft/server/InventoryEnderChest.java
 +++ b/src/main/java/net/minecraft/server/InventoryEnderChest.java
 @@ -5,7 +5,7 @@ import org.bukkit.inventory.InventoryHolder;
@@ -27,5 +27,5 @@ index ac81d3f86b..f50bae0123 100644
      }
  
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0236-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/Spigot-Server-Patches/0235-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
similarity index 94%
rename from Spigot-Server-Patches/0236-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
rename to Spigot-Server-Patches/0235-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
index 5d8d4637f..ab24e05ed 100644
--- a/Spigot-Server-Patches/0236-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
+++ b/Spigot-Server-Patches/0235-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
@@ -1,11 +1,11 @@
-From 0337ec68f7397efe5c6599cb488ae42952f290a8 Mon Sep 17 00:00:00 2001
+From 8e13d0697e68b74c47b0cfd20d0567fc8872a24b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 10 Mar 2018 16:33:15 -0500
 Subject: [PATCH] Prevent Frosted Ice from loading/holding chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockIceFrost.java b/src/main/java/net/minecraft/server/BlockIceFrost.java
-index 7bea86f52b..ea3a6f2fb1 100644
+index 7bea86f52..ea3a6f2fb 100644
 --- a/src/main/java/net/minecraft/server/BlockIceFrost.java
 +++ b/src/main/java/net/minecraft/server/BlockIceFrost.java
 @@ -16,7 +16,8 @@ public class BlockIceFrost extends BlockIce {
@@ -28,5 +28,5 @@ index 7bea86f52b..ea3a6f2fb1 100644
                      if (j >= i) {
                          boolean flag = false;
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0237-Disable-Explicit-Network-Manager-Flushing.patch b/Spigot-Server-Patches/0236-Disable-Explicit-Network-Manager-Flushing.patch
similarity index 93%
rename from Spigot-Server-Patches/0237-Disable-Explicit-Network-Manager-Flushing.patch
rename to Spigot-Server-Patches/0236-Disable-Explicit-Network-Manager-Flushing.patch
index b0ae0886d..4973796d6 100644
--- a/Spigot-Server-Patches/0237-Disable-Explicit-Network-Manager-Flushing.patch
+++ b/Spigot-Server-Patches/0236-Disable-Explicit-Network-Manager-Flushing.patch
@@ -1,4 +1,4 @@
-From 1bbdbfeadb10437782ff1ed24a4a09db0d8e52db Mon Sep 17 00:00:00 2001
+From 0019dfaa0a4e8fb508ad9e9298822ec3bae74686 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 11 Mar 2018 14:13:33 -0400
 Subject: [PATCH] Disable Explicit Network Manager Flushing
@@ -12,7 +12,7 @@ flushing on the netty event loop, so it won't do the flush on the main thread.
 Renable flushing by passing -Dpaper.explicit-flush=true
 
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 4f3f88ff66..f8facddb40 100644
+index 4f3f88ff6..f8facddb4 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -66,6 +66,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -33,5 +33,5 @@ index 4f3f88ff66..f8facddb40 100644
  
          if (this.u++ % 20 == 0) {
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0238-Implement-extended-PaperServerListPingEvent.patch b/Spigot-Server-Patches/0237-Implement-extended-PaperServerListPingEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0238-Implement-extended-PaperServerListPingEvent.patch
rename to Spigot-Server-Patches/0237-Implement-extended-PaperServerListPingEvent.patch
index 6056944c6..59c74ae46 100644
--- a/Spigot-Server-Patches/0238-Implement-extended-PaperServerListPingEvent.patch
+++ b/Spigot-Server-Patches/0237-Implement-extended-PaperServerListPingEvent.patch
@@ -1,4 +1,4 @@
-From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
+From b38db1bcd7c796e5a1a6737d4710400d52e0bad6 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Wed, 11 Oct 2017 15:56:26 +0200
 Subject: [PATCH] Implement extended PaperServerListPingEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement extended PaperServerListPingEvent
 
 diff --git a/src/main/java/com/destroystokyo/paper/network/PaperServerListPingEventImpl.java b/src/main/java/com/destroystokyo/paper/network/PaperServerListPingEventImpl.java
 new file mode 100644
-index 7ac07ac07ac0..7ac07ac07ac0
+index 000000000..c1a8e295b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/PaperServerListPingEventImpl.java
 @@ -0,0 +1,31 @@
@@ -43,7 +43,7 @@ index 7ac07ac07ac0..7ac07ac07ac0
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/network/PaperStatusClient.java b/src/main/java/com/destroystokyo/paper/network/PaperStatusClient.java
 new file mode 100644
-index 7ac07ac07ac0..7ac07ac07ac0
+index 000000000..a2a409e63
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/PaperStatusClient.java
 @@ -0,0 +1,11 @@
@@ -60,7 +60,7 @@ index 7ac07ac07ac0..7ac07ac07ac0
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java b/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java
 new file mode 100644
-index 7ac07ac07ac0..7ac07ac07ac0
+index 000000000..26e3031d2
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java
 @@ -0,0 +1,112 @@
@@ -177,7 +177,7 @@ index 7ac07ac07ac0..7ac07ac07ac0
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 34ba382a4..c3efb5e1b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1,6 +1,7 @@
@@ -211,7 +211,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
          return this.s.getMaxPlayers();
      }
 diff --git a/src/main/java/net/minecraft/server/PacketStatusListener.java b/src/main/java/net/minecraft/server/PacketStatusListener.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index c9edd289a..8aa121e2f 100644
 --- a/src/main/java/net/minecraft/server/PacketStatusListener.java
 +++ b/src/main/java/net/minecraft/server/PacketStatusListener.java
 @@ -30,6 +30,8 @@ public class PacketStatusListener implements PacketStatusInListener {
@@ -234,7 +234,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
          // CraftBukkit end
      }
 diff --git a/src/main/java/net/minecraft/server/ServerPing.java b/src/main/java/net/minecraft/server/ServerPing.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 615aa2cd0..408aad098 100644
 --- a/src/main/java/net/minecraft/server/ServerPing.java
 +++ b/src/main/java/net/minecraft/server/ServerPing.java
 @@ -29,6 +29,7 @@ public class ServerPing {
@@ -259,7 +259,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
              this.c = agameprofile;
          }
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 9584950c6..eed96c60c 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -291,7 +291,7 @@ public class SpigotConfig
@@ -272,5 +272,5 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
      }
  
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0239-Improved-Async-Task-Scheduler.patch b/Spigot-Server-Patches/0238-Improved-Async-Task-Scheduler.patch
similarity index 99%
rename from Spigot-Server-Patches/0239-Improved-Async-Task-Scheduler.patch
rename to Spigot-Server-Patches/0238-Improved-Async-Task-Scheduler.patch
index a42d0cc25..82a4bd064 100644
--- a/Spigot-Server-Patches/0239-Improved-Async-Task-Scheduler.patch
+++ b/Spigot-Server-Patches/0238-Improved-Async-Task-Scheduler.patch
@@ -1,4 +1,4 @@
-From e84041324c9d6f185d71c400f96f22715e6df8ce Mon Sep 17 00:00:00 2001
+From ac5e264a067c2fd8b4a762a6e6ec31f09e2d35eb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 16 Mar 2018 22:59:43 -0400
 Subject: [PATCH] Improved Async Task Scheduler
@@ -32,7 +32,7 @@ operations are decoupled from the sync tasks queue.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java
 new file mode 100644
-index 0000000000..3c1992e212
+index 000000000..3c1992e21
 --- /dev/null
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java
 @@ -0,0 +1,122 @@
@@ -159,7 +159,7 @@ index 0000000000..3c1992e212
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 5f228373e3..a9107ce5d2 100644
+index 8963168ed..05285cf0b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -16,7 +16,6 @@ import java.util.function.Consumer;
@@ -370,5 +370,5 @@ index 5f228373e3..a9107ce5d2 100644
  
      private boolean isReady(final int currentTick) {
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0240-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/Spigot-Server-Patches/0239-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
similarity index 95%
rename from Spigot-Server-Patches/0240-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
rename to Spigot-Server-Patches/0239-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
index c1d480bcf..a7346fea2 100644
--- a/Spigot-Server-Patches/0240-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
+++ b/Spigot-Server-Patches/0239-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
@@ -1,4 +1,4 @@
-From 982c19767d50214ca6c84babe208d483ddcb5e4e Mon Sep 17 00:00:00 2001
+From f7d0b364eb1ef2d4246d44382e38511d771dee26 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 18 Mar 2018 11:45:57 -0400
 Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent
 This will allow you to change the players name or skin on login.
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 1380a14274..ab85fd9a6e 100644
+index 30be39b0c..ca3a211a5 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -1,5 +1,7 @@
@@ -44,5 +44,5 @@ index 1380a14274..ab85fd9a6e 100644
                              if (PlayerPreLoginEvent.getHandlerList().getRegisteredListeners().length != 0) {
                                  final PlayerPreLoginEvent event = new PlayerPreLoginEvent(playerName, address, uniqueId);
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0241-Call-PortalCreateEvent-for-exit-portals.patch b/Spigot-Server-Patches/0240-Call-PortalCreateEvent-for-exit-portals.patch
similarity index 98%
rename from Spigot-Server-Patches/0241-Call-PortalCreateEvent-for-exit-portals.patch
rename to Spigot-Server-Patches/0240-Call-PortalCreateEvent-for-exit-portals.patch
index a9345ad44..b4d277c3f 100644
--- a/Spigot-Server-Patches/0241-Call-PortalCreateEvent-for-exit-portals.patch
+++ b/Spigot-Server-Patches/0240-Call-PortalCreateEvent-for-exit-portals.patch
@@ -1,4 +1,4 @@
-From 66b22bb50ee08233312675626b9ed979fed3eac9 Mon Sep 17 00:00:00 2001
+From a001b53e9f4c971c4747d451f51ee92d4a47968e Mon Sep 17 00:00:00 2001
 From: MiniDigger <admin@minidigger.me>
 Date: Sun, 18 Mar 2018 15:44:44 +0100
 Subject: [PATCH] Call PortalCreateEvent for exit portals
@@ -104,5 +104,5 @@ index 434589adb..7e858bab4 100644
      }
  
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0242-Player.setPlayerProfile-API.patch b/Spigot-Server-Patches/0241-Player.setPlayerProfile-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0242-Player.setPlayerProfile-API.patch
rename to Spigot-Server-Patches/0241-Player.setPlayerProfile-API.patch
index 405ca003d..efe521fcb 100644
--- a/Spigot-Server-Patches/0242-Player.setPlayerProfile-API.patch
+++ b/Spigot-Server-Patches/0241-Player.setPlayerProfile-API.patch
@@ -1,4 +1,4 @@
-From a347b25b7293f1b2eb1740a18840d7ae893bcd18 Mon Sep 17 00:00:00 2001
+From 897d4808a90fc03d824d304830659d3f6b35ee49 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 18 Mar 2018 12:29:48 -0400
 Subject: [PATCH] Player.setPlayerProfile API
@@ -6,7 +6,7 @@ Subject: [PATCH] Player.setPlayerProfile API
 This can be useful for changing name or skins after a player has logged in.
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index b9e6a18293..73998e5a75 100644
+index d5adc0a24..507641fc6 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -66,7 +66,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -19,7 +19,7 @@ index b9e6a18293..73998e5a75 100644
      private final ItemCooldown ce;
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index ab85fd9a6e..5778a5201d 100644
+index ca3a211a5..58a2f3d28 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -38,7 +38,7 @@ public class LoginListener implements PacketLoginInListener, ITickable {
@@ -48,7 +48,7 @@ index ab85fd9a6e..5778a5201d 100644
                              uniqueId = i.getId();
                              // Paper end
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 45f7a4143f..b1cba904e4 100644
+index 45f7a4143..b1cba904e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1,6 +1,8 @@
@@ -139,5 +139,5 @@ index 45f7a4143f..b1cba904e4 100644
      public void removeDisconnectingPlayer(Player player) {
          hiddenPlayers.remove(player.getUniqueId());
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0243-Fix-Dragon-Server-Crashes.patch b/Spigot-Server-Patches/0242-Fix-Dragon-Server-Crashes.patch
similarity index 92%
rename from Spigot-Server-Patches/0243-Fix-Dragon-Server-Crashes.patch
rename to Spigot-Server-Patches/0242-Fix-Dragon-Server-Crashes.patch
index 0ada5469b..fffa6ffc4 100644
--- a/Spigot-Server-Patches/0243-Fix-Dragon-Server-Crashes.patch
+++ b/Spigot-Server-Patches/0242-Fix-Dragon-Server-Crashes.patch
@@ -1,4 +1,4 @@
-From e97afba9cc1e570e5e20d21303566e319cb6b325 Mon Sep 17 00:00:00 2001
+From cf49a77d720e289f094cb4e31e44d3053ef90e90 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Mar 2018 20:52:07 -0400
 Subject: [PATCH] Fix Dragon Server Crashes
@@ -7,7 +7,7 @@ If the dragon tries to find "ground" and hits a hole, or off edge,
 it will infinitely keep looking for non air and eventually crash.
 
 diff --git a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
-index da89a69ed6..45f96078c5 100644
+index da89a69ed..45f96078c 100644
 --- a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
 +++ b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
 @@ -49,7 +49,7 @@ public class DragonControllerLandedFlame extends AbstractDragonControllerLanded
@@ -20,5 +20,5 @@ index da89a69ed6..45f96078c5 100644
                  blockposition$mutableblockposition.c(MathHelper.floor(d0), MathHelper.floor(d2), MathHelper.floor(d1));
              }
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0244-getPlayerUniqueId-API.patch b/Spigot-Server-Patches/0243-getPlayerUniqueId-API.patch
similarity index 94%
rename from Spigot-Server-Patches/0244-getPlayerUniqueId-API.patch
rename to Spigot-Server-Patches/0243-getPlayerUniqueId-API.patch
index e6657ac4e..e6ac51bda 100644
--- a/Spigot-Server-Patches/0244-getPlayerUniqueId-API.patch
+++ b/Spigot-Server-Patches/0243-getPlayerUniqueId-API.patch
@@ -1,4 +1,4 @@
-From c2dc93bcdd5d8493ea4da4351517bfa77efc6d53 Mon Sep 17 00:00:00 2001
+From 46b48a06dd052ec7025966dfe111049bf74710d0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 22 Mar 2018 01:40:24 -0400
 Subject: [PATCH] getPlayerUniqueId API
@@ -9,7 +9,7 @@ In Offline Mode, will return an Offline UUID
 This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2c6d488d2..0eab17bd3 100644
+index 07364554a..71d1929c1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1415,6 +1415,26 @@ public final class CraftServer implements Server {
@@ -40,5 +40,5 @@ index 2c6d488d2..0eab17bd3 100644
      @Deprecated
      public OfflinePlayer getOfflinePlayer(String name) {
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0245-Make-player-data-saving-configurable.patch b/Spigot-Server-Patches/0244-Make-player-data-saving-configurable.patch
similarity index 92%
rename from Spigot-Server-Patches/0245-Make-player-data-saving-configurable.patch
rename to Spigot-Server-Patches/0244-Make-player-data-saving-configurable.patch
index f26c84bb3..780017533 100644
--- a/Spigot-Server-Patches/0245-Make-player-data-saving-configurable.patch
+++ b/Spigot-Server-Patches/0244-Make-player-data-saving-configurable.patch
@@ -1,14 +1,14 @@
-From adc6a73d736b3ddf87d8e3a1954d3deec8e14f3f Mon Sep 17 00:00:00 2001
+From db7f5c905af40c27d82de4775172e0de67666f6e Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Mon, 26 Mar 2018 18:30:53 +0300
 Subject: [PATCH] Make player data saving configurable
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index a499578db..dc15bfcf8 100644
+index 305a1258f..5c18e5770 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -300,4 +300,13 @@ public class PaperConfig {
+@@ -291,4 +291,13 @@ public class PaperConfig {
      private static void authenticationServersDownKickMessage() {
          authenticationServersDownKickMessage = Strings.emptyToNull(getString("messages.kick.authentication-servers-down", authenticationServersDownKickMessage));
      }
@@ -35,5 +35,5 @@ index 0fd6efec0..7553280d2 100644
              NBTTagCompound nbttagcompound = entityhuman.save(new NBTTagCompound());
              File file = new File(this.playerDir, entityhuman.bu() + ".dat.tmp");
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0246-Make-legacy-ping-handler-more-reliable.patch b/Spigot-Server-Patches/0245-Make-legacy-ping-handler-more-reliable.patch
similarity index 98%
rename from Spigot-Server-Patches/0246-Make-legacy-ping-handler-more-reliable.patch
rename to Spigot-Server-Patches/0245-Make-legacy-ping-handler-more-reliable.patch
index efe5f290a..8e79e6030 100644
--- a/Spigot-Server-Patches/0246-Make-legacy-ping-handler-more-reliable.patch
+++ b/Spigot-Server-Patches/0245-Make-legacy-ping-handler-more-reliable.patch
@@ -1,4 +1,4 @@
-From 03f5df321e1299135fb47f7febb879bb492a9dfb Mon Sep 17 00:00:00 2001
+From 5adc07529bf386d144cafa53eb41c66b1c2cea8b Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Wed, 11 Oct 2017 18:22:50 +0200
 Subject: [PATCH] Make legacy ping handler more reliable
@@ -28,7 +28,7 @@ respond to the request.
 [2]: https://netty.io/wiki/user-guide-for-4.x.html#wiki-h4-13
 
 diff --git a/src/main/java/net/minecraft/server/LegacyPingHandler.java b/src/main/java/net/minecraft/server/LegacyPingHandler.java
-index 5691d0aeaf..aafca9c9c4 100644
+index 5691d0aea..aafca9c9c 100644
 --- a/src/main/java/net/minecraft/server/LegacyPingHandler.java
 +++ b/src/main/java/net/minecraft/server/LegacyPingHandler.java
 @@ -13,6 +13,7 @@ import org.apache.logging.log4j.Logger;
@@ -167,5 +167,5 @@ index 5691d0aeaf..aafca9c9c4 100644
          channelhandlercontext.pipeline().firstContext().writeAndFlush(bytebuf).addListener(ChannelFutureListener.CLOSE);
      }
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0247-Call-PaperServerListPingEvent-for-legacy-pings.patch b/Spigot-Server-Patches/0246-Call-PaperServerListPingEvent-for-legacy-pings.patch
similarity index 98%
rename from Spigot-Server-Patches/0247-Call-PaperServerListPingEvent-for-legacy-pings.patch
rename to Spigot-Server-Patches/0246-Call-PaperServerListPingEvent-for-legacy-pings.patch
index a96af7449..13e5b75e0 100644
--- a/Spigot-Server-Patches/0247-Call-PaperServerListPingEvent-for-legacy-pings.patch
+++ b/Spigot-Server-Patches/0246-Call-PaperServerListPingEvent-for-legacy-pings.patch
@@ -1,4 +1,4 @@
-From 51238ebbbbd3fa77c730204f46bb3bee2db0cd15 Mon Sep 17 00:00:00 2001
+From 9a84ca1c9a75d3682f99f6f80938b597eb82b470 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Wed, 11 Oct 2017 19:30:51 +0200
 Subject: [PATCH] Call PaperServerListPingEvent for legacy pings
@@ -6,7 +6,7 @@ Subject: [PATCH] Call PaperServerListPingEvent for legacy pings
 
 diff --git a/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java b/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java
 new file mode 100644
-index 0000000000..74c012fd40
+index 000000000..74c012fd4
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java
 @@ -0,0 +1,73 @@
@@ -84,7 +84,7 @@ index 0000000000..74c012fd40
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/LegacyPingHandler.java b/src/main/java/net/minecraft/server/LegacyPingHandler.java
-index aafca9c9c4..860076fc23 100644
+index aafca9c9c..860076fc2 100644
 --- a/src/main/java/net/minecraft/server/LegacyPingHandler.java
 +++ b/src/main/java/net/minecraft/server/LegacyPingHandler.java
 @@ -9,6 +9,7 @@ import java.net.InetSocketAddress;
@@ -151,5 +151,5 @@ index aafca9c9c4..860076fc23 100644
      }
  
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0248-Flag-to-disable-the-channel-limit.patch b/Spigot-Server-Patches/0247-Flag-to-disable-the-channel-limit.patch
similarity index 94%
rename from Spigot-Server-Patches/0248-Flag-to-disable-the-channel-limit.patch
rename to Spigot-Server-Patches/0247-Flag-to-disable-the-channel-limit.patch
index 18369a5b6..bb1fcd83c 100644
--- a/Spigot-Server-Patches/0248-Flag-to-disable-the-channel-limit.patch
+++ b/Spigot-Server-Patches/0247-Flag-to-disable-the-channel-limit.patch
@@ -1,4 +1,4 @@
-From beeb06397df382083e4ce46067bffe583ad595ba Mon Sep 17 00:00:00 2001
+From 44a509258a75062d27fa7527eba1ee8641088fe3 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 31 Mar 2018 17:04:26 +0100
 Subject: [PATCH] Flag to disable the channel limit
@@ -9,7 +9,7 @@ e.g. servers which allow and support the usage of mod packs.
 provide an optional flag to disable this check, at your own risk.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ae28723ef2..898371e5f4 100644
+index b1cba904e..8699cc72f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -133,6 +133,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -30,5 +30,5 @@ index ae28723ef2..898371e5f4 100644
          if (channels.add(channel)) {
              server.getPluginManager().callEvent(new PlayerRegisterChannelEvent(this, channel));
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0249-Add-method-to-open-already-placed-sign.patch b/Spigot-Server-Patches/0248-Add-method-to-open-already-placed-sign.patch
similarity index 92%
rename from Spigot-Server-Patches/0249-Add-method-to-open-already-placed-sign.patch
rename to Spigot-Server-Patches/0248-Add-method-to-open-already-placed-sign.patch
index 20afabb3d..b4ee17de7 100644
--- a/Spigot-Server-Patches/0249-Add-method-to-open-already-placed-sign.patch
+++ b/Spigot-Server-Patches/0248-Add-method-to-open-already-placed-sign.patch
@@ -1,11 +1,11 @@
-From d10e4e52c21070aa77e423b03a65302e5ca17f9d Mon Sep 17 00:00:00 2001
+From 605d907e273d4f15dfee8305b18a4e959e108a6b Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Sun, 1 Apr 2018 02:29:37 +0300
 Subject: [PATCH] Add method to open already placed sign
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 99705b1344..32fcba1d1a 100644
+index 755d288ed..707091754 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -559,4 +559,17 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -27,5 +27,5 @@ index 99705b1344..32fcba1d1a 100644
 +    // Paper end
  }
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0250-Load-version-history-at-server-start.patch b/Spigot-Server-Patches/0249-Load-version-history-at-server-start.patch
similarity index 88%
rename from Spigot-Server-Patches/0250-Load-version-history-at-server-start.patch
rename to Spigot-Server-Patches/0249-Load-version-history-at-server-start.patch
index 90cb4c2a7..9bdc363f7 100644
--- a/Spigot-Server-Patches/0250-Load-version-history-at-server-start.patch
+++ b/Spigot-Server-Patches/0249-Load-version-history-at-server-start.patch
@@ -1,11 +1,11 @@
-From 48922982dfb8b16328a8e5c3e730750a8d5c5e6d Mon Sep 17 00:00:00 2001
+From 957c7817dad93a9d8cf4f0d4a104282337050884 Mon Sep 17 00:00:00 2001
 From: Kyle Wood <demonwav@gmail.com>
 Date: Thu, 1 Mar 2018 19:38:14 -0600
 Subject: [PATCH] Load version history at server start
 
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index fe259e985..d9c6b1104 100644
+index fb9db65ee..3dc7e2a89 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -212,6 +212,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -17,5 +17,5 @@ index fe259e985..d9c6b1104 100644
  
              DedicatedServer.LOGGER.info("Generating keypair");
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0251-Configurable-sprint-interruption-on-attack.patch b/Spigot-Server-Patches/0250-Configurable-sprint-interruption-on-attack.patch
similarity index 96%
rename from Spigot-Server-Patches/0251-Configurable-sprint-interruption-on-attack.patch
rename to Spigot-Server-Patches/0250-Configurable-sprint-interruption-on-attack.patch
index 7c9067569..d9dee1a86 100644
--- a/Spigot-Server-Patches/0251-Configurable-sprint-interruption-on-attack.patch
+++ b/Spigot-Server-Patches/0250-Configurable-sprint-interruption-on-attack.patch
@@ -1,4 +1,4 @@
-From 25155c9ec86274414859937728b50d961386a7fd Mon Sep 17 00:00:00 2001
+From f4100dc6bb306ce750f2369a5802dad3590effa7 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Sat, 14 Apr 2018 20:20:46 +0200
 Subject: [PATCH] Configurable sprint interruption on attack
diff --git a/Spigot-Server-Patches/0252-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/Spigot-Server-Patches/0251-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
similarity index 94%
rename from Spigot-Server-Patches/0252-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
rename to Spigot-Server-Patches/0251-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
index 1fa829585..f68763d17 100644
--- a/Spigot-Server-Patches/0252-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
+++ b/Spigot-Server-Patches/0251-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
@@ -1,4 +1,4 @@
-From 7caac3eb29b5b2438119eda8589590d63cf31bef Mon Sep 17 00:00:00 2001
+From b4306a885ddf71c79918aabff5fdb6865f2327b8 Mon Sep 17 00:00:00 2001
 From: 0x22 <0x22@futureclient.net>
 Date: Thu, 26 Apr 2018 04:41:11 -0400
 Subject: [PATCH] Fix exploit that allowed colored signs to be created
@@ -18,5 +18,5 @@ index 371513042..871dea68f 100644
              SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.server.getPlayer(this.player), lines);
              this.server.getPluginManager().callEvent(event);
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0253-EndermanEscapeEvent.patch b/Spigot-Server-Patches/0252-EndermanEscapeEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0253-EndermanEscapeEvent.patch
rename to Spigot-Server-Patches/0252-EndermanEscapeEvent.patch
index b8621d8c9..3958e5f49 100644
--- a/Spigot-Server-Patches/0253-EndermanEscapeEvent.patch
+++ b/Spigot-Server-Patches/0252-EndermanEscapeEvent.patch
@@ -1,4 +1,4 @@
-From aac7b934c6ba1da1ee67804cca10f524efe67535 Mon Sep 17 00:00:00 2001
+From a1c129eac9366b285b7b4a5bed20576929f97195 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 13:15:55 -0400
 Subject: [PATCH] EndermanEscapeEvent
@@ -8,7 +8,7 @@ Fires an event anytime an enderman intends to teleport away from the player
 You may cancel this, enabling ranged attacks to damage the enderman for example.
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index 53a3819ee4..6abe45fd6f 100644
+index db618ae68..5d5c21bba 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -1,6 +1,7 @@
@@ -78,5 +78,5 @@ index 53a3819ee4..6abe45fd6f 100644
                          }
  
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0254-Enderman.teleportRandomly.patch b/Spigot-Server-Patches/0253-Enderman.teleportRandomly.patch
similarity index 91%
rename from Spigot-Server-Patches/0254-Enderman.teleportRandomly.patch
rename to Spigot-Server-Patches/0253-Enderman.teleportRandomly.patch
index 46368aa3a..37a8ade3a 100644
--- a/Spigot-Server-Patches/0254-Enderman.teleportRandomly.patch
+++ b/Spigot-Server-Patches/0253-Enderman.teleportRandomly.patch
@@ -1,4 +1,4 @@
-From b0c4e5504b1e5e3cfc54db2057e31d7d8733fa05 Mon Sep 17 00:00:00 2001
+From 156fe49755603c461fdce079f0c681401edd58b3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 13:29:44 -0400
 Subject: [PATCH] Enderman.teleportRandomly()
@@ -6,7 +6,7 @@ Subject: [PATCH] Enderman.teleportRandomly()
 Ability to trigger the vanilla "teleport randomly" mechanic of an enderman.
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index 6abe45fd6f..5f636efb0c 100644
+index 5d5c21bba..d4f7805bb 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -184,6 +184,7 @@ public class EntityEnderman extends EntityMonster {
@@ -18,7 +18,7 @@ index 6abe45fd6f..5f636efb0c 100644
          double d0 = this.locX + (this.random.nextDouble() - 0.5D) * 64.0D;
          double d1 = this.locY + (double) (this.random.nextInt(64) - 32);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
-index b81693d9ff..9bc6a6c0c1 100644
+index b81693d9f..9bc6a6c0c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
 @@ -17,6 +17,7 @@ public class CraftEnderman extends CraftMonster implements Enderman {
@@ -30,5 +30,5 @@ index b81693d9ff..9bc6a6c0c1 100644
          IBlockData blockData = getHandle().getCarried();
          return (blockData == null) ? Material.AIR.getNewData((byte) 0) : CraftMagicNumbers.getMaterial(blockData);
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0255-Block-Enderpearl-Travel-Exploit.patch b/Spigot-Server-Patches/0254-Block-Enderpearl-Travel-Exploit.patch
similarity index 97%
rename from Spigot-Server-Patches/0255-Block-Enderpearl-Travel-Exploit.patch
rename to Spigot-Server-Patches/0254-Block-Enderpearl-Travel-Exploit.patch
index 44072d41c..29d316bb8 100644
--- a/Spigot-Server-Patches/0255-Block-Enderpearl-Travel-Exploit.patch
+++ b/Spigot-Server-Patches/0254-Block-Enderpearl-Travel-Exploit.patch
@@ -1,4 +1,4 @@
-From e97bd3b2054b415121bdc5eb131ccd3e207da94e Mon Sep 17 00:00:00 2001
+From cc5ce481cb20c7fec2258936b71ba6d8a478b561 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 17:15:26 -0400
 Subject: [PATCH] Block Enderpearl Travel Exploit
diff --git a/Spigot-Server-Patches/0256-Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-Server-Patches/0255-Expand-World.spawnParticle-API-and-add-Builder.patch
similarity index 96%
rename from Spigot-Server-Patches/0256-Expand-World.spawnParticle-API-and-add-Builder.patch
rename to Spigot-Server-Patches/0255-Expand-World.spawnParticle-API-and-add-Builder.patch
index c3fa12ef0..511e3b481 100644
--- a/Spigot-Server-Patches/0256-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/Spigot-Server-Patches/0255-Expand-World.spawnParticle-API-and-add-Builder.patch
@@ -1,4 +1,4 @@
-From 1f1c12ca7a9dc9d35d582850db5c44623e22f1a4 Mon Sep 17 00:00:00 2001
+From 76953fecb2b9aa243ac7b71bd8a42a804b28e07b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 15 Aug 2017 22:29:12 -0400
 Subject: [PATCH] Expand World.spawnParticle API and add Builder
@@ -10,7 +10,7 @@ Adds an option to control the force mode of the particle.
 This adds a new Builder API which is much friendlier to use.
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 682e0b87ea..a5dfc1ebf5 100644
+index b80315bc5..a30d92ce7 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1206,12 +1206,17 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -34,7 +34,7 @@ index 682e0b87ea..a5dfc1ebf5 100644
  
              if (this.a(entityplayer, force, d0, d1, d2, packetplayoutworldparticles)) { // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index e1c09452b7..84bde3ef20 100644
+index e1c09452b..84bde3ef2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1746,11 +1746,17 @@ public class CraftWorld implements World {
@@ -57,5 +57,5 @@ index e1c09452b7..84bde3ef20 100644
                  x, y, z, // Position
                  count,  // Count
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0257-EndermanAttackPlayerEvent.patch b/Spigot-Server-Patches/0256-EndermanAttackPlayerEvent.patch
similarity index 92%
rename from Spigot-Server-Patches/0257-EndermanAttackPlayerEvent.patch
rename to Spigot-Server-Patches/0256-EndermanAttackPlayerEvent.patch
index d312249c5..77ab04d4b 100644
--- a/Spigot-Server-Patches/0257-EndermanAttackPlayerEvent.patch
+++ b/Spigot-Server-Patches/0256-EndermanAttackPlayerEvent.patch
@@ -1,4 +1,4 @@
-From 081c20c5cacf693b7b401bb41b09f798db036263 Mon Sep 17 00:00:00 2001
+From 53f0c76aa8b97792b8279381a85ccaf2fa690725 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 May 2018 20:18:54 -0400
 Subject: [PATCH] EndermanAttackPlayerEvent
@@ -8,7 +8,7 @@ Allow control over whether or not an enderman aggros a player.
 This allows you to override/extend the pumpkin/stare logic.
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index 5f636efb0c..e5ccd29a08 100644
+index d4f7805bb..d5c55d50e 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -135,7 +135,15 @@ public class EntityEnderman extends EntityMonster {
@@ -28,5 +28,5 @@ index 5f636efb0c..e5ccd29a08 100644
  
          if (itemstack.getItem() == Blocks.CARVED_PUMPKIN.getItem()) {
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0258-WitchConsumePotionEvent.patch b/Spigot-Server-Patches/0257-WitchConsumePotionEvent.patch
similarity index 92%
rename from Spigot-Server-Patches/0258-WitchConsumePotionEvent.patch
rename to Spigot-Server-Patches/0257-WitchConsumePotionEvent.patch
index d5ea5cbdd..18aa362aa 100644
--- a/Spigot-Server-Patches/0258-WitchConsumePotionEvent.patch
+++ b/Spigot-Server-Patches/0257-WitchConsumePotionEvent.patch
@@ -1,4 +1,4 @@
-From c9d947db8035e9549431d25f17b33764b0653fc3 Mon Sep 17 00:00:00 2001
+From a823f8da82b3c4a701a5a3b744be38f77542d48b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 16 May 2018 20:35:16 -0400
 Subject: [PATCH] WitchConsumePotionEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] WitchConsumePotionEvent
 Fires when a witch consumes the potion in their hand
 
 diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
-index a586689acf..6717d3c331 100644
+index 093c7de52..f7d809444 100644
 --- a/src/main/java/net/minecraft/server/EntityWitch.java
 +++ b/src/main/java/net/minecraft/server/EntityWitch.java
 @@ -67,7 +67,11 @@ public class EntityWitch extends EntityMonster implements IRangedEntity {
@@ -23,5 +23,5 @@ index a586689acf..6717d3c331 100644
                          if (list != null) {
                              Iterator iterator = list.iterator();
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0259-WitchThrowPotionEvent.patch b/Spigot-Server-Patches/0258-WitchThrowPotionEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0259-WitchThrowPotionEvent.patch
rename to Spigot-Server-Patches/0258-WitchThrowPotionEvent.patch
index 2dde7537c..01b7ab230 100644
--- a/Spigot-Server-Patches/0259-WitchThrowPotionEvent.patch
+++ b/Spigot-Server-Patches/0258-WitchThrowPotionEvent.patch
@@ -1,4 +1,4 @@
-From 87695882f78f6951e4c17496a84b16eb9273a20b Mon Sep 17 00:00:00 2001
+From 5370abcb90e08348765c6ccccce25986d373bdb2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 16 May 2018 20:44:58 -0400
 Subject: [PATCH] WitchThrowPotionEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] WitchThrowPotionEvent
 Fired when a witch throws a potion at a player
 
 diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
-index 6717d3c331..648ed17a30 100644
+index f7d809444..11a8af15e 100644
 --- a/src/main/java/net/minecraft/server/EntityWitch.java
 +++ b/src/main/java/net/minecraft/server/EntityWitch.java
 @@ -154,7 +154,15 @@ public class EntityWitch extends EntityMonster implements IRangedEntity {
@@ -27,5 +27,5 @@ index 6717d3c331..648ed17a30 100644
              entitypotion.pitch -= -20.0F;
              entitypotion.shoot(d1, d2 + (double) (f1 * 0.2F), d3, 0.75F, 8.0F);
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0260-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/Spigot-Server-Patches/0259-Allow-spawning-Item-entities-with-World.spawnEntity.patch
similarity index 92%
rename from Spigot-Server-Patches/0260-Allow-spawning-Item-entities-with-World.spawnEntity.patch
rename to Spigot-Server-Patches/0259-Allow-spawning-Item-entities-with-World.spawnEntity.patch
index 8e6fc01ca..283492e5e 100644
--- a/Spigot-Server-Patches/0260-Allow-spawning-Item-entities-with-World.spawnEntity.patch
+++ b/Spigot-Server-Patches/0259-Allow-spawning-Item-entities-with-World.spawnEntity.patch
@@ -1,4 +1,4 @@
-From 8a1594063a6ad06f391b3614c7c45ae24342e8b5 Mon Sep 17 00:00:00 2001
+From 5f4d733d640cf0a0161ce388123fc93dba66b756 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 4 Jun 2018 20:39:20 -0400
 Subject: [PATCH] Allow spawning Item entities with World.spawnEntity
@@ -8,7 +8,7 @@ This API has more capabilities than .dropItem with the Consumer function
 Item can be set inside of the Consumer pre spawn function.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 84bde3ef20..e127cc91ef 100644
+index 84bde3ef2..e127cc91e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1055,6 +1055,10 @@ public class CraftWorld implements World {
@@ -23,5 +23,5 @@ index 84bde3ef20..e127cc91ef 100644
              entity = new EntityFallingBlock(world, x, y, z, world.getType(new BlockPosition(x, y, z)));
          } else if (Projectile.class.isAssignableFrom(clazz)) {
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0261-Configurable-Villages-loading-chunks-for-door-checks.patch b/Spigot-Server-Patches/0260-Configurable-Villages-loading-chunks-for-door-checks.patch
similarity index 98%
rename from Spigot-Server-Patches/0261-Configurable-Villages-loading-chunks-for-door-checks.patch
rename to Spigot-Server-Patches/0260-Configurable-Villages-loading-chunks-for-door-checks.patch
index 54038ac0c..956aabbf8 100644
--- a/Spigot-Server-Patches/0261-Configurable-Villages-loading-chunks-for-door-checks.patch
+++ b/Spigot-Server-Patches/0260-Configurable-Villages-loading-chunks-for-door-checks.patch
@@ -1,4 +1,4 @@
-From 7a2610b1588363701aabbaabf8924cadaa1d9617 Mon Sep 17 00:00:00 2001
+From 08d5af6c98be159bee0271797d26563fdd1814f9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Jun 2018 00:32:22 -0400
 Subject: [PATCH] Configurable Villages loading chunks for door checks
diff --git a/Spigot-Server-Patches/0262-WitchReadyPotionEvent.patch b/Spigot-Server-Patches/0261-WitchReadyPotionEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0262-WitchReadyPotionEvent.patch
rename to Spigot-Server-Patches/0261-WitchReadyPotionEvent.patch
index e926a1d41..6996a3eb4 100644
--- a/Spigot-Server-Patches/0262-WitchReadyPotionEvent.patch
+++ b/Spigot-Server-Patches/0261-WitchReadyPotionEvent.patch
@@ -1,11 +1,11 @@
-From a73c930e547660446807e57975e0de532c229594 Mon Sep 17 00:00:00 2001
+From 53b135e8dea526b9a7d123f3f03375c56e5087d6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Jun 2018 22:47:26 -0400
 Subject: [PATCH] WitchReadyPotionEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
-index 648ed17a30..b5f676f045 100644
+index 11a8af15e..896388c41 100644
 --- a/src/main/java/net/minecraft/server/EntityWitch.java
 +++ b/src/main/java/net/minecraft/server/EntityWitch.java
 @@ -100,7 +100,11 @@ public class EntityWitch extends EntityMonster implements IRangedEntity {
@@ -22,5 +22,5 @@ index 648ed17a30..b5f676f045 100644
                      this.a(true);
                      this.world.a((EntityHuman) null, this.locX, this.locY, this.locZ, SoundEffects.ENTITY_WITCH_DRINK, this.bV(), 1.0F, 0.8F + this.random.nextFloat() * 0.4F);
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0263-ItemStack-getMaxItemUseDuration.patch b/Spigot-Server-Patches/0262-ItemStack-getMaxItemUseDuration.patch
similarity index 91%
rename from Spigot-Server-Patches/0263-ItemStack-getMaxItemUseDuration.patch
rename to Spigot-Server-Patches/0262-ItemStack-getMaxItemUseDuration.patch
index 52f01d536..93b242d87 100644
--- a/Spigot-Server-Patches/0263-ItemStack-getMaxItemUseDuration.patch
+++ b/Spigot-Server-Patches/0262-ItemStack-getMaxItemUseDuration.patch
@@ -1,4 +1,4 @@
-From 1e12dab0780ccc1ca6e689cff0c54010aab97f66 Mon Sep 17 00:00:00 2001
+From b99b87b8536146f38d5b9b768b315bb3db69c28a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Jun 2018 23:00:29 -0400
 Subject: [PATCH] ItemStack#getMaxItemUseDuration
@@ -6,7 +6,7 @@ Subject: [PATCH] ItemStack#getMaxItemUseDuration
 Allows you to determine how long it takes to use a usable/consumable item
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index f71d9ee578..a238388012 100644
+index 3de567851..a1ec3879b 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -522,6 +522,7 @@ public final class ItemStack {
@@ -18,7 +18,7 @@ index f71d9ee578..a238388012 100644
          return this.getItem().c(this);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index e7daa95078..d6e6b9bed4 100644
+index 284630f74..1282ee399 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -183,6 +183,13 @@ public final class CraftItemStack extends ItemStack {
@@ -36,5 +36,5 @@ index e7daa95078..d6e6b9bed4 100644
      public void addUnsafeEnchantment(Enchantment ench, int level) {
          Validate.notNull(ench, "Cannot add null enchantment");
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0264-Implement-EntityTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0263-Implement-EntityTeleportEndGatewayEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0264-Implement-EntityTeleportEndGatewayEvent.patch
rename to Spigot-Server-Patches/0263-Implement-EntityTeleportEndGatewayEvent.patch
index 70eb61c9d..50bb1fec0 100644
--- a/Spigot-Server-Patches/0264-Implement-EntityTeleportEndGatewayEvent.patch
+++ b/Spigot-Server-Patches/0263-Implement-EntityTeleportEndGatewayEvent.patch
@@ -1,11 +1,11 @@
-From 9aebe1e759505f810a8893bce3ea74aa46d27df6 Mon Sep 17 00:00:00 2001
+From 0d412c9b25938e45fff9bb813e6f9edd9cae9c51 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 9 Jun 2018 14:08:39 +0200
 Subject: [PATCH] Implement EntityTeleportEndGatewayEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityEndGateway.java b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
-index b36dcb4d7d..268e4996bc 100644
+index af71c7c48..8b52a25ec 100644
 --- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 +++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 @@ -138,8 +138,19 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick
@@ -30,5 +30,5 @@ index b36dcb4d7d..268e4996bc 100644
  
              this.f();
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0265-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/Spigot-Server-Patches/0264-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
similarity index 93%
rename from Spigot-Server-Patches/0265-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
rename to Spigot-Server-Patches/0264-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
index eb3a019f0..e9152827f 100644
--- a/Spigot-Server-Patches/0265-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
+++ b/Spigot-Server-Patches/0264-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
@@ -1,4 +1,4 @@
-From 73594e284d277127349fb5fa7cd857bffcd68974 Mon Sep 17 00:00:00 2001
+From 660e2b2f1862b7cdbc2c98c8a012a979a93edf9f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 10 Jun 2018 01:18:49 -0400
 Subject: [PATCH] Unset Ignited flag on cancel of Explosion Event
@@ -6,7 +6,7 @@ Subject: [PATCH] Unset Ignited flag on cancel of Explosion Event
 Otherwise the creeper infinite explodes
 
 diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
-index 765123e3d2..19022b6e24 100644
+index 64a5fefad..569248abb 100644
 --- a/src/main/java/net/minecraft/server/EntityCreeper.java
 +++ b/src/main/java/net/minecraft/server/EntityCreeper.java
 @@ -12,7 +12,7 @@ public class EntityCreeper extends EntityMonster {
@@ -27,5 +27,5 @@ index 765123e3d2..19022b6e24 100644
              // CraftBukkit end
          }
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0266-Properly-remove-entities-on-dimension-teleport.patch b/Spigot-Server-Patches/0265-Properly-remove-entities-on-dimension-teleport.patch
similarity index 93%
rename from Spigot-Server-Patches/0266-Properly-remove-entities-on-dimension-teleport.patch
rename to Spigot-Server-Patches/0265-Properly-remove-entities-on-dimension-teleport.patch
index d03b64351..c3aad5e11 100644
--- a/Spigot-Server-Patches/0266-Properly-remove-entities-on-dimension-teleport.patch
+++ b/Spigot-Server-Patches/0265-Properly-remove-entities-on-dimension-teleport.patch
@@ -1,4 +1,4 @@
-From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
+From 7ffeeb46285513123a676adfd4f812b5c9282d16 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 10 Jun 2018 20:04:42 -0400
 Subject: [PATCH] Properly remove entities on dimension teleport
@@ -22,7 +22,7 @@ requirement, but plugins (such as my own) use this method to
 trigger a "reload" of the entity on the client.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 07a64966e..5600223d9 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2595,7 +2595,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -35,7 +35,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
              this.world.methodProfiler.a("reposition");
              /* CraftBukkit start - Handled in calculateTarget
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index a30d92ce7..83109177d 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1020,6 +1020,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -47,5 +47,5 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
          this.entitiesById.d(entity.getId());
          this.entitiesByUUID.remove(entity.getUniqueID());
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0267-Fix-CraftEntity-hashCode.patch b/Spigot-Server-Patches/0266-Fix-CraftEntity-hashCode.patch
similarity index 96%
rename from Spigot-Server-Patches/0267-Fix-CraftEntity-hashCode.patch
rename to Spigot-Server-Patches/0266-Fix-CraftEntity-hashCode.patch
index 3e0c27d82..460d6af63 100644
--- a/Spigot-Server-Patches/0267-Fix-CraftEntity-hashCode.patch
+++ b/Spigot-Server-Patches/0266-Fix-CraftEntity-hashCode.patch
@@ -1,4 +1,4 @@
-From 317790884a5372d33d4427690f75228d45d1f964 Mon Sep 17 00:00:00 2001
+From a4e93bbdfd4204957151b71f41263ce137b0f1ea Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 10 Jun 2018 20:20:15 -0400
 Subject: [PATCH] Fix CraftEntity hashCode
@@ -45,5 +45,5 @@ index 5689f8390..9aa9882e5 100644
  
      public void setMetadata(String metadataKey, MetadataValue newMetadataValue) {
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0268-Configurable-Alternative-LootPool-Luck-Formula.patch b/Spigot-Server-Patches/0267-Configurable-Alternative-LootPool-Luck-Formula.patch
similarity index 96%
rename from Spigot-Server-Patches/0268-Configurable-Alternative-LootPool-Luck-Formula.patch
rename to Spigot-Server-Patches/0267-Configurable-Alternative-LootPool-Luck-Formula.patch
index 2cf30fd8f..8bb220060 100644
--- a/Spigot-Server-Patches/0268-Configurable-Alternative-LootPool-Luck-Formula.patch
+++ b/Spigot-Server-Patches/0267-Configurable-Alternative-LootPool-Luck-Formula.patch
@@ -1,4 +1,4 @@
-From d22a1f553e1bce0ce91f494dfd9a4eb7af061df5 Mon Sep 17 00:00:00 2001
+From b91e19596e9c455a5893b65fa23a1bcb9d5bb686 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 15 Jun 2018 00:30:32 -0400
 Subject: [PATCH] Configurable Alternative LootPool Luck Formula
@@ -36,10 +36,10 @@ This change will result in some major changes to fishing formulas.
 I would love to see this change in Vanilla, so Mojang please pull :)
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index dc15bfcf8..f69a11ddf 100644
+index 5c18e5770..48b0a742a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -309,4 +309,12 @@ public class PaperConfig {
+@@ -300,4 +300,12 @@ public class PaperConfig {
                      "such as inventories, experience points, advancements and the like will not be saved when they log out.");
          }
      }
@@ -104,5 +104,5 @@ index 8daccdd6e..c2a4ed6cf 100644
      public abstract void a(Collection<ItemStack> var1, Random var2, LootTableInfo var3);
  
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0269-Print-Error-details-when-failing-to-save-player-data.patch b/Spigot-Server-Patches/0268-Print-Error-details-when-failing-to-save-player-data.patch
similarity index 88%
rename from Spigot-Server-Patches/0269-Print-Error-details-when-failing-to-save-player-data.patch
rename to Spigot-Server-Patches/0268-Print-Error-details-when-failing-to-save-player-data.patch
index 8c34f6594..d9de18978 100644
--- a/Spigot-Server-Patches/0269-Print-Error-details-when-failing-to-save-player-data.patch
+++ b/Spigot-Server-Patches/0268-Print-Error-details-when-failing-to-save-player-data.patch
@@ -1,11 +1,11 @@
-From 5fd104088d7fcb8677589cf20a19287f416006b9 Mon Sep 17 00:00:00 2001
+From 4b7926e5b453411ba73aab8df0c3a03898071b64 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 15 Jun 2018 20:37:03 -0400
 Subject: [PATCH] Print Error details when failing to save player data
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
-index 7553280d21..ab085788ab 100644
+index 7553280d2..ab085788a 100644
 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
 +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
 @@ -154,7 +154,7 @@ public class WorldNBTStorage implements IDataManager, IPlayerFileData {
@@ -18,5 +18,5 @@ index 7553280d21..ab085788ab 100644
  
      }
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0270-Make-shield-blocking-delay-configurable.patch b/Spigot-Server-Patches/0269-Make-shield-blocking-delay-configurable.patch
similarity index 97%
rename from Spigot-Server-Patches/0270-Make-shield-blocking-delay-configurable.patch
rename to Spigot-Server-Patches/0269-Make-shield-blocking-delay-configurable.patch
index 01edda1a6..77543639e 100644
--- a/Spigot-Server-Patches/0270-Make-shield-blocking-delay-configurable.patch
+++ b/Spigot-Server-Patches/0269-Make-shield-blocking-delay-configurable.patch
@@ -1,4 +1,4 @@
-From 46da1c9803991fcad8559c8340356353bbb9d894 Mon Sep 17 00:00:00 2001
+From 0741f31ada8315f118a38e97acfcfa5133d30ec7 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 16 Jun 2018 01:18:16 -0500
 Subject: [PATCH] Make shield blocking delay configurable
diff --git a/Spigot-Server-Patches/0271-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch b/Spigot-Server-Patches/0270-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
similarity index 95%
rename from Spigot-Server-Patches/0271-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
rename to Spigot-Server-Patches/0270-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
index 57957be4a..aca01660e 100644
--- a/Spigot-Server-Patches/0271-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
+++ b/Spigot-Server-Patches/0270-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
@@ -1,4 +1,4 @@
-From c45f03541ddd2ec94c13f403ba49db5ef960d275 Mon Sep 17 00:00:00 2001
+From 1a9a6679427f52fe5262edb0a31b9cb71b981f0f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 16 Jun 2018 16:23:38 -0400
 Subject: [PATCH] Ignore Missing Recipes in RecipeBook to avoid data errors
@@ -32,5 +32,5 @@ index 1a1619260..c8cdd990e 100644
          }
  
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0272-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/Spigot-Server-Patches/0271-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
similarity index 98%
rename from Spigot-Server-Patches/0272-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
rename to Spigot-Server-Patches/0271-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
index fcdba55cc..41b1d4d04 100644
--- a/Spigot-Server-Patches/0272-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
+++ b/Spigot-Server-Patches/0271-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
@@ -1,4 +1,4 @@
-From d612d82b0a3ff0130214126a54fb0de279d69ae2 Mon Sep 17 00:00:00 2001
+From 6707b69e2360665a4ff5550a008be9ddf04030d3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 15 Jun 2013 19:51:17 -0400
 Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API
@@ -80,5 +80,5 @@ index 8d12155c3..3f17fbd37 100644
  
          return event;
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0273-PlayerReadyArrowEvent.patch b/Spigot-Server-Patches/0272-PlayerReadyArrowEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0273-PlayerReadyArrowEvent.patch
rename to Spigot-Server-Patches/0272-PlayerReadyArrowEvent.patch
index 71d2dbc35..a9b2fc1d9 100644
--- a/Spigot-Server-Patches/0273-PlayerReadyArrowEvent.patch
+++ b/Spigot-Server-Patches/0272-PlayerReadyArrowEvent.patch
@@ -1,4 +1,4 @@
-From c49c00d50f048309923a635b82d67ab84c7a4723 Mon Sep 17 00:00:00 2001
+From 6a1faac5ed0df41c015eb1859f952485bac1774b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 18 Jun 2018 01:12:53 -0400
 Subject: [PATCH] PlayerReadyArrowEvent
@@ -7,7 +7,7 @@ Called when a player is firing a bow and the server is choosing an arrow to use.
 Plugins can skip selection of certain arrows and control which is used.
 
 diff --git a/src/main/java/net/minecraft/server/ItemBow.java b/src/main/java/net/minecraft/server/ItemBow.java
-index 152b179ce1..797e9ecf11 100644
+index 152b179ce..797e9ecf1 100644
 --- a/src/main/java/net/minecraft/server/ItemBow.java
 +++ b/src/main/java/net/minecraft/server/ItemBow.java
 @@ -1,5 +1,6 @@
@@ -75,5 +75,5 @@ index 152b179ce1..797e9ecf11 100644
          if (!entityhuman.abilities.canInstantlyBuild && !flag) {
              return flag ? new InteractionResultWrapper(EnumInteractionResult.PASS, itemstack) : new InteractionResultWrapper(EnumInteractionResult.FAIL, itemstack);
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0274-Fire-EntityShootBowEvent-for-Illusioner.patch b/Spigot-Server-Patches/0273-Fire-EntityShootBowEvent-for-Illusioner.patch
similarity index 92%
rename from Spigot-Server-Patches/0274-Fire-EntityShootBowEvent-for-Illusioner.patch
rename to Spigot-Server-Patches/0273-Fire-EntityShootBowEvent-for-Illusioner.patch
index 81b62ab98..e7e5846a6 100644
--- a/Spigot-Server-Patches/0274-Fire-EntityShootBowEvent-for-Illusioner.patch
+++ b/Spigot-Server-Patches/0273-Fire-EntityShootBowEvent-for-Illusioner.patch
@@ -1,11 +1,11 @@
-From 4a63c370d62804b3a2d2ec760b7ea68b4831a37c Mon Sep 17 00:00:00 2001
+From 2f7f07012b3ef439c0d93e98378815f01000dd92 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 18 Jun 2018 22:19:36 -0400
 Subject: [PATCH] Fire EntityShootBowEvent for Illusioner
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
-index 54c7c95a3b..6db21668d4 100644
+index 4aee9d794..f62b38c35 100644
 --- a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
 +++ b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
 @@ -123,8 +123,18 @@ public class EntityIllagerIllusioner extends EntityIllagerWizard implements IRan
@@ -29,5 +29,5 @@ index 54c7c95a3b..6db21668d4 100644
  
      protected EntityArrow v(float f) {
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0275-Implement-EntityKnockbackByEntityEvent.patch b/Spigot-Server-Patches/0274-Implement-EntityKnockbackByEntityEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0275-Implement-EntityKnockbackByEntityEvent.patch
rename to Spigot-Server-Patches/0274-Implement-EntityKnockbackByEntityEvent.patch
index c397280f9..6ae4ad273 100644
--- a/Spigot-Server-Patches/0275-Implement-EntityKnockbackByEntityEvent.patch
+++ b/Spigot-Server-Patches/0274-Implement-EntityKnockbackByEntityEvent.patch
@@ -1,4 +1,4 @@
-From b664061d5a2f0735d9077636c959ecbda15c7795 Mon Sep 17 00:00:00 2001
+From 387b89e5a2142154b75d78517dd7308cda269adb Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Mon, 18 Jun 2018 15:46:23 +0200
 Subject: [PATCH] Implement EntityKnockbackByEntityEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement EntityKnockbackByEntityEvent
 This event is called when an entity receives knockback by another entity.
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 566f6e3a6a..a8f58a13fe 100644
+index 67ed48652..8aef335a1 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1251,6 +1251,12 @@ public abstract class EntityLiving extends Entity {
@@ -42,5 +42,5 @@ index 566f6e3a6a..a8f58a13fe 100644
      }
  
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0276-Expand-Explosions-API.patch b/Spigot-Server-Patches/0275-Expand-Explosions-API.patch
similarity index 91%
rename from Spigot-Server-Patches/0276-Expand-Explosions-API.patch
rename to Spigot-Server-Patches/0275-Expand-Explosions-API.patch
index 0fdb5a97c..466c316c1 100644
--- a/Spigot-Server-Patches/0276-Expand-Explosions-API.patch
+++ b/Spigot-Server-Patches/0275-Expand-Explosions-API.patch
@@ -1,4 +1,4 @@
-From ae111c2505930a400cfe893885976c3557707640 Mon Sep 17 00:00:00 2001
+From d90d21380374c1524ad795a87d28747124f4c57e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 20 Jun 2018 23:17:24 -0400
 Subject: [PATCH] Expand Explosions API
@@ -6,7 +6,7 @@ Subject: [PATCH] Expand Explosions API
 Add Entity as a Source capability, and add more API choices, and on Location.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index e127cc91ef..d6f9953777 100644
+index e127cc91e..d6f995377 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -524,6 +524,11 @@ public class CraftWorld implements World {
@@ -22,5 +22,5 @@ index e127cc91ef..d6f9953777 100644
      public boolean createExplosion(Location loc, float power) {
          return createExplosion(loc, power, false);
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0277-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-Server-Patches/0276-LivingEntity-Hand-Raised-Item-Use-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0277-LivingEntity-Hand-Raised-Item-Use-API.patch
rename to Spigot-Server-Patches/0276-LivingEntity-Hand-Raised-Item-Use-API.patch
index 591485642..8a1e249eb 100644
--- a/Spigot-Server-Patches/0277-LivingEntity-Hand-Raised-Item-Use-API.patch
+++ b/Spigot-Server-Patches/0276-LivingEntity-Hand-Raised-Item-Use-API.patch
@@ -1,4 +1,4 @@
-From 59f1cdb547e2355cf6ab94742fd601f41954550e Mon Sep 17 00:00:00 2001
+From c8a0f617763aabdf82bf3856b5ca3b375deab1a5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 29 Jun 2018 00:21:28 -0400
 Subject: [PATCH] LivingEntity Hand Raised/Item Use API
@@ -62,5 +62,5 @@ index 8e65bfc78..52834b6da 100644
      // Paper end
  }
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0278-RangedEntity-API.patch b/Spigot-Server-Patches/0277-RangedEntity-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0278-RangedEntity-API.patch
rename to Spigot-Server-Patches/0277-RangedEntity-API.patch
index b0ac2789b..9182cdffa 100644
--- a/Spigot-Server-Patches/0278-RangedEntity-API.patch
+++ b/Spigot-Server-Patches/0277-RangedEntity-API.patch
@@ -1,4 +1,4 @@
-From 27094bee52b30dc3ffbda02d5db78a8f77ba9d6f Mon Sep 17 00:00:00 2001
+From 96e4498b872011add7476c3d221f0f75c9ee8658 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 26 Jun 2018 22:00:49 -0400
 Subject: [PATCH] RangedEntity API
@@ -139,7 +139,7 @@ index c08833cb7..f25998eb6 100644
          super(server, entity);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
-index 2b00b3772..effcfa2d8 100644
+index 3df0fcb9b..a1d04ff28 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
 @@ -1,5 +1,6 @@
@@ -159,5 +159,5 @@ index 2b00b3772..effcfa2d8 100644
      private BossBar bossBar;
  
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0279-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch b/Spigot-Server-Patches/0278-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch
similarity index 94%
rename from Spigot-Server-Patches/0279-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch
rename to Spigot-Server-Patches/0278-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch
index 36d90e3b1..0ea2dac9c 100644
--- a/Spigot-Server-Patches/0279-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch
+++ b/Spigot-Server-Patches/0278-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch
@@ -1,4 +1,4 @@
-From 60a79fd7ebc61e53da457fbc62b43064f962b9f8 Mon Sep 17 00:00:00 2001
+From 405ca5db1a06b1eb62ef401c25629edcba54ac59 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Sat, 30 Jun 2018 05:45:39 +0200
 Subject: [PATCH] Improve ProjectileHitEvent to include the BlockFace where the
@@ -19,5 +19,5 @@ index 3f17fbd37..dfedd4c30 100644
          return event;
      }
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0280-Add-config-to-disable-ender-dragon-legacy-check.patch b/Spigot-Server-Patches/0279-Add-config-to-disable-ender-dragon-legacy-check.patch
similarity index 75%
rename from Spigot-Server-Patches/0280-Add-config-to-disable-ender-dragon-legacy-check.patch
rename to Spigot-Server-Patches/0279-Add-config-to-disable-ender-dragon-legacy-check.patch
index d36ce63d1..d59343e35 100644
--- a/Spigot-Server-Patches/0280-Add-config-to-disable-ender-dragon-legacy-check.patch
+++ b/Spigot-Server-Patches/0279-Add-config-to-disable-ender-dragon-legacy-check.patch
@@ -1,4 +1,4 @@
-From ca75b9e2215df7923fe306514a5e3514f694d94f Mon Sep 17 00:00:00 2001
+From b62d50045a2dd2fceb8f8cb4a6327091d6f4e3c7 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 22 Jun 2018 10:38:31 -0500
 Subject: [PATCH] Add config to disable ender dragon legacy check
@@ -19,10 +19,10 @@ index 875650b8d..74185b31f 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java
-index 1e22aa531..67808446c 100644
+index 1e22aa531..e6da1c30f 100644
 --- a/src/main/java/net/minecraft/server/EnderDragonBattle.java
 +++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java
-@@ -27,10 +27,11 @@ public class EnderDragonBattle {
+@@ -27,16 +27,21 @@ public class EnderDragonBattle {
      private int h;
      private int i;
      private int j;
@@ -35,7 +35,17 @@ index 1e22aa531..67808446c 100644
      private BlockPosition o;
      private EnumDragonRespawn p;
      private int q;
-@@ -293,7 +294,7 @@ public class EnderDragonBattle {
+     private List<EntityEnderCrystal> r;
+ 
+     public EnderDragonBattle(WorldServer worldserver, NBTTagCompound nbttagcompound) {
++        // Paper start
++        setScanForLegacyFight(worldserver.paperConfig.scanForLegacyEnderDragon);
++        if (!scanForLegacyFight()) setDragonKilled(true);
++        // Paper end
+         this.d = worldserver;
+         if (nbttagcompound.hasKeyOfType("DragonKilled", 99)) {
+             if (nbttagcompound.b("DragonUUID")) {
+@@ -293,7 +298,7 @@ public class EnderDragonBattle {
              hashset.add(entityplayer);
          }
  
diff --git a/Spigot-Server-Patches/0281-Implement-World.getEntity-UUID-API.patch b/Spigot-Server-Patches/0280-Implement-World.getEntity-UUID-API.patch
similarity index 88%
rename from Spigot-Server-Patches/0281-Implement-World.getEntity-UUID-API.patch
rename to Spigot-Server-Patches/0280-Implement-World.getEntity-UUID-API.patch
index 5f2a84686..c9fc944d8 100644
--- a/Spigot-Server-Patches/0281-Implement-World.getEntity-UUID-API.patch
+++ b/Spigot-Server-Patches/0280-Implement-World.getEntity-UUID-API.patch
@@ -1,11 +1,11 @@
-From 61cf48e76ea55f17222b189250e28f216aecb30a Mon Sep 17 00:00:00 2001
+From 2f7cc4b77d8a76cd5591cdd73dc0a593ed30d667 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 3 Jul 2018 16:08:14 +0200
 Subject: [PATCH] Implement World.getEntity(UUID) API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index d6f9953777..a05320c908 100644
+index d6f995377..a05320c90 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -875,6 +875,14 @@ public class CraftWorld implements World {
@@ -24,5 +24,5 @@ index d6f9953777..a05320c908 100644
      // Spigot start
          save(true);
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0282-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0281-InventoryCloseEvent-Reason-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0282-InventoryCloseEvent-Reason-API.patch
rename to Spigot-Server-Patches/0281-InventoryCloseEvent-Reason-API.patch
index 09010be51..f2c5a9e8c 100644
--- a/Spigot-Server-Patches/0282-InventoryCloseEvent-Reason-API.patch
+++ b/Spigot-Server-Patches/0281-InventoryCloseEvent-Reason-API.patch
@@ -1,4 +1,4 @@
-From 5d63a3c07d358801ce32bba4d4f26098c738e4db Mon Sep 17 00:00:00 2001
+From 1d69bda1bb0ad97f6b6883bf69578383d490c36a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 3 Jul 2018 21:56:23 -0400
 Subject: [PATCH] InventoryCloseEvent Reason API
@@ -7,7 +7,7 @@ Allows you to determine why an inventory was closed, enabling plugin developers
 to "confirm" things based on if it was player triggered close or not.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index cded44bc4..101343849 100644
+index 9430bccf6..aedf31a07 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -931,7 +931,7 @@ public class Chunk implements IChunkAccess {
@@ -193,5 +193,5 @@ index dfedd4c30..b220895c2 100644
          human.activeContainer.transferTo(human.defaultContainer, human.getBukkitEntity());
      }
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0283-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch b/Spigot-Server-Patches/0282-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
similarity index 96%
rename from Spigot-Server-Patches/0283-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
rename to Spigot-Server-Patches/0282-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
index cc7bc9424..544b3a226 100644
--- a/Spigot-Server-Patches/0283-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
+++ b/Spigot-Server-Patches/0282-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
@@ -1,4 +1,4 @@
-From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
+From 5c0bebf72e955ea07f0ade815cdfbaf6e028e720 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 03:39:51 -0400
 Subject: [PATCH] Avoid Chunk Lookups for Entity/TileEntity Current Chunk
@@ -10,7 +10,7 @@ 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/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index aedf31a07..8ff542c88 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -719,6 +719,7 @@ public class Chunk implements IChunkAccess {
@@ -22,7 +22,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
          this.a(entity, entity.af);
      }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index a14518ba6..980f373b1 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1258,12 +1258,15 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -85,5 +85,5 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
              }
          }
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0284-Configurable-Bed-Search-Radius.patch b/Spigot-Server-Patches/0283-Configurable-Bed-Search-Radius.patch
similarity index 98%
rename from Spigot-Server-Patches/0284-Configurable-Bed-Search-Radius.patch
rename to Spigot-Server-Patches/0283-Configurable-Bed-Search-Radius.patch
index 22a9256ca..3329d96c8 100644
--- a/Spigot-Server-Patches/0284-Configurable-Bed-Search-Radius.patch
+++ b/Spigot-Server-Patches/0283-Configurable-Bed-Search-Radius.patch
@@ -1,4 +1,4 @@
-From 31a804ff9a03c3897cfd1320fe51638676ff0b57 Mon Sep 17 00:00:00 2001
+From c67f05080f86570908b8e71f87484372bbe3b7c6 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
diff --git a/Spigot-Server-Patches/0285-Vex-getSummoner-API.patch b/Spigot-Server-Patches/0284-Vex-getSummoner-API.patch
similarity index 91%
rename from Spigot-Server-Patches/0285-Vex-getSummoner-API.patch
rename to Spigot-Server-Patches/0284-Vex-getSummoner-API.patch
index 8cc9b9410..3d632f7b9 100644
--- a/Spigot-Server-Patches/0285-Vex-getSummoner-API.patch
+++ b/Spigot-Server-Patches/0284-Vex-getSummoner-API.patch
@@ -1,4 +1,4 @@
-From 69419d95db57ea53d9bd6aefa1c93bc9c302302d Mon Sep 17 00:00:00 2001
+From cdf23d76a567bbe5173d53ed24d192ca4471198d 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 9c08b3e182..6e029ff44c 100644
+index b83826b18..90028c802 100644
 --- a/src/main/java/net/minecraft/server/EntityVex.java
 +++ b/src/main/java/net/minecraft/server/EntityVex.java
 @@ -86,6 +86,7 @@ public class EntityVex extends EntityMonster {
@@ -18,7 +18,7 @@ index 9c08b3e182..6e029ff44c 100644
          return this.b;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
-index 787a41e015..927ed9a9a8 100644
+index 787a41e01..927ed9a9a 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 @@
@@ -47,5 +47,5 @@ index 787a41e015..927ed9a9a8 100644
      public String toString() {
          return "CraftVex";
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0286-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/Spigot-Server-Patches/0285-Refresh-player-inventory-when-cancelling-PlayerInter.patch
similarity index 95%
rename from Spigot-Server-Patches/0286-Refresh-player-inventory-when-cancelling-PlayerInter.patch
rename to Spigot-Server-Patches/0285-Refresh-player-inventory-when-cancelling-PlayerInter.patch
index f93bd1db0..24df10a4b 100644
--- a/Spigot-Server-Patches/0286-Refresh-player-inventory-when-cancelling-PlayerInter.patch
+++ b/Spigot-Server-Patches/0285-Refresh-player-inventory-when-cancelling-PlayerInter.patch
@@ -1,4 +1,4 @@
-From a2401ef6a6fb1f963e4fba262d19a483d57993de Mon Sep 17 00:00:00 2001
+From e42d82959a7bf4c09b1b36f3aa18e7434ee3c4d0 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
@@ -28,5 +28,5 @@ index 30d5c1734..e204dbe21 100644
                      }
                      // CraftBukkit end
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0287-Don-t-change-the-Entity-Random-seed-for-squids.patch b/Spigot-Server-Patches/0286-Don-t-change-the-Entity-Random-seed-for-squids.patch
similarity index 87%
rename from Spigot-Server-Patches/0287-Don-t-change-the-Entity-Random-seed-for-squids.patch
rename to Spigot-Server-Patches/0286-Don-t-change-the-Entity-Random-seed-for-squids.patch
index ae68ef244..55b96f93a 100644
--- a/Spigot-Server-Patches/0287-Don-t-change-the-Entity-Random-seed-for-squids.patch
+++ b/Spigot-Server-Patches/0286-Don-t-change-the-Entity-Random-seed-for-squids.patch
@@ -1,11 +1,11 @@
-From 8ecfbad7b86050b24ad575382b3fd29c199bc5a8 Mon Sep 17 00:00:00 2001
+From 5ce33612445c4672c447d2efc855486b879f3bbd 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 2dfa794a3f..522ce36cba 100644
+index a5edc5bc2..12aaab90a 100644
 --- a/src/main/java/net/minecraft/server/EntitySquid.java
 +++ b/src/main/java/net/minecraft/server/EntitySquid.java
 @@ -22,7 +22,7 @@ public class EntitySquid extends EntityWaterAnimal {
@@ -18,5 +18,5 @@ index 2dfa794a3f..522ce36cba 100644
      }
  
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0288-Re-add-vanilla-entity-warnings-for-duplicates.patch b/Spigot-Server-Patches/0287-Re-add-vanilla-entity-warnings-for-duplicates.patch
similarity index 92%
rename from Spigot-Server-Patches/0288-Re-add-vanilla-entity-warnings-for-duplicates.patch
rename to Spigot-Server-Patches/0287-Re-add-vanilla-entity-warnings-for-duplicates.patch
index ef2c578df..cb7e40443 100644
--- a/Spigot-Server-Patches/0288-Re-add-vanilla-entity-warnings-for-duplicates.patch
+++ b/Spigot-Server-Patches/0287-Re-add-vanilla-entity-warnings-for-duplicates.patch
@@ -1,4 +1,4 @@
-From fb17a0382199e08478fafa054ffaba06dcfce1fa Mon Sep 17 00:00:00 2001
+From 8c69389cc19ab38e56bd06e965cdd5e2d7a9937c 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 b939c31b23..27278078e4 100644
+index 83109177d..a07077397 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -986,7 +986,8 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -22,5 +22,5 @@ index b939c31b23..27278078e4 100644
                      }
  
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0289-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch b/Spigot-Server-Patches/0288-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch
similarity index 94%
rename from Spigot-Server-Patches/0289-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch
rename to Spigot-Server-Patches/0288-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch
index 768e3765d..e989b66cf 100644
--- a/Spigot-Server-Patches/0289-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch
+++ b/Spigot-Server-Patches/0288-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch
@@ -1,4 +1,4 @@
-From cbad86f2de8d4863753c51a2eb06ee6fb8a8230a Mon Sep 17 00:00:00 2001
+From 43c7596b978dcbe81872177d170fed143666f568 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 19 Jul 2018 01:23:00 -0400
 Subject: [PATCH] Don't process despawn if entity is in a chunk scheduled for
@@ -25,5 +25,5 @@ index a28aa016c..d92b6a6ea 100644
  
              if (entityhuman != null && entityhuman.affectsSpawning) { // Paper - Affects Spawning API
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0290-Avoid-item-merge-if-stack-size-above-max-stack-size.patch b/Spigot-Server-Patches/0289-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
similarity index 89%
rename from Spigot-Server-Patches/0290-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
rename to Spigot-Server-Patches/0289-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
index a5f6a3526..3a55d6b54 100644
--- a/Spigot-Server-Patches/0290-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
+++ b/Spigot-Server-Patches/0289-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
@@ -1,11 +1,11 @@
-From 74c3f8a4b47eda9664038146cd285a1142732039 Mon Sep 17 00:00:00 2001
+From a5cceec9307d5362b29f671904840bdd61cd9abb 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 946e59753e..f596b4351b 100644
+index 0b4cab0af..7264773ef 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -173,6 +173,10 @@ public class EntityItem extends Entity {
@@ -20,5 +20,5 @@ index 946e59753e..f596b4351b 100644
          double radius = world.spigotConfig.itemMerge;
          Iterator iterator = this.world.a(EntityItem.class, this.getBoundingBox().grow(radius, radius, radius)).iterator();
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0291-Use-asynchronous-Log4j-2-loggers.patch b/Spigot-Server-Patches/0290-Use-asynchronous-Log4j-2-loggers.patch
similarity index 87%
rename from Spigot-Server-Patches/0291-Use-asynchronous-Log4j-2-loggers.patch
rename to Spigot-Server-Patches/0290-Use-asynchronous-Log4j-2-loggers.patch
index 838ac40ba..1a62a79f5 100644
--- a/Spigot-Server-Patches/0291-Use-asynchronous-Log4j-2-loggers.patch
+++ b/Spigot-Server-Patches/0290-Use-asynchronous-Log4j-2-loggers.patch
@@ -1,11 +1,11 @@
-From 2e7ba223102646f119fdfdbee12670b397a3b8d2 Mon Sep 17 00:00:00 2001
+From f88d82ab0d6f8d8ab30383396e41b6cb588fdc32 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 b28f8e0929..6d8b27e927 100644
+index f4dcd8564..282410a22 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -73,6 +73,13 @@
@@ -24,11 +24,11 @@ index b28f8e0929..6d8b27e927 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 0000000000..ee7c90784c
+index 000000000..ee7c90784
 --- /dev/null
 +++ b/src/main/resources/log4j2.component.properties
 @@ -0,0 +1 @@
 +Log4jContextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0292-add-more-information-to-Entity.toString.patch b/Spigot-Server-Patches/0291-add-more-information-to-Entity.toString.patch
similarity index 95%
rename from Spigot-Server-Patches/0292-add-more-information-to-Entity.toString.patch
rename to Spigot-Server-Patches/0291-add-more-information-to-Entity.toString.patch
index a0cd49bed..ca7c97abb 100644
--- a/Spigot-Server-Patches/0292-add-more-information-to-Entity.toString.patch
+++ b/Spigot-Server-Patches/0291-add-more-information-to-Entity.toString.patch
@@ -1,4 +1,4 @@
-From 91b0749f983780bab7e46d67a6d2908a1209fc8e Mon Sep 17 00:00:00 2001
+From feb89c43a9cc4398764516124c5bb289e15bddb3 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()
@@ -19,5 +19,5 @@ index 5600223d9..173712659 100644
  
      public boolean isInvulnerable(DamageSource damagesource) {
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0293-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/Spigot-Server-Patches/0292-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
similarity index 96%
rename from Spigot-Server-Patches/0293-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
rename to Spigot-Server-Patches/0292-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
index eae75ec15..c20a98f26 100644
--- a/Spigot-Server-Patches/0293-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
+++ b/Spigot-Server-Patches/0292-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
@@ -1,4 +1,4 @@
-From 23a899902be4cf2fe569776330edac2e5dd52740 Mon Sep 17 00:00:00 2001
+From b0f35b7948542c90faf5e855470bc0ac36a49eca 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 42c1c47c58..3606c78843 100644
+index 173712659..a402f71a9 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -73,6 +73,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -18,7 +18,7 @@ index 42c1c47c58..3606c78843 100644
          if (bukkitEntity == null) {
              bukkitEntity = CraftEntity.getEntity(world.getServer(), this);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index ee2cdb897c..a341f5de9a 100644
+index 980f373b1..29c3a24f2 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -115,6 +115,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -30,7 +30,7 @@ index ee2cdb897c..a341f5de9a 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 27278078e4..7eab55e7c1 100644
+index a07077397..0bb903aab 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -55,6 +55,9 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -103,5 +103,5 @@ index 27278078e4..7eab55e7c1 100644
  
          if (aentity != null) {
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0294-EnderDragon-Events.patch b/Spigot-Server-Patches/0293-EnderDragon-Events.patch
similarity index 95%
rename from Spigot-Server-Patches/0294-EnderDragon-Events.patch
rename to Spigot-Server-Patches/0293-EnderDragon-Events.patch
index c26737977..8244089cc 100644
--- a/Spigot-Server-Patches/0294-EnderDragon-Events.patch
+++ b/Spigot-Server-Patches/0293-EnderDragon-Events.patch
@@ -1,11 +1,11 @@
-From cf7eb31d8748ed0bcf048d8146af360669173b0c Mon Sep 17 00:00:00 2001
+From c0149cb74524b73b11a7d9b475c24bbd4105c836 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 45f96078c5..fed3e9daf1 100644
+index 45f96078c..fed3e9daf 100644
 --- a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
 +++ b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
 @@ -61,7 +61,9 @@ public class DragonControllerLandedFlame extends AbstractDragonControllerLanded
@@ -27,7 +27,7 @@ index 45f96078c5..fed3e9daf1 100644
          if (this.d != null) {
              this.d.die();
 diff --git a/src/main/java/net/minecraft/server/DragonControllerStrafe.java b/src/main/java/net/minecraft/server/DragonControllerStrafe.java
-index 66223af9a8..7aa8a5708d 100644
+index 8dd378826..ddbd90032 100644
 --- a/src/main/java/net/minecraft/server/DragonControllerStrafe.java
 +++ b/src/main/java/net/minecraft/server/DragonControllerStrafe.java
 @@ -57,7 +57,9 @@ public class DragonControllerStrafe extends AbstractDragonController {
@@ -41,7 +41,7 @@ index 66223af9a8..7aa8a5708d 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 e746a6a0da..366ebb8d2d 100644
+index e746a6a0d..366ebb8d2 100644
 --- a/src/main/java/net/minecraft/server/EntityDragonFireball.java
 +++ b/src/main/java/net/minecraft/server/EntityDragonFireball.java
 @@ -32,8 +32,10 @@ public class EntityDragonFireball extends EntityFireball {
@@ -56,5 +56,5 @@ index e746a6a0da..366ebb8d2d 100644
              }
  
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0295-PlayerElytraBoostEvent.patch b/Spigot-Server-Patches/0294-PlayerElytraBoostEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0295-PlayerElytraBoostEvent.patch
rename to Spigot-Server-Patches/0294-PlayerElytraBoostEvent.patch
index b69ccfbb9..d15259bbf 100644
--- a/Spigot-Server-Patches/0295-PlayerElytraBoostEvent.patch
+++ b/Spigot-Server-Patches/0294-PlayerElytraBoostEvent.patch
@@ -1,11 +1,11 @@
-From 9e35ddf0782e89383c33333b36d2640d7cf216ce Mon Sep 17 00:00:00 2001
+From caf72921abadbe4f2d25b8c8c4f854c10bdc234c 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 d971bbc76c..4ce9c60895 100644
+index d971bbc76..4ce9c6089 100644
 --- a/src/main/java/net/minecraft/server/ItemFireworks.java
 +++ b/src/main/java/net/minecraft/server/ItemFireworks.java
 @@ -28,9 +28,15 @@ public class ItemFireworks extends Item {
@@ -28,5 +28,5 @@ index d971bbc76c..4ce9c60895 100644
              }
  
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0296-PlayerLaunchProjectileEvent.patch b/Spigot-Server-Patches/0295-PlayerLaunchProjectileEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0296-PlayerLaunchProjectileEvent.patch
rename to Spigot-Server-Patches/0295-PlayerLaunchProjectileEvent.patch
index 8e53c29e2..eb610bbed 100644
--- a/Spigot-Server-Patches/0296-PlayerLaunchProjectileEvent.patch
+++ b/Spigot-Server-Patches/0295-PlayerLaunchProjectileEvent.patch
@@ -1,11 +1,11 @@
-From 1e69a35c0ca2212f2b3576237f2e20481064ecc9 Mon Sep 17 00:00:00 2001
+From 76d7a27d33147add3dd195d96c3c052341a4985d 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 adc38763b9..776c86f1fe 100644
+index adc38763b..776c86f1f 100644
 --- a/src/main/java/net/minecraft/server/ItemEgg.java
 +++ b/src/main/java/net/minecraft/server/ItemEgg.java
 @@ -7,15 +7,34 @@ public class ItemEgg extends Item {
@@ -49,7 +49,7 @@ index adc38763b9..776c86f1fe 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 876384f37b..8b8bc8ec1c 100644
+index 876384f37..8b8bc8ec1 100644
 --- a/src/main/java/net/minecraft/server/ItemEnderPearl.java
 +++ b/src/main/java/net/minecraft/server/ItemEnderPearl.java
 @@ -14,7 +14,19 @@ public class ItemEnderPearl extends Item {
@@ -97,7 +97,7 @@ index 876384f37b..8b8bc8ec1c 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 b167c54417..42a0329c29 100644
+index b167c5441..42a0329c2 100644
 --- a/src/main/java/net/minecraft/server/ItemExpBottle.java
 +++ b/src/main/java/net/minecraft/server/ItemExpBottle.java
 @@ -7,15 +7,34 @@ public class ItemExpBottle extends Item {
@@ -141,7 +141,7 @@ index b167c54417..42a0329c29 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 ab7807d832..46c64c760f 100644
+index ab7807d83..46c64c760 100644
 --- a/src/main/java/net/minecraft/server/ItemLingeringPotion.java
 +++ b/src/main/java/net/minecraft/server/ItemLingeringPotion.java
 @@ -7,12 +7,37 @@ public class ItemLingeringPotion extends ItemPotion {
@@ -186,7 +186,7 @@ index ab7807d832..46c64c760f 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 332145c32b..5c23c9ae0c 100644
+index 332145c32..5c23c9ae0 100644
 --- a/src/main/java/net/minecraft/server/ItemSnowball.java
 +++ b/src/main/java/net/minecraft/server/ItemSnowball.java
 @@ -21,15 +21,23 @@ public class ItemSnowball extends Item {
@@ -219,7 +219,7 @@ index 332145c32b..5c23c9ae0c 100644
          // CraftBukkit end
  
 diff --git a/src/main/java/net/minecraft/server/ItemSplashPotion.java b/src/main/java/net/minecraft/server/ItemSplashPotion.java
-index 426b42a12c..a4e2f70c7c 100644
+index 426b42a12..a4e2f70c7 100644
 --- a/src/main/java/net/minecraft/server/ItemSplashPotion.java
 +++ b/src/main/java/net/minecraft/server/ItemSplashPotion.java
 @@ -7,12 +7,36 @@ public class ItemSplashPotion extends ItemPotion {
@@ -263,5 +263,5 @@ index 426b42a12c..a4e2f70c7c 100644
  
          entityhuman.b(StatisticList.ITEM_USED.b(this));
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0297-Duplicate-UUID-Resolve-Option.patch b/Spigot-Server-Patches/0296-Duplicate-UUID-Resolve-Option.patch
similarity index 99%
rename from Spigot-Server-Patches/0297-Duplicate-UUID-Resolve-Option.patch
rename to Spigot-Server-Patches/0296-Duplicate-UUID-Resolve-Option.patch
index 82e330bfc..3ca45f51e 100644
--- a/Spigot-Server-Patches/0297-Duplicate-UUID-Resolve-Option.patch
+++ b/Spigot-Server-Patches/0296-Duplicate-UUID-Resolve-Option.patch
@@ -1,4 +1,4 @@
-From 62074554848b01cbe35c0ca21f3372af595eb185 Mon Sep 17 00:00:00 2001
+From 04c998bf22d871ead237bc6be5e12cd676965219 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Jul 2018 14:27:34 -0400
 Subject: [PATCH] Duplicate UUID Resolve Option
diff --git a/Spigot-Server-Patches/0298-Speedup-BlockPos-by-fixing-inlining.patch b/Spigot-Server-Patches/0297-Speedup-BlockPos-by-fixing-inlining.patch
similarity index 98%
rename from Spigot-Server-Patches/0298-Speedup-BlockPos-by-fixing-inlining.patch
rename to Spigot-Server-Patches/0297-Speedup-BlockPos-by-fixing-inlining.patch
index 68f13cdfb..168b4934e 100644
--- a/Spigot-Server-Patches/0298-Speedup-BlockPos-by-fixing-inlining.patch
+++ b/Spigot-Server-Patches/0297-Speedup-BlockPos-by-fixing-inlining.patch
@@ -1,4 +1,4 @@
-From 0f133791272ef61f2012e980808baf094cc01bb4 Mon Sep 17 00:00:00 2001
+From 06bd33e6e6962babee025681cf18fbf3b17b52f0 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 680764b342..25334377a2 100644
+index 680764b34..25334377a 100644
 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java
 @@ -6,22 +6,22 @@ import javax.annotation.concurrent.Immutable;
@@ -80,7 +80,7 @@ index 680764b342..25334377a2 100644
      public BaseBlockPosition d(BaseBlockPosition baseblockposition1) {
          return new BaseBlockPosition(this.getY() * baseblockposition1.getZ() - this.getZ() * baseblockposition1.getY(), this.getZ() * baseblockposition1.getX() - this.getX() * baseblockposition1.getZ(), this.getX() * baseblockposition1.getY() - this.getY() * baseblockposition1.getX());
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 7bd51b3578..9ce3cd9c9d 100644
+index 7bd51b357..9ce3cd9c9 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -205,18 +205,20 @@ public class BlockPosition extends BaseBlockPosition {
@@ -202,5 +202,5 @@ index 7bd51b3578..9ce3cd9c9d 100644
  
          public BlockPosition toBlockPosition() { return h(); } // Paper - OBFHELPER
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0299-Don-t-save-Proto-Chunks.patch b/Spigot-Server-Patches/0298-Don-t-save-Proto-Chunks.patch
similarity index 93%
rename from Spigot-Server-Patches/0299-Don-t-save-Proto-Chunks.patch
rename to Spigot-Server-Patches/0298-Don-t-save-Proto-Chunks.patch
index f4c946894..acf8e7908 100644
--- a/Spigot-Server-Patches/0299-Don-t-save-Proto-Chunks.patch
+++ b/Spigot-Server-Patches/0298-Don-t-save-Proto-Chunks.patch
@@ -1,4 +1,4 @@
-From 1e8c6bcd03fc5466a28c8f17e76e871d09558bc1 Mon Sep 17 00:00:00 2001
+From 2db9c766c78caaeabd0d2e76a48aed03e7e45ee5 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/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index ec328126cf..3d8f0b5786 100644
+index 34ddf655e..3b36a32c6 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -300,6 +300,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -20,7 +20,7 @@ index ec328126cf..3d8f0b5786 100644
          world.checkSession();
  
 diff --git a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
-index 22af9c1885..95eb1a84ac 100644
+index 772382144..9deab61fc 100644
 --- a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
 +++ b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
 @@ -24,7 +24,7 @@ public class ChunkTaskScheduler extends Scheduler<ChunkCoordIntPair, ChunkStatus
@@ -41,5 +41,5 @@ index 22af9c1885..95eb1a84ac 100644
  
          synchronized (this.e) {
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0300-Optimize-RegistryID.c.patch b/Spigot-Server-Patches/0299-Optimize-RegistryID.c.patch
similarity index 94%
rename from Spigot-Server-Patches/0300-Optimize-RegistryID.c.patch
rename to Spigot-Server-Patches/0299-Optimize-RegistryID.c.patch
index c465567a7..4a72eccdc 100644
--- a/Spigot-Server-Patches/0300-Optimize-RegistryID.c.patch
+++ b/Spigot-Server-Patches/0299-Optimize-RegistryID.c.patch
@@ -1,4 +1,4 @@
-From 765c811360685b754d86b1617a860f682f03b9d0 Mon Sep 17 00:00:00 2001
+From 2cd962b21d2017d73d53cfbdf8e07d416a924e07 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 d03ac0e70c..9242999f70 100644
+index d03ac0e70..9242999f7 100644
 --- a/src/main/java/net/minecraft/server/RegistryID.java
 +++ b/src/main/java/net/minecraft/server/RegistryID.java
 @@ -13,12 +13,14 @@ public class RegistryID<K> implements Registry<K> {
@@ -64,5 +64,5 @@ index d03ac0e70c..9242999f70 100644
  
      public int b() {
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0301-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/0300-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
similarity index 96%
rename from Spigot-Server-Patches/0301-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
rename to Spigot-Server-Patches/0300-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
index 92b25de3e..5bd0a7f5b 100644
--- a/Spigot-Server-Patches/0301-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/Spigot-Server-Patches/0300-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
@@ -1,4 +1,4 @@
-From 5c2993f23b856a9e887f50d7294b5385fd63a9fe Mon Sep 17 00:00:00 2001
+From 741f77317ff07a0e73ecfc5474f9c4f75c0e3b59 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/Spigot-Server-Patches/0302-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0301-Vanished-players-don-t-have-rights.patch
similarity index 98%
rename from Spigot-Server-Patches/0302-Vanished-players-don-t-have-rights.patch
rename to Spigot-Server-Patches/0301-Vanished-players-don-t-have-rights.patch
index 34b9a146c..722929ee8 100644
--- a/Spigot-Server-Patches/0302-Vanished-players-don-t-have-rights.patch
+++ b/Spigot-Server-Patches/0301-Vanished-players-don-t-have-rights.patch
@@ -1,4 +1,4 @@
-From 96c562f75805dc969a5acdd9e4f9577ab3d55652 Mon Sep 17 00:00:00 2001
+From be9b89578e5f5dac27f077804e41ee406100c1e4 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
@@ -105,5 +105,5 @@ index b220895c2..672c32858 100644
          return event;
      }
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0303-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch b/Spigot-Server-Patches/0302-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
similarity index 89%
rename from Spigot-Server-Patches/0303-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
rename to Spigot-Server-Patches/0302-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
index 826ad52f0..979bd09cc 100644
--- a/Spigot-Server-Patches/0303-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
+++ b/Spigot-Server-Patches/0302-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
@@ -1,4 +1,4 @@
-From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
+From 490ae02b8037545eb9c1984738af7d8f07bf788c 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 7ac07ac07ac0..7ac07ac07ac0 100644
+index bb76f56da..382e46adb 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -712,6 +712,7 @@ public class Chunk implements IChunkAccess {
@@ -26,5 +26,5 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
              itemCounts[i]--;
          } else if (entity instanceof IInventory) {
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0304-Add-some-Debug-to-Chunk-Entity-slices.patch b/Spigot-Server-Patches/0303-Add-some-Debug-to-Chunk-Entity-slices.patch
similarity index 96%
rename from Spigot-Server-Patches/0304-Add-some-Debug-to-Chunk-Entity-slices.patch
rename to Spigot-Server-Patches/0303-Add-some-Debug-to-Chunk-Entity-slices.patch
index be1038da6..16e4be23a 100644
--- a/Spigot-Server-Patches/0304-Add-some-Debug-to-Chunk-Entity-slices.patch
+++ b/Spigot-Server-Patches/0303-Add-some-Debug-to-Chunk-Entity-slices.patch
@@ -1,4 +1,4 @@
-From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
+From e8a7d574452142fd04be78da0bd9161b3170be8c 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 7ac07ac07ac0..7ac07ac07ac0 100644
+index 382e46adb..a62d7196b 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -710,8 +710,34 @@ public class Chunk implements IChunkAccess {
@@ -73,7 +73,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
                  // Do not pass along players, as doing so can get them stuck outside of time.
                  // (which for example disables inventory icon updates and prevents block breaking)
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index f13fa7fff..715ab15e3 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -64,6 +64,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -85,5 +85,5 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
      static boolean isLevelAtLeast(NBTTagCompound tag, int level) {
          return tag.hasKey("Bukkit.updateLevel") && tag.getInt("Bukkit.updateLevel") >= level;
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0305-Optimize-Region-File-Cache.patch b/Spigot-Server-Patches/0304-Optimize-Region-File-Cache.patch
similarity index 96%
rename from Spigot-Server-Patches/0305-Optimize-Region-File-Cache.patch
rename to Spigot-Server-Patches/0304-Optimize-Region-File-Cache.patch
index 4ba5446eb..dc0e3bd37 100644
--- a/Spigot-Server-Patches/0305-Optimize-Region-File-Cache.patch
+++ b/Spigot-Server-Patches/0304-Optimize-Region-File-Cache.patch
@@ -1,4 +1,4 @@
-From dddfa3385a6f08eb4bba4dcaf6ef11570db9c0f5 Mon Sep 17 00:00:00 2001
+From 11658c58e5db3b36e30ccd8c4dfd2f9d047856bc Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 23 Jul 2018 23:40:04 -0400
 Subject: [PATCH] Optimize Region File Cache
@@ -32,7 +32,7 @@ synchronized context, reducing lock times.
 Ultimately: This brings us back to Vanilla, which has had no indication of region file loss.
 
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index c0ab543b91..15666325ea 100644
+index c0ab543b9..15666325e 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -99,7 +99,7 @@ public class RegionFileCache {
@@ -63,5 +63,5 @@ index c0ab543b91..15666325ea 100644
  
          return regionfile != null ? regionfile.d(i & 31, j & 31) : false;
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0306-EntityTransformedEvent.patch b/Spigot-Server-Patches/0305-EntityTransformedEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0306-EntityTransformedEvent.patch
rename to Spigot-Server-Patches/0305-EntityTransformedEvent.patch
index 803cf0c16..03d68ea2d 100644
--- a/Spigot-Server-Patches/0306-EntityTransformedEvent.patch
+++ b/Spigot-Server-Patches/0305-EntityTransformedEvent.patch
@@ -1,4 +1,4 @@
-From cbb9f2cdcc6a9cc78a19674821934916c512e6d9 Mon Sep 17 00:00:00 2001
+From a1fbd733a1332a7d08ee3237f698543e58b590e1 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
@@ -61,5 +61,5 @@ index d2b2cc2fd..ab1b3ab5e 100644
          this.world.addEntity(entityvillager, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.CURED); // CraftBukkit - add SpawnReason
          // CraftBukkit end
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0307-SkeletonHorse-Additions.patch b/Spigot-Server-Patches/0306-SkeletonHorse-Additions.patch
similarity index 94%
rename from Spigot-Server-Patches/0307-SkeletonHorse-Additions.patch
rename to Spigot-Server-Patches/0306-SkeletonHorse-Additions.patch
index 73df0d2f2..8b085c531 100644
--- a/Spigot-Server-Patches/0307-SkeletonHorse-Additions.patch
+++ b/Spigot-Server-Patches/0306-SkeletonHorse-Additions.patch
@@ -1,11 +1,11 @@
-From 00de64f0020739cb73b826de2cf58b842c0d410d Mon Sep 17 00:00:00 2001
+From bc07d0b9a025fa6b155ec03ca6e649bc8347b107 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 e3690db471..ba6c0e96a3 100644
+index e3690db47..ba6c0e96a 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
 @@ -5,7 +5,7 @@ import javax.annotation.Nullable;
@@ -31,7 +31,7 @@ index e3690db471..ba6c0e96a3 100644
          if (flag != this.bN) {
              this.bN = flag;
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
-index a6979fe859..d4fdcbdfd6 100644
+index a6979fe85..d4fdcbdfd 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
 @@ -13,6 +13,7 @@ public class PathfinderGoalHorseTrap extends PathfinderGoal {
@@ -43,7 +43,7 @@ index a6979fe859..d4fdcbdfd6 100644
  
          this.a.s(false);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java
-index e822c2200d..496d0c0cac 100644
+index e822c2200..496d0c0ca 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java
 @@ -26,4 +26,23 @@ public class CraftSkeletonHorse extends CraftAbstractHorse implements SkeletonHo
@@ -71,5 +71,5 @@ index e822c2200d..496d0c0cac 100644
 +    // Paper end
  }
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0308-Prevent-Saving-Bad-entities-to-chunks.patch b/Spigot-Server-Patches/0307-Prevent-Saving-Bad-entities-to-chunks.patch
similarity index 95%
rename from Spigot-Server-Patches/0308-Prevent-Saving-Bad-entities-to-chunks.patch
rename to Spigot-Server-Patches/0307-Prevent-Saving-Bad-entities-to-chunks.patch
index 19403722f..8a2236395 100644
--- a/Spigot-Server-Patches/0308-Prevent-Saving-Bad-entities-to-chunks.patch
+++ b/Spigot-Server-Patches/0307-Prevent-Saving-Bad-entities-to-chunks.patch
@@ -1,4 +1,4 @@
-From ec29810bd4cedf7fa9c2690520c27bff8a989749 Mon Sep 17 00:00:00 2001
+From 2177df0325fe26a4da9122530cf377a106bcef93 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 3d8f0b5786..db5c6e0f74 100644
+index 3b36a32c6..7c77d384b 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -563,11 +563,22 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -57,5 +57,5 @@ index 3d8f0b5786..db5c6e0f74 100644
          nbttagcompound.set("Entities", nbttaglist1);
          NBTTagList nbttaglist2 = new NBTTagList();
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0309-Don-t-call-getItemMeta-on-hasItemMeta.patch b/Spigot-Server-Patches/0308-Don-t-call-getItemMeta-on-hasItemMeta.patch
similarity index 98%
rename from Spigot-Server-Patches/0309-Don-t-call-getItemMeta-on-hasItemMeta.patch
rename to Spigot-Server-Patches/0308-Don-t-call-getItemMeta-on-hasItemMeta.patch
index ff6f23cf4..aefd5b0ed 100644
--- a/Spigot-Server-Patches/0309-Don-t-call-getItemMeta-on-hasItemMeta.patch
+++ b/Spigot-Server-Patches/0308-Don-t-call-getItemMeta-on-hasItemMeta.patch
@@ -1,4 +1,4 @@
-From 2ddf0a8c7dbaa6932de8309da5889c43f3d9e498 Mon Sep 17 00:00:00 2001
+From 581d00244c23273c5ed641f733abfe77ac24636c 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
@@ -84,5 +84,5 @@ index 0ad0004b9..7455461f1 100644
      public void testBlockStateMeta() {
          List<Block> queue = new ArrayList<>();
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0310-Always-process-chunk-removal-in-removeEntity.patch b/Spigot-Server-Patches/0309-Always-process-chunk-removal-in-removeEntity.patch
similarity index 93%
rename from Spigot-Server-Patches/0310-Always-process-chunk-removal-in-removeEntity.patch
rename to Spigot-Server-Patches/0309-Always-process-chunk-removal-in-removeEntity.patch
index a2eedeb6c..57d0c306e 100644
--- a/Spigot-Server-Patches/0310-Always-process-chunk-removal-in-removeEntity.patch
+++ b/Spigot-Server-Patches/0309-Always-process-chunk-removal-in-removeEntity.patch
@@ -1,4 +1,4 @@
-From 040c8d9195f7cbc40319ba43c89e4cb66d7a0256 Mon Sep 17 00:00:00 2001
+From a25472bc5e97fb4bc871d21cc6f3068f9cab0489 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 28 Jul 2018 12:09:20 -0400
 Subject: [PATCH] Always process chunk removal in removeEntity
@@ -8,7 +8,7 @@ which can keep them in the chunk when they shouldnt be if done
 during entity ticking.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index b3eaac23a6..0331512468 100644
+index 811311e9e..1d7188b2e 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1173,7 +1173,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -29,5 +29,5 @@ index b3eaac23a6..0331512468 100644
          int index = this.entityList.indexOf(entity);
          if (index != -1) {
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0311-Ignore-Dead-Entities-in-entityList-iteration.patch b/Spigot-Server-Patches/0310-Ignore-Dead-Entities-in-entityList-iteration.patch
similarity index 96%
rename from Spigot-Server-Patches/0311-Ignore-Dead-Entities-in-entityList-iteration.patch
rename to Spigot-Server-Patches/0310-Ignore-Dead-Entities-in-entityList-iteration.patch
index 9f33ce39e..2cab9a564 100644
--- a/Spigot-Server-Patches/0311-Ignore-Dead-Entities-in-entityList-iteration.patch
+++ b/Spigot-Server-Patches/0310-Ignore-Dead-Entities-in-entityList-iteration.patch
@@ -1,4 +1,4 @@
-From 66d3435a1ece49d458f7629024e1679208783a4c Mon Sep 17 00:00:00 2001
+From b338f62ebd5fc9c46087d7b3e36001fab13ff023 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 56700fc596..9b9c8361e9 100644
+index 56700fc59..9b9c8361e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
 @@ -172,6 +172,7 @@ public class PaperCommand extends Command {
@@ -23,7 +23,7 @@ index 56700fc596..9b9c8361e9 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/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 8fa36cd65e..0de0dc2936 100644
+index 715ab15e3..df23b5c4f 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -123,6 +123,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -35,7 +35,7 @@ index 8fa36cd65e..0de0dc2936 100644
      public float length;
      public float J;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 965a598db9..2aa4946c75 100644
+index 1d7188b2e..ccdb1ba01 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1112,6 +1112,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -71,7 +71,7 @@ index 965a598db9..2aa4946c75 100644
              if (entity instanceof EntityInsentient) {
                  EntityInsentient entityinsentient = (EntityInsentient) entity;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index a05320c908..2acd8a4b31 100644
+index a05320c90..2acd8a4b3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -619,6 +619,7 @@ public class CraftWorld implements World {
@@ -107,5 +107,5 @@ index a05320c908..2acd8a4b31 100644
  
                  if (bukkitEntity == null) {
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0312-Provide-option-to-use-a-versioned-world-folder-for-t.patch b/Spigot-Server-Patches/0311-Provide-option-to-use-a-versioned-world-folder-for-t.patch
similarity index 98%
rename from Spigot-Server-Patches/0312-Provide-option-to-use-a-versioned-world-folder-for-t.patch
rename to Spigot-Server-Patches/0311-Provide-option-to-use-a-versioned-world-folder-for-t.patch
index b560c5aae..645957ca8 100644
--- a/Spigot-Server-Patches/0312-Provide-option-to-use-a-versioned-world-folder-for-t.patch
+++ b/Spigot-Server-Patches/0311-Provide-option-to-use-a-versioned-world-folder-for-t.patch
@@ -1,4 +1,4 @@
-From 67ac4c42d1317ff79e65bc9c7a01adb7283ddcac Mon Sep 17 00:00:00 2001
+From 84ce6cd9900e5bedc702311da69bfcfdffd1a3ec 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 f69a11ddf..c90148d8a 100644
+index 48b0a742a..f0b87972d 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;
@@ -30,7 +30,7 @@ index f69a11ddf..c90148d8a 100644
  import java.util.regex.Pattern;
  
  import com.google.common.collect.Lists;
-@@ -317,4 +318,27 @@ public class PaperConfig {
+@@ -308,4 +309,27 @@ public class PaperConfig {
              Bukkit.getLogger().log(Level.INFO, "Using Aikar's Alternative Luck Formula to apply Luck attribute to all loot pool calculations. See https://luckformula.emc.gs");
          }
      }
@@ -59,7 +59,7 @@ index f69a11ddf..c90148d8a 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index db5c6e0f7..b6ec51837 100644
+index 7c77d384b..f734b85e0 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -59,8 +59,55 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -220,5 +220,5 @@ index ab085788a..c84e6acdb 100644
          this.baseDir.mkdirs();
          this.playerDir = new File(this.baseDir, "playerdata");
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0313-MC-111480-Start-Entity-ID-s-at-1.patch b/Spigot-Server-Patches/0312-MC-111480-Start-Entity-ID-s-at-1.patch
similarity index 91%
rename from Spigot-Server-Patches/0313-MC-111480-Start-Entity-ID-s-at-1.patch
rename to Spigot-Server-Patches/0312-MC-111480-Start-Entity-ID-s-at-1.patch
index 5dc797963..c8f335a96 100644
--- a/Spigot-Server-Patches/0313-MC-111480-Start-Entity-ID-s-at-1.patch
+++ b/Spigot-Server-Patches/0312-MC-111480-Start-Entity-ID-s-at-1.patch
@@ -1,4 +1,4 @@
-From 9fba22ed9ce928dca7c5596181e6aa883e7473d8 Mon Sep 17 00:00:00 2001
+From 01d62016db82ecdc43d5fe0bc9783fca0dd71bb2 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 1dd56aec38..1554530966 100644
+index df23b5c4f..b284524be 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
@@ -20,5 +20,5 @@ index 1dd56aec38..1554530966 100644
      private int id;
      public boolean j; public boolean blocksEntitySpawning() { return j; } // Paper - OBFHELPER
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0314-Implement-Expanded-ArmorStand-API.patch b/Spigot-Server-Patches/0313-Implement-Expanded-ArmorStand-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0314-Implement-Expanded-ArmorStand-API.patch
rename to Spigot-Server-Patches/0313-Implement-Expanded-ArmorStand-API.patch
index e15a004ff..97f8ebb3e 100644
--- a/Spigot-Server-Patches/0314-Implement-Expanded-ArmorStand-API.patch
+++ b/Spigot-Server-Patches/0313-Implement-Expanded-ArmorStand-API.patch
@@ -1,4 +1,4 @@
-From 01b2f97693dd5bc72e602aba07776fc468ffdd84 Mon Sep 17 00:00:00 2001
+From 3aea822ceb36857019ae4d7305b522effb714adf 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
@@ -126,5 +126,5 @@ index 124c3185b..9f5c3b92e 100644
      // Paper end
  }
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0315-AnvilDamageEvent.patch b/Spigot-Server-Patches/0314-AnvilDamageEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0315-AnvilDamageEvent.patch
rename to Spigot-Server-Patches/0314-AnvilDamageEvent.patch
index 1ce0ba8a9..b7d5e74b1 100644
--- a/Spigot-Server-Patches/0315-AnvilDamageEvent.patch
+++ b/Spigot-Server-Patches/0314-AnvilDamageEvent.patch
@@ -1,11 +1,11 @@
-From 59fa16a4c0c3b2a2afa3297988aecb9a26c7082c Mon Sep 17 00:00:00 2001
+From 055444613695d1d6a438acf7346af18b272b8152 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 4b6424911..5d239322d 100644
+index a7b04a967..c8f988c2c 100644
 --- a/src/main/java/net/minecraft/server/ContainerAnvil.java
 +++ b/src/main/java/net/minecraft/server/ContainerAnvil.java
 @@ -74,6 +74,16 @@ public class ContainerAnvil extends Container {
@@ -26,5 +26,5 @@ index 4b6424911..5d239322d 100644
                          if (iblockdata1 == null) {
                              world.setAir(blockposition);
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0316-World-EntityHuman-Lookup-Optimizations.patch b/Spigot-Server-Patches/0315-World-EntityHuman-Lookup-Optimizations.patch
similarity index 96%
rename from Spigot-Server-Patches/0316-World-EntityHuman-Lookup-Optimizations.patch
rename to Spigot-Server-Patches/0315-World-EntityHuman-Lookup-Optimizations.patch
index 04fa8b240..0822dba1d 100644
--- a/Spigot-Server-Patches/0316-World-EntityHuman-Lookup-Optimizations.patch
+++ b/Spigot-Server-Patches/0315-World-EntityHuman-Lookup-Optimizations.patch
@@ -1,11 +1,11 @@
-From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
+From 05042904dc0fb028c53a89f5274ded92483d81fa Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Mon, 30 Jul 2018 02:42:49 -0400
 Subject: [PATCH] World EntityHuman Lookup Optimizations
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index ccdb1ba01..12379f755 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -81,6 +81,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -78,5 +78,5 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
  
      public void checkSession() throws ExceptionWorldConflict {
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0317-Add-TNTPrimeEvent.patch b/Spigot-Server-Patches/0316-Add-TNTPrimeEvent.patch
similarity index 99%
rename from Spigot-Server-Patches/0317-Add-TNTPrimeEvent.patch
rename to Spigot-Server-Patches/0316-Add-TNTPrimeEvent.patch
index c632370e6..be7126ebf 100644
--- a/Spigot-Server-Patches/0317-Add-TNTPrimeEvent.patch
+++ b/Spigot-Server-Patches/0316-Add-TNTPrimeEvent.patch
@@ -1,4 +1,4 @@
-From d4789c35af7e28c4260ea87432196d2efe728fd0 Mon Sep 17 00:00:00 2001
+From 5f2e9e30f6d4d0087e575529aa57aec91a281b7a 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
@@ -136,5 +136,5 @@ index 473773724..a49f1208b 100644
  
                  this.world.setAir(new BlockPosition(blockX, blockY, blockZ));
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0318-Break-up-and-make-tab-spam-limits-configurable.patch b/Spigot-Server-Patches/0317-Break-up-and-make-tab-spam-limits-configurable.patch
similarity index 95%
rename from Spigot-Server-Patches/0318-Break-up-and-make-tab-spam-limits-configurable.patch
rename to Spigot-Server-Patches/0317-Break-up-and-make-tab-spam-limits-configurable.patch
index f854e0944..7b96e5b64 100644
--- a/Spigot-Server-Patches/0318-Break-up-and-make-tab-spam-limits-configurable.patch
+++ b/Spigot-Server-Patches/0317-Break-up-and-make-tab-spam-limits-configurable.patch
@@ -1,4 +1,4 @@
-From 40573b27e828db93f4250c6ff94e1364833a4b50 Mon Sep 17 00:00:00 2001
+From 1b8368109e47aca2e43eaade5e565c5cf7b2af2a 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,10 +22,10 @@ to take the burden of this into their own hand without having to rely on
 plugins doing unsafe things.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index c90148d8a..fad2f8f82 100644
+index f0b87972d..a92914576 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -341,4 +341,18 @@ public class PaperConfig {
+@@ -332,4 +332,18 @@ public class PaperConfig {
              logger.log(Level.INFO, "******************************************************");
          }
      }
@@ -45,7 +45,7 @@ index c90148d8a..fad2f8f82 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 05b5e23bf..1e5ac7185 100644
+index e204dbe21..8e436c7f4 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -77,6 +77,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -74,5 +74,5 @@ index 05b5e23bf..1e5ac7185 100644
              return;
          }
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0319-Make-portal-teleportation-adjustment-math-more-accur.patch b/Spigot-Server-Patches/0318-Make-portal-teleportation-adjustment-math-more-accur.patch
similarity index 95%
rename from Spigot-Server-Patches/0319-Make-portal-teleportation-adjustment-math-more-accur.patch
rename to Spigot-Server-Patches/0318-Make-portal-teleportation-adjustment-math-more-accur.patch
index 30a733419..73d86f58c 100644
--- a/Spigot-Server-Patches/0319-Make-portal-teleportation-adjustment-math-more-accur.patch
+++ b/Spigot-Server-Patches/0318-Make-portal-teleportation-adjustment-math-more-accur.patch
@@ -1,11 +1,11 @@
-From 0a584c7a4ae66c14d3bf496d5e7939f58dcb5a00 Mon Sep 17 00:00:00 2001
+From 91c66cede1fe69afa655668cb7a6323884bea06f Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 31 Jul 2018 19:32:57 -0500
 Subject: [PATCH] Make portal teleportation adjustment math more accurate
 
 
 diff --git a/src/main/java/net/minecraft/server/EnumDirection.java b/src/main/java/net/minecraft/server/EnumDirection.java
-index c0853f0fcd..7aa940672e 100644
+index c0853f0fc..7aa940672 100644
 --- a/src/main/java/net/minecraft/server/EnumDirection.java
 +++ b/src/main/java/net/minecraft/server/EnumDirection.java
 @@ -95,6 +95,7 @@ public enum EnumDirection implements INamable {
@@ -33,7 +33,7 @@ index c0853f0fcd..7aa940672e 100644
              return this.c;
          }
 diff --git a/src/main/java/net/minecraft/server/MathHelper.java b/src/main/java/net/minecraft/server/MathHelper.java
-index d53d0c2422..49fba0979e 100644
+index d53d0c242..49fba0979 100644
 --- a/src/main/java/net/minecraft/server/MathHelper.java
 +++ b/src/main/java/net/minecraft/server/MathHelper.java
 @@ -83,6 +83,7 @@ public class MathHelper {
@@ -45,7 +45,7 @@ index d53d0c2422..49fba0979e 100644
          if (d0 < d1) {
              return d1;
 diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java
-index 20f2a9197c..fd372103be 100644
+index 7e858bab4..eba6eaf37 100644
 --- a/src/main/java/net/minecraft/server/PortalTravelAgent.java
 +++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java
 @@ -208,11 +208,27 @@ public class PortalTravelAgent {
@@ -79,7 +79,7 @@ index 20f2a9197c..fd372103be 100644
              float f1 = 0.0F;
              float f2 = 0.0F;
 diff --git a/src/main/java/net/minecraft/server/ShapeDetector.java b/src/main/java/net/minecraft/server/ShapeDetector.java
-index 0c9910d9a5..446cdb86d8 100644
+index 0c9910d9a..446cdb86d 100644
 --- a/src/main/java/net/minecraft/server/ShapeDetector.java
 +++ b/src/main/java/net/minecraft/server/ShapeDetector.java
 @@ -143,6 +143,7 @@ public class ShapeDetector {
@@ -91,5 +91,5 @@ index 0c9910d9a5..446cdb86d8 100644
              return this.e;
          }
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0320-Add-hand-to-bucket-events.patch b/Spigot-Server-Patches/0319-Add-hand-to-bucket-events.patch
similarity index 99%
rename from Spigot-Server-Patches/0320-Add-hand-to-bucket-events.patch
rename to Spigot-Server-Patches/0319-Add-hand-to-bucket-events.patch
index 5c7d1e775..48f802f42 100644
--- a/Spigot-Server-Patches/0320-Add-hand-to-bucket-events.patch
+++ b/Spigot-Server-Patches/0319-Add-hand-to-bucket-events.patch
@@ -1,4 +1,4 @@
-From 211bc700ef0ca2bbca2364ab75810fd0cc0fad72 Mon Sep 17 00:00:00 2001
+From b52532546fa0fb8da126d7dc9c49ea77f8554af2 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
@@ -105,5 +105,5 @@ index 672c32858..cd6ae3b8e 100644
          }
  
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0321-MC-135506-Experience-should-save-as-Integers.patch b/Spigot-Server-Patches/0320-MC-135506-Experience-should-save-as-Integers.patch
similarity index 91%
rename from Spigot-Server-Patches/0321-MC-135506-Experience-should-save-as-Integers.patch
rename to Spigot-Server-Patches/0320-MC-135506-Experience-should-save-as-Integers.patch
index e43a30004..945c695d0 100644
--- a/Spigot-Server-Patches/0321-MC-135506-Experience-should-save-as-Integers.patch
+++ b/Spigot-Server-Patches/0320-MC-135506-Experience-should-save-as-Integers.patch
@@ -1,11 +1,11 @@
-From 6b2c1c2661fac08070630fcab4bb7bd75cbc4814 Mon Sep 17 00:00:00 2001
+From 7187d073d6fc4d78549afbc0c0cfa9def3a50ed5 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 53cfc10017..904c6e1a7d 100644
+index 69d4dc9ab..80edbf481 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -205,14 +205,14 @@ public class EntityExperienceOrb extends Entity {
@@ -26,5 +26,5 @@ index 53cfc10017..904c6e1a7d 100644
      }
  
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0322-Entity-add-to-world-fixes.patch b/Spigot-Server-Patches/0321-Entity-add-to-world-fixes.patch
similarity index 95%
rename from Spigot-Server-Patches/0322-Entity-add-to-world-fixes.patch
rename to Spigot-Server-Patches/0321-Entity-add-to-world-fixes.patch
index 956dae04e..2bb972079 100644
--- a/Spigot-Server-Patches/0322-Entity-add-to-world-fixes.patch
+++ b/Spigot-Server-Patches/0321-Entity-add-to-world-fixes.patch
@@ -1,4 +1,4 @@
-From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
+From ce0e1b9fb596f82f91df77559fe845022517da42 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 3 Aug 2018 22:47:46 -0400
 Subject: [PATCH] Entity add to world fixes
@@ -14,7 +14,7 @@ Fix this by differing entity add to world for all entities at the same time
 the original entity is dead, overwrite it as the logic does for unloaod queued entities.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index a62d7196b..836aea6c3 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -911,6 +911,7 @@ public class Chunk implements IChunkAccess {
@@ -42,7 +42,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
          // CraftBukkit start
          org.bukkit.Server server = this.world.getServer();
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 12379f755..72e74c59f 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1103,6 +1103,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -68,7 +68,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
              this.b(entity);
          });
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 572c54c9c..0545336b4 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -990,7 +990,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -81,5 +81,5 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
                  } else {
                      if (!(entity instanceof EntityHuman)) {
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0323-Fix-client-rendering-skulls-from-same-user.patch b/Spigot-Server-Patches/0322-Fix-client-rendering-skulls-from-same-user.patch
similarity index 95%
rename from Spigot-Server-Patches/0323-Fix-client-rendering-skulls-from-same-user.patch
rename to Spigot-Server-Patches/0322-Fix-client-rendering-skulls-from-same-user.patch
index 1962a6b8c..9619cb572 100644
--- a/Spigot-Server-Patches/0323-Fix-client-rendering-skulls-from-same-user.patch
+++ b/Spigot-Server-Patches/0322-Fix-client-rendering-skulls-from-same-user.patch
@@ -1,4 +1,4 @@
-From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
+From 5e227d9c66176d90820491e6cbe6148bc3c7c6c4 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 7ac07ac07ac0..7ac07ac07ac0 100644
+index a1ec3879b..36c8644e2 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -44,7 +44,7 @@ public final class ItemStack {
@@ -25,7 +25,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 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 7ac07ac07ac0..7ac07ac07ac0 100644
+index d05f1e02c..b95836d44 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 7ac07ac07ac0..7ac07ac07ac0 100644
              }
              // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index af382815f..22a262bb6 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 @@ -33,6 +33,7 @@ public class PacketPlayOutMapChunk implements Packet<PacketListenerPlayOut> {
@@ -74,7 +74,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
              }
          }
 diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index e59f3c21d..05fca47f3 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
@@ -117,5 +117,5 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
  
      public NBTTagCompound aa_() {
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0324-Add-Early-Warning-Feature-to-WatchDog.patch b/Spigot-Server-Patches/0323-Add-Early-Warning-Feature-to-WatchDog.patch
similarity index 98%
rename from Spigot-Server-Patches/0324-Add-Early-Warning-Feature-to-WatchDog.patch
rename to Spigot-Server-Patches/0323-Add-Early-Warning-Feature-to-WatchDog.patch
index 9ef4ecc4d..fe26572ed 100644
--- a/Spigot-Server-Patches/0324-Add-Early-Warning-Feature-to-WatchDog.patch
+++ b/Spigot-Server-Patches/0323-Add-Early-Warning-Feature-to-WatchDog.patch
@@ -1,4 +1,4 @@
-From 4fcb18f366f3c6f24b150f1c5a192081e02866c3 Mon Sep 17 00:00:00 2001
+From 2f48e58760d9e8f2e19c16e04ba6127567d8f368 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 59264969a..8e522e3aa 100644
+index a92914576..f3f2a0b69 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -25,6 +25,7 @@ import org.bukkit.configuration.file.YamlConfiguration;
@@ -20,7 +20,7 @@ index 59264969a..8e522e3aa 100644
  
  public class PaperConfig {
  
-@@ -342,6 +343,14 @@ public class PaperConfig {
+@@ -333,6 +334,14 @@ public class PaperConfig {
          }
      }
  
diff --git a/Spigot-Server-Patches/0325-Make-EnderDragon-implement-Mob.patch b/Spigot-Server-Patches/0324-Make-EnderDragon-implement-Mob.patch
similarity index 92%
rename from Spigot-Server-Patches/0325-Make-EnderDragon-implement-Mob.patch
rename to Spigot-Server-Patches/0324-Make-EnderDragon-implement-Mob.patch
index 214375c57..c0866bc78 100644
--- a/Spigot-Server-Patches/0325-Make-EnderDragon-implement-Mob.patch
+++ b/Spigot-Server-Patches/0324-Make-EnderDragon-implement-Mob.patch
@@ -1,11 +1,11 @@
-From 7bfc5023bc0e32a91b6950708b60d1cff49c6d23 Mon Sep 17 00:00:00 2001
+From 37e833b3f7a2d592b00c59f9c03ce5248b72c966 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 cc115cc368..4947249da2 100644
+index cc115cc36..4947249da 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 @@
@@ -32,5 +32,5 @@ index cc115cc368..4947249da2 100644
  
      @Override
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0326-Detect-and-repair-corrupt-Region-Files.patch b/Spigot-Server-Patches/0325-Detect-and-repair-corrupt-Region-Files.patch
similarity index 97%
rename from Spigot-Server-Patches/0326-Detect-and-repair-corrupt-Region-Files.patch
rename to Spigot-Server-Patches/0325-Detect-and-repair-corrupt-Region-Files.patch
index a2dd80e82..c5ef4636a 100644
--- a/Spigot-Server-Patches/0326-Detect-and-repair-corrupt-Region-Files.patch
+++ b/Spigot-Server-Patches/0325-Detect-and-repair-corrupt-Region-Files.patch
@@ -1,4 +1,4 @@
-From 8375c097918c91e3a4ff945847903ff33c1f770f Mon Sep 17 00:00:00 2001
+From cd74ac2197650f3df5f0f1148ad08de5a75e3d8c 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 5d2853b9ce..6a2edfd1e1 100644
+index 5d2853b9c..6a2edfd1e 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -22,10 +22,10 @@ import javax.annotation.Nullable;
@@ -115,5 +115,5 @@ index 5d2853b9ce..6a2edfd1e1 100644
          private final int b;
          private final int c;
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0327-Use-ConcurrentHashMap-in-JsonList.patch b/Spigot-Server-Patches/0326-Use-ConcurrentHashMap-in-JsonList.patch
similarity index 97%
rename from Spigot-Server-Patches/0327-Use-ConcurrentHashMap-in-JsonList.patch
rename to Spigot-Server-Patches/0326-Use-ConcurrentHashMap-in-JsonList.patch
index bc42d8995..f38cfde11 100644
--- a/Spigot-Server-Patches/0327-Use-ConcurrentHashMap-in-JsonList.patch
+++ b/Spigot-Server-Patches/0326-Use-ConcurrentHashMap-in-JsonList.patch
@@ -1,4 +1,4 @@
-From 78850eeb498a048669ffaccd328c08406b0dfa37 Mon Sep 17 00:00:00 2001
+From f14c71b032397d4a94eb0eb2218371a800b058d5 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 6700e68c06..a2815b91fd 100644
+index 6700e68c0..a2815b91f 100644
 --- a/src/main/java/net/minecraft/server/JsonList.java
 +++ b/src/main/java/net/minecraft/server/JsonList.java
 @@ -36,7 +36,8 @@ public class JsonList<K, V extends JsonListEntry<K>> {
@@ -101,5 +101,5 @@ index 6700e68c06..a2815b91fd 100644
          String s = this.b.toJson(collection);
          BufferedWriter bufferedwriter = null;
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0328-Use-a-Queue-for-Queueing-Commands.patch b/Spigot-Server-Patches/0327-Use-a-Queue-for-Queueing-Commands.patch
similarity index 94%
rename from Spigot-Server-Patches/0328-Use-a-Queue-for-Queueing-Commands.patch
rename to Spigot-Server-Patches/0327-Use-a-Queue-for-Queueing-Commands.patch
index a025d1336..4f0f4b24a 100644
--- a/Spigot-Server-Patches/0328-Use-a-Queue-for-Queueing-Commands.patch
+++ b/Spigot-Server-Patches/0327-Use-a-Queue-for-Queueing-Commands.patch
@@ -1,4 +1,4 @@
-From cf9d4ec297f13b271cc00493324987e8da16e851 Mon Sep 17 00:00:00 2001
+From 011f8d6f3dc4eab9b49a1a9729f0825a35f2b2a4 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 d9c6b1104..80576a929 100644
+index 3dc7e2a89..5fb914f54 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -39,7 +39,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -32,5 +32,5 @@ index d9c6b1104..80576a929 100644
              // CraftBukkit start - ServerCommand for preprocessing
              ServerCommandEvent event = new ServerCommandEvent(console, servercommand.command);
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0329-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/Spigot-Server-Patches/0328-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
similarity index 92%
rename from Spigot-Server-Patches/0329-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
rename to Spigot-Server-Patches/0328-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
index 25fc5adc9..2a39fb64e 100644
--- a/Spigot-Server-Patches/0329-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
+++ b/Spigot-Server-Patches/0328-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
@@ -1,11 +1,11 @@
-From d1cb50480f7aad995cfc80a502340961c7e623f6 Mon Sep 17 00:00:00 2001
+From 5198d60c225315ac6160ad530aad57c5024596d6 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 76d395c4ed..12c6d850d2 100644
+index 76d395c4e..12c6d850d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 @@ -99,7 +99,12 @@ public class CraftChunk implements Chunk {
@@ -31,5 +31,5 @@ index 76d395c4ed..12c6d850d2 100644
  
          return entities;
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0330-Allow-disabling-armour-stand-ticking.patch b/Spigot-Server-Patches/0329-Allow-disabling-armour-stand-ticking.patch
similarity index 99%
rename from Spigot-Server-Patches/0330-Allow-disabling-armour-stand-ticking.patch
rename to Spigot-Server-Patches/0329-Allow-disabling-armour-stand-ticking.patch
index 26938d47c..90078a5fd 100644
--- a/Spigot-Server-Patches/0330-Allow-disabling-armour-stand-ticking.patch
+++ b/Spigot-Server-Patches/0329-Allow-disabling-armour-stand-ticking.patch
@@ -1,4 +1,4 @@
-From cb83a888c2da2df1db872f2a7f8b9a60049f8c82 Mon Sep 17 00:00:00 2001
+From e48332db0f5bfbafa2fb3ad77e4cf28dac027a60 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 15 Aug 2018 01:26:09 -0700
 Subject: [PATCH] Allow disabling armour stand ticking
diff --git a/Spigot-Server-Patches/0331-Optimize-BlockPosition-helper-methods.patch b/Spigot-Server-Patches/0330-Optimize-BlockPosition-helper-methods.patch
similarity index 98%
rename from Spigot-Server-Patches/0331-Optimize-BlockPosition-helper-methods.patch
rename to Spigot-Server-Patches/0330-Optimize-BlockPosition-helper-methods.patch
index cecca2e9c..729fa0260 100644
--- a/Spigot-Server-Patches/0331-Optimize-BlockPosition-helper-methods.patch
+++ b/Spigot-Server-Patches/0330-Optimize-BlockPosition-helper-methods.patch
@@ -1,4 +1,4 @@
-From fe94333525c84f0e38966d2c3d99317d7cf4bd2b Mon Sep 17 00:00:00 2001
+From 920e9a778232025ce8de4183f13610da418b3843 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 9ce3cd9c9d..adf648dfd5 100644
+index 9ce3cd9c9..adf648dfd 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -58,59 +58,96 @@ public class BlockPosition extends BaseBlockPosition {
@@ -121,5 +121,5 @@ index 9ce3cd9c9d..adf648dfd5 100644
  
      public BlockPosition a(EnumBlockRotation enumblockrotation) {
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0332-Send-nearby-packets-from-world-player-list-not-serve.patch b/Spigot-Server-Patches/0331-Send-nearby-packets-from-world-player-list-not-serve.patch
similarity index 97%
rename from Spigot-Server-Patches/0332-Send-nearby-packets-from-world-player-list-not-serve.patch
rename to Spigot-Server-Patches/0331-Send-nearby-packets-from-world-player-list-not-serve.patch
index 687088f44..365247724 100644
--- a/Spigot-Server-Patches/0332-Send-nearby-packets-from-world-player-list-not-serve.patch
+++ b/Spigot-Server-Patches/0331-Send-nearby-packets-from-world-player-list-not-serve.patch
@@ -1,11 +1,11 @@
-From 87004adf14a118f365884bf9f68541b72f87c314 Mon Sep 17 00:00:00 2001
+From ae03b8f1c592a7ede7a1fd3f36ccc0f922635bcd 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 813f6d1fd3..73bd0dc4a1 100644
+index e6ee5042c..a3794b5c6 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1202,8 +1202,25 @@ public abstract class PlayerList {
@@ -46,7 +46,7 @@ index 813f6d1fd3..73bd0dc4a1 100644
                  double d5 = d1 - entityplayer.locY;
                  double d6 = d2 - entityplayer.locZ;
 diff --git a/src/main/java/net/minecraft/server/WorldManager.java b/src/main/java/net/minecraft/server/WorldManager.java
-index e26405d341..23f390c221 100644
+index e26405d34..23f390c22 100644
 --- a/src/main/java/net/minecraft/server/WorldManager.java
 +++ b/src/main/java/net/minecraft/server/WorldManager.java
 @@ -35,8 +35,8 @@ public class WorldManager implements IWorldAccess {
@@ -95,7 +95,7 @@ index e26405d341..23f390c221 100644
              if (entityplayer != null && entityplayer.world == this.world && entityplayer.getId() != i) {
                  double d0 = (double) blockposition.getX() - entityplayer.locX;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 17758c8134..6e54b71e88 100644
+index 0545336b4..bab0c0e0f 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1087,7 +1087,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -119,7 +119,7 @@ index 17758c8134..6e54b71e88 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 2acd8a4b31..4237e5e3c4 100644
+index 2acd8a4b3..4237e5e3c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1621,7 +1621,7 @@ public class CraftWorld implements World {
@@ -132,5 +132,5 @@ index 2acd8a4b31..4237e5e3c4 100644
  
      public String getGameRuleValue(String rule) {
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0333-Cache-World-Entity-Type-counts.patch b/Spigot-Server-Patches/0332-Cache-World-Entity-Type-counts.patch
similarity index 96%
rename from Spigot-Server-Patches/0333-Cache-World-Entity-Type-counts.patch
rename to Spigot-Server-Patches/0332-Cache-World-Entity-Type-counts.patch
index 594de80d7..e5e4bb21d 100644
--- a/Spigot-Server-Patches/0333-Cache-World-Entity-Type-counts.patch
+++ b/Spigot-Server-Patches/0332-Cache-World-Entity-Type-counts.patch
@@ -1,4 +1,4 @@
-From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
+From be64c5365e10e2f876dde3700ae8f637022bf5a9 Mon Sep 17 00:00:00 2001
 From: Colin Godsey <crgodsey@gmail.com>
 Date: Wed, 8 Aug 2018 10:10:06 -0600
 Subject: [PATCH] Cache World Entity Type counts
@@ -7,7 +7,7 @@ Optimizes mob spawning by keeping a count of entities by type
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldEntityList.java b/src/main/java/com/destroystokyo/paper/PaperWorldEntityList.java
 new file mode 100644
-index 7ac07ac07ac0..7ac07ac07ac0
+index 000000000..a10a5bc13
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldEntityList.java
 @@ -0,0 +1,121 @@
@@ -133,7 +133,7 @@ index 7ac07ac07ac0..7ac07ac07ac0
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index b284524be..80d384dfe 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -124,6 +124,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -145,7 +145,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
      public float length;
      public float J;
 diff --git a/src/main/java/net/minecraft/server/EnumCreatureType.java b/src/main/java/net/minecraft/server/EnumCreatureType.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 8874a05be..0af387c05 100644
 --- a/src/main/java/net/minecraft/server/EnumCreatureType.java
 +++ b/src/main/java/net/minecraft/server/EnumCreatureType.java
 @@ -18,6 +18,8 @@ public enum EnumCreatureType {
@@ -158,7 +158,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
          return this.e;
      }
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 72cd9ba58..35205561b 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -114,7 +114,7 @@ public final class SpawnerCreature {
@@ -171,7 +171,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
                      if (l1 <= k) {
                          BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition();
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 72e74c59f..e8891d078 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -50,7 +50,8 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -210,5 +210,5 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
          if (!guardEntityList) { // Spigot - It will get removed after the tick if we are ticking // Paper - always remove from current chunk above
          // CraftBukkit start - Decrement loop variable field if we've already ticked this entity
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0334-Restore-vanlla-default-mob-spawn-range.patch b/Spigot-Server-Patches/0333-Restore-vanlla-default-mob-spawn-range.patch
similarity index 86%
rename from Spigot-Server-Patches/0334-Restore-vanlla-default-mob-spawn-range.patch
rename to Spigot-Server-Patches/0333-Restore-vanlla-default-mob-spawn-range.patch
index e34248643..17ad8053a 100644
--- a/Spigot-Server-Patches/0334-Restore-vanlla-default-mob-spawn-range.patch
+++ b/Spigot-Server-Patches/0333-Restore-vanlla-default-mob-spawn-range.patch
@@ -1,11 +1,11 @@
-From 11621f2b919b38c0c58fa036707ec17e313141dd Mon Sep 17 00:00:00 2001
+From 21045a7146a3f7a534a4eb335b15d39f5bf451d4 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 06d84a0b66..15abde4f5d 100644
+index 06d84a0b6..15abde4f5 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -130,7 +130,7 @@ public class SpigotWorldConfig
@@ -18,5 +18,5 @@ index 06d84a0b66..15abde4f5d 100644
      }
  
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0335-Optimize-Hoppers.patch b/Spigot-Server-Patches/0334-Optimize-Hoppers.patch
similarity index 99%
rename from Spigot-Server-Patches/0335-Optimize-Hoppers.patch
rename to Spigot-Server-Patches/0334-Optimize-Hoppers.patch
index 22c61337b..35a327afe 100644
--- a/Spigot-Server-Patches/0335-Optimize-Hoppers.patch
+++ b/Spigot-Server-Patches/0334-Optimize-Hoppers.patch
@@ -1,4 +1,4 @@
-From e3d75ee2a7b865826500b70945a58a969f76cbb7 Mon Sep 17 00:00:00 2001
+From 67b546a9be501634109a7f3caca372e306466951 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 27 Apr 2016 22:09:52 -0400
 Subject: [PATCH] Optimize Hoppers
diff --git a/Spigot-Server-Patches/0336-Optimize-CraftBlockData-Creation.patch b/Spigot-Server-Patches/0335-Optimize-CraftBlockData-Creation.patch
similarity index 94%
rename from Spigot-Server-Patches/0336-Optimize-CraftBlockData-Creation.patch
rename to Spigot-Server-Patches/0335-Optimize-CraftBlockData-Creation.patch
index 487b3f24a..5822bad34 100644
--- a/Spigot-Server-Patches/0336-Optimize-CraftBlockData-Creation.patch
+++ b/Spigot-Server-Patches/0335-Optimize-CraftBlockData-Creation.patch
@@ -1,4 +1,4 @@
-From a0d86a396033f06301c88c4714d383b2fa6bacf3 Mon Sep 17 00:00:00 2001
+From 682fb9d99363928b21ea5ae8596fe6352cf1386f 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/BlockData.java b/src/main/java/net/minecraft/server/BlockData.java
-index fbe181c1fd..bd86cd2e54 100644
+index fbe181c1f..bd86cd2e5 100644
 --- a/src/main/java/net/minecraft/server/BlockData.java
 +++ b/src/main/java/net/minecraft/server/BlockData.java
 @@ -1,6 +1,7 @@
@@ -34,7 +34,7 @@ index fbe181c1fd..bd86cd2e54 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java
-index bf06a90312..4d62d0093d 100644
+index 1423419b9..2d855aae6 100644
 --- a/src/main/java/net/minecraft/server/IBlockData.java
 +++ b/src/main/java/net/minecraft/server/IBlockData.java
 @@ -23,6 +23,8 @@ public interface IBlockData extends IBlockDataHolder<IBlockData> {
@@ -47,7 +47,7 @@ index bf06a90312..4d62d0093d 100644
          return this.getBlock().n(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 d470e2b34a..b9279d925c 100644
+index d470e2b34..b9279d925 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
 @@ -501,7 +501,17 @@ public class CraftBlockData implements BlockData {
@@ -69,5 +69,5 @@ index d470e2b34a..b9279d925c 100644
      }
  }
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0337-Fix-MC-124320.patch b/Spigot-Server-Patches/0336-Fix-MC-124320.patch
similarity index 95%
rename from Spigot-Server-Patches/0337-Fix-MC-124320.patch
rename to Spigot-Server-Patches/0336-Fix-MC-124320.patch
index cfcd2d5dc..a4febd05a 100644
--- a/Spigot-Server-Patches/0337-Fix-MC-124320.patch
+++ b/Spigot-Server-Patches/0336-Fix-MC-124320.patch
@@ -1,11 +1,11 @@
-From eeae8286b41292e83ce46456b7f60a349dd2f825 Mon Sep 17 00:00:00 2001
+From 0fa92dc555762952141bc8de4ed2274b5be93bb4 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 d55b076f5d..297f674d08 100644
+index 1bf01000e..f8ef58dca 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -155,6 +155,7 @@ public class Block implements IMaterial {
@@ -17,7 +17,7 @@ index d55b076f5d..297f674d08 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 e5ccd29a08..9116e52911 100644
+index d5c55d50e..f9d5a2499 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -313,8 +313,9 @@ public class EntityEnderman extends EntityMonster {
@@ -49,5 +49,5 @@ index e5ccd29a08..9116e52911 100644
              if (iblockdata2 != null && this.a(world, blockposition, iblockdata2, iblockdata, iblockdata1)) {
                  // CraftBukkit start - Place event
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0338-Slime-Pathfinder-Events.patch b/Spigot-Server-Patches/0337-Slime-Pathfinder-Events.patch
similarity index 98%
rename from Spigot-Server-Patches/0338-Slime-Pathfinder-Events.patch
rename to Spigot-Server-Patches/0337-Slime-Pathfinder-Events.patch
index de2964c57..b7f4b9e57 100644
--- a/Spigot-Server-Patches/0338-Slime-Pathfinder-Events.patch
+++ b/Spigot-Server-Patches/0337-Slime-Pathfinder-Events.patch
@@ -1,4 +1,4 @@
-From 71d15635773d8a7f7a77483164cd4812f860dee1 Mon Sep 17 00:00:00 2001
+From ff4978b2ab101e876fe9a81be9642ada2976fb91 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
@@ -164,5 +164,5 @@ index 18e7ef80a..8403c1e01 100644
 +    // Paper end
  }
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0339-Add-source-block-to-BlockPhysicsEvent.patch b/Spigot-Server-Patches/0338-Add-source-block-to-BlockPhysicsEvent.patch
similarity index 92%
rename from Spigot-Server-Patches/0339-Add-source-block-to-BlockPhysicsEvent.patch
rename to Spigot-Server-Patches/0338-Add-source-block-to-BlockPhysicsEvent.patch
index 039ddf788..3fcacb1b4 100644
--- a/Spigot-Server-Patches/0339-Add-source-block-to-BlockPhysicsEvent.patch
+++ b/Spigot-Server-Patches/0338-Add-source-block-to-BlockPhysicsEvent.patch
@@ -1,11 +1,11 @@
-From 69f7ce35c27fc02b9c1f01c4b57fc48da48179b4 Mon Sep 17 00:00:00 2001
+From 38bdeeb7dd658da73e2dfd568d7375623d5a7cb8 Mon Sep 17 00:00:00 2001
 From: Sotr <i@omc.hk>
 Date: Thu, 23 Aug 2018 16:14:12 +0800
 Subject: [PATCH] Add source block to BlockPhysicsEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index a7dcfb4191..f713b0d3d0 100644
+index e8891d078..0d401bf1d 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -630,7 +630,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -18,5 +18,5 @@ index a7dcfb4191..f713b0d3d0 100644
  
                      if (event.isCancelled()) {
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0340-Anti-Xray.patch b/Spigot-Server-Patches/0339-Anti-Xray.patch
similarity index 99%
rename from Spigot-Server-Patches/0340-Anti-Xray.patch
rename to Spigot-Server-Patches/0339-Anti-Xray.patch
index 319289e26..97b8b05e3 100644
--- a/Spigot-Server-Patches/0340-Anti-Xray.patch
+++ b/Spigot-Server-Patches/0339-Anti-Xray.patch
@@ -1,4 +1,4 @@
-From 79d8732d462211d9b31611ee6bc486c311a5c2b5 Mon Sep 17 00:00:00 2001
+From ddbf245c3681e18daf8334ae47737991977435df Mon Sep 17 00:00:00 2001
 From: stonar96 <minecraft.stonar96@gmail.com>
 Date: Mon, 20 Aug 2018 03:03:58 +0200
 Subject: [PATCH] Anti-Xray
diff --git a/Spigot-Server-Patches/0341-Configurable-speed-for-water-flowing-over-lava.patch b/Spigot-Server-Patches/0340-Configurable-speed-for-water-flowing-over-lava.patch
similarity index 98%
rename from Spigot-Server-Patches/0341-Configurable-speed-for-water-flowing-over-lava.patch
rename to Spigot-Server-Patches/0340-Configurable-speed-for-water-flowing-over-lava.patch
index 5f4a8bd2e..a88502457 100644
--- a/Spigot-Server-Patches/0341-Configurable-speed-for-water-flowing-over-lava.patch
+++ b/Spigot-Server-Patches/0340-Configurable-speed-for-water-flowing-over-lava.patch
@@ -1,4 +1,4 @@
-From f9207700a1c84a637d183465d863ecc241360f02 Mon Sep 17 00:00:00 2001
+From 8790643aad0bcc298befe7e6d4dd20e0cd350550 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 8 Aug 2018 16:33:21 -0600
 Subject: [PATCH] Configurable speed for water flowing over lava
diff --git a/Spigot-Server-Patches/0342-Optimize-RegistryMaterials.patch b/Spigot-Server-Patches/0341-Optimize-RegistryMaterials.patch
similarity index 91%
rename from Spigot-Server-Patches/0342-Optimize-RegistryMaterials.patch
rename to Spigot-Server-Patches/0341-Optimize-RegistryMaterials.patch
index de7d3342c..5da3c92df 100644
--- a/Spigot-Server-Patches/0342-Optimize-RegistryMaterials.patch
+++ b/Spigot-Server-Patches/0341-Optimize-RegistryMaterials.patch
@@ -1,4 +1,4 @@
-From d1a99aa3a770edc860e74ec16778082dc0888040 Mon Sep 17 00:00:00 2001
+From 4f6f28757c11bdfc4b7f5f127afca881a33d647c 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 83ce386e05..a47110bba8 100644
+index 83ce386e0..a47110bba 100644
 --- a/src/main/java/net/minecraft/server/RegistryMaterials.java
 +++ b/src/main/java/net/minecraft/server/RegistryMaterials.java
 @@ -13,8 +13,8 @@ import org.apache.logging.log4j.Logger;
@@ -23,5 +23,5 @@ index 83ce386e05..a47110bba8 100644
      private int x;
  
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0343-Add-PhantomPreSpawnEvent.patch b/Spigot-Server-Patches/0342-Add-PhantomPreSpawnEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0343-Add-PhantomPreSpawnEvent.patch
rename to Spigot-Server-Patches/0342-Add-PhantomPreSpawnEvent.patch
index cb9139f21..d498373a3 100644
--- a/Spigot-Server-Patches/0343-Add-PhantomPreSpawnEvent.patch
+++ b/Spigot-Server-Patches/0342-Add-PhantomPreSpawnEvent.patch
@@ -1,11 +1,11 @@
-From 99fc8d9cadca3916a3c8d17df85d0030b95af22f Mon Sep 17 00:00:00 2001
+From 804faee018140f31944962c6ce2def0b7d022217 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 2429644e99..e276001094 100644
+index 3c5785733..8332d5cc8 100644
 --- a/src/main/java/net/minecraft/server/EntityPhantom.java
 +++ b/src/main/java/net/minecraft/server/EntityPhantom.java
 @@ -128,6 +128,11 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@@ -48,7 +48,7 @@ index 2429644e99..e276001094 100644
  
          private int b;
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
-index 0626b77904..413188e970 100644
+index 5c43d908f..5ddf66eef 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 0626b77904..413188e970 100644
                                                  groupdataentity = entityphantom.prepare(difficultydamagescaler, groupdataentity, (NBTTagCompound) null);
                                                  world.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 9f9ee92390..2b97313694 100644
+index 9f9ee9239..2b9731369 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 {
@@ -86,5 +86,5 @@ index 9f9ee92390..2b97313694 100644
 +    // Paper end
  }
 -- 
-2.19.0
+2.20.0
 
diff --git a/Spigot-Server-Patches/0344-Add-More-Creeper-API.patch b/Spigot-Server-Patches/0343-Add-More-Creeper-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0344-Add-More-Creeper-API.patch
rename to Spigot-Server-Patches/0343-Add-More-Creeper-API.patch
index 554488467..65ce9986d 100644
--- a/Spigot-Server-Patches/0344-Add-More-Creeper-API.patch
+++ b/Spigot-Server-Patches/0343-Add-More-Creeper-API.patch
@@ -1,4 +1,4 @@
-From 900acad38a9935f66e793d3bc95f209d873a59d5 Mon Sep 17 00:00:00 2001
+From b6fda6a8d4c4a364dc431a35807c5117d1d9648a 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
@@ -74,5 +74,5 @@ index ffebb54ca..ab2b20a0d 100644
 +    // Paper end
  }
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0345-Implement-Force-Loaded-Chunk-API.patch b/Spigot-Server-Patches/0344-Implement-Force-Loaded-Chunk-API.patch
similarity index 91%
rename from Spigot-Server-Patches/0345-Implement-Force-Loaded-Chunk-API.patch
rename to Spigot-Server-Patches/0344-Implement-Force-Loaded-Chunk-API.patch
index b52c3c001..7638b4cff 100644
--- a/Spigot-Server-Patches/0345-Implement-Force-Loaded-Chunk-API.patch
+++ b/Spigot-Server-Patches/0344-Implement-Force-Loaded-Chunk-API.patch
@@ -1,11 +1,11 @@
-From 15713ce4147d9658c1be331ce9a245016cb094c9 Mon Sep 17 00:00:00 2001
+From 52cf83bd470922c316b22cf3633cf3b21ca786e7 Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Wed, 29 Aug 2018 00:37:42 -0400
 Subject: [PATCH] Implement Force-Loaded Chunk API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-index 12c6d850d2..b9371e3ae9 100644
+index 12c6d850d..b9371e3ae 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 @@ -289,6 +289,18 @@ public class CraftChunk implements Chunk {
@@ -28,7 +28,7 @@ index 12c6d850d2..b9371e3ae9 100644
          Arrays.fill(emptySkyLight, (byte) 0xFF);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 4237e5e3c4..d5936eb199 100644
+index 4237e5e3c..d5936eb19 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -571,6 +571,12 @@ public class CraftWorld implements World {
@@ -45,5 +45,5 @@ index 4237e5e3c4..d5936eb199 100644
          return generator;
      }
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0346-Inventory-removeItemAnySlot.patch b/Spigot-Server-Patches/0345-Inventory-removeItemAnySlot.patch
similarity index 95%
rename from Spigot-Server-Patches/0346-Inventory-removeItemAnySlot.patch
rename to Spigot-Server-Patches/0345-Inventory-removeItemAnySlot.patch
index f288a485d..694546a75 100644
--- a/Spigot-Server-Patches/0346-Inventory-removeItemAnySlot.patch
+++ b/Spigot-Server-Patches/0345-Inventory-removeItemAnySlot.patch
@@ -1,11 +1,11 @@
-From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
+From 57cf711452a442ccfed9a6e59db02208ceb077b8 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 7ac07ac07ac0..7ac07ac07ac0 100644
+index dd7b3d766..01af98293 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
 @@ -213,10 +213,16 @@ public class CraftInventory implements Inventory {
@@ -57,5 +57,5 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
                  // Drat! we don't have this type in the inventory
                  if (first == -1) {
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0347-Optimize-getChunkIfLoaded-type-calls.patch b/Spigot-Server-Patches/0346-Optimize-getChunkIfLoaded-type-calls.patch
similarity index 98%
rename from Spigot-Server-Patches/0347-Optimize-getChunkIfLoaded-type-calls.patch
rename to Spigot-Server-Patches/0346-Optimize-getChunkIfLoaded-type-calls.patch
index 53e415baa..db64f853d 100644
--- a/Spigot-Server-Patches/0347-Optimize-getChunkIfLoaded-type-calls.patch
+++ b/Spigot-Server-Patches/0346-Optimize-getChunkIfLoaded-type-calls.patch
@@ -1,4 +1,4 @@
-From 084c88af6e4ed0452afb265baac3a816bb78f5ea Mon Sep 17 00:00:00 2001
+From a65b2191f811de67e4135aab6277ab1bf7c0edc7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 29 Aug 2018 21:59:22 -0400
 Subject: [PATCH] Optimize getChunkIfLoaded type calls
@@ -77,5 +77,5 @@ index d5936eb19..4b8b66352 100644
              return true;
          }
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0348-Don-t-double-add-golems-to-world.patch b/Spigot-Server-Patches/0347-Don-t-double-add-golems-to-world.patch
similarity index 89%
rename from Spigot-Server-Patches/0348-Don-t-double-add-golems-to-world.patch
rename to Spigot-Server-Patches/0347-Don-t-double-add-golems-to-world.patch
index 27eb1635d..441b9a0fe 100644
--- a/Spigot-Server-Patches/0348-Don-t-double-add-golems-to-world.patch
+++ b/Spigot-Server-Patches/0347-Don-t-double-add-golems-to-world.patch
@@ -1,4 +1,4 @@
-From ab28a18613d51ddb9df2fb4e6d947c734d63090f Mon Sep 17 00:00:00 2001
+From 85c3c2fdc7db2755ecb460f4bb77726592a29e9e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 30 Aug 2018 20:56:26 -0400
 Subject: [PATCH] Don't double add golems to world
@@ -6,7 +6,7 @@ Subject: [PATCH] Don't double add golems to world
 spawnCreature adds to world now
 
 diff --git a/src/main/java/net/minecraft/server/Village.java b/src/main/java/net/minecraft/server/Village.java
-index fc671801..7caae1d7 100644
+index 02d8d9749..482b97d55 100644
 --- a/src/main/java/net/minecraft/server/Village.java
 +++ b/src/main/java/net/minecraft/server/Village.java
 @@ -83,7 +83,7 @@ public class Village {
@@ -19,5 +19,5 @@ index fc671801..7caae1d7 100644
                      }
  
 -- 
-2.17.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0349-fix-newlines-in-spigot-tab-list-API.patch b/Spigot-Server-Patches/0348-fix-newlines-in-spigot-tab-list-API.patch
similarity index 94%
rename from Spigot-Server-Patches/0349-fix-newlines-in-spigot-tab-list-API.patch
rename to Spigot-Server-Patches/0348-fix-newlines-in-spigot-tab-list-API.patch
index 44d79cab1..7bbd279f9 100644
--- a/Spigot-Server-Patches/0349-fix-newlines-in-spigot-tab-list-API.patch
+++ b/Spigot-Server-Patches/0348-fix-newlines-in-spigot-tab-list-API.patch
@@ -1,4 +1,4 @@
-From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
+From 90641f4259ba4f723f4d86556b4715591150a05e Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 1 Sep 2018 11:29:52 +0100
 Subject: [PATCH] fix newlines in spigot tab list API
@@ -7,7 +7,7 @@ Spigots implementation around the header/footer strips newlines from the
 header/footer, this patch allows the tab list header/footer to retain newlines.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 0f1d700c7..0a0ea301d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -370,20 +370,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -36,7 +36,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index a067e39d5..5e20a9a61 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
 @@ -143,7 +143,13 @@ public final class CraftChatMessage {
@@ -55,5 +55,5 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
  
      public static IChatBaseComponent[] fromString(String message) {
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0350-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/Spigot-Server-Patches/0349-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
similarity index 89%
rename from Spigot-Server-Patches/0350-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
rename to Spigot-Server-Patches/0349-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
index 58a765f66..080eeb71b 100644
--- a/Spigot-Server-Patches/0350-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
+++ b/Spigot-Server-Patches/0349-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
@@ -1,4 +1,4 @@
-From 61bb26690d5a5a2c0fbb4094c481fc56d8a16142 Mon Sep 17 00:00:00 2001
+From 05bfada94ff2d7a9b2468669575eb8cb1324e9fc 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 4b8b66352b..7e6a7b0e90 100644
+index 4b8b66352..7e6a7b0e9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -295,7 +295,7 @@ public class CraftWorld implements World {
@@ -19,5 +19,5 @@ index 4b8b66352b..7e6a7b0e90 100644
  
      public boolean isChunkLoaded(Chunk chunk) {
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0351-Add-ray-tracing-methods-to-LivingEntity.patch b/Spigot-Server-Patches/0350-Add-ray-tracing-methods-to-LivingEntity.patch
similarity index 98%
rename from Spigot-Server-Patches/0351-Add-ray-tracing-methods-to-LivingEntity.patch
rename to Spigot-Server-Patches/0350-Add-ray-tracing-methods-to-LivingEntity.patch
index 6900ae9b8..3e549a42c 100644
--- a/Spigot-Server-Patches/0351-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/Spigot-Server-Patches/0350-Add-ray-tracing-methods-to-LivingEntity.patch
@@ -1,4 +1,4 @@
-From 1d1819863a8c32551ce0cda7eb22264e3581eaab Mon Sep 17 00:00:00 2001
+From 8b81175767226157070263f9e5c6044322216a9a 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
@@ -60,5 +60,5 @@ index 52834b6da..eeab59379 100644
          return getLineOfSight(transparent, maxDistance, 2);
      }
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0352-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-Server-Patches/0351-Expose-attack-cooldown-methods-for-Player.patch
similarity index 96%
rename from Spigot-Server-Patches/0352-Expose-attack-cooldown-methods-for-Player.patch
rename to Spigot-Server-Patches/0351-Expose-attack-cooldown-methods-for-Player.patch
index 6f9140f51..f3f2d42a2 100644
--- a/Spigot-Server-Patches/0352-Expose-attack-cooldown-methods-for-Player.patch
+++ b/Spigot-Server-Patches/0351-Expose-attack-cooldown-methods-for-Player.patch
@@ -1,4 +1,4 @@
-From 7837b5e97bc04b84c20101a88dd8e38c6a4a6b7b Mon Sep 17 00:00:00 2001
+From 2dbcb3e4718cea990bba6a0ea0610c4b59cba08a 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
@@ -52,5 +52,5 @@ index 0a0ea301d..8be0a47ba 100644
      private final Player.Spigot spigot = new Player.Spigot()
      {
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0353-MC-2025-Save-and-load-entity-AABB-to-prevent-wobble.patch b/Spigot-Server-Patches/0352-MC-2025-Save-and-load-entity-AABB-to-prevent-wobble.patch
similarity index 98%
rename from Spigot-Server-Patches/0353-MC-2025-Save-and-load-entity-AABB-to-prevent-wobble.patch
rename to Spigot-Server-Patches/0352-MC-2025-Save-and-load-entity-AABB-to-prevent-wobble.patch
index 42be1e962..a2820e64f 100644
--- a/Spigot-Server-Patches/0353-MC-2025-Save-and-load-entity-AABB-to-prevent-wobble.patch
+++ b/Spigot-Server-Patches/0352-MC-2025-Save-and-load-entity-AABB-to-prevent-wobble.patch
@@ -1,4 +1,4 @@
-From 5bd823869446fd35dde228b7603cf6d1a0e2ba5e Mon Sep 17 00:00:00 2001
+From ebf59a4f1ec27da1e3bc0ce92be22070045778b9 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 4 Sep 2018 19:07:57 -0400
 Subject: [PATCH] MC-2025: Save and load entity AABB to prevent wobble
@@ -46,7 +46,7 @@ index bf538684a..19819b134 100644
      public AxisAlignedBB(double d0, double d1, double d2, double d3, double d4, double d5) {
          this.minX = Math.min(d0, d3);
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index c97b7313c..665c85ca4 100644
+index 80d384dfe..da0e9b0a3 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1659,6 +1659,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -88,5 +88,5 @@ index c97b7313c..665c85ca4 100644
          // CraftBukkit start - block invalid bounding boxes
          double minX = axisalignedbb.minX,
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0354-Improve-death-events.patch b/Spigot-Server-Patches/0353-Improve-death-events.patch
similarity index 99%
rename from Spigot-Server-Patches/0354-Improve-death-events.patch
rename to Spigot-Server-Patches/0353-Improve-death-events.patch
index 2d91ee4cd..b6afa732f 100644
--- a/Spigot-Server-Patches/0354-Improve-death-events.patch
+++ b/Spigot-Server-Patches/0353-Improve-death-events.patch
@@ -1,4 +1,4 @@
-From 7ca1e391b1eb3a7a712bc0c6b9a52dc05855b11c Mon Sep 17 00:00:00 2001
+From 96a7cd354c1a98e255bc42cb30ed417744295115 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
@@ -375,5 +375,5 @@ index cd6ae3b8e..4a0a456a0 100644
       * Server methods
       */
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0355-Allow-chests-to-be-placed-with-NBT-data.patch b/Spigot-Server-Patches/0354-Allow-chests-to-be-placed-with-NBT-data.patch
similarity index 96%
rename from Spigot-Server-Patches/0355-Allow-chests-to-be-placed-with-NBT-data.patch
rename to Spigot-Server-Patches/0354-Allow-chests-to-be-placed-with-NBT-data.patch
index 7095e1700..fa5245858 100644
--- a/Spigot-Server-Patches/0355-Allow-chests-to-be-placed-with-NBT-data.patch
+++ b/Spigot-Server-Patches/0354-Allow-chests-to-be-placed-with-NBT-data.patch
@@ -1,4 +1,4 @@
-From 18ec774319308ba9befa7a944933bd457259d580 Mon Sep 17 00:00:00 2001
+From d8ec170594cd5d62e56b820d4d372c7ae867f7d2 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
@@ -38,5 +38,5 @@ index 9573a4ecd..7594c16e9 100644
      // CraftBukkit end
  }
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0356-Mob-Pathfinding-API.patch b/Spigot-Server-Patches/0355-Mob-Pathfinding-API.patch
similarity index 99%
rename from Spigot-Server-Patches/0356-Mob-Pathfinding-API.patch
rename to Spigot-Server-Patches/0355-Mob-Pathfinding-API.patch
index 71460c9de..a3e120041 100644
--- a/Spigot-Server-Patches/0356-Mob-Pathfinding-API.patch
+++ b/Spigot-Server-Patches/0355-Mob-Pathfinding-API.patch
@@ -1,4 +1,4 @@
-From 1d6fd44a923b538e42ddf1eea7d285b544eb3bf7 Mon Sep 17 00:00:00 2001
+From 3568f5361e2875b198914133d0fcb79a843d8c4b 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
@@ -245,5 +245,5 @@ index 5bf1cd06f..53c2d154e 100644
      public void setTarget(LivingEntity target) {
          EntityInsentient entity = getHandle();
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0357-Prevent-chunk-loading-from-Fluid-Flowing.patch b/Spigot-Server-Patches/0356-Prevent-chunk-loading-from-Fluid-Flowing.patch
similarity index 98%
rename from Spigot-Server-Patches/0357-Prevent-chunk-loading-from-Fluid-Flowing.patch
rename to Spigot-Server-Patches/0356-Prevent-chunk-loading-from-Fluid-Flowing.patch
index 526e03d82..7e32f0915 100644
--- a/Spigot-Server-Patches/0357-Prevent-chunk-loading-from-Fluid-Flowing.patch
+++ b/Spigot-Server-Patches/0356-Prevent-chunk-loading-from-Fluid-Flowing.patch
@@ -1,4 +1,4 @@
-From ab6ded29658de4a666f701be4a17dc2c70571b88 Mon Sep 17 00:00:00 2001
+From 789be1bd63158936d36e9b45a76aa49f4a59e148 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
@@ -75,5 +75,5 @@ index 8a6f79908..c1ed05d9e 100644
              IBlockData iblockdata1 = (IBlockData) pair.getFirst();
              Fluid fluid = (Fluid) pair.getSecond();
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0358-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/Spigot-Server-Patches/0357-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
similarity index 99%
rename from Spigot-Server-Patches/0358-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
rename to Spigot-Server-Patches/0357-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
index 0204321d2..79f9baa62 100644
--- a/Spigot-Server-Patches/0358-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
+++ b/Spigot-Server-Patches/0357-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
@@ -1,4 +1,4 @@
-From f47a1b4de8a002e464b4f45c7c35eea9e80aa010 Mon Sep 17 00:00:00 2001
+From 1eb74e11de99c6807477c751d4ea094e73556cd4 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
@@ -484,5 +484,5 @@ index 197563552..d34b017f9 100644
 +    // Paper end
  }
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0359-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/Spigot-Server-Patches/0358-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
similarity index 98%
rename from Spigot-Server-Patches/0359-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
rename to Spigot-Server-Patches/0358-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
index 35786c941..d1791eba1 100644
--- a/Spigot-Server-Patches/0359-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
+++ b/Spigot-Server-Patches/0358-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
@@ -1,4 +1,4 @@
-From e9e56c914dfbf0e0247dd46619c712e006ff7255 Mon Sep 17 00:00:00 2001
+From c739c5c8647c3b59c5f2c04827e8853d8e60b088 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
@@ -96,5 +96,5 @@ index 5fe4734e3..eabf50e24 100644
          if (blockposition.isInvalidYLocation()) { // Paper
              return FluidTypes.a.i();
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0360-Prevent-mob-spawning-from-loading-generating-chunks.patch b/Spigot-Server-Patches/0359-Prevent-mob-spawning-from-loading-generating-chunks.patch
similarity index 95%
rename from Spigot-Server-Patches/0360-Prevent-mob-spawning-from-loading-generating-chunks.patch
rename to Spigot-Server-Patches/0359-Prevent-mob-spawning-from-loading-generating-chunks.patch
index 8850d71b8..1400f10c6 100644
--- a/Spigot-Server-Patches/0360-Prevent-mob-spawning-from-loading-generating-chunks.patch
+++ b/Spigot-Server-Patches/0359-Prevent-mob-spawning-from-loading-generating-chunks.patch
@@ -1,4 +1,4 @@
-From 31e70a8d643471613959f369fb615891e277cf91 Mon Sep 17 00:00:00 2001
+From de9c935fa969abd751d58894bd4ea1032fcf415b 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 9221b41bc..2faa3ec97 100644
+index 35205561b..0e578caf6 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -129,9 +129,9 @@ public final class SpawnerCreature {
@@ -31,5 +31,5 @@ index 9221b41bc..2faa3ec97 100644
                                                              if (entitypositiontypes_surface != null && a(entitypositiontypes_surface, worldserver, blockposition_mutableblockposition, biomebase_biomemeta.b)) {
                                                                  EntityInsentient entityinsentient;
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0361-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/Spigot-Server-Patches/0360-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 96%
rename from Spigot-Server-Patches/0361-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to Spigot-Server-Patches/0360-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
index a2d7aba2c..23eb5f3d9 100644
--- a/Spigot-Server-Patches/0361-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
+++ b/Spigot-Server-Patches/0360-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
@@ -1,4 +1,4 @@
-From 38dd97023fdd51bb5d4d6481a5941f6f2b9820f1 Mon Sep 17 00:00:00 2001
+From 24eafa03098283a7a8c1a093ad1100079875580b 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 d381206fe..e87ed33c8 100644
+index 7703744d3..21843209d 100644
 --- a/src/main/java/net/minecraft/server/BiomeBase.java
 +++ b/src/main/java/net/minecraft/server/BiomeBase.java
 @@ -118,7 +118,7 @@ public abstract class BiomeBase {
@@ -76,5 +76,5 @@ index d381206fe..e87ed33c8 100644
          public EntityTypes<? extends EntityInsentient> b;
          public int c;
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0362-Optimize-and-Fix-ExpiringMap-Issues.patch b/Spigot-Server-Patches/0361-Optimize-and-Fix-ExpiringMap-Issues.patch
similarity index 99%
rename from Spigot-Server-Patches/0362-Optimize-and-Fix-ExpiringMap-Issues.patch
rename to Spigot-Server-Patches/0361-Optimize-and-Fix-ExpiringMap-Issues.patch
index 137d91b9e..9a21dc642 100644
--- a/Spigot-Server-Patches/0362-Optimize-and-Fix-ExpiringMap-Issues.patch
+++ b/Spigot-Server-Patches/0361-Optimize-and-Fix-ExpiringMap-Issues.patch
@@ -1,4 +1,4 @@
-From 9c4cf40d3f69a1a4b86e27690df94c8330c0db17 Mon Sep 17 00:00:00 2001
+From 22c997ec6fc5edb318f4522db1d5edd32cda4262 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 16 Sep 2018 00:00:16 -0400
 Subject: [PATCH] Optimize and Fix ExpiringMap Issues
@@ -329,5 +329,5 @@ index 9c2adb235..04e29f58c 100644
      }
  
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0363-Implement-furnace-cook-speed-multiplier-API.patch b/Spigot-Server-Patches/0362-Implement-furnace-cook-speed-multiplier-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0363-Implement-furnace-cook-speed-multiplier-API.patch
rename to Spigot-Server-Patches/0362-Implement-furnace-cook-speed-multiplier-API.patch
index e13cfc425..070f7b329 100644
--- a/Spigot-Server-Patches/0363-Implement-furnace-cook-speed-multiplier-API.patch
+++ b/Spigot-Server-Patches/0362-Implement-furnace-cook-speed-multiplier-API.patch
@@ -1,4 +1,4 @@
-From 34ef6bd02347a076c96a715472eebd0feeb12650 Mon Sep 17 00:00:00 2001
+From 55878b98117a59bc88932cd317004fe2392df359 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 3a69455b4..0ba13b790 100644
+index 1634b8ce0..324a8431c 100644
 --- a/src/main/java/net/minecraft/server/TileEntityFurnace.java
 +++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java
 @@ -10,6 +10,7 @@ import java.util.Map.Entry;
@@ -80,5 +80,5 @@ index 469dc4ff2..0ffbe8cd6 100644
 +    // Paper end
  }
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0364-Support-Overriding-World-Seeds.patch b/Spigot-Server-Patches/0363-Support-Overriding-World-Seeds.patch
similarity index 97%
rename from Spigot-Server-Patches/0364-Support-Overriding-World-Seeds.patch
rename to Spigot-Server-Patches/0363-Support-Overriding-World-Seeds.patch
index 077e8f06b..120a7053d 100644
--- a/Spigot-Server-Patches/0364-Support-Overriding-World-Seeds.patch
+++ b/Spigot-Server-Patches/0363-Support-Overriding-World-Seeds.patch
@@ -1,4 +1,4 @@
-From 84ee7f41eaf438a751ebb46ee8f077a9e4b90cbe Mon Sep 17 00:00:00 2001
+From 33680168b1aaa776f384a20a46a403784858e7d3 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 8e522e3aa..c54465a62 100644
+index f3f2a0b69..6f76351b8 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;
@@ -34,7 +34,7 @@ index 8e522e3aa..c54465a62 100644
  import org.bukkit.configuration.InvalidConfigurationException;
  import org.bukkit.configuration.file.YamlConfiguration;
  import co.aikar.timings.Timings;
-@@ -364,4 +366,23 @@ public class PaperConfig {
+@@ -355,4 +357,23 @@ public class PaperConfig {
          }
          tabSpamLimit = getInt("settings.spam-limiter.tab-spam-limit", tabSpamLimit);
      }
diff --git a/Spigot-Server-Patches/0365-Optimize-Server-World-Map.patch b/Spigot-Server-Patches/0364-Optimize-Server-World-Map.patch
similarity index 98%
rename from Spigot-Server-Patches/0365-Optimize-Server-World-Map.patch
rename to Spigot-Server-Patches/0364-Optimize-Server-World-Map.patch
index 5bda031f4..7ad24b49b 100644
--- a/Spigot-Server-Patches/0365-Optimize-Server-World-Map.patch
+++ b/Spigot-Server-Patches/0364-Optimize-Server-World-Map.patch
@@ -1,4 +1,4 @@
-From c40ff8852b2b3975cb6c23b02934953274edff7d Mon Sep 17 00:00:00 2001
+From 2922ac7ef4d6243dd4340eb3b09f8eeb11ee7a64 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
@@ -217,7 +217,7 @@ index 000000000..af9e4455c
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1f9e8a082..292547be3 100644
+index ef49fc258..c73a61d94 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -87,7 +87,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -239,5 +239,5 @@ index 1f9e8a082..292547be3 100644
          }
          // CraftBukkit end
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0366-PreSpawnerSpawnEvent.patch b/Spigot-Server-Patches/0365-PreSpawnerSpawnEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0366-PreSpawnerSpawnEvent.patch
rename to Spigot-Server-Patches/0365-PreSpawnerSpawnEvent.patch
index c1d6fbb58..140859361 100644
--- a/Spigot-Server-Patches/0366-PreSpawnerSpawnEvent.patch
+++ b/Spigot-Server-Patches/0365-PreSpawnerSpawnEvent.patch
@@ -1,4 +1,4 @@
-From 35fc67b72798399ed5e3ae8da18a9335c3d9d06d Mon Sep 17 00:00:00 2001
+From b244af90b7c98d93f1a8ea285afe743a9d6c27cf 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 0484c7006..733d5199a 100644
+index eca3f85ad..b2d2de7f8 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -102,11 +102,11 @@ public abstract class MobSpawnerAbstract {
@@ -28,5 +28,5 @@ index 0484c7006..733d5199a 100644
                          if (!event.callEvent()) {
                              flag = true;
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0367-Catch-JsonParseException-in-Entity-and-TE-names.patch b/Spigot-Server-Patches/0366-Catch-JsonParseException-in-Entity-and-TE-names.patch
similarity index 99%
rename from Spigot-Server-Patches/0367-Catch-JsonParseException-in-Entity-and-TE-names.patch
rename to Spigot-Server-Patches/0366-Catch-JsonParseException-in-Entity-and-TE-names.patch
index 177974146..debe33e89 100644
--- a/Spigot-Server-Patches/0367-Catch-JsonParseException-in-Entity-and-TE-names.patch
+++ b/Spigot-Server-Patches/0366-Catch-JsonParseException-in-Entity-and-TE-names.patch
@@ -1,4 +1,4 @@
-From ee657098cd8e89b0772d0668bc603682ae1b2ce4 Mon Sep 17 00:00:00 2001
+From 1c42d652f8e89a08c70d95eef465259447769e7b 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
@@ -154,5 +154,5 @@ index d4f379db9..59a0f4b2c 100644
  
      }
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0368-Avoid-dimension-id-collisions.patch b/Spigot-Server-Patches/0367-Avoid-dimension-id-collisions.patch
similarity index 94%
rename from Spigot-Server-Patches/0368-Avoid-dimension-id-collisions.patch
rename to Spigot-Server-Patches/0367-Avoid-dimension-id-collisions.patch
index f562f3405..43a47fc6a 100644
--- a/Spigot-Server-Patches/0368-Avoid-dimension-id-collisions.patch
+++ b/Spigot-Server-Patches/0367-Avoid-dimension-id-collisions.patch
@@ -1,4 +1,4 @@
-From 15e41014f6981d4507c5febfd4d6db708d44d35e Mon Sep 17 00:00:00 2001
+From b5ea79cadcb3f0c94babcc29504309d000e9bd38 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 25 Sep 2018 06:53:43 +0200
 Subject: [PATCH] Avoid dimension id collisions
diff --git a/Spigot-Server-Patches/0369-Honor-EntityAgeable.ageLock.patch b/Spigot-Server-Patches/0368-Honor-EntityAgeable.ageLock.patch
similarity index 85%
rename from Spigot-Server-Patches/0369-Honor-EntityAgeable.ageLock.patch
rename to Spigot-Server-Patches/0368-Honor-EntityAgeable.ageLock.patch
index 9f5897855..cc8d57e88 100644
--- a/Spigot-Server-Patches/0369-Honor-EntityAgeable.ageLock.patch
+++ b/Spigot-Server-Patches/0368-Honor-EntityAgeable.ageLock.patch
@@ -1,11 +1,11 @@
-From 2da068e973592741d075509d62f65f9317ffe6e9 Mon Sep 17 00:00:00 2001
+From 770706b73b1c9a69a1b1472e06d9d5c0f4da5193 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 1d7c998aa..a11bdaadc 100644
+index 652b178f1..b0c07560b 100644
 --- a/src/main/java/net/minecraft/server/EntityAgeable.java
 +++ b/src/main/java/net/minecraft/server/EntityAgeable.java
 @@ -82,6 +82,7 @@ public abstract class EntityAgeable extends EntityCreature {
@@ -17,5 +17,5 @@ index 1d7c998aa..a11bdaadc 100644
          int k = j;
  
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0370-Async-Chunk-Loading-and-Generation.patch b/Spigot-Server-Patches/0369-Async-Chunk-Loading-and-Generation.patch
similarity index 99%
rename from Spigot-Server-Patches/0370-Async-Chunk-Loading-and-Generation.patch
rename to Spigot-Server-Patches/0369-Async-Chunk-Loading-and-Generation.patch
index 46d40b5a3..79ec4cb6d 100644
--- a/Spigot-Server-Patches/0370-Async-Chunk-Loading-and-Generation.patch
+++ b/Spigot-Server-Patches/0369-Async-Chunk-Loading-and-Generation.patch
@@ -1,4 +1,4 @@
-From e3d4d30667e9aa88b949627e4a10b59eee0db3b2 Mon Sep 17 00:00:00 2001
+From d36d1367dd5f8207585ac03adcb92d936482125c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Jul 2018 16:55:04 -0400
 Subject: [PATCH] Async Chunk Loading and Generation
@@ -43,10 +43,10 @@ reading or writing to the chunk will be safe, so plugins still
 should not be touching chunks asynchronously!
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index c54465a62..aa26a7758 100644
+index 6f76351b8..e8b03795f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -385,4 +385,57 @@ public class PaperConfig {
+@@ -376,4 +376,57 @@ public class PaperConfig {
              }
          }
      }
diff --git a/Spigot-Server-Patches/0371-Ignore-Dimension-NBT-field-in-Entity-data.patch b/Spigot-Server-Patches/0370-Ignore-Dimension-NBT-field-in-Entity-data.patch
similarity index 92%
rename from Spigot-Server-Patches/0371-Ignore-Dimension-NBT-field-in-Entity-data.patch
rename to Spigot-Server-Patches/0370-Ignore-Dimension-NBT-field-in-Entity-data.patch
index d2e02c51e..eca117bae 100644
--- a/Spigot-Server-Patches/0371-Ignore-Dimension-NBT-field-in-Entity-data.patch
+++ b/Spigot-Server-Patches/0370-Ignore-Dimension-NBT-field-in-Entity-data.patch
@@ -1,4 +1,4 @@
-From 0877ec92331121e0415d7c14dc63075ed294a3d3 Mon Sep 17 00:00:00 2001
+From 8adcfffd2be7a9ff13871063ae4849441c2c08b7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 27 Sep 2018 00:08:31 -0400
 Subject: [PATCH] Ignore Dimension NBT field in Entity data
@@ -14,7 +14,7 @@ DimensionManager set to the world it is being placed into.
 This fixes corrupt entities breaking chunk saving in custom worlds.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 552be8cd8..dd96b09e6 100644
+index ee878191a..0f646ac7e 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1721,7 +1721,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -27,5 +27,5 @@ index 552be8cd8..dd96b09e6 100644
  
              this.invulnerable = nbttagcompound.getBoolean("Invulnerable");
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0372-Optimize-Light-Recalculations.patch b/Spigot-Server-Patches/0371-Optimize-Light-Recalculations.patch
similarity index 96%
rename from Spigot-Server-Patches/0372-Optimize-Light-Recalculations.patch
rename to Spigot-Server-Patches/0371-Optimize-Light-Recalculations.patch
index b22280c06..3a87462ec 100644
--- a/Spigot-Server-Patches/0372-Optimize-Light-Recalculations.patch
+++ b/Spigot-Server-Patches/0371-Optimize-Light-Recalculations.patch
@@ -1,4 +1,4 @@
-From 659826fe3f74e1201299115726355f730d4aa3fd Mon Sep 17 00:00:00 2001
+From 1852d827e23ce5b43a7895a0a7d3e339ae785bbd Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 28 Sep 2018 20:46:29 -0400
 Subject: [PATCH] Optimize Light Recalculations
@@ -14,7 +14,7 @@ Also optimizes to not repeatedly look up the same chunk for
 light lookups.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index d86e12042..b85a217fe 100644
+index 0bd975b6d..603ad2393 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -347,7 +347,7 @@ public class Chunk implements IChunkAccess {
@@ -64,5 +64,5 @@ index f8afa6f72..3c99ae7cd 100644
              // CraftBukkit end
              return false;
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0373-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch b/Spigot-Server-Patches/0372-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
similarity index 96%
rename from Spigot-Server-Patches/0373-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
rename to Spigot-Server-Patches/0372-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
index 306804df2..a4f71cfb3 100644
--- a/Spigot-Server-Patches/0373-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
+++ b/Spigot-Server-Patches/0372-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
@@ -1,4 +1,4 @@
-From 834ae3968bdf4370bb2a8f6ee313b323a1268b4b Mon Sep 17 00:00:00 2001
+From 0b05b7acbe1e2495df24a75b06ac6d07b26bbfe1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 28 Sep 2018 21:49:53 -0400
 Subject: [PATCH] Fix issues with entity loss due to unloaded chunks
@@ -40,5 +40,5 @@ index 3c99ae7cd..2b9da597a 100644
              } else {
                  this.getChunkAt(i, k).a(entity);
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0374-Don-t-recheck-type-after-setting-a-block.patch b/Spigot-Server-Patches/0373-Don-t-recheck-type-after-setting-a-block.patch
similarity index 92%
rename from Spigot-Server-Patches/0374-Don-t-recheck-type-after-setting-a-block.patch
rename to Spigot-Server-Patches/0373-Don-t-recheck-type-after-setting-a-block.patch
index 9fb8878bf..694950ea9 100644
--- a/Spigot-Server-Patches/0374-Don-t-recheck-type-after-setting-a-block.patch
+++ b/Spigot-Server-Patches/0373-Don-t-recheck-type-after-setting-a-block.patch
@@ -1,4 +1,4 @@
-From a3996515e796f8e2daade8a978a59355a94f6629 Mon Sep 17 00:00:00 2001
+From 0c569b2b292c0dd86f4f5602118c0fb545f37d07 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 b85a217fe..07bc23e28 100644
+index 603ad2393..5d0ecb114 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -552,7 +552,7 @@ public class Chunk implements IChunkAccess {
@@ -29,5 +29,5 @@ index b85a217fe..07bc23e28 100644
              } else {
                  if (flag1) {
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0375-Fix-Sending-Chunks-to-Client.patch b/Spigot-Server-Patches/0374-Fix-Sending-Chunks-to-Client.patch
similarity index 95%
rename from Spigot-Server-Patches/0375-Fix-Sending-Chunks-to-Client.patch
rename to Spigot-Server-Patches/0374-Fix-Sending-Chunks-to-Client.patch
index 5588fdf9a..d98d8f2c4 100644
--- a/Spigot-Server-Patches/0375-Fix-Sending-Chunks-to-Client.patch
+++ b/Spigot-Server-Patches/0374-Fix-Sending-Chunks-to-Client.patch
@@ -1,4 +1,4 @@
-From 9bd565eb9c7a00c05a056cdffc13286be4049e01 Mon Sep 17 00:00:00 2001
+From 5a2b308023d887a64eb67e1ae60018e5e5fe6d99 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 29 Sep 2018 01:18:16 -0400
 Subject: [PATCH] Fix Sending Chunks to Client
@@ -14,7 +14,7 @@ This fix always sends chunks to the client, and simply updates
 the client anytime post processing is triggered with the new chunk data.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 07bc23e28..b9242d4a2 100644
+index 5d0ecb114..d36c79732 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -1184,7 +1184,7 @@ public class Chunk implements IChunkAccess {
@@ -62,5 +62,5 @@ index cbff0d946..3ac09b91f 100644
          if (this.done) {
              return true;
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0376-Configurable-connection-throttle-kick-message.patch b/Spigot-Server-Patches/0375-Configurable-connection-throttle-kick-message.patch
similarity index 92%
rename from Spigot-Server-Patches/0376-Configurable-connection-throttle-kick-message.patch
rename to Spigot-Server-Patches/0375-Configurable-connection-throttle-kick-message.patch
index 91e880ec7..8bcfede59 100644
--- a/Spigot-Server-Patches/0376-Configurable-connection-throttle-kick-message.patch
+++ b/Spigot-Server-Patches/0375-Configurable-connection-throttle-kick-message.patch
@@ -1,14 +1,14 @@
-From 1fa1da69183f3f686be206c0ae935fcca0a23984 Mon Sep 17 00:00:00 2001
+From 6d01af39a8b3e43e67ef44b63b3e4eea992e842a 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 73b0c2394..e87c79387 100644
+index e8b03795f..5663a6517 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -305,6 +305,11 @@ public class PaperConfig {
+@@ -296,6 +296,11 @@ public class PaperConfig {
          authenticationServersDownKickMessage = Strings.emptyToNull(getString("messages.kick.authentication-servers-down", authenticationServersDownKickMessage));
      }
  
@@ -21,7 +21,7 @@ index 73b0c2394..e87c79387 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 daea8330c..88a275afd 100644
+index 25049a351..f923272a4 100644
 --- a/src/main/java/net/minecraft/server/HandshakeListener.java
 +++ b/src/main/java/net/minecraft/server/HandshakeListener.java
 @@ -37,7 +37,7 @@ public class HandshakeListener implements PacketHandshakingInListener {
@@ -34,5 +34,5 @@ index daea8330c..88a275afd 100644
                          this.b.close(chatmessage);
                          return;
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0377-Fix-FileIOThread-concurrency-issues.patch b/Spigot-Server-Patches/0376-Fix-FileIOThread-concurrency-issues.patch
similarity index 95%
rename from Spigot-Server-Patches/0377-Fix-FileIOThread-concurrency-issues.patch
rename to Spigot-Server-Patches/0376-Fix-FileIOThread-concurrency-issues.patch
index 415169a17..da4d6da67 100644
--- a/Spigot-Server-Patches/0377-Fix-FileIOThread-concurrency-issues.patch
+++ b/Spigot-Server-Patches/0376-Fix-FileIOThread-concurrency-issues.patch
@@ -1,4 +1,4 @@
-From 53e69860d3f27a67cd70a1984effe3377ee67735 Mon Sep 17 00:00:00 2001
+From 735de45cac6b82ec25348841a58a83c41f6ac9e4 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Wed, 3 Oct 2018 19:04:53 +0100
 Subject: [PATCH] Fix FileIOThread concurrency issues
@@ -31,5 +31,5 @@ index 97917551a..1959bc066 100644
          }
  
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0378-Don-t-update-snapshot-blockstates.patch b/Spigot-Server-Patches/0377-Don-t-update-snapshot-blockstates.patch
similarity index 93%
rename from Spigot-Server-Patches/0378-Don-t-update-snapshot-blockstates.patch
rename to Spigot-Server-Patches/0377-Don-t-update-snapshot-blockstates.patch
index 18d109d2a..c484ecfca 100644
--- a/Spigot-Server-Patches/0378-Don-t-update-snapshot-blockstates.patch
+++ b/Spigot-Server-Patches/0377-Don-t-update-snapshot-blockstates.patch
@@ -1,4 +1,4 @@
-From 96c0dacc79b25fda35fad6855acdb01770785d04 Mon Sep 17 00:00:00 2001
+From 9b9f06d80de2155ed714b5fa9a4bd4711fc4b28f Mon Sep 17 00:00:00 2001
 From: Matthew Miller <mnmiller1@me.com>
 Date: Fri, 5 Oct 2018 15:46:46 +1000
 Subject: [PATCH] Don't update snapshot blockstates
@@ -22,5 +22,5 @@ index d4d9c5fc5..f5c6dbd85 100644
              }
          }
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0379-Hook-into-CB-plugin-rewrites.patch b/Spigot-Server-Patches/0378-Hook-into-CB-plugin-rewrites.patch
similarity index 99%
rename from Spigot-Server-Patches/0379-Hook-into-CB-plugin-rewrites.patch
rename to Spigot-Server-Patches/0378-Hook-into-CB-plugin-rewrites.patch
index cc5a139ed..e06133538 100644
--- a/Spigot-Server-Patches/0379-Hook-into-CB-plugin-rewrites.patch
+++ b/Spigot-Server-Patches/0378-Hook-into-CB-plugin-rewrites.patch
@@ -1,4 +1,4 @@
-From 86bcfd44c4aa9ead64eddd5edf88914f3f3a3242 Mon Sep 17 00:00:00 2001
+From 9b7e46b12fd7a2f30a3fcf16389f327333d44da7 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
@@ -187,5 +187,5 @@ index 875b4f77c..93e09e42f 100644
                          {
                              if ( owner.equals( "org/bukkit/Material" ) )
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0380-Allow-setting-the-vex-s-summoner.patch b/Spigot-Server-Patches/0379-Allow-setting-the-vex-s-summoner.patch
similarity index 92%
rename from Spigot-Server-Patches/0380-Allow-setting-the-vex-s-summoner.patch
rename to Spigot-Server-Patches/0379-Allow-setting-the-vex-s-summoner.patch
index d115363d3..319b52ab7 100644
--- a/Spigot-Server-Patches/0380-Allow-setting-the-vex-s-summoner.patch
+++ b/Spigot-Server-Patches/0379-Allow-setting-the-vex-s-summoner.patch
@@ -1,11 +1,11 @@
-From 98f5aff421ed8074a66f272dba2c70656b9d1b7c Mon Sep 17 00:00:00 2001
+From 28baa8f8be9e47d530070d72a79781e61d3b54fa 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 6e029ff44..1bf705e82 100644
+index 90028c802..6915e5d11 100644
 --- a/src/main/java/net/minecraft/server/EntityVex.java
 +++ b/src/main/java/net/minecraft/server/EntityVex.java
 @@ -127,6 +127,7 @@ public class EntityVex extends EntityMonster {
@@ -32,5 +32,5 @@ index 927ed9a9a..c23b1e960 100644
  
      @Override
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0381-Add-LivingEntity-getTargetEntity.patch b/Spigot-Server-Patches/0380-Add-LivingEntity-getTargetEntity.patch
similarity index 99%
rename from Spigot-Server-Patches/0381-Add-LivingEntity-getTargetEntity.patch
rename to Spigot-Server-Patches/0380-Add-LivingEntity-getTargetEntity.patch
index 99895ef01..57d869213 100644
--- a/Spigot-Server-Patches/0381-Add-LivingEntity-getTargetEntity.patch
+++ b/Spigot-Server-Patches/0380-Add-LivingEntity-getTargetEntity.patch
@@ -1,4 +1,4 @@
-From ba8e629a2b3f75fde85854071cf7f51180271543 Mon Sep 17 00:00:00 2001
+From e819add1bd9db4ae5bd4a089cbb822adce4f04d5 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
@@ -180,5 +180,5 @@ index eeab59379..d6a4bc64a 100644
  
      public List<Block> getLastTwoTargetBlocks(Set<Material> transparent, int maxDistance) {
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0382-Add-sun-related-API.patch b/Spigot-Server-Patches/0381-Add-sun-related-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0382-Add-sun-related-API.patch
rename to Spigot-Server-Patches/0381-Add-sun-related-API.patch
index 6871fe96c..f89c93284 100644
--- a/Spigot-Server-Patches/0382-Add-sun-related-API.patch
+++ b/Spigot-Server-Patches/0381-Add-sun-related-API.patch
@@ -1,4 +1,4 @@
-From 37b39c722b30521882bdffa54fe17de4feb89d74 Mon Sep 17 00:00:00 2001
+From 59a962dc195d077d4ca77c9b5da82faefe987854 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
@@ -61,5 +61,5 @@ index 53c2d154e..40a429942 100644
 +    // Paper end
  }
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0383-Check-Drowned-for-Villager-Aggression-Config.patch b/Spigot-Server-Patches/0382-Check-Drowned-for-Villager-Aggression-Config.patch
similarity index 96%
rename from Spigot-Server-Patches/0383-Check-Drowned-for-Villager-Aggression-Config.patch
rename to Spigot-Server-Patches/0382-Check-Drowned-for-Villager-Aggression-Config.patch
index 7c43df88a..8d8b9e707 100644
--- a/Spigot-Server-Patches/0383-Check-Drowned-for-Villager-Aggression-Config.patch
+++ b/Spigot-Server-Patches/0382-Check-Drowned-for-Villager-Aggression-Config.patch
@@ -1,4 +1,4 @@
-From 339773e609c502e87439121628825c9b02857833 Mon Sep 17 00:00:00 2001
+From 163eb2768d1e2d847727e3f6b2292048f23d0a2f 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
@@ -32,5 +32,5 @@ index b4500eead..512c22df9 100644
      }
  
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0384-Here-s-Johnny.patch b/Spigot-Server-Patches/0383-Here-s-Johnny.patch
similarity index 95%
rename from Spigot-Server-Patches/0384-Here-s-Johnny.patch
rename to Spigot-Server-Patches/0383-Here-s-Johnny.patch
index e53ae2006..ce809419e 100644
--- a/Spigot-Server-Patches/0384-Here-s-Johnny.patch
+++ b/Spigot-Server-Patches/0383-Here-s-Johnny.patch
@@ -1,4 +1,4 @@
-From 4199535f4288d3876a9f2973e4dcc3f2ec3c4d1e Mon Sep 17 00:00:00 2001
+From c17f707a80a349d69269d8d601271939e46f0938 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!
@@ -37,5 +37,5 @@ index 951d47929..5ff957ced 100644
 +    // Paper end
  }
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0385-Turtle-API.patch b/Spigot-Server-Patches/0384-Turtle-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0385-Turtle-API.patch
rename to Spigot-Server-Patches/0384-Turtle-API.patch
index 5721572b1..6b3a0fbe5 100644
--- a/Spigot-Server-Patches/0385-Turtle-API.patch
+++ b/Spigot-Server-Patches/0384-Turtle-API.patch
@@ -1,4 +1,4 @@
-From ff8fe97e3d6eed64da443a63edf0cdb55106978c Mon Sep 17 00:00:00 2001
+From 5c8a1842d827515d28e5138c93f67a8ce83a8dd1 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
@@ -153,5 +153,5 @@ index 123a2c75c..8edcf7af6 100644
 +    // Paper end
  }
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0386-Fire-EntityCombustEvent-for-phantoms.patch b/Spigot-Server-Patches/0385-Fire-EntityCombustEvent-for-phantoms.patch
similarity index 89%
rename from Spigot-Server-Patches/0386-Fire-EntityCombustEvent-for-phantoms.patch
rename to Spigot-Server-Patches/0385-Fire-EntityCombustEvent-for-phantoms.patch
index 3bba7e918..3412637aa 100644
--- a/Spigot-Server-Patches/0386-Fire-EntityCombustEvent-for-phantoms.patch
+++ b/Spigot-Server-Patches/0385-Fire-EntityCombustEvent-for-phantoms.patch
@@ -1,11 +1,11 @@
-From 67768c485ef423216d91265e34352f93c6e185d8 Mon Sep 17 00:00:00 2001
+From 5fbe0cd486254c3f259c75e59496cc81a9e0263d Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Sat, 13 Oct 2018 22:29:17 +0200
 Subject: [PATCH] Fire EntityCombustEvent for phantoms
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
-index e27600109..098662193 100644
+index 8332d5cc8..dd7dcfbf1 100644
 --- a/src/main/java/net/minecraft/server/EntityPhantom.java
 +++ b/src/main/java/net/minecraft/server/EntityPhantom.java
 @@ -105,7 +105,12 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@@ -23,5 +23,5 @@ index e27600109..098662193 100644
  
          super.k();
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0387-Limit-lightning-strike-effect-distance.patch b/Spigot-Server-Patches/0386-Limit-lightning-strike-effect-distance.patch
similarity index 97%
rename from Spigot-Server-Patches/0387-Limit-lightning-strike-effect-distance.patch
rename to Spigot-Server-Patches/0386-Limit-lightning-strike-effect-distance.patch
index 97e680c1d..1d3903091 100644
--- a/Spigot-Server-Patches/0387-Limit-lightning-strike-effect-distance.patch
+++ b/Spigot-Server-Patches/0386-Limit-lightning-strike-effect-distance.patch
@@ -1,11 +1,11 @@
-From 219eb45985e44415921f1d03c2bb7e940bde06b1 Mon Sep 17 00:00:00 2001
+From 14da468379f829404d6f5480c42fff474472b823 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 93bf8c6d3..f94fa5df2 100644
+index 94c544714..48920b045 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -237,6 +237,28 @@ public class PaperWorldConfig {
@@ -69,7 +69,7 @@ index afbe43dd3..d732be52e 100644
  
          --this.lifeTicks;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index a54ea5a69..818e4c376 100644
+index af68074c1..899c7f5f7 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1087,7 +1087,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -82,5 +82,5 @@ index a54ea5a69..818e4c376 100644
          } else {
              return false;
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0388-Implement-getters-and-setters-for-EntityItem-owner-a.patch b/Spigot-Server-Patches/0387-Implement-getters-and-setters-for-EntityItem-owner-a.patch
similarity index 95%
rename from Spigot-Server-Patches/0388-Implement-getters-and-setters-for-EntityItem-owner-a.patch
rename to Spigot-Server-Patches/0387-Implement-getters-and-setters-for-EntityItem-owner-a.patch
index 313cf8db1..3b0082499 100644
--- a/Spigot-Server-Patches/0388-Implement-getters-and-setters-for-EntityItem-owner-a.patch
+++ b/Spigot-Server-Patches/0387-Implement-getters-and-setters-for-EntityItem-owner-a.patch
@@ -1,4 +1,4 @@
-From 5144ca531ef4e30f914d043754c2f6f298413c26 Mon Sep 17 00:00:00 2001
+From 7be795a007b6995f5027cbc6c2960b43c60d9f80 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/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index 6037ce0e9..10eb882f4 100644
+index 7264773ef..890342baa 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -410,20 +410,22 @@ public class EntityItem extends Entity {
@@ -78,5 +78,5 @@ index 1df17f09b..25666792e 100644
  
      @Override
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0389-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/Spigot-Server-Patches/0388-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
similarity index 94%
rename from Spigot-Server-Patches/0389-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
rename to Spigot-Server-Patches/0388-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
index 4dfbc36d1..b9847c147 100644
--- a/Spigot-Server-Patches/0389-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
+++ b/Spigot-Server-Patches/0388-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
@@ -1,4 +1,4 @@
-From 8f295e5a58d67196f276972878a4f12616dbe3c4 Mon Sep 17 00:00:00 2001
+From db692abcbb280881383faf0642f610e626708fa9 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 dd8af4be8..b4a5bc600 100644
+index 8d41efe8f..0e6dae8cd 100644
 --- a/src/main/java/net/minecraft/server/EntityProjectile.java
 +++ b/src/main/java/net/minecraft/server/EntityProjectile.java
 @@ -250,11 +250,21 @@ public abstract class EntityProjectile extends Entity implements IProjectile {
@@ -38,5 +38,5 @@ index dd8af4be8..b4a5bc600 100644
          }
  
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0390-Call-player-spectator-target-events.patch b/Spigot-Server-Patches/0389-Call-player-spectator-target-events.patch
similarity index 96%
rename from Spigot-Server-Patches/0390-Call-player-spectator-target-events.patch
rename to Spigot-Server-Patches/0389-Call-player-spectator-target-events.patch
index 8e87d5eee..36b20306d 100644
--- a/Spigot-Server-Patches/0390-Call-player-spectator-target-events.patch
+++ b/Spigot-Server-Patches/0389-Call-player-spectator-target-events.patch
@@ -1,11 +1,11 @@
-From 8d90f48b3015935a82ecebbe74f46795b43f5f62 Mon Sep 17 00:00:00 2001
+From 647dd278ce28d44290e63d656da9dff190becf11 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 720eb9184..7bbcaba05 100644
+index d429e552e..6105a4e14 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -62,7 +62,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -60,5 +60,5 @@ index 720eb9184..7bbcaba05 100644
  
      protected void E() {
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0391-Add-Velocity-IP-Forwarding-Support.patch b/Spigot-Server-Patches/0390-Add-Velocity-IP-Forwarding-Support.patch
similarity index 98%
rename from Spigot-Server-Patches/0391-Add-Velocity-IP-Forwarding-Support.patch
rename to Spigot-Server-Patches/0390-Add-Velocity-IP-Forwarding-Support.patch
index 07ab3c8d4..a58615c45 100644
--- a/Spigot-Server-Patches/0391-Add-Velocity-IP-Forwarding-Support.patch
+++ b/Spigot-Server-Patches/0390-Add-Velocity-IP-Forwarding-Support.patch
@@ -1,4 +1,4 @@
-From 63b09e7f09469d97b06df38f7dcfa4e7cab1eba2 Mon Sep 17 00:00:00 2001
+From 004b5a9beb71200c6c09ef9dc7791fd697f004a5 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 e87c79387..bc74ea2f0 100644
+index 5663a6517..fef899ae0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -8,6 +8,7 @@ import java.io.IOException;
@@ -34,7 +34,7 @@ index e87c79387..bc74ea2f0 100644
      }
  
      public static int packetInSpamThreshold = 300;
-@@ -443,4 +444,18 @@ public class PaperConfig {
+@@ -434,4 +435,18 @@ public class PaperConfig {
              }
          }
      }
@@ -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 5778a5201..b6a3992a3 100644
+index 58a2f3d28..4df31c828 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -43,6 +43,7 @@ public class LoginListener implements PacketLoginInListener, ITickable {
@@ -278,5 +278,5 @@ index 9c5559ece..9de0421bb 100644
          this.a = packetdataserializer.g();
          this.b = packetdataserializer.l();
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0392-Add-more-Witch-API.patch b/Spigot-Server-Patches/0391-Add-more-Witch-API.patch
similarity index 99%
rename from Spigot-Server-Patches/0392-Add-more-Witch-API.patch
rename to Spigot-Server-Patches/0391-Add-more-Witch-API.patch
index 366551795..c7449cd47 100644
--- a/Spigot-Server-Patches/0392-Add-more-Witch-API.patch
+++ b/Spigot-Server-Patches/0391-Add-more-Witch-API.patch
@@ -1,4 +1,4 @@
-From 4a2033ec2efd8d600fbb7090583867d28201d089 Mon Sep 17 00:00:00 2001
+From 18b099c85cd5ab178d78435d918404787ea441c7 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
@@ -136,5 +136,5 @@ index f25998eb6..ac465bda2 100644
 +    // Paper end
  }
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0393-Fix-MC-93764.patch b/Spigot-Server-Patches/0392-Fix-MC-93764.patch
similarity index 90%
rename from Spigot-Server-Patches/0393-Fix-MC-93764.patch
rename to Spigot-Server-Patches/0392-Fix-MC-93764.patch
index f35bc4c49..a145a08cd 100644
--- a/Spigot-Server-Patches/0393-Fix-MC-93764.patch
+++ b/Spigot-Server-Patches/0392-Fix-MC-93764.patch
@@ -1,4 +1,4 @@
-From 93f360e4b50c87654275e6f1e3d8e4d043fbbea0 Mon Sep 17 00:00:00 2001
+From 035e7e8af36cbd056ec50daa9d7dcf5e69515a58 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
@@ -18,5 +18,5 @@ index 54ca83286..0c854170c 100644
  
      public boolean canRespawn() {
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0394-Don-t-modify-item-tag-if-interaction-is-canceled.patch b/Spigot-Server-Patches/0393-Don-t-modify-item-tag-if-interaction-is-canceled.patch
similarity index 97%
rename from Spigot-Server-Patches/0394-Don-t-modify-item-tag-if-interaction-is-canceled.patch
rename to Spigot-Server-Patches/0393-Don-t-modify-item-tag-if-interaction-is-canceled.patch
index fa38121d1..748ca7d0c 100644
--- a/Spigot-Server-Patches/0394-Don-t-modify-item-tag-if-interaction-is-canceled.patch
+++ b/Spigot-Server-Patches/0393-Don-t-modify-item-tag-if-interaction-is-canceled.patch
@@ -1,4 +1,4 @@
-From d9e749a4f00e14e4c137f6d7c367774732deae25 Mon Sep 17 00:00:00 2001
+From 31d6fee4dc2059d68332b4edca5b0a145454804e Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Sat, 20 Oct 2018 03:45:34 +0200
 Subject: [PATCH] Don't modify item tag if interaction is canceled
@@ -56,5 +56,5 @@ index 4d29cb8d8..cb77bc8a5 100644
  
                      for (Map.Entry<BlockPosition, TileEntity> e : world.capturedTileEntities.entrySet()) {
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0395-Add-option-to-prevent-players-from-moving-into-unloa.patch b/Spigot-Server-Patches/0394-Add-option-to-prevent-players-from-moving-into-unloa.patch
similarity index 98%
rename from Spigot-Server-Patches/0395-Add-option-to-prevent-players-from-moving-into-unloa.patch
rename to Spigot-Server-Patches/0394-Add-option-to-prevent-players-from-moving-into-unloa.patch
index cb5c105cf..e7baf2d9c 100644
--- a/Spigot-Server-Patches/0395-Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/Spigot-Server-Patches/0394-Add-option-to-prevent-players-from-moving-into-unloa.patch
@@ -1,4 +1,4 @@
-From e4233c1ede5555a34a70d41c86b40b45f63b4d7a Mon Sep 17 00:00:00 2001
+From 3232746a90f2ca339eaeb1a7bcdbd6fd0b2c6edc Mon Sep 17 00:00:00 2001
 From: Gabriele C <sgdc3.mail@gmail.com>
 Date: Mon, 22 Oct 2018 17:34:10 +0200
 Subject: [PATCH] Add option to prevent players from moving into unloaded
diff --git a/Spigot-Server-Patches/0396-Reset-players-airTicks-on-respawn.patch b/Spigot-Server-Patches/0395-Reset-players-airTicks-on-respawn.patch
similarity index 89%
rename from Spigot-Server-Patches/0396-Reset-players-airTicks-on-respawn.patch
rename to Spigot-Server-Patches/0395-Reset-players-airTicks-on-respawn.patch
index 2a3a899cc..4dfbce44e 100644
--- a/Spigot-Server-Patches/0396-Reset-players-airTicks-on-respawn.patch
+++ b/Spigot-Server-Patches/0395-Reset-players-airTicks-on-respawn.patch
@@ -1,11 +1,11 @@
-From b966c253c53ed96502ebb4de7bb0a0d9682bd6dc Mon Sep 17 00:00:00 2001
+From 2140c895572c8167fc70431472908e3d26055210 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 d60dab95f..32b90f30d 100644
+index 23e6f45bf..e4c78c676 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2335,7 +2335,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -18,7 +18,7 @@ index d60dab95f..32b90f30d 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 7bbcaba05..4490b6325 100644
+index 6105a4e14..1b47d7bd4 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1619,6 +1619,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -30,5 +30,5 @@ index 7bbcaba05..4490b6325 100644
          this.fallDistance = 0;
          this.foodData = new FoodMetaData(this);
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0397-Strip-private-area-unicode-characters-from-signs.patch b/Spigot-Server-Patches/0396-Strip-private-area-unicode-characters-from-signs.patch
similarity index 98%
rename from Spigot-Server-Patches/0397-Strip-private-area-unicode-characters-from-signs.patch
rename to Spigot-Server-Patches/0396-Strip-private-area-unicode-characters-from-signs.patch
index 9f786f5d6..ba5f9c508 100644
--- a/Spigot-Server-Patches/0397-Strip-private-area-unicode-characters-from-signs.patch
+++ b/Spigot-Server-Patches/0396-Strip-private-area-unicode-characters-from-signs.patch
@@ -1,4 +1,4 @@
-From e07c285c4be3bbc081ce1a4dd03d2884557c5d25 Mon Sep 17 00:00:00 2001
+From fd8522ce3ddbd90e469df1984f4a78f462c4e55f 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
@@ -89,5 +89,5 @@ index 20dc3f272..3c712fc93 100644
  
      public void a(int i, IChatBaseComponent ichatbasecomponent) {
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0398-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/Spigot-Server-Patches/0397-Don-t-sleep-after-profile-lookups-if-not-needed.patch
similarity index 95%
rename from Spigot-Server-Patches/0398-Don-t-sleep-after-profile-lookups-if-not-needed.patch
rename to Spigot-Server-Patches/0397-Don-t-sleep-after-profile-lookups-if-not-needed.patch
index f35b0613b..095957234 100644
--- a/Spigot-Server-Patches/0398-Don-t-sleep-after-profile-lookups-if-not-needed.patch
+++ b/Spigot-Server-Patches/0397-Don-t-sleep-after-profile-lookups-if-not-needed.patch
@@ -1,4 +1,4 @@
-From d5f1d78fb2a5d63b07ed6a9a41bf517aba824599 Mon Sep 17 00:00:00 2001
+From ab154e556faa32e598214415f972381190fe1208 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
@@ -32,5 +32,5 @@ index 71e48e87b..23f1447cf 100644
                      try {
                          Thread.sleep(DELAY_BETWEEN_PAGES);
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0399-Use-more-reasonable-thread-count-default-for-bootstr.patch b/Spigot-Server-Patches/0398-Use-more-reasonable-thread-count-default-for-bootstr.patch
similarity index 91%
rename from Spigot-Server-Patches/0399-Use-more-reasonable-thread-count-default-for-bootstr.patch
rename to Spigot-Server-Patches/0398-Use-more-reasonable-thread-count-default-for-bootstr.patch
index 438ff20ec..e51dd65fb 100644
--- a/Spigot-Server-Patches/0399-Use-more-reasonable-thread-count-default-for-bootstr.patch
+++ b/Spigot-Server-Patches/0398-Use-more-reasonable-thread-count-default-for-bootstr.patch
@@ -1,11 +1,11 @@
-From 8f2fdc5080f1ed159479a906fff4089c524d6c5f Mon Sep 17 00:00:00 2001
+From 55d24fdbcaf2a193f697c2e4f7490d6fb2f0de72 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/DataConverterRegistry.java b/src/main/java/net/minecraft/server/DataConverterRegistry.java
-index e15b6da82..021fc0fc1 100644
+index 13f237ec4..012d878cb 100644
 --- a/src/main/java/net/minecraft/server/DataConverterRegistry.java
 +++ b/src/main/java/net/minecraft/server/DataConverterRegistry.java
 @@ -22,7 +22,7 @@ public class DataConverterRegistry {
@@ -18,5 +18,5 @@ index e15b6da82..021fc0fc1 100644
          pool.shutdown();
          return fixer;
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0400-Use-EntityTypes-for-living-entities.patch b/Spigot-Server-Patches/0399-Use-EntityTypes-for-living-entities.patch
similarity index 99%
rename from Spigot-Server-Patches/0400-Use-EntityTypes-for-living-entities.patch
rename to Spigot-Server-Patches/0399-Use-EntityTypes-for-living-entities.patch
index a87ed1320..bb7a0b52b 100644
--- a/Spigot-Server-Patches/0400-Use-EntityTypes-for-living-entities.patch
+++ b/Spigot-Server-Patches/0399-Use-EntityTypes-for-living-entities.patch
@@ -1,4 +1,4 @@
-From 63c725d26b2b469c15ba5d6c618ef4c8628e42b5 Mon Sep 17 00:00:00 2001
+From d5a03e6f186b822c7f5536897a21be7c1a7d128e Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 4 Oct 2018 10:08:02 -0500
 Subject: [PATCH] Use EntityTypes for living entities
@@ -66,10 +66,10 @@ index 93bf32dc1..e6063bb46 100644
  
                  entitywither.setPositionRotation((double) blockposition2.getX() + 0.5D, (double) blockposition2.getY() + 0.55D, (double) blockposition2.getZ() + 0.5D, shapedetector_shapedetectorcollection.getFacing().k() == EnumDirection.EnumAxis.X ? 0.0F : 90.0F, 0.0F);
 diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java
-index 67808446c..89bb2e768 100644
+index e6da1c30f..efb3c057d 100644
 --- a/src/main/java/net/minecraft/server/EnderDragonBattle.java
 +++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java
-@@ -357,7 +357,7 @@ public class EnderDragonBattle {
+@@ -361,7 +361,7 @@ public class EnderDragonBattle {
  
      private EntityEnderDragon n() {
          this.d.getChunkAtWorldCoords(new BlockPosition(0, 128, 0));
@@ -915,5 +915,5 @@ index 10fa12253..bd118f7f0 100644
  
              if (entity != null) {
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0401-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch b/Spigot-Server-Patches/0400-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
similarity index 96%
rename from Spigot-Server-Patches/0401-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
rename to Spigot-Server-Patches/0400-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
index e65321a3d..25a80397e 100644
--- a/Spigot-Server-Patches/0401-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
+++ b/Spigot-Server-Patches/0400-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
@@ -1,4 +1,4 @@
-From 7f5b0bc3f6a6548490c41d8035e88dc1aac0d159 Mon Sep 17 00:00:00 2001
+From cf16bcbcc159e8788f7c77444ba2de728b9aa206 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
@@ -30,5 +30,5 @@ index 23fc4d8e1..0b6c25936 100644
                          iblockdata.getBlock().a(this.world, this.player, blockposition, iblockdata, tileentity, itemstack2);
                      }
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0402-Optimize-World-Time-Updates.patch b/Spigot-Server-Patches/0401-Optimize-World-Time-Updates.patch
similarity index 96%
rename from Spigot-Server-Patches/0402-Optimize-World-Time-Updates.patch
rename to Spigot-Server-Patches/0401-Optimize-World-Time-Updates.patch
index ec6e9087b..27a52d2db 100644
--- a/Spigot-Server-Patches/0402-Optimize-World-Time-Updates.patch
+++ b/Spigot-Server-Patches/0401-Optimize-World-Time-Updates.patch
@@ -1,4 +1,4 @@
-From 49ff6e6c0df56f2e644f8d82ce6ec6448615e4d4 Mon Sep 17 00:00:00 2001
+From ce53ef45117823d14fb68349adbf192cb6b62b94 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 5049595ab..9c8c3304e 100644
+index 17ae26cb8..2023ee118 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1038,12 +1038,24 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -41,5 +41,5 @@ index 5049595ab..9c8c3304e 100644
  
          // WorldServer worldserver; // CraftBukkit - dropped down
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0403-Restore-custom-InventoryHolder-support.patch b/Spigot-Server-Patches/0402-Restore-custom-InventoryHolder-support.patch
similarity index 96%
rename from Spigot-Server-Patches/0403-Restore-custom-InventoryHolder-support.patch
rename to Spigot-Server-Patches/0402-Restore-custom-InventoryHolder-support.patch
index 8f776dbca..1bb243d0e 100644
--- a/Spigot-Server-Patches/0403-Restore-custom-InventoryHolder-support.patch
+++ b/Spigot-Server-Patches/0402-Restore-custom-InventoryHolder-support.patch
@@ -1,4 +1,4 @@
-From a49502b8aac85700c7893c07d94f576e0301e757 Mon Sep 17 00:00:00 2001
+From 7817eebb61ebe27be2a7ccda68255e7366cfc332 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
@@ -42,5 +42,5 @@ index 23389743d..d25928e09 100644
      }
  
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0404-Use-Vanilla-Minecart-Speeds.patch b/Spigot-Server-Patches/0403-Use-Vanilla-Minecart-Speeds.patch
similarity index 91%
rename from Spigot-Server-Patches/0404-Use-Vanilla-Minecart-Speeds.patch
rename to Spigot-Server-Patches/0403-Use-Vanilla-Minecart-Speeds.patch
index c093b9e6a..0715ebe19 100644
--- a/Spigot-Server-Patches/0404-Use-Vanilla-Minecart-Speeds.patch
+++ b/Spigot-Server-Patches/0403-Use-Vanilla-Minecart-Speeds.patch
@@ -1,4 +1,4 @@
-From 137bc6f72feba5616a393925792550a0632d2ae1 Mon Sep 17 00:00:00 2001
+From d5f7c49e1cec24ab58a34916aaa8794feaa64eb4 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 932fbff7c..7fa1bceec 100644
+index b52bc659e..cea8cfce2 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 @@ -39,9 +39,9 @@ public abstract class EntityMinecartAbstract extends Entity implements INamableT
@@ -23,5 +23,5 @@ index 932fbff7c..7fa1bceec 100644
      // CraftBukkit end
  
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0405-Fix-SpongeAbsortEvent-handling.patch b/Spigot-Server-Patches/0404-Fix-SpongeAbsortEvent-handling.patch
similarity index 94%
rename from Spigot-Server-Patches/0405-Fix-SpongeAbsortEvent-handling.patch
rename to Spigot-Server-Patches/0404-Fix-SpongeAbsortEvent-handling.patch
index 1e62eaaed..36cb20050 100644
--- a/Spigot-Server-Patches/0405-Fix-SpongeAbsortEvent-handling.patch
+++ b/Spigot-Server-Patches/0404-Fix-SpongeAbsortEvent-handling.patch
@@ -1,4 +1,4 @@
-From 17003f4fd29872c2beeb6ed2cb706e4b17116e6f Mon Sep 17 00:00:00 2001
+From 4fa0b38da6fd7cb7ca6af5fdc3cdb608ec74a024 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/BlockSponge.java b/src/main/java/net/minecraft/server/BlockSponge.java
-index 987af9c3d..adb863eb5 100644
+index afd3f32d0..2aa9b68b8 100644
 --- a/src/main/java/net/minecraft/server/BlockSponge.java
 +++ b/src/main/java/net/minecraft/server/BlockSponge.java
 @@ -100,7 +100,11 @@ public class BlockSponge extends Block {
@@ -35,5 +35,5 @@ index 2d855aae6..bc345a2c3 100644
          this.dropNaturally(world, blockposition, 1.0F, i);
      }
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0406-Don-t-allow-digging-into-unloaded-chunks.patch b/Spigot-Server-Patches/0405-Don-t-allow-digging-into-unloaded-chunks.patch
similarity index 94%
rename from Spigot-Server-Patches/0406-Don-t-allow-digging-into-unloaded-chunks.patch
rename to Spigot-Server-Patches/0405-Don-t-allow-digging-into-unloaded-chunks.patch
index 290c36592..269960df7 100644
--- a/Spigot-Server-Patches/0406-Don-t-allow-digging-into-unloaded-chunks.patch
+++ b/Spigot-Server-Patches/0405-Don-t-allow-digging-into-unloaded-chunks.patch
@@ -1,4 +1,4 @@
-From 42e3f9ca2869b80229ed8609c94341074ae57c3a Mon Sep 17 00:00:00 2001
+From 1ec53fbad94452966645b7d7fbca15b0b48b8013 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
@@ -21,5 +21,5 @@ index 5e8c85cfb..bb4498e0f 100644
              double d1 = this.player.locY - ((double) blockposition.getY() + 0.5D) + 1.5D;
              double d2 = this.player.locZ - ((double) blockposition.getZ() + 0.5D);
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0407-Optimize-redstone-algorithm.patch b/Spigot-Server-Patches/0406-Optimize-redstone-algorithm.patch
similarity index 99%
rename from Spigot-Server-Patches/0407-Optimize-redstone-algorithm.patch
rename to Spigot-Server-Patches/0406-Optimize-redstone-algorithm.patch
index 3a5c76d0c..517715ee1 100644
--- a/Spigot-Server-Patches/0407-Optimize-redstone-algorithm.patch
+++ b/Spigot-Server-Patches/0406-Optimize-redstone-algorithm.patch
@@ -1,4 +1,4 @@
-From 4f373a4ea5822c86917b6be304acecb9c4eb274c Mon Sep 17 00:00:00 2001
+From af29e4ca853324d07c80107d93b6c79d8bf326dc Mon Sep 17 00:00:00 2001
 From: theosib <millerti@172.16.221.1>
 Date: Thu, 27 Sep 2018 01:43:35 -0600
 Subject: [PATCH] Optimize redstone algorithm
diff --git a/Spigot-Server-Patches/0408-force-entity-dismount-during-teleportation.patch b/Spigot-Server-Patches/0407-force-entity-dismount-during-teleportation.patch
similarity index 98%
rename from Spigot-Server-Patches/0408-force-entity-dismount-during-teleportation.patch
rename to Spigot-Server-Patches/0407-force-entity-dismount-during-teleportation.patch
index 191f3a471..adc5f1fe8 100644
--- a/Spigot-Server-Patches/0408-force-entity-dismount-during-teleportation.patch
+++ b/Spigot-Server-Patches/0407-force-entity-dismount-during-teleportation.patch
@@ -1,4 +1,4 @@
-From 7fcc80b90987430ca654b6ecc6aa0f01b2ed9da2 Mon Sep 17 00:00:00 2001
+From 3418123f427b84abe247fb9965798a6f26ffe968 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
@@ -130,5 +130,5 @@ index 1b47d7bd4..7b8dbd00c 100644
  
          if (entity1 != entity && this.playerConnection != null) {
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0409-Book-Size-Limits.patch b/Spigot-Server-Patches/0408-Book-Size-Limits.patch
similarity index 95%
rename from Spigot-Server-Patches/0409-Book-Size-Limits.patch
rename to Spigot-Server-Patches/0408-Book-Size-Limits.patch
index 934551958..f299b9770 100644
--- a/Spigot-Server-Patches/0409-Book-Size-Limits.patch
+++ b/Spigot-Server-Patches/0408-Book-Size-Limits.patch
@@ -1,4 +1,4 @@
-From 7e63bbbab3ac2aeeb7e598d9b036544f2541933f Mon Sep 17 00:00:00 2001
+From c93839b72c860701de2edb9def83098c7c0c6315 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,10 +6,10 @@ Subject: [PATCH] Book Size Limits
 Puts some limits on the size of books.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index bc74ea2f0..beec4e33c 100644
+index fef899ae0..468aff713 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -458,4 +458,11 @@ public class PaperConfig {
+@@ -449,4 +449,11 @@ public class PaperConfig {
              velocitySecretKey = secret.getBytes(StandardCharsets.UTF_8);
          }
      }
@@ -65,5 +65,5 @@ index bb4498e0f..a9ef84d0e 100644
          PlayerConnectionUtils.ensureMainThread(packetplayinbedit, this, this.player.getWorldServer());
          if (this.lastBookTick + 20 > MinecraftServer.currentTick) {
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0410-Make-the-default-permission-message-configurable.patch b/Spigot-Server-Patches/0409-Make-the-default-permission-message-configurable.patch
similarity index 93%
rename from Spigot-Server-Patches/0410-Make-the-default-permission-message-configurable.patch
rename to Spigot-Server-Patches/0409-Make-the-default-permission-message-configurable.patch
index b095e3af5..73e82c9ab 100644
--- a/Spigot-Server-Patches/0410-Make-the-default-permission-message-configurable.patch
+++ b/Spigot-Server-Patches/0409-Make-the-default-permission-message-configurable.patch
@@ -1,11 +1,11 @@
-From 9354006d8eb507b7dff8da600c0839b97084e76e Mon Sep 17 00:00:00 2001
+From 748d2881702945973d2383c3ab22ecf6ad5c945c 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 26e52ace4..7a2fddce9 100644
+index 468aff713..241992f59 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;
@@ -16,7 +16,7 @@ index 26e52ace4..7a2fddce9 100644
  import org.bukkit.command.Command;
  import org.bukkit.configuration.ConfigurationSection;
  import org.bukkit.configuration.InvalidConfigurationException;
-@@ -311,6 +312,11 @@ public class PaperConfig {
+@@ -302,6 +303,11 @@ public class PaperConfig {
          connectionThrottleKickMessage = getString("messages.kick.connection-throttle", connectionThrottleKickMessage);
      }
  
diff --git a/Spigot-Server-Patches/0411-Add-more-Zombie-API.patch b/Spigot-Server-Patches/0410-Add-more-Zombie-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0411-Add-more-Zombie-API.patch
rename to Spigot-Server-Patches/0410-Add-more-Zombie-API.patch
index 2d01f1300..ae06d8969 100644
--- a/Spigot-Server-Patches/0411-Add-more-Zombie-API.patch
+++ b/Spigot-Server-Patches/0410-Add-more-Zombie-API.patch
@@ -1,4 +1,4 @@
-From f9b2a1c4bbab24f3a310b185f81adf268057069b Mon Sep 17 00:00:00 2001
+From acdfd1580144bf7970aa16eb874549d5166d5ee6 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
@@ -150,5 +150,5 @@ index d2c3dbe48..43d4470d9 100644
 +    // Paper end
  }
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0412-limit-the-range-at-which-we-ll-consider-an-attackabl.patch b/Spigot-Server-Patches/0411-limit-the-range-at-which-we-ll-consider-an-attackabl.patch
similarity index 96%
rename from Spigot-Server-Patches/0412-limit-the-range-at-which-we-ll-consider-an-attackabl.patch
rename to Spigot-Server-Patches/0411-limit-the-range-at-which-we-ll-consider-an-attackabl.patch
index 643b0d8b2..08dcd62b8 100644
--- a/Spigot-Server-Patches/0412-limit-the-range-at-which-we-ll-consider-an-attackabl.patch
+++ b/Spigot-Server-Patches/0411-limit-the-range-at-which-we-ll-consider-an-attackabl.patch
@@ -1,4 +1,4 @@
-From 80886158a3df3b0515a5273fbdef2650e9555db3 Mon Sep 17 00:00:00 2001
+From c47b48aa35d881755ab882724c0b166cb2085e6b Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Tue, 13 Nov 2018 14:01:00 +0000
 Subject: [PATCH] limit the range at which we'll consider an attackable target
@@ -31,5 +31,5 @@ index 05256ad3c..747fda044 100644
  
                  if (entityhuman1.isSneaking()) {
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0413-Prevent-rayTrace-from-loading-chunks.patch b/Spigot-Server-Patches/0412-Prevent-rayTrace-from-loading-chunks.patch
similarity index 96%
rename from Spigot-Server-Patches/0413-Prevent-rayTrace-from-loading-chunks.patch
rename to Spigot-Server-Patches/0412-Prevent-rayTrace-from-loading-chunks.patch
index d381953ca..bdd0a1c26 100644
--- a/Spigot-Server-Patches/0413-Prevent-rayTrace-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0412-Prevent-rayTrace-from-loading-chunks.patch
@@ -1,4 +1,4 @@
-From 3fa72ce74440ffd54068445d27333ff81d231e8f Mon Sep 17 00:00:00 2001
+From 0acb4ed30df82b52e3d01792980ce3dee59e639d 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
@@ -31,5 +31,5 @@ index 747fda044..bdbacae29 100644
  
                      if (!flag || iblockdata1.getMaterial() == Material.PORTAL || !iblockdata1.getCollisionShape(this, blockposition).isEmpty()) {
 -- 
-2.19.2
+2.20.0
 
diff --git a/Spigot-Server-Patches/0414-Handle-Large-Packets-disconnecting-client.patch b/Spigot-Server-Patches/0413-Handle-Large-Packets-disconnecting-client.patch
similarity index 98%
rename from Spigot-Server-Patches/0414-Handle-Large-Packets-disconnecting-client.patch
rename to Spigot-Server-Patches/0413-Handle-Large-Packets-disconnecting-client.patch
index d494e2c98..98736386b 100644
--- a/Spigot-Server-Patches/0414-Handle-Large-Packets-disconnecting-client.patch
+++ b/Spigot-Server-Patches/0413-Handle-Large-Packets-disconnecting-client.patch
@@ -1,4 +1,4 @@
-From 75007b2ece9dba6d209f3398cefba8f55ac5e1a1 Mon Sep 17 00:00:00 2001
+From abb284f681df9a0f69b977444ccfa476c3ad8a2c 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
@@ -115,5 +115,5 @@ index 4d4835353..abdb21f6b 100644
      }
  
 -- 
-2.19.1
+2.20.0
 
diff --git a/Spigot-Server-Patches/0415-Lazy-init-world-storage-in-CraftOfflinePlayer.patch b/Spigot-Server-Patches/0414-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
similarity index 97%
rename from Spigot-Server-Patches/0415-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
rename to Spigot-Server-Patches/0414-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
index 708d656c7..a6c0f9a32 100644
--- a/Spigot-Server-Patches/0415-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
+++ b/Spigot-Server-Patches/0414-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
@@ -1,4 +1,4 @@
-From ac4395439245052fa16f71da9c69c67120bd95f5 Mon Sep 17 00:00:00 2001
+From cdb32d812029eb5b53ed8b2e3dad3d34b49a325d Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Tue, 11 Dec 2018 22:25:07 -0500
 Subject: [PATCH] Lazy init world storage in CraftOfflinePlayer
diff --git a/Spigot-Server-Patches/0416-Add-PlayerConnectionCloseEvent.patch b/Spigot-Server-Patches/0415-Add-PlayerConnectionCloseEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0416-Add-PlayerConnectionCloseEvent.patch
rename to Spigot-Server-Patches/0415-Add-PlayerConnectionCloseEvent.patch
index 7c454e5fc..e6ae7f129 100644
--- a/Spigot-Server-Patches/0416-Add-PlayerConnectionCloseEvent.patch
+++ b/Spigot-Server-Patches/0415-Add-PlayerConnectionCloseEvent.patch
@@ -1,4 +1,4 @@
-From a6fc124f1734c2bcac9058c5746a1127bf58bb54 Mon Sep 17 00:00:00 2001
+From e2f257e0513b6f8699db8182a2d94fa92ecc37c0 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