From 70ce6ce8314b9268cb5985cf2ebbd2115e9d9f11 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach@zachbr.io>
Date: Mon, 27 May 2019 04:13:41 -0500
Subject: [PATCH] Move version command update checking to the implementation

This makes it easier for downstream projects (forks) to replace the
version fetching system with their own. It is as simple as implementing
an interface and overriding the default implementation of
org.bukkit.UnsafeValues#getVersionFetcher()

It also makes it easier for us to organize things like the version
history feature.

Lastly I have updated the paper implementation to check against the site
API rather than against jenkins.
---
 .../0008-Check-Paper-versions.patch           | 154 ---------------
 .../0008-Version-Command-2.0.patch            | 180 ++++++++++++++++++
 ...2-Add-Ban-Methods-to-Player-Objects.patch} |   4 +-
 ...t.patch => 0093-EndermanEscapeEvent.patch} |   2 +-
 ...h => 0094-Enderman.teleportRandomly.patch} |   2 +-
 ...ional-world.getNearbyEntities-API-s.patch} |   4 +-
 ... => 0096-Location.isChunkLoaded-API.patch} |   2 +-
 ...d.spawnParticle-API-and-add-Builder.patch} |   8 +-
 ...h => 0098-EndermanAttackPlayerEvent.patch} |   2 +-
 ...ose-Plugin-Class-Loaders-on-Disable.patch} |   2 +-
 ...tch => 0100-WitchConsumePotionEvent.patch} |   2 +-
 ...patch => 0101-WitchThrowPotionEvent.patch} |   2 +-
 ...on.toBlockLocation-toCenterLocation.patch} |   2 +-
 ... => 0103-PotionEffect-clone-methods.patch} |   4 +-
 ...patch => 0104-WitchReadyPotionEvent.patch} |   2 +-
 ...105-ItemStack-getMaxItemUseDuration.patch} |   2 +-
 ...6-Add-EntityTeleportEndGatewayEvent.patch} |   2 +-
 ...-shield-blocking-delay-configurable.patch} |   4 +-
 ...nt-consumeArrow-and-getArrowItem-AP.patch} |   4 +-
 ...dd-getNearbyXXX-methods-to-Location.patch} |   2 +-
 ...patch => 0110-PlayerReadyArrowEvent.patch} |   2 +-
 ...11-Add-EntityKnockbackByEntityEvent.patch} |   2 +-
 ...patch => 0112-Expand-Explosions-API.patch} |   4 +-
 ...I-additions-for-quantity-flags-lore.patch} |   2 +-
 ...vingEntity-Hand-Raised-Item-Use-API.patch} |   4 +-
 ...-API.patch => 0115-RangedEntity-API.patch} |   6 +-
 ...> 0116-Add-World.getEntity-UUID-API.patch} |   4 +-
 ...0117-InventoryCloseEvent-Reason-API.patch} |   4 +-
 ...I.patch => 0118-Entity-getChunk-API.patch} |   2 +-
 ...d-an-asterisk-to-legacy-API-plugins.patch} |  12 +-
 ...ts.patch => 0120-EnderDragon-Events.patch} |   2 +-
 ...=> 0121-PlayerLaunchProjectileEvent.patch} |   2 +-
 ...atch => 0122-PlayerElytraBoostEvent.patch} |   2 +-
 ...atch => 0123-EntityTransformedEvent.patch} |   2 +-
 ...llow-disabling-armour-stand-ticking.patch} |   2 +-
 ...tch => 0125-SkeletonHorse-Additions.patch} |   2 +-
 ...26-Expand-Location-Manipulation-API.patch} |   2 +-
 ...patch => 0127-Expand-ArmorStand-API.patch} |   2 +-
 ...vent.patch => 0128-AnvilDamageEvent.patch} |   2 +-
 ...eadlock-risk-in-firing-async-events.patch} |   2 +-
 ...h => 0130-Add-hand-to-bucket-events.patch} |   2 +-
 ...ent.patch => 0131-Add-TNTPrimeEvent.patch} |   2 +-
 ...ide-Chunk-Coordinates-as-a-Long-API.patch} |   6 +-
 ...-API.patch => 0133-Async-Chunks-API.patch} |   4 +-
 ...=> 0134-Make-EnderDragon-extend-Mob.patch} |   4 +-
 ...le-Entities-from-a-chunk-without-sn.patch} |   4 +-
 ...ots-for-Timings-Tile-Entity-reports.patch} |   4 +-
 ...locks-to-be-accessed-via-a-long-key.patch} |   4 +-
 ...tch => 0138-Slime-Pathfinder-Events.patch} |   2 +-
 ....patch => 0139-isChunkGenerated-API.patch} |   4 +-
 ....patch => 0140-Add-More-Creeper-API.patch} |   4 +-
 ...ch => 0141-Add-PhantomPreSpawnEvent.patch} |   2 +-
 ...d-source-block-to-BlockPhysicsEvent.patch} |   4 +-
 ...=> 0143-Inventory-removeItemAnySlot.patch} |   2 +-
 ...ray-tracing-methods-to-LivingEntity.patch} |   6 +-
 ....patch => 0145-Improve-death-events.patch} |   2 +-
 ...I.patch => 0146-Mob-Pathfinding-API.patch} |   2 +-
 ...-attack-cooldown-methods-for-Player.patch} |   4 +-
 ...anPlaceOn-and-CanDestroy-NBT-values.patch} |   6 +-
 ...urrency-Improvements-to-Permissions.patch} |   2 +-
 ...Add-ItemStackRecipeChoice-Draft-API.patch} |   2 +-
 ...t-furnace-cook-speed-multiplier-API.patch} |   2 +-
 ....patch => 0152-PreSpawnerSpawnEvent.patch} |   2 +-
 ...ition-on-name-for-AttributeModifier.patch} |   2 +-
 ...atch => 0154-Material-API-additions.patch} |   4 +-
 ...ags.patch => 0155-Add-Material-Tags.patch} |   2 +-
 ...56-Allow-setting-the-vex-s-summoner.patch} |   2 +-
 ...57-Add-LivingEntity-getTargetEntity.patch} |   6 +-
 ...I.patch => 0158-Add-sun-related-API.patch} |   4 +-
 ...-Johnny.patch => 0159-Here-s-Johnny.patch} |   2 +-
 ...Turtle-API.patch => 0160-Turtle-API.patch} |   2 +-
 ...-and-setters-for-EntityItem-owner-a.patch} |   2 +-
 ...=> 0162-Add-spectator-target-events.patch} |   2 +-
 ...PI.patch => 0163-Add-more-Witch-API.patch} |   2 +-
 ...ult-permission-message-configurable.patch} |   2 +-
 ...ion-supression-of-EntityDismount-Ve.patch} |   2 +-
 ...I.patch => 0166-Add-more-Zombie-API.patch} |   4 +-
 ...served-channel-check-to-be-sensible.patch} |   2 +-
 ...0168-Add-PlayerConnectionCloseEvent.patch} |   2 +-
 ...replace-OfflinePlayer-getLastPlayed.patch} |   2 +-
 ...ent.patch => 0170-BlockDestroyEvent.patch} |   2 +-
 ...ItemStack-Recipe-API-helper-methods.patch} |   2 +-
 ...ch => 0172-Add-WhitelistToggleEvent.patch} |   2 +-
 ...tch => 0173-Annotation-Test-changes.patch} |   4 +-
 ...=> 0174-Entity-getEntitySpawnReason.patch} |   2 +-
 ...t.patch => 0175-Add-GS4-Query-event.patch} |   2 +-
 ... => 0176-Add-PlayerPostRespawnEvent.patch} |   2 +-
 ...ivate-methods-for-nullability-annot.patch} |   4 +-
 ...ip-some-Spigot-API-null-annotations.patch} |   4 +-
 ...ts.patch => 0179-Server-Tick-Events.patch} |   2 +-
 ...180-PlayerDeathEvent-getItemsToKeep.patch} |   2 +-
 ...API.patch => 0181-Add-Heightmap-API.patch} |   4 +-
 ...> 0182-Mob-Spawner-API-Enhancements.patch} |   2 +-
 ...p-track-ver-1.14-for-version-command.patch |  22 ---
 .../0018-Implement-Paper-VersionChecker.patch | 146 ++++++++++++++
 ...d-version-history-to-version-command.patch | 101 +++++-----
 ...=> 0020-Player-affects-spawning-API.patch} |   2 +-
 ...e-invalid-mob-spawner-tile-entities.patch} |   4 +-
 ...=> 0022-Optimize-TileEntity-Ticking.patch} |   6 +-
 ...23-Further-improve-server-tick-loop.patch} |   8 +-
 ...24-Only-refresh-abilities-if-needed.patch} |   4 +-
 ...API.patch => 0025-Entity-Origin-API.patch} |  14 +-
 ...vent-tile-entity-and-entity-crashes.patch} |   6 +-
 ...figurable-top-of-nether-void-damage.patch} |   8 +-
 ...-before-converting-and-renaming-pla.patch} |   4 +-
 ... => 0029-Always-tick-falling-blocks.patch} |   4 +-
 ...ch => 0030-Configurable-end-credits.patch} |   6 +-
 ...explosions-processing-dead-entities.patch} |   6 +-
 ...s.patch => 0032-Optimize-explosions.patch} |   6 +-
 ...=> 0033-Disable-explosion-knockback.patch} |   8 +-
 ...under.patch => 0034-Disable-thunder.patch} |   2 +-
 ....patch => 0035-Disable-ice-and-snow.patch} |   2 +-
 ...-Configurable-mob-spawner-tick-rate.patch} |   6 +-
 ...ition-the-first-time-an-entity-is-s.patch} |   6 +-
 ...patch => 0038-Add-BeaconEffectEvent.patch} |   4 +-
 ...igurable-container-update-tick-rate.patch} |   6 +-
 ...0040-Use-UserCache-for-player-heads.patch} |   4 +-
 ...> 0041-Disable-spigot-tick-limiters.patch} |   4 +-
 ...=> 0042-Add-PlayerInitialSpawnEvent.patch} |   2 +-
 ...rable-Disabling-Cat-Chest-Detection.patch} |   6 +-
 ...4-Ensure-commands-are-not-ran-async.patch} |  12 +-
 ...hunks-are-slime-spawn-chunks-toggle.patch} |   6 +-
 ....patch => 0046-Optimize-Pathfinding.patch} |   2 +-
 ...ch => 0047-Expose-server-CommandMap.patch} |   4 +-
 ...-informative-in-maxHealth-exception.patch} |   4 +-
 ...0049-Player-Tab-List-and-Title-APIs.patch} |   8 +-
 ...> 0050-Ensure-inv-drag-is-in-bounds.patch} |   4 +-
 ...ntation-of-tile-entity-removal-list.patch} |   4 +-
 ...d-configurable-portal-search-radius.patch} |   6 +-
 ...patch => 0053-Add-velocity-warnings.patch} |   8 +-
 ...le-inter-world-teleportation-safety.patch} |   2 +-
 ... 0055-Add-exception-reporting-event.patch} |  24 +--
 ...don-t-need-to-when-cerealising-text.patch} |   4 +-
 ...reboards-for-non-players-by-default.patch} |   8 +-
 ...orking-with-arrows-stuck-in-living-.patch} |   4 +-
 ... => 0059-Complete-resource-pack-API.patch} |   2 +-
 ....patch => 0060-Chunk-Save-Reattempt.patch} |   2 +-
 ...ding-permissions.yml-before-plugins.patch} |   4 +-
 ...low-Reloading-of-Custom-Permissions.patch} |   4 +-
 ...h => 0063-Remove-Metadata-on-reload.patch} |   4 +-
 ...patch => 0064-Undead-horse-leashing.patch} |   6 +-
 ...65-Handle-Item-Meta-Inconsistencies.patch} |   8 +-
 ...rable-Non-Player-Arrow-Despawn-Rate.patch} |   6 +-
 ...atch => 0067-Add-World-Util-Methods.patch} |   8 +-
 ...-Custom-replacement-for-eaten-items.patch} |   4 +-
 ...h-absorb-values-and-repair-bad-data.patch} |   4 +-
 ...ch => 0070-Waving-banner-workaround.patch} |   4 +-
 ...71-Use-a-Shared-Random-for-Entities.patch} |   4 +-
 ...e-spawn-chances-for-skeleton-horses.patch} |   2 +-
 ...ocation-getType-and-getBlockData-fo.patch} |  12 +-
 ... 0074-Access-items-by-EquipmentSlot.patch} |   4 +-
 ...kPhysicsEvent-if-a-plugin-has-a-lis.patch} |  12 +-
 ...ntity-AddTo-RemoveFrom-World-Events.patch} |   2 +-
 ...7-Configurable-Chunk-Inhabited-Time.patch} |   6 +-
 ...t.patch => 0078-EntityPathfindEvent.patch} |   2 +-
 ...ce-IO-ops-opening-a-new-region-file.patch} |   2 +-
 ...gionFileCache-and-make-configurable.patch} |   4 +-
 ...h => 0081-Use-Optimized-Collections.patch} |   4 +-
 ...-Do-not-load-chunks-for-Pathfinding.patch} |  10 +-
 ...Do-not-load-chunks-for-light-checks.patch} |   4 +-
 ...084-Add-PlayerUseUnknownEntityEvent.patch} |   6 +-
 ...DebugInfo-not-initialized-on-client.patch} |   2 +-
 ...Configurable-Grass-Spread-Tick-Rate.patch} |   2 +-
 ...-BlockPlaceEvent-triggering-physics.patch} |   4 +-
 ...8-Remove-Debug-checks-from-DataBits.patch} |   2 +-
 ...illa-per-world-scoreboard-coloring-.patch} |   2 +-
 ...d-for-setting-passengers-on-players.patch} |   2 +-
 ...emove-unused-World-Tile-Entity-List.patch} |   4 +-
 ... 0092-Don-t-tick-Skulls-unused-code.patch} |   4 +-
 ... 0093-Configurable-Player-Collision.patch} |   4 +-
 ...nt-to-allow-plugins-to-handle-clien.patch} |   2 +-
 ...> 0095-Configurable-RCON-IP-address.patch} |   4 +-
 ...96-Prevent-Fire-from-loading-chunks.patch} |   4 +-
 ...7-Implement-PlayerLocaleChangeEvent.patch} |   4 +-
 ...tyRegainHealthEvent-isFastRegen-API.patch} |   6 +-
 ...to-configure-frosted_ice-properties.patch} |   2 +-
 ...possibility-for-getServer-singleton.patch} |   4 +-
 ...tem-frames-performance-and-bug-fixe.patch} |   2 +-
 ...API-Replenishable-Lootables-Feature.patch} |  34 ++--
 ...-scoreboard-teams-to-scoreboard.dat.patch} |   2 +-
 ...em-property-for-disabling-watchdoge.patch} |   2 +-
 ...0105-Optimize-UserCache-Thread-Safe.patch} |   6 +-
 ...locking-on-Network-Manager-creation.patch} |   2 +-
 ...-Optional-TNT-doesn-t-move-in-water.patch} |  10 +-
 ...-redstone-torch-rapid-clock-removal.patch} |   4 +-
 ...h => 0109-Add-server-name-parameter.patch} |   4 +-
 ...n-Wither-Death-sounds-to-same-world.patch} |   6 +-
 ...=> 0111-Fix-Double-World-Add-issues.patch} |   2 +-
 ...tch => 0112-Fix-Old-Sign-Conversion.patch} |   2 +-
 ...-profiles-that-have-no-UUID-and-no-.patch} |   4 +-
 ...ative-vehicle-moved-wrongly-message.patch} |   4 +-
 ...rs-that-dismount-from-other-players.patch} |   4 +-
 ...etting-for-proxy-online-mode-status.patch} |   4 +-
 ...timise-BlockState-s-hashCode-equals.patch} |   2 +-
 ...nfigurable-packet-in-spam-threshold.patch} |   4 +-
 ...9-Configurable-flying-kick-messages.patch} |   4 +-
 ...ch => 0120-Chunk-registration-fixes.patch} |   2 +-
 ...k-reference-on-Craft-Entity-removal.patch} |   4 +-
 ...to-fix-bad-Y-levels-on-player-login.patch} |   4 +-
 ...ion-to-remove-corrupt-tile-entities.patch} |   6 +-
 ...nt.patch => 0124-Add-EntityZapEvent.patch} |   2 +-
 ...hunks-from-Hoppers-and-other-things.patch} |   2 +-
 ...-from-ArmorStand-and-SpawnEgg-items.patch} |   2 +-
 ...27-Cache-user-authenticator-threads.patch} |   2 +-
 ....patch => 0128-Optimise-removeQueue.patch} |   4 +-
 ...-Allow-Reloading-of-Command-Aliases.patch} |   4 +-
 ...-Add-source-to-PlayerExpChangeEvent.patch} |   2 +-
 ...mize-World.isLoaded-BlockPosition-Z.patch} |   4 +-
 ...-Don-t-let-fishinghooks-use-portals.patch} |   6 +-
 ... => 0133-Add-ProjectileCollideEvent.patch} |   2 +-
 ...ent-Pathfinding-out-of-World-Border.patch} |   4 +-
 ...Bound-Treasure-Maps-to-World-Border.patch} |   6 +-
 ...igurable-Cartographer-Treasure-Maps.patch} |   6 +-
 ... => 0137-Optimize-ItemStack.isEmpty.patch} |   2 +-
 ...o-control-if-armour-stands-can-move.patch} |   6 +-
 ...9-Properly-fix-item-duplication-bug.patch} |   6 +-
 ...=> 0140-String-based-Action-Bar-API.patch} |   6 +-
 ...-API-s.patch => 0141-Firework-API-s.patch} |   2 +-
 ... 0142-PlayerTeleportEndGatewayEvent.patch} |   4 +-
 ...ovide-E-TE-Chunk-count-stat-methods.patch} |   4 +-
 ...h => 0144-Enforce-Sync-Player-Saves.patch} |   2 +-
 ...low-entities-to-ride-themselves-572.patch} |   4 +-
 ...atch => 0146-Fix-block-break-desync.patch} |   4 +-
 ...I-for-Reason-Source-Triggering-play.patch} |  34 ++--
 ...patch => 0148-Cap-Entity-Collisions.patch} |   8 +-
 ...-CraftScheduler-Async-Task-Debugger.patch} |   4 +-
 ...ore-aggressive-in-the-chunk-unload-.patch} |   4 +-
 ...> 0151-Do-not-let-armorstands-drown.patch} |   6 +-
 ...e-async-calls-to-restart-the-server.patch} |   4 +-
 ...roperty-to-disable-book-size-limits.patch} |   4 +-
 ...e-parrots-stay-on-shoulders-despite.patch} |   8 +-
 ...-option-to-prevent-player-names-fro.patch} |   4 +-
 ...leAppender-for-console-improvements.patch} |   8 +-
 ...rable-option-to-disable-creeper-lin.patch} |   2 +-
 ....patch => 0158-Item-canEntityPickup.patch} |   8 +-
 ...layerPickupItemEvent-setFlyAtPlayer.patch} |   2 +-
 ...> 0160-PlayerAttemptPickupItemEvent.patch} |   2 +-
 ...tch => 0161-Add-UnknownCommandEvent.patch} |   4 +-
 ...tch => 0162-Basic-PlayerProfile-API.patch} |  20 +-
 ... 0163-Shoulder-Entities-Release-API.patch} |   6 +-
 ...patch => 0164-Profile-Lookup-Events.patch} |   2 +-
 ...layer-logins-during-server-shutdown.patch} |   2 +-
 ...patch => 0166-Entity-fromMobSpawner.patch} |   8 +-
 ...7-Improve-the-Saddle-API-for-Horses.patch} |   8 +-
 ...plement-ensureServerConversions-API.patch} |   4 +-
 ...> 0169-Implement-getI18NDisplayName.patch} |   6 +-
 ...=> 0170-ProfileWhitelistVerifyEvent.patch} |   2 +-
 ...ch => 0171-Fix-this-stupid-bullshit.patch} |   4 +-
 ...wns-should-honor-nametags-and-leash.patch} |   2 +-
 ...mer-when-spawner-event-is-cancelled.patch} |   4 +-
 ...4-Fix-MC-117075-TE-Unload-Lag-Spike.patch} |   4 +-
 ...a-custom-authentication-servers-dow.patch} |   2 +-
 ...atch => 0176-LivingEntity-setKiller.patch} |   6 +-
 ...ms-to-redirect-System.out-err-to-lo.patch} |   6 +-
 ...-prefixes-using-Log4J-configuration.patch} |   6 +-
 ...Include-Log4J2-SLF4J-implementation.patch} |   4 +-
 ...efix-for-various-plugins-bypassing-.patch} |   2 +-
 ...t.patch => 0181-Add-PlayerJumpEvent.patch} |   4 +-
 ...-handle-PacketPlayInKeepAlive-async.patch} |   4 +-
 ...t-protocol-version-and-virtual-host.patch} |  12 +-
 ...t-serverside-behavior-of-keepalives.patch} |   2 +-
 ...Effects-only-to-players-who-can-see.patch} |   6 +-
 ...maximum-exp-value-when-merging-orbs.patch} |   2 +-
 ... => 0187-Add-PlayerArmorChangeEvent.patch} |   4 +-
 ...om-being-processed-when-the-player-.patch} |   2 +-
 ...-implementations-for-captured-block.patch} |   4 +-
 ...get-a-BlockState-without-a-snapshot.patch} |   4 +-
 ...patch => 0191-AsyncTabCompleteEvent.patch} |   4 +-
 ...92-Avoid-NPE-in-PathfinderGoalTempt.patch} |   2 +-
 ...=> 0193-PlayerPickupExperienceEvent.patch} |   2 +-
 ...tch => 0194-ExperienceOrbMergeEvent.patch} |   2 +-
 ...-Ability-to-apply-mending-to-XP-API.patch} |   2 +-
 ...max-squid-spawn-height-configurable.patch} |   2 +-
 ...patch => 0197-PreCreatureSpawnEvent.patch} |   2 +-
 ...-PlayerNaturallySpawnCreaturesEvent.patch} |   4 +-
 ...Add-setPlayerProfile-API-for-Skulls.patch} |   2 +-
 ...> 0200-Fill-Profile-Property-Events.patch} |   2 +-
 ...layerAdvancementCriterionGrantEvent.patch} |   2 +-
 ...ch => 0202-Add-ArmorStand-Item-Meta.patch} |   4 +-
 ...Extend-Player-Interact-cancellation.patch} |   2 +-
 ... 0204-Tameable-getOwnerUniqueId-API.patch} |   2 +-
 ...-crits-helps-mitigate-hacked-client.patch} |   2 +-
 ...ing-location-from-InventoryEnderChe.patch} |   2 +-
 ...ted-Ice-from-loading-holding-chunks.patch} |   2 +-
 ...e-Explicit-Network-Manager-Flushing.patch} |   2 +-
 ...t-extended-PaperServerListPingEvent.patch} |   4 +-
 ... 0210-Improved-Async-Task-Scheduler.patch} |   2 +-
 ...-PlayerProfile-in-AsyncPreLoginEven.patch} |   2 +-
 ...=> 0212-Player.setPlayerProfile-API.patch} |   2 +-
 ...h => 0213-Fix-Dragon-Server-Crashes.patch} |   2 +-
 ...patch => 0214-getPlayerUniqueId-API.patch} |   4 +-
 ...ake-player-data-saving-configurable.patch} |   2 +-
 ...e-legacy-ping-handler-more-reliable.patch} |   2 +-
 ...erverListPingEvent-for-legacy-pings.patch} |   2 +-
 ...8-Flag-to-disable-the-channel-limit.patch} |   2 +-
 ...Load-version-history-at-server-start.patch |  21 --
 ...-method-to-open-already-placed-sign.patch} |   4 +-
 ...rable-sprint-interruption-on-attack.patch} |   2 +-
 ...allowed-colored-signs-to-be-created.patch} |   2 +-
 ...t.patch => 0222-EndermanEscapeEvent.patch} |   2 +-
 ...h => 0223-Enderman.teleportRandomly.patch} |   2 +-
 ...224-Block-Enderpearl-Travel-Exploit.patch} |   2 +-
 ...d.spawnParticle-API-and-add-Builder.patch} |   6 +-
 ...h => 0226-EndermanAttackPlayerEvent.patch} |   2 +-
 ...tch => 0227-WitchConsumePotionEvent.patch} |   2 +-
 ...patch => 0228-WitchThrowPotionEvent.patch} |   2 +-
 ...tem-entities-with-World.spawnEntity.patch} |   4 +-
 ...patch => 0230-WitchReadyPotionEvent.patch} |   2 +-
 ...231-ItemStack-getMaxItemUseDuration.patch} |   2 +-
 ...ement-EntityTeleportEndGatewayEvent.patch} |   2 +-
 ...d-flag-on-cancel-of-Explosion-Event.patch} |   2 +-
 ...ch => 0234-Fix-CraftEntity-hashCode.patch} |   4 +-
 ...e-Alternative-LootPool-Luck-Formula.patch} |   2 +-
 ...ls-when-failing-to-save-player-data.patch} |   2 +-
 ...-shield-blocking-delay-configurable.patch} |   8 +-
 ...cipes-in-RecipeBook-to-avoid-data-e.patch} |   2 +-
 ...nt-consumeArrow-and-getArrowItem-AP.patch} |   2 +-
 ...patch => 0240-PlayerReadyArrowEvent.patch} |   2 +-
 ...-EntityShootBowEvent-for-Illusioner.patch} |   2 +-
 ...lement-EntityKnockbackByEntityEvent.patch} |   4 +-
 ...patch => 0243-Expand-Explosions-API.patch} |   4 +-
 ...vingEntity-Hand-Raised-Item-Use-API.patch} |   6 +-
 ...-API.patch => 0245-RangedEntity-API.patch} |   2 +-
 ...o-disable-ender-dragon-legacy-check.patch} |   2 +-
 ...-Implement-World.getEntity-UUID-API.patch} |   4 +-
 ...0248-InventoryCloseEvent-Reason-API.patch} |  18 +-
 ...0249-Configurable-Bed-Search-Radius.patch} |   6 +-
 ...I.patch => 0250-Vex-getSummoner-API.patch} |   6 +-
 ...ventory-when-cancelling-PlayerInter.patch} |   4 +-
 ...e-the-Entity-Random-seed-for-squids.patch} |   4 +-
 ...illa-entity-warnings-for-duplicates.patch} |   4 +-
 ...-if-stack-size-above-max-stack-size.patch} |   4 +-
 ...55-Use-asynchronous-Log4j-2-loggers.patch} |   6 +-
 ...more-information-to-Entity.toString.patch} |   4 +-
 ...es-option-to-debug-dupe-uuid-issues.patch} |  10 +-
 ...ts.patch => 0258-EnderDragon-Events.patch} |   8 +-
 ...atch => 0259-PlayerElytraBoostEvent.patch} |   4 +-
 ...=> 0260-PlayerLaunchProjectileEvent.patch} |  14 +-
 ...Speedup-BlockPos-by-fixing-inlining.patch} |   6 +-
 ...tch => 0262-Don-t-save-Proto-Chunks.patch} |   4 +-
 ...patch => 0263-Optimize-RegistryID.c.patch} |   4 +-
 ...-armor-stands-from-doing-entity-loo.patch} |   6 +-
 ...-Vanished-players-don-t-have-rights.patch} |  12 +-
 ...anytime-entities-change-to-guarante.patch} |   4 +-
 ...d-some-Debug-to-Chunk-Entity-slices.patch} |   6 +-
 ...atch => 0268-EntityTransformedEvent.patch} |  10 +-
 ...tch => 0269-SkeletonHorse-Additions.patch} |   8 +-
 ...event-Saving-Bad-entities-to-chunks.patch} |   4 +-
 ...n-t-call-getItemMeta-on-hasItemMeta.patch} |   6 +-
 ...ad-Entities-in-entityList-iteration.patch} |  12 +-
 ...-use-a-versioned-world-folder-for-t.patch} |   8 +-
 ...74-MC-111480-Start-Entity-ID-s-at-1.patch} |   4 +-
 ...5-Implement-Expanded-ArmorStand-API.patch} |   6 +-
 ...vent.patch => 0276-AnvilDamageEvent.patch} |   4 +-
 ...ent.patch => 0277-Add-TNTPrimeEvent.patch} |   8 +-
 ...d-make-tab-spam-limits-configurable.patch} |   6 +-
 ...h => 0279-Add-hand-to-bucket-events.patch} |   2 +-
 ...-Experience-should-save-as-Integers.patch} |   4 +-
 ...ent-rendering-skulls-from-same-user.patch} |  10 +-
 ...d-Early-Warning-Feature-to-WatchDog.patch} |   6 +-
 ...0283-Make-EnderDragon-implement-Mob.patch} |   4 +-
 ...ect-and-repair-corrupt-Region-Files.patch} |   4 +-
 ...5-Use-ConcurrentHashMap-in-JsonList.patch} |   4 +-
 ...6-Use-a-Queue-for-Queueing-Commands.patch} |   4 +-
 ...le-Entities-from-a-chunk-without-sn.patch} |   4 +-
 ...llow-disabling-armour-stand-ticking.patch} |  10 +-
 ...timize-BlockPosition-helper-methods.patch} |   4 +-
 ...ts-from-world-player-list-not-serve.patch} |   8 +-
 ...tore-vanlla-default-mob-spawn-range.patch} |   4 +-
 ...pers.patch => 0292-Optimize-Hoppers.patch} |   4 +-
 ...93-Optimize-CraftBlockData-Creation.patch} |   6 +-
 ...-124320.patch => 0294-Fix-MC-124320.patch} |   6 +-
 ...tch => 0295-Slime-Pathfinder-Events.patch} |   6 +-
 ...e-speed-for-water-flowing-over-lava.patch} |   6 +-
 ... => 0297-Optimize-RegistryMaterials.patch} |   4 +-
 ...ch => 0298-Add-PhantomPreSpawnEvent.patch} |   8 +-
 ....patch => 0299-Add-More-Creeper-API.patch} |   6 +-
 ...=> 0300-Inventory-removeItemAnySlot.patch} |   4 +-
 ...oadChunk-int-int-false-load-unconve.patch} |   4 +-
 ...ray-tracing-methods-to-LivingEntity.patch} |   6 +-
 ...-attack-cooldown-methods-for-Player.patch} |   6 +-
 ....patch => 0304-Improve-death-events.patch} |  20 +-
 ...w-chests-to-be-placed-with-NBT-data.patch} |   6 +-
 ...I.patch => 0306-Mob-Pathfinding-API.patch} |  12 +-
 ...nt-chunk-loading-from-Fluid-Flowing.patch} |   4 +-
 ...for-CanPlaceOn-and-CanDestroy-NBT-v.patch} |   2 +-
 ...nt-Mob-AI-Rules-from-Loading-Chunks.patch} |   6 +-
 ...ning-from-loading-generating-chunks.patch} |   4 +-
 ...-Biome-Mob-Lookups-for-Mob-Spawning.patch} |   4 +-
 ...t-furnace-cook-speed-multiplier-API.patch} |   6 +-
 ...0313-Support-Overriding-World-Seeds.patch} |  10 +-
 ...h => 0314-Optimize-Server-World-Map.patch} |   6 +-
 ....patch => 0315-PreSpawnerSpawnEvent.patch} |   4 +-
 ...rseException-in-Entity-and-TE-names.patch} |  12 +-
 ... 0317-Avoid-dimension-id-collisions.patch} |   4 +-
 ...=> 0318-Honor-EntityAgeable.ageLock.patch} |   4 +-
 ...le-connection-throttle-kick-message.patch} |   6 +-
 ...> 0320-Hook-into-CB-plugin-rewrites.patch} |   4 +-
 ...21-Allow-setting-the-vex-s-summoner.patch} |   6 +-
 ...I.patch => 0322-Add-sun-related-API.patch} |  10 +-
 ...wned-for-Villager-Aggression-Config.patch} |   4 +-
 ...-Johnny.patch => 0324-Here-s-Johnny.patch} |   6 +-
 ...Turtle-API.patch => 0325-Turtle-API.patch} |   6 +-
 ...it-lightning-strike-effect-distance.patch} |   8 +-
 ...her-worlds-for-shooter-of-projectil.patch} |   4 +-
 ...Call-player-spectator-target-events.patch} |   4 +-
 ...-Add-Velocity-IP-Forwarding-Support.patch} |  16 +-
 ...PI.patch => 0330-Add-more-Witch-API.patch} |   6 +-
 ...MC-93764.patch => 0331-Fix-MC-93764.patch} |   4 +-
 ...vent-players-from-moving-into-unloa.patch} |   6 +-
 ...3-Reset-players-airTicks-on-respawn.patch} |   6 +-
 ...-area-unicode-characters-from-signs.patch} |   4 +-
 ...after-profile-lookups-if-not-needed.patch} |   4 +-
 ...le-thread-count-default-for-bootstr.patch} |   4 +-
 ...id-item-for-enchantment-checks-on-b.patch} |   4 +-
 ...=> 0338-Optimize-World-Time-Updates.patch} |   4 +-
 ...tore-custom-InventoryHolder-support.patch} |   4 +-
 ...=> 0340-Use-Vanilla-Minecart-Speeds.patch} |   4 +-
 ...0341-Fix-SpongeAbsortEvent-handling.patch} |   6 +-
 ...-allow-digging-into-unloaded-chunks.patch} |   4 +-
 ...=> 0343-Optimize-redstone-algorithm.patch} |  10 +-
 ...ntity-dismount-during-teleportation.patch} |  10 +-
 ...mits.patch => 0345-Book-Size-Limits.patch} |   6 +-
 ...ult-permission-message-configurable.patch} |   6 +-
 ...I.patch => 0347-Add-more-Zombie-API.patch} |   8 +-
 ...revent-rayTrace-from-loading-chunks.patch} |   4 +-
 ...-Large-Packets-disconnecting-client.patch} |  12 +-
 ...world-storage-in-CraftOfflinePlayer.patch} |   4 +-
 ...0351-Add-PlayerConnectionCloseEvent.patch} |   6 +-
 ...revent-Enderman-from-loading-chunks.patch} |   4 +-
 ...replace-OfflinePlayer-getLastPlayed.patch} |  10 +-
 ...tch => 0354-Fix-PlayerEditBookEvent.patch} |   4 +-
 ...ehicle-tracking-issue-on-disconnect.patch} |   4 +-
 ...nRetractEvent-for-all-empty-pistons.patch} |   4 +-
 ...remove-from-being-called-on-Players.patch} |   4 +-
 ...58-Allow-Saving-of-Oversized-Chunks.patch} |  10 +-
 ...ent.patch => 0359-BlockDestroyEvent.patch} |   4 +-
 ...m-Shapeless-Custom-Crafting-Recipes.patch} |   4 +-
 ...h => 0361-Fix-sign-edit-memory-leak.patch} |   6 +-
 ... 0362-Limit-Client-Sign-length-more.patch} |   4 +-
 ...onvertSigns-boolean-every-sign-save.patch} |   4 +-
 ...Signs-in-Chunks-creating-too-large-.patch} |   8 +-
 ...-Fix-Whitelist-On-Off-inconsistency.patch} |   6 +-
 ...t-tick-at-start-of-drowning-process.patch} |   4 +-
 ...ggleEvent-when-whitelist-is-toggled.patch} |   4 +-
 ...68-Add-LivingEntity-getTargetEntity.patch} |  12 +-
 ...ngth-when-serialising-BungeeCord-te.patch} |   4 +-
 ...=> 0370-Entity-getEntitySpawnReason.patch} |  10 +-
 ...ty-Metadata-for-all-tracked-players.patch} |   6 +-
 ...tch => 0372-Fire-event-on-GS4-query.patch} |   8 +-
 ...73-Implement-PlayerPostRespawnEvent.patch} |   4 +-
 ...for-pickupDelay-breaks-picking-up-i.patch} |   4 +-
 ...-and-setters-for-EntityItem-owner-a.patch} |   4 +-
 ...ts.patch => 0376-Server-Tick-Events.patch} |   4 +-
 ...377-PlayerDeathEvent-getItemsToKeep.patch} |   4 +-
 ...78-Optimize-Persistent-Data-Loading.patch} |   4 +-
 ...s-to-fire-only-after-the-server-plu.patch} |   6 +-
 ...ion-files-more-reliable-to-write-to.patch} |   4 +-
 ...mize-GameRules-to-use-LinkedHashMap.patch} |   6 +-
 ...Optimize-Captured-TileEntity-Lookup.patch} |   4 +-
 ...API.patch => 0383-Add-Heightmap-API.patch} |   6 +-
 ...4-Handle-bad-chunks-more-gracefully.patch} |   4 +-
 ...> 0385-Mob-Spawner-API-Enhancements.patch} |   6 +-
 ...ayer-View-Distance-API-placeholders.patch} |   8 +-
 ...tch => 0387-Async-Chunk-placeholder.patch} |   4 +-
 ...-to-changed-postToMainThread-method.patch} |   4 +-
 ...-item-frames-are-modified-MC-123450.patch} |   6 +-
 ...se-RegionFiles-when-they-get-evicte.patch} |   4 +-
 ...sPrimaryThread-and-MinecraftServer-.patch} |   6 +-
 ...h => 0392-Elide-lock-in-DataWatcher.patch} |   4 +-
 ...-entity-loss-due-to-unloaded-chunks.patch} |   4 +-
 ... 0394-Duplicate-UUID-Resolve-Option.patch} |  12 +-
 ...95-improve-CraftWorld-isChunkLoaded.patch} |   4 +-
 ...e-Keep-Spawn-Loaded-range-per-world.patch} |  14 +-
 ...-some-generation-concurrency-issues.patch} |   8 +-
 475 files changed, 1472 insertions(+), 1338 deletions(-)
 delete mode 100644 Spigot-API-Patches/0008-Check-Paper-versions.patch
 create mode 100644 Spigot-API-Patches/0008-Version-Command-2.0.patch
 rename Spigot-API-Patches/{0093-Add-Ban-Methods-to-Player-Objects.patch => 0092-Add-Ban-Methods-to-Player-Objects.patch} (98%)
 rename Spigot-API-Patches/{0094-EndermanEscapeEvent.patch => 0093-EndermanEscapeEvent.patch} (97%)
 rename Spigot-API-Patches/{0095-Enderman.teleportRandomly.patch => 0094-Enderman.teleportRandomly.patch} (93%)
 rename Spigot-API-Patches/{0096-Additional-world.getNearbyEntities-API-s.patch => 0095-Additional-world.getNearbyEntities-API-s.patch} (99%)
 rename Spigot-API-Patches/{0097-Location.isChunkLoaded-API.patch => 0096-Location.isChunkLoaded-API.patch} (91%)
 rename Spigot-API-Patches/{0098-Expand-World.spawnParticle-API-and-add-Builder.patch => 0097-Expand-World.spawnParticle-API-and-add-Builder.patch} (99%)
 rename Spigot-API-Patches/{0099-EndermanAttackPlayerEvent.patch => 0098-EndermanAttackPlayerEvent.patch} (98%)
 rename Spigot-API-Patches/{0100-Close-Plugin-Class-Loaders-on-Disable.patch => 0099-Close-Plugin-Class-Loaders-on-Disable.patch} (98%)
 rename Spigot-API-Patches/{0101-WitchConsumePotionEvent.patch => 0100-WitchConsumePotionEvent.patch} (98%)
 rename Spigot-API-Patches/{0102-WitchThrowPotionEvent.patch => 0101-WitchThrowPotionEvent.patch} (97%)
 rename Spigot-API-Patches/{0103-Location.toBlockLocation-toCenterLocation.patch => 0102-Location.toBlockLocation-toCenterLocation.patch} (95%)
 rename Spigot-API-Patches/{0104-PotionEffect-clone-methods.patch => 0103-PotionEffect-clone-methods.patch} (95%)
 rename Spigot-API-Patches/{0105-WitchReadyPotionEvent.patch => 0104-WitchReadyPotionEvent.patch} (97%)
 rename Spigot-API-Patches/{0106-ItemStack-getMaxItemUseDuration.patch => 0105-ItemStack-getMaxItemUseDuration.patch} (93%)
 rename Spigot-API-Patches/{0107-Add-EntityTeleportEndGatewayEvent.patch => 0106-Add-EntityTeleportEndGatewayEvent.patch} (95%)
 rename Spigot-API-Patches/{0108-Make-shield-blocking-delay-configurable.patch => 0107-Make-shield-blocking-delay-configurable.patch} (90%)
 rename Spigot-API-Patches/{0109-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch => 0108-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch} (95%)
 rename Spigot-API-Patches/{0110-Add-getNearbyXXX-methods-to-Location.patch => 0109-Add-getNearbyXXX-methods-to-Location.patch} (99%)
 rename Spigot-API-Patches/{0111-PlayerReadyArrowEvent.patch => 0110-PlayerReadyArrowEvent.patch} (98%)
 rename Spigot-API-Patches/{0112-Add-EntityKnockbackByEntityEvent.patch => 0111-Add-EntityKnockbackByEntityEvent.patch} (97%)
 rename Spigot-API-Patches/{0113-Expand-Explosions-API.patch => 0112-Expand-Explosions-API.patch} (98%)
 rename Spigot-API-Patches/{0114-ItemStack-API-additions-for-quantity-flags-lore.patch => 0113-ItemStack-API-additions-for-quantity-flags-lore.patch} (98%)
 rename Spigot-API-Patches/{0115-LivingEntity-Hand-Raised-Item-Use-API.patch => 0114-LivingEntity-Hand-Raised-Item-Use-API.patch} (95%)
 rename Spigot-API-Patches/{0116-RangedEntity-API.patch => 0115-RangedEntity-API.patch} (97%)
 rename Spigot-API-Patches/{0117-Add-World.getEntity-UUID-API.patch => 0116-Add-World.getEntity-UUID-API.patch} (90%)
 rename Spigot-API-Patches/{0118-InventoryCloseEvent-Reason-API.patch => 0117-InventoryCloseEvent-Reason-API.patch} (96%)
 rename Spigot-API-Patches/{0119-Entity-getChunk-API.patch => 0118-Entity-getChunk-API.patch} (94%)
 rename Spigot-API-Patches/{0120-Add-an-asterisk-to-legacy-API-plugins.patch => 0119-Add-an-asterisk-to-legacy-API-plugins.patch} (89%)
 rename Spigot-API-Patches/{0121-EnderDragon-Events.patch => 0120-EnderDragon-Events.patch} (99%)
 rename Spigot-API-Patches/{0122-PlayerLaunchProjectileEvent.patch => 0121-PlayerLaunchProjectileEvent.patch} (97%)
 rename Spigot-API-Patches/{0123-PlayerElytraBoostEvent.patch => 0122-PlayerElytraBoostEvent.patch} (97%)
 rename Spigot-API-Patches/{0124-EntityTransformedEvent.patch => 0123-EntityTransformedEvent.patch} (97%)
 rename Spigot-API-Patches/{0125-Allow-disabling-armour-stand-ticking.patch => 0124-Allow-disabling-armour-stand-ticking.patch} (94%)
 rename Spigot-API-Patches/{0126-SkeletonHorse-Additions.patch => 0125-SkeletonHorse-Additions.patch} (97%)
 rename Spigot-API-Patches/{0127-Expand-Location-Manipulation-API.patch => 0126-Expand-Location-Manipulation-API.patch} (97%)
 rename Spigot-API-Patches/{0128-Expand-ArmorStand-API.patch => 0127-Expand-ArmorStand-API.patch} (98%)
 rename Spigot-API-Patches/{0129-AnvilDamageEvent.patch => 0128-AnvilDamageEvent.patch} (98%)
 rename Spigot-API-Patches/{0130-Remove-deadlock-risk-in-firing-async-events.patch => 0129-Remove-deadlock-risk-in-firing-async-events.patch} (98%)
 rename Spigot-API-Patches/{0131-Add-hand-to-bucket-events.patch => 0130-Add-hand-to-bucket-events.patch} (98%)
 rename Spigot-API-Patches/{0132-Add-TNTPrimeEvent.patch => 0131-Add-TNTPrimeEvent.patch} (98%)
 rename Spigot-API-Patches/{0133-Provide-Chunk-Coordinates-as-a-Long-API.patch => 0132-Provide-Chunk-Coordinates-as-a-Long-API.patch} (94%)
 rename Spigot-API-Patches/{0134-Async-Chunks-API.patch => 0133-Async-Chunks-API.patch} (99%)
 rename Spigot-API-Patches/{0135-Make-EnderDragon-extend-Mob.patch => 0134-Make-EnderDragon-extend-Mob.patch} (88%)
 rename Spigot-API-Patches/{0136-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch => 0135-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch} (91%)
 rename Spigot-API-Patches/{0137-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch => 0136-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch} (90%)
 rename Spigot-API-Patches/{0138-Allow-Blocks-to-be-accessed-via-a-long-key.patch => 0137-Allow-Blocks-to-be-accessed-via-a-long-key.patch} (98%)
 rename Spigot-API-Patches/{0139-Slime-Pathfinder-Events.patch => 0138-Slime-Pathfinder-Events.patch} (99%)
 rename Spigot-API-Patches/{0140-isChunkGenerated-API.patch => 0139-isChunkGenerated-API.patch} (95%)
 rename Spigot-API-Patches/{0141-Add-More-Creeper-API.patch => 0140-Add-More-Creeper-API.patch} (96%)
 rename Spigot-API-Patches/{0142-Add-PhantomPreSpawnEvent.patch => 0141-Add-PhantomPreSpawnEvent.patch} (97%)
 rename Spigot-API-Patches/{0143-Add-source-block-to-BlockPhysicsEvent.patch => 0142-Add-source-block-to-BlockPhysicsEvent.patch} (91%)
 rename Spigot-API-Patches/{0144-Inventory-removeItemAnySlot.patch => 0143-Inventory-removeItemAnySlot.patch} (96%)
 rename Spigot-API-Patches/{0145-Add-ray-tracing-methods-to-LivingEntity.patch => 0144-Add-ray-tracing-methods-to-LivingEntity.patch} (97%)
 rename Spigot-API-Patches/{0146-Improve-death-events.patch => 0145-Improve-death-events.patch} (99%)
 rename Spigot-API-Patches/{0147-Mob-Pathfinding-API.patch => 0146-Mob-Pathfinding-API.patch} (99%)
 rename Spigot-API-Patches/{0148-Expose-attack-cooldown-methods-for-Player.patch => 0147-Expose-attack-cooldown-methods-for-Player.patch} (92%)
 rename Spigot-API-Patches/{0149-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch => 0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch} (98%)
 rename Spigot-API-Patches/{0150-Performance-Concurrency-Improvements-to-Permissions.patch => 0149-Performance-Concurrency-Improvements-to-Permissions.patch} (98%)
 rename Spigot-API-Patches/{0151-Add-ItemStackRecipeChoice-Draft-API.patch => 0150-Add-ItemStackRecipeChoice-Draft-API.patch} (96%)
 rename Spigot-API-Patches/{0152-Implement-furnace-cook-speed-multiplier-API.patch => 0151-Implement-furnace-cook-speed-multiplier-API.patch} (95%)
 rename Spigot-API-Patches/{0153-PreSpawnerSpawnEvent.patch => 0152-PreSpawnerSpawnEvent.patch} (96%)
 rename Spigot-API-Patches/{0154-Remove-Precondition-on-name-for-AttributeModifier.patch => 0153-Remove-Precondition-on-name-for-AttributeModifier.patch} (94%)
 rename Spigot-API-Patches/{0155-Material-API-additions.patch => 0154-Material-API-additions.patch} (92%)
 rename Spigot-API-Patches/{0156-Add-Material-Tags.patch => 0155-Add-Material-Tags.patch} (99%)
 rename Spigot-API-Patches/{0157-Allow-setting-the-vex-s-summoner.patch => 0156-Allow-setting-the-vex-s-summoner.patch} (93%)
 rename Spigot-API-Patches/{0158-Add-LivingEntity-getTargetEntity.patch => 0157-Add-LivingEntity-getTargetEntity.patch} (96%)
 rename Spigot-API-Patches/{0159-Add-sun-related-API.patch => 0158-Add-sun-related-API.patch} (93%)
 rename Spigot-API-Patches/{0160-Here-s-Johnny.patch => 0159-Here-s-Johnny.patch} (96%)
 rename Spigot-API-Patches/{0161-Turtle-API.patch => 0160-Turtle-API.patch} (99%)
 rename Spigot-API-Patches/{0162-Implement-getters-and-setters-for-EntityItem-owner-a.patch => 0161-Implement-getters-and-setters-for-EntityItem-owner-a.patch} (96%)
 rename Spigot-API-Patches/{0163-Add-spectator-target-events.patch => 0162-Add-spectator-target-events.patch} (98%)
 rename Spigot-API-Patches/{0164-Add-more-Witch-API.patch => 0163-Add-more-Witch-API.patch} (95%)
 rename Spigot-API-Patches/{0165-Make-the-default-permission-message-configurable.patch => 0164-Make-the-default-permission-message-configurable.patch} (97%)
 rename Spigot-API-Patches/{0166-Support-cancellation-supression-of-EntityDismount-Ve.patch => 0165-Support-cancellation-supression-of-EntityDismount-Ve.patch} (98%)
 rename Spigot-API-Patches/{0167-Add-more-Zombie-API.patch => 0166-Add-more-Zombie-API.patch} (94%)
 rename Spigot-API-Patches/{0168-Change-the-reserved-channel-check-to-be-sensible.patch => 0167-Change-the-reserved-channel-check-to-be-sensible.patch} (96%)
 rename Spigot-API-Patches/{0169-Add-PlayerConnectionCloseEvent.patch => 0168-Add-PlayerConnectionCloseEvent.patch} (98%)
 rename Spigot-API-Patches/{0170-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch => 0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch} (97%)
 rename Spigot-API-Patches/{0171-BlockDestroyEvent.patch => 0170-BlockDestroyEvent.patch} (98%)
 rename Spigot-API-Patches/{0172-Add-ItemStack-Recipe-API-helper-methods.patch => 0171-Add-ItemStack-Recipe-API-helper-methods.patch} (97%)
 rename Spigot-API-Patches/{0173-Add-WhitelistToggleEvent.patch => 0172-Add-WhitelistToggleEvent.patch} (95%)
 rename Spigot-API-Patches/{0174-Annotation-Test-changes.patch => 0173-Annotation-Test-changes.patch} (92%)
 rename Spigot-API-Patches/{0175-Entity-getEntitySpawnReason.patch => 0174-Entity-getEntitySpawnReason.patch} (93%)
 rename Spigot-API-Patches/{0176-Add-GS4-Query-event.patch => 0175-Add-GS4-Query-event.patch} (99%)
 rename Spigot-API-Patches/{0177-Add-PlayerPostRespawnEvent.patch => 0176-Add-PlayerPostRespawnEvent.patch} (96%)
 rename Spigot-API-Patches/{0178-Ignore-package-private-methods-for-nullability-annot.patch => 0177-Ignore-package-private-methods-for-nullability-annot.patch} (91%)
 rename Spigot-API-Patches/{0179-Flip-some-Spigot-API-null-annotations.patch => 0178-Flip-some-Spigot-API-null-annotations.patch} (98%)
 rename Spigot-API-Patches/{0180-Server-Tick-Events.patch => 0179-Server-Tick-Events.patch} (98%)
 rename Spigot-API-Patches/{0181-PlayerDeathEvent-getItemsToKeep.patch => 0180-PlayerDeathEvent-getItemsToKeep.patch} (97%)
 rename Spigot-API-Patches/{0182-Add-Heightmap-API.patch => 0181-Add-Heightmap-API.patch} (98%)
 rename Spigot-API-Patches/{0183-Mob-Spawner-API-Enhancements.patch => 0182-Mob-Spawner-API-Enhancements.patch} (93%)
 delete mode 100644 Spigot-API-Patches/0184-Temp-track-ver-1.14-for-version-command.patch
 create mode 100644 Spigot-Server-Patches/0018-Implement-Paper-VersionChecker.patch
 rename Spigot-API-Patches/0092-Add-version-history-to-version-command.patch => Spigot-Server-Patches/0019-Add-version-history-to-version-command.patch (72%)
 rename Spigot-Server-Patches/{0018-Player-affects-spawning-API.patch => 0020-Player-affects-spawning-API.patch} (98%)
 rename Spigot-Server-Patches/{0019-Remove-invalid-mob-spawner-tile-entities.patch => 0021-Remove-invalid-mob-spawner-tile-entities.patch} (91%)
 rename Spigot-Server-Patches/{0020-Optimize-TileEntity-Ticking.patch => 0022-Optimize-TileEntity-Ticking.patch} (97%)
 rename Spigot-Server-Patches/{0021-Further-improve-server-tick-loop.patch => 0023-Further-improve-server-tick-loop.patch} (98%)
 rename Spigot-Server-Patches/{0022-Only-refresh-abilities-if-needed.patch => 0024-Only-refresh-abilities-if-needed.patch} (91%)
 rename Spigot-Server-Patches/{0023-Entity-Origin-API.patch => 0025-Entity-Origin-API.patch} (95%)
 rename Spigot-Server-Patches/{0024-Prevent-tile-entity-and-entity-crashes.patch => 0026-Prevent-tile-entity-and-entity-crashes.patch} (96%)
 rename Spigot-Server-Patches/{0025-Configurable-top-of-nether-void-damage.patch => 0027-Configurable-top-of-nether-void-damage.patch} (95%)
 rename Spigot-Server-Patches/{0026-Check-online-mode-before-converting-and-renaming-pla.patch => 0028-Check-online-mode-before-converting-and-renaming-pla.patch} (91%)
 rename Spigot-Server-Patches/{0027-Always-tick-falling-blocks.patch => 0029-Always-tick-falling-blocks.patch} (92%)
 rename Spigot-Server-Patches/{0028-Configurable-end-credits.patch => 0030-Configurable-end-credits.patch} (93%)
 rename Spigot-Server-Patches/{0029-Fix-lag-from-explosions-processing-dead-entities.patch => 0031-Fix-lag-from-explosions-processing-dead-entities.patch} (93%)
 rename Spigot-Server-Patches/{0030-Optimize-explosions.patch => 0032-Optimize-explosions.patch} (98%)
 rename Spigot-Server-Patches/{0031-Disable-explosion-knockback.patch => 0033-Disable-explosion-knockback.patch} (95%)
 rename Spigot-Server-Patches/{0032-Disable-thunder.patch => 0034-Disable-thunder.patch} (96%)
 rename Spigot-Server-Patches/{0033-Disable-ice-and-snow.patch => 0035-Disable-ice-and-snow.patch} (96%)
 rename Spigot-Server-Patches/{0034-Configurable-mob-spawner-tick-rate.patch => 0036-Configurable-mob-spawner-tick-rate.patch} (94%)
 rename Spigot-Server-Patches/{0035-Send-absolute-position-the-first-time-an-entity-is-s.patch => 0037-Send-absolute-position-the-first-time-an-entity-is-s.patch} (97%)
 rename Spigot-Server-Patches/{0036-Add-BeaconEffectEvent.patch => 0038-Add-BeaconEffectEvent.patch} (96%)
 rename Spigot-Server-Patches/{0037-Configurable-container-update-tick-rate.patch => 0039-Configurable-container-update-tick-rate.patch} (93%)
 rename Spigot-Server-Patches/{0038-Use-UserCache-for-player-heads.patch => 0040-Use-UserCache-for-player-heads.patch} (91%)
 rename Spigot-Server-Patches/{0039-Disable-spigot-tick-limiters.patch => 0041-Disable-spigot-tick-limiters.patch} (92%)
 rename Spigot-Server-Patches/{0040-Add-PlayerInitialSpawnEvent.patch => 0042-Add-PlayerInitialSpawnEvent.patch} (96%)
 rename Spigot-Server-Patches/{0041-Configurable-Disabling-Cat-Chest-Detection.patch => 0043-Configurable-Disabling-Cat-Chest-Detection.patch} (93%)
 rename Spigot-Server-Patches/{0042-Ensure-commands-are-not-ran-async.patch => 0044-Ensure-commands-are-not-ran-async.patch} (96%)
 rename Spigot-Server-Patches/{0043-All-chunks-are-slime-spawn-chunks-toggle.patch => 0045-All-chunks-are-slime-spawn-chunks-toggle.patch} (92%)
 rename Spigot-Server-Patches/{0044-Optimize-Pathfinding.patch => 0046-Optimize-Pathfinding.patch} (96%)
 rename Spigot-Server-Patches/{0045-Expose-server-CommandMap.patch => 0047-Expose-server-CommandMap.patch} (85%)
 rename Spigot-Server-Patches/{0046-Be-a-bit-more-informative-in-maxHealth-exception.patch => 0048-Be-a-bit-more-informative-in-maxHealth-exception.patch} (92%)
 rename Spigot-Server-Patches/{0047-Player-Tab-List-and-Title-APIs.patch => 0049-Player-Tab-List-and-Title-APIs.patch} (97%)
 rename Spigot-Server-Patches/{0048-Ensure-inv-drag-is-in-bounds.patch => 0050-Ensure-inv-drag-is-in-bounds.patch} (90%)
 rename Spigot-Server-Patches/{0049-Change-implementation-of-tile-entity-removal-list.patch => 0051-Change-implementation-of-tile-entity-removal-list.patch} (91%)
 rename Spigot-Server-Patches/{0050-Add-configurable-portal-search-radius.patch => 0052-Add-configurable-portal-search-radius.patch} (93%)
 rename Spigot-Server-Patches/{0051-Add-velocity-warnings.patch => 0053-Add-velocity-warnings.patch} (96%)
 rename Spigot-Server-Patches/{0052-Configurable-inter-world-teleportation-safety.patch => 0054-Configurable-inter-world-teleportation-safety.patch} (97%)
 rename Spigot-Server-Patches/{0053-Add-exception-reporting-event.patch => 0055-Add-exception-reporting-event.patch} (97%)
 rename Spigot-Server-Patches/{0054-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch => 0056-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch} (93%)
 rename Spigot-Server-Patches/{0055-Disable-Scoreboards-for-non-players-by-default.patch => 0057-Disable-Scoreboards-for-non-players-by-default.patch} (93%)
 rename Spigot-Server-Patches/{0056-Add-methods-for-working-with-arrows-stuck-in-living-.patch => 0058-Add-methods-for-working-with-arrows-stuck-in-living-.patch} (90%)
 rename Spigot-Server-Patches/{0057-Complete-resource-pack-API.patch => 0059-Complete-resource-pack-API.patch} (98%)
 rename Spigot-Server-Patches/{0058-Chunk-Save-Reattempt.patch => 0060-Chunk-Save-Reattempt.patch} (97%)
 rename Spigot-Server-Patches/{0059-Default-loading-permissions.yml-before-plugins.patch => 0061-Default-loading-permissions.yml-before-plugins.patch} (96%)
 rename Spigot-Server-Patches/{0060-Allow-Reloading-of-Custom-Permissions.patch => 0062-Allow-Reloading-of-Custom-Permissions.patch} (93%)
 rename Spigot-Server-Patches/{0061-Remove-Metadata-on-reload.patch => 0063-Remove-Metadata-on-reload.patch} (92%)
 rename Spigot-Server-Patches/{0062-Undead-horse-leashing.patch => 0064-Undead-horse-leashing.patch} (92%)
 rename Spigot-Server-Patches/{0063-Handle-Item-Meta-Inconsistencies.patch => 0065-Handle-Item-Meta-Inconsistencies.patch} (98%)
 rename Spigot-Server-Patches/{0064-Configurable-Non-Player-Arrow-Despawn-Rate.patch => 0066-Configurable-Non-Player-Arrow-Despawn-Rate.patch} (94%)
 rename Spigot-Server-Patches/{0065-Add-World-Util-Methods.patch => 0067-Add-World-Util-Methods.patch} (96%)
 rename Spigot-Server-Patches/{0066-Custom-replacement-for-eaten-items.patch => 0068-Custom-replacement-for-eaten-items.patch} (95%)
 rename Spigot-Server-Patches/{0067-handle-NaN-health-absorb-values-and-repair-bad-data.patch => 0069-handle-NaN-health-absorb-values-and-repair-bad-data.patch} (96%)
 rename Spigot-Server-Patches/{0068-Waving-banner-workaround.patch => 0070-Waving-banner-workaround.patch} (92%)
 rename Spigot-Server-Patches/{0069-Use-a-Shared-Random-for-Entities.patch => 0071-Use-a-Shared-Random-for-Entities.patch} (94%)
 rename Spigot-Server-Patches/{0070-Configurable-spawn-chances-for-skeleton-horses.patch => 0072-Configurable-spawn-chances-for-skeleton-horses.patch} (96%)
 rename Spigot-Server-Patches/{0071-Optimize-isValidLocation-getType-and-getBlockData-fo.patch => 0073-Optimize-isValidLocation-getType-and-getBlockData-fo.patch} (95%)
 rename Spigot-Server-Patches/{0072-Access-items-by-EquipmentSlot.patch => 0074-Access-items-by-EquipmentSlot.patch} (95%)
 rename Spigot-Server-Patches/{0073-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch => 0075-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch} (95%)
 rename Spigot-Server-Patches/{0074-Entity-AddTo-RemoveFrom-World-Events.patch => 0076-Entity-AddTo-RemoveFrom-World-Events.patch} (95%)
 rename Spigot-Server-Patches/{0075-Configurable-Chunk-Inhabited-Time.patch => 0077-Configurable-Chunk-Inhabited-Time.patch} (93%)
 rename Spigot-Server-Patches/{0076-EntityPathfindEvent.patch => 0078-EntityPathfindEvent.patch} (98%)
 rename Spigot-Server-Patches/{0077-Reduce-IO-ops-opening-a-new-region-file.patch => 0079-Reduce-IO-ops-opening-a-new-region-file.patch} (96%)
 rename Spigot-Server-Patches/{0078-Sanitise-RegionFileCache-and-make-configurable.patch => 0080-Sanitise-RegionFileCache-and-make-configurable.patch} (95%)
 rename Spigot-Server-Patches/{0079-Use-Optimized-Collections.patch => 0081-Use-Optimized-Collections.patch} (94%)
 rename Spigot-Server-Patches/{0080-Do-not-load-chunks-for-Pathfinding.patch => 0082-Do-not-load-chunks-for-Pathfinding.patch} (95%)
 rename Spigot-Server-Patches/{0081-Do-not-load-chunks-for-light-checks.patch => 0083-Do-not-load-chunks-for-light-checks.patch} (90%)
 rename Spigot-Server-Patches/{0082-Add-PlayerUseUnknownEntityEvent.patch => 0084-Add-PlayerUseUnknownEntityEvent.patch} (92%)
 rename Spigot-Server-Patches/{0083-Fix-reducedDebugInfo-not-initialized-on-client.patch => 0085-Fix-reducedDebugInfo-not-initialized-on-client.patch} (94%)
 rename Spigot-Server-Patches/{0084-Configurable-Grass-Spread-Tick-Rate.patch => 0086-Configurable-Grass-Spread-Tick-Rate.patch} (96%)
 rename Spigot-Server-Patches/{0085-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch => 0087-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch} (89%)
 rename Spigot-Server-Patches/{0086-Remove-Debug-checks-from-DataBits.patch => 0088-Remove-Debug-checks-from-DataBits.patch} (96%)
 rename Spigot-Server-Patches/{0087-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch => 0089-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch} (98%)
 rename Spigot-Server-Patches/{0088-Workaround-for-setting-passengers-on-players.patch => 0090-Workaround-for-setting-passengers-on-players.patch} (94%)
 rename Spigot-Server-Patches/{0089-Remove-unused-World-Tile-Entity-List.patch => 0091-Remove-unused-World-Tile-Entity-List.patch} (97%)
 rename Spigot-Server-Patches/{0090-Don-t-tick-Skulls-unused-code.patch => 0092-Don-t-tick-Skulls-unused-code.patch} (90%)
 rename Spigot-Server-Patches/{0091-Configurable-Player-Collision.patch => 0093-Configurable-Player-Collision.patch} (98%)
 rename Spigot-Server-Patches/{0092-Add-handshake-event-to-allow-plugins-to-handle-clien.patch => 0094-Add-handshake-event-to-allow-plugins-to-handle-clien.patch} (97%)
 rename Spigot-Server-Patches/{0093-Configurable-RCON-IP-address.patch => 0095-Configurable-RCON-IP-address.patch} (96%)
 rename Spigot-Server-Patches/{0094-Prevent-Fire-from-loading-chunks.patch => 0096-Prevent-Fire-from-loading-chunks.patch} (96%)
 rename Spigot-Server-Patches/{0095-Implement-PlayerLocaleChangeEvent.patch => 0097-Implement-PlayerLocaleChangeEvent.patch} (97%)
 rename Spigot-Server-Patches/{0096-EntityRegainHealthEvent-isFastRegen-API.patch => 0098-EntityRegainHealthEvent-isFastRegen-API.patch} (93%)
 rename Spigot-Server-Patches/{0097-Add-ability-to-configure-frosted_ice-properties.patch => 0099-Add-ability-to-configure-frosted_ice-properties.patch} (98%)
 rename Spigot-Server-Patches/{0098-remove-null-possibility-for-getServer-singleton.patch => 0100-remove-null-possibility-for-getServer-singleton.patch} (95%)
 rename Spigot-Server-Patches/{0099-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch => 0101-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch} (99%)
 rename Spigot-Server-Patches/{0100-LootTable-API-Replenishable-Lootables-Feature.patch => 0102-LootTable-API-Replenishable-Lootables-Feature.patch} (98%)
 rename Spigot-Server-Patches/{0101-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch => 0103-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch} (96%)
 rename Spigot-Server-Patches/{0102-System-property-for-disabling-watchdoge.patch => 0104-System-property-for-disabling-watchdoge.patch} (93%)
 rename Spigot-Server-Patches/{0103-Optimize-UserCache-Thread-Safe.patch => 0105-Optimize-UserCache-Thread-Safe.patch} (96%)
 rename Spigot-Server-Patches/{0104-Avoid-blocking-on-Network-Manager-creation.patch => 0106-Avoid-blocking-on-Network-Manager-creation.patch} (97%)
 rename Spigot-Server-Patches/{0105-Optional-TNT-doesn-t-move-in-water.patch => 0107-Optional-TNT-doesn-t-move-in-water.patch} (95%)
 rename Spigot-Server-Patches/{0106-Faster-redstone-torch-rapid-clock-removal.patch => 0108-Faster-redstone-torch-rapid-clock-removal.patch} (97%)
 rename Spigot-Server-Patches/{0107-Add-server-name-parameter.patch => 0109-Add-server-name-parameter.patch} (90%)
 rename Spigot-Server-Patches/{0108-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch => 0110-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch} (95%)
 rename Spigot-Server-Patches/{0109-Fix-Double-World-Add-issues.patch => 0111-Fix-Double-World-Add-issues.patch} (94%)
 rename Spigot-Server-Patches/{0110-Fix-Old-Sign-Conversion.patch => 0112-Fix-Old-Sign-Conversion.patch} (98%)
 rename Spigot-Server-Patches/{0111-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch => 0113-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch} (90%)
 rename Spigot-Server-Patches/{0112-More-informative-vehicle-moved-wrongly-message.patch => 0114-More-informative-vehicle-moved-wrongly-message.patch} (90%)
 rename Spigot-Server-Patches/{0113-Re-track-players-that-dismount-from-other-players.patch => 0115-Re-track-players-that-dismount-from-other-players.patch} (92%)
 rename Spigot-Server-Patches/{0114-Add-setting-for-proxy-online-mode-status.patch => 0116-Add-setting-for-proxy-online-mode-status.patch} (96%)
 rename Spigot-Server-Patches/{0115-Optimise-BlockState-s-hashCode-equals.patch => 0117-Optimise-BlockState-s-hashCode-equals.patch} (98%)
 rename Spigot-Server-Patches/{0116-Configurable-packet-in-spam-threshold.patch => 0118-Configurable-packet-in-spam-threshold.patch} (95%)
 rename Spigot-Server-Patches/{0117-Configurable-flying-kick-messages.patch => 0119-Configurable-flying-kick-messages.patch} (96%)
 rename Spigot-Server-Patches/{0118-Chunk-registration-fixes.patch => 0120-Chunk-registration-fixes.patch} (94%)
 rename Spigot-Server-Patches/{0119-Remove-FishingHook-reference-on-Craft-Entity-removal.patch => 0121-Remove-FishingHook-reference-on-Craft-Entity-removal.patch} (89%)
 rename Spigot-Server-Patches/{0120-Auto-fix-bad-Y-levels-on-player-login.patch => 0122-Auto-fix-bad-Y-levels-on-player-login.patch} (90%)
 rename Spigot-Server-Patches/{0121-Option-to-remove-corrupt-tile-entities.patch => 0123-Option-to-remove-corrupt-tile-entities.patch} (92%)
 rename Spigot-Server-Patches/{0122-Add-EntityZapEvent.patch => 0124-Add-EntityZapEvent.patch} (98%)
 rename Spigot-Server-Patches/{0123-Don-t-load-Chunks-from-Hoppers-and-other-things.patch => 0125-Don-t-load-Chunks-from-Hoppers-and-other-things.patch} (96%)
 rename Spigot-Server-Patches/{0124-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch => 0126-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch} (97%)
 rename Spigot-Server-Patches/{0125-Cache-user-authenticator-threads.patch => 0127-Cache-user-authenticator-threads.patch} (97%)
 rename Spigot-Server-Patches/{0126-Optimise-removeQueue.patch => 0128-Optimise-removeQueue.patch} (97%)
 rename Spigot-Server-Patches/{0127-Allow-Reloading-of-Command-Aliases.patch => 0129-Allow-Reloading-of-Command-Aliases.patch} (93%)
 rename Spigot-Server-Patches/{0128-Add-source-to-PlayerExpChangeEvent.patch => 0130-Add-source-to-PlayerExpChangeEvent.patch} (97%)
 rename Spigot-Server-Patches/{0129-Optimize-World.isLoaded-BlockPosition-Z.patch => 0131-Optimize-World.isLoaded-BlockPosition-Z.patch} (90%)
 rename Spigot-Server-Patches/{0130-Don-t-let-fishinghooks-use-portals.patch => 0132-Don-t-let-fishinghooks-use-portals.patch} (91%)
 rename Spigot-Server-Patches/{0131-Add-ProjectileCollideEvent.patch => 0133-Add-ProjectileCollideEvent.patch} (99%)
 rename Spigot-Server-Patches/{0132-Prevent-Pathfinding-out-of-World-Border.patch => 0134-Prevent-Pathfinding-out-of-World-Border.patch} (91%)
 rename Spigot-Server-Patches/{0133-Bound-Treasure-Maps-to-World-Border.patch => 0135-Bound-Treasure-Maps-to-World-Border.patch} (95%)
 rename Spigot-Server-Patches/{0134-Configurable-Cartographer-Treasure-Maps.patch => 0136-Configurable-Cartographer-Treasure-Maps.patch} (93%)
 rename Spigot-Server-Patches/{0135-Optimize-ItemStack.isEmpty.patch => 0137-Optimize-ItemStack.isEmpty.patch} (92%)
 rename Spigot-Server-Patches/{0136-Add-API-methods-to-control-if-armour-stands-can-move.patch => 0138-Add-API-methods-to-control-if-armour-stands-can-move.patch} (93%)
 rename Spigot-Server-Patches/{0137-Properly-fix-item-duplication-bug.patch => 0139-Properly-fix-item-duplication-bug.patch} (91%)
 rename Spigot-Server-Patches/{0138-String-based-Action-Bar-API.patch => 0140-String-based-Action-Bar-API.patch} (94%)
 rename Spigot-Server-Patches/{0139-Firework-API-s.patch => 0141-Firework-API-s.patch} (98%)
 rename Spigot-Server-Patches/{0140-PlayerTeleportEndGatewayEvent.patch => 0142-PlayerTeleportEndGatewayEvent.patch} (93%)
 rename Spigot-Server-Patches/{0141-Provide-E-TE-Chunk-count-stat-methods.patch => 0143-Provide-E-TE-Chunk-count-stat-methods.patch} (94%)
 rename Spigot-Server-Patches/{0142-Enforce-Sync-Player-Saves.patch => 0144-Enforce-Sync-Player-Saves.patch} (94%)
 rename Spigot-Server-Patches/{0143-Don-t-allow-entities-to-ride-themselves-572.patch => 0145-Don-t-allow-entities-to-ride-themselves-572.patch} (89%)
 rename Spigot-Server-Patches/{0144-Fix-block-break-desync.patch => 0146-Fix-block-break-desync.patch} (90%)
 rename Spigot-Server-Patches/{0145-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch => 0147-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch} (96%)
 rename Spigot-Server-Patches/{0146-Cap-Entity-Collisions.patch => 0148-Cap-Entity-Collisions.patch} (93%)
 rename Spigot-Server-Patches/{0147-Remove-CraftScheduler-Async-Task-Debugger.patch => 0149-Remove-CraftScheduler-Async-Task-Debugger.patch} (95%)
 rename Spigot-Server-Patches/{0148-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch => 0150-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch} (91%)
 rename Spigot-Server-Patches/{0149-Do-not-let-armorstands-drown.patch => 0151-Do-not-let-armorstands-drown.patch} (93%)
 rename Spigot-Server-Patches/{0150-Properly-handle-async-calls-to-restart-the-server.patch => 0152-Properly-handle-async-calls-to-restart-the-server.patch} (99%)
 rename Spigot-Server-Patches/{0151-Add-system-property-to-disable-book-size-limits.patch => 0153-Add-system-property-to-disable-book-size-limits.patch} (96%)
 rename Spigot-Server-Patches/{0152-Add-option-to-make-parrots-stay-on-shoulders-despite.patch => 0154-Add-option-to-make-parrots-stay-on-shoulders-despite.patch} (94%)
 rename Spigot-Server-Patches/{0153-Add-configuration-option-to-prevent-player-names-fro.patch => 0155-Add-configuration-option-to-prevent-player-names-fro.patch} (94%)
 rename Spigot-Server-Patches/{0154-Use-TerminalConsoleAppender-for-console-improvements.patch => 0156-Use-TerminalConsoleAppender-for-console-improvements.patch} (99%)
 rename Spigot-Server-Patches/{0155-provide-a-configurable-option-to-disable-creeper-lin.patch => 0157-provide-a-configurable-option-to-disable-creeper-lin.patch} (96%)
 rename Spigot-Server-Patches/{0156-Item-canEntityPickup.patch => 0158-Item-canEntityPickup.patch} (92%)
 rename Spigot-Server-Patches/{0157-PlayerPickupItemEvent-setFlyAtPlayer.patch => 0159-PlayerPickupItemEvent-setFlyAtPlayer.patch} (97%)
 rename Spigot-Server-Patches/{0158-PlayerAttemptPickupItemEvent.patch => 0160-PlayerAttemptPickupItemEvent.patch} (96%)
 rename Spigot-Server-Patches/{0159-Add-UnknownCommandEvent.patch => 0161-Add-UnknownCommandEvent.patch} (94%)
 rename Spigot-Server-Patches/{0160-Basic-PlayerProfile-API.patch => 0162-Basic-PlayerProfile-API.patch} (98%)
 rename Spigot-Server-Patches/{0161-Shoulder-Entities-Release-API.patch => 0163-Shoulder-Entities-Release-API.patch} (96%)
 rename Spigot-Server-Patches/{0162-Profile-Lookup-Events.patch => 0164-Profile-Lookup-Events.patch} (98%)
 rename Spigot-Server-Patches/{0163-Block-player-logins-during-server-shutdown.patch => 0165-Block-player-logins-during-server-shutdown.patch} (94%)
 rename Spigot-Server-Patches/{0164-Entity-fromMobSpawner.patch => 0166-Entity-fromMobSpawner.patch} (95%)
 rename Spigot-Server-Patches/{0165-Improve-the-Saddle-API-for-Horses.patch => 0167-Improve-the-Saddle-API-for-Horses.patch} (94%)
 rename Spigot-Server-Patches/{0166-Implement-ensureServerConversions-API.patch => 0168-Implement-ensureServerConversions-API.patch} (91%)
 rename Spigot-Server-Patches/{0167-Implement-getI18NDisplayName.patch => 0169-Implement-getI18NDisplayName.patch} (93%)
 rename Spigot-Server-Patches/{0168-ProfileWhitelistVerifyEvent.patch => 0170-ProfileWhitelistVerifyEvent.patch} (97%)
 rename Spigot-Server-Patches/{0169-Fix-this-stupid-bullshit.patch => 0171-Fix-this-stupid-bullshit.patch} (94%)
 rename Spigot-Server-Patches/{0170-Ocelot-despawns-should-honor-nametags-and-leash.patch => 0172-Ocelot-despawns-should-honor-nametags-and-leash.patch} (92%)
 rename Spigot-Server-Patches/{0171-Reset-spawner-timer-when-spawner-event-is-cancelled.patch => 0173-Reset-spawner-timer-when-spawner-event-is-cancelled.patch} (92%)
 rename Spigot-Server-Patches/{0172-Fix-MC-117075-TE-Unload-Lag-Spike.patch => 0174-Fix-MC-117075-TE-Unload-Lag-Spike.patch} (92%)
 rename Spigot-Server-Patches/{0173-Allow-specifying-a-custom-authentication-servers-dow.patch => 0175-Allow-specifying-a-custom-authentication-servers-dow.patch} (97%)
 rename Spigot-Server-Patches/{0174-LivingEntity-setKiller.patch => 0176-LivingEntity-setKiller.patch} (93%)
 rename Spigot-Server-Patches/{0175-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch => 0177-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch} (93%)
 rename Spigot-Server-Patches/{0176-Handle-plugin-prefixes-using-Log4J-configuration.patch => 0178-Handle-plugin-prefixes-using-Log4J-configuration.patch} (96%)
 rename Spigot-Server-Patches/{0177-Include-Log4J2-SLF4J-implementation.patch => 0179-Include-Log4J2-SLF4J-implementation.patch} (87%)
 rename Spigot-Server-Patches/{0178-Disable-logger-prefix-for-various-plugins-bypassing-.patch => 0180-Disable-logger-prefix-for-various-plugins-bypassing-.patch} (97%)
 rename Spigot-Server-Patches/{0179-Add-PlayerJumpEvent.patch => 0181-Add-PlayerJumpEvent.patch} (96%)
 rename Spigot-Server-Patches/{0180-handle-PacketPlayInKeepAlive-async.patch => 0182-handle-PacketPlayInKeepAlive-async.patch} (95%)
 rename Spigot-Server-Patches/{0181-Expose-client-protocol-version-and-virtual-host.patch => 0183-Expose-client-protocol-version-and-virtual-host.patch} (95%)
 rename Spigot-Server-Patches/{0182-revert-serverside-behavior-of-keepalives.patch => 0184-revert-serverside-behavior-of-keepalives.patch} (98%)
 rename Spigot-Server-Patches/{0183-Send-attack-SoundEffects-only-to-players-who-can-see.patch => 0185-Send-attack-SoundEffects-only-to-players-who-can-see.patch} (97%)
 rename Spigot-Server-Patches/{0184-Option-for-maximum-exp-value-when-merging-orbs.patch => 0186-Option-for-maximum-exp-value-when-merging-orbs.patch} (98%)
 rename Spigot-Server-Patches/{0185-Add-PlayerArmorChangeEvent.patch => 0187-Add-PlayerArmorChangeEvent.patch} (95%)
 rename Spigot-Server-Patches/{0186-Prevent-logins-from-being-processed-when-the-player-.patch => 0188-Prevent-logins-from-being-processed-when-the-player-.patch} (94%)
 rename Spigot-Server-Patches/{0187-use-CB-BlockState-implementations-for-captured-block.patch => 0189-use-CB-BlockState-implementations-for-captured-block.patch} (94%)
 rename Spigot-Server-Patches/{0188-API-to-get-a-BlockState-without-a-snapshot.patch => 0190-API-to-get-a-BlockState-without-a-snapshot.patch} (98%)
 rename Spigot-Server-Patches/{0189-AsyncTabCompleteEvent.patch => 0191-AsyncTabCompleteEvent.patch} (98%)
 rename Spigot-Server-Patches/{0190-Avoid-NPE-in-PathfinderGoalTempt.patch => 0192-Avoid-NPE-in-PathfinderGoalTempt.patch} (93%)
 rename Spigot-Server-Patches/{0191-PlayerPickupExperienceEvent.patch => 0193-PlayerPickupExperienceEvent.patch} (94%)
 rename Spigot-Server-Patches/{0192-ExperienceOrbMergeEvent.patch => 0194-ExperienceOrbMergeEvent.patch} (96%)
 rename Spigot-Server-Patches/{0193-Ability-to-apply-mending-to-XP-API.patch => 0195-Ability-to-apply-mending-to-XP-API.patch} (98%)
 rename Spigot-Server-Patches/{0194-Make-max-squid-spawn-height-configurable.patch => 0196-Make-max-squid-spawn-height-configurable.patch} (96%)
 rename Spigot-Server-Patches/{0195-PreCreatureSpawnEvent.patch => 0197-PreCreatureSpawnEvent.patch} (98%)
 rename Spigot-Server-Patches/{0196-PlayerNaturallySpawnCreaturesEvent.patch => 0198-PlayerNaturallySpawnCreaturesEvent.patch} (95%)
 rename Spigot-Server-Patches/{0197-Add-setPlayerProfile-API-for-Skulls.patch => 0199-Add-setPlayerProfile-API-for-Skulls.patch} (98%)
 rename Spigot-Server-Patches/{0198-Fill-Profile-Property-Events.patch => 0200-Fill-Profile-Property-Events.patch} (96%)
 rename Spigot-Server-Patches/{0199-PlayerAdvancementCriterionGrantEvent.patch => 0201-PlayerAdvancementCriterionGrantEvent.patch} (94%)
 rename Spigot-Server-Patches/{0200-Add-ArmorStand-Item-Meta.patch => 0202-Add-ArmorStand-Item-Meta.patch} (99%)
 rename Spigot-Server-Patches/{0201-Extend-Player-Interact-cancellation.patch => 0203-Extend-Player-Interact-cancellation.patch} (98%)
 rename Spigot-Server-Patches/{0202-Tameable-getOwnerUniqueId-API.patch => 0204-Tameable-getOwnerUniqueId-API.patch} (96%)
 rename Spigot-Server-Patches/{0203-Toggleable-player-crits-helps-mitigate-hacked-client.patch => 0205-Toggleable-player-crits-helps-mitigate-hacked-client.patch} (96%)
 rename Spigot-Server-Patches/{0204-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch => 0206-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch} (95%)
 rename Spigot-Server-Patches/{0205-Prevent-Frosted-Ice-from-loading-holding-chunks.patch => 0207-Prevent-Frosted-Ice-from-loading-holding-chunks.patch} (96%)
 rename Spigot-Server-Patches/{0206-Disable-Explicit-Network-Manager-Flushing.patch => 0208-Disable-Explicit-Network-Manager-Flushing.patch} (96%)
 rename Spigot-Server-Patches/{0207-Implement-extended-PaperServerListPingEvent.patch => 0209-Implement-extended-PaperServerListPingEvent.patch} (99%)
 rename Spigot-Server-Patches/{0208-Improved-Async-Task-Scheduler.patch => 0210-Improved-Async-Task-Scheduler.patch} (99%)
 rename Spigot-Server-Patches/{0209-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch => 0211-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch} (97%)
 rename Spigot-Server-Patches/{0210-Player.setPlayerProfile-API.patch => 0212-Player.setPlayerProfile-API.patch} (99%)
 rename Spigot-Server-Patches/{0211-Fix-Dragon-Server-Crashes.patch => 0213-Fix-Dragon-Server-Crashes.patch} (94%)
 rename Spigot-Server-Patches/{0212-getPlayerUniqueId-API.patch => 0214-getPlayerUniqueId-API.patch} (94%)
 rename Spigot-Server-Patches/{0213-Make-player-data-saving-configurable.patch => 0215-Make-player-data-saving-configurable.patch} (96%)
 rename Spigot-Server-Patches/{0214-Make-legacy-ping-handler-more-reliable.patch => 0216-Make-legacy-ping-handler-more-reliable.patch} (98%)
 rename Spigot-Server-Patches/{0215-Call-PaperServerListPingEvent-for-legacy-pings.patch => 0217-Call-PaperServerListPingEvent-for-legacy-pings.patch} (99%)
 rename Spigot-Server-Patches/{0216-Flag-to-disable-the-channel-limit.patch => 0218-Flag-to-disable-the-channel-limit.patch} (96%)
 delete mode 100644 Spigot-Server-Patches/0218-Load-version-history-at-server-start.patch
 rename Spigot-Server-Patches/{0217-Add-method-to-open-already-placed-sign.patch => 0219-Add-method-to-open-already-placed-sign.patch} (92%)
 rename Spigot-Server-Patches/{0219-Configurable-sprint-interruption-on-attack.patch => 0220-Configurable-sprint-interruption-on-attack.patch} (96%)
 rename Spigot-Server-Patches/{0220-Fix-exploit-that-allowed-colored-signs-to-be-created.patch => 0221-Fix-exploit-that-allowed-colored-signs-to-be-created.patch} (94%)
 rename Spigot-Server-Patches/{0221-EndermanEscapeEvent.patch => 0222-EndermanEscapeEvent.patch} (98%)
 rename Spigot-Server-Patches/{0222-Enderman.teleportRandomly.patch => 0223-Enderman.teleportRandomly.patch} (95%)
 rename Spigot-Server-Patches/{0223-Block-Enderpearl-Travel-Exploit.patch => 0224-Block-Enderpearl-Travel-Exploit.patch} (97%)
 rename Spigot-Server-Patches/{0224-Expand-World.spawnParticle-API-and-add-Builder.patch => 0225-Expand-World.spawnParticle-API-and-add-Builder.patch} (96%)
 rename Spigot-Server-Patches/{0225-EndermanAttackPlayerEvent.patch => 0226-EndermanAttackPlayerEvent.patch} (95%)
 rename Spigot-Server-Patches/{0226-WitchConsumePotionEvent.patch => 0227-WitchConsumePotionEvent.patch} (95%)
 rename Spigot-Server-Patches/{0227-WitchThrowPotionEvent.patch => 0228-WitchThrowPotionEvent.patch} (96%)
 rename Spigot-Server-Patches/{0228-Allow-spawning-Item-entities-with-World.spawnEntity.patch => 0229-Allow-spawning-Item-entities-with-World.spawnEntity.patch} (92%)
 rename Spigot-Server-Patches/{0229-WitchReadyPotionEvent.patch => 0230-WitchReadyPotionEvent.patch} (95%)
 rename Spigot-Server-Patches/{0230-ItemStack-getMaxItemUseDuration.patch => 0231-ItemStack-getMaxItemUseDuration.patch} (96%)
 rename Spigot-Server-Patches/{0231-Implement-EntityTeleportEndGatewayEvent.patch => 0232-Implement-EntityTeleportEndGatewayEvent.patch} (96%)
 rename Spigot-Server-Patches/{0232-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch => 0233-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch} (95%)
 rename Spigot-Server-Patches/{0233-Fix-CraftEntity-hashCode.patch => 0234-Fix-CraftEntity-hashCode.patch} (94%)
 rename Spigot-Server-Patches/{0234-Configurable-Alternative-LootPool-Luck-Formula.patch => 0235-Configurable-Alternative-LootPool-Luck-Formula.patch} (98%)
 rename Spigot-Server-Patches/{0235-Print-Error-details-when-failing-to-save-player-data.patch => 0236-Print-Error-details-when-failing-to-save-player-data.patch} (93%)
 rename Spigot-Server-Patches/{0236-Make-shield-blocking-delay-configurable.patch => 0237-Make-shield-blocking-delay-configurable.patch} (94%)
 rename Spigot-Server-Patches/{0237-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch => 0238-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch} (95%)
 rename Spigot-Server-Patches/{0238-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch => 0239-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch} (99%)
 rename Spigot-Server-Patches/{0239-PlayerReadyArrowEvent.patch => 0240-PlayerReadyArrowEvent.patch} (96%)
 rename Spigot-Server-Patches/{0240-Fire-EntityShootBowEvent-for-Illusioner.patch => 0241-Fire-EntityShootBowEvent-for-Illusioner.patch} (95%)
 rename Spigot-Server-Patches/{0241-Implement-EntityKnockbackByEntityEvent.patch => 0242-Implement-EntityKnockbackByEntityEvent.patch} (93%)
 rename Spigot-Server-Patches/{0242-Expand-Explosions-API.patch => 0243-Expand-Explosions-API.patch} (92%)
 rename Spigot-Server-Patches/{0243-LivingEntity-Hand-Raised-Item-Use-API.patch => 0244-LivingEntity-Hand-Raised-Item-Use-API.patch} (94%)
 rename Spigot-Server-Patches/{0244-RangedEntity-API.patch => 0245-RangedEntity-API.patch} (99%)
 rename Spigot-Server-Patches/{0245-Add-config-to-disable-ender-dragon-legacy-check.patch => 0246-Add-config-to-disable-ender-dragon-legacy-check.patch} (97%)
 rename Spigot-Server-Patches/{0246-Implement-World.getEntity-UUID-API.patch => 0247-Implement-World.getEntity-UUID-API.patch} (89%)
 rename Spigot-Server-Patches/{0247-InventoryCloseEvent-Reason-API.patch => 0248-InventoryCloseEvent-Reason-API.patch} (96%)
 rename Spigot-Server-Patches/{0248-Configurable-Bed-Search-Radius.patch => 0249-Configurable-Bed-Search-Radius.patch} (97%)
 rename Spigot-Server-Patches/{0249-Vex-getSummoner-API.patch => 0250-Vex-getSummoner-API.patch} (92%)
 rename Spigot-Server-Patches/{0250-Refresh-player-inventory-when-cancelling-PlayerInter.patch => 0251-Refresh-player-inventory-when-cancelling-PlayerInter.patch} (92%)
 rename Spigot-Server-Patches/{0251-Don-t-change-the-Entity-Random-seed-for-squids.patch => 0252-Don-t-change-the-Entity-Random-seed-for-squids.patch} (88%)
 rename Spigot-Server-Patches/{0252-Re-add-vanilla-entity-warnings-for-duplicates.patch => 0253-Re-add-vanilla-entity-warnings-for-duplicates.patch} (92%)
 rename Spigot-Server-Patches/{0253-Avoid-item-merge-if-stack-size-above-max-stack-size.patch => 0254-Avoid-item-merge-if-stack-size-above-max-stack-size.patch} (90%)
 rename Spigot-Server-Patches/{0254-Use-asynchronous-Log4j-2-loggers.patch => 0255-Use-asynchronous-Log4j-2-loggers.patch} (88%)
 rename Spigot-Server-Patches/{0255-add-more-information-to-Entity.toString.patch => 0256-add-more-information-to-Entity.toString.patch} (93%)
 rename Spigot-Server-Patches/{0256-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch => 0257-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch} (96%)
 rename Spigot-Server-Patches/{0257-EnderDragon-Events.patch => 0258-EnderDragon-Events.patch} (95%)
 rename Spigot-Server-Patches/{0258-PlayerElytraBoostEvent.patch => 0259-PlayerElytraBoostEvent.patch} (94%)
 rename Spigot-Server-Patches/{0259-PlayerLaunchProjectileEvent.patch => 0260-PlayerLaunchProjectileEvent.patch} (98%)
 rename Spigot-Server-Patches/{0260-Speedup-BlockPos-by-fixing-inlining.patch => 0261-Speedup-BlockPos-by-fixing-inlining.patch} (98%)
 rename Spigot-Server-Patches/{0261-Don-t-save-Proto-Chunks.patch => 0262-Don-t-save-Proto-Chunks.patch} (91%)
 rename Spigot-Server-Patches/{0262-Optimize-RegistryID.c.patch => 0263-Optimize-RegistryID.c.patch} (95%)
 rename Spigot-Server-Patches/{0263-Option-to-prevent-armor-stands-from-doing-entity-loo.patch => 0264-Option-to-prevent-armor-stands-from-doing-entity-loo.patch} (92%)
 rename Spigot-Server-Patches/{0264-Vanished-players-don-t-have-rights.patch => 0265-Vanished-players-don-t-have-rights.patch} (95%)
 rename Spigot-Server-Patches/{0265-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch => 0266-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch} (89%)
 rename Spigot-Server-Patches/{0266-Add-some-Debug-to-Chunk-Entity-slices.patch => 0267-Add-some-Debug-to-Chunk-Entity-slices.patch} (95%)
 rename Spigot-Server-Patches/{0267-EntityTransformedEvent.patch => 0268-EntityTransformedEvent.patch} (95%)
 rename Spigot-Server-Patches/{0268-SkeletonHorse-Additions.patch => 0269-SkeletonHorse-Additions.patch} (94%)
 rename Spigot-Server-Patches/{0269-Prevent-Saving-Bad-entities-to-chunks.patch => 0270-Prevent-Saving-Bad-entities-to-chunks.patch} (96%)
 rename Spigot-Server-Patches/{0270-Don-t-call-getItemMeta-on-hasItemMeta.patch => 0271-Don-t-call-getItemMeta-on-hasItemMeta.patch} (97%)
 rename Spigot-Server-Patches/{0271-Ignore-Dead-Entities-in-entityList-iteration.patch => 0272-Ignore-Dead-Entities-in-entityList-iteration.patch} (96%)
 rename Spigot-Server-Patches/{0272-Provide-option-to-use-a-versioned-world-folder-for-t.patch => 0273-Provide-option-to-use-a-versioned-world-folder-for-t.patch} (98%)
 rename Spigot-Server-Patches/{0273-MC-111480-Start-Entity-ID-s-at-1.patch => 0274-MC-111480-Start-Entity-ID-s-at-1.patch} (91%)
 rename Spigot-Server-Patches/{0274-Implement-Expanded-ArmorStand-API.patch => 0275-Implement-Expanded-ArmorStand-API.patch} (97%)
 rename Spigot-Server-Patches/{0275-AnvilDamageEvent.patch => 0276-AnvilDamageEvent.patch} (94%)
 rename Spigot-Server-Patches/{0276-Add-TNTPrimeEvent.patch => 0277-Add-TNTPrimeEvent.patch} (97%)
 rename Spigot-Server-Patches/{0277-Break-up-and-make-tab-spam-limits-configurable.patch => 0278-Break-up-and-make-tab-spam-limits-configurable.patch} (97%)
 rename Spigot-Server-Patches/{0278-Add-hand-to-bucket-events.patch => 0279-Add-hand-to-bucket-events.patch} (99%)
 rename Spigot-Server-Patches/{0279-MC-135506-Experience-should-save-as-Integers.patch => 0280-MC-135506-Experience-should-save-as-Integers.patch} (92%)
 rename Spigot-Server-Patches/{0280-Fix-client-rendering-skulls-from-same-user.patch => 0281-Fix-client-rendering-skulls-from-same-user.patch} (96%)
 rename Spigot-Server-Patches/{0281-Add-Early-Warning-Feature-to-WatchDog.patch => 0282-Add-Early-Warning-Feature-to-WatchDog.patch} (98%)
 rename Spigot-Server-Patches/{0282-Make-EnderDragon-implement-Mob.patch => 0283-Make-EnderDragon-implement-Mob.patch} (93%)
 rename Spigot-Server-Patches/{0283-Detect-and-repair-corrupt-Region-Files.patch => 0284-Detect-and-repair-corrupt-Region-Files.patch} (98%)
 rename Spigot-Server-Patches/{0284-Use-ConcurrentHashMap-in-JsonList.patch => 0285-Use-ConcurrentHashMap-in-JsonList.patch} (97%)
 rename Spigot-Server-Patches/{0285-Use-a-Queue-for-Queueing-Commands.patch => 0286-Use-a-Queue-for-Queueing-Commands.patch} (94%)
 rename Spigot-Server-Patches/{0286-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch => 0287-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch} (93%)
 rename Spigot-Server-Patches/{0287-Allow-disabling-armour-stand-ticking.patch => 0288-Allow-disabling-armour-stand-ticking.patch} (98%)
 rename Spigot-Server-Patches/{0288-Optimize-BlockPosition-helper-methods.patch => 0289-Optimize-BlockPosition-helper-methods.patch} (97%)
 rename Spigot-Server-Patches/{0289-Send-nearby-packets-from-world-player-list-not-serve.patch => 0290-Send-nearby-packets-from-world-player-list-not-serve.patch} (96%)
 rename Spigot-Server-Patches/{0290-Restore-vanlla-default-mob-spawn-range.patch => 0291-Restore-vanlla-default-mob-spawn-range.patch} (87%)
 rename Spigot-Server-Patches/{0291-Optimize-Hoppers.patch => 0292-Optimize-Hoppers.patch} (99%)
 rename Spigot-Server-Patches/{0292-Optimize-CraftBlockData-Creation.patch => 0293-Optimize-CraftBlockData-Creation.patch} (94%)
 rename Spigot-Server-Patches/{0293-Fix-MC-124320.patch => 0294-Fix-MC-124320.patch} (95%)
 rename Spigot-Server-Patches/{0294-Slime-Pathfinder-Events.patch => 0295-Slime-Pathfinder-Events.patch} (98%)
 rename Spigot-Server-Patches/{0295-Configurable-speed-for-water-flowing-over-lava.patch => 0296-Configurable-speed-for-water-flowing-over-lava.patch} (96%)
 rename Spigot-Server-Patches/{0296-Optimize-RegistryMaterials.patch => 0297-Optimize-RegistryMaterials.patch} (94%)
 rename Spigot-Server-Patches/{0297-Add-PhantomPreSpawnEvent.patch => 0298-Add-PhantomPreSpawnEvent.patch} (96%)
 rename Spigot-Server-Patches/{0298-Add-More-Creeper-API.patch => 0299-Add-More-Creeper-API.patch} (95%)
 rename Spigot-Server-Patches/{0299-Inventory-removeItemAnySlot.patch => 0300-Inventory-removeItemAnySlot.patch} (95%)
 rename Spigot-Server-Patches/{0300-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch => 0301-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch} (91%)
 rename Spigot-Server-Patches/{0301-Add-ray-tracing-methods-to-LivingEntity.patch => 0302-Add-ray-tracing-methods-to-LivingEntity.patch} (96%)
 rename Spigot-Server-Patches/{0302-Expose-attack-cooldown-methods-for-Player.patch => 0303-Expose-attack-cooldown-methods-for-Player.patch} (93%)
 rename Spigot-Server-Patches/{0303-Improve-death-events.patch => 0304-Improve-death-events.patch} (98%)
 rename Spigot-Server-Patches/{0304-Allow-chests-to-be-placed-with-NBT-data.patch => 0305-Allow-chests-to-be-placed-with-NBT-data.patch} (91%)
 rename Spigot-Server-Patches/{0305-Mob-Pathfinding-API.patch => 0306-Mob-Pathfinding-API.patch} (97%)
 rename Spigot-Server-Patches/{0306-Prevent-chunk-loading-from-Fluid-Flowing.patch => 0307-Prevent-chunk-loading-from-Fluid-Flowing.patch} (97%)
 rename Spigot-Server-Patches/{0307-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch => 0308-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch} (99%)
 rename Spigot-Server-Patches/{0308-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch => 0309-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch} (96%)
 rename Spigot-Server-Patches/{0309-Prevent-mob-spawning-from-loading-generating-chunks.patch => 0310-Prevent-mob-spawning-from-loading-generating-chunks.patch} (95%)
 rename Spigot-Server-Patches/{0310-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch => 0311-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch} (96%)
 rename Spigot-Server-Patches/{0311-Implement-furnace-cook-speed-multiplier-API.patch => 0312-Implement-furnace-cook-speed-multiplier-API.patch} (96%)
 rename Spigot-Server-Patches/{0312-Support-Overriding-World-Seeds.patch => 0313-Support-Overriding-World-Seeds.patch} (96%)
 rename Spigot-Server-Patches/{0313-Optimize-Server-World-Map.patch => 0314-Optimize-Server-World-Map.patch} (98%)
 rename Spigot-Server-Patches/{0314-PreSpawnerSpawnEvent.patch => 0315-PreSpawnerSpawnEvent.patch} (94%)
 rename Spigot-Server-Patches/{0315-Catch-JsonParseException-in-Entity-and-TE-names.patch => 0316-Catch-JsonParseException-in-Entity-and-TE-names.patch} (95%)
 rename Spigot-Server-Patches/{0316-Avoid-dimension-id-collisions.patch => 0317-Avoid-dimension-id-collisions.patch} (91%)
 rename Spigot-Server-Patches/{0317-Honor-EntityAgeable.ageLock.patch => 0318-Honor-EntityAgeable.ageLock.patch} (86%)
 rename Spigot-Server-Patches/{0318-Configurable-connection-throttle-kick-message.patch => 0319-Configurable-connection-throttle-kick-message.patch} (94%)
 rename Spigot-Server-Patches/{0319-Hook-into-CB-plugin-rewrites.patch => 0320-Hook-into-CB-plugin-rewrites.patch} (98%)
 rename Spigot-Server-Patches/{0320-Allow-setting-the-vex-s-summoner.patch => 0321-Allow-setting-the-vex-s-summoner.patch} (90%)
 rename Spigot-Server-Patches/{0321-Add-sun-related-API.patch => 0322-Add-sun-related-API.patch} (91%)
 rename Spigot-Server-Patches/{0322-Check-Drowned-for-Villager-Aggression-Config.patch => 0323-Check-Drowned-for-Villager-Aggression-Config.patch} (93%)
 rename Spigot-Server-Patches/{0323-Here-s-Johnny.patch => 0324-Here-s-Johnny.patch} (92%)
 rename Spigot-Server-Patches/{0324-Turtle-API.patch => 0325-Turtle-API.patch} (98%)
 rename Spigot-Server-Patches/{0325-Limit-lightning-strike-effect-distance.patch => 0326-Limit-lightning-strike-effect-distance.patch} (96%)
 rename Spigot-Server-Patches/{0326-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch => 0327-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch} (94%)
 rename Spigot-Server-Patches/{0327-Call-player-spectator-target-events.patch => 0328-Call-player-spectator-target-events.patch} (96%)
 rename Spigot-Server-Patches/{0328-Add-Velocity-IP-Forwarding-Support.patch => 0329-Add-Velocity-IP-Forwarding-Support.patch} (97%)
 rename Spigot-Server-Patches/{0329-Add-more-Witch-API.patch => 0330-Add-more-Witch-API.patch} (98%)
 rename Spigot-Server-Patches/{0330-Fix-MC-93764.patch => 0331-Fix-MC-93764.patch} (86%)
 rename Spigot-Server-Patches/{0331-Add-option-to-prevent-players-from-moving-into-unloa.patch => 0332-Add-option-to-prevent-players-from-moving-into-unloa.patch} (96%)
 rename Spigot-Server-Patches/{0332-Reset-players-airTicks-on-respawn.patch => 0333-Reset-players-airTicks-on-respawn.patch} (89%)
 rename Spigot-Server-Patches/{0333-Strip-private-area-unicode-characters-from-signs.patch => 0334-Strip-private-area-unicode-characters-from-signs.patch} (97%)
 rename Spigot-Server-Patches/{0334-Don-t-sleep-after-profile-lookups-if-not-needed.patch => 0335-Don-t-sleep-after-profile-lookups-if-not-needed.patch} (94%)
 rename Spigot-Server-Patches/{0335-Use-more-reasonable-thread-count-default-for-bootstr.patch => 0336-Use-more-reasonable-thread-count-default-for-bootstr.patch} (89%)
 rename Spigot-Server-Patches/{0336-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch => 0337-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch} (94%)
 rename Spigot-Server-Patches/{0337-Optimize-World-Time-Updates.patch => 0338-Optimize-World-Time-Updates.patch} (96%)
 rename Spigot-Server-Patches/{0338-Restore-custom-InventoryHolder-support.patch => 0339-Restore-custom-InventoryHolder-support.patch} (95%)
 rename Spigot-Server-Patches/{0339-Use-Vanilla-Minecart-Speeds.patch => 0340-Use-Vanilla-Minecart-Speeds.patch} (91%)
 rename Spigot-Server-Patches/{0340-Fix-SpongeAbsortEvent-handling.patch => 0341-Fix-SpongeAbsortEvent-handling.patch} (93%)
 rename Spigot-Server-Patches/{0341-Don-t-allow-digging-into-unloaded-chunks.patch => 0342-Don-t-allow-digging-into-unloaded-chunks.patch} (91%)
 rename Spigot-Server-Patches/{0342-Optimize-redstone-algorithm.patch => 0343-Optimize-redstone-algorithm.patch} (99%)
 rename Spigot-Server-Patches/{0343-force-entity-dismount-during-teleportation.patch => 0344-force-entity-dismount-during-teleportation.patch} (96%)
 rename Spigot-Server-Patches/{0344-Book-Size-Limits.patch => 0345-Book-Size-Limits.patch} (96%)
 rename Spigot-Server-Patches/{0345-Make-the-default-permission-message-configurable.patch => 0346-Make-the-default-permission-message-configurable.patch} (94%)
 rename Spigot-Server-Patches/{0346-Add-more-Zombie-API.patch => 0347-Add-more-Zombie-API.patch} (96%)
 rename Spigot-Server-Patches/{0347-Prevent-rayTrace-from-loading-chunks.patch => 0348-Prevent-rayTrace-from-loading-chunks.patch} (93%)
 rename Spigot-Server-Patches/{0348-Handle-Large-Packets-disconnecting-client.patch => 0349-Handle-Large-Packets-disconnecting-client.patch} (95%)
 rename Spigot-Server-Patches/{0349-Lazy-init-world-storage-in-CraftOfflinePlayer.patch => 0350-Lazy-init-world-storage-in-CraftOfflinePlayer.patch} (96%)
 rename Spigot-Server-Patches/{0350-Add-PlayerConnectionCloseEvent.patch => 0351-Add-PlayerConnectionCloseEvent.patch} (97%)
 rename Spigot-Server-Patches/{0351-Prevent-Enderman-from-loading-chunks.patch => 0352-Prevent-Enderman-from-loading-chunks.patch} (95%)
 rename Spigot-Server-Patches/{0352-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch => 0353-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch} (96%)
 rename Spigot-Server-Patches/{0353-Fix-PlayerEditBookEvent.patch => 0354-Fix-PlayerEditBookEvent.patch} (94%)
 rename Spigot-Server-Patches/{0354-Workaround-for-vehicle-tracking-issue-on-disconnect.patch => 0355-Workaround-for-vehicle-tracking-issue-on-disconnect.patch} (90%)
 rename Spigot-Server-Patches/{0355-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch => 0356-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch} (96%)
 rename Spigot-Server-Patches/{0356-Block-Entity-remove-from-being-called-on-Players.patch => 0357-Block-Entity-remove-from-being-called-on-Players.patch} (93%)
 rename Spigot-Server-Patches/{0357-Allow-Saving-of-Oversized-Chunks.patch => 0358-Allow-Saving-of-Oversized-Chunks.patch} (99%)
 rename Spigot-Server-Patches/{0358-BlockDestroyEvent.patch => 0359-BlockDestroyEvent.patch} (95%)
 rename Spigot-Server-Patches/{0359-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch => 0360-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch} (96%)
 rename Spigot-Server-Patches/{0360-Fix-sign-edit-memory-leak.patch => 0361-Fix-sign-edit-memory-leak.patch} (94%)
 rename Spigot-Server-Patches/{0361-Limit-Client-Sign-length-more.patch => 0362-Limit-Client-Sign-length-more.patch} (96%)
 rename Spigot-Server-Patches/{0362-Don-t-check-ConvertSigns-boolean-every-sign-save.patch => 0363-Don-t-check-ConvertSigns-boolean-every-sign-save.patch} (93%)
 rename Spigot-Server-Patches/{0363-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch => 0364-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch} (95%)
 rename Spigot-Server-Patches/{0364-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch => 0365-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch} (95%)
 rename Spigot-Server-Patches/{0365-Set-Zombie-last-tick-at-start-of-drowning-process.patch => 0366-Set-Zombie-last-tick-at-start-of-drowning-process.patch} (89%)
 rename Spigot-Server-Patches/{0366-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch => 0367-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch} (87%)
 rename Spigot-Server-Patches/{0367-Add-LivingEntity-getTargetEntity.patch => 0368-Add-LivingEntity-getTargetEntity.patch} (96%)
 rename Spigot-Server-Patches/{0368-Use-proper-max-length-when-serialising-BungeeCord-te.patch => 0369-Use-proper-max-length-when-serialising-BungeeCord-te.patch} (94%)
 rename Spigot-Server-Patches/{0369-Entity-getEntitySpawnReason.patch => 0370-Entity-getEntitySpawnReason.patch} (96%)
 rename Spigot-Server-Patches/{0370-Update-entity-Metadata-for-all-tracked-players.patch => 0371-Update-entity-Metadata-for-all-tracked-players.patch} (92%)
 rename Spigot-Server-Patches/{0371-Fire-event-on-GS4-query.patch => 0372-Fire-event-on-GS4-query.patch} (98%)
 rename Spigot-Server-Patches/{0372-Implement-PlayerPostRespawnEvent.patch => 0373-Implement-PlayerPostRespawnEvent.patch} (95%)
 rename Spigot-Server-Patches/{0373-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch => 0374-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch} (93%)
 rename Spigot-Server-Patches/{0374-Implement-getters-and-setters-for-EntityItem-owner-a.patch => 0375-Implement-getters-and-setters-for-EntityItem-owner-a.patch} (93%)
 rename Spigot-Server-Patches/{0375-Server-Tick-Events.patch => 0376-Server-Tick-Events.patch} (93%)
 rename Spigot-Server-Patches/{0376-PlayerDeathEvent-getItemsToKeep.patch => 0377-PlayerDeathEvent-getItemsToKeep.patch} (96%)
 rename Spigot-Server-Patches/{0377-Optimize-Persistent-Data-Loading.patch => 0378-Optimize-Persistent-Data-Loading.patch} (96%)
 rename Spigot-Server-Patches/{0378-Allow-login-events-to-fire-only-after-the-server-plu.patch => 0379-Allow-login-events-to-fire-only-after-the-server-plu.patch} (95%)
 rename Spigot-Server-Patches/{0379-Make-region-files-more-reliable-to-write-to.patch => 0380-Make-region-files-more-reliable-to-write-to.patch} (98%)
 rename Spigot-Server-Patches/{0380-Optimize-GameRules-to-use-LinkedHashMap.patch => 0381-Optimize-GameRules-to-use-LinkedHashMap.patch} (96%)
 rename Spigot-Server-Patches/{0381-Optimize-Captured-TileEntity-Lookup.patch => 0382-Optimize-Captured-TileEntity-Lookup.patch} (93%)
 rename Spigot-Server-Patches/{0382-Add-Heightmap-API.patch => 0383-Add-Heightmap-API.patch} (94%)
 rename Spigot-Server-Patches/{0383-Handle-bad-chunks-more-gracefully.patch => 0384-Handle-bad-chunks-more-gracefully.patch} (96%)
 rename Spigot-Server-Patches/{0384-Mob-Spawner-API-Enhancements.patch => 0385-Mob-Spawner-API-Enhancements.patch} (97%)
 rename Spigot-Server-Patches/{0385-Per-Player-View-Distance-API-placeholders.patch => 0386-Per-Player-View-Distance-API-placeholders.patch} (95%)
 rename Spigot-Server-Patches/{0386-Async-Chunk-placeholder.patch => 0387-Async-Chunk-placeholder.patch} (96%)
 rename Spigot-Server-Patches/{0387-Fix-CB-call-to-changed-postToMainThread-method.patch => 0388-Fix-CB-call-to-changed-postToMainThread-method.patch} (88%)
 rename Spigot-Server-Patches/{0388-Fix-sounds-when-item-frames-are-modified-MC-123450.patch => 0389-Fix-sounds-when-item-frames-are-modified-MC-123450.patch} (92%)
 rename Spigot-Server-Patches/{0389-Fix-MC-151674-Close-RegionFiles-when-they-get-evicte.patch => 0390-Fix-MC-151674-Close-RegionFiles-when-they-get-evicte.patch} (89%)
 rename Spigot-Server-Patches/{0390-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch => 0391-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch} (93%)
 rename Spigot-Server-Patches/{0391-Elide-lock-in-DataWatcher.patch => 0392-Elide-lock-in-DataWatcher.patch} (98%)
 rename Spigot-Server-Patches/{0392-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch => 0393-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch} (95%)
 rename Spigot-Server-Patches/{0393-Duplicate-UUID-Resolve-Option.patch => 0394-Duplicate-UUID-Resolve-Option.patch} (98%)
 rename Spigot-Server-Patches/{0394-improve-CraftWorld-isChunkLoaded.patch => 0395-improve-CraftWorld-isChunkLoaded.patch} (91%)
 rename Spigot-Server-Patches/{0395-Configurable-Keep-Spawn-Loaded-range-per-world.patch => 0396-Configurable-Keep-Spawn-Loaded-range-per-world.patch} (96%)
 rename Spigot-Server-Patches/{0396-Fix-some-generation-concurrency-issues.patch => 0397-Fix-some-generation-concurrency-issues.patch} (98%)

diff --git a/Spigot-API-Patches/0008-Check-Paper-versions.patch b/Spigot-API-Patches/0008-Check-Paper-versions.patch
deleted file mode 100644
index 78ab4f4e0c..0000000000
--- a/Spigot-API-Patches/0008-Check-Paper-versions.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-From e3823b8eaaa1f54104e13a283aab7a682fdb6cdb Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Mon, 29 Feb 2016 17:58:01 -0600
-Subject: [PATCH] Check Paper versions
-
-
-diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-index cbce52444..4f9042e23 100644
---- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-+++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-@@ -25,6 +25,14 @@ import org.bukkit.plugin.PluginDescriptionFile;
- import org.bukkit.util.StringUtil;
- import org.jetbrains.annotations.NotNull;
- 
-+// Paper start
-+import java.io.InputStreamReader;
-+import java.net.HttpURLConnection;
-+import org.json.simple.JSONObject;
-+import org.json.simple.parser.JSONParser;
-+import org.json.simple.parser.ParseException;
-+// Paper end
-+
- public class VersionCommand extends BukkitCommand {
-     public VersionCommand(@NotNull String name) {
-         super(name);
-@@ -150,7 +158,7 @@ public class VersionCommand extends BukkitCommand {
- 
-     private void sendVersion(@NotNull CommandSender sender) {
-         if (hasVersion) {
--            if (System.currentTimeMillis() - lastCheck > 21600000) {
-+            if (System.currentTimeMillis() - lastCheck > 7200000) { // Paper - Lower to 2 hours
-                 lastCheck = System.currentTimeMillis();
-                 hasVersion = false;
-             } else {
-@@ -181,24 +189,28 @@ public class VersionCommand extends BukkitCommand {
-         }
-     }
- 
-+    // Paper start
-     private void obtainVersion() {
-         String version = Bukkit.getVersion();
-         if (version == null) version = "Custom";
--        if (version.startsWith("git-Spigot-")) {
--            String[] parts = version.substring("git-Spigot-".length()).split("-");
--            int cbVersions = getDistance("craftbukkit", parts[1].substring(0, parts[1].indexOf(' ')));
--            int spigotVersions = getDistance("spigot", parts[0]);
--            if (cbVersions == -1 || spigotVersions == -1) {
--                setVersionMessage("Error obtaining version information");
--            } else {
--                if (cbVersions == 0 && spigotVersions == 0) {
-+        if (version.startsWith("git-Paper-")) {
-+            String[] parts = version.substring("git-Paper-".length()).split("[-\\s]");
-+            int distance = getDistance(null, parts[0]);
-+            switch (distance) {
-+                case -1:
-+                    setVersionMessage("Error obtaining version information");
-+                    break;
-+                case 0:
-                     setVersionMessage("You are running the latest version");
--                } else {
--                    setVersionMessage("You are " + (cbVersions + spigotVersions) + " version(s) behind");
--                }
-+                    break;
-+                case -2:
-+                    setVersionMessage("Unknown version");
-+                    break;
-+                default:
-+                    setVersionMessage("You are " + distance + " version(s) behind");
-             }
--
-         } else if (version.startsWith("git-Bukkit-")) {
-+            // Paper end
-             version = version.substring("git-Bukkit-".length());
-             int cbVersions = getDistance("craftbukkit", version.substring(0, version.indexOf(' ')));
-             if (cbVersions == -1) {
-@@ -231,8 +243,16 @@ public class VersionCommand extends BukkitCommand {
-         }
-     }
- 
--    private static int getDistance(@NotNull String repo, @NotNull String hash) {
-+    // Paper start
-+    private static int getDistance(@NotNull String repo, @NotNull String verInfo) {
-         try {
-+            int currentVer = Integer.decode(verInfo);
-+            return getFromJenkins(currentVer);
-+        } catch (NumberFormatException ex) {
-+            verInfo = verInfo.replace("\"", "");
-+            return getFromRepo("PaperMC/Paper", "master", verInfo);
-+        }
-+            /*
-             BufferedReader reader = Resources.asCharSource(
-                     new URL("https://hub.spigotmc.org/stash/rest/api/1.0/projects/SPIGOT/repos/" + repo + "/commits?since=" + URLEncoder.encode(hash, "UTF-8") + "&withCounts=true"),
-                     Charsets.UTF_8
-@@ -246,9 +266,57 @@ public class VersionCommand extends BukkitCommand {
-             } finally {
-                 reader.close();
-             }
-+            */
-+    }
-+
-+    private static int getFromJenkins(int currentVer) {
-+        try {
-+            BufferedReader reader = Resources.asCharSource(
-+                    new URL("https://ci.destroystokyo.com/job/Paper-1.14/lastSuccessfulBuild/buildNumber"), // Paper
-+                    Charsets.UTF_8
-+            ).openBufferedStream();
-+            try {
-+                int newVer = Integer.decode(reader.readLine());
-+                return newVer - currentVer;
-+            } catch (NumberFormatException ex) {
-+                ex.printStackTrace();
-+                return -2;
-+            } finally {
-+                reader.close();
-+            }
-+        } catch (IOException e) {
-+            e.printStackTrace();
-+            return -1;
-+        }
-+    }
-+
-+    // Contributed by Techcable <Techcable@outlook.com> in GH PR #65
-+    private static int getFromRepo(String repo, String branch, String hash) {
-+        try {
-+            HttpURLConnection connection = (HttpURLConnection) new URL("https://api.github.com/repos/" + repo + "/compare/" + branch + "..." + hash).openConnection();
-+            connection.connect();
-+            if (connection.getResponseCode() == HttpURLConnection.HTTP_NOT_FOUND) return -2; // Unknown commit
-+            try (
-+                    BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream(), Charsets.UTF_8))
-+            ) {
-+                JSONObject obj = (JSONObject) new JSONParser().parse(reader);
-+                String status = (String) obj.get("status");
-+                switch (status) {
-+                    case "identical":
-+                        return 0;
-+                    case "behind":
-+                        return ((Number) obj.get("behind_by")).intValue();
-+                    default:
-+                        return -1;
-+                }
-+            } catch (ParseException | NumberFormatException e) {
-+                e.printStackTrace();
-+                return -1;
-+            }
-         } catch (IOException e) {
-             e.printStackTrace();
-             return -1;
-         }
-     }
-+    // Paper end
- }
--- 
-2.21.0
-
diff --git a/Spigot-API-Patches/0008-Version-Command-2.0.patch b/Spigot-API-Patches/0008-Version-Command-2.0.patch
new file mode 100644
index 0000000000..25fe82f9a0
--- /dev/null
+++ b/Spigot-API-Patches/0008-Version-Command-2.0.patch
@@ -0,0 +1,180 @@
+From b96066e41b3d03c005b1e571dd042769b787725c Mon Sep 17 00:00:00 2001
+From: Zach Brown <zach@zachbr.io>
+Date: Mon, 27 May 2019 01:10:06 -0500
+Subject: [PATCH] Version Command 2.0
+
+
+diff --git a/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java b/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java
+new file mode 100644
+index 00000000..2a265129
+--- /dev/null
++++ b/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java
+@@ -0,0 +1,44 @@
++package com.destroystokyo.paper.util;
++
++import org.bukkit.Bukkit;
++import org.jetbrains.annotations.NotNull;
++
++public interface VersionFetcher {
++    /**
++     * Amount of time to cache results for in milliseconds
++     * <p>
++     * Negative values will never cache.
++     *
++     * @return cache time
++     */
++    long getCacheTime();
++
++    /**
++     * Gets the version message to cache and show to command senders. Multiple messages can be sent using newlines (\n)
++     * in the string. The string will be split on these newlines and sent as individual messages.
++     * <p>
++     * NOTE: This is run in a new thread separate from that of the command processing thread
++     *
++     * @param serverVersion the current version of the server (will match {@link Bukkit#getVersion()})
++     * @return the message to show when requesting a version
++     */
++    @NotNull
++    String getVersionMessage(@NotNull String serverVersion);
++
++    class DummyVersionFetcher implements VersionFetcher {
++
++        @Override
++        public long getCacheTime() {
++            return -1;
++        }
++
++        @NotNull
++        @Override
++        public String getVersionMessage(@NotNull String serverVersion) {
++            Bukkit.getLogger().warning("Version provider has not been set, cannot check for updates!");
++            Bukkit.getLogger().info("Override the default implementation of org.bukkit.UnsafeValues#getVersionFetcher()");
++            new Throwable().printStackTrace();
++            return "Unable to check for updates. No version provider set.";
++        }
++    }
++}
+diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
+index 72c5501e..c0ff133d 100644
+--- a/src/main/java/org/bukkit/UnsafeValues.java
++++ b/src/main/java/org/bukkit/UnsafeValues.java
+@@ -76,5 +76,12 @@ public interface UnsafeValues {
+      * @return name
+      */
+     String getTimingsServerName();
++
++    /**
++     * Called once by the version command on first use, then cached.
++     */
++    default com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
++        return new com.destroystokyo.paper.util.VersionFetcher.DummyVersionFetcher();
++    }
+     // Paper end
+ }
+diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
+index cbce5244..0486abd1 100644
+--- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
++++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
+@@ -1,5 +1,6 @@
+ package org.bukkit.command.defaults;
+ 
++import com.destroystokyo.paper.util.VersionFetcher; // Paper - version supplier
+ import com.google.common.base.Charsets;
+ import com.google.common.collect.ImmutableList;
+ import com.google.common.io.Resources;
+@@ -26,6 +27,15 @@ import org.bukkit.util.StringUtil;
+ import org.jetbrains.annotations.NotNull;
+ 
+ public class VersionCommand extends BukkitCommand {
++    private VersionFetcher versionFetcher;
++    private VersionFetcher getVersionFetcher() { // lazy load because unsafe isn't available at command registration
++        if (versionFetcher == null) {
++            versionFetcher = Bukkit.getUnsafe().getVersionFetcher();
++        }
++
++        return versionFetcher;
++    }
++
+     public VersionCommand(@NotNull String name) {
+         super(name);
+ 
+@@ -150,18 +160,18 @@ public class VersionCommand extends BukkitCommand {
+ 
+     private void sendVersion(@NotNull CommandSender sender) {
+         if (hasVersion) {
+-            if (System.currentTimeMillis() - lastCheck > 21600000) {
++            if (System.currentTimeMillis() - lastCheck > getVersionFetcher().getCacheTime()) { // Paper - use version supplier
+                 lastCheck = System.currentTimeMillis();
+                 hasVersion = false;
+             } else {
+-                sender.sendMessage(versionMessage);
++                sendMessages(versionMessage, sender); // Paper - allow \n for multiple messages
+                 return;
+             }
+         }
+         versionLock.lock();
+         try {
+             if (hasVersion) {
+-                sender.sendMessage(versionMessage);
++                sendMessages(versionMessage, sender); // Paper - allow \n for multiple messages
+                 return;
+             }
+             versionWaiters.add(sender);
+@@ -183,7 +193,12 @@ public class VersionCommand extends BukkitCommand {
+ 
+     private void obtainVersion() {
+         String version = Bukkit.getVersion();
+-        if (version == null) version = "Custom";
++        // Paper start
++        if (version.startsWith("null")) { // running from ide?
++            setVersionMessage("Unknown version, custom build?");
++            return;
++        }
++        /*
+         if (version.startsWith("git-Spigot-")) {
+             String[] parts = version.substring("git-Spigot-".length()).split("-");
+             int cbVersions = getDistance("craftbukkit", parts[1].substring(0, parts[1].indexOf(' ')));
+@@ -213,6 +228,9 @@ public class VersionCommand extends BukkitCommand {
+         } else {
+             setVersionMessage("Unknown version, custom build?");
+         }
++         */
++        setVersionMessage(getVersionFetcher().getVersionMessage(version));
++        // Paper end
+     }
+ 
+     private void setVersionMessage(@NotNull String msg) {
+@@ -222,8 +240,13 @@ public class VersionCommand extends BukkitCommand {
+         try {
+             hasVersion = true;
+             versionTaskStarted = false;
++            // Paper - allow \n for multiple messages
++            String[] messages = versionMessage.split("\n");
+             for (CommandSender sender : versionWaiters) {
+-                sender.sendMessage(versionMessage);
++                for (String message : messages) {
++                    sender.sendMessage(message);
++                }
++                // Paper end
+             }
+             versionWaiters.clear();
+         } finally {
+@@ -231,6 +254,15 @@ public class VersionCommand extends BukkitCommand {
+         }
+     }
+ 
++    // Paper start
++    private void sendMessages(String toSplit, CommandSender target) {
++        String[] messages = toSplit.split("\n");
++        for (String message : messages) {
++            target.sendMessage(message);
++        }
++    }
++    // Paper end
++
+     private static int getDistance(@NotNull String repo, @NotNull String hash) {
+         try {
+             BufferedReader reader = Resources.asCharSource(
+-- 
+2.21.0
+
diff --git a/Spigot-API-Patches/0093-Add-Ban-Methods-to-Player-Objects.patch b/Spigot-API-Patches/0092-Add-Ban-Methods-to-Player-Objects.patch
similarity index 98%
rename from Spigot-API-Patches/0093-Add-Ban-Methods-to-Player-Objects.patch
rename to Spigot-API-Patches/0092-Add-Ban-Methods-to-Player-Objects.patch
index eb79126748..dd99a608bf 100644
--- a/Spigot-API-Patches/0093-Add-Ban-Methods-to-Player-Objects.patch
+++ b/Spigot-API-Patches/0092-Add-Ban-Methods-to-Player-Objects.patch
@@ -1,4 +1,4 @@
-From 5448fd27d7cab4be6ee7feed8c87aabfe2044a5c Mon Sep 17 00:00:00 2001
+From a1b55ca0684c1e96cb4416abf7f5531e2c20c2f0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 28 Apr 2018 10:28:50 -0400
 Subject: [PATCH] Add Ban Methods to Player Objects
@@ -74,7 +74,7 @@ index ffc8ad37..222a9a7b 100644
      /**
       * Checks if this player is whitelisted or not
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 8f87b165..214fe2d9 100644
+index ff799ac7..32dc1f86 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1,10 +1,15 @@
diff --git a/Spigot-API-Patches/0094-EndermanEscapeEvent.patch b/Spigot-API-Patches/0093-EndermanEscapeEvent.patch
similarity index 97%
rename from Spigot-API-Patches/0094-EndermanEscapeEvent.patch
rename to Spigot-API-Patches/0093-EndermanEscapeEvent.patch
index e084786675..f3485bf720 100644
--- a/Spigot-API-Patches/0094-EndermanEscapeEvent.patch
+++ b/Spigot-API-Patches/0093-EndermanEscapeEvent.patch
@@ -1,4 +1,4 @@
-From e85a57a343deaa2b201b07c39b29222ed9e73183 Mon Sep 17 00:00:00 2001
+From c1828ab1f99a94ec3c39f3aba13319f44cc2e7e4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 13:14:30 -0400
 Subject: [PATCH] EndermanEscapeEvent
diff --git a/Spigot-API-Patches/0095-Enderman.teleportRandomly.patch b/Spigot-API-Patches/0094-Enderman.teleportRandomly.patch
similarity index 93%
rename from Spigot-API-Patches/0095-Enderman.teleportRandomly.patch
rename to Spigot-API-Patches/0094-Enderman.teleportRandomly.patch
index ef76318c03..a336b64729 100644
--- a/Spigot-API-Patches/0095-Enderman.teleportRandomly.patch
+++ b/Spigot-API-Patches/0094-Enderman.teleportRandomly.patch
@@ -1,4 +1,4 @@
-From aa578a25fb86af68606e853a0d32821d979fce4c Mon Sep 17 00:00:00 2001
+From 2a517ba291f4bce720c9c721a8a9a350741d6e80 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 13:29:15 -0400
 Subject: [PATCH] Enderman.teleportRandomly()
diff --git a/Spigot-API-Patches/0096-Additional-world.getNearbyEntities-API-s.patch b/Spigot-API-Patches/0095-Additional-world.getNearbyEntities-API-s.patch
similarity index 99%
rename from Spigot-API-Patches/0096-Additional-world.getNearbyEntities-API-s.patch
rename to Spigot-API-Patches/0095-Additional-world.getNearbyEntities-API-s.patch
index 6b09907837..02e00d34dd 100644
--- a/Spigot-API-Patches/0096-Additional-world.getNearbyEntities-API-s.patch
+++ b/Spigot-API-Patches/0095-Additional-world.getNearbyEntities-API-s.patch
@@ -1,4 +1,4 @@
-From 69b1739f71d3210dcf61ff3cdded512a9830b2dd Mon Sep 17 00:00:00 2001
+From 69bf5e553110fa957385964199ece616895b9469 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 17:55:28 -0400
 Subject: [PATCH] Additional world.getNearbyEntities API's
@@ -6,7 +6,7 @@ Subject: [PATCH] Additional world.getNearbyEntities API's
 Provides more methods to get nearby entities, and filter by types and predicates
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index d8d42c84..bcf5f8aa 100644
+index 2fe46faf..e1e674ba 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -1,6 +1,9 @@
diff --git a/Spigot-API-Patches/0097-Location.isChunkLoaded-API.patch b/Spigot-API-Patches/0096-Location.isChunkLoaded-API.patch
similarity index 91%
rename from Spigot-API-Patches/0097-Location.isChunkLoaded-API.patch
rename to Spigot-API-Patches/0096-Location.isChunkLoaded-API.patch
index 8816ff3f3c..2dae096ee7 100644
--- a/Spigot-API-Patches/0097-Location.isChunkLoaded-API.patch
+++ b/Spigot-API-Patches/0096-Location.isChunkLoaded-API.patch
@@ -1,4 +1,4 @@
-From d13ee63c08c1eab492e1863506f5882e9d18c061 Mon Sep 17 00:00:00 2001
+From 947a4656a70657d309ba4c02c36a3b5277d5d4c6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 19:27:31 -0400
 Subject: [PATCH] Location.isChunkLoaded() API
diff --git a/Spigot-API-Patches/0098-Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch
similarity index 99%
rename from Spigot-API-Patches/0098-Expand-World.spawnParticle-API-and-add-Builder.patch
rename to Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch
index f31c8cdfed..6bcf5129bd 100644
--- a/Spigot-API-Patches/0098-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch
@@ -1,4 +1,4 @@
-From 3f6946a1734c78e66bc72254d58abd3fee9bbb88 Mon Sep 17 00:00:00 2001
+From b1e61a261f80eb5ec6ab010c0a9695ddfcd071a7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 29 Aug 2017 23:58:48 -0400
 Subject: [PATCH] Expand World.spawnParticle API and add Builder
@@ -10,7 +10,7 @@ This adds a new Builder API which is much friendlier to use.
 
 diff --git a/src/main/java/com/destroystokyo/paper/ParticleBuilder.java b/src/main/java/com/destroystokyo/paper/ParticleBuilder.java
 new file mode 100644
-index 000000000..06f1602f5
+index 00000000..06f1602f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/ParticleBuilder.java
 @@ -0,0 +1,478 @@
@@ -493,7 +493,7 @@ index 000000000..06f1602f5
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java
-index 68cb74420..69aae30a3 100644
+index 68cb7442..69aae30a 100644
 --- a/src/main/java/org/bukkit/Particle.java
 +++ b/src/main/java/org/bukkit/Particle.java
 @@ -92,6 +92,17 @@ public enum Particle {
@@ -515,7 +515,7 @@ index 68cb74420..69aae30a3 100644
       * Options which can be applied to redstone dust particles - a particle
       * color and size.
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index e1e674bab..fbd61137d 100644
+index e1e674ba..fbd61137 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -2081,7 +2081,57 @@ public interface World extends PluginMessageRecipient, Metadatable {
diff --git a/Spigot-API-Patches/0099-EndermanAttackPlayerEvent.patch b/Spigot-API-Patches/0098-EndermanAttackPlayerEvent.patch
similarity index 98%
rename from Spigot-API-Patches/0099-EndermanAttackPlayerEvent.patch
rename to Spigot-API-Patches/0098-EndermanAttackPlayerEvent.patch
index b5ce8bfe2c..1808f165b8 100644
--- a/Spigot-API-Patches/0099-EndermanAttackPlayerEvent.patch
+++ b/Spigot-API-Patches/0098-EndermanAttackPlayerEvent.patch
@@ -1,4 +1,4 @@
-From 09083fb373c14a78dc46902e3ddb2763e23f4fea Mon Sep 17 00:00:00 2001
+From c773ef768d279a34cf0da370b4de5b0bf3347559 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 May 2018 20:17:44 -0400
 Subject: [PATCH] EndermanAttackPlayerEvent
diff --git a/Spigot-API-Patches/0100-Close-Plugin-Class-Loaders-on-Disable.patch b/Spigot-API-Patches/0099-Close-Plugin-Class-Loaders-on-Disable.patch
similarity index 98%
rename from Spigot-API-Patches/0100-Close-Plugin-Class-Loaders-on-Disable.patch
rename to Spigot-API-Patches/0099-Close-Plugin-Class-Loaders-on-Disable.patch
index 7e7e5b083d..b33dc193fa 100644
--- a/Spigot-API-Patches/0100-Close-Plugin-Class-Loaders-on-Disable.patch
+++ b/Spigot-API-Patches/0099-Close-Plugin-Class-Loaders-on-Disable.patch
@@ -1,4 +1,4 @@
-From 11d55b78c68da025428c3e85a7bb0fef49112c82 Mon Sep 17 00:00:00 2001
+From 63f352493cf36bf80eb1d97a0ea3d897b5766bd3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 May 2018 21:33:35 -0400
 Subject: [PATCH] Close Plugin Class Loaders on Disable
diff --git a/Spigot-API-Patches/0101-WitchConsumePotionEvent.patch b/Spigot-API-Patches/0100-WitchConsumePotionEvent.patch
similarity index 98%
rename from Spigot-API-Patches/0101-WitchConsumePotionEvent.patch
rename to Spigot-API-Patches/0100-WitchConsumePotionEvent.patch
index 474eba4f88..1465f0ad88 100644
--- a/Spigot-API-Patches/0101-WitchConsumePotionEvent.patch
+++ b/Spigot-API-Patches/0100-WitchConsumePotionEvent.patch
@@ -1,4 +1,4 @@
-From 8ad457fe22064cb95a98d944c39b121fa5d5e9f7 Mon Sep 17 00:00:00 2001
+From e454efd84631216d67774e33cabd7cd2e823447f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 16 May 2018 20:26:16 -0400
 Subject: [PATCH] WitchConsumePotionEvent
diff --git a/Spigot-API-Patches/0102-WitchThrowPotionEvent.patch b/Spigot-API-Patches/0101-WitchThrowPotionEvent.patch
similarity index 97%
rename from Spigot-API-Patches/0102-WitchThrowPotionEvent.patch
rename to Spigot-API-Patches/0101-WitchThrowPotionEvent.patch
index f71ef2b60a..3e85db0fb4 100644
--- a/Spigot-API-Patches/0102-WitchThrowPotionEvent.patch
+++ b/Spigot-API-Patches/0101-WitchThrowPotionEvent.patch
@@ -1,4 +1,4 @@
-From fc6b5dba1f829790033dc13af8176268da944946 Mon Sep 17 00:00:00 2001
+From 5183d6aa6a230ae1cad69fd2a54589f6b82dfee0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 16 May 2018 20:39:09 -0400
 Subject: [PATCH] WitchThrowPotionEvent
diff --git a/Spigot-API-Patches/0103-Location.toBlockLocation-toCenterLocation.patch b/Spigot-API-Patches/0102-Location.toBlockLocation-toCenterLocation.patch
similarity index 95%
rename from Spigot-API-Patches/0103-Location.toBlockLocation-toCenterLocation.patch
rename to Spigot-API-Patches/0102-Location.toBlockLocation-toCenterLocation.patch
index b41a9e5191..9795f5ff97 100644
--- a/Spigot-API-Patches/0103-Location.toBlockLocation-toCenterLocation.patch
+++ b/Spigot-API-Patches/0102-Location.toBlockLocation-toCenterLocation.patch
@@ -1,4 +1,4 @@
-From 08b2440a26eb1424573216f76e56d4c64423b8b6 Mon Sep 17 00:00:00 2001
+From bf76c03cf7730ea8d7f3ae692cb406f28326d9ef Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 24 May 2018 21:01:13 -0400
 Subject: [PATCH] Location.toBlockLocation/toCenterLocation()
diff --git a/Spigot-API-Patches/0104-PotionEffect-clone-methods.patch b/Spigot-API-Patches/0103-PotionEffect-clone-methods.patch
similarity index 95%
rename from Spigot-API-Patches/0104-PotionEffect-clone-methods.patch
rename to Spigot-API-Patches/0103-PotionEffect-clone-methods.patch
index 3b9cd0c2bf..e602df8490 100644
--- a/Spigot-API-Patches/0104-PotionEffect-clone-methods.patch
+++ b/Spigot-API-Patches/0103-PotionEffect-clone-methods.patch
@@ -1,11 +1,11 @@
-From 3bcb7a82269c5b46d201e08b1a0f48eef8af6587 Mon Sep 17 00:00:00 2001
+From c7a93ea87077c8180f4a4bdb6012b45c63a84543 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 Jun 2018 04:10:13 -0400
 Subject: [PATCH] PotionEffect clone methods
 
 
 diff --git a/src/main/java/org/bukkit/potion/PotionEffect.java b/src/main/java/org/bukkit/potion/PotionEffect.java
-index a0529fbe..3782d84a 100644
+index bbefcd58..0193e075 100644
 --- a/src/main/java/org/bukkit/potion/PotionEffect.java
 +++ b/src/main/java/org/bukkit/potion/PotionEffect.java
 @@ -101,6 +101,33 @@ public class PotionEffect implements ConfigurationSerializable {
diff --git a/Spigot-API-Patches/0105-WitchReadyPotionEvent.patch b/Spigot-API-Patches/0104-WitchReadyPotionEvent.patch
similarity index 97%
rename from Spigot-API-Patches/0105-WitchReadyPotionEvent.patch
rename to Spigot-API-Patches/0104-WitchReadyPotionEvent.patch
index eff481b2a8..91be8db816 100644
--- a/Spigot-API-Patches/0105-WitchReadyPotionEvent.patch
+++ b/Spigot-API-Patches/0104-WitchReadyPotionEvent.patch
@@ -1,4 +1,4 @@
-From 7d23434a72c7cf227540dea784c7d10998d7ffb7 Mon Sep 17 00:00:00 2001
+From 63dc44f5af0bb4d788eee64733e6b673b4c96831 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Jun 2018 22:47:08 -0400
 Subject: [PATCH] WitchReadyPotionEvent
diff --git a/Spigot-API-Patches/0106-ItemStack-getMaxItemUseDuration.patch b/Spigot-API-Patches/0105-ItemStack-getMaxItemUseDuration.patch
similarity index 93%
rename from Spigot-API-Patches/0106-ItemStack-getMaxItemUseDuration.patch
rename to Spigot-API-Patches/0105-ItemStack-getMaxItemUseDuration.patch
index 912d53b5a8..c4028224d6 100644
--- a/Spigot-API-Patches/0106-ItemStack-getMaxItemUseDuration.patch
+++ b/Spigot-API-Patches/0105-ItemStack-getMaxItemUseDuration.patch
@@ -1,4 +1,4 @@
-From b78d7f7e912c656a7c9abbd6d62adcd19ed2783c Mon Sep 17 00:00:00 2001
+From 4ff82e5af876626b15bd1e45fedb42381fc7c7a3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Jun 2018 22:59:50 -0400
 Subject: [PATCH] ItemStack#getMaxItemUseDuration
diff --git a/Spigot-API-Patches/0107-Add-EntityTeleportEndGatewayEvent.patch b/Spigot-API-Patches/0106-Add-EntityTeleportEndGatewayEvent.patch
similarity index 95%
rename from Spigot-API-Patches/0107-Add-EntityTeleportEndGatewayEvent.patch
rename to Spigot-API-Patches/0106-Add-EntityTeleportEndGatewayEvent.patch
index 6dd4b36974..352ddd4144 100644
--- a/Spigot-API-Patches/0107-Add-EntityTeleportEndGatewayEvent.patch
+++ b/Spigot-API-Patches/0106-Add-EntityTeleportEndGatewayEvent.patch
@@ -1,4 +1,4 @@
-From 99b0ff6cfea815ea98af9ff7e40946bff0623e33 Mon Sep 17 00:00:00 2001
+From 9c461d8d344b0176143af283f8385f567bcc3c2d Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 9 Jun 2018 13:08:21 +0100
 Subject: [PATCH] Add EntityTeleportEndGatewayEvent
diff --git a/Spigot-API-Patches/0108-Make-shield-blocking-delay-configurable.patch b/Spigot-API-Patches/0107-Make-shield-blocking-delay-configurable.patch
similarity index 90%
rename from Spigot-API-Patches/0108-Make-shield-blocking-delay-configurable.patch
rename to Spigot-API-Patches/0107-Make-shield-blocking-delay-configurable.patch
index 08bdb4fa3c..fd01fece36 100644
--- a/Spigot-API-Patches/0108-Make-shield-blocking-delay-configurable.patch
+++ b/Spigot-API-Patches/0107-Make-shield-blocking-delay-configurable.patch
@@ -1,11 +1,11 @@
-From 71decde1e8308ca10fd40b21d795c443aa04e5ce Mon Sep 17 00:00:00 2001
+From 8ed3dc7a4e8ac87e1972ef34e9b3896603fb69d4 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 16 Jun 2018 01:17:39 -0500
 Subject: [PATCH] Make shield blocking delay configurable
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index ffbf3d7a8..e08dfe17f 100644
+index ffbf3d7a..e08dfe17 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -523,5 +523,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/Spigot-API-Patches/0109-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/Spigot-API-Patches/0108-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
similarity index 95%
rename from Spigot-API-Patches/0109-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
rename to Spigot-API-Patches/0108-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
index ba546afa3d..ab75d237c4 100644
--- a/Spigot-API-Patches/0109-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
+++ b/Spigot-API-Patches/0108-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
@@ -1,4 +1,4 @@
-From d703171a91b490c086f656418317449ad3e6896f Mon Sep 17 00:00:00 2001
+From 8cff2d98b5379af84aeab9de2dcc13e26d470c03 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 15 Jun 2013 19:52:04 -0400
 Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API
@@ -6,7 +6,7 @@ Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API
 Adds ability to get what arrow was shot, and control if it should be consumed.
 
 diff --git a/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java b/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java
-index 18c5e31ab..37dbc12eb 100644
+index 18c5e31a..37dbc12e 100644
 --- a/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java
 +++ b/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java
 @@ -2,6 +2,7 @@ package org.bukkit.event.entity;
diff --git a/Spigot-API-Patches/0110-Add-getNearbyXXX-methods-to-Location.patch b/Spigot-API-Patches/0109-Add-getNearbyXXX-methods-to-Location.patch
similarity index 99%
rename from Spigot-API-Patches/0110-Add-getNearbyXXX-methods-to-Location.patch
rename to Spigot-API-Patches/0109-Add-getNearbyXXX-methods-to-Location.patch
index 4da0389a28..a4b71979ff 100644
--- a/Spigot-API-Patches/0110-Add-getNearbyXXX-methods-to-Location.patch
+++ b/Spigot-API-Patches/0109-Add-getNearbyXXX-methods-to-Location.patch
@@ -1,4 +1,4 @@
-From d4a8bae91bcb848e431f81908a7d149d6cc87e62 Mon Sep 17 00:00:00 2001
+From cd1e5704bdbbc91bb3458ad84aebdb285c6aa1c0 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 18 Jun 2018 00:41:46 -0500
 Subject: [PATCH] Add "getNearbyXXX" methods to Location
diff --git a/Spigot-API-Patches/0111-PlayerReadyArrowEvent.patch b/Spigot-API-Patches/0110-PlayerReadyArrowEvent.patch
similarity index 98%
rename from Spigot-API-Patches/0111-PlayerReadyArrowEvent.patch
rename to Spigot-API-Patches/0110-PlayerReadyArrowEvent.patch
index e59a33e41f..b7755a614b 100644
--- a/Spigot-API-Patches/0111-PlayerReadyArrowEvent.patch
+++ b/Spigot-API-Patches/0110-PlayerReadyArrowEvent.patch
@@ -1,4 +1,4 @@
-From 9f64f378b903f5fe1a7e728c6181ed12d6ec1cfb Mon Sep 17 00:00:00 2001
+From 2579ae2f66e730b085f10c3228d6140ad01430ba Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 18 Jun 2018 01:09:27 -0400
 Subject: [PATCH] PlayerReadyArrowEvent
diff --git a/Spigot-API-Patches/0112-Add-EntityKnockbackByEntityEvent.patch b/Spigot-API-Patches/0111-Add-EntityKnockbackByEntityEvent.patch
similarity index 97%
rename from Spigot-API-Patches/0112-Add-EntityKnockbackByEntityEvent.patch
rename to Spigot-API-Patches/0111-Add-EntityKnockbackByEntityEvent.patch
index e9ab6b9bc9..7a0a1012ad 100644
--- a/Spigot-API-Patches/0112-Add-EntityKnockbackByEntityEvent.patch
+++ b/Spigot-API-Patches/0111-Add-EntityKnockbackByEntityEvent.patch
@@ -1,4 +1,4 @@
-From 30f32c15edc8a830818b6427009ed843cd06daae Mon Sep 17 00:00:00 2001
+From 0df61b65f48c93c8581c3a9e512e67ceaed88194 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Mon, 18 Jun 2018 15:40:39 +0200
 Subject: [PATCH] Add EntityKnockbackByEntityEvent
diff --git a/Spigot-API-Patches/0113-Expand-Explosions-API.patch b/Spigot-API-Patches/0112-Expand-Explosions-API.patch
similarity index 98%
rename from Spigot-API-Patches/0113-Expand-Explosions-API.patch
rename to Spigot-API-Patches/0112-Expand-Explosions-API.patch
index 7e0771ce97..e255c46db4 100644
--- a/Spigot-API-Patches/0113-Expand-Explosions-API.patch
+++ b/Spigot-API-Patches/0112-Expand-Explosions-API.patch
@@ -1,4 +1,4 @@
-From 2715b1aea34fcc2ac427535cba59a5f43bcfafe5 Mon Sep 17 00:00:00 2001
+From 18333843870e8b62ec99eb21aa3afb70b122d033 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 16:24:42 -0500
 Subject: [PATCH] Expand Explosions API
@@ -106,7 +106,7 @@ index 5730d5f4..b226d7e4 100644
       * Returns a list of entities within a bounding box centered around a Location.
       *
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 28afb932..eb5860b2 100644
+index fbd61137..8f69dced 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -1201,6 +1201,102 @@ public interface World extends PluginMessageRecipient, Metadatable {
diff --git a/Spigot-API-Patches/0114-ItemStack-API-additions-for-quantity-flags-lore.patch b/Spigot-API-Patches/0113-ItemStack-API-additions-for-quantity-flags-lore.patch
similarity index 98%
rename from Spigot-API-Patches/0114-ItemStack-API-additions-for-quantity-flags-lore.patch
rename to Spigot-API-Patches/0113-ItemStack-API-additions-for-quantity-flags-lore.patch
index 176574a931..3fb56c30d1 100644
--- a/Spigot-API-Patches/0114-ItemStack-API-additions-for-quantity-flags-lore.patch
+++ b/Spigot-API-Patches/0113-ItemStack-API-additions-for-quantity-flags-lore.patch
@@ -1,4 +1,4 @@
-From 271d50401e6ae6ba853ae96a2c4172ab8d488435 Mon Sep 17 00:00:00 2001
+From f18032a0ddc6bf008b5420f6dc30f06490a7e266 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 22 Jun 2018 22:59:18 -0400
 Subject: [PATCH] ItemStack API additions for quantity/flags/lore
diff --git a/Spigot-API-Patches/0115-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-API-Patches/0114-LivingEntity-Hand-Raised-Item-Use-API.patch
similarity index 95%
rename from Spigot-API-Patches/0115-LivingEntity-Hand-Raised-Item-Use-API.patch
rename to Spigot-API-Patches/0114-LivingEntity-Hand-Raised-Item-Use-API.patch
index bf9e2c7186..d7559a1796 100644
--- a/Spigot-API-Patches/0115-LivingEntity-Hand-Raised-Item-Use-API.patch
+++ b/Spigot-API-Patches/0114-LivingEntity-Hand-Raised-Item-Use-API.patch
@@ -1,4 +1,4 @@
-From 17fb95b5f4231afd377f2067961a63c8deeb9c0c Mon Sep 17 00:00:00 2001
+From c13c50f8c81e38a98d62384277eb84e3ca9a5f44 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 29 Jun 2018 00:19:19 -0400
 Subject: [PATCH] LivingEntity Hand Raised/Item Use API
@@ -6,7 +6,7 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API
 How long an entity has raised hands to charge an attack or use an item
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index e08dfe17f..6e3284b20 100644
+index e08dfe17..6e3284b2 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -11,6 +11,7 @@ import org.bukkit.attribute.Attributable;
diff --git a/Spigot-API-Patches/0116-RangedEntity-API.patch b/Spigot-API-Patches/0115-RangedEntity-API.patch
similarity index 97%
rename from Spigot-API-Patches/0116-RangedEntity-API.patch
rename to Spigot-API-Patches/0115-RangedEntity-API.patch
index d3056b5743..efc449317c 100644
--- a/Spigot-API-Patches/0116-RangedEntity-API.patch
+++ b/Spigot-API-Patches/0115-RangedEntity-API.patch
@@ -1,4 +1,4 @@
-From b4ed810ded91c4e5d07423ad94e4ffc685a89257 Mon Sep 17 00:00:00 2001
+From 191d54c0de07b2d996bd755ec0c2cbdbdd52d6ee Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 26 Jun 2018 21:34:40 -0400
 Subject: [PATCH] RangedEntity API
@@ -79,7 +79,7 @@ index c4385429..d23226cc 100644
      /**
       * Represents the base color that the llama has.
 diff --git a/src/main/java/org/bukkit/entity/Skeleton.java b/src/main/java/org/bukkit/entity/Skeleton.java
-index 2ac30c0f..d42a4e12 100644
+index 16b12938..1c367f78 100644
 --- a/src/main/java/org/bukkit/entity/Skeleton.java
 +++ b/src/main/java/org/bukkit/entity/Skeleton.java
 @@ -2,11 +2,12 @@ package org.bukkit.entity;
@@ -144,7 +144,7 @@ index 3bc332ee..426d3693 100644
 +public interface Wither extends Monster, Boss, RangedEntity { // Paper
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 72e268c1..76da06d1 100644
+index 690abbba..6d18de76 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -18,7 +18,7 @@ import org.jetbrains.annotations.NotNull;
diff --git a/Spigot-API-Patches/0117-Add-World.getEntity-UUID-API.patch b/Spigot-API-Patches/0116-Add-World.getEntity-UUID-API.patch
similarity index 90%
rename from Spigot-API-Patches/0117-Add-World.getEntity-UUID-API.patch
rename to Spigot-API-Patches/0116-Add-World.getEntity-UUID-API.patch
index 9f9b690eae..7962f6de68 100644
--- a/Spigot-API-Patches/0117-Add-World.getEntity-UUID-API.patch
+++ b/Spigot-API-Patches/0116-Add-World.getEntity-UUID-API.patch
@@ -1,11 +1,11 @@
-From e4492ea2ddcebc431c20d0933e4dc7f85090695d Mon Sep 17 00:00:00 2001
+From 30e95a4cbd997640b4ad3b63ae46e8b8caf15161 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 3 Jul 2018 16:07:16 +0200
 Subject: [PATCH] Add World.getEntity(UUID) API
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index eb5860b2..3f934c80 100644
+index 8f69dced..0b328315 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -776,6 +776,17 @@ public interface World extends PluginMessageRecipient, Metadatable {
diff --git a/Spigot-API-Patches/0118-InventoryCloseEvent-Reason-API.patch b/Spigot-API-Patches/0117-InventoryCloseEvent-Reason-API.patch
similarity index 96%
rename from Spigot-API-Patches/0118-InventoryCloseEvent-Reason-API.patch
rename to Spigot-API-Patches/0117-InventoryCloseEvent-Reason-API.patch
index 7b6d055003..8f1e4d65be 100644
--- a/Spigot-API-Patches/0118-InventoryCloseEvent-Reason-API.patch
+++ b/Spigot-API-Patches/0117-InventoryCloseEvent-Reason-API.patch
@@ -1,4 +1,4 @@
-From 7598e855d8a3861b325248812b427feb4a19160d Mon Sep 17 00:00:00 2001
+From da54191d0c80dea58ca857a395d3a39ccfdcc585 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 3 Jul 2018 21:52:52 -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/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index 04f0e08f..a372c74b 100644
+index cdbac95b..f25c7315 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
 @@ -152,6 +152,15 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
diff --git a/Spigot-API-Patches/0119-Entity-getChunk-API.patch b/Spigot-API-Patches/0118-Entity-getChunk-API.patch
similarity index 94%
rename from Spigot-API-Patches/0119-Entity-getChunk-API.patch
rename to Spigot-API-Patches/0118-Entity-getChunk-API.patch
index aa563015b5..400e1df779 100644
--- a/Spigot-API-Patches/0119-Entity-getChunk-API.patch
+++ b/Spigot-API-Patches/0118-Entity-getChunk-API.patch
@@ -1,4 +1,4 @@
-From bd1d9bcc76034a9cdbe655d37b0d55e85af9a520 Mon Sep 17 00:00:00 2001
+From 510847f2f98f230e51cd206db7175a8b07f15b67 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 02:25:48 -0400
 Subject: [PATCH] Entity#getChunk API
diff --git a/Spigot-API-Patches/0120-Add-an-asterisk-to-legacy-API-plugins.patch b/Spigot-API-Patches/0119-Add-an-asterisk-to-legacy-API-plugins.patch
similarity index 89%
rename from Spigot-API-Patches/0120-Add-an-asterisk-to-legacy-API-plugins.patch
rename to Spigot-API-Patches/0119-Add-an-asterisk-to-legacy-API-plugins.patch
index 4f8c2839dd..7006987a52 100644
--- a/Spigot-API-Patches/0120-Add-an-asterisk-to-legacy-API-plugins.patch
+++ b/Spigot-API-Patches/0119-Add-an-asterisk-to-legacy-API-plugins.patch
@@ -1,4 +1,4 @@
-From 809f5b4c1be70938c5b10f4c7639904a499b5951 Mon Sep 17 00:00:00 2001
+From c3a4f448b987e671941688fde2af3d1154b9823c Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 19 Jul 2018 15:07:02 -0500
 Subject: [PATCH] Add an asterisk to legacy API plugins
@@ -7,13 +7,13 @@ Not here to name and shame, only so server admins can be aware of which
 plugins have and haven't been updated.
 
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 72c5501e..71da4a79 100644
+index c0ff133d..b173e2ec 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -76,5 +76,9 @@ public interface UnsafeValues {
-      * @return name
-      */
-     String getTimingsServerName();
+@@ -83,5 +83,9 @@ public interface UnsafeValues {
+     default com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
+         return new com.destroystokyo.paper.util.VersionFetcher.DummyVersionFetcher();
+     }
 +
 +    static boolean isLegacyPlugin(org.bukkit.plugin.Plugin plugin) {
 +        return !"1.13".equals(plugin.getDescription().getAPIVersion()) && !"1.14".equals(plugin.getDescription().getAPIVersion());
diff --git a/Spigot-API-Patches/0121-EnderDragon-Events.patch b/Spigot-API-Patches/0120-EnderDragon-Events.patch
similarity index 99%
rename from Spigot-API-Patches/0121-EnderDragon-Events.patch
rename to Spigot-API-Patches/0120-EnderDragon-Events.patch
index 1935c24113..d1ed538e13 100644
--- a/Spigot-API-Patches/0121-EnderDragon-Events.patch
+++ b/Spigot-API-Patches/0120-EnderDragon-Events.patch
@@ -1,4 +1,4 @@
-From 926e195e6d693c4a3845dde51d876efb8ca25231 Mon Sep 17 00:00:00 2001
+From c3dcb41ecc3c27a968a757ea4dda9a9d35c7661f Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 21 Jul 2018 01:51:05 -0500
 Subject: [PATCH] EnderDragon Events
diff --git a/Spigot-API-Patches/0122-PlayerLaunchProjectileEvent.patch b/Spigot-API-Patches/0121-PlayerLaunchProjectileEvent.patch
similarity index 97%
rename from Spigot-API-Patches/0122-PlayerLaunchProjectileEvent.patch
rename to Spigot-API-Patches/0121-PlayerLaunchProjectileEvent.patch
index 6fdce65966..51344b3b2d 100644
--- a/Spigot-API-Patches/0122-PlayerLaunchProjectileEvent.patch
+++ b/Spigot-API-Patches/0121-PlayerLaunchProjectileEvent.patch
@@ -1,4 +1,4 @@
-From 68bfbd197cb7e1d79da309b3f43ce996b23bab9a Mon Sep 17 00:00:00 2001
+From fe1133cb18af58ae0b15203109297df3b233ed5d Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 21 Jul 2018 03:10:50 -0500
 Subject: [PATCH] PlayerLaunchProjectileEvent
diff --git a/Spigot-API-Patches/0123-PlayerElytraBoostEvent.patch b/Spigot-API-Patches/0122-PlayerElytraBoostEvent.patch
similarity index 97%
rename from Spigot-API-Patches/0123-PlayerElytraBoostEvent.patch
rename to Spigot-API-Patches/0122-PlayerElytraBoostEvent.patch
index f02baf8c9c..94f0ef13e4 100644
--- a/Spigot-API-Patches/0123-PlayerElytraBoostEvent.patch
+++ b/Spigot-API-Patches/0122-PlayerElytraBoostEvent.patch
@@ -1,4 +1,4 @@
-From dd9a628828a124c4c4f22186b59d2d332c657241 Mon Sep 17 00:00:00 2001
+From 210779762b6b255f3c0957958051f6d710eb88fc Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 21 Jul 2018 01:59:53 -0500
 Subject: [PATCH] PlayerElytraBoostEvent
diff --git a/Spigot-API-Patches/0124-EntityTransformedEvent.patch b/Spigot-API-Patches/0123-EntityTransformedEvent.patch
similarity index 97%
rename from Spigot-API-Patches/0124-EntityTransformedEvent.patch
rename to Spigot-API-Patches/0123-EntityTransformedEvent.patch
index e3795f74ac..d1084f9c2b 100644
--- a/Spigot-API-Patches/0124-EntityTransformedEvent.patch
+++ b/Spigot-API-Patches/0123-EntityTransformedEvent.patch
@@ -1,4 +1,4 @@
-From c6e1d0020fdf92be2748e4ddf694c15e7881e6f5 Mon Sep 17 00:00:00 2001
+From 213b2c432b14f24689483abbf50f6c3716db4584 Mon Sep 17 00:00:00 2001
 From: Anthony MacAllister <anthonymmacallister@gmail.com>
 Date: Thu, 26 Jul 2018 15:28:53 -0400
 Subject: [PATCH] EntityTransformedEvent
diff --git a/Spigot-API-Patches/0125-Allow-disabling-armour-stand-ticking.patch b/Spigot-API-Patches/0124-Allow-disabling-armour-stand-ticking.patch
similarity index 94%
rename from Spigot-API-Patches/0125-Allow-disabling-armour-stand-ticking.patch
rename to Spigot-API-Patches/0124-Allow-disabling-armour-stand-ticking.patch
index 90e5ad638b..f63dbcc1cd 100644
--- a/Spigot-API-Patches/0125-Allow-disabling-armour-stand-ticking.patch
+++ b/Spigot-API-Patches/0124-Allow-disabling-armour-stand-ticking.patch
@@ -1,4 +1,4 @@
-From 3014696abf81408031ce208b526d2d964b3e68c7 Mon Sep 17 00:00:00 2001
+From 88132835dadea5f2e73892af9a3985379236fbe7 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 15 Aug 2018 01:26:03 -0700
 Subject: [PATCH] Allow disabling armour stand ticking
diff --git a/Spigot-API-Patches/0126-SkeletonHorse-Additions.patch b/Spigot-API-Patches/0125-SkeletonHorse-Additions.patch
similarity index 97%
rename from Spigot-API-Patches/0126-SkeletonHorse-Additions.patch
rename to Spigot-API-Patches/0125-SkeletonHorse-Additions.patch
index f18f9eaca8..8075eab224 100644
--- a/Spigot-API-Patches/0126-SkeletonHorse-Additions.patch
+++ b/Spigot-API-Patches/0125-SkeletonHorse-Additions.patch
@@ -1,4 +1,4 @@
-From c20b900710f100a5695afa6cd33c30f7d8fae5a1 Mon Sep 17 00:00:00 2001
+From 2afe98b5368ce6cb6dd2099aef2f44e685a7c100 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 27 Jul 2018 22:36:17 -0500
 Subject: [PATCH] SkeletonHorse Additions
diff --git a/Spigot-API-Patches/0127-Expand-Location-Manipulation-API.patch b/Spigot-API-Patches/0126-Expand-Location-Manipulation-API.patch
similarity index 97%
rename from Spigot-API-Patches/0127-Expand-Location-Manipulation-API.patch
rename to Spigot-API-Patches/0126-Expand-Location-Manipulation-API.patch
index ab26e1503c..b89de29345 100644
--- a/Spigot-API-Patches/0127-Expand-Location-Manipulation-API.patch
+++ b/Spigot-API-Patches/0126-Expand-Location-Manipulation-API.patch
@@ -1,4 +1,4 @@
-From c807a2cd2c5ce27ece6532433232f8391a84edbe Mon Sep 17 00:00:00 2001
+From 2fd4158a4def36728c68bb14c875f8375008ad38 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 25 Jul 2018 01:36:07 -0400
 Subject: [PATCH] Expand Location Manipulation API
diff --git a/Spigot-API-Patches/0128-Expand-ArmorStand-API.patch b/Spigot-API-Patches/0127-Expand-ArmorStand-API.patch
similarity index 98%
rename from Spigot-API-Patches/0128-Expand-ArmorStand-API.patch
rename to Spigot-API-Patches/0127-Expand-ArmorStand-API.patch
index 28f3b68141..c04982c1ec 100644
--- a/Spigot-API-Patches/0128-Expand-ArmorStand-API.patch
+++ b/Spigot-API-Patches/0127-Expand-ArmorStand-API.patch
@@ -1,4 +1,4 @@
-From 9fb611dc9f3489629214f4962308ef498358ccc9 Mon Sep 17 00:00:00 2001
+From ef423f6023541baa719a802f18754ca605e1aaaf Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Thu, 26 Jul 2018 02:22:44 -0400
 Subject: [PATCH] Expand ArmorStand API
diff --git a/Spigot-API-Patches/0129-AnvilDamageEvent.patch b/Spigot-API-Patches/0128-AnvilDamageEvent.patch
similarity index 98%
rename from Spigot-API-Patches/0129-AnvilDamageEvent.patch
rename to Spigot-API-Patches/0128-AnvilDamageEvent.patch
index 94a790ac84..175a483f5d 100644
--- a/Spigot-API-Patches/0129-AnvilDamageEvent.patch
+++ b/Spigot-API-Patches/0128-AnvilDamageEvent.patch
@@ -1,4 +1,4 @@
-From dd237c9ad1f04c98b305173a600865b2dc7e5896 Mon Sep 17 00:00:00 2001
+From c0d26c6ba4c12481f34150f71e8602c8a4fadfb5 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 20 Jul 2018 23:36:55 -0500
 Subject: [PATCH] AnvilDamageEvent
diff --git a/Spigot-API-Patches/0130-Remove-deadlock-risk-in-firing-async-events.patch b/Spigot-API-Patches/0129-Remove-deadlock-risk-in-firing-async-events.patch
similarity index 98%
rename from Spigot-API-Patches/0130-Remove-deadlock-risk-in-firing-async-events.patch
rename to Spigot-API-Patches/0129-Remove-deadlock-risk-in-firing-async-events.patch
index 24e10ae0c9..af4efbfc74 100644
--- a/Spigot-API-Patches/0130-Remove-deadlock-risk-in-firing-async-events.patch
+++ b/Spigot-API-Patches/0129-Remove-deadlock-risk-in-firing-async-events.patch
@@ -1,4 +1,4 @@
-From 79eb3b353f5f8e4b7f237675a59c0b8139499da3 Mon Sep 17 00:00:00 2001
+From 2817ea0cd2b735fcf41d322476b4b1d6c97f39a4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 9 Sep 2018 00:32:05 -0400
 Subject: [PATCH] Remove deadlock risk in firing async events
diff --git a/Spigot-API-Patches/0131-Add-hand-to-bucket-events.patch b/Spigot-API-Patches/0130-Add-hand-to-bucket-events.patch
similarity index 98%
rename from Spigot-API-Patches/0131-Add-hand-to-bucket-events.patch
rename to Spigot-API-Patches/0130-Add-hand-to-bucket-events.patch
index ce63aa0228..bdbbde8627 100644
--- a/Spigot-API-Patches/0131-Add-hand-to-bucket-events.patch
+++ b/Spigot-API-Patches/0130-Add-hand-to-bucket-events.patch
@@ -1,4 +1,4 @@
-From 5163c03359615886d54e6541ac60df07f0bb509d Mon Sep 17 00:00:00 2001
+From b22b8ad9f32691a305d1ef4fd1d1ab8bdab72e1f Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 2 Aug 2018 08:44:20 -0500
 Subject: [PATCH] Add hand to bucket events
diff --git a/Spigot-API-Patches/0132-Add-TNTPrimeEvent.patch b/Spigot-API-Patches/0131-Add-TNTPrimeEvent.patch
similarity index 98%
rename from Spigot-API-Patches/0132-Add-TNTPrimeEvent.patch
rename to Spigot-API-Patches/0131-Add-TNTPrimeEvent.patch
index 210576f55b..95ec57def2 100644
--- a/Spigot-API-Patches/0132-Add-TNTPrimeEvent.patch
+++ b/Spigot-API-Patches/0131-Add-TNTPrimeEvent.patch
@@ -1,4 +1,4 @@
-From ef0003fe68b304fe055657557cc65576371ec7ef Mon Sep 17 00:00:00 2001
+From 96c816ec45a4ca04d09c5c1c4d13a92d0a5c03ff Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Sun, 15 Jul 2018 22:17:55 +0300
 Subject: [PATCH] Add TNTPrimeEvent
diff --git a/Spigot-API-Patches/0133-Provide-Chunk-Coordinates-as-a-Long-API.patch b/Spigot-API-Patches/0132-Provide-Chunk-Coordinates-as-a-Long-API.patch
similarity index 94%
rename from Spigot-API-Patches/0133-Provide-Chunk-Coordinates-as-a-Long-API.patch
rename to Spigot-API-Patches/0132-Provide-Chunk-Coordinates-as-a-Long-API.patch
index 6d8a2f3ec7..fe7e900bc8 100644
--- a/Spigot-API-Patches/0133-Provide-Chunk-Coordinates-as-a-Long-API.patch
+++ b/Spigot-API-Patches/0132-Provide-Chunk-Coordinates-as-a-Long-API.patch
@@ -1,4 +1,4 @@
-From d8ab6185814520370886f17aa53e2cbe4cbeac13 Mon Sep 17 00:00:00 2001
+From 264c6b1962030a6be05560d8ec5feca1ad5912a1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 4 Aug 2018 19:37:35 -0400
 Subject: [PATCH] Provide Chunk Coordinates as a Long API
@@ -7,7 +7,7 @@ Allows you to easily access the chunks X/z as a long, and a method
 to look up by the long key too.
 
 diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java
-index e583f86d..7302b6e3 100644
+index aab292e1..fe77e33a 100644
 --- a/src/main/java/org/bukkit/Chunk.java
 +++ b/src/main/java/org/bukkit/Chunk.java
 @@ -24,6 +24,32 @@ public interface Chunk {
@@ -44,7 +44,7 @@ index e583f86d..7302b6e3 100644
       * Gets the world containing this chunk
       *
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 3f934c80..dd0ab741 100644
+index 0b328315..32be5210 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -157,6 +157,22 @@ public interface World extends PluginMessageRecipient, Metadatable {
diff --git a/Spigot-API-Patches/0134-Async-Chunks-API.patch b/Spigot-API-Patches/0133-Async-Chunks-API.patch
similarity index 99%
rename from Spigot-API-Patches/0134-Async-Chunks-API.patch
rename to Spigot-API-Patches/0133-Async-Chunks-API.patch
index 55f7664197..be39de5b2b 100644
--- a/Spigot-API-Patches/0134-Async-Chunks-API.patch
+++ b/Spigot-API-Patches/0133-Async-Chunks-API.patch
@@ -1,4 +1,4 @@
-From 52ee3c6a80ac54dc5ecd9a5518f008da2fb1d9fc Mon Sep 17 00:00:00 2001
+From aec44c58717f140b7090af2f2620b84834a1a8c5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 29 Feb 2016 17:43:33 -0600
 Subject: [PATCH] Async Chunks API
@@ -8,7 +8,7 @@ Adds API's to load or generate chunks asynchronously.
 Also adds utility methods to Entity to teleport asynchronously.
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index dd0ab741..a06d7a0d 100644
+index 32be5210..0981675d 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -171,6 +171,358 @@ public interface World extends PluginMessageRecipient, Metadatable {
diff --git a/Spigot-API-Patches/0135-Make-EnderDragon-extend-Mob.patch b/Spigot-API-Patches/0134-Make-EnderDragon-extend-Mob.patch
similarity index 88%
rename from Spigot-API-Patches/0135-Make-EnderDragon-extend-Mob.patch
rename to Spigot-API-Patches/0134-Make-EnderDragon-extend-Mob.patch
index 51b9bf9fe1..ae52f67d75 100644
--- a/Spigot-API-Patches/0135-Make-EnderDragon-extend-Mob.patch
+++ b/Spigot-API-Patches/0134-Make-EnderDragon-extend-Mob.patch
@@ -1,11 +1,11 @@
-From a01c59bfa5adbd1f5587c65ea8a8cd02a9055e03 Mon Sep 17 00:00:00 2001
+From 30650b84b3420d53f9cc3fabb31dfdb7502d0874 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 10 Aug 2018 22:08:34 -0400
 Subject: [PATCH] Make EnderDragon extend Mob
 
 
 diff --git a/src/main/java/org/bukkit/entity/EnderDragon.java b/src/main/java/org/bukkit/entity/EnderDragon.java
-index fa13b38d..e800259a 100644
+index 16199b3e..ddef550b 100644
 --- a/src/main/java/org/bukkit/entity/EnderDragon.java
 +++ b/src/main/java/org/bukkit/entity/EnderDragon.java
 @@ -5,7 +5,7 @@ import org.jetbrains.annotations.NotNull;
diff --git a/Spigot-API-Patches/0136-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/Spigot-API-Patches/0135-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
similarity index 91%
rename from Spigot-API-Patches/0136-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
rename to Spigot-API-Patches/0135-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
index 2e0303dca6..00f6b00f44 100644
--- a/Spigot-API-Patches/0136-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
+++ b/Spigot-API-Patches/0135-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
@@ -1,11 +1,11 @@
-From bc07cddc9c670f92b31bbfecca2042f85e2ca753 Mon Sep 17 00:00:00 2001
+From e6a44197c43bc5f8f1284bcaf5eead766ceabf07 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 15 Aug 2018 01:04:58 -0400
 Subject: [PATCH] Ability to get Tile Entities from a chunk without snapshots
 
 
 diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java
-index 893300a7..22ff63e5 100644
+index fe77e33a..6d45a421 100644
 --- a/src/main/java/org/bukkit/Chunk.java
 +++ b/src/main/java/org/bukkit/Chunk.java
 @@ -99,13 +99,26 @@ public interface Chunk {
diff --git a/Spigot-API-Patches/0137-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch b/Spigot-API-Patches/0136-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch
similarity index 90%
rename from Spigot-API-Patches/0137-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch
rename to Spigot-API-Patches/0136-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch
index a4272b7efe..14579fefa3 100644
--- a/Spigot-API-Patches/0137-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch
+++ b/Spigot-API-Patches/0136-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch
@@ -1,11 +1,11 @@
-From 812ce8fc0b825ddf9b7ec78cbf6982a799cf26bc Mon Sep 17 00:00:00 2001
+From 458a068274864314ed1431505a754d8c26efdc7b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 15 Aug 2018 01:19:37 -0400
 Subject: [PATCH] Don't use snapshots for Timings Tile Entity reports
 
 
 diff --git a/src/main/java/co/aikar/timings/TimingHistory.java b/src/main/java/co/aikar/timings/TimingHistory.java
-index 04369523..99815866 100644
+index ddaed812..203cda0f 100644
 --- a/src/main/java/co/aikar/timings/TimingHistory.java
 +++ b/src/main/java/co/aikar/timings/TimingHistory.java
 @@ -119,7 +119,7 @@ public class TimingHistory {
diff --git a/Spigot-API-Patches/0138-Allow-Blocks-to-be-accessed-via-a-long-key.patch b/Spigot-API-Patches/0137-Allow-Blocks-to-be-accessed-via-a-long-key.patch
similarity index 98%
rename from Spigot-API-Patches/0138-Allow-Blocks-to-be-accessed-via-a-long-key.patch
rename to Spigot-API-Patches/0137-Allow-Blocks-to-be-accessed-via-a-long-key.patch
index e7f3259e14..57458ada36 100644
--- a/Spigot-API-Patches/0138-Allow-Blocks-to-be-accessed-via-a-long-key.patch
+++ b/Spigot-API-Patches/0137-Allow-Blocks-to-be-accessed-via-a-long-key.patch
@@ -1,4 +1,4 @@
-From 5c9c0c19bf8ed9ca04c795ad49f5ceeb04d505f7 Mon Sep 17 00:00:00 2001
+From 2aad459cfeca77582f8f789f4f0b8c45fa215cf3 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Tue, 14 Aug 2018 21:42:10 -0700
 Subject: [PATCH] Allow Blocks to be accessed via a long key
@@ -48,7 +48,7 @@ index 884862ab..6dc39989 100644
       * @return A new location where X/Y/Z are the center of the block
       */
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index a06d7a0d..4d35efb0 100644
+index 0981675d..c840d474 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -88,6 +88,38 @@ public interface World extends PluginMessageRecipient, Metadatable {
diff --git a/Spigot-API-Patches/0139-Slime-Pathfinder-Events.patch b/Spigot-API-Patches/0138-Slime-Pathfinder-Events.patch
similarity index 99%
rename from Spigot-API-Patches/0139-Slime-Pathfinder-Events.patch
rename to Spigot-API-Patches/0138-Slime-Pathfinder-Events.patch
index 0ed0858ca8..b10f9bae7f 100644
--- a/Spigot-API-Patches/0139-Slime-Pathfinder-Events.patch
+++ b/Spigot-API-Patches/0138-Slime-Pathfinder-Events.patch
@@ -1,4 +1,4 @@
-From 855e6ce1a9904a0cc12cacec59f86be7a77bec65 Mon Sep 17 00:00:00 2001
+From 9d084a90bc57d9c80340084020b529024199e259 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 24 Aug 2018 08:18:27 -0500
 Subject: [PATCH] Slime Pathfinder Events
diff --git a/Spigot-API-Patches/0140-isChunkGenerated-API.patch b/Spigot-API-Patches/0139-isChunkGenerated-API.patch
similarity index 95%
rename from Spigot-API-Patches/0140-isChunkGenerated-API.patch
rename to Spigot-API-Patches/0139-isChunkGenerated-API.patch
index 18af08bc0f..59d0214f27 100644
--- a/Spigot-API-Patches/0140-isChunkGenerated-API.patch
+++ b/Spigot-API-Patches/0139-isChunkGenerated-API.patch
@@ -1,4 +1,4 @@
-From 4f3dd333bb40e8c41894462cb63dfde6cf8b9bf7 Mon Sep 17 00:00:00 2001
+From 315d168b275c290a695675d69d7b354724a6a1ec Mon Sep 17 00:00:00 2001
 From: cswhite2000 <18whitechristop@gmail.com>
 Date: Tue, 21 Aug 2018 19:39:46 -0700
 Subject: [PATCH] isChunkGenerated API
@@ -34,7 +34,7 @@ index 6dc39989..4e69f277 100644
      /**
       * Sets the position of this Location and returns itself
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 4d35efb0..150c5af2 100644
+index c840d474..93dd8742 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -204,6 +204,17 @@ public interface World extends PluginMessageRecipient, Metadatable {
diff --git a/Spigot-API-Patches/0141-Add-More-Creeper-API.patch b/Spigot-API-Patches/0140-Add-More-Creeper-API.patch
similarity index 96%
rename from Spigot-API-Patches/0141-Add-More-Creeper-API.patch
rename to Spigot-API-Patches/0140-Add-More-Creeper-API.patch
index 8ad3976b7c..540ffead4c 100644
--- a/Spigot-API-Patches/0141-Add-More-Creeper-API.patch
+++ b/Spigot-API-Patches/0140-Add-More-Creeper-API.patch
@@ -1,4 +1,4 @@
-From 7b741981e2d04a10c5cc9c8c883aa235481c1a10 Mon Sep 17 00:00:00 2001
+From 3c26fbdbcb3bd7ccc1123ba0aac7189c0b7103c1 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 24 Aug 2018 11:50:16 -0500
 Subject: [PATCH] Add More Creeper API
@@ -65,7 +65,7 @@ index 00000000..ff10251b
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Creeper.java b/src/main/java/org/bukkit/entity/Creeper.java
-index f957d836..b9877fb8 100644
+index 32f18a3a..601ba4af 100644
 --- a/src/main/java/org/bukkit/entity/Creeper.java
 +++ b/src/main/java/org/bukkit/entity/Creeper.java
 @@ -50,4 +50,32 @@ public interface Creeper extends Monster {
diff --git a/Spigot-API-Patches/0142-Add-PhantomPreSpawnEvent.patch b/Spigot-API-Patches/0141-Add-PhantomPreSpawnEvent.patch
similarity index 97%
rename from Spigot-API-Patches/0142-Add-PhantomPreSpawnEvent.patch
rename to Spigot-API-Patches/0141-Add-PhantomPreSpawnEvent.patch
index 2811dc29d8..37d79d92bc 100644
--- a/Spigot-API-Patches/0142-Add-PhantomPreSpawnEvent.patch
+++ b/Spigot-API-Patches/0141-Add-PhantomPreSpawnEvent.patch
@@ -1,4 +1,4 @@
-From 96d56296712254c823bd6ed82e626232ecc1948e Mon Sep 17 00:00:00 2001
+From b188e6eab15294ab8d21056780b149632aa13317 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 25 Aug 2018 19:56:42 -0500
 Subject: [PATCH] Add PhantomPreSpawnEvent
diff --git a/Spigot-API-Patches/0143-Add-source-block-to-BlockPhysicsEvent.patch b/Spigot-API-Patches/0142-Add-source-block-to-BlockPhysicsEvent.patch
similarity index 91%
rename from Spigot-API-Patches/0143-Add-source-block-to-BlockPhysicsEvent.patch
rename to Spigot-API-Patches/0142-Add-source-block-to-BlockPhysicsEvent.patch
index c03390e251..69705d1352 100644
--- a/Spigot-API-Patches/0143-Add-source-block-to-BlockPhysicsEvent.patch
+++ b/Spigot-API-Patches/0142-Add-source-block-to-BlockPhysicsEvent.patch
@@ -1,11 +1,11 @@
-From a577299608e2fedf76e94d9ae75675133a0cd032 Mon Sep 17 00:00:00 2001
+From 76457191674e513142d7e2e289b018cafe854e85 Mon Sep 17 00:00:00 2001
 From: Sotr <i@omc.hk>
 Date: Thu, 23 Aug 2018 16:14:25 +0800
 Subject: [PATCH] Add source block to BlockPhysicsEvent
 
 
 diff --git a/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java b/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java
-index 75d4e70f..a28731dc 100644
+index e3a5f582..c382f9fc 100644
 --- a/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java
 +++ b/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java
 @@ -32,6 +32,13 @@ public class BlockPhysicsEvent extends BlockEvent implements Cancellable {
diff --git a/Spigot-API-Patches/0144-Inventory-removeItemAnySlot.patch b/Spigot-API-Patches/0143-Inventory-removeItemAnySlot.patch
similarity index 96%
rename from Spigot-API-Patches/0144-Inventory-removeItemAnySlot.patch
rename to Spigot-API-Patches/0143-Inventory-removeItemAnySlot.patch
index 7f2a58b5af..1ce9be7759 100644
--- a/Spigot-API-Patches/0144-Inventory-removeItemAnySlot.patch
+++ b/Spigot-API-Patches/0143-Inventory-removeItemAnySlot.patch
@@ -1,4 +1,4 @@
-From 2393a64341d781d5e6101361c029c4866479e66c Mon Sep 17 00:00:00 2001
+From f15c9148fdb45e7f951a8621ba7ae96bd2579a6b Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 28 Aug 2018 23:04:06 -0400
 Subject: [PATCH] Inventory#removeItemAnySlot
diff --git a/Spigot-API-Patches/0145-Add-ray-tracing-methods-to-LivingEntity.patch b/Spigot-API-Patches/0144-Add-ray-tracing-methods-to-LivingEntity.patch
similarity index 97%
rename from Spigot-API-Patches/0145-Add-ray-tracing-methods-to-LivingEntity.patch
rename to Spigot-API-Patches/0144-Add-ray-tracing-methods-to-LivingEntity.patch
index ff6aaf84a1..f54533bfb2 100644
--- a/Spigot-API-Patches/0145-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/Spigot-API-Patches/0144-Add-ray-tracing-methods-to-LivingEntity.patch
@@ -1,4 +1,4 @@
-From 6c38f7533ba57e7f607e6552cb73b62714eba0b3 Mon Sep 17 00:00:00 2001
+From 246a3f9429755931b2290bb3f50dee71335b5532 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 3 Sep 2018 18:13:53 -0500
 Subject: [PATCH] Add ray tracing methods to LivingEntity
@@ -6,7 +6,7 @@ Subject: [PATCH] Add ray tracing methods to LivingEntity
 
 diff --git a/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java b/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java
 new file mode 100644
-index 000000000..18a96dbb0
+index 00000000..18a96dbb
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java
 @@ -0,0 +1,54 @@
@@ -65,7 +65,7 @@ index 000000000..18a96dbb0
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index adae86709..6b2002ceb 100644
+index 6e3284b2..9dc0d4ce 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -81,6 +81,77 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/Spigot-API-Patches/0146-Improve-death-events.patch b/Spigot-API-Patches/0145-Improve-death-events.patch
similarity index 99%
rename from Spigot-API-Patches/0146-Improve-death-events.patch
rename to Spigot-API-Patches/0145-Improve-death-events.patch
index 4cd0a3c23f..e1a1a53ae7 100644
--- a/Spigot-API-Patches/0146-Improve-death-events.patch
+++ b/Spigot-API-Patches/0145-Improve-death-events.patch
@@ -1,4 +1,4 @@
-From 77c90772efb67a42bebfb667c8f04e61354b5762 Mon Sep 17 00:00:00 2001
+From 0ef3566b5a658cc35b2a2bc140bbb74461142aaf Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Tue, 21 Aug 2018 01:32:28 +0100
 Subject: [PATCH] Improve death events
diff --git a/Spigot-API-Patches/0147-Mob-Pathfinding-API.patch b/Spigot-API-Patches/0146-Mob-Pathfinding-API.patch
similarity index 99%
rename from Spigot-API-Patches/0147-Mob-Pathfinding-API.patch
rename to Spigot-API-Patches/0146-Mob-Pathfinding-API.patch
index c5b73801c8..fde54cbd99 100644
--- a/Spigot-API-Patches/0147-Mob-Pathfinding-API.patch
+++ b/Spigot-API-Patches/0146-Mob-Pathfinding-API.patch
@@ -1,4 +1,4 @@
-From 9c3067c801a8c770b06fb8207a01e2378b3cc6cb Mon Sep 17 00:00:00 2001
+From ba38e6dbbb812cac523fe052e7ec50e582cf057b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 9 Sep 2018 12:39:06 -0400
 Subject: [PATCH] Mob Pathfinding API
diff --git a/Spigot-API-Patches/0148-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-API-Patches/0147-Expose-attack-cooldown-methods-for-Player.patch
similarity index 92%
rename from Spigot-API-Patches/0148-Expose-attack-cooldown-methods-for-Player.patch
rename to Spigot-API-Patches/0147-Expose-attack-cooldown-methods-for-Player.patch
index 8d768c3f2d..08a352868a 100644
--- a/Spigot-API-Patches/0148-Expose-attack-cooldown-methods-for-Player.patch
+++ b/Spigot-API-Patches/0147-Expose-attack-cooldown-methods-for-Player.patch
@@ -1,11 +1,11 @@
-From 6e59b914fe8eb9eaed067387f9c727536e429b23 Mon Sep 17 00:00:00 2001
+From 4a916b6e1b8261a773ad37167862a35f252b2e57 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 4 Sep 2018 15:01:54 -0500
 Subject: [PATCH] Expose attack cooldown methods for Player
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 32dc1f868..dea6130a6 100644
+index 32dc1f86..dea6130a 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1929,6 +1929,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/Spigot-API-Patches/0149-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/Spigot-API-Patches/0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
similarity index 98%
rename from Spigot-API-Patches/0149-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
rename to Spigot-API-Patches/0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
index 2d9b079e3a..33ef543ef2 100644
--- a/Spigot-API-Patches/0149-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
+++ b/Spigot-API-Patches/0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
@@ -1,4 +1,4 @@
-From e98c081f8db91bfe12856621b2bd9446ad518c76 Mon Sep 17 00:00:00 2001
+From 48fae9e9abaaa7d899074299fb920a37fd95d2b0 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Wed, 12 Sep 2018 18:53:35 +0300
 Subject: [PATCH] Add an API for CanPlaceOn and CanDestroy NBT values
@@ -199,7 +199,7 @@ index 00000000..28f3fda9
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/NamespacedKey.java b/src/main/java/org/bukkit/NamespacedKey.java
-index f5e3929a..8648e8fb 100644
+index 22eca2a1..620a962d 100644
 --- a/src/main/java/org/bukkit/NamespacedKey.java
 +++ b/src/main/java/org/bukkit/NamespacedKey.java
 @@ -18,7 +18,7 @@ import org.jetbrains.annotations.NotNull;
@@ -226,7 +226,7 @@ index f5e3929a..8648e8fb 100644
          return key;
      }
 diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-index d0e4c8ee..d0221b29 100644
+index 4e8c7a8a..595df539 100644
 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 @@ -421,4 +421,86 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
diff --git a/Spigot-API-Patches/0150-Performance-Concurrency-Improvements-to-Permissions.patch b/Spigot-API-Patches/0149-Performance-Concurrency-Improvements-to-Permissions.patch
similarity index 98%
rename from Spigot-API-Patches/0150-Performance-Concurrency-Improvements-to-Permissions.patch
rename to Spigot-API-Patches/0149-Performance-Concurrency-Improvements-to-Permissions.patch
index 3fa5f1097b..b3d87754f9 100644
--- a/Spigot-API-Patches/0150-Performance-Concurrency-Improvements-to-Permissions.patch
+++ b/Spigot-API-Patches/0149-Performance-Concurrency-Improvements-to-Permissions.patch
@@ -1,4 +1,4 @@
-From 92e63fa41726779b8e2673b1ebd5435b8fc954b7 Mon Sep 17 00:00:00 2001
+From 31a97ee3841d55754647d0751fed2a488e4139e3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 13 Sep 2018 20:51:50 -0400
 Subject: [PATCH] Performance & Concurrency Improvements to Permissions
diff --git a/Spigot-API-Patches/0151-Add-ItemStackRecipeChoice-Draft-API.patch b/Spigot-API-Patches/0150-Add-ItemStackRecipeChoice-Draft-API.patch
similarity index 96%
rename from Spigot-API-Patches/0151-Add-ItemStackRecipeChoice-Draft-API.patch
rename to Spigot-API-Patches/0150-Add-ItemStackRecipeChoice-Draft-API.patch
index d3daabd00a..13a30dbb8c 100644
--- a/Spigot-API-Patches/0151-Add-ItemStackRecipeChoice-Draft-API.patch
+++ b/Spigot-API-Patches/0150-Add-ItemStackRecipeChoice-Draft-API.patch
@@ -1,4 +1,4 @@
-From 174bf2456490af968e86a1968c27b57932e52a4a Mon Sep 17 00:00:00 2001
+From 6e774a6907d67c987be6902cd85aa7e713d2ad57 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 13 Sep 2018 21:39:26 -0400
 Subject: [PATCH] Add ItemStackRecipeChoice Draft API
diff --git a/Spigot-API-Patches/0152-Implement-furnace-cook-speed-multiplier-API.patch b/Spigot-API-Patches/0151-Implement-furnace-cook-speed-multiplier-API.patch
similarity index 95%
rename from Spigot-API-Patches/0152-Implement-furnace-cook-speed-multiplier-API.patch
rename to Spigot-API-Patches/0151-Implement-furnace-cook-speed-multiplier-API.patch
index 8e38edccf0..28cca89da9 100644
--- a/Spigot-API-Patches/0152-Implement-furnace-cook-speed-multiplier-API.patch
+++ b/Spigot-API-Patches/0151-Implement-furnace-cook-speed-multiplier-API.patch
@@ -1,4 +1,4 @@
-From 1711a5a14d94328aabd0de48aa52f839741ba279 Mon Sep 17 00:00:00 2001
+From 7441129221dd49a2239f47e7d4237683baa56bbd Mon Sep 17 00:00:00 2001
 From: Tassu <git@tassu.me>
 Date: Thu, 13 Sep 2018 08:45:01 +0300
 Subject: [PATCH] Implement furnace cook speed multiplier API
diff --git a/Spigot-API-Patches/0153-PreSpawnerSpawnEvent.patch b/Spigot-API-Patches/0152-PreSpawnerSpawnEvent.patch
similarity index 96%
rename from Spigot-API-Patches/0153-PreSpawnerSpawnEvent.patch
rename to Spigot-API-Patches/0152-PreSpawnerSpawnEvent.patch
index 8c875f4c36..4456faad7f 100644
--- a/Spigot-API-Patches/0153-PreSpawnerSpawnEvent.patch
+++ b/Spigot-API-Patches/0152-PreSpawnerSpawnEvent.patch
@@ -1,4 +1,4 @@
-From 067011b9b765658c52b5ceaf8e37a042119d2991 Mon Sep 17 00:00:00 2001
+From 1499f72bc455c5b57447ed95902712a585fa204b Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Tue, 18 Sep 2018 23:50:10 +0100
 Subject: [PATCH] PreSpawnerSpawnEvent
diff --git a/Spigot-API-Patches/0154-Remove-Precondition-on-name-for-AttributeModifier.patch b/Spigot-API-Patches/0153-Remove-Precondition-on-name-for-AttributeModifier.patch
similarity index 94%
rename from Spigot-API-Patches/0154-Remove-Precondition-on-name-for-AttributeModifier.patch
rename to Spigot-API-Patches/0153-Remove-Precondition-on-name-for-AttributeModifier.patch
index 6a2fe95276..98671b0dfa 100644
--- a/Spigot-API-Patches/0154-Remove-Precondition-on-name-for-AttributeModifier.patch
+++ b/Spigot-API-Patches/0153-Remove-Precondition-on-name-for-AttributeModifier.patch
@@ -1,4 +1,4 @@
-From a266af8e96aff5e4c85cb8804f27cd44ebae0262 Mon Sep 17 00:00:00 2001
+From e718538a8b3799242006d95332319c9de15f4f3b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 22 Sep 2018 18:41:01 -0400
 Subject: [PATCH] Remove Precondition on name for AttributeModifier
diff --git a/Spigot-API-Patches/0155-Material-API-additions.patch b/Spigot-API-Patches/0154-Material-API-additions.patch
similarity index 92%
rename from Spigot-API-Patches/0155-Material-API-additions.patch
rename to Spigot-API-Patches/0154-Material-API-additions.patch
index 4c2e715a33..50b10db4d5 100644
--- a/Spigot-API-Patches/0155-Material-API-additions.patch
+++ b/Spigot-API-Patches/0154-Material-API-additions.patch
@@ -1,11 +1,11 @@
-From d87976c339606180aab0ee21966a692f21fe6c63 Mon Sep 17 00:00:00 2001
+From ca41b95550077f665eafda0196e09f76153f6a86 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 6 Oct 2018 21:14:29 -0400
 Subject: [PATCH] Material API additions
 
 
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index bb694bfb..a982092d 100644
+index b9838dc9..9a1c3724 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
 @@ -80,6 +80,7 @@ import org.jetbrains.annotations.Nullable;
diff --git a/Spigot-API-Patches/0156-Add-Material-Tags.patch b/Spigot-API-Patches/0155-Add-Material-Tags.patch
similarity index 99%
rename from Spigot-API-Patches/0156-Add-Material-Tags.patch
rename to Spigot-API-Patches/0155-Add-Material-Tags.patch
index df2371a92c..59bffa3401 100644
--- a/Spigot-API-Patches/0156-Add-Material-Tags.patch
+++ b/Spigot-API-Patches/0155-Add-Material-Tags.patch
@@ -1,4 +1,4 @@
-From 6e0a7a9708fd792e32acae5b03dc7d4c3aca021d Mon Sep 17 00:00:00 2001
+From ce227832021b02e082e046553625657ca85aed9e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 17 Jul 2018 01:27:15 -0400
 Subject: [PATCH] Add Material Tags
diff --git a/Spigot-API-Patches/0157-Allow-setting-the-vex-s-summoner.patch b/Spigot-API-Patches/0156-Allow-setting-the-vex-s-summoner.patch
similarity index 93%
rename from Spigot-API-Patches/0157-Allow-setting-the-vex-s-summoner.patch
rename to Spigot-API-Patches/0156-Allow-setting-the-vex-s-summoner.patch
index 6f3ddda761..2dbfe2c7a6 100644
--- a/Spigot-API-Patches/0157-Allow-setting-the-vex-s-summoner.patch
+++ b/Spigot-API-Patches/0156-Allow-setting-the-vex-s-summoner.patch
@@ -1,4 +1,4 @@
-From 313d42af8e15482fef26f3b7a600604215cdd5b7 Mon Sep 17 00:00:00 2001
+From ad855b07a8a9d5e3ad04f0419e107c4aefa71e23 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 6 Oct 2018 21:47:09 -0500
 Subject: [PATCH] Allow setting the vex's summoner
diff --git a/Spigot-API-Patches/0158-Add-LivingEntity-getTargetEntity.patch b/Spigot-API-Patches/0157-Add-LivingEntity-getTargetEntity.patch
similarity index 96%
rename from Spigot-API-Patches/0158-Add-LivingEntity-getTargetEntity.patch
rename to Spigot-API-Patches/0157-Add-LivingEntity-getTargetEntity.patch
index d3bd6c20c2..311359fe58 100644
--- a/Spigot-API-Patches/0158-Add-LivingEntity-getTargetEntity.patch
+++ b/Spigot-API-Patches/0157-Add-LivingEntity-getTargetEntity.patch
@@ -1,4 +1,4 @@
-From ff3cac69313d04099bc0005676832b9b92d7fb5e Mon Sep 17 00:00:00 2001
+From 04b7f7a20e837a9394b81b148c7b20949846f963 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 22 Sep 2018 00:32:53 -0500
 Subject: [PATCH] Add LivingEntity#getTargetEntity
@@ -6,7 +6,7 @@ Subject: [PATCH] Add LivingEntity#getTargetEntity
 
 diff --git a/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java b/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java
 new file mode 100644
-index 000000000..f52644fab
+index 00000000..f52644fa
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java
 @@ -0,0 +1,38 @@
@@ -49,7 +49,7 @@ index 000000000..f52644fab
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 6b2002ceb..757cc5826 100644
+index 9dc0d4ce..a78f390d 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -150,6 +150,50 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/Spigot-API-Patches/0159-Add-sun-related-API.patch b/Spigot-API-Patches/0158-Add-sun-related-API.patch
similarity index 93%
rename from Spigot-API-Patches/0159-Add-sun-related-API.patch
rename to Spigot-API-Patches/0158-Add-sun-related-API.patch
index b269a41150..a904fc5ee3 100644
--- a/Spigot-API-Patches/0159-Add-sun-related-API.patch
+++ b/Spigot-API-Patches/0158-Add-sun-related-API.patch
@@ -1,11 +1,11 @@
-From 20baf564f13aaaa1f0ec80f2b1695581523dda2c Mon Sep 17 00:00:00 2001
+From 469ebbbf30e5e73921440fc6192dfff2e496916d Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 Oct 2018 00:54:15 -0500
 Subject: [PATCH] Add sun related API
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 150c5af2..951eba31 100644
+index 93dd8742..1818e158 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -1508,6 +1508,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
diff --git a/Spigot-API-Patches/0160-Here-s-Johnny.patch b/Spigot-API-Patches/0159-Here-s-Johnny.patch
similarity index 96%
rename from Spigot-API-Patches/0160-Here-s-Johnny.patch
rename to Spigot-API-Patches/0159-Here-s-Johnny.patch
index 5f1c5392c2..1a2933f2f4 100644
--- a/Spigot-API-Patches/0160-Here-s-Johnny.patch
+++ b/Spigot-API-Patches/0159-Here-s-Johnny.patch
@@ -1,4 +1,4 @@
-From 0a5183f643ec62c7b54a00cd947bd76e8fff4549 Mon Sep 17 00:00:00 2001
+From 6337fde419a1700fa22d8e40995c4cfbdb36a124 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 12 Oct 2018 01:37:16 -0500
 Subject: [PATCH] Here's Johnny!
diff --git a/Spigot-API-Patches/0161-Turtle-API.patch b/Spigot-API-Patches/0160-Turtle-API.patch
similarity index 99%
rename from Spigot-API-Patches/0161-Turtle-API.patch
rename to Spigot-API-Patches/0160-Turtle-API.patch
index 62822edafc..ed9cfb8211 100644
--- a/Spigot-API-Patches/0161-Turtle-API.patch
+++ b/Spigot-API-Patches/0160-Turtle-API.patch
@@ -1,4 +1,4 @@
-From b0207fc37267ae453255af719476006e8c691228 Mon Sep 17 00:00:00 2001
+From f789dbd181102df5658bcd4a048056ab55b5b109 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 28 Sep 2018 17:08:09 -0500
 Subject: [PATCH] Turtle API
diff --git a/Spigot-API-Patches/0162-Implement-getters-and-setters-for-EntityItem-owner-a.patch b/Spigot-API-Patches/0161-Implement-getters-and-setters-for-EntityItem-owner-a.patch
similarity index 96%
rename from Spigot-API-Patches/0162-Implement-getters-and-setters-for-EntityItem-owner-a.patch
rename to Spigot-API-Patches/0161-Implement-getters-and-setters-for-EntityItem-owner-a.patch
index 204f56920d..f8488452dd 100644
--- a/Spigot-API-Patches/0162-Implement-getters-and-setters-for-EntityItem-owner-a.patch
+++ b/Spigot-API-Patches/0161-Implement-getters-and-setters-for-EntityItem-owner-a.patch
@@ -1,4 +1,4 @@
-From 4a214392891daf7fd2226846aa79e07b9ab49367 Mon Sep 17 00:00:00 2001
+From 3d3e7ad0541aba872975f6aeba753405727211ec Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 6 Oct 2018 20:54:13 -0500
 Subject: [PATCH] Implement getters and setters for EntityItem owner and
diff --git a/Spigot-API-Patches/0163-Add-spectator-target-events.patch b/Spigot-API-Patches/0162-Add-spectator-target-events.patch
similarity index 98%
rename from Spigot-API-Patches/0163-Add-spectator-target-events.patch
rename to Spigot-API-Patches/0162-Add-spectator-target-events.patch
index 7ea6ded0ba..f07d38f15d 100644
--- a/Spigot-API-Patches/0163-Add-spectator-target-events.patch
+++ b/Spigot-API-Patches/0162-Add-spectator-target-events.patch
@@ -1,4 +1,4 @@
-From 58eb9b3112c67d09fce2461a9ad9cf420d601472 Mon Sep 17 00:00:00 2001
+From 4304d246418a14fa2bedc2662bd5f9730dc5358f Mon Sep 17 00:00:00 2001
 From: Caleb Bassham <caleb.bassham@gmail.com>
 Date: Fri, 28 Sep 2018 02:30:56 -0500
 Subject: [PATCH] Add spectator target events
diff --git a/Spigot-API-Patches/0164-Add-more-Witch-API.patch b/Spigot-API-Patches/0163-Add-more-Witch-API.patch
similarity index 95%
rename from Spigot-API-Patches/0164-Add-more-Witch-API.patch
rename to Spigot-API-Patches/0163-Add-more-Witch-API.patch
index 2088bae2fc..464ece0d7b 100644
--- a/Spigot-API-Patches/0164-Add-more-Witch-API.patch
+++ b/Spigot-API-Patches/0163-Add-more-Witch-API.patch
@@ -1,4 +1,4 @@
-From 4d56256f208eb7e341e808fa2e9c829e1a64cf61 Mon Sep 17 00:00:00 2001
+From f3be0787b2990390ac5709f7069844505af7b986 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 12 Oct 2018 03:47:26 -0500
 Subject: [PATCH] Add more Witch API
diff --git a/Spigot-API-Patches/0165-Make-the-default-permission-message-configurable.patch b/Spigot-API-Patches/0164-Make-the-default-permission-message-configurable.patch
similarity index 97%
rename from Spigot-API-Patches/0165-Make-the-default-permission-message-configurable.patch
rename to Spigot-API-Patches/0164-Make-the-default-permission-message-configurable.patch
index 6ad6f1d391..a7987635e9 100644
--- a/Spigot-API-Patches/0165-Make-the-default-permission-message-configurable.patch
+++ b/Spigot-API-Patches/0164-Make-the-default-permission-message-configurable.patch
@@ -1,4 +1,4 @@
-From cb587e0bd55df4951e9a4cb976fc2e48aad27cc5 Mon Sep 17 00:00:00 2001
+From ba7c668ff92f66c985ec1aa036f1033d05aefe37 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 18 Nov 2018 19:44:54 +0000
 Subject: [PATCH] Make the default permission message configurable
diff --git a/Spigot-API-Patches/0166-Support-cancellation-supression-of-EntityDismount-Ve.patch b/Spigot-API-Patches/0165-Support-cancellation-supression-of-EntityDismount-Ve.patch
similarity index 98%
rename from Spigot-API-Patches/0166-Support-cancellation-supression-of-EntityDismount-Ve.patch
rename to Spigot-API-Patches/0165-Support-cancellation-supression-of-EntityDismount-Ve.patch
index ccc6c342ec..efd889ca23 100644
--- a/Spigot-API-Patches/0166-Support-cancellation-supression-of-EntityDismount-Ve.patch
+++ b/Spigot-API-Patches/0165-Support-cancellation-supression-of-EntityDismount-Ve.patch
@@ -1,4 +1,4 @@
-From 75492423338959a60f7831eff9e5e9a737d2f676 Mon Sep 17 00:00:00 2001
+From 6b95712581e254062c8447b0a028beb99ff2bb0b Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 18 Nov 2018 15:53:43 +0000
 Subject: [PATCH] Support cancellation supression of EntityDismount/VehicleExit
diff --git a/Spigot-API-Patches/0167-Add-more-Zombie-API.patch b/Spigot-API-Patches/0166-Add-more-Zombie-API.patch
similarity index 94%
rename from Spigot-API-Patches/0167-Add-more-Zombie-API.patch
rename to Spigot-API-Patches/0166-Add-more-Zombie-API.patch
index d0d7c220e5..b7946c156c 100644
--- a/Spigot-API-Patches/0167-Add-more-Zombie-API.patch
+++ b/Spigot-API-Patches/0166-Add-more-Zombie-API.patch
@@ -1,11 +1,11 @@
-From 7ad724db569c57628ef6ad4199f26140032c3159 Mon Sep 17 00:00:00 2001
+From 96132c23c6f6504490d612b90428a3545be7f024 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 Oct 2018 04:29:51 -0500
 Subject: [PATCH] Add more Zombie API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Zombie.java b/src/main/java/org/bukkit/entity/Zombie.java
-index ee2e70c6..74d6529a 100644
+index 6dcac979..fa7a43c3 100644
 --- a/src/main/java/org/bukkit/entity/Zombie.java
 +++ b/src/main/java/org/bukkit/entity/Zombie.java
 @@ -86,4 +86,55 @@ public interface Zombie extends Monster {
diff --git a/Spigot-API-Patches/0168-Change-the-reserved-channel-check-to-be-sensible.patch b/Spigot-API-Patches/0167-Change-the-reserved-channel-check-to-be-sensible.patch
similarity index 96%
rename from Spigot-API-Patches/0168-Change-the-reserved-channel-check-to-be-sensible.patch
rename to Spigot-API-Patches/0167-Change-the-reserved-channel-check-to-be-sensible.patch
index addbee7411..1b740898f3 100644
--- a/Spigot-API-Patches/0168-Change-the-reserved-channel-check-to-be-sensible.patch
+++ b/Spigot-API-Patches/0167-Change-the-reserved-channel-check-to-be-sensible.patch
@@ -1,4 +1,4 @@
-From d5abb48e4d10b87de170ca3471261b766960bc61 Mon Sep 17 00:00:00 2001
+From b36a48e067fabe4f9108ef31f6ce6d1373627bf5 Mon Sep 17 00:00:00 2001
 From: DoNotSpamPls <7570108+DoNotSpamPls@users.noreply.github.com>
 Date: Tue, 23 Oct 2018 19:32:55 +0300
 Subject: [PATCH] Change the reserved channel check to be sensible
diff --git a/Spigot-API-Patches/0169-Add-PlayerConnectionCloseEvent.patch b/Spigot-API-Patches/0168-Add-PlayerConnectionCloseEvent.patch
similarity index 98%
rename from Spigot-API-Patches/0169-Add-PlayerConnectionCloseEvent.patch
rename to Spigot-API-Patches/0168-Add-PlayerConnectionCloseEvent.patch
index 178d75c19e..874da577cc 100644
--- a/Spigot-API-Patches/0169-Add-PlayerConnectionCloseEvent.patch
+++ b/Spigot-API-Patches/0168-Add-PlayerConnectionCloseEvent.patch
@@ -1,4 +1,4 @@
-From 97a5ad5bffb496b0895e50927fc43cb4a9909b8f Mon Sep 17 00:00:00 2001
+From 46783a8013a1aa82f42a5c84ae431997e3e4aa87 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sun, 7 Oct 2018 12:05:06 -0700
 Subject: [PATCH] Add PlayerConnectionCloseEvent
diff --git a/Spigot-API-Patches/0170-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/Spigot-API-Patches/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
similarity index 97%
rename from Spigot-API-Patches/0170-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
rename to Spigot-API-Patches/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index e45ee971a1..f3539b118d 100644
--- a/Spigot-API-Patches/0170-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/Spigot-API-Patches/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
@@ -1,4 +1,4 @@
-From 7742ee299c1d018e0f7c0bb73870428e901dc42e Mon Sep 17 00:00:00 2001
+From 2cb8c205aecd5cf6721b1732608a91f1ffc647d2 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Wed, 2 Jan 2019 00:31:12 -0600
 Subject: [PATCH] Add APIs to replace OfflinePlayer#getLastPlayed
diff --git a/Spigot-API-Patches/0171-BlockDestroyEvent.patch b/Spigot-API-Patches/0170-BlockDestroyEvent.patch
similarity index 98%
rename from Spigot-API-Patches/0171-BlockDestroyEvent.patch
rename to Spigot-API-Patches/0170-BlockDestroyEvent.patch
index f337ef5c8e..168494a5bc 100644
--- a/Spigot-API-Patches/0171-BlockDestroyEvent.patch
+++ b/Spigot-API-Patches/0170-BlockDestroyEvent.patch
@@ -1,4 +1,4 @@
-From e159ad95e45ec024a8a765adc94c3eee46e06467 Mon Sep 17 00:00:00 2001
+From 3a8a74faebdfc13c20216048b001baee3de8b0eb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 6 Feb 2019 00:19:33 -0500
 Subject: [PATCH] BlockDestroyEvent
diff --git a/Spigot-API-Patches/0172-Add-ItemStack-Recipe-API-helper-methods.patch b/Spigot-API-Patches/0171-Add-ItemStack-Recipe-API-helper-methods.patch
similarity index 97%
rename from Spigot-API-Patches/0172-Add-ItemStack-Recipe-API-helper-methods.patch
rename to Spigot-API-Patches/0171-Add-ItemStack-Recipe-API-helper-methods.patch
index 13d2cd21e8..f0a13baa46 100644
--- a/Spigot-API-Patches/0172-Add-ItemStack-Recipe-API-helper-methods.patch
+++ b/Spigot-API-Patches/0171-Add-ItemStack-Recipe-API-helper-methods.patch
@@ -1,4 +1,4 @@
-From 2de9aa3c54fb5e949cf3dac28525918527141317 Mon Sep 17 00:00:00 2001
+From 1e59893d15dc6efa7eccc010b77adb814e57a6aa Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 28 Jan 2014 19:13:57 -0500
 Subject: [PATCH] Add ItemStack Recipe API helper methods
diff --git a/Spigot-API-Patches/0173-Add-WhitelistToggleEvent.patch b/Spigot-API-Patches/0172-Add-WhitelistToggleEvent.patch
similarity index 95%
rename from Spigot-API-Patches/0173-Add-WhitelistToggleEvent.patch
rename to Spigot-API-Patches/0172-Add-WhitelistToggleEvent.patch
index 880c038fb8..fa0272bb73 100644
--- a/Spigot-API-Patches/0173-Add-WhitelistToggleEvent.patch
+++ b/Spigot-API-Patches/0172-Add-WhitelistToggleEvent.patch
@@ -1,4 +1,4 @@
-From 80bd01a329efd26892f15e07c3502a4bf66e14e6 Mon Sep 17 00:00:00 2001
+From 956695150bce0d2d74ba337fd742a403e2edce7f Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Wed, 13 Mar 2019 20:04:43 +0200
 Subject: [PATCH] Add WhitelistToggleEvent
diff --git a/Spigot-API-Patches/0174-Annotation-Test-changes.patch b/Spigot-API-Patches/0173-Annotation-Test-changes.patch
similarity index 92%
rename from Spigot-API-Patches/0174-Annotation-Test-changes.patch
rename to Spigot-API-Patches/0173-Annotation-Test-changes.patch
index 5b680a444b..0ab3ab1dad 100644
--- a/Spigot-API-Patches/0174-Annotation-Test-changes.patch
+++ b/Spigot-API-Patches/0173-Annotation-Test-changes.patch
@@ -1,11 +1,11 @@
-From b336313faa48d320445d797f0057e88e42bb366e Mon Sep 17 00:00:00 2001
+From 1a26c0d087846c0ff615263216505475184cf2c4 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 17 Mar 2019 23:04:30 +0000
 Subject: [PATCH] Annotation Test changes
 
 
 diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
-index dfd6e137..596f2807 100644
+index cc6b6e20..328a5a16 100644
 --- a/src/test/java/org/bukkit/AnnotationTest.java
 +++ b/src/test/java/org/bukkit/AnnotationTest.java
 @@ -40,7 +40,17 @@ public class AnnotationTest {
diff --git a/Spigot-API-Patches/0175-Entity-getEntitySpawnReason.patch b/Spigot-API-Patches/0174-Entity-getEntitySpawnReason.patch
similarity index 93%
rename from Spigot-API-Patches/0175-Entity-getEntitySpawnReason.patch
rename to Spigot-API-Patches/0174-Entity-getEntitySpawnReason.patch
index 1f97512b1f..ca797a0fd4 100644
--- a/Spigot-API-Patches/0175-Entity-getEntitySpawnReason.patch
+++ b/Spigot-API-Patches/0174-Entity-getEntitySpawnReason.patch
@@ -1,4 +1,4 @@
-From 33c9867ff8e00e5f2903999c23cd50cd1f826362 Mon Sep 17 00:00:00 2001
+From 6eb4f8f6f02a2a720d97c5925953c48b247674eb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 24 Mar 2019 00:21:23 -0400
 Subject: [PATCH] Entity#getEntitySpawnReason
diff --git a/Spigot-API-Patches/0176-Add-GS4-Query-event.patch b/Spigot-API-Patches/0175-Add-GS4-Query-event.patch
similarity index 99%
rename from Spigot-API-Patches/0176-Add-GS4-Query-event.patch
rename to Spigot-API-Patches/0175-Add-GS4-Query-event.patch
index 68baedb28b..aa92978b15 100644
--- a/Spigot-API-Patches/0176-Add-GS4-Query-event.patch
+++ b/Spigot-API-Patches/0175-Add-GS4-Query-event.patch
@@ -1,4 +1,4 @@
-From b3a8a2440a3796371a4450a4e5b464f1f473674e Mon Sep 17 00:00:00 2001
+From 8af8a8fbf521cac34d701cd5436545c70e88ccaa Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Sun, 17 Mar 2019 21:46:27 +0200
 Subject: [PATCH] Add GS4 Query event
diff --git a/Spigot-API-Patches/0177-Add-PlayerPostRespawnEvent.patch b/Spigot-API-Patches/0176-Add-PlayerPostRespawnEvent.patch
similarity index 96%
rename from Spigot-API-Patches/0177-Add-PlayerPostRespawnEvent.patch
rename to Spigot-API-Patches/0176-Add-PlayerPostRespawnEvent.patch
index 90553c1b5a..79e07b3a24 100644
--- a/Spigot-API-Patches/0177-Add-PlayerPostRespawnEvent.patch
+++ b/Spigot-API-Patches/0176-Add-PlayerPostRespawnEvent.patch
@@ -1,4 +1,4 @@
-From c8a1fe8d001b65dc3a8c65b81e22e89955cc35bc Mon Sep 17 00:00:00 2001
+From f38ffb6d09efb22ea0368e835ed6c4c0fec23773 Mon Sep 17 00:00:00 2001
 From: MisterVector <whizkid3000@hotmail.com>
 Date: Fri, 26 Oct 2018 21:33:13 -0700
 Subject: [PATCH] Add PlayerPostRespawnEvent
diff --git a/Spigot-API-Patches/0178-Ignore-package-private-methods-for-nullability-annot.patch b/Spigot-API-Patches/0177-Ignore-package-private-methods-for-nullability-annot.patch
similarity index 91%
rename from Spigot-API-Patches/0178-Ignore-package-private-methods-for-nullability-annot.patch
rename to Spigot-API-Patches/0177-Ignore-package-private-methods-for-nullability-annot.patch
index 65a4a01107..e4383f544d 100644
--- a/Spigot-API-Patches/0178-Ignore-package-private-methods-for-nullability-annot.patch
+++ b/Spigot-API-Patches/0177-Ignore-package-private-methods-for-nullability-annot.patch
@@ -1,4 +1,4 @@
-From 08595b0bf9dcd0fbeb11f467ff604ae052e1418c Mon Sep 17 00:00:00 2001
+From 2927db66363b3ee30a315fd4041bf5a55b2af016 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 24 Mar 2019 18:44:26 -0400
 Subject: [PATCH] Ignore package-private methods for nullability annotations
@@ -6,7 +6,7 @@ Subject: [PATCH] Ignore package-private methods for nullability annotations
 This isn't API
 
 diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
-index 328a5a163..af2abd47f 100644
+index 328a5a16..af2abd47 100644
 --- a/src/test/java/org/bukkit/AnnotationTest.java
 +++ b/src/test/java/org/bukkit/AnnotationTest.java
 @@ -162,7 +162,7 @@ public class AnnotationTest {
diff --git a/Spigot-API-Patches/0179-Flip-some-Spigot-API-null-annotations.patch b/Spigot-API-Patches/0178-Flip-some-Spigot-API-null-annotations.patch
similarity index 98%
rename from Spigot-API-Patches/0179-Flip-some-Spigot-API-null-annotations.patch
rename to Spigot-API-Patches/0178-Flip-some-Spigot-API-null-annotations.patch
index bb1a768c42..d20fc827f3 100644
--- a/Spigot-API-Patches/0179-Flip-some-Spigot-API-null-annotations.patch
+++ b/Spigot-API-Patches/0178-Flip-some-Spigot-API-null-annotations.patch
@@ -1,4 +1,4 @@
-From 4227a867264d348f9ba7eecf6e1a5623287a56e2 Mon Sep 17 00:00:00 2001
+From fb262f912ed78da8575b03f61868f43dd5d63550 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 24 Mar 2019 18:39:01 -0400
 Subject: [PATCH] Flip some Spigot API null annotations
@@ -84,7 +84,7 @@ index 1cbb9bc6..27d3b5ad 100644
  
      /**
 diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
-index dca77bba..56734f8e 100644
+index 3cada348..03ba2265 100644
 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java
 +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
 @@ -3,6 +3,7 @@ package org.bukkit.inventory;
diff --git a/Spigot-API-Patches/0180-Server-Tick-Events.patch b/Spigot-API-Patches/0179-Server-Tick-Events.patch
similarity index 98%
rename from Spigot-API-Patches/0180-Server-Tick-Events.patch
rename to Spigot-API-Patches/0179-Server-Tick-Events.patch
index 194c8a4654..4475653ba4 100644
--- a/Spigot-API-Patches/0180-Server-Tick-Events.patch
+++ b/Spigot-API-Patches/0179-Server-Tick-Events.patch
@@ -1,4 +1,4 @@
-From ffa7e3f5b074f2785650cbfb172f80444d6a0548 Mon Sep 17 00:00:00 2001
+From 5490eac320d59394f00403eec705cbe774f2fd79 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 27 Mar 2019 21:58:55 -0400
 Subject: [PATCH] Server Tick Events
diff --git a/Spigot-API-Patches/0181-PlayerDeathEvent-getItemsToKeep.patch b/Spigot-API-Patches/0180-PlayerDeathEvent-getItemsToKeep.patch
similarity index 97%
rename from Spigot-API-Patches/0181-PlayerDeathEvent-getItemsToKeep.patch
rename to Spigot-API-Patches/0180-PlayerDeathEvent-getItemsToKeep.patch
index 3d82530256..1806b5ca81 100644
--- a/Spigot-API-Patches/0181-PlayerDeathEvent-getItemsToKeep.patch
+++ b/Spigot-API-Patches/0180-PlayerDeathEvent-getItemsToKeep.patch
@@ -1,4 +1,4 @@
-From c44389f13850fc2f9f8e5bef6ba3877cd44f5326 Mon Sep 17 00:00:00 2001
+From c9d19322171cba500160f8fd9c4373f854f3805c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 11 Mar 2013 20:04:34 -0400
 Subject: [PATCH] PlayerDeathEvent#getItemsToKeep
diff --git a/Spigot-API-Patches/0182-Add-Heightmap-API.patch b/Spigot-API-Patches/0181-Add-Heightmap-API.patch
similarity index 98%
rename from Spigot-API-Patches/0182-Add-Heightmap-API.patch
rename to Spigot-API-Patches/0181-Add-Heightmap-API.patch
index b3b2620cfd..d748ec6ab2 100644
--- a/Spigot-API-Patches/0182-Add-Heightmap-API.patch
+++ b/Spigot-API-Patches/0181-Add-Heightmap-API.patch
@@ -1,4 +1,4 @@
-From 3bfd84603554d6cbb91aec86b2a689ffa29cebae Mon Sep 17 00:00:00 2001
+From 30b569ca7446323f70c2582de9d0c3998d09ed2e Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sat, 1 Dec 2018 19:00:36 -0800
 Subject: [PATCH] Add Heightmap API
@@ -84,7 +84,7 @@ index 2a40da99..3e1ca4c9 100644
       * Creates explosion at this location with given power
       *
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 951eba31..2da92d39 100644
+index 1818e158..65dc8022 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -161,6 +161,79 @@ public interface World extends PluginMessageRecipient, Metadatable {
diff --git a/Spigot-API-Patches/0183-Mob-Spawner-API-Enhancements.patch b/Spigot-API-Patches/0182-Mob-Spawner-API-Enhancements.patch
similarity index 93%
rename from Spigot-API-Patches/0183-Mob-Spawner-API-Enhancements.patch
rename to Spigot-API-Patches/0182-Mob-Spawner-API-Enhancements.patch
index 9d61c45fd7..4e7bf951ae 100644
--- a/Spigot-API-Patches/0183-Mob-Spawner-API-Enhancements.patch
+++ b/Spigot-API-Patches/0182-Mob-Spawner-API-Enhancements.patch
@@ -1,4 +1,4 @@
-From 8a7fdc3db38d4b47cc8f1309e7426abfab179799 Mon Sep 17 00:00:00 2001
+From 9c1b7b7e74dce4fb6fbbd9e3979f9cd711e38141 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 19 Apr 2019 12:41:19 -0500
 Subject: [PATCH] Mob Spawner API Enhancements
diff --git a/Spigot-API-Patches/0184-Temp-track-ver-1.14-for-version-command.patch b/Spigot-API-Patches/0184-Temp-track-ver-1.14-for-version-command.patch
deleted file mode 100644
index 37604d519f..0000000000
--- a/Spigot-API-Patches/0184-Temp-track-ver-1.14-for-version-command.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From a5beefed41fd637dfed924034905e153109a350b Mon Sep 17 00:00:00 2001
-From: Shane Freeder <theboyetronic@gmail.com>
-Date: Tue, 7 May 2019 16:44:03 +0100
-Subject: [PATCH] Temp track ver/1.14 for version command
-
-
-diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-index 27f0cadd9..ece8d1c8a 100644
---- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-+++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-@@ -268,7 +268,7 @@ public class VersionCommand extends BukkitCommand {
-             return getFromJenkins(currentVer);
-         } catch (NumberFormatException ex) {
-             verInfo = verInfo.replace("\"", "");
--            return getFromRepo("PaperMC/Paper", "master", verInfo);
-+            return getFromRepo("PaperMC/Paper", "ver/1.14", verInfo); // Just for now
-         }
-             /*
-             BufferedReader reader = Resources.asCharSource(
--- 
-2.21.0
-
diff --git a/Spigot-Server-Patches/0018-Implement-Paper-VersionChecker.patch b/Spigot-Server-Patches/0018-Implement-Paper-VersionChecker.patch
new file mode 100644
index 0000000000..ed620822ae
--- /dev/null
+++ b/Spigot-Server-Patches/0018-Implement-Paper-VersionChecker.patch
@@ -0,0 +1,146 @@
+From b90b49851bbceb8edef5dc8d88bdb6633e6c9076 Mon Sep 17 00:00:00 2001
+From: Zach Brown <zach@zachbr.io>
+Date: Mon, 27 May 2019 03:40:05 -0500
+Subject: [PATCH] Implement Paper VersionChecker
+
+
+diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
+new file mode 100644
+index 000000000..ded51d042
+--- /dev/null
++++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
+@@ -0,0 +1,115 @@
++package com.destroystokyo.paper;
++
++import com.destroystokyo.paper.util.VersionFetcher;
++import com.google.common.base.Charsets;
++import com.google.common.io.Resources;
++import com.google.gson.*;
++
++import javax.annotation.Nonnull;
++import javax.annotation.Nullable;
++import java.io.*;
++import java.net.HttpURLConnection;
++import java.net.URL;
++
++public class PaperVersionFetcher implements VersionFetcher {
++    private static final java.util.regex.Pattern VER_PATTERN = java.util.regex.Pattern.compile("^([0-9\\.]*)\\-.*R"); // R is an anchor, will always give '-R' at end
++    private static final String GITHUB_BRANCH_NAME = "ver/1.14";
++    private static @Nullable String mcVer;
++
++    @Override
++    public long getCacheTime() {
++        return 720000;
++    }
++
++    @Nonnull
++    @Override
++    public String getVersionMessage(@Nonnull String serverVersion) {
++        String[] parts = serverVersion.substring("git-Paper-".length()).split("[-\\s]");
++        return getUpdateStatusMessage("PaperMC/Paper", GITHUB_BRANCH_NAME, parts[0]);
++    }
++
++    private static @Nullable String getMinecraftVersion() {
++        if (mcVer == null) {
++            java.util.regex.Matcher matcher = VER_PATTERN.matcher(org.bukkit.Bukkit.getBukkitVersion());
++            if (matcher.find()) {
++                String result = matcher.group();
++                mcVer = result.substring(0, result.length() - 2); // strip 'R' anchor and trailing '-'
++            } else {
++                org.bukkit.Bukkit.getLogger().warning("Unable to match version to pattern! Report to PaperMC!");
++                org.bukkit.Bukkit.getLogger().warning("Pattern: " + VER_PATTERN.toString());
++                org.bukkit.Bukkit.getLogger().warning("Version: " + org.bukkit.Bukkit.getBukkitVersion());
++            }
++        }
++
++        return mcVer;
++    }
++
++    private static String getUpdateStatusMessage(@Nonnull String repo, @Nonnull String branch, @Nonnull String versionInfo) {
++        int distance;
++        try {
++            int jenkinsBuild = Integer.parseInt(versionInfo);
++            distance = fetchDistanceFromSiteApi(jenkinsBuild, getMinecraftVersion());
++        } catch (NumberFormatException ignored) {
++            versionInfo = versionInfo.replace("\"", "");
++            distance = fetchDistanceFromGitHub(repo, branch, versionInfo);
++        }
++
++        switch (distance) {
++            case -1:
++                return "Error obtaining version information";
++            case 0:
++                return "You are running the latest version";
++            case -2:
++                return "Unknown version";
++            default:
++                return "You are " + distance + " version(s) behind";
++        }
++    }
++
++    private static int fetchDistanceFromSiteApi(int jenkinsBuild, @Nullable String siteApiVersion) {
++        if (siteApiVersion == null) { return -1; }
++        try {
++            try (BufferedReader reader = Resources.asCharSource(
++                new URL("https://papermc.io/api/v1/paper/" + siteApiVersion + "/latest"),
++                Charsets.UTF_8
++            ).openBufferedStream()) {
++                JsonObject json = new Gson().fromJson(reader, JsonObject.class);
++                int latest = json.get("build").getAsInt();
++                return latest - jenkinsBuild;
++            } catch (JsonSyntaxException ex) {
++                ex.printStackTrace();
++                return -1;
++            }
++        } catch (IOException e) {
++            e.printStackTrace();
++            return -1;
++        }
++    }
++
++    // Contributed by Techcable <Techcable@outlook.com> in GH-65
++    private static int fetchDistanceFromGitHub(@Nonnull String repo, @Nonnull String branch, @Nonnull String hash) {
++        try {
++            HttpURLConnection connection = (HttpURLConnection) new URL("https://api.github.com/repos/" + repo + "/compare/" + branch + "..." + hash).openConnection();
++            connection.connect();
++            if (connection.getResponseCode() == HttpURLConnection.HTTP_NOT_FOUND) return -2; // Unknown commit
++            try (BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream(), Charsets.UTF_8))) {
++                JsonObject obj = new Gson().fromJson(reader, JsonObject.class);
++                String status = obj.get("status").getAsString();
++                switch (status) {
++                    case "identical":
++                        return 0;
++                    case "behind":
++                        return obj.get("behind_by").getAsInt();
++                    default:
++                        return -1;
++                }
++            } catch (JsonSyntaxException | NumberFormatException e) {
++                e.printStackTrace();
++                return -1;
++            }
++        } catch (IOException e) {
++            e.printStackTrace();
++            return -1;
++        }
++    }
++}
+diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+index 6775bf043..bb29b329b 100644
+--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
++++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+@@ -276,6 +276,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
+     public String getTimingsServerName() {
+         return com.destroystokyo.paper.PaperConfig.timingsServerName;
+     }
++
++    @Override
++    public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
++        return new com.destroystokyo.paper.PaperVersionFetcher();
++    }
+     // Paper end
+ 
+     /**
+-- 
+2.21.0
+
diff --git a/Spigot-API-Patches/0092-Add-version-history-to-version-command.patch b/Spigot-Server-Patches/0019-Add-version-history-to-version-command.patch
similarity index 72%
rename from Spigot-API-Patches/0092-Add-version-history-to-version-command.patch
rename to Spigot-Server-Patches/0019-Add-version-history-to-version-command.patch
index 9f54dd5c53..cb8663549b 100644
--- a/Spigot-API-Patches/0092-Add-version-history-to-version-command.patch
+++ b/Spigot-Server-Patches/0019-Add-version-history-to-version-command.patch
@@ -1,15 +1,50 @@
-From 9ac21215adc9c6fb74467a43ee44d0366de3c0f1 Mon Sep 17 00:00:00 2001
+From 5740e3f1fbd1bcad809d4394f437ffffa3b87bed Mon Sep 17 00:00:00 2001
 From: Kyle Wood <demonwav@gmail.com>
 Date: Thu, 1 Mar 2018 19:37:52 -0600
 Subject: [PATCH] Add version history to version command
 
 
+diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
+index ded51d042..e0bd79f60 100644
+--- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
++++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
+@@ -25,7 +25,9 @@ public class PaperVersionFetcher implements VersionFetcher {
+     @Override
+     public String getVersionMessage(@Nonnull String serverVersion) {
+         String[] parts = serverVersion.substring("git-Paper-".length()).split("[-\\s]");
+-        return getUpdateStatusMessage("PaperMC/Paper", GITHUB_BRANCH_NAME, parts[0]);
++        String updateMessage = getUpdateStatusMessage("PaperMC/Paper", GITHUB_BRANCH_NAME, parts[0]);
++
++        return getHistory() + "\n" + updateMessage;
+     }
+ 
+     private static @Nullable String getMinecraftVersion() {
+@@ -112,4 +114,19 @@ public class PaperVersionFetcher implements VersionFetcher {
+             return -1;
+         }
+     }
++
++    @Nullable
++    private String getHistory() {
++        final VersionHistoryManager.VersionData data = VersionHistoryManager.INSTANCE.getVersionData();
++        if (data == null) {
++            return null;
++        }
++
++        final String oldVersion = data.getOldVersion();
++        if (oldVersion == null) {
++            return null;
++        }
++
++        return "Previous version: " + oldVersion;
++    }
+ }
 diff --git a/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java b/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java
 new file mode 100644
-index 00000000..648b247e
+index 000000000..aac3f66cb
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java
-@@ -0,0 +1,144 @@
+@@ -0,0 +1,145 @@
 +package com.destroystokyo.paper;
 +
 +import com.google.common.base.MoreObjects;
@@ -27,8 +62,9 @@ index 00000000..648b247e
 +import java.util.logging.Level;
 +import java.util.logging.Logger;
 +import org.bukkit.Bukkit;
-+import org.jetbrains.annotations.NotNull;
-+import org.jetbrains.annotations.Nullable;
++
++import javax.annotation.Nonnull;
++import javax.annotation.Nullable;
 +
 +public enum VersionHistoryManager {
 +    INSTANCE;
@@ -85,7 +121,7 @@ index 00000000..648b247e
 +        }
 +    }
 +
-+    private void writeFile(@NotNull final Path path) {
++    private void writeFile(@Nonnull final Path path) {
 +        try (final BufferedWriter writer = Files.newBufferedWriter(
 +            path,
 +            StandardCharsets.UTF_8,
@@ -154,49 +190,18 @@ index 00000000..648b247e
 +        }
 +    }
 +}
-diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-index 5a1f9504..a36ab04c 100644
---- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-+++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-@@ -31,6 +31,7 @@ import java.net.HttpURLConnection;
- import org.json.simple.JSONObject;
- import org.json.simple.parser.JSONParser;
- import org.json.simple.parser.ParseException;
-+import com.destroystokyo.paper.VersionHistoryManager;
- // Paper end
+diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
+index 19e2df309..f0e2250cd 100644
+--- a/src/main/java/net/minecraft/server/DedicatedServer.java
++++ b/src/main/java/net/minecraft/server/DedicatedServer.java
+@@ -160,6 +160,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+             return false;
+         }
+         com.destroystokyo.paper.PaperConfig.registerCommands();
++        com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now
+         // Paper end
  
- public class VersionCommand extends BukkitCommand {
-@@ -49,6 +50,7 @@ public class VersionCommand extends BukkitCommand {
- 
-         if (args.length == 0) {
-             sender.sendMessage("This server is running " + Bukkit.getName() + " version " + Bukkit.getVersion() + " (Implementing API version " + Bukkit.getBukkitVersion() + ")");
-+            tellHistory(sender); // Paper
-             sendVersion(sender);
-         } else {
-             StringBuilder name = new StringBuilder();
-@@ -85,6 +87,22 @@ public class VersionCommand extends BukkitCommand {
-         return true;
-     }
- 
-+    // Paper start - show version history
-+    private void tellHistory(final CommandSender sender) {
-+        final VersionHistoryManager.VersionData data = VersionHistoryManager.INSTANCE.getVersionData();
-+        if (data == null) {
-+            return;
-+        }
-+
-+        final String oldVersion = data.getOldVersion();
-+        if (oldVersion == null) {
-+            return;
-+        }
-+
-+        sender.sendMessage("Previous version: " + oldVersion);
-+    }
-+    // Paper end
-+
-     private void describeToSender(@NotNull Plugin plugin, @NotNull CommandSender sender) {
-         PluginDescriptionFile desc = plugin.getDescription();
-         sender.sendMessage(ChatColor.GREEN + desc.getName() + ChatColor.WHITE + " version " + ChatColor.GREEN + desc.getVersion());
+         this.setSpawnAnimals(dedicatedserverproperties.spawnAnimals);
 -- 
 2.21.0
 
diff --git a/Spigot-Server-Patches/0018-Player-affects-spawning-API.patch b/Spigot-Server-Patches/0020-Player-affects-spawning-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0018-Player-affects-spawning-API.patch
rename to Spigot-Server-Patches/0020-Player-affects-spawning-API.patch
index 02e85fcca0..a75fd475d9 100644
--- a/Spigot-Server-Patches/0018-Player-affects-spawning-API.patch
+++ b/Spigot-Server-Patches/0020-Player-affects-spawning-API.patch
@@ -1,4 +1,4 @@
-From 72c98e1673f146a01c9e8ea3ca44cbd2e55e4a8c Mon Sep 17 00:00:00 2001
+From 49c5bdc934ad55d573f1f70539b1b9a4e38ff4e2 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Tue, 1 Mar 2016 14:47:52 -0600
 Subject: [PATCH] Player affects spawning API
diff --git a/Spigot-Server-Patches/0019-Remove-invalid-mob-spawner-tile-entities.patch b/Spigot-Server-Patches/0021-Remove-invalid-mob-spawner-tile-entities.patch
similarity index 91%
rename from Spigot-Server-Patches/0019-Remove-invalid-mob-spawner-tile-entities.patch
rename to Spigot-Server-Patches/0021-Remove-invalid-mob-spawner-tile-entities.patch
index 2b1a7f0af9..08d954f5da 100644
--- a/Spigot-Server-Patches/0019-Remove-invalid-mob-spawner-tile-entities.patch
+++ b/Spigot-Server-Patches/0021-Remove-invalid-mob-spawner-tile-entities.patch
@@ -1,11 +1,11 @@
-From b3eef60e49a65dd67c160fd3fc6d11456b77c44e Mon Sep 17 00:00:00 2001
+From 8a87e6f9ebf29d370013a3b135f3ea3f91d96d1a Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 15:08:03 -0600
 Subject: [PATCH] Remove invalid mob spawner tile entities
 
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 4ec0c22233..318035a48e 100644
+index 4ec0c2223..318035a48 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -506,6 +506,10 @@ public class Chunk implements IChunkAccess {
diff --git a/Spigot-Server-Patches/0020-Optimize-TileEntity-Ticking.patch b/Spigot-Server-Patches/0022-Optimize-TileEntity-Ticking.patch
similarity index 97%
rename from Spigot-Server-Patches/0020-Optimize-TileEntity-Ticking.patch
rename to Spigot-Server-Patches/0022-Optimize-TileEntity-Ticking.patch
index c1222db2e0..64af3a4bb0 100644
--- a/Spigot-Server-Patches/0020-Optimize-TileEntity-Ticking.patch
+++ b/Spigot-Server-Patches/0022-Optimize-TileEntity-Ticking.patch
@@ -1,11 +1,11 @@
-From f394769c4ad8881b21c3e2931a2a01c075a241a3 Mon Sep 17 00:00:00 2001
+From 04b87f60ac11d2b82bb3ae15c16685042d298c6f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 8 Mar 2015 22:55:25 -0600
 Subject: [PATCH] Optimize TileEntity Ticking
 
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityChest.java b/src/main/java/net/minecraft/server/TileEntityChest.java
-index 271406f8bb..85b450c054 100644
+index 271406f8b..85b450c05 100644
 --- a/src/main/java/net/minecraft/server/TileEntityChest.java
 +++ b/src/main/java/net/minecraft/server/TileEntityChest.java
 @@ -7,7 +7,7 @@ import org.bukkit.craftbukkit.entity.CraftHumanEntity;
@@ -90,7 +90,7 @@ index 271406f8bb..85b450c054 100644
                  int newPower = Math.max(0, Math.min(15, this.viewingCount));
  
 diff --git a/src/main/java/net/minecraft/server/TileEntityEnderChest.java b/src/main/java/net/minecraft/server/TileEntityEnderChest.java
-index 6908f50031..ed5cdf177f 100644
+index 6908f5003..ed5cdf177 100644
 --- a/src/main/java/net/minecraft/server/TileEntityEnderChest.java
 +++ b/src/main/java/net/minecraft/server/TileEntityEnderChest.java
 @@ -1,6 +1,6 @@
diff --git a/Spigot-Server-Patches/0021-Further-improve-server-tick-loop.patch b/Spigot-Server-Patches/0023-Further-improve-server-tick-loop.patch
similarity index 98%
rename from Spigot-Server-Patches/0021-Further-improve-server-tick-loop.patch
rename to Spigot-Server-Patches/0023-Further-improve-server-tick-loop.patch
index c4826f386c..4d4625d6f2 100644
--- a/Spigot-Server-Patches/0021-Further-improve-server-tick-loop.patch
+++ b/Spigot-Server-Patches/0023-Further-improve-server-tick-loop.patch
@@ -1,4 +1,4 @@
-From b4b7ed644739b3d7f7131765ebb7af130ba70248 Mon Sep 17 00:00:00 2001
+From 872546911a19e8385a950c600ed0c7a7ddbb0ac3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 Mar 2016 23:09:29 -0600
 Subject: [PATCH] Further improve server tick loop
@@ -12,7 +12,7 @@ Previous implementation did not calculate TPS correctly.
 Switch to a realistic rolling average and factor in std deviation as an extra reporting variable
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 2fc8c192b3..cf7a75b2e2 100644
+index 2fc8c192b..cf7a75b2e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -150,7 +150,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -140,7 +140,7 @@ index 2fc8c192b3..cf7a75b2e2 100644
                      if (this.T) {
                          this.T = false;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e8a905c815..d97cba9c04 100644
+index e8a905c81..d97cba9c0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1923,6 +1923,17 @@ public final class CraftServer implements Server {
@@ -162,7 +162,7 @@ index e8a905c815..d97cba9c04 100644
      {
  
 diff --git a/src/main/java/org/spigotmc/TicksPerSecondCommand.java b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
-index be2e31deae..6d21c32692 100644
+index be2e31dea..6d21c3269 100644
 --- a/src/main/java/org/spigotmc/TicksPerSecondCommand.java
 +++ b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
 @@ -1,8 +1,5 @@
diff --git a/Spigot-Server-Patches/0022-Only-refresh-abilities-if-needed.patch b/Spigot-Server-Patches/0024-Only-refresh-abilities-if-needed.patch
similarity index 91%
rename from Spigot-Server-Patches/0022-Only-refresh-abilities-if-needed.patch
rename to Spigot-Server-Patches/0024-Only-refresh-abilities-if-needed.patch
index 4ba6e250d9..5f5ada7a69 100644
--- a/Spigot-Server-Patches/0022-Only-refresh-abilities-if-needed.patch
+++ b/Spigot-Server-Patches/0024-Only-refresh-abilities-if-needed.patch
@@ -1,11 +1,11 @@
-From 30114cb020556b26a53429e43b61641166f4ca02 Mon Sep 17 00:00:00 2001
+From 75c03fbc62f9440a76d2b6535e95087f8e0fb9dd Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 23:12:03 -0600
 Subject: [PATCH] Only refresh abilities if needed
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ffe29917ce..a3628b2c2c 100644
+index 6085f293d..26ee5444f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1330,12 +1330,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0023-Entity-Origin-API.patch b/Spigot-Server-Patches/0025-Entity-Origin-API.patch
similarity index 95%
rename from Spigot-Server-Patches/0023-Entity-Origin-API.patch
rename to Spigot-Server-Patches/0025-Entity-Origin-API.patch
index 90d79cb365..fc99b39ab0 100644
--- a/Spigot-Server-Patches/0023-Entity-Origin-API.patch
+++ b/Spigot-Server-Patches/0025-Entity-Origin-API.patch
@@ -1,11 +1,11 @@
-From 57df59aeea7c458019b13260624d79ef7f1704d7 Mon Sep 17 00:00:00 2001
+From c248766e22ec223907e3f01f655ed9914681bdf3 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 23:45:08 -0600
 Subject: [PATCH] Entity Origin API
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 899e6af69d..de57289fee 100644
+index 899e6af69..de57289fe 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -163,6 +163,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -51,7 +51,7 @@ index 899e6af69d..de57289fee 100644
          NBTTagList nbttaglist = new NBTTagList();
          double[] adouble1 = adouble;
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index 55591fbe05..90becdfdec 100644
+index 55591fbe0..90becdfde 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
 @@ -245,6 +245,14 @@ public class EntityFallingBlock extends Entity {
@@ -70,7 +70,7 @@ index 55591fbe05..90becdfdec 100644
  
      public void a(boolean flag) {
 diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
-index e3001570f9..e0535604b6 100644
+index e3001570f..e0535604b 100644
 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 @@ -104,6 +104,14 @@ public class EntityTNTPrimed extends Entity {
@@ -89,7 +89,7 @@ index e3001570f9..e0535604b6 100644
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/NBTTagList.java b/src/main/java/net/minecraft/server/NBTTagList.java
-index ce510c4867..b7c94fe238 100644
+index ce510c486..b7c94fe23 100644
 --- a/src/main/java/net/minecraft/server/NBTTagList.java
 +++ b/src/main/java/net/minecraft/server/NBTTagList.java
 @@ -161,6 +161,7 @@ public class NBTTagList extends NBTList<NBTBase> {
@@ -101,7 +101,7 @@ index ce510c4867..b7c94fe238 100644
          if (i >= 0 && i < this.list.size()) {
              NBTBase nbtbase = (NBTBase) this.list.get(i);
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 5a0d940bee..4710b79af7 100644
+index 5a0d940be..4710b79af 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1095,6 +1095,11 @@ public class WorldServer extends World {
@@ -117,7 +117,7 @@ index 5a0d940bee..4710b79af7 100644
  
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index a98f6f3389..d1d37c06bf 100644
+index a98f6f338..d1d37c06b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1009,4 +1009,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/Spigot-Server-Patches/0024-Prevent-tile-entity-and-entity-crashes.patch b/Spigot-Server-Patches/0026-Prevent-tile-entity-and-entity-crashes.patch
similarity index 96%
rename from Spigot-Server-Patches/0024-Prevent-tile-entity-and-entity-crashes.patch
rename to Spigot-Server-Patches/0026-Prevent-tile-entity-and-entity-crashes.patch
index 0bf275ad51..9e51021e28 100644
--- a/Spigot-Server-Patches/0024-Prevent-tile-entity-and-entity-crashes.patch
+++ b/Spigot-Server-Patches/0026-Prevent-tile-entity-and-entity-crashes.patch
@@ -1,11 +1,11 @@
-From fcbb62d33056f461daaa3d81fdfc0b8667bd29d8 Mon Sep 17 00:00:00 2001
+From 8027dc71e7d0b0467b17faa47ded3a1972a687ad Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 Mar 2016 23:52:34 -0600
 Subject: [PATCH] Prevent tile entity and entity crashes
 
 
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 095ef9ba51..b99bcbf8a4 100644
+index 095ef9ba5..b99bcbf8a 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -199,7 +199,12 @@ public abstract class TileEntity implements KeyedObject { // Paper
@@ -23,7 +23,7 @@ index 095ef9ba51..b99bcbf8a4 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index d659b7613f..4369574891 100644
+index d659b7613..436957489 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -718,11 +718,13 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
diff --git a/Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch b/Spigot-Server-Patches/0027-Configurable-top-of-nether-void-damage.patch
similarity index 95%
rename from Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch
rename to Spigot-Server-Patches/0027-Configurable-top-of-nether-void-damage.patch
index 9431131e34..030587ff51 100644
--- a/Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch
+++ b/Spigot-Server-Patches/0027-Configurable-top-of-nether-void-damage.patch
@@ -1,11 +1,11 @@
-From 34c016eb943d594c20a8e2445f4b31177a43a280 Mon Sep 17 00:00:00 2001
+From b0268160dfc28f598d49d21353df1a308d1e6bf4 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 23:58:50 -0600
 Subject: [PATCH] Configurable top of nether void damage
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 1ed58f4bba..a797a57671 100644
+index 1ed58f4bb..a797a5767 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -124,4 +124,19 @@ public class PaperWorldConfig {
@@ -29,7 +29,7 @@ index 1ed58f4bba..a797a57671 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index de57289fee..fef69c7c3f 100644
+index de57289fe..fef69c7c3 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -397,9 +397,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -75,7 +75,7 @@ index de57289fee..fef69c7c3f 100644
          this.die();
      }
 diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
-index 4d2ef9a02b..6fc332dbff 100644
+index 4d2ef9a02..6fc332dbf 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 @@ -182,9 +182,15 @@ public abstract class EntityMinecartAbstract extends Entity {
diff --git a/Spigot-Server-Patches/0026-Check-online-mode-before-converting-and-renaming-pla.patch b/Spigot-Server-Patches/0028-Check-online-mode-before-converting-and-renaming-pla.patch
similarity index 91%
rename from Spigot-Server-Patches/0026-Check-online-mode-before-converting-and-renaming-pla.patch
rename to Spigot-Server-Patches/0028-Check-online-mode-before-converting-and-renaming-pla.patch
index a1f2edfed6..f09d29a058 100644
--- a/Spigot-Server-Patches/0026-Check-online-mode-before-converting-and-renaming-pla.patch
+++ b/Spigot-Server-Patches/0028-Check-online-mode-before-converting-and-renaming-pla.patch
@@ -1,11 +1,11 @@
-From fa0eae868a9a3dc68fd35f43e31d6c70d69db1e0 Mon Sep 17 00:00:00 2001
+From 6cf080c4ed100a070e3a3db48082c746ef80494b Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 2 Mar 2016 00:03:55 -0600
 Subject: [PATCH] Check online mode before converting and renaming player data
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
-index e9e7d92584..e821dfbaf6 100644
+index 97bac7d25..a0254d8e5 100644
 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
 +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
 @@ -164,7 +164,7 @@ public class WorldNBTStorage implements IPlayerFileData {
diff --git a/Spigot-Server-Patches/0027-Always-tick-falling-blocks.patch b/Spigot-Server-Patches/0029-Always-tick-falling-blocks.patch
similarity index 92%
rename from Spigot-Server-Patches/0027-Always-tick-falling-blocks.patch
rename to Spigot-Server-Patches/0029-Always-tick-falling-blocks.patch
index 77cc943de2..6881b4f269 100644
--- a/Spigot-Server-Patches/0027-Always-tick-falling-blocks.patch
+++ b/Spigot-Server-Patches/0029-Always-tick-falling-blocks.patch
@@ -1,11 +1,11 @@
-From 5fa0966cfcf252ba31b9196baf0ed90e8ae237de Mon Sep 17 00:00:00 2001
+From bd7cb7fab75815ba9677495b140c3d279c54245b Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 2 Mar 2016 00:32:25 -0600
 Subject: [PATCH] Always tick falling blocks
 
 
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index bf35950867..8e1234c246 100644
+index 2daecf504..77f1563af 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -13,6 +13,7 @@ import net.minecraft.server.EntityCreature;
diff --git a/Spigot-Server-Patches/0028-Configurable-end-credits.patch b/Spigot-Server-Patches/0030-Configurable-end-credits.patch
similarity index 93%
rename from Spigot-Server-Patches/0028-Configurable-end-credits.patch
rename to Spigot-Server-Patches/0030-Configurable-end-credits.patch
index 1ba82e55ad..f1eb412d11 100644
--- a/Spigot-Server-Patches/0028-Configurable-end-credits.patch
+++ b/Spigot-Server-Patches/0030-Configurable-end-credits.patch
@@ -1,11 +1,11 @@
-From 96e182ab7959d4040f27304a92958605f8b05e5a Mon Sep 17 00:00:00 2001
+From 373b835aba474fdea61c957499a637dc6578a894 Mon Sep 17 00:00:00 2001
 From: DoctorDark <doctordark11@gmail.com>
 Date: Wed, 16 Mar 2016 02:21:39 -0500
 Subject: [PATCH] Configurable end credits
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index a797a57671..c2b9690a0c 100644
+index a797a5767..c2b9690a0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -139,4 +139,10 @@ public class PaperWorldConfig {
@@ -20,7 +20,7 @@ index a797a57671..c2b9690a0c 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 67988b6c6a..550e6714bc 100644
+index 995acea72..db0a559fe 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -60,7 +60,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0029-Fix-lag-from-explosions-processing-dead-entities.patch b/Spigot-Server-Patches/0031-Fix-lag-from-explosions-processing-dead-entities.patch
similarity index 93%
rename from Spigot-Server-Patches/0029-Fix-lag-from-explosions-processing-dead-entities.patch
rename to Spigot-Server-Patches/0031-Fix-lag-from-explosions-processing-dead-entities.patch
index 4df5dd5157..87c5e9aa37 100644
--- a/Spigot-Server-Patches/0029-Fix-lag-from-explosions-processing-dead-entities.patch
+++ b/Spigot-Server-Patches/0031-Fix-lag-from-explosions-processing-dead-entities.patch
@@ -1,11 +1,11 @@
-From 7db4d0c3eb67772cdffc6226fa7ccecc4a71be36 Mon Sep 17 00:00:00 2001
+From 3edf5fbf7fab81e91707ecd5feda12b3f91a0bfc Mon Sep 17 00:00:00 2001
 From: Iceee <andrew@opticgaming.tv>
 Date: Wed, 2 Mar 2016 01:39:52 -0600
 Subject: [PATCH] Fix lag from explosions processing dead entities
 
 
 diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
-index 462f8f33a1..e1c628f177 100644
+index 462f8f33a..e1c628f17 100644
 --- a/src/main/java/net/minecraft/server/Explosion.java
 +++ b/src/main/java/net/minecraft/server/Explosion.java
 @@ -146,7 +146,14 @@ public class Explosion {
@@ -25,7 +25,7 @@ index 462f8f33a1..e1c628f177 100644
  
          for (int l1 = 0; l1 < list.size(); ++l1) {
 diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
-index ac44db2543..035d70419d 100644
+index ac44db254..035d70419 100644
 --- a/src/main/java/net/minecraft/server/IEntitySelector.java
 +++ b/src/main/java/net/minecraft/server/IEntitySelector.java
 @@ -14,6 +14,7 @@ public final class IEntitySelector {
diff --git a/Spigot-Server-Patches/0030-Optimize-explosions.patch b/Spigot-Server-Patches/0032-Optimize-explosions.patch
similarity index 98%
rename from Spigot-Server-Patches/0030-Optimize-explosions.patch
rename to Spigot-Server-Patches/0032-Optimize-explosions.patch
index 623c8ba9eb..df96032c09 100644
--- a/Spigot-Server-Patches/0030-Optimize-explosions.patch
+++ b/Spigot-Server-Patches/0032-Optimize-explosions.patch
@@ -1,4 +1,4 @@
-From 75cb51560e9968f48a6d132d9659b2fa39383267 Mon Sep 17 00:00:00 2001
+From fc3123da2e3b645b7f3b041a28f8a6cf5ba7762f Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 11:59:48 -0600
 Subject: [PATCH] Optimize explosions
@@ -123,7 +123,7 @@ index e1c628f17..bcff11761 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index db60cbc7b..31c9917f9 100644
+index cf7a75b2e..454e28fc4 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1131,6 +1131,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -135,7 +135,7 @@ index db60cbc7b..31c9917f9 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index cfbe3d592..6cd8b8ede 100644
+index 436957489..c792b713f 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -19,6 +19,7 @@ import org.apache.logging.log4j.util.Supplier;
diff --git a/Spigot-Server-Patches/0031-Disable-explosion-knockback.patch b/Spigot-Server-Patches/0033-Disable-explosion-knockback.patch
similarity index 95%
rename from Spigot-Server-Patches/0031-Disable-explosion-knockback.patch
rename to Spigot-Server-Patches/0033-Disable-explosion-knockback.patch
index 5cd22293c9..c0eb1e3248 100644
--- a/Spigot-Server-Patches/0031-Disable-explosion-knockback.patch
+++ b/Spigot-Server-Patches/0033-Disable-explosion-knockback.patch
@@ -1,11 +1,11 @@
-From 8f2350f0a8682976968073072d82217c8b358034 Mon Sep 17 00:00:00 2001
+From 7111287522a84789636c89dcc2eace0dc4bb2814 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 14:48:03 -0600
 Subject: [PATCH] Disable explosion knockback
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index a5ec0bc0e0..6a307d5dd6 100644
+index a5ec0bc0e..6a307d5dd 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -151,4 +151,9 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index a5ec0bc0e0..6a307d5dd6 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 85567a7072..d85172e728 100644
+index d630b1be1..2212f3198 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1112,6 +1112,7 @@ public abstract class EntityLiving extends Entity {
@@ -48,7 +48,7 @@ index 85567a7072..d85172e728 100644
                  if (!this.f(damagesource)) {
                      SoundEffect soundeffect = this.getSoundDeath();
 diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
-index bcff117619..6eeff4ce59 100644
+index bcff11761..6eeff4ce5 100644
 --- a/src/main/java/net/minecraft/server/Explosion.java
 +++ b/src/main/java/net/minecraft/server/Explosion.java
 @@ -188,14 +188,14 @@ public class Explosion {
diff --git a/Spigot-Server-Patches/0032-Disable-thunder.patch b/Spigot-Server-Patches/0034-Disable-thunder.patch
similarity index 96%
rename from Spigot-Server-Patches/0032-Disable-thunder.patch
rename to Spigot-Server-Patches/0034-Disable-thunder.patch
index 8c3f1d6b16..a78e4d5eb2 100644
--- a/Spigot-Server-Patches/0032-Disable-thunder.patch
+++ b/Spigot-Server-Patches/0034-Disable-thunder.patch
@@ -1,4 +1,4 @@
-From 85b1459df312dda2ed54ccd2fc404ad06a89d70e Mon Sep 17 00:00:00 2001
+From 735d20a751f13594e2a2326e4ff8a2c361ea4a8e Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 14:52:43 -0600
 Subject: [PATCH] Disable thunder
diff --git a/Spigot-Server-Patches/0033-Disable-ice-and-snow.patch b/Spigot-Server-Patches/0035-Disable-ice-and-snow.patch
similarity index 96%
rename from Spigot-Server-Patches/0033-Disable-ice-and-snow.patch
rename to Spigot-Server-Patches/0035-Disable-ice-and-snow.patch
index 4a58207b2a..5d9a47fdb8 100644
--- a/Spigot-Server-Patches/0033-Disable-ice-and-snow.patch
+++ b/Spigot-Server-Patches/0035-Disable-ice-and-snow.patch
@@ -1,4 +1,4 @@
-From ddd20750e2a793c72044738fe3940936127eb6b5 Mon Sep 17 00:00:00 2001
+From 75fe9bdeea87e7fd94963c78f278e6db61e6fb80 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 14:57:24 -0600
 Subject: [PATCH] Disable ice and snow
diff --git a/Spigot-Server-Patches/0034-Configurable-mob-spawner-tick-rate.patch b/Spigot-Server-Patches/0036-Configurable-mob-spawner-tick-rate.patch
similarity index 94%
rename from Spigot-Server-Patches/0034-Configurable-mob-spawner-tick-rate.patch
rename to Spigot-Server-Patches/0036-Configurable-mob-spawner-tick-rate.patch
index 1cbeaa306b..784e23f133 100644
--- a/Spigot-Server-Patches/0034-Configurable-mob-spawner-tick-rate.patch
+++ b/Spigot-Server-Patches/0036-Configurable-mob-spawner-tick-rate.patch
@@ -1,11 +1,11 @@
-From 7b29308aadabc42681f9c94fba7ac381947d1f01 Mon Sep 17 00:00:00 2001
+From 0ddb763372e5551b2769d995f5f6ec8e44720fea Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 15:03:53 -0600
 Subject: [PATCH] Configurable mob spawner tick rate
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 8db5c3f3fe..e4e00e2e1c 100644
+index 8db5c3f3f..e4e00e2e1 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -166,4 +166,9 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index 8db5c3f3fe..e4e00e2e1c 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index 4db5fd641f..6499d27e63 100644
+index a2140cb6c..b3af4ba23 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -23,6 +23,7 @@ public abstract class MobSpawnerAbstract {
diff --git a/Spigot-Server-Patches/0035-Send-absolute-position-the-first-time-an-entity-is-s.patch b/Spigot-Server-Patches/0037-Send-absolute-position-the-first-time-an-entity-is-s.patch
similarity index 97%
rename from Spigot-Server-Patches/0035-Send-absolute-position-the-first-time-an-entity-is-s.patch
rename to Spigot-Server-Patches/0037-Send-absolute-position-the-first-time-an-entity-is-s.patch
index f84c37d0e0..b6cf0edce0 100644
--- a/Spigot-Server-Patches/0035-Send-absolute-position-the-first-time-an-entity-is-s.patch
+++ b/Spigot-Server-Patches/0037-Send-absolute-position-the-first-time-an-entity-is-s.patch
@@ -1,11 +1,11 @@
-From 86fde0759e459ea013497fca2cd7e5530edcb049 Mon Sep 17 00:00:00 2001
+From 7e48e573bfe3e61492bcb527101c2ad6515fc570 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Wed, 2 Mar 2016 23:13:07 -0600
 Subject: [PATCH] Send absolute position the first time an entity is seen
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index 315c3d9165..aaf3a54b08 100644
+index 315c3d916..aaf3a54b0 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -2,6 +2,7 @@ package net.minecraft.server;
@@ -77,7 +77,7 @@ index 315c3d9165..aaf3a54b08 100644
  
                  this.c();
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index b52809e13e..cf20da1685 100644
+index b52809e13..cf20da168 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -1015,10 +1015,14 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
diff --git a/Spigot-Server-Patches/0036-Add-BeaconEffectEvent.patch b/Spigot-Server-Patches/0038-Add-BeaconEffectEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0036-Add-BeaconEffectEvent.patch
rename to Spigot-Server-Patches/0038-Add-BeaconEffectEvent.patch
index 06f2ee307b..727ddef1f5 100644
--- a/Spigot-Server-Patches/0036-Add-BeaconEffectEvent.patch
+++ b/Spigot-Server-Patches/0038-Add-BeaconEffectEvent.patch
@@ -1,11 +1,11 @@
-From bcf9690c17928aade39c3cf8769f9cdbd33b7cc3 Mon Sep 17 00:00:00 2001
+From 41c3aa292936f2d523dfbd56f40d3a82262cde95 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 23:30:53 -0600
 Subject: [PATCH] Add BeaconEffectEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityBeacon.java b/src/main/java/net/minecraft/server/TileEntityBeacon.java
-index 8837dc4542..87f77bb86b 100644
+index 8fd4f4bf7..0612a446a 100644
 --- a/src/main/java/net/minecraft/server/TileEntityBeacon.java
 +++ b/src/main/java/net/minecraft/server/TileEntityBeacon.java
 @@ -14,6 +14,11 @@ import org.bukkit.craftbukkit.potion.CraftPotionUtil;
diff --git a/Spigot-Server-Patches/0037-Configurable-container-update-tick-rate.patch b/Spigot-Server-Patches/0039-Configurable-container-update-tick-rate.patch
similarity index 93%
rename from Spigot-Server-Patches/0037-Configurable-container-update-tick-rate.patch
rename to Spigot-Server-Patches/0039-Configurable-container-update-tick-rate.patch
index 3db5747be6..7a4ba2e212 100644
--- a/Spigot-Server-Patches/0037-Configurable-container-update-tick-rate.patch
+++ b/Spigot-Server-Patches/0039-Configurable-container-update-tick-rate.patch
@@ -1,11 +1,11 @@
-From 1b44495fde971b1629df210ba39c03af28d125ed Mon Sep 17 00:00:00 2001
+From 02f36547d23e1af8afedf1c7e031c288b8a97a1b Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 23:34:44 -0600
 Subject: [PATCH] Configurable container update tick rate
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e4e00e2e1c..d663b15ceb 100644
+index e4e00e2e1..d663b15ce 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -171,4 +171,9 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index e4e00e2e1c..d663b15ceb 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 550e6714bc..409443356a 100644
+index db0a559fe..7eaef7f6b 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -72,6 +72,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0038-Use-UserCache-for-player-heads.patch b/Spigot-Server-Patches/0040-Use-UserCache-for-player-heads.patch
similarity index 91%
rename from Spigot-Server-Patches/0038-Use-UserCache-for-player-heads.patch
rename to Spigot-Server-Patches/0040-Use-UserCache-for-player-heads.patch
index 4110c5557d..e3f14b04da 100644
--- a/Spigot-Server-Patches/0038-Use-UserCache-for-player-heads.patch
+++ b/Spigot-Server-Patches/0040-Use-UserCache-for-player-heads.patch
@@ -1,11 +1,11 @@
-From c0388a11bd083d4ad27ce482b73392570976b7b2 Mon Sep 17 00:00:00 2001
+From bed33fb7866d2760f7fb79a8b8534c7468de5764 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Wed, 2 Mar 2016 23:42:37 -0600
 Subject: [PATCH] Use UserCache for player heads
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-index c83bebe709..0136e1bfe1 100644
+index c83bebe70..0136e1bfe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 @@ -155,7 +155,13 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
diff --git a/Spigot-Server-Patches/0039-Disable-spigot-tick-limiters.patch b/Spigot-Server-Patches/0041-Disable-spigot-tick-limiters.patch
similarity index 92%
rename from Spigot-Server-Patches/0039-Disable-spigot-tick-limiters.patch
rename to Spigot-Server-Patches/0041-Disable-spigot-tick-limiters.patch
index 324e0cbc33..da0c5dab9b 100644
--- a/Spigot-Server-Patches/0039-Disable-spigot-tick-limiters.patch
+++ b/Spigot-Server-Patches/0041-Disable-spigot-tick-limiters.patch
@@ -1,11 +1,11 @@
-From 96a5e81f64bf7dd5431e78b5b08080e88f9e2340 Mon Sep 17 00:00:00 2001
+From eb9ae3776e369402d182595469709c374a4f254a Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 2 Mar 2016 23:45:17 -0600
 Subject: [PATCH] Disable spigot tick limiters
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index c792b713fc..6d900669d7 100644
+index c792b713f..6d900669d 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -689,9 +689,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
diff --git a/Spigot-Server-Patches/0040-Add-PlayerInitialSpawnEvent.patch b/Spigot-Server-Patches/0042-Add-PlayerInitialSpawnEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0040-Add-PlayerInitialSpawnEvent.patch
rename to Spigot-Server-Patches/0042-Add-PlayerInitialSpawnEvent.patch
index 04c89b192e..646890af68 100644
--- a/Spigot-Server-Patches/0040-Add-PlayerInitialSpawnEvent.patch
+++ b/Spigot-Server-Patches/0042-Add-PlayerInitialSpawnEvent.patch
@@ -1,4 +1,4 @@
-From a5b32ed2ffc293d938bc77d6aab460e110d72a1b Mon Sep 17 00:00:00 2001
+From ec739e1cdd5521ae380b82b57928bb0c77f5061f Mon Sep 17 00:00:00 2001
 From: Steve Anton <anxuiz.nx@gmail.com>
 Date: Thu, 3 Mar 2016 00:09:38 -0600
 Subject: [PATCH] Add PlayerInitialSpawnEvent
diff --git a/Spigot-Server-Patches/0041-Configurable-Disabling-Cat-Chest-Detection.patch b/Spigot-Server-Patches/0043-Configurable-Disabling-Cat-Chest-Detection.patch
similarity index 93%
rename from Spigot-Server-Patches/0041-Configurable-Disabling-Cat-Chest-Detection.patch
rename to Spigot-Server-Patches/0043-Configurable-Disabling-Cat-Chest-Detection.patch
index 39b0a140c7..e2275353b7 100644
--- a/Spigot-Server-Patches/0041-Configurable-Disabling-Cat-Chest-Detection.patch
+++ b/Spigot-Server-Patches/0043-Configurable-Disabling-Cat-Chest-Detection.patch
@@ -1,4 +1,4 @@
-From c453ea6fa9dccc9e8c61d9f07842f5364377539e Mon Sep 17 00:00:00 2001
+From bbe0f21f7cd3c2f44aa4e67a1edf3262979f012c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 01:13:45 -0600
 Subject: [PATCH] Configurable Disabling Cat Chest Detection
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Disabling Cat Chest Detection
 Offers a gameplay feature to stop cats from blocking chests
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index d663b15ceb..2782970393 100644
+index d663b15ce..278297039 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -176,4 +176,9 @@ public class PaperWorldConfig {
@@ -20,7 +20,7 @@ index d663b15ceb..2782970393 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockChest.java b/src/main/java/net/minecraft/server/BlockChest.java
-index 6b1c64e8f3..ee9d91a8c1 100644
+index 6b1c64e8f..ee9d91a8c 100644
 --- a/src/main/java/net/minecraft/server/BlockChest.java
 +++ b/src/main/java/net/minecraft/server/BlockChest.java
 @@ -280,6 +280,11 @@ public class BlockChest extends BlockTileEntity implements IBlockWaterlogged {
diff --git a/Spigot-Server-Patches/0042-Ensure-commands-are-not-ran-async.patch b/Spigot-Server-Patches/0044-Ensure-commands-are-not-ran-async.patch
similarity index 96%
rename from Spigot-Server-Patches/0042-Ensure-commands-are-not-ran-async.patch
rename to Spigot-Server-Patches/0044-Ensure-commands-are-not-ran-async.patch
index bde196b137..a73e0d4abf 100644
--- a/Spigot-Server-Patches/0042-Ensure-commands-are-not-ran-async.patch
+++ b/Spigot-Server-Patches/0044-Ensure-commands-are-not-ran-async.patch
@@ -1,4 +1,4 @@
-From 16a2ee411f4aa6292cf8f94b00b89e58f594641f Mon Sep 17 00:00:00 2001
+From 193308e8db069bec82d2856cce908670e58ea31a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 01:17:12 -0600
 Subject: [PATCH] Ensure commands are not ran async
@@ -14,7 +14,7 @@ big slowdown in execution but throwing an exception at same time to raise awaren
 that it is happening so that plugin authors can fix their code to stop executing commands async.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index e07f4a9680..c73fd79666 100644
+index a7104e966..f2e96da81 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1578,6 +1578,29 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -48,7 +48,7 @@ index e07f4a9680..c73fd79666 100644
          } else if (this.player.getChatFlags() == EnumChatVisibility.SYSTEM) {
              // Do nothing, this is coming from a plugin
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 72902d2f5d..8551073ab2 100644
+index d97cba9c0..a29b7b792 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -704,6 +704,29 @@ public final class CraftServer implements Server {
@@ -82,7 +82,7 @@ index 72902d2f5d..8551073ab2 100644
              return true;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
-index ddef523ea8..70f8d42992 100644
+index ddef523ea..70f8d4299 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
 @@ -13,6 +13,7 @@ public class ServerShutdownThread extends Thread {
@@ -94,7 +94,7 @@ index ddef523ea8..70f8d42992 100644
          } finally {
              try {
 diff --git a/src/main/java/org/spigotmc/AsyncCatcher.java b/src/main/java/org/spigotmc/AsyncCatcher.java
-index aeed769725..9f7d2ef932 100644
+index aeed76972..9f7d2ef93 100644
 --- a/src/main/java/org/spigotmc/AsyncCatcher.java
 +++ b/src/main/java/org/spigotmc/AsyncCatcher.java
 @@ -6,6 +6,7 @@ public class AsyncCatcher
@@ -106,7 +106,7 @@ index aeed769725..9f7d2ef932 100644
      public static void catchOp(String reason)
      {
 diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java
-index e7b953ca31..ccea803f58 100644
+index e7b953ca3..ccea803f5 100644
 --- a/src/main/java/org/spigotmc/RestartCommand.java
 +++ b/src/main/java/org/spigotmc/RestartCommand.java
 @@ -43,6 +43,7 @@ public class RestartCommand extends Command
diff --git a/Spigot-Server-Patches/0043-All-chunks-are-slime-spawn-chunks-toggle.patch b/Spigot-Server-Patches/0045-All-chunks-are-slime-spawn-chunks-toggle.patch
similarity index 92%
rename from Spigot-Server-Patches/0043-All-chunks-are-slime-spawn-chunks-toggle.patch
rename to Spigot-Server-Patches/0045-All-chunks-are-slime-spawn-chunks-toggle.patch
index 6cf6c89326..009533e1e8 100644
--- a/Spigot-Server-Patches/0043-All-chunks-are-slime-spawn-chunks-toggle.patch
+++ b/Spigot-Server-Patches/0045-All-chunks-are-slime-spawn-chunks-toggle.patch
@@ -1,11 +1,11 @@
-From 3eec776d3820e492a821d9cb3d2ad417cf1935cf Mon Sep 17 00:00:00 2001
+From 2896f18be8082df36920c4478f6d070cd1e3a9bc Mon Sep 17 00:00:00 2001
 From: vemacs <d@nkmem.es>
 Date: Thu, 3 Mar 2016 01:19:22 -0600
 Subject: [PATCH] All chunks are slime spawn chunks toggle
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 2782970393..be91b11242 100644
+index 278297039..be91b1124 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -181,4 +181,9 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index 2782970393..be91b11242 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java
-index 3140a49e1c..8115b1e4ec 100644
+index 30bc933c2..96cf4bcce 100644
 --- a/src/main/java/net/minecraft/server/EntitySlime.java
 +++ b/src/main/java/net/minecraft/server/EntitySlime.java
 @@ -276,7 +276,7 @@ public class EntitySlime extends EntityInsentient implements IMonster {
diff --git a/Spigot-Server-Patches/0044-Optimize-Pathfinding.patch b/Spigot-Server-Patches/0046-Optimize-Pathfinding.patch
similarity index 96%
rename from Spigot-Server-Patches/0044-Optimize-Pathfinding.patch
rename to Spigot-Server-Patches/0046-Optimize-Pathfinding.patch
index 7cc59d6280..8c0bcd7d8f 100644
--- a/Spigot-Server-Patches/0044-Optimize-Pathfinding.patch
+++ b/Spigot-Server-Patches/0046-Optimize-Pathfinding.patch
@@ -1,4 +1,4 @@
-From e0e3c441b8dfa2892f00363d9cf15f337a1a98b3 Mon Sep 17 00:00:00 2001
+From b9c1926cb0c745f8fb394d57c4966b7264a76d16 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 02:02:07 -0600
 Subject: [PATCH] Optimize Pathfinding
diff --git a/Spigot-Server-Patches/0045-Expose-server-CommandMap.patch b/Spigot-Server-Patches/0047-Expose-server-CommandMap.patch
similarity index 85%
rename from Spigot-Server-Patches/0045-Expose-server-CommandMap.patch
rename to Spigot-Server-Patches/0047-Expose-server-CommandMap.patch
index ef454414c9..fcf372d4ec 100644
--- a/Spigot-Server-Patches/0045-Expose-server-CommandMap.patch
+++ b/Spigot-Server-Patches/0047-Expose-server-CommandMap.patch
@@ -1,11 +1,11 @@
-From 9a6df7e78a63ba269903c9ad72ce7820692e0974 Mon Sep 17 00:00:00 2001
+From a9f87d27fac27702fbbc8cf0b84786be08c7841b Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 3 Mar 2016 02:15:57 -0600
 Subject: [PATCH] Expose server CommandMap
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8551073ab2..bb20024ba2 100644
+index a29b7b792..00b8fcb30 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1582,6 +1582,7 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0046-Be-a-bit-more-informative-in-maxHealth-exception.patch b/Spigot-Server-Patches/0048-Be-a-bit-more-informative-in-maxHealth-exception.patch
similarity index 92%
rename from Spigot-Server-Patches/0046-Be-a-bit-more-informative-in-maxHealth-exception.patch
rename to Spigot-Server-Patches/0048-Be-a-bit-more-informative-in-maxHealth-exception.patch
index 11dd0a0113..cc58e10ebe 100644
--- a/Spigot-Server-Patches/0046-Be-a-bit-more-informative-in-maxHealth-exception.patch
+++ b/Spigot-Server-Patches/0048-Be-a-bit-more-informative-in-maxHealth-exception.patch
@@ -1,11 +1,11 @@
-From 7e0b08302812c2d2d74c1b981d2d1ccf9168d1a6 Mon Sep 17 00:00:00 2001
+From e21f94a077a0825523fcae4e77694381192518e4 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 3 Mar 2016 02:18:39 -0600
 Subject: [PATCH] Be a bit more informative in maxHealth exception
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 2e007d4ffc..82b3c0a7de 100644
+index 2e007d4ff..82b3c0a7d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -104,7 +104,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/Spigot-Server-Patches/0047-Player-Tab-List-and-Title-APIs.patch b/Spigot-Server-Patches/0049-Player-Tab-List-and-Title-APIs.patch
similarity index 97%
rename from Spigot-Server-Patches/0047-Player-Tab-List-and-Title-APIs.patch
rename to Spigot-Server-Patches/0049-Player-Tab-List-and-Title-APIs.patch
index 2ac839eb34..35220f6f91 100644
--- a/Spigot-Server-Patches/0047-Player-Tab-List-and-Title-APIs.patch
+++ b/Spigot-Server-Patches/0049-Player-Tab-List-and-Title-APIs.patch
@@ -1,11 +1,11 @@
-From be4d46773160f8c9ce10bcd3f1ecff3f5e7673e8 Mon Sep 17 00:00:00 2001
+From 78ba910a19023702a8a74487ebcf0a0268b336d0 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Thu, 3 Mar 2016 02:32:10 -0600
 Subject: [PATCH] Player Tab List and Title APIs
 
 
 diff --git a/src/main/java/net/minecraft/server/IChatBaseComponent.java b/src/main/java/net/minecraft/server/IChatBaseComponent.java
-index aa8601920b..6e867e2347 100644
+index aa8601920..6e867e234 100644
 --- a/src/main/java/net/minecraft/server/IChatBaseComponent.java
 +++ b/src/main/java/net/minecraft/server/IChatBaseComponent.java
 @@ -433,6 +433,7 @@ public interface IChatBaseComponent extends Message, Iterable<IChatBaseComponent
@@ -17,7 +17,7 @@ index aa8601920b..6e867e2347 100644
          public static IChatBaseComponent a(String s) {
              return (IChatBaseComponent) ChatDeserializer.a(IChatBaseComponent.ChatSerializer.a, s, IChatBaseComponent.class, false);
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutTitle.java b/src/main/java/net/minecraft/server/PacketPlayOutTitle.java
-index 3a6e780007..535056c64e 100644
+index 3a6e78000..535056c64 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutTitle.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutTitle.java
 @@ -43,12 +43,29 @@ public class PacketPlayOutTitle implements Packet<PacketListenerPlayOut> {
@@ -52,7 +52,7 @@ index 3a6e780007..535056c64e 100644
  
          if (this.a == PacketPlayOutTitle.EnumTitleAction.TIMES) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a3628b2c2c..00be351e07 100644
+index 26ee5444f..a09c02a1c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1,5 +1,6 @@
diff --git a/Spigot-Server-Patches/0048-Ensure-inv-drag-is-in-bounds.patch b/Spigot-Server-Patches/0050-Ensure-inv-drag-is-in-bounds.patch
similarity index 90%
rename from Spigot-Server-Patches/0048-Ensure-inv-drag-is-in-bounds.patch
rename to Spigot-Server-Patches/0050-Ensure-inv-drag-is-in-bounds.patch
index 9cd4a474b5..90e7924dd1 100644
--- a/Spigot-Server-Patches/0048-Ensure-inv-drag-is-in-bounds.patch
+++ b/Spigot-Server-Patches/0050-Ensure-inv-drag-is-in-bounds.patch
@@ -1,11 +1,11 @@
-From 55aad3b4034fa8a84069684e9dca4cddfd304fc5 Mon Sep 17 00:00:00 2001
+From 14e217c38aef00311746e82de53c24f08a995c19 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:33:53 -0600
 Subject: [PATCH] Ensure inv drag is in bounds
 
 
 diff --git a/src/main/java/net/minecraft/server/Container.java b/src/main/java/net/minecraft/server/Container.java
-index 7a27993476..a2805011df 100644
+index 7a2799347..a2805011d 100644
 --- a/src/main/java/net/minecraft/server/Container.java
 +++ b/src/main/java/net/minecraft/server/Container.java
 @@ -201,7 +201,7 @@ public abstract class Container {
diff --git a/Spigot-Server-Patches/0049-Change-implementation-of-tile-entity-removal-list.patch b/Spigot-Server-Patches/0051-Change-implementation-of-tile-entity-removal-list.patch
similarity index 91%
rename from Spigot-Server-Patches/0049-Change-implementation-of-tile-entity-removal-list.patch
rename to Spigot-Server-Patches/0051-Change-implementation-of-tile-entity-removal-list.patch
index 64e6e79c00..a765598b06 100644
--- a/Spigot-Server-Patches/0049-Change-implementation-of-tile-entity-removal-list.patch
+++ b/Spigot-Server-Patches/0051-Change-implementation-of-tile-entity-removal-list.patch
@@ -1,4 +1,4 @@
-From 7ac114444af9a40097a33c0061bfde8eb0b33208 Mon Sep 17 00:00:00 2001
+From 5714232edbc1210d08b4aa3ac09f10d5545932ca Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:39:54 -0600
 Subject: [PATCH] Change implementation of (tile)entity removal list
@@ -6,7 +6,7 @@ Subject: [PATCH] Change implementation of (tile)entity removal list
 use sets for faster removal
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index c78d48872..074944718 100644
+index 6d900669d..72435a2c0 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -40,7 +40,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
diff --git a/Spigot-Server-Patches/0050-Add-configurable-portal-search-radius.patch b/Spigot-Server-Patches/0052-Add-configurable-portal-search-radius.patch
similarity index 93%
rename from Spigot-Server-Patches/0050-Add-configurable-portal-search-radius.patch
rename to Spigot-Server-Patches/0052-Add-configurable-portal-search-radius.patch
index 7b9012904b..9eefd59421 100644
--- a/Spigot-Server-Patches/0050-Add-configurable-portal-search-radius.patch
+++ b/Spigot-Server-Patches/0052-Add-configurable-portal-search-radius.patch
@@ -1,11 +1,11 @@
-From 0cdb3904fef11c54f90e1e0e323d36b039a0e82e Mon Sep 17 00:00:00 2001
+From 7b9635a220e06f4be8da1b0f7b446ce506068b1d Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:46:17 -0600
 Subject: [PATCH] Add configurable portal search radius
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index be91b11242..320fd07c62 100644
+index be91b1124..320fd07c6 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -186,4 +186,9 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index be91b11242..320fd07c62 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java
-index 13f80ac832..02e5487efb 100644
+index 576fd6172..524dc7daa 100644
 --- a/src/main/java/net/minecraft/server/PortalTravelAgent.java
 +++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java
 @@ -70,10 +70,11 @@ public class PortalTravelAgent {
diff --git a/Spigot-Server-Patches/0051-Add-velocity-warnings.patch b/Spigot-Server-Patches/0053-Add-velocity-warnings.patch
similarity index 96%
rename from Spigot-Server-Patches/0051-Add-velocity-warnings.patch
rename to Spigot-Server-Patches/0053-Add-velocity-warnings.patch
index 63b0709899..c90db49cfd 100644
--- a/Spigot-Server-Patches/0051-Add-velocity-warnings.patch
+++ b/Spigot-Server-Patches/0053-Add-velocity-warnings.patch
@@ -1,11 +1,11 @@
-From 789cd00899d4fbcbb5379909561c1bcae7648929 Mon Sep 17 00:00:00 2001
+From 347f8cdf5fb277a0f890d37684d941ab79d948fa Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:48:12 -0600
 Subject: [PATCH] Add velocity warnings
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index bb20024ba2..120c3a613b 100644
+index 00b8fcb30..03e5d34be 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -230,6 +230,7 @@ public final class CraftServer implements Server {
@@ -17,7 +17,7 @@ index bb20024ba2..120c3a613b 100644
      static {
          ConfigurationSerialization.registerClass(CraftOfflinePlayer.class);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index cc493ab7f7..0b7fc359d9 100644
+index d1d37c06b..ed496d03a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -405,10 +405,41 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -63,7 +63,7 @@ index cc493ab7f7..0b7fc359d9 100644
      public double getHeight() {
          return getHandle().getHeight();
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index 70b187190f..56f5f54bd1 100644
+index 70b187190..56f5f54bd 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -76,7 +76,19 @@ public class WatchdogThread extends Thread
diff --git a/Spigot-Server-Patches/0052-Configurable-inter-world-teleportation-safety.patch b/Spigot-Server-Patches/0054-Configurable-inter-world-teleportation-safety.patch
similarity index 97%
rename from Spigot-Server-Patches/0052-Configurable-inter-world-teleportation-safety.patch
rename to Spigot-Server-Patches/0054-Configurable-inter-world-teleportation-safety.patch
index 54d82737ff..3fb1315872 100644
--- a/Spigot-Server-Patches/0052-Configurable-inter-world-teleportation-safety.patch
+++ b/Spigot-Server-Patches/0054-Configurable-inter-world-teleportation-safety.patch
@@ -1,4 +1,4 @@
-From 80433e682612d8e0b754118af2bb420a252c8055 Mon Sep 17 00:00:00 2001
+From aef9e9ba6a4e9c9845d0b20ae4409549507ef1cd Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Thu, 3 Mar 2016 02:50:31 -0600
 Subject: [PATCH] Configurable inter-world teleportation safety
diff --git a/Spigot-Server-Patches/0053-Add-exception-reporting-event.patch b/Spigot-Server-Patches/0055-Add-exception-reporting-event.patch
similarity index 97%
rename from Spigot-Server-Patches/0053-Add-exception-reporting-event.patch
rename to Spigot-Server-Patches/0055-Add-exception-reporting-event.patch
index ea57b15e40..2d131f2c41 100644
--- a/Spigot-Server-Patches/0053-Add-exception-reporting-event.patch
+++ b/Spigot-Server-Patches/0055-Add-exception-reporting-event.patch
@@ -1,4 +1,4 @@
-From 3fe8c35abd7b40ad2ac20e7a686e33fd42fff9c3 Mon Sep 17 00:00:00 2001
+From 1d08ce42eb8d7e6ed4444f43f381302b251ac0e1 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 03:15:41 -0600
 Subject: [PATCH] Add exception reporting event
@@ -6,7 +6,7 @@ Subject: [PATCH] Add exception reporting event
 
 diff --git a/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java b/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java
 new file mode 100644
-index 0000000000..f699ce18ca
+index 000000000..f699ce18c
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java
 @@ -0,0 +1,38 @@
@@ -49,7 +49,7 @@ index 0000000000..f699ce18ca
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 318035a48e..879a491920 100644
+index 318035a48..879a49192 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -1,5 +1,6 @@
@@ -80,7 +80,7 @@ index 318035a48e..879a491920 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 7a93c8eca8..c3320e3c44 100644
+index 7a93c8eca..c3320e3c4 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -16,6 +16,9 @@ import java.util.function.BooleanSupplier;
@@ -94,7 +94,7 @@ index 7a93c8eca8..c3320e3c44 100644
  public class ChunkProviderServer extends IChunkProvider {
  
 diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
-index 1dd793d2fb..61ea2818b1 100644
+index 1dd793d2f..61ea2818b 100644
 --- a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
 +++ b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
 @@ -1,5 +1,6 @@
@@ -121,7 +121,7 @@ index 1dd793d2fb..61ea2818b1 100644
                         }
                          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index cf20da1685..7ee32d4922 100644
+index cf20da168..7ee32d492 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -578,6 +578,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -141,7 +141,7 @@ index cf20da1685..7ee32d4922 100644
              }
          }
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index d4a9af975d..88b5aa3a51 100644
+index d4a9af975..88b5aa3a5 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -1,5 +1,6 @@
@@ -168,7 +168,7 @@ index d4a9af975d..88b5aa3a51 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index 90f891beae..cbf05926a6 100644
+index 90f891bea..cbf05926a 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -8,6 +8,7 @@ import org.apache.logging.log4j.LogManager;
@@ -196,7 +196,7 @@ index 90f891beae..cbf05926a6 100644
                              }
  
 diff --git a/src/main/java/net/minecraft/server/VillageSiege.java b/src/main/java/net/minecraft/server/VillageSiege.java
-index beeb9ccb8d..bb3aa4a376 100644
+index beeb9ccb8..bb3aa4a37 100644
 --- a/src/main/java/net/minecraft/server/VillageSiege.java
 +++ b/src/main/java/net/minecraft/server/VillageSiege.java
 @@ -1,5 +1,7 @@
@@ -216,7 +216,7 @@ index beeb9ccb8d..bb3aa4a376 100644
              }
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 72435a2c07..373d08b23a 100644
+index 72435a2c0..373d08b23 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -2,6 +2,9 @@ package net.minecraft.server;
@@ -255,7 +255,7 @@ index 72435a2c07..373d08b23a 100644
              return;
              // Paper end
 diff --git a/src/main/java/net/minecraft/server/WorldPersistentData.java b/src/main/java/net/minecraft/server/WorldPersistentData.java
-index 3c5b3fe101..47a4ea9985 100644
+index 3c5b3fe10..47a4ea998 100644
 --- a/src/main/java/net/minecraft/server/WorldPersistentData.java
 +++ b/src/main/java/net/minecraft/server/WorldPersistentData.java
 @@ -113,6 +113,7 @@ public class WorldPersistentData {
@@ -267,7 +267,7 @@ index 3c5b3fe101..47a4ea9985 100644
          } finally {
              if (pushbackinputstream != null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 8823f94f7b..552daf4376 100644
+index 8823f94f7..552daf437 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -16,6 +16,9 @@ import java.util.concurrent.atomic.AtomicInteger;
diff --git a/Spigot-Server-Patches/0054-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch b/Spigot-Server-Patches/0056-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
similarity index 93%
rename from Spigot-Server-Patches/0054-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
rename to Spigot-Server-Patches/0056-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
index 2e8f25e442..8b1186fb0b 100644
--- a/Spigot-Server-Patches/0054-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
+++ b/Spigot-Server-Patches/0056-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
@@ -1,4 +1,4 @@
-From 4d06ddd34329ea79d1a5fde510b9f360cafb0b24 Mon Sep 17 00:00:00 2001
+From 1b9570e9180e38839d6d39ac2a9667d84c63647e Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Tue, 8 Mar 2016 18:28:43 -0800
 Subject: [PATCH] Don't nest if we don't need to when cerealising text
@@ -6,7 +6,7 @@ Subject: [PATCH] Don't nest if we don't need to when cerealising text
 
 
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutChat.java b/src/main/java/net/minecraft/server/PacketPlayOutChat.java
-index fa4eab5b0b..0ab611564e 100644
+index fa4eab5b0..0ab611564 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutChat.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutChat.java
 @@ -29,7 +29,14 @@ public class PacketPlayOutChat implements Packet<PacketListenerPlayOut> {
diff --git a/Spigot-Server-Patches/0055-Disable-Scoreboards-for-non-players-by-default.patch b/Spigot-Server-Patches/0057-Disable-Scoreboards-for-non-players-by-default.patch
similarity index 93%
rename from Spigot-Server-Patches/0055-Disable-Scoreboards-for-non-players-by-default.patch
rename to Spigot-Server-Patches/0057-Disable-Scoreboards-for-non-players-by-default.patch
index 5d0033d620..319bd50b90 100644
--- a/Spigot-Server-Patches/0055-Disable-Scoreboards-for-non-players-by-default.patch
+++ b/Spigot-Server-Patches/0057-Disable-Scoreboards-for-non-players-by-default.patch
@@ -1,4 +1,4 @@
-From 3585e8276df5489e11fde61e640a57058196b052 Mon Sep 17 00:00:00 2001
+From 86502886d45b0f486ce2ffa05f003251afa0ed62 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 8 Mar 2016 23:25:45 -0500
 Subject: [PATCH] Disable Scoreboards for non players by default
@@ -11,7 +11,7 @@ So avoid looking up scoreboards and short circuit to the "not on a team"
 logic which is most likely to be true.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 94f5c90b3c..30f0dcfd51 100644
+index 94f5c90b3..30f0dcfd5 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -196,4 +196,9 @@ public class PaperWorldConfig {
@@ -25,7 +25,7 @@ index 94f5c90b3c..30f0dcfd51 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index fef69c7c3f..da99714450 100644
+index fef69c7c3..da9971445 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2213,6 +2213,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -37,7 +37,7 @@ index fef69c7c3f..da99714450 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 2212f31986..2fd9ebe7ec 100644
+index 2212f3198..2fd9ebe7e 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -578,6 +578,7 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0056-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-Server-Patches/0058-Add-methods-for-working-with-arrows-stuck-in-living-.patch
similarity index 90%
rename from Spigot-Server-Patches/0056-Add-methods-for-working-with-arrows-stuck-in-living-.patch
rename to Spigot-Server-Patches/0058-Add-methods-for-working-with-arrows-stuck-in-living-.patch
index 3d792f650d..fb0f68c94a 100644
--- a/Spigot-Server-Patches/0056-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/Spigot-Server-Patches/0058-Add-methods-for-working-with-arrows-stuck-in-living-.patch
@@ -1,11 +1,11 @@
-From c36465cf4b9b842a5e7ddf25797abf6f72bb5b30 Mon Sep 17 00:00:00 2001
+From d34919be9cd4477522345cde214da56d535c6f92 Mon Sep 17 00:00:00 2001
 From: mrapple <tony@oc.tc>
 Date: Sun, 25 Nov 2012 13:43:39 -0600
 Subject: [PATCH] Add methods for working with arrows stuck in living entities
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 82b3c0a7de..aa50435bec 100644
+index 82b3c0a7d..aa50435be 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -598,4 +598,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/Spigot-Server-Patches/0057-Complete-resource-pack-API.patch b/Spigot-Server-Patches/0059-Complete-resource-pack-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0057-Complete-resource-pack-API.patch
rename to Spigot-Server-Patches/0059-Complete-resource-pack-API.patch
index 2532449eeb..fcdad739b2 100644
--- a/Spigot-Server-Patches/0057-Complete-resource-pack-API.patch
+++ b/Spigot-Server-Patches/0059-Complete-resource-pack-API.patch
@@ -1,4 +1,4 @@
-From f11f25626aa4897c7e9ac28f6cf4b4af9e2e960e Mon Sep 17 00:00:00 2001
+From 0b94d796699403daf18f18e33b59b39b9f9ede1f Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 4 Apr 2015 23:17:52 -0400
 Subject: [PATCH] Complete resource pack API
diff --git a/Spigot-Server-Patches/0058-Chunk-Save-Reattempt.patch b/Spigot-Server-Patches/0060-Chunk-Save-Reattempt.patch
similarity index 97%
rename from Spigot-Server-Patches/0058-Chunk-Save-Reattempt.patch
rename to Spigot-Server-Patches/0060-Chunk-Save-Reattempt.patch
index 9b83407c91..ebb51c0cad 100644
--- a/Spigot-Server-Patches/0058-Chunk-Save-Reattempt.patch
+++ b/Spigot-Server-Patches/0060-Chunk-Save-Reattempt.patch
@@ -1,4 +1,4 @@
-From d38104d04a34c19ab958709583fbfe9eeb32b222 Mon Sep 17 00:00:00 2001
+From 1efc7501388c4bcf6414352067bca5b30503016a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 4 Mar 2013 23:46:10 -0500
 Subject: [PATCH] Chunk Save Reattempt
diff --git a/Spigot-Server-Patches/0059-Default-loading-permissions.yml-before-plugins.patch b/Spigot-Server-Patches/0061-Default-loading-permissions.yml-before-plugins.patch
similarity index 96%
rename from Spigot-Server-Patches/0059-Default-loading-permissions.yml-before-plugins.patch
rename to Spigot-Server-Patches/0061-Default-loading-permissions.yml-before-plugins.patch
index 4bb197bb8e..adefecd001 100644
--- a/Spigot-Server-Patches/0059-Default-loading-permissions.yml-before-plugins.patch
+++ b/Spigot-Server-Patches/0061-Default-loading-permissions.yml-before-plugins.patch
@@ -1,4 +1,4 @@
-From d20fbc24184765b10e29fab20f6afae079f13ad4 Mon Sep 17 00:00:00 2001
+From 8663eb2b698d8986a399d6060fd5b3d4c4c2a8d5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 13:17:38 -0400
 Subject: [PATCH] Default loading permissions.yml before plugins
@@ -30,7 +30,7 @@ index 0c65afccf..6cc99ffe4 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 93499ad4e..c22d730ee 100644
+index 03e5d34be..6b1eb8b3a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -364,6 +364,7 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0060-Allow-Reloading-of-Custom-Permissions.patch b/Spigot-Server-Patches/0062-Allow-Reloading-of-Custom-Permissions.patch
similarity index 93%
rename from Spigot-Server-Patches/0060-Allow-Reloading-of-Custom-Permissions.patch
rename to Spigot-Server-Patches/0062-Allow-Reloading-of-Custom-Permissions.patch
index 686e4c7fa5..17fa446856 100644
--- a/Spigot-Server-Patches/0060-Allow-Reloading-of-Custom-Permissions.patch
+++ b/Spigot-Server-Patches/0062-Allow-Reloading-of-Custom-Permissions.patch
@@ -1,4 +1,4 @@
-From 20fd4a7f1c069d95060617fb16f35f8ba4b26397 Mon Sep 17 00:00:00 2001
+From 175764c80ff7de7c218b419ce841b83a4d59b8df Mon Sep 17 00:00:00 2001
 From: William <admin@domnian.com>
 Date: Fri, 18 Mar 2016 03:30:17 -0400
 Subject: [PATCH] Allow Reloading of Custom Permissions
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Custom Permissions
 https://github.com/PaperMC/Paper/issues/49
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 10588bc672..4d3a246ee5 100644
+index 6b1eb8b3a..dbc58436c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2033,5 +2033,23 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0061-Remove-Metadata-on-reload.patch b/Spigot-Server-Patches/0063-Remove-Metadata-on-reload.patch
similarity index 92%
rename from Spigot-Server-Patches/0061-Remove-Metadata-on-reload.patch
rename to Spigot-Server-Patches/0063-Remove-Metadata-on-reload.patch
index b1d3b692c8..693b17f287 100644
--- a/Spigot-Server-Patches/0061-Remove-Metadata-on-reload.patch
+++ b/Spigot-Server-Patches/0063-Remove-Metadata-on-reload.patch
@@ -1,4 +1,4 @@
-From 616a1b27492ade45ede12846a3777483571eade3 Mon Sep 17 00:00:00 2001
+From dc8aa52ba9b344ae5b6514c3e684b5f32c1bceb4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 13:50:14 -0400
 Subject: [PATCH] Remove Metadata on reload
@@ -7,7 +7,7 @@ Metadata is not meant to persist reload as things break badly with non primitive
 This will remove metadata on reload so it does not crash everything if a plugin uses it.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 591d3702b5..cf9594ea2b 100644
+index dbc58436c..954eb497b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -795,8 +795,18 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0062-Undead-horse-leashing.patch b/Spigot-Server-Patches/0064-Undead-horse-leashing.patch
similarity index 92%
rename from Spigot-Server-Patches/0062-Undead-horse-leashing.patch
rename to Spigot-Server-Patches/0064-Undead-horse-leashing.patch
index 63bf4e6baa..2846830b39 100644
--- a/Spigot-Server-Patches/0062-Undead-horse-leashing.patch
+++ b/Spigot-Server-Patches/0064-Undead-horse-leashing.patch
@@ -1,4 +1,4 @@
-From 989e29da01a1fe8a5673b645ea326833b94d7391 Mon Sep 17 00:00:00 2001
+From 85a9949f6c8ea7a989f1ddb18dc7ed65df78be11 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 14:19:19 -0400
 Subject: [PATCH] Undead horse leashing
@@ -6,7 +6,7 @@ Subject: [PATCH] Undead horse leashing
 default false to match vanilla, but option to allow undead horse types to be leashed.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 30f0dcfd51..89556dc94a 100644
+index 30f0dcfd5..89556dc94 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -201,4 +201,9 @@ public class PaperWorldConfig {
@@ -20,7 +20,7 @@ index 30f0dcfd51..89556dc94a 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
-index e9f34c9307..8ce2fca806 100644
+index e9f34c930..8ce2fca80 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
 @@ -107,7 +107,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
diff --git a/Spigot-Server-Patches/0063-Handle-Item-Meta-Inconsistencies.patch b/Spigot-Server-Patches/0065-Handle-Item-Meta-Inconsistencies.patch
similarity index 98%
rename from Spigot-Server-Patches/0063-Handle-Item-Meta-Inconsistencies.patch
rename to Spigot-Server-Patches/0065-Handle-Item-Meta-Inconsistencies.patch
index 6ef0893759..fca3dcae54 100644
--- a/Spigot-Server-Patches/0063-Handle-Item-Meta-Inconsistencies.patch
+++ b/Spigot-Server-Patches/0065-Handle-Item-Meta-Inconsistencies.patch
@@ -1,4 +1,4 @@
-From 059159f7ef5559325d589a7702c9c16eb9d07d60 Mon Sep 17 00:00:00 2001
+From e81e85ec09ef4d3437f8dd2beee01fef91d9d539 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 28 May 2015 23:00:19 -0400
 Subject: [PATCH] Handle Item Meta Inconsistencies
@@ -18,7 +18,7 @@ For consistency, the old API methods now forward to use the
 ItemMeta API equivalents, and should deprecate the old API's.
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index aa6a58dd88..b643a41235 100644
+index aa6a58dd8..b643a4123 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -7,6 +7,8 @@ import com.mojang.brigadier.StringReader;
@@ -78,7 +78,7 @@ index aa6a58dd88..b643a41235 100644
  
      public boolean hasEnchantments() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 5d71addb0c..00497350a3 100644
+index 5d71addb0..00497350a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -178,28 +178,11 @@ public final class CraftItemStack extends ItemStack {
@@ -193,7 +193,7 @@ index 5d71addb0c..00497350a3 100644
  
      static Map<Enchantment, Integer> getEnchantments(net.minecraft.server.ItemStack item) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index ab77a37e75..0d513e1f33 100644
+index 7c8b515bc..bf7b226a4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -24,6 +24,7 @@ import java.util.ArrayList;
diff --git a/Spigot-Server-Patches/0064-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/Spigot-Server-Patches/0066-Configurable-Non-Player-Arrow-Despawn-Rate.patch
similarity index 94%
rename from Spigot-Server-Patches/0064-Configurable-Non-Player-Arrow-Despawn-Rate.patch
rename to Spigot-Server-Patches/0066-Configurable-Non-Player-Arrow-Despawn-Rate.patch
index 8bbf89e1ff..8a7bdd78cc 100644
--- a/Spigot-Server-Patches/0064-Configurable-Non-Player-Arrow-Despawn-Rate.patch
+++ b/Spigot-Server-Patches/0066-Configurable-Non-Player-Arrow-Despawn-Rate.patch
@@ -1,4 +1,4 @@
-From cf9d4765f9a0d62dc30e80f49f03bdc67c590c8c Mon Sep 17 00:00:00 2001
+From a109d2bc17727a91414d823c6490c4e248e653b3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 15:12:22 -0400
 Subject: [PATCH] Configurable Non Player Arrow Despawn Rate
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Non Player Arrow Despawn Rate
 Can set a much shorter despawn rate for arrows that players can not pick up.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 89556dc94a..98049567f4 100644
+index 89556dc94..98049567f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -206,4 +206,19 @@ public class PaperWorldConfig {
@@ -30,7 +30,7 @@ index 89556dc94a..98049567f4 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index bc391812d3..b5b569ef95 100644
+index b50f996b6..531bb7f66 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
 @@ -263,7 +263,7 @@ public abstract class EntityArrow extends Entity implements IProjectile {
diff --git a/Spigot-Server-Patches/0065-Add-World-Util-Methods.patch b/Spigot-Server-Patches/0067-Add-World-Util-Methods.patch
similarity index 96%
rename from Spigot-Server-Patches/0065-Add-World-Util-Methods.patch
rename to Spigot-Server-Patches/0067-Add-World-Util-Methods.patch
index d831a9b627..200c0d7726 100644
--- a/Spigot-Server-Patches/0065-Add-World-Util-Methods.patch
+++ b/Spigot-Server-Patches/0067-Add-World-Util-Methods.patch
@@ -1,4 +1,4 @@
-From 23db71afbfe996b7afeed9e005fe8c192eb48cca Mon Sep 17 00:00:00 2001
+From e2d2f4b4ebf96707ab1a22497ee67cc6ab677c85 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 20:16:03 -0400
 Subject: [PATCH] Add World Util Methods
@@ -6,7 +6,7 @@ Subject: [PATCH] Add World Util Methods
 Methods that can be used for other patches to help improve logic.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 879a491920..d246970d3e 100644
+index 879a49192..d246970d3 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -371,6 +371,7 @@ public class Chunk implements IChunkAccess {
@@ -18,7 +18,7 @@ index 879a491920..d246970d3e 100644
          return this.a(blockposition, i, this.world.getWorldProvider().g());
      }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 373d08b23a..e43b1d27c3 100644
+index 373d08b23..e43b1d27c 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -46,7 +46,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
@@ -86,7 +86,7 @@ index 373d08b23a..e43b1d27c3 100644
          return this.getChunkAt(blockposition.getX() >> 4, blockposition.getZ() >> 4);
      }
 diff --git a/src/main/java/net/minecraft/server/WorldBorder.java b/src/main/java/net/minecraft/server/WorldBorder.java
-index 94d1c2be11..77b805f3ae 100644
+index 94d1c2be1..77b805f3a 100644
 --- a/src/main/java/net/minecraft/server/WorldBorder.java
 +++ b/src/main/java/net/minecraft/server/WorldBorder.java
 @@ -19,6 +19,7 @@ public class WorldBorder {
diff --git a/Spigot-Server-Patches/0066-Custom-replacement-for-eaten-items.patch b/Spigot-Server-Patches/0068-Custom-replacement-for-eaten-items.patch
similarity index 95%
rename from Spigot-Server-Patches/0066-Custom-replacement-for-eaten-items.patch
rename to Spigot-Server-Patches/0068-Custom-replacement-for-eaten-items.patch
index 0ba7268f09..8f43e38981 100644
--- a/Spigot-Server-Patches/0066-Custom-replacement-for-eaten-items.patch
+++ b/Spigot-Server-Patches/0068-Custom-replacement-for-eaten-items.patch
@@ -1,11 +1,11 @@
-From 0ef7232e104adf85bbf7fd538240d57576a5f9ec Mon Sep 17 00:00:00 2001
+From 49ca30b4a9012aef4bce4e3116dfe2146ea37132 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 21 Jun 2015 15:07:20 -0400
 Subject: [PATCH] Custom replacement for eaten items
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index e3613a8e67..44570edcae 100644
+index 2fd9ebe7e..a3ee253b6 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2811,12 +2811,13 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0067-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/Spigot-Server-Patches/0069-handle-NaN-health-absorb-values-and-repair-bad-data.patch
similarity index 96%
rename from Spigot-Server-Patches/0067-handle-NaN-health-absorb-values-and-repair-bad-data.patch
rename to Spigot-Server-Patches/0069-handle-NaN-health-absorb-values-and-repair-bad-data.patch
index ca39278533..11428bd9a0 100644
--- a/Spigot-Server-Patches/0067-handle-NaN-health-absorb-values-and-repair-bad-data.patch
+++ b/Spigot-Server-Patches/0069-handle-NaN-health-absorb-values-and-repair-bad-data.patch
@@ -1,11 +1,11 @@
-From 1638dcb7d7c6bbf985b4350a96f566ddcbcff5aa Mon Sep 17 00:00:00 2001
+From d2f0bbd9969223ed296013cd62c99712cbfb9216 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 27 Sep 2015 01:18:02 -0400
 Subject: [PATCH] handle NaN health/absorb values and repair bad data
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 5d73894d3..37a642676 100644
+index a3ee253b6..9717e8575 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -539,7 +539,13 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0068-Waving-banner-workaround.patch b/Spigot-Server-Patches/0070-Waving-banner-workaround.patch
similarity index 92%
rename from Spigot-Server-Patches/0068-Waving-banner-workaround.patch
rename to Spigot-Server-Patches/0070-Waving-banner-workaround.patch
index 3b489e1760..4646fe81fb 100644
--- a/Spigot-Server-Patches/0068-Waving-banner-workaround.patch
+++ b/Spigot-Server-Patches/0070-Waving-banner-workaround.patch
@@ -1,4 +1,4 @@
-From 39bc4d6e5b8c9f20b00e7b94737aa73615d0c13a Mon Sep 17 00:00:00 2001
+From c2b00d2f93744e3232037ca1352a107d31a08a07 Mon Sep 17 00:00:00 2001
 From: Gabscap <git@gabscap.de>
 Date: Sat, 19 Mar 2016 22:25:11 +0100
 Subject: [PATCH] Waving banner workaround
@@ -6,7 +6,7 @@ Subject: [PATCH] Waving banner workaround
 This patch is a workaround for MC-63720
 
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java b/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java
-index 88c3d7efaf..15af5927f3 100644
+index 88c3d7efa..15af5927f 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java
 @@ -4,7 +4,13 @@ import java.io.IOException;
diff --git a/Spigot-Server-Patches/0069-Use-a-Shared-Random-for-Entities.patch b/Spigot-Server-Patches/0071-Use-a-Shared-Random-for-Entities.patch
similarity index 94%
rename from Spigot-Server-Patches/0069-Use-a-Shared-Random-for-Entities.patch
rename to Spigot-Server-Patches/0071-Use-a-Shared-Random-for-Entities.patch
index aa13f934bd..b007ec5675 100644
--- a/Spigot-Server-Patches/0069-Use-a-Shared-Random-for-Entities.patch
+++ b/Spigot-Server-Patches/0071-Use-a-Shared-Random-for-Entities.patch
@@ -1,4 +1,4 @@
-From 3cd7aa9e356f4411d171f22dedf7d1c326c48255 Mon Sep 17 00:00:00 2001
+From 1790da3e00864266af558508ed1f31980376431a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 22 Mar 2016 00:33:47 -0400
 Subject: [PATCH] Use a Shared Random for Entities
@@ -6,7 +6,7 @@ Subject: [PATCH] Use a Shared Random for Entities
 Reduces memory usage and provides ensures more randomness, Especially since a lot of garbage entity objects get created.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index da99714450..e6e47bc574 100644
+index da9971445..e6e47bc57 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -54,6 +54,20 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/Spigot-Server-Patches/0070-Configurable-spawn-chances-for-skeleton-horses.patch b/Spigot-Server-Patches/0072-Configurable-spawn-chances-for-skeleton-horses.patch
similarity index 96%
rename from Spigot-Server-Patches/0070-Configurable-spawn-chances-for-skeleton-horses.patch
rename to Spigot-Server-Patches/0072-Configurable-spawn-chances-for-skeleton-horses.patch
index dd2d3606d1..9d96555ce3 100644
--- a/Spigot-Server-Patches/0070-Configurable-spawn-chances-for-skeleton-horses.patch
+++ b/Spigot-Server-Patches/0072-Configurable-spawn-chances-for-skeleton-horses.patch
@@ -1,4 +1,4 @@
-From 4bb8555a2cc19ce266bc0bbfe84955b32f0c9154 Mon Sep 17 00:00:00 2001
+From 58a7c942ae705408bddb86fc850ab3ff78922459 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 22 Mar 2016 12:04:28 -0500
 Subject: [PATCH] Configurable spawn chances for skeleton horses
diff --git a/Spigot-Server-Patches/0071-Optimize-isValidLocation-getType-and-getBlockData-fo.patch b/Spigot-Server-Patches/0073-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
similarity index 95%
rename from Spigot-Server-Patches/0071-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
rename to Spigot-Server-Patches/0073-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
index 6e3f87f088..7a8a124f23 100644
--- a/Spigot-Server-Patches/0071-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
+++ b/Spigot-Server-Patches/0073-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
@@ -1,4 +1,4 @@
-From b30d0058811703ff694e7762936418b48df12565 Mon Sep 17 00:00:00 2001
+From 4079f60167fbb6d4e223df14d2e925f6e3ab52f8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 02:07:55 -0600
 Subject: [PATCH] Optimize isValidLocation, getType and getBlockData for inling
@@ -12,7 +12,7 @@ Replace all calls to the new place to the unnecessary forward.
 Optimize getType and getBlockData to manually inline and optimize the calls
 
 diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java
-index 2852a17f23..7cb46d7a9c 100644
+index 2852a17f2..7cb46d7a9 100644
 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java
 @@ -10,6 +10,14 @@ public class BaseBlockPosition implements Comparable<BaseBlockPosition> {
@@ -31,7 +31,7 @@ index 2852a17f23..7cb46d7a9c 100644
      public BaseBlockPosition(int i, int j, int k) {
          this.a = i;
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index c927d524a8..64700b97c0 100644
+index c927d524a..64700b97c 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -339,6 +339,16 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali
@@ -52,7 +52,7 @@ index c927d524a8..64700b97c0 100644
          public MutableBlockPosition() {
              this(0, 0, 0);
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index d246970d3e..c211f8a43f 100644
+index d246970d3..c211f8a43 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -203,12 +203,24 @@ public class Chunk implements IChunkAccess {
@@ -85,7 +85,7 @@ index d246970d3e..c211f8a43f 100644
              IBlockData iblockdata = null;
  
 diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java
-index 30701fd7f3..43f75fc837 100644
+index 30701fd7f..43f75fc83 100644
 --- a/src/main/java/net/minecraft/server/ChunkSection.java
 +++ b/src/main/java/net/minecraft/server/ChunkSection.java
 @@ -9,7 +9,7 @@ public class ChunkSection {
@@ -98,7 +98,7 @@ index 30701fd7f3..43f75fc837 100644
      public ChunkSection(int i) {
          this(i, (short) 0, (short) 0, (short) 0);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index e43b1d27c3..6e655d292a 100644
+index e43b1d27c..6e655d292 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -197,11 +197,11 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
diff --git a/Spigot-Server-Patches/0072-Access-items-by-EquipmentSlot.patch b/Spigot-Server-Patches/0074-Access-items-by-EquipmentSlot.patch
similarity index 95%
rename from Spigot-Server-Patches/0072-Access-items-by-EquipmentSlot.patch
rename to Spigot-Server-Patches/0074-Access-items-by-EquipmentSlot.patch
index 465c83226c..b0c930a526 100644
--- a/Spigot-Server-Patches/0072-Access-items-by-EquipmentSlot.patch
+++ b/Spigot-Server-Patches/0074-Access-items-by-EquipmentSlot.patch
@@ -1,11 +1,11 @@
-From 8c74d27fd8b984b8301ef5712a94a74d5733a0ad Mon Sep 17 00:00:00 2001
+From f8ae5f908eb52e91c30ce1ed041c6f285d865bd1 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 20 Mar 2016 06:45:01 -0400
 Subject: [PATCH] Access items by EquipmentSlot
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
-index 5873b76236..ef4cd7a7b6 100644
+index 5873b7623..ef4cd7a7b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
 @@ -268,4 +268,54 @@ public class CraftInventoryPlayer extends CraftInventory implements org.bukkit.i
diff --git a/Spigot-Server-Patches/0073-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch b/Spigot-Server-Patches/0075-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
similarity index 95%
rename from Spigot-Server-Patches/0073-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
rename to Spigot-Server-Patches/0075-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
index 5d68495046..ac75df3de9 100644
--- a/Spigot-Server-Patches/0073-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
+++ b/Spigot-Server-Patches/0075-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
@@ -1,4 +1,4 @@
-From b357ccc6a79be05c62a42d746988971ba50b21be Mon Sep 17 00:00:00 2001
+From c0e39a8677454538f878b96e74207423a901a128 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 19:55:45 -0400
 Subject: [PATCH] Only process BlockPhysicsEvent if a plugin has a listener
@@ -6,7 +6,7 @@ Subject: [PATCH] Only process BlockPhysicsEvent if a plugin has a listener
 Saves on some object allocation and processing when no plugin listens to this
 
 diff --git a/src/main/java/net/minecraft/server/BlockPlant.java b/src/main/java/net/minecraft/server/BlockPlant.java
-index 9bf42bb5ef..0526af776d 100644
+index 9bf42bb5e..0526af776 100644
 --- a/src/main/java/net/minecraft/server/BlockPlant.java
 +++ b/src/main/java/net/minecraft/server/BlockPlant.java
 @@ -16,7 +16,7 @@ public class BlockPlant extends Block {
@@ -19,7 +19,7 @@ index 9bf42bb5ef..0526af776d 100644
              }
          }
 diff --git a/src/main/java/net/minecraft/server/BlockTallPlant.java b/src/main/java/net/minecraft/server/BlockTallPlant.java
-index 469a3be057..f2c429f22e 100644
+index 469a3be05..f2c429f22 100644
 --- a/src/main/java/net/minecraft/server/BlockTallPlant.java
 +++ b/src/main/java/net/minecraft/server/BlockTallPlant.java
 @@ -55,7 +55,7 @@ public class BlockTallPlant extends BlockPlant {
@@ -32,7 +32,7 @@ index 469a3be057..f2c429f22e 100644
          }
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 454e28fc47..40b9bff98f 100644
+index 454e28fc4..40b9bff98 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1096,6 +1096,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -44,7 +44,7 @@ index 454e28fc47..40b9bff98f 100644
              if (true || worldserver.worldProvider.getDimensionManager() == DimensionManager.OVERWORLD || this.getAllowNether()) { // CraftBukkit
                  this.methodProfiler.a(() -> {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 6e655d292a..7f0a338d64 100644
+index 6e655d292..7f0a338d6 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -444,7 +444,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
@@ -66,7 +66,7 @@ index 6e655d292a..7f0a338d64 100644
                      this.getServer().getPluginManager().callEvent(event);
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 727faa35db..7c3d2d5def 100644
+index 727faa35d..7c3d2d5de 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -68,6 +68,7 @@ public class WorldServer extends World {
diff --git a/Spigot-Server-Patches/0074-Entity-AddTo-RemoveFrom-World-Events.patch b/Spigot-Server-Patches/0076-Entity-AddTo-RemoveFrom-World-Events.patch
similarity index 95%
rename from Spigot-Server-Patches/0074-Entity-AddTo-RemoveFrom-World-Events.patch
rename to Spigot-Server-Patches/0076-Entity-AddTo-RemoveFrom-World-Events.patch
index 6516302267..b8a3e1b650 100644
--- a/Spigot-Server-Patches/0074-Entity-AddTo-RemoveFrom-World-Events.patch
+++ b/Spigot-Server-Patches/0076-Entity-AddTo-RemoveFrom-World-Events.patch
@@ -1,4 +1,4 @@
-From 586414e6c81a1d5051fca0b97f37b134c6b3b89e Mon Sep 17 00:00:00 2001
+From 4180858f1bda0a6d9a5f2fe1212d31d34db35d1e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:32:58 -0400
 Subject: [PATCH] Entity AddTo/RemoveFrom World Events
diff --git a/Spigot-Server-Patches/0075-Configurable-Chunk-Inhabited-Time.patch b/Spigot-Server-Patches/0077-Configurable-Chunk-Inhabited-Time.patch
similarity index 93%
rename from Spigot-Server-Patches/0075-Configurable-Chunk-Inhabited-Time.patch
rename to Spigot-Server-Patches/0077-Configurable-Chunk-Inhabited-Time.patch
index f16fcd9169..53994207d9 100644
--- a/Spigot-Server-Patches/0075-Configurable-Chunk-Inhabited-Time.patch
+++ b/Spigot-Server-Patches/0077-Configurable-Chunk-Inhabited-Time.patch
@@ -1,4 +1,4 @@
-From 2332bb0de0087ed2a7468fd651307f121ae8270a Mon Sep 17 00:00:00 2001
+From 46d5f243c09e94472ccb5c04592cd4ebdaed7404 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:46:14 -0400
 Subject: [PATCH] Configurable Chunk Inhabited Time
@@ -11,7 +11,7 @@ For people who want all chunks to be treated equally, you can chose a fixed valu
 This allows to fine-tune vanilla gameplay.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 2a71381dae..e43866991c 100644
+index 2a71381da..e43866991 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -229,4 +229,19 @@ public class PaperWorldConfig {
@@ -35,7 +35,7 @@ index 2a71381dae..e43866991c 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index c211f8a43f..2da7c4531f 100644
+index c211f8a43..2da7c4531 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -818,7 +818,7 @@ public class Chunk implements IChunkAccess {
diff --git a/Spigot-Server-Patches/0076-EntityPathfindEvent.patch b/Spigot-Server-Patches/0078-EntityPathfindEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0076-EntityPathfindEvent.patch
rename to Spigot-Server-Patches/0078-EntityPathfindEvent.patch
index e5f5c1ac79..c954de19d8 100644
--- a/Spigot-Server-Patches/0076-EntityPathfindEvent.patch
+++ b/Spigot-Server-Patches/0078-EntityPathfindEvent.patch
@@ -1,4 +1,4 @@
-From c7641c30bd926b4c5d123ed4f9943bfbaad76ee7 Mon Sep 17 00:00:00 2001
+From aa0a77d89b5675a2c87c70e049f44ca6ef1c2933 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 21:22:26 -0400
 Subject: [PATCH] EntityPathfindEvent
diff --git a/Spigot-Server-Patches/0077-Reduce-IO-ops-opening-a-new-region-file.patch b/Spigot-Server-Patches/0079-Reduce-IO-ops-opening-a-new-region-file.patch
similarity index 96%
rename from Spigot-Server-Patches/0077-Reduce-IO-ops-opening-a-new-region-file.patch
rename to Spigot-Server-Patches/0079-Reduce-IO-ops-opening-a-new-region-file.patch
index 01b778d2b0..a9f8f37055 100644
--- a/Spigot-Server-Patches/0077-Reduce-IO-ops-opening-a-new-region-file.patch
+++ b/Spigot-Server-Patches/0079-Reduce-IO-ops-opening-a-new-region-file.patch
@@ -1,4 +1,4 @@
-From 1f55c86840384d32f33f077d9af9ec28ebbc05e0 Mon Sep 17 00:00:00 2001
+From 076e36b75d9d6dde7bc0bec57f7c4690b00d4e01 Mon Sep 17 00:00:00 2001
 From: Antony Riley <antony@cyberiantiger.org>
 Date: Tue, 29 Mar 2016 06:56:23 +0300
 Subject: [PATCH] Reduce IO ops opening a new region file.
diff --git a/Spigot-Server-Patches/0078-Sanitise-RegionFileCache-and-make-configurable.patch b/Spigot-Server-Patches/0080-Sanitise-RegionFileCache-and-make-configurable.patch
similarity index 95%
rename from Spigot-Server-Patches/0078-Sanitise-RegionFileCache-and-make-configurable.patch
rename to Spigot-Server-Patches/0080-Sanitise-RegionFileCache-and-make-configurable.patch
index 3576f7a6b0..f901caa1da 100644
--- a/Spigot-Server-Patches/0078-Sanitise-RegionFileCache-and-make-configurable.patch
+++ b/Spigot-Server-Patches/0080-Sanitise-RegionFileCache-and-make-configurable.patch
@@ -1,4 +1,4 @@
-From 0ba1071a0c1c57dde48b29969baecb7dcc5a895e Mon Sep 17 00:00:00 2001
+From 07f9a49c8b099dcde0098e3aa7c4665f260ffc75 Mon Sep 17 00:00:00 2001
 From: Antony Riley <antony@cyberiantiger.org>
 Date: Tue, 29 Mar 2016 08:22:55 +0300
 Subject: [PATCH] Sanitise RegionFileCache and make configurable.
@@ -25,7 +25,7 @@ index 6cc99ffe4..4424f7ef1 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index 75731c919..c8573a8ee 100644
+index 20f563144..6425b14f2 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -8,6 +8,7 @@ import java.io.DataOutputStream;
diff --git a/Spigot-Server-Patches/0079-Use-Optimized-Collections.patch b/Spigot-Server-Patches/0081-Use-Optimized-Collections.patch
similarity index 94%
rename from Spigot-Server-Patches/0079-Use-Optimized-Collections.patch
rename to Spigot-Server-Patches/0081-Use-Optimized-Collections.patch
index 95e1e7a3a3..b18f65f2b8 100644
--- a/Spigot-Server-Patches/0079-Use-Optimized-Collections.patch
+++ b/Spigot-Server-Patches/0081-Use-Optimized-Collections.patch
@@ -1,4 +1,4 @@
-From b82a8f1e62534de6c4f4bfceeda56a580ca0eaa6 Mon Sep 17 00:00:00 2001
+From 1b2ad4e733c58626160941b5719277e1e96e6a3a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 30 Mar 2016 02:13:24 -0400
 Subject: [PATCH] Use Optimized Collections
@@ -13,7 +13,7 @@ These collections are super fast as seen
 http://java-performance.info/hashmap-overview-jdk-fastutil-goldman-sachs-hppc-koloboke-trove-january-2015/
 
 diff --git a/src/main/java/net/minecraft/server/DataWatcher.java b/src/main/java/net/minecraft/server/DataWatcher.java
-index 79a240cd1d..f224043d8e 100644
+index 79a240cd1..f224043d8 100644
 --- a/src/main/java/net/minecraft/server/DataWatcher.java
 +++ b/src/main/java/net/minecraft/server/DataWatcher.java
 @@ -12,6 +12,7 @@ import java.util.Map;
diff --git a/Spigot-Server-Patches/0080-Do-not-load-chunks-for-Pathfinding.patch b/Spigot-Server-Patches/0082-Do-not-load-chunks-for-Pathfinding.patch
similarity index 95%
rename from Spigot-Server-Patches/0080-Do-not-load-chunks-for-Pathfinding.patch
rename to Spigot-Server-Patches/0082-Do-not-load-chunks-for-Pathfinding.patch
index 9c1bb02975..e1e40476ec 100644
--- a/Spigot-Server-Patches/0080-Do-not-load-chunks-for-Pathfinding.patch
+++ b/Spigot-Server-Patches/0082-Do-not-load-chunks-for-Pathfinding.patch
@@ -1,11 +1,11 @@
-From 8db9736ba4a038348d72fba78248990a7a89d97d Mon Sep 17 00:00:00 2001
+From de7967b2d83901afe71ae8e0ca85ea9fe2dd5f7e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 31 Mar 2016 19:17:58 -0400
 Subject: [PATCH] Do not load chunks for Pathfinding
 
 
 diff --git a/src/main/java/net/minecraft/server/ChunkCache.java b/src/main/java/net/minecraft/server/ChunkCache.java
-index ccbc1dde09..34e743716b 100644
+index ccbc1dde0..34e743716 100644
 --- a/src/main/java/net/minecraft/server/ChunkCache.java
 +++ b/src/main/java/net/minecraft/server/ChunkCache.java
 @@ -25,7 +25,7 @@ public class ChunkCache implements IWorldReader {
@@ -27,7 +27,7 @@ index ccbc1dde09..34e743716b 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
-index d04eb1bbfe..ed69eaa176 100644
+index d04eb1bbf..ed69eaa17 100644
 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java
 +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
 @@ -22,7 +22,7 @@ public abstract class NavigationAbstract {
@@ -40,7 +40,7 @@ index d04eb1bbfe..ed69eaa176 100644
      public NavigationAbstract(EntityInsentient entityinsentient, World world) {
          this.g = Vec3D.a;
 diff --git a/src/main/java/net/minecraft/server/Pathfinder.java b/src/main/java/net/minecraft/server/Pathfinder.java
-index 359d9a11c0..262fa55850 100644
+index 359d9a11c..262fa5585 100644
 --- a/src/main/java/net/minecraft/server/Pathfinder.java
 +++ b/src/main/java/net/minecraft/server/Pathfinder.java
 @@ -12,7 +12,7 @@ public class Pathfinder {
@@ -53,7 +53,7 @@ index 359d9a11c0..262fa55850 100644
      public Pathfinder(PathfinderAbstract pathfinderabstract, int i) {
          this.e = pathfinderabstract;
 diff --git a/src/main/java/net/minecraft/server/PathfinderNormal.java b/src/main/java/net/minecraft/server/PathfinderNormal.java
-index d97166f8f0..0cea9db8f5 100644
+index d97166f8f..0cea9db8f 100644
 --- a/src/main/java/net/minecraft/server/PathfinderNormal.java
 +++ b/src/main/java/net/minecraft/server/PathfinderNormal.java
 @@ -355,7 +355,8 @@ public class PathfinderNormal extends PathfinderAbstract {
diff --git a/Spigot-Server-Patches/0081-Do-not-load-chunks-for-light-checks.patch b/Spigot-Server-Patches/0083-Do-not-load-chunks-for-light-checks.patch
similarity index 90%
rename from Spigot-Server-Patches/0081-Do-not-load-chunks-for-light-checks.patch
rename to Spigot-Server-Patches/0083-Do-not-load-chunks-for-light-checks.patch
index 38878e0f05..8abfddbac8 100644
--- a/Spigot-Server-Patches/0081-Do-not-load-chunks-for-light-checks.patch
+++ b/Spigot-Server-Patches/0083-Do-not-load-chunks-for-light-checks.patch
@@ -1,4 +1,4 @@
-From 27a39fec91cc911138b2e076b4268aee75bcdfc3 Mon Sep 17 00:00:00 2001
+From 4351b6a0dab9bf16220548ab518e2734eee48cdf Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 31 Mar 2016 19:17:58 -0400
 Subject: [PATCH] Do not load chunks for light checks
@@ -7,7 +7,7 @@ Should only happen for blocks on the edge that uses neighbors light level
 (certain blocks). In that case, there will be 3-4 other neighbors to get a light level from.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 7f0a338d64..8ad4fbff21 100644
+index 7f0a338d6..8ad4fbff2 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -596,6 +596,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
diff --git a/Spigot-Server-Patches/0082-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-Server-Patches/0084-Add-PlayerUseUnknownEntityEvent.patch
similarity index 92%
rename from Spigot-Server-Patches/0082-Add-PlayerUseUnknownEntityEvent.patch
rename to Spigot-Server-Patches/0084-Add-PlayerUseUnknownEntityEvent.patch
index 508e7a4a3b..1e4d8572c2 100644
--- a/Spigot-Server-Patches/0082-Add-PlayerUseUnknownEntityEvent.patch
+++ b/Spigot-Server-Patches/0084-Add-PlayerUseUnknownEntityEvent.patch
@@ -1,11 +1,11 @@
-From 2e277508847c335f51c14a2bb61758099d1bdbcb Mon Sep 17 00:00:00 2001
+From 5197c88754e7f356278768f8625b07606102f140 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 2 Apr 2016 05:09:16 -0400
 Subject: [PATCH] Add PlayerUseUnknownEntityEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java b/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java
-index 680adbdeb0..3f7697b39c 100644
+index 680adbdeb..3f7697b39 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java
 @@ -5,7 +5,7 @@ import javax.annotation.Nullable;
@@ -18,7 +18,7 @@ index 680adbdeb0..3f7697b39c 100644
      private Vec3D c;
      private EnumHand d;
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index b7c8cab9ea..ce98f690e8 100644
+index 669566f4c..86de93275 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1922,6 +1922,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0083-Fix-reducedDebugInfo-not-initialized-on-client.patch b/Spigot-Server-Patches/0085-Fix-reducedDebugInfo-not-initialized-on-client.patch
similarity index 94%
rename from Spigot-Server-Patches/0083-Fix-reducedDebugInfo-not-initialized-on-client.patch
rename to Spigot-Server-Patches/0085-Fix-reducedDebugInfo-not-initialized-on-client.patch
index 3e0d884777..e8e98e0ae4 100644
--- a/Spigot-Server-Patches/0083-Fix-reducedDebugInfo-not-initialized-on-client.patch
+++ b/Spigot-Server-Patches/0085-Fix-reducedDebugInfo-not-initialized-on-client.patch
@@ -1,4 +1,4 @@
-From 427bd54d7a0f7fd616d989a044eff927c11eddc9 Mon Sep 17 00:00:00 2001
+From 423787829587edb5a7bc9e77c238e30fd4429051 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 2 Apr 2016 20:37:03 -0400
 Subject: [PATCH] Fix reducedDebugInfo not initialized on client
diff --git a/Spigot-Server-Patches/0084-Configurable-Grass-Spread-Tick-Rate.patch b/Spigot-Server-Patches/0086-Configurable-Grass-Spread-Tick-Rate.patch
similarity index 96%
rename from Spigot-Server-Patches/0084-Configurable-Grass-Spread-Tick-Rate.patch
rename to Spigot-Server-Patches/0086-Configurable-Grass-Spread-Tick-Rate.patch
index cb7a46e93a..916353d9bb 100644
--- a/Spigot-Server-Patches/0084-Configurable-Grass-Spread-Tick-Rate.patch
+++ b/Spigot-Server-Patches/0086-Configurable-Grass-Spread-Tick-Rate.patch
@@ -1,4 +1,4 @@
-From ecdf0f12e6f006fcf530350c33ab4b516acb1581 Mon Sep 17 00:00:00 2001
+From 0bffb82c7e47d00fe30082cfcac8505fe6df2efa Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 Apr 2016 16:28:17 -0400
 Subject: [PATCH] Configurable Grass Spread Tick Rate
diff --git a/Spigot-Server-Patches/0085-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/Spigot-Server-Patches/0087-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
similarity index 89%
rename from Spigot-Server-Patches/0085-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
rename to Spigot-Server-Patches/0087-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
index 7b2e1d6576..37d7a9e972 100644
--- a/Spigot-Server-Patches/0085-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
+++ b/Spigot-Server-Patches/0087-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
@@ -1,11 +1,11 @@
-From 0fbc89449c74ab4d1a538d060a61a914888c7a0c Mon Sep 17 00:00:00 2001
+From 3335c20b0b739ccc047c731f9fb718c525f104a5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 Apr 2016 17:48:50 -0400
 Subject: [PATCH] Fix Cancelling BlockPlaceEvent triggering physics
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 8ad4fbff21..b5e8de64ce 100644
+index 8ad4fbff2..b5e8de64c 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -514,6 +514,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
diff --git a/Spigot-Server-Patches/0086-Remove-Debug-checks-from-DataBits.patch b/Spigot-Server-Patches/0088-Remove-Debug-checks-from-DataBits.patch
similarity index 96%
rename from Spigot-Server-Patches/0086-Remove-Debug-checks-from-DataBits.patch
rename to Spigot-Server-Patches/0088-Remove-Debug-checks-from-DataBits.patch
index cf431b73eb..51798bf77c 100644
--- a/Spigot-Server-Patches/0086-Remove-Debug-checks-from-DataBits.patch
+++ b/Spigot-Server-Patches/0088-Remove-Debug-checks-from-DataBits.patch
@@ -1,4 +1,4 @@
-From b4a076f89d83b45dae9ae1ec7919ef774ba884e2 Mon Sep 17 00:00:00 2001
+From 084a4779bd54e0678d3fabfdef2cc0ffa55d5dc0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Apr 2016 21:38:58 -0400
 Subject: [PATCH] Remove Debug checks from DataBits
diff --git a/Spigot-Server-Patches/0087-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/Spigot-Server-Patches/0089-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
similarity index 98%
rename from Spigot-Server-Patches/0087-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
rename to Spigot-Server-Patches/0089-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
index 566eb3b20c..44d6c32c54 100644
--- a/Spigot-Server-Patches/0087-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+++ b/Spigot-Server-Patches/0089-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
@@ -1,4 +1,4 @@
-From db51cb961748a40d440c861a9693892955f35464 Mon Sep 17 00:00:00 2001
+From 1cdcbb68ac7e32ebd2e8ff842cfa7b0dca28fdbd Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 6 Apr 2016 01:04:23 -0500
 Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names
diff --git a/Spigot-Server-Patches/0088-Workaround-for-setting-passengers-on-players.patch b/Spigot-Server-Patches/0090-Workaround-for-setting-passengers-on-players.patch
similarity index 94%
rename from Spigot-Server-Patches/0088-Workaround-for-setting-passengers-on-players.patch
rename to Spigot-Server-Patches/0090-Workaround-for-setting-passengers-on-players.patch
index 6b6299a388..a465ce7f28 100644
--- a/Spigot-Server-Patches/0088-Workaround-for-setting-passengers-on-players.patch
+++ b/Spigot-Server-Patches/0090-Workaround-for-setting-passengers-on-players.patch
@@ -1,4 +1,4 @@
-From 491523ef4ba143804b922744b5835af6ee868621 Mon Sep 17 00:00:00 2001
+From 921fa8d6156b4f6f71eb2e8a26f42b0b33590a97 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 10 Apr 2016 03:23:32 -0500
 Subject: [PATCH] Workaround for setting passengers on players
diff --git a/Spigot-Server-Patches/0089-Remove-unused-World-Tile-Entity-List.patch b/Spigot-Server-Patches/0091-Remove-unused-World-Tile-Entity-List.patch
similarity index 97%
rename from Spigot-Server-Patches/0089-Remove-unused-World-Tile-Entity-List.patch
rename to Spigot-Server-Patches/0091-Remove-unused-World-Tile-Entity-List.patch
index db4936996b..9141ec1e9a 100644
--- a/Spigot-Server-Patches/0089-Remove-unused-World-Tile-Entity-List.patch
+++ b/Spigot-Server-Patches/0091-Remove-unused-World-Tile-Entity-List.patch
@@ -1,4 +1,4 @@
-From 97a894ab9f9e161d6809ad9e228899da61e50341 Mon Sep 17 00:00:00 2001
+From c6aa46f0deebd8097a0dcfe516819d6eb10ea6f5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 00:25:28 -0400
 Subject: [PATCH] Remove unused World Tile Entity List
@@ -6,7 +6,7 @@ Subject: [PATCH] Remove unused World Tile Entity List
 Massive hit to performance and it is completely unnecessary.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index b5e8de64ce..aaf22401b0 100644
+index b5e8de64c..aaf22401b 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -40,7 +40,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
diff --git a/Spigot-Server-Patches/0090-Don-t-tick-Skulls-unused-code.patch b/Spigot-Server-Patches/0092-Don-t-tick-Skulls-unused-code.patch
similarity index 90%
rename from Spigot-Server-Patches/0090-Don-t-tick-Skulls-unused-code.patch
rename to Spigot-Server-Patches/0092-Don-t-tick-Skulls-unused-code.patch
index 831ef61e6b..fd4038ccf9 100644
--- a/Spigot-Server-Patches/0090-Don-t-tick-Skulls-unused-code.patch
+++ b/Spigot-Server-Patches/0092-Don-t-tick-Skulls-unused-code.patch
@@ -1,11 +1,11 @@
-From f1f27585e26230ace9096694bacd455ea0928cf2 Mon Sep 17 00:00:00 2001
+From 11c7c6634e7b82a3515a1b481131f2350f411e12 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 00:30:10 -0400
 Subject: [PATCH] Don't tick Skulls - unused code
 
 
 diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java
-index 369fdfe677..f6a80a00f4 100644
+index 369fdfe67..f6a80a00f 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySkull.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySkull.java
 @@ -24,7 +24,7 @@ import com.mojang.authlib.ProfileLookupCallback;
diff --git a/Spigot-Server-Patches/0091-Configurable-Player-Collision.patch b/Spigot-Server-Patches/0093-Configurable-Player-Collision.patch
similarity index 98%
rename from Spigot-Server-Patches/0091-Configurable-Player-Collision.patch
rename to Spigot-Server-Patches/0093-Configurable-Player-Collision.patch
index 308d7bde4b..cf72763164 100644
--- a/Spigot-Server-Patches/0091-Configurable-Player-Collision.patch
+++ b/Spigot-Server-Patches/0093-Configurable-Player-Collision.patch
@@ -1,4 +1,4 @@
-From 98c52a0d68daa9285292fe40c0e4214e661c6372 Mon Sep 17 00:00:00 2001
+From f51bf643eca9dd327d7b778f7815b838bbbb718b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 02:10:49 -0400
 Subject: [PATCH] Configurable Player Collision
@@ -19,7 +19,7 @@ index 4424f7ef1..69bfe6241 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 8ce7903a1..1bc26d17d 100644
+index 40b9bff98..7a860231e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -439,6 +439,20 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
diff --git a/Spigot-Server-Patches/0092-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/Spigot-Server-Patches/0094-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
similarity index 97%
rename from Spigot-Server-Patches/0092-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
rename to Spigot-Server-Patches/0094-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
index f44d8a8189..6edf5f0f13 100644
--- a/Spigot-Server-Patches/0092-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
+++ b/Spigot-Server-Patches/0094-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
@@ -1,4 +1,4 @@
-From 51375e7d49a68f620fab5f1a66cb5637cb40a9de Mon Sep 17 00:00:00 2001
+From 92ecc9dec534968a8dde134cb40b2d9f56ddfbb0 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 13 Apr 2016 20:21:38 -0700
 Subject: [PATCH] Add handshake event to allow plugins to handle client
diff --git a/Spigot-Server-Patches/0093-Configurable-RCON-IP-address.patch b/Spigot-Server-Patches/0095-Configurable-RCON-IP-address.patch
similarity index 96%
rename from Spigot-Server-Patches/0093-Configurable-RCON-IP-address.patch
rename to Spigot-Server-Patches/0095-Configurable-RCON-IP-address.patch
index 519d126b36..fbbea2710b 100644
--- a/Spigot-Server-Patches/0093-Configurable-RCON-IP-address.patch
+++ b/Spigot-Server-Patches/0095-Configurable-RCON-IP-address.patch
@@ -1,4 +1,4 @@
-From 762544d6d7a753a902f7fbb433f3cfaaca07f643 Mon Sep 17 00:00:00 2001
+From 357d0968b4557fbeee33afad9f1bf4953bfe5f97 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 16 Apr 2016 00:39:33 -0400
 Subject: [PATCH] Configurable RCON IP address
@@ -30,7 +30,7 @@ index 4af81c886..fb092a941 100644
  
      // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/server/PropertyManager.java b/src/main/java/net/minecraft/server/PropertyManager.java
-index d42e7503a..3434f8bae 100644
+index d7e81a6d9..729455ce5 100644
 --- a/src/main/java/net/minecraft/server/PropertyManager.java
 +++ b/src/main/java/net/minecraft/server/PropertyManager.java
 @@ -127,8 +127,8 @@ public abstract class PropertyManager<T extends PropertyManager<T>> {
diff --git a/Spigot-Server-Patches/0094-Prevent-Fire-from-loading-chunks.patch b/Spigot-Server-Patches/0096-Prevent-Fire-from-loading-chunks.patch
similarity index 96%
rename from Spigot-Server-Patches/0094-Prevent-Fire-from-loading-chunks.patch
rename to Spigot-Server-Patches/0096-Prevent-Fire-from-loading-chunks.patch
index 540b42c09d..2d99c5be2f 100644
--- a/Spigot-Server-Patches/0094-Prevent-Fire-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0096-Prevent-Fire-from-loading-chunks.patch
@@ -1,4 +1,4 @@
-From d26dc9b1fa65c8017685b172d9716a2bde604175 Mon Sep 17 00:00:00 2001
+From d1efa6bba3cdff2f808b7cd9b23710bda0bc1e31 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 17 Apr 2016 17:27:09 -0400
 Subject: [PATCH] Prevent Fire from loading chunks
@@ -7,7 +7,7 @@ This causes the nether to spam unload/reload chunks, plus overall
 bad behavior.
 
 diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java
-index 2e46ba44a..73190ccba 100644
+index 8645a0ebd..f769df41a 100644
 --- a/src/main/java/net/minecraft/server/BlockFire.java
 +++ b/src/main/java/net/minecraft/server/BlockFire.java
 @@ -163,6 +163,7 @@ public class BlockFire extends Block {
diff --git a/Spigot-Server-Patches/0095-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0097-Implement-PlayerLocaleChangeEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0095-Implement-PlayerLocaleChangeEvent.patch
rename to Spigot-Server-Patches/0097-Implement-PlayerLocaleChangeEvent.patch
index a9e53e19f5..2da4e1c172 100644
--- a/Spigot-Server-Patches/0095-Implement-PlayerLocaleChangeEvent.patch
+++ b/Spigot-Server-Patches/0097-Implement-PlayerLocaleChangeEvent.patch
@@ -1,11 +1,11 @@
-From 7bb6986156e4f55149c222aa7d9ddc563635d5e9 Mon Sep 17 00:00:00 2001
+From cbe0c2d48c13bface4e60be80356287705e5c9c9 Mon Sep 17 00:00:00 2001
 From: Isaac Moore <rmsy@me.com>
 Date: Tue, 19 Apr 2016 14:09:31 -0500
 Subject: [PATCH] Implement PlayerLocaleChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 6725b62a9..42b5b3f40 100644
+index 7eaef7f6b..beb16c8d5 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -37,7 +37,7 @@ import org.bukkit.inventory.MainHand;
diff --git a/Spigot-Server-Patches/0096-EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-Server-Patches/0098-EntityRegainHealthEvent-isFastRegen-API.patch
similarity index 93%
rename from Spigot-Server-Patches/0096-EntityRegainHealthEvent-isFastRegen-API.patch
rename to Spigot-Server-Patches/0098-EntityRegainHealthEvent-isFastRegen-API.patch
index ee03ea638a..cef690a6c2 100644
--- a/Spigot-Server-Patches/0096-EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/Spigot-Server-Patches/0098-EntityRegainHealthEvent-isFastRegen-API.patch
@@ -1,4 +1,4 @@
-From 80ed9953dd7370d6d04450471ef7049d4463ead8 Mon Sep 17 00:00:00 2001
+From 2650d28542a72d8d1789484fa0ad77b1f14406ab Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 22 Apr 2016 01:43:11 -0500
 Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
@@ -6,7 +6,7 @@ Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
 Don't even get me started
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 5ae7014887..482d6f7c62 100644
+index 9717e8575..223032e1e 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -963,10 +963,16 @@ public abstract class EntityLiving extends Entity {
@@ -28,7 +28,7 @@ index 5ae7014887..482d6f7c62 100644
              if (this.valid) {
                  this.world.getServer().getPluginManager().callEvent(event);
 diff --git a/src/main/java/net/minecraft/server/FoodMetaData.java b/src/main/java/net/minecraft/server/FoodMetaData.java
-index da07530d99..d184422fbe 100644
+index da07530d9..d184422fb 100644
 --- a/src/main/java/net/minecraft/server/FoodMetaData.java
 +++ b/src/main/java/net/minecraft/server/FoodMetaData.java
 @@ -69,7 +69,7 @@ public class FoodMetaData {
diff --git a/Spigot-Server-Patches/0097-Add-ability-to-configure-frosted_ice-properties.patch b/Spigot-Server-Patches/0099-Add-ability-to-configure-frosted_ice-properties.patch
similarity index 98%
rename from Spigot-Server-Patches/0097-Add-ability-to-configure-frosted_ice-properties.patch
rename to Spigot-Server-Patches/0099-Add-ability-to-configure-frosted_ice-properties.patch
index 5cd87611c2..539815181d 100644
--- a/Spigot-Server-Patches/0097-Add-ability-to-configure-frosted_ice-properties.patch
+++ b/Spigot-Server-Patches/0099-Add-ability-to-configure-frosted_ice-properties.patch
@@ -1,4 +1,4 @@
-From 1b74e3cb58a144c914a29d1158c06596d2ef751a Mon Sep 17 00:00:00 2001
+From ec727fb21a703427442c7ec6646cb2f95ef36eb4 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 21 Apr 2016 23:51:55 -0700
 Subject: [PATCH] Add ability to configure frosted_ice properties
diff --git a/Spigot-Server-Patches/0098-remove-null-possibility-for-getServer-singleton.patch b/Spigot-Server-Patches/0100-remove-null-possibility-for-getServer-singleton.patch
similarity index 95%
rename from Spigot-Server-Patches/0098-remove-null-possibility-for-getServer-singleton.patch
rename to Spigot-Server-Patches/0100-remove-null-possibility-for-getServer-singleton.patch
index ef10c208e0..90e271163f 100644
--- a/Spigot-Server-Patches/0098-remove-null-possibility-for-getServer-singleton.patch
+++ b/Spigot-Server-Patches/0100-remove-null-possibility-for-getServer-singleton.patch
@@ -1,4 +1,4 @@
-From db6b501790c33110448f91bde8ab710f1905e8bb Mon Sep 17 00:00:00 2001
+From 8d4d0568b508b622988c62ecd54d1565f9e03b53 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 28 Apr 2016 00:57:27 -0400
 Subject: [PATCH] remove null possibility for getServer singleton
@@ -6,7 +6,7 @@ Subject: [PATCH] remove null possibility for getServer singleton
 to stop IDE complaining about potential NPE
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index bf8ca326b..50cf32f41 100644
+index 7a860231e..d3d8fffeb 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -61,6 +61,7 @@ import co.aikar.timings.MinecraftTimings; // Paper
diff --git a/Spigot-Server-Patches/0099-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/Spigot-Server-Patches/0101-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
similarity index 99%
rename from Spigot-Server-Patches/0099-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
rename to Spigot-Server-Patches/0101-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index 2f5e69698a..40f6eeb5a1 100644
--- a/Spigot-Server-Patches/0099-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/Spigot-Server-Patches/0101-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
@@ -1,4 +1,4 @@
-From a8ea4e4661e2aa7898ecf28fe43d93916064f57b Mon Sep 17 00:00:00 2001
+From 00f68187d3129ddb2d4cd71db286a1f72d9e11b2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 29 Apr 2016 20:02:00 -0400
 Subject: [PATCH] Improve Maps (in item frames) performance and bug fixes
diff --git a/Spigot-Server-Patches/0100-LootTable-API-Replenishable-Lootables-Feature.patch b/Spigot-Server-Patches/0102-LootTable-API-Replenishable-Lootables-Feature.patch
similarity index 98%
rename from Spigot-Server-Patches/0100-LootTable-API-Replenishable-Lootables-Feature.patch
rename to Spigot-Server-Patches/0102-LootTable-API-Replenishable-Lootables-Feature.patch
index fa716d6e4e..58959e4c7a 100644
--- a/Spigot-Server-Patches/0100-LootTable-API-Replenishable-Lootables-Feature.patch
+++ b/Spigot-Server-Patches/0102-LootTable-API-Replenishable-Lootables-Feature.patch
@@ -1,4 +1,4 @@
-From 0db0762560688201711a37c7d2b1289a82a89301 Mon Sep 17 00:00:00 2001
+From 93163ab4f1ab40ca4faeca7eada9985ad855c8c8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 1 May 2016 21:19:14 -0400
 Subject: [PATCH] LootTable API & Replenishable Lootables Feature
@@ -11,7 +11,7 @@ This feature is good for long term worlds so that newer players
 do not suffer with "Every chest has been looted"
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 377f4983b7..805aa56999 100644
+index 377f4983b..805aa5699 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -265,4 +265,26 @@ public class PaperWorldConfig {
@@ -43,7 +43,7 @@ index 377f4983b7..805aa56999 100644
  }
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableBlockInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableBlockInventory.java
 new file mode 100644
-index 0000000000..d6fce3112e
+index 000000000..d6fce3112
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableBlockInventory.java
 @@ -0,0 +1,33 @@
@@ -82,7 +82,7 @@ index 0000000000..d6fce3112e
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableEntityInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableEntityInventory.java
 new file mode 100644
-index 0000000000..5e637782d5
+index 000000000..5e637782d
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableEntityInventory.java
 @@ -0,0 +1,28 @@
@@ -116,7 +116,7 @@ index 0000000000..5e637782d5
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventory.java
 new file mode 100644
-index 0000000000..856843fc91
+index 000000000..856843fc9
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventory.java
 @@ -0,0 +1,71 @@
@@ -193,7 +193,7 @@ index 0000000000..856843fc91
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java
 new file mode 100644
-index 0000000000..b5401eaf97
+index 000000000..b5401eaf9
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java
 @@ -0,0 +1,179 @@
@@ -378,7 +378,7 @@ index 0000000000..b5401eaf97
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperMinecartLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperMinecartLootableInventory.java
 new file mode 100644
-index 0000000000..f9fbc221bd
+index 000000000..f9fbc221b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperMinecartLootableInventory.java
 @@ -0,0 +1,64 @@
@@ -448,7 +448,7 @@ index 0000000000..f9fbc221bd
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java
 new file mode 100644
-index 0000000000..d50410532c
+index 000000000..d50410532
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java
 @@ -0,0 +1,67 @@
@@ -520,7 +520,7 @@ index 0000000000..d50410532c
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index bff30aac1c..2f4e56fc56 100644
+index e6e47bc57..202ad9489 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -72,6 +72,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -532,7 +532,7 @@ index bff30aac1c..2f4e56fc56 100644
  
      public CraftEntity getBukkitEntity() {
 diff --git a/src/main/java/net/minecraft/server/EntityMinecartContainer.java b/src/main/java/net/minecraft/server/EntityMinecartContainer.java
-index 66826da450..b84a70edb4 100644
+index 66826da45..b84a70edb 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartContainer.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartContainer.java
 @@ -15,10 +15,11 @@ public abstract class EntityMinecartContainer extends EntityMinecartAbstract imp
@@ -591,7 +591,7 @@ index 66826da450..b84a70edb4 100644
  
              if (entityhuman != null) {
 diff --git a/src/main/java/net/minecraft/server/TileEntityLootable.java b/src/main/java/net/minecraft/server/TileEntityLootable.java
-index 56c7f9b4e3..a12d49fc4d 100644
+index 56c7f9b4e..a12d49fc4 100644
 --- a/src/main/java/net/minecraft/server/TileEntityLootable.java
 +++ b/src/main/java/net/minecraft/server/TileEntityLootable.java
 @@ -6,8 +6,9 @@ import javax.annotation.Nullable;
@@ -646,7 +646,7 @@ index 56c7f9b4e3..a12d49fc4d 100644
  
              if (entityhuman != null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
-index 57443ca6f0..d8b3d2f3d5 100644
+index 57443ca6f..d8b3d2f3d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 @@ -65,7 +65,7 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
@@ -659,7 +659,7 @@ index 57443ca6f0..d8b3d2f3d5 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
-index 6beb992622..019fa71181 100644
+index 6beb99262..019fa7118 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
 @@ -11,8 +11,9 @@ import org.bukkit.craftbukkit.CraftWorld;
@@ -674,7 +674,7 @@ index 6beb992622..019fa71181 100644
      public CraftChest(final Block block) {
          super(block, TileEntityChest.class);
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java b/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java
-index e1ad26a242..678aa09d47 100644
+index e1ad26a24..678aa09d4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java
 @@ -1,5 +1,6 @@
@@ -703,7 +703,7 @@ index e1ad26a242..678aa09d47 100644
          getSnapshot().setLootTable(key, seed);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java
-index e05624e643..ab4807b2cd 100644
+index e05624e64..ab4807b2c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java
 @@ -1,5 +1,6 @@
@@ -723,7 +723,7 @@ index e05624e643..ab4807b2cd 100644
  
      public CraftMinecartChest(CraftServer server, EntityMinecartChest entity) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartContainer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartContainer.java
-index 2d776b520b..fcc9787848 100644
+index 2d776b520..fcc978784 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartContainer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartContainer.java
 @@ -47,7 +47,7 @@ public abstract class CraftMinecartContainer extends CraftMinecart implements Lo
@@ -736,7 +736,7 @@ index 2d776b520b..fcc9787848 100644
          getHandle().setLootTable(newKey, seed);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java
-index 334bd5bb3f..f5b31237fc 100644
+index 334bd5bb3..f5b31237f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java
 @@ -1,5 +1,6 @@
diff --git a/Spigot-Server-Patches/0101-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/Spigot-Server-Patches/0103-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
similarity index 96%
rename from Spigot-Server-Patches/0101-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
rename to Spigot-Server-Patches/0103-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
index 5e761e70f5..a992145ace 100644
--- a/Spigot-Server-Patches/0101-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
+++ b/Spigot-Server-Patches/0103-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
@@ -1,4 +1,4 @@
-From 19cd9fc8e3f7c2781e39f9d2c39ba5e57bbdb7ba Mon Sep 17 00:00:00 2001
+From 955ba66f8ecfc4ccf127afcb2d30c4a9f3aac8e6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 May 2016 23:33:08 -0400
 Subject: [PATCH] Don't save empty scoreboard teams to scoreboard.dat
diff --git a/Spigot-Server-Patches/0102-System-property-for-disabling-watchdoge.patch b/Spigot-Server-Patches/0104-System-property-for-disabling-watchdoge.patch
similarity index 93%
rename from Spigot-Server-Patches/0102-System-property-for-disabling-watchdoge.patch
rename to Spigot-Server-Patches/0104-System-property-for-disabling-watchdoge.patch
index de93aaf498..eb3dd8e351 100644
--- a/Spigot-Server-Patches/0102-System-property-for-disabling-watchdoge.patch
+++ b/Spigot-Server-Patches/0104-System-property-for-disabling-watchdoge.patch
@@ -1,4 +1,4 @@
-From 1903e90b74e09bde64878c01584df9d90cfa8815 Mon Sep 17 00:00:00 2001
+From 882090b6eebab75df8847daedb5734d500c5b360 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 12 May 2016 23:02:58 -0500
 Subject: [PATCH] System property for disabling watchdoge
diff --git a/Spigot-Server-Patches/0103-Optimize-UserCache-Thread-Safe.patch b/Spigot-Server-Patches/0105-Optimize-UserCache-Thread-Safe.patch
similarity index 96%
rename from Spigot-Server-Patches/0103-Optimize-UserCache-Thread-Safe.patch
rename to Spigot-Server-Patches/0105-Optimize-UserCache-Thread-Safe.patch
index 1928d14f8c..7a4db84695 100644
--- a/Spigot-Server-Patches/0103-Optimize-UserCache-Thread-Safe.patch
+++ b/Spigot-Server-Patches/0105-Optimize-UserCache-Thread-Safe.patch
@@ -1,4 +1,4 @@
-From a29caf1df2a8c7f8a6201b61dd3487c7525829e5 Mon Sep 17 00:00:00 2001
+From aea94acb32f7d201b505e3e46a382a3b9c0256b2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 16 May 2016 20:47:41 -0400
 Subject: [PATCH] Optimize UserCache / Thread Safe
@@ -10,7 +10,7 @@ Additionally, move Saving of the User cache to be done async, incase
 the user never changed the default setting for Spigot's save on stop only.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d3d8fffeb0..f142ed9a3b 100644
+index d3d8fffeb..f142ed9a3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -739,7 +739,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -23,7 +23,7 @@ index d3d8fffeb0..f142ed9a3b 100644
          // Spigot end
      }
 diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java
-index 41be5bf64e..dc5c0afab4 100644
+index 41be5bf64..dc5c0afab 100644
 --- a/src/main/java/net/minecraft/server/UserCache.java
 +++ b/src/main/java/net/minecraft/server/UserCache.java
 @@ -43,8 +43,8 @@ public class UserCache {
diff --git a/Spigot-Server-Patches/0104-Avoid-blocking-on-Network-Manager-creation.patch b/Spigot-Server-Patches/0106-Avoid-blocking-on-Network-Manager-creation.patch
similarity index 97%
rename from Spigot-Server-Patches/0104-Avoid-blocking-on-Network-Manager-creation.patch
rename to Spigot-Server-Patches/0106-Avoid-blocking-on-Network-Manager-creation.patch
index d24755947c..7f352caabb 100644
--- a/Spigot-Server-Patches/0104-Avoid-blocking-on-Network-Manager-creation.patch
+++ b/Spigot-Server-Patches/0106-Avoid-blocking-on-Network-Manager-creation.patch
@@ -1,4 +1,4 @@
-From fe618c45f0b134731b12c0ad6ca90eff15dea5ce Mon Sep 17 00:00:00 2001
+From 78c8956bb054e087a9eac7373dac3e4effcd9bd3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 16 May 2016 23:19:16 -0400
 Subject: [PATCH] Avoid blocking on Network Manager creation
diff --git a/Spigot-Server-Patches/0105-Optional-TNT-doesn-t-move-in-water.patch b/Spigot-Server-Patches/0107-Optional-TNT-doesn-t-move-in-water.patch
similarity index 95%
rename from Spigot-Server-Patches/0105-Optional-TNT-doesn-t-move-in-water.patch
rename to Spigot-Server-Patches/0107-Optional-TNT-doesn-t-move-in-water.patch
index 21c1c9992f..b041c674ef 100644
--- a/Spigot-Server-Patches/0105-Optional-TNT-doesn-t-move-in-water.patch
+++ b/Spigot-Server-Patches/0107-Optional-TNT-doesn-t-move-in-water.patch
@@ -1,11 +1,11 @@
-From 1a85f5369bbc8c7836c9599c5ad64dfcc7abddd5 Mon Sep 17 00:00:00 2001
+From 523f9eced01289baf9441ed3e84169bcd9b3769e Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 22 May 2016 20:20:55 -0500
 Subject: [PATCH] Optional TNT doesn't move in water
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 805aa56999..92ab55182f 100644
+index 805aa5699..92ab55182 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -2,7 +2,6 @@ package com.destroystokyo.paper;
@@ -32,7 +32,7 @@ index 805aa56999..92ab55182f 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 202ad9489f..d017cc8e6a 100644
+index 202ad9489..d017cc8e6 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2645,6 +2645,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -49,7 +49,7 @@ index 202ad9489f..d017cc8e6a 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
-index e0535604b6..baeb85142b 100644
+index e0535604b..baeb85142 100644
 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 @@ -80,7 +80,27 @@ public class EntityTNTPrimed extends Entity {
@@ -94,7 +94,7 @@ index e0535604b6..baeb85142b 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index aaf3a54b08..afd8748da8 100644
+index aaf3a54b0..afd8748da 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -36,7 +36,7 @@ public class EntityTrackerEntry {
diff --git a/Spigot-Server-Patches/0106-Faster-redstone-torch-rapid-clock-removal.patch b/Spigot-Server-Patches/0108-Faster-redstone-torch-rapid-clock-removal.patch
similarity index 97%
rename from Spigot-Server-Patches/0106-Faster-redstone-torch-rapid-clock-removal.patch
rename to Spigot-Server-Patches/0108-Faster-redstone-torch-rapid-clock-removal.patch
index f664c33ad4..7299c6fd17 100644
--- a/Spigot-Server-Patches/0106-Faster-redstone-torch-rapid-clock-removal.patch
+++ b/Spigot-Server-Patches/0108-Faster-redstone-torch-rapid-clock-removal.patch
@@ -1,4 +1,4 @@
-From d52d8059d6a382725261365b534a91ff351b17c2 Mon Sep 17 00:00:00 2001
+From 98afb383d2043af399ac01b60a988d9975b83ef9 Mon Sep 17 00:00:00 2001
 From: Martin Panzer <postremus1996@googlemail.com>
 Date: Mon, 23 May 2016 12:12:37 +0200
 Subject: [PATCH] Faster redstone torch rapid clock removal
@@ -77,7 +77,7 @@ index a99f979ef..919ba8a14 100644
          public RedstoneUpdateInfo(BlockPosition blockposition, long i) {
              this.a = blockposition;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index de09ed97e..3305e110c 100644
+index aaf22401b..de0b07b5a 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -99,6 +99,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
diff --git a/Spigot-Server-Patches/0107-Add-server-name-parameter.patch b/Spigot-Server-Patches/0109-Add-server-name-parameter.patch
similarity index 90%
rename from Spigot-Server-Patches/0107-Add-server-name-parameter.patch
rename to Spigot-Server-Patches/0109-Add-server-name-parameter.patch
index b6642e43d2..4b0579a661 100644
--- a/Spigot-Server-Patches/0107-Add-server-name-parameter.patch
+++ b/Spigot-Server-Patches/0109-Add-server-name-parameter.patch
@@ -1,11 +1,11 @@
-From 00dc73fe3a8769eb28d5bc2eb930d75ae7816654 Mon Sep 17 00:00:00 2001
+From b84a4c4ef5f5a3860860eb96092dc6c1eb6ee025 Mon Sep 17 00:00:00 2001
 From: Martin Panzer <postremus1996@googlemail.com>
 Date: Sat, 28 May 2016 16:54:03 +0200
 Subject: [PATCH] Add server-name parameter
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 7f5ea764d7..c5d5121fd9 100644
+index 7f5ea764d..c5d5121fd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -136,6 +136,14 @@ public class Main {
diff --git a/Spigot-Server-Patches/0108-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch b/Spigot-Server-Patches/0110-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
similarity index 95%
rename from Spigot-Server-Patches/0108-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
rename to Spigot-Server-Patches/0110-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
index 49ec804b12..c2577940f3 100644
--- a/Spigot-Server-Patches/0108-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
+++ b/Spigot-Server-Patches/0110-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
@@ -1,4 +1,4 @@
-From e682fe5696989039197c856ce887b1b90cc91d8d Mon Sep 17 00:00:00 2001
+From a03786f6ca15361611bb799cfd4eadc26bacd533 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 31 May 2016 22:53:50 -0400
 Subject: [PATCH] Only send Dragon/Wither Death sounds to same world
@@ -6,7 +6,7 @@ Subject: [PATCH] Only send Dragon/Wither Death sounds to same world
 Also fix view distance lookup
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index 831a99ebee..2ee80c2863 100644
+index 291845be1..b3010bee5 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -563,8 +563,11 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
@@ -24,7 +24,7 @@ index 831a99ebee..2ee80c2863 100644
                      double deltaZ = this.locZ - player.locZ;
                      double distanceSquared = deltaX * deltaX + deltaZ * deltaZ;
 diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java
-index f23f094303..48b22894aa 100644
+index f23f09430..48b22894a 100644
 --- a/src/main/java/net/minecraft/server/EntityWither.java
 +++ b/src/main/java/net/minecraft/server/EntityWither.java
 @@ -207,8 +207,11 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
diff --git a/Spigot-Server-Patches/0109-Fix-Double-World-Add-issues.patch b/Spigot-Server-Patches/0111-Fix-Double-World-Add-issues.patch
similarity index 94%
rename from Spigot-Server-Patches/0109-Fix-Double-World-Add-issues.patch
rename to Spigot-Server-Patches/0111-Fix-Double-World-Add-issues.patch
index 6ad133dce2..2516133a7e 100644
--- a/Spigot-Server-Patches/0109-Fix-Double-World-Add-issues.patch
+++ b/Spigot-Server-Patches/0111-Fix-Double-World-Add-issues.patch
@@ -1,4 +1,4 @@
-From 75f71ce6a90425d146b533b8a86a277b014925c6 Mon Sep 17 00:00:00 2001
+From 34e636a557db00e823e4b1ce139507410c999fe2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 21 Jun 2016 22:54:34 -0400
 Subject: [PATCH] Fix Double World Add issues
diff --git a/Spigot-Server-Patches/0110-Fix-Old-Sign-Conversion.patch b/Spigot-Server-Patches/0112-Fix-Old-Sign-Conversion.patch
similarity index 98%
rename from Spigot-Server-Patches/0110-Fix-Old-Sign-Conversion.patch
rename to Spigot-Server-Patches/0112-Fix-Old-Sign-Conversion.patch
index 82fb389e7f..5d7b9ff76a 100644
--- a/Spigot-Server-Patches/0110-Fix-Old-Sign-Conversion.patch
+++ b/Spigot-Server-Patches/0112-Fix-Old-Sign-Conversion.patch
@@ -1,4 +1,4 @@
-From ace42663ea06bd02c38d2a2b2462b91303d524d1 Mon Sep 17 00:00:00 2001
+From 3a3725fb8e7c10867e2f89ffd36c334843303d37 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 17 Jun 2016 20:50:11 -0400
 Subject: [PATCH] Fix Old Sign Conversion
diff --git a/Spigot-Server-Patches/0111-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/Spigot-Server-Patches/0113-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
similarity index 90%
rename from Spigot-Server-Patches/0111-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
rename to Spigot-Server-Patches/0113-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
index 9e8bf2004a..9648ca9ffa 100644
--- a/Spigot-Server-Patches/0111-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
+++ b/Spigot-Server-Patches/0113-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
@@ -1,11 +1,11 @@
-From 503c53decf8c3e502927a285808f3449b5535be0 Mon Sep 17 00:00:00 2001
+From f11ec050ce775670004b79fc9cd6ad75db672a4e Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 16 Jul 2016 19:11:17 -0500
 Subject: [PATCH] Don't lookup game profiles that have no UUID and no name
 
 
 diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java
-index cd8a652eb..409bc6da9 100644
+index dc5c0afab..fd17a3e93 100644
 --- a/src/main/java/net/minecraft/server/UserCache.java
 +++ b/src/main/java/net/minecraft/server/UserCache.java
 @@ -86,7 +86,7 @@ public class UserCache {
diff --git a/Spigot-Server-Patches/0112-More-informative-vehicle-moved-wrongly-message.patch b/Spigot-Server-Patches/0114-More-informative-vehicle-moved-wrongly-message.patch
similarity index 90%
rename from Spigot-Server-Patches/0112-More-informative-vehicle-moved-wrongly-message.patch
rename to Spigot-Server-Patches/0114-More-informative-vehicle-moved-wrongly-message.patch
index 6fac52df61..5db06ed73e 100644
--- a/Spigot-Server-Patches/0112-More-informative-vehicle-moved-wrongly-message.patch
+++ b/Spigot-Server-Patches/0114-More-informative-vehicle-moved-wrongly-message.patch
@@ -1,11 +1,11 @@
-From 18e3888c278a1fb0720e69e10bb56d8dde181796 Mon Sep 17 00:00:00 2001
+From c3923c331319d8f793867276f2505d2c4736d3f5 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 28 Jul 2016 17:58:53 -0500
 Subject: [PATCH] More informative vehicle moved wrongly message
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index cd0f62f5f0..a95abdbc6d 100644
+index bc11a9162..be870d97a 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -361,7 +361,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0113-Re-track-players-that-dismount-from-other-players.patch b/Spigot-Server-Patches/0115-Re-track-players-that-dismount-from-other-players.patch
similarity index 92%
rename from Spigot-Server-Patches/0113-Re-track-players-that-dismount-from-other-players.patch
rename to Spigot-Server-Patches/0115-Re-track-players-that-dismount-from-other-players.patch
index 950cd6a295..da11bcf667 100644
--- a/Spigot-Server-Patches/0113-Re-track-players-that-dismount-from-other-players.patch
+++ b/Spigot-Server-Patches/0115-Re-track-players-that-dismount-from-other-players.patch
@@ -1,11 +1,11 @@
-From bd4ea8e02d139fda914a2764aa6b778fa36ce1ac Mon Sep 17 00:00:00 2001
+From 043764e8d33082b85be144949a683d71601426a7 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 31 Jul 2016 16:33:03 -0500
 Subject: [PATCH] Re-track players that dismount from other players
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 9b68c5fec1..088475d8f6 100644
+index beb16c8d5..ec1033f33 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -975,6 +975,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0114-Add-setting-for-proxy-online-mode-status.patch b/Spigot-Server-Patches/0116-Add-setting-for-proxy-online-mode-status.patch
similarity index 96%
rename from Spigot-Server-Patches/0114-Add-setting-for-proxy-online-mode-status.patch
rename to Spigot-Server-Patches/0116-Add-setting-for-proxy-online-mode-status.patch
index 0432db3ae7..34448cec7c 100644
--- a/Spigot-Server-Patches/0114-Add-setting-for-proxy-online-mode-status.patch
+++ b/Spigot-Server-Patches/0116-Add-setting-for-proxy-online-mode-status.patch
@@ -1,4 +1,4 @@
-From 6b1783cb318c0f6a3ae12fe201983e2f7d76ad3e Mon Sep 17 00:00:00 2001
+From d5a547237926db5bf30ee054daeff55fb6ca8987 Mon Sep 17 00:00:00 2001
 From: Gabriele C <sgdc3.mail@gmail.com>
 Date: Fri, 5 Aug 2016 01:03:08 +0200
 Subject: [PATCH] Add setting for proxy online mode status
@@ -45,7 +45,7 @@ index 61ea2818b..26c786106 100644
          } else {
              String[] astring1 = astring;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 430ece28b..8717bdb37 100644
+index 954eb497b..4d51bbbec 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1352,7 +1352,8 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0115-Optimise-BlockState-s-hashCode-equals.patch b/Spigot-Server-Patches/0117-Optimise-BlockState-s-hashCode-equals.patch
similarity index 98%
rename from Spigot-Server-Patches/0115-Optimise-BlockState-s-hashCode-equals.patch
rename to Spigot-Server-Patches/0117-Optimise-BlockState-s-hashCode-equals.patch
index 56a5e3f948..b75ed0d0ba 100644
--- a/Spigot-Server-Patches/0115-Optimise-BlockState-s-hashCode-equals.patch
+++ b/Spigot-Server-Patches/0117-Optimise-BlockState-s-hashCode-equals.patch
@@ -1,4 +1,4 @@
-From 111e6d81ee7f75c570d33392fb174aaeabdd5f54 Mon Sep 17 00:00:00 2001
+From 0ac810e61e128cfd3d657bcf5af1d1401ea1559c Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Fri, 19 Aug 2016 01:52:56 +0100
 Subject: [PATCH] Optimise BlockState's hashCode/equals
diff --git a/Spigot-Server-Patches/0116-Configurable-packet-in-spam-threshold.patch b/Spigot-Server-Patches/0118-Configurable-packet-in-spam-threshold.patch
similarity index 95%
rename from Spigot-Server-Patches/0116-Configurable-packet-in-spam-threshold.patch
rename to Spigot-Server-Patches/0118-Configurable-packet-in-spam-threshold.patch
index 0be7fead9f..c9200893a9 100644
--- a/Spigot-Server-Patches/0116-Configurable-packet-in-spam-threshold.patch
+++ b/Spigot-Server-Patches/0118-Configurable-packet-in-spam-threshold.patch
@@ -1,4 +1,4 @@
-From e2195fe46e824d420abf976e70700119032737db Mon Sep 17 00:00:00 2001
+From 94a3653af3730965a639215163c102294a0eb793 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 11 Sep 2016 14:30:57 -0500
 Subject: [PATCH] Configurable packet in spam threshold
@@ -23,7 +23,7 @@ index 3d9dba769..5c7f17090 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index a95abdbc6..d0689953d 100644
+index be870d97a..8d33eb25e 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1216,13 +1216,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0117-Configurable-flying-kick-messages.patch b/Spigot-Server-Patches/0119-Configurable-flying-kick-messages.patch
similarity index 96%
rename from Spigot-Server-Patches/0117-Configurable-flying-kick-messages.patch
rename to Spigot-Server-Patches/0119-Configurable-flying-kick-messages.patch
index c8116eff03..10ba57900d 100644
--- a/Spigot-Server-Patches/0117-Configurable-flying-kick-messages.patch
+++ b/Spigot-Server-Patches/0119-Configurable-flying-kick-messages.patch
@@ -1,4 +1,4 @@
-From 4e283b3a1ef77abe48226f455e2241a164fec93f Mon Sep 17 00:00:00 2001
+From 9e7b3606ca82f4d99656cabaaf202fb7a3f49844 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Tue, 20 Sep 2016 00:58:01 +0000
 Subject: [PATCH] Configurable flying kick messages
@@ -21,7 +21,7 @@ index 5c7f17090..503e13775 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index d0689953d..ea62e9baf 100644
+index 8d33eb25e..3788cc37e 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -144,7 +144,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0118-Chunk-registration-fixes.patch b/Spigot-Server-Patches/0120-Chunk-registration-fixes.patch
similarity index 94%
rename from Spigot-Server-Patches/0118-Chunk-registration-fixes.patch
rename to Spigot-Server-Patches/0120-Chunk-registration-fixes.patch
index 30c1d2f9c2..ae19bafc42 100644
--- a/Spigot-Server-Patches/0118-Chunk-registration-fixes.patch
+++ b/Spigot-Server-Patches/0120-Chunk-registration-fixes.patch
@@ -1,4 +1,4 @@
-From 2b1575c0cbbe8ef6d446beabe6cc7852af985386 Mon Sep 17 00:00:00 2001
+From 259a5fd0b7e29174666b9cdb1fb6083bede2b275 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Sep 2016 22:54:28 -0400
 Subject: [PATCH] Chunk registration fixes
diff --git a/Spigot-Server-Patches/0119-Remove-FishingHook-reference-on-Craft-Entity-removal.patch b/Spigot-Server-Patches/0121-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
similarity index 89%
rename from Spigot-Server-Patches/0119-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
rename to Spigot-Server-Patches/0121-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
index 5a3e66eea0..7c3765b088 100644
--- a/Spigot-Server-Patches/0119-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
+++ b/Spigot-Server-Patches/0121-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
@@ -1,11 +1,11 @@
-From 0caf657407a19815246778d82f2941f8de3c70fd Mon Sep 17 00:00:00 2001
+From 06525d170c7d03336b3e760d1b5f03094219896f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 16 Jun 2016 00:17:23 -0400
 Subject: [PATCH] Remove FishingHook reference on Craft Entity removal
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java
-index 1ed9a4e32e..9eb9801376 100644
+index 1ed9a4e32..9eb980137 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java
 @@ -66,4 +66,15 @@ public class CraftFishHook extends AbstractProjectile implements FishHook {
diff --git a/Spigot-Server-Patches/0120-Auto-fix-bad-Y-levels-on-player-login.patch b/Spigot-Server-Patches/0122-Auto-fix-bad-Y-levels-on-player-login.patch
similarity index 90%
rename from Spigot-Server-Patches/0120-Auto-fix-bad-Y-levels-on-player-login.patch
rename to Spigot-Server-Patches/0122-Auto-fix-bad-Y-levels-on-player-login.patch
index 3b167cfc81..e89db2a7b0 100644
--- a/Spigot-Server-Patches/0120-Auto-fix-bad-Y-levels-on-player-login.patch
+++ b/Spigot-Server-Patches/0122-Auto-fix-bad-Y-levels-on-player-login.patch
@@ -1,4 +1,4 @@
-From 17b7e7a2d3ad65237784d2d68b538ba13df67153 Mon Sep 17 00:00:00 2001
+From cdebeb72ea6b44cd8feb612a6b0d39301822a4f2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Sep 2016 23:48:39 -0400
 Subject: [PATCH] Auto fix bad Y levels on player login
@@ -6,7 +6,7 @@ Subject: [PATCH] Auto fix bad Y levels on player login
 Bring down to a saner Y level if super high, as this can cause the server to crash
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 088475d8f6..d61d159d11 100644
+index ec1033f33..af803ae8a 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -191,6 +191,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0121-Option-to-remove-corrupt-tile-entities.patch b/Spigot-Server-Patches/0123-Option-to-remove-corrupt-tile-entities.patch
similarity index 92%
rename from Spigot-Server-Patches/0121-Option-to-remove-corrupt-tile-entities.patch
rename to Spigot-Server-Patches/0123-Option-to-remove-corrupt-tile-entities.patch
index df6c197398..f094ef6e9b 100644
--- a/Spigot-Server-Patches/0121-Option-to-remove-corrupt-tile-entities.patch
+++ b/Spigot-Server-Patches/0123-Option-to-remove-corrupt-tile-entities.patch
@@ -1,11 +1,11 @@
-From 73179058d09632fc4c845c480aad2ba42fe43e1a Mon Sep 17 00:00:00 2001
+From fa25cf3ca7063d1bb2dd2aa78ca5f2b3067266d6 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 5 Oct 2016 16:27:36 -0500
 Subject: [PATCH] Option to remove corrupt tile entities
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 92ab55182f..eed454bf40 100644
+index 92ab55182..eed454bf4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -296,4 +296,9 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index 92ab55182f..eed454bf40 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 2da7c4531f..7bd5a0a8cd 100644
+index 2da7c4531..7bd5a0a8c 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -533,6 +533,12 @@ public class Chunk implements IChunkAccess {
diff --git a/Spigot-Server-Patches/0122-Add-EntityZapEvent.patch b/Spigot-Server-Patches/0124-Add-EntityZapEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0122-Add-EntityZapEvent.patch
rename to Spigot-Server-Patches/0124-Add-EntityZapEvent.patch
index ef8827127f..4598d0033a 100644
--- a/Spigot-Server-Patches/0122-Add-EntityZapEvent.patch
+++ b/Spigot-Server-Patches/0124-Add-EntityZapEvent.patch
@@ -1,4 +1,4 @@
-From 22bcb8cbcdb22075fee2e664ee03e0ebfc0803b1 Mon Sep 17 00:00:00 2001
+From 51c00e652685a55306c10cd88136a10cd8b108bb Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Sun, 16 Oct 2016 23:19:30 -0700
 Subject: [PATCH] Add EntityZapEvent
diff --git a/Spigot-Server-Patches/0123-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/Spigot-Server-Patches/0125-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
similarity index 96%
rename from Spigot-Server-Patches/0123-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
rename to Spigot-Server-Patches/0125-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
index e222e8998e..045dbf0fcf 100644
--- a/Spigot-Server-Patches/0123-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
+++ b/Spigot-Server-Patches/0125-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
@@ -1,4 +1,4 @@
-From 8b7b6d6567969fde109ee4cc9ff7f4cd95823fa3 Mon Sep 17 00:00:00 2001
+From 95acf9aa9d57511f2f8cbffc86e02862ab67a165 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Nov 2016 20:28:12 -0400
 Subject: [PATCH] Don't load Chunks from Hoppers and other things
diff --git a/Spigot-Server-Patches/0124-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch b/Spigot-Server-Patches/0126-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
similarity index 97%
rename from Spigot-Server-Patches/0124-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
rename to Spigot-Server-Patches/0126-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
index 0aad39646c..c606d181ce 100644
--- a/Spigot-Server-Patches/0124-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
+++ b/Spigot-Server-Patches/0126-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
@@ -1,4 +1,4 @@
-From 6a535c23280839bd1920db5c8cdb6c2c1200c017 Mon Sep 17 00:00:00 2001
+From 7e3e752ccf968eae4eec177848c194cfcd040f12 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 12 Nov 2016 23:25:22 -0600
 Subject: [PATCH] Filter bad data from ArmorStand and SpawnEgg items
diff --git a/Spigot-Server-Patches/0125-Cache-user-authenticator-threads.patch b/Spigot-Server-Patches/0127-Cache-user-authenticator-threads.patch
similarity index 97%
rename from Spigot-Server-Patches/0125-Cache-user-authenticator-threads.patch
rename to Spigot-Server-Patches/0127-Cache-user-authenticator-threads.patch
index 394cdf5d1f..d36973de0d 100644
--- a/Spigot-Server-Patches/0125-Cache-user-authenticator-threads.patch
+++ b/Spigot-Server-Patches/0127-Cache-user-authenticator-threads.patch
@@ -1,4 +1,4 @@
-From ff8aab9bd4f2d75aff418f3c73d4fa45fa2805d3 Mon Sep 17 00:00:00 2001
+From d482793affe9ce0c643010d6ba5401aa1dbf331e Mon Sep 17 00:00:00 2001
 From: vemacs <d@nkmem.es>
 Date: Wed, 23 Nov 2016 08:31:45 -0500
 Subject: [PATCH] Cache user authenticator threads
diff --git a/Spigot-Server-Patches/0126-Optimise-removeQueue.patch b/Spigot-Server-Patches/0128-Optimise-removeQueue.patch
similarity index 97%
rename from Spigot-Server-Patches/0126-Optimise-removeQueue.patch
rename to Spigot-Server-Patches/0128-Optimise-removeQueue.patch
index 78e0f162fc..41ab66de4d 100644
--- a/Spigot-Server-Patches/0126-Optimise-removeQueue.patch
+++ b/Spigot-Server-Patches/0128-Optimise-removeQueue.patch
@@ -1,11 +1,11 @@
-From de2b62887def1fa621a3e390e65c4b9fa2b6b997 Mon Sep 17 00:00:00 2001
+From ff1320c9a7860de781f25149459b0a813b27f522 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Fri, 25 Nov 2016 13:22:40 +0000
 Subject: [PATCH] Optimise removeQueue
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 1e6b8bd46..cb34c6beb 100644
+index af803ae8a..46d1dddca 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -4,7 +4,9 @@ import com.google.common.collect.Lists;
diff --git a/Spigot-Server-Patches/0127-Allow-Reloading-of-Command-Aliases.patch b/Spigot-Server-Patches/0129-Allow-Reloading-of-Command-Aliases.patch
similarity index 93%
rename from Spigot-Server-Patches/0127-Allow-Reloading-of-Command-Aliases.patch
rename to Spigot-Server-Patches/0129-Allow-Reloading-of-Command-Aliases.patch
index c7772cbaf0..45d19a22bc 100644
--- a/Spigot-Server-Patches/0127-Allow-Reloading-of-Command-Aliases.patch
+++ b/Spigot-Server-Patches/0129-Allow-Reloading-of-Command-Aliases.patch
@@ -1,4 +1,4 @@
-From 8dbb982c625689f7e40c8134d8200d6b1fddef7b Mon Sep 17 00:00:00 2001
+From 96ac123f0471183403f26b720fa88bc266f7a03b Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Mon, 28 Nov 2016 10:21:52 -0500
 Subject: [PATCH] Allow Reloading of Command Aliases
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Command Aliases
 Reload the aliases stored in commands.yml
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1f0e63a1c2..2757ed338c 100644
+index 4d51bbbec..e79ea322a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2062,5 +2062,24 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0128-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-Server-Patches/0130-Add-source-to-PlayerExpChangeEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0128-Add-source-to-PlayerExpChangeEvent.patch
rename to Spigot-Server-Patches/0130-Add-source-to-PlayerExpChangeEvent.patch
index 198fbc523b..409540e7f8 100644
--- a/Spigot-Server-Patches/0128-Add-source-to-PlayerExpChangeEvent.patch
+++ b/Spigot-Server-Patches/0130-Add-source-to-PlayerExpChangeEvent.patch
@@ -1,4 +1,4 @@
-From e8f835808fa12ff4f541c2ffb52621c58edd4ae9 Mon Sep 17 00:00:00 2001
+From 263b266b8d5554ddd2653c218c4f64540076e779 Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Thu, 8 Sep 2016 08:48:33 -0700
 Subject: [PATCH] Add source to PlayerExpChangeEvent
diff --git a/Spigot-Server-Patches/0129-Optimize-World.isLoaded-BlockPosition-Z.patch b/Spigot-Server-Patches/0131-Optimize-World.isLoaded-BlockPosition-Z.patch
similarity index 90%
rename from Spigot-Server-Patches/0129-Optimize-World.isLoaded-BlockPosition-Z.patch
rename to Spigot-Server-Patches/0131-Optimize-World.isLoaded-BlockPosition-Z.patch
index 8bf9fc5177..bf6c35b9a8 100644
--- a/Spigot-Server-Patches/0129-Optimize-World.isLoaded-BlockPosition-Z.patch
+++ b/Spigot-Server-Patches/0131-Optimize-World.isLoaded-BlockPosition-Z.patch
@@ -1,4 +1,4 @@
-From 900048bc0a83882aa8c155c135a93c33851eba69 Mon Sep 17 00:00:00 2001
+From 05df7e752a62f0ae70c38cd166ba265bc93aa533 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 2 Dec 2016 00:11:43 -0500
 Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z
 Reduce method invocations for World.isLoaded(BlockPosition)Z
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 3305e110c..8ac081bef 100644
+index de0b07b5a..6b2769343 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -209,6 +209,10 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
diff --git a/Spigot-Server-Patches/0130-Don-t-let-fishinghooks-use-portals.patch b/Spigot-Server-Patches/0132-Don-t-let-fishinghooks-use-portals.patch
similarity index 91%
rename from Spigot-Server-Patches/0130-Don-t-let-fishinghooks-use-portals.patch
rename to Spigot-Server-Patches/0132-Don-t-let-fishinghooks-use-portals.patch
index 7d34025994..85b3041830 100644
--- a/Spigot-Server-Patches/0130-Don-t-let-fishinghooks-use-portals.patch
+++ b/Spigot-Server-Patches/0132-Don-t-let-fishinghooks-use-portals.patch
@@ -1,11 +1,11 @@
-From 5f0ebb18b40884e04d4ec3cc143b75a76dbc3035 Mon Sep 17 00:00:00 2001
+From 36f8bbc61f94489ba77a4a775807e75b716fe735 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 16 Dec 2016 16:03:19 -0600
 Subject: [PATCH] Don't let fishinghooks use portals
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 2f1cd47619..e74baac5bc 100644
+index d017cc8e6..7700652e1 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -156,7 +156,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -18,7 +18,7 @@ index 2f1cd47619..e74baac5bc 100644
      public DimensionManager dimension;
      protected BlockPosition al;
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index b082d0a820..15a686cb29 100644
+index 9cbcce446..3b10043ba 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
 @@ -163,6 +163,12 @@ public class EntityFishingHook extends Entity {
diff --git a/Spigot-Server-Patches/0131-Add-ProjectileCollideEvent.patch b/Spigot-Server-Patches/0133-Add-ProjectileCollideEvent.patch
similarity index 99%
rename from Spigot-Server-Patches/0131-Add-ProjectileCollideEvent.patch
rename to Spigot-Server-Patches/0133-Add-ProjectileCollideEvent.patch
index 4163335c94..675f34c4e6 100644
--- a/Spigot-Server-Patches/0131-Add-ProjectileCollideEvent.patch
+++ b/Spigot-Server-Patches/0133-Add-ProjectileCollideEvent.patch
@@ -1,4 +1,4 @@
-From 070d33f9ee257c5c8f31c060046e6bcc52367727 Mon Sep 17 00:00:00 2001
+From 03d4c7baae2730503bd1ad440c73ce2306b3a87c Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Fri, 16 Dec 2016 21:25:39 -0600
 Subject: [PATCH] Add ProjectileCollideEvent
diff --git a/Spigot-Server-Patches/0132-Prevent-Pathfinding-out-of-World-Border.patch b/Spigot-Server-Patches/0134-Prevent-Pathfinding-out-of-World-Border.patch
similarity index 91%
rename from Spigot-Server-Patches/0132-Prevent-Pathfinding-out-of-World-Border.patch
rename to Spigot-Server-Patches/0134-Prevent-Pathfinding-out-of-World-Border.patch
index 99c24e044e..ef364ebc81 100644
--- a/Spigot-Server-Patches/0132-Prevent-Pathfinding-out-of-World-Border.patch
+++ b/Spigot-Server-Patches/0134-Prevent-Pathfinding-out-of-World-Border.patch
@@ -1,4 +1,4 @@
-From cad43ec9f2d9613bb004d977dfb6ab644004d670 Mon Sep 17 00:00:00 2001
+From f0e810168ea733c61409a90ff5f5bb2783326d53 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 19 Dec 2016 23:07:42 -0500
 Subject: [PATCH] Prevent Pathfinding out of World Border
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent Pathfinding out of World Border
 This prevents Entities from trying to run outside of the World Border
 
 diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
-index ed69eaa176..a473c03b9d 100644
+index ed69eaa17..a473c03b9 100644
 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java
 +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
 @@ -95,6 +95,7 @@ public abstract class NavigationAbstract {
diff --git a/Spigot-Server-Patches/0133-Bound-Treasure-Maps-to-World-Border.patch b/Spigot-Server-Patches/0135-Bound-Treasure-Maps-to-World-Border.patch
similarity index 95%
rename from Spigot-Server-Patches/0133-Bound-Treasure-Maps-to-World-Border.patch
rename to Spigot-Server-Patches/0135-Bound-Treasure-Maps-to-World-Border.patch
index 6a525942b2..7405035570 100644
--- a/Spigot-Server-Patches/0133-Bound-Treasure-Maps-to-World-Border.patch
+++ b/Spigot-Server-Patches/0135-Bound-Treasure-Maps-to-World-Border.patch
@@ -1,4 +1,4 @@
-From 414758f1b9530fe3176a012dc24d4ba2c1a59369 Mon Sep 17 00:00:00 2001
+From b9c3b94962c7d88eeeb0cbc6f91f3412620ba7cf Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 20 Dec 2016 15:15:11 -0500
 Subject: [PATCH] Bound Treasure Maps to World Border
@@ -11,7 +11,7 @@ that is outside happens to be closer, but unreachable, yet another reachable
 one is in border that would of been missed.
 
 diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java
-index 464e1e101a..7b2eace75c 100644
+index 464e1e101..7b2eace75 100644
 --- a/src/main/java/net/minecraft/server/StructureGenerator.java
 +++ b/src/main/java/net/minecraft/server/StructureGenerator.java
 @@ -103,6 +103,7 @@ public abstract class StructureGenerator<C extends WorldGenFeatureConfiguration>
@@ -23,7 +23,7 @@ index 464e1e101a..7b2eace75c 100644
  
                                  if (structurestart != null && structurestart.e()) {
 diff --git a/src/main/java/net/minecraft/server/WorldBorder.java b/src/main/java/net/minecraft/server/WorldBorder.java
-index 77b805f3ae..1e622a0434 100644
+index 77b805f3a..1e622a043 100644
 --- a/src/main/java/net/minecraft/server/WorldBorder.java
 +++ b/src/main/java/net/minecraft/server/WorldBorder.java
 @@ -24,6 +24,18 @@ public class WorldBorder {
diff --git a/Spigot-Server-Patches/0134-Configurable-Cartographer-Treasure-Maps.patch b/Spigot-Server-Patches/0136-Configurable-Cartographer-Treasure-Maps.patch
similarity index 93%
rename from Spigot-Server-Patches/0134-Configurable-Cartographer-Treasure-Maps.patch
rename to Spigot-Server-Patches/0136-Configurable-Cartographer-Treasure-Maps.patch
index 6785f72522..3f616ae389 100644
--- a/Spigot-Server-Patches/0134-Configurable-Cartographer-Treasure-Maps.patch
+++ b/Spigot-Server-Patches/0136-Configurable-Cartographer-Treasure-Maps.patch
@@ -1,4 +1,4 @@
-From 54d0abf4bac80d7ac2305e925e6a7138b36683ab Mon Sep 17 00:00:00 2001
+From 5a50217c62878cd2a708aca5df44f83b92ce07e2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 20 Dec 2016 15:26:27 -0500
 Subject: [PATCH] Configurable Cartographer Treasure Maps
@@ -9,7 +9,7 @@ Also allow turning off treasure maps all together as they can eat up Map ID's
 which are limited in quantity.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 4892113a15..406bc611c1 100644
+index 4892113a1..406bc611c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -310,4 +310,14 @@ public class PaperWorldConfig {
@@ -28,7 +28,7 @@ index 4892113a15..406bc611c1 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/VillagerTrades.java b/src/main/java/net/minecraft/server/VillagerTrades.java
-index eabbf29334..0fbaa8dd6d 100644
+index ff3f15eac..ae5ed782e 100644
 --- a/src/main/java/net/minecraft/server/VillagerTrades.java
 +++ b/src/main/java/net/minecraft/server/VillagerTrades.java
 @@ -89,6 +89,7 @@ public class VillagerTrades {
diff --git a/Spigot-Server-Patches/0135-Optimize-ItemStack.isEmpty.patch b/Spigot-Server-Patches/0137-Optimize-ItemStack.isEmpty.patch
similarity index 92%
rename from Spigot-Server-Patches/0135-Optimize-ItemStack.isEmpty.patch
rename to Spigot-Server-Patches/0137-Optimize-ItemStack.isEmpty.patch
index 3f5ceb1cf1..7a05b2437a 100644
--- a/Spigot-Server-Patches/0135-Optimize-ItemStack.isEmpty.patch
+++ b/Spigot-Server-Patches/0137-Optimize-ItemStack.isEmpty.patch
@@ -1,4 +1,4 @@
-From 1d88861a7a12606b16577ab0926d5a0df1e17af4 Mon Sep 17 00:00:00 2001
+From 3820ee666676a9a9a03b771e6235c28375663d42 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Dec 2016 03:48:29 -0500
 Subject: [PATCH] Optimize ItemStack.isEmpty()
diff --git a/Spigot-Server-Patches/0136-Add-API-methods-to-control-if-armour-stands-can-move.patch b/Spigot-Server-Patches/0138-Add-API-methods-to-control-if-armour-stands-can-move.patch
similarity index 93%
rename from Spigot-Server-Patches/0136-Add-API-methods-to-control-if-armour-stands-can-move.patch
rename to Spigot-Server-Patches/0138-Add-API-methods-to-control-if-armour-stands-can-move.patch
index 5071072332..bfdf1d4782 100644
--- a/Spigot-Server-Patches/0136-Add-API-methods-to-control-if-armour-stands-can-move.patch
+++ b/Spigot-Server-Patches/0138-Add-API-methods-to-control-if-armour-stands-can-move.patch
@@ -1,11 +1,11 @@
-From 3bfabae664d81e585174144586f077d50f08b505 Mon Sep 17 00:00:00 2001
+From 12da06361d096ef084a84abb7b64636287a4a63e Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 21 Dec 2016 11:47:25 -0600
 Subject: [PATCH] Add API methods to control if armour stands can move
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 87298320d2..ebedb41787 100644
+index 87298320d..ebedb4178 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -43,6 +43,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -31,7 +31,7 @@ index 87298320d2..ebedb41787 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-index 2b66a08ade..124c3185bc 100644
+index 2b66a08ad..124c3185b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 @@ -211,4 +211,16 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
diff --git a/Spigot-Server-Patches/0137-Properly-fix-item-duplication-bug.patch b/Spigot-Server-Patches/0139-Properly-fix-item-duplication-bug.patch
similarity index 91%
rename from Spigot-Server-Patches/0137-Properly-fix-item-duplication-bug.patch
rename to Spigot-Server-Patches/0139-Properly-fix-item-duplication-bug.patch
index 07bd27dea4..59ce453949 100644
--- a/Spigot-Server-Patches/0137-Properly-fix-item-duplication-bug.patch
+++ b/Spigot-Server-Patches/0139-Properly-fix-item-duplication-bug.patch
@@ -1,4 +1,4 @@
-From f316eb9374bf4515acd9062b3388bd65d20bbeda Mon Sep 17 00:00:00 2001
+From b1fcecc9782a86c510957e4df7f27fda452187dc 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Properly fix item duplication bug
 Credit to prplz for figuring out the real issue
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index cb34c6beb..8074465f1 100644
+index 46d1dddca..c3026530d 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1791,7 +1791,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -19,7 +19,7 @@ index cb34c6beb..8074465f1 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index ea62e9baf..693688c34 100644
+index 3788cc37e..a7e082246 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2540,7 +2540,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0138-String-based-Action-Bar-API.patch b/Spigot-Server-Patches/0140-String-based-Action-Bar-API.patch
similarity index 94%
rename from Spigot-Server-Patches/0138-String-based-Action-Bar-API.patch
rename to Spigot-Server-Patches/0140-String-based-Action-Bar-API.patch
index 12a10a6b68..b0be0b4ad5 100644
--- a/Spigot-Server-Patches/0138-String-based-Action-Bar-API.patch
+++ b/Spigot-Server-Patches/0140-String-based-Action-Bar-API.patch
@@ -1,11 +1,11 @@
-From fc25517cebc592f17213a25323f0954d9e540e5d Mon Sep 17 00:00:00 2001
+From 9a7975a46570f5b6745635e8927fae84a4ab8c78 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 3448b5588e..d7dc516e4a 100644
+index c96f3ed17..1f6a12632 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 3448b5588e..d7dc516e4a 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 06db4a8f04..37e9c86375 100644
+index eca8c0ded..f7ce4b106 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -214,6 +214,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0139-Firework-API-s.patch b/Spigot-Server-Patches/0141-Firework-API-s.patch
similarity index 98%
rename from Spigot-Server-Patches/0139-Firework-API-s.patch
rename to Spigot-Server-Patches/0141-Firework-API-s.patch
index 488d357bc6..63a9a5af65 100644
--- a/Spigot-Server-Patches/0139-Firework-API-s.patch
+++ b/Spigot-Server-Patches/0141-Firework-API-s.patch
@@ -1,4 +1,4 @@
-From 98eddee130ce845f97aadda24a463864fa004b97 Mon Sep 17 00:00:00 2001
+From b0e0b780857cf3a272495b853a22be27ede59428 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/Spigot-Server-Patches/0140-PlayerTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0142-PlayerTeleportEndGatewayEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0140-PlayerTeleportEndGatewayEvent.patch
rename to Spigot-Server-Patches/0142-PlayerTeleportEndGatewayEvent.patch
index 5be45a49f5..b1e40e2978 100644
--- a/Spigot-Server-Patches/0140-PlayerTeleportEndGatewayEvent.patch
+++ b/Spigot-Server-Patches/0142-PlayerTeleportEndGatewayEvent.patch
@@ -1,4 +1,4 @@
-From 0bb363ae5e65babf767f8a9229010c5681c11568 Mon Sep 17 00:00:00 2001
+From 61880860d7580ad26c41f98b244b869f16231695 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 bfc147059..5dd670615 100644
+index 4bd4b93e6..6aa07da6e 100644
 --- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 +++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 @@ -132,7 +132,7 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick
diff --git a/Spigot-Server-Patches/0141-Provide-E-TE-Chunk-count-stat-methods.patch b/Spigot-Server-Patches/0143-Provide-E-TE-Chunk-count-stat-methods.patch
similarity index 94%
rename from Spigot-Server-Patches/0141-Provide-E-TE-Chunk-count-stat-methods.patch
rename to Spigot-Server-Patches/0143-Provide-E-TE-Chunk-count-stat-methods.patch
index 1ce9765a88..4f1b4a690c 100644
--- a/Spigot-Server-Patches/0141-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/Spigot-Server-Patches/0143-Provide-E-TE-Chunk-count-stat-methods.patch
@@ -1,4 +1,4 @@
-From dab337d54a7e298d406f11354171e4adb12f51ad Mon Sep 17 00:00:00 2001
+From acaf32b038ea5a7b338b7c1225a99780241195df 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 b8de76007..b3a77ec3c 100644
+index d000d595b..38e10017d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -265,6 +265,35 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0142-Enforce-Sync-Player-Saves.patch b/Spigot-Server-Patches/0144-Enforce-Sync-Player-Saves.patch
similarity index 94%
rename from Spigot-Server-Patches/0142-Enforce-Sync-Player-Saves.patch
rename to Spigot-Server-Patches/0144-Enforce-Sync-Player-Saves.patch
index d91166315e..07f9a56534 100644
--- a/Spigot-Server-Patches/0142-Enforce-Sync-Player-Saves.patch
+++ b/Spigot-Server-Patches/0144-Enforce-Sync-Player-Saves.patch
@@ -1,4 +1,4 @@
-From 453b8bec5d32187e1700a0d78fd731096e4480d5 Mon Sep 17 00:00:00 2001
+From d7d6889e72bad8d61240ff2399a180bd5598be2e 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
diff --git a/Spigot-Server-Patches/0143-Don-t-allow-entities-to-ride-themselves-572.patch b/Spigot-Server-Patches/0145-Don-t-allow-entities-to-ride-themselves-572.patch
similarity index 89%
rename from Spigot-Server-Patches/0143-Don-t-allow-entities-to-ride-themselves-572.patch
rename to Spigot-Server-Patches/0145-Don-t-allow-entities-to-ride-themselves-572.patch
index 606adbb3e4..dd45db4493 100644
--- a/Spigot-Server-Patches/0143-Don-t-allow-entities-to-ride-themselves-572.patch
+++ b/Spigot-Server-Patches/0145-Don-t-allow-entities-to-ride-themselves-572.patch
@@ -1,11 +1,11 @@
-From ea1c3c3a55a8766a2ee6e55f27455620358b057a Mon Sep 17 00:00:00 2001
+From 295c0624ceff21d1a877c1413a967f55f2461fcf 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 7700652e12..c649507c85 100644
+index 7700652e1..c649507c8 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1993,6 +1993,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/Spigot-Server-Patches/0144-Fix-block-break-desync.patch b/Spigot-Server-Patches/0146-Fix-block-break-desync.patch
similarity index 90%
rename from Spigot-Server-Patches/0144-Fix-block-break-desync.patch
rename to Spigot-Server-Patches/0146-Fix-block-break-desync.patch
index 7cb97c4808..3fa30b3724 100644
--- a/Spigot-Server-Patches/0144-Fix-block-break-desync.patch
+++ b/Spigot-Server-Patches/0146-Fix-block-break-desync.patch
@@ -1,11 +1,11 @@
-From d5e37d75b964cb7f9204a33914e6432d4adadae1 Mon Sep 17 00:00:00 2001
+From 305bd26f4fb649b9bd9ff43b049802ebdc95b078 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
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 693688c340..24615c5bfe 100644
+index a7e082246..cb9a7b68c 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1175,6 +1175,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0145-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/Spigot-Server-Patches/0147-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
similarity index 96%
rename from Spigot-Server-Patches/0145-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
rename to Spigot-Server-Patches/0147-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index f4fd8c24bd..018688de65 100644
--- a/Spigot-Server-Patches/0145-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/Spigot-Server-Patches/0147-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@@ -1,4 +1,4 @@
-From 06c825ad40db674576530530ebcae132c01246f4 Mon Sep 17 00:00:00 2001
+From dedca964454457d3535ca67893daf3c4718ce427 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
@@ -8,7 +8,7 @@ Adds lots of information about why this orb exists.
 Replaces isFromBottle() with logic that persists entity reloads too.
 
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index 85a5776b04..dedb063de8 100644
+index 85a5776b0..dedb063de 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -512,13 +512,13 @@ public class Block implements IMaterial {
@@ -28,7 +28,7 @@ index 85a5776b04..dedb063de8 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/ContainerGrindstone.java b/src/main/java/net/minecraft/server/ContainerGrindstone.java
-index 4144a4757d..8a9c81ad62 100644
+index 4144a4757..8a9c81ad6 100644
 --- a/src/main/java/net/minecraft/server/ContainerGrindstone.java
 +++ b/src/main/java/net/minecraft/server/ContainerGrindstone.java
 @@ -81,7 +81,7 @@ public class ContainerGrindstone extends Container {
@@ -41,7 +41,7 @@ index 4144a4757d..8a9c81ad62 100644
  
                      world.triggerEffect(1042, blockposition, 0);
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index b3010bee5e..d42d4e83ef 100644
+index b3010bee5..d42d4e83e 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -607,7 +607,7 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
@@ -54,7 +54,7 @@ index b3010bee5e..d42d4e83ef 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index bfba08fb24..49668f2c21 100644
+index bfba08fb2..49668f2c2 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -16,9 +16,59 @@ public class EntityExperienceOrb extends Entity {
@@ -134,7 +134,7 @@ index bfba08fb24..49668f2c21 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index bdd2a39f89..67f8b68413 100644
+index bdd2a39f8..67f8b6841 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
 @@ -404,7 +404,7 @@ public class EntityFishingHook extends Entity {
@@ -147,7 +147,7 @@ index bdd2a39f89..67f8b68413 100644
                      // CraftBukkit end
                      if (itemstack1.getItem().a(TagsItem.FISHES)) {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 223032e1ec..6df98f845e 100644
+index 223032e1e..6df98f845 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -381,7 +381,8 @@ public abstract class EntityLiving extends Entity {
@@ -161,7 +161,7 @@ index 223032e1ec..6df98f845e 100644
              this.expToDrop = 0;
              // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
-index 77dd4c99a6..398b499bbe 100644
+index 77dd4c99a..398b499bb 100644
 --- a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
 +++ b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
 @@ -43,7 +43,7 @@ public class EntityThrownExpBottle extends EntityProjectileThrowable {
@@ -174,7 +174,7 @@ index 77dd4c99a6..398b499bbe 100644
  
              this.die();
 diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java
-index 7c6506a912..1b4933c077 100644
+index 7c6506a91..1b4933c07 100644
 --- a/src/main/java/net/minecraft/server/EntityTurtle.java
 +++ b/src/main/java/net/minecraft/server/EntityTurtle.java
 @@ -512,7 +512,7 @@ public class EntityTurtle extends EntityAnimal {
@@ -187,7 +187,7 @@ index 7c6506a912..1b4933c077 100644
  
          }
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 9ac9d499d5..53e2266a99 100644
+index 9ac9d499d..53e2266a9 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -426,7 +426,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -200,7 +200,7 @@ index 9ac9d499d5..53e2266a99 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/EntityVillagerTrader.java b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
-index fee8f97d82..8ced8722a6 100644
+index fee8f97d8..8ced8722a 100644
 --- a/src/main/java/net/minecraft/server/EntityVillagerTrader.java
 +++ b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
 @@ -147,7 +147,7 @@ public class EntityVillagerTrader extends EntityVillagerAbstract {
@@ -213,7 +213,7 @@ index fee8f97d82..8ced8722a6 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalBreed.java b/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
-index d25a05736e..9d0b1ffefa 100644
+index d25a05736..9d0b1ffef 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
 @@ -117,7 +117,7 @@ public class PathfinderGoalBreed extends PathfinderGoal {
@@ -226,7 +226,7 @@ index d25a05736e..9d0b1ffefa 100644
                  // CraftBukkit end
              }
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index 6e90f21ea2..a7411c75ac 100644
+index 6e90f21ea..a7411c75a 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -367,7 +367,7 @@ public class PlayerInteractManager {
@@ -239,7 +239,7 @@ index 6e90f21ea2..a7411c75ac 100644
                  // CraftBukkit end
  
 diff --git a/src/main/java/net/minecraft/server/SlotFurnaceResult.java b/src/main/java/net/minecraft/server/SlotFurnaceResult.java
-index d2698e847c..edc4a5c34e 100644
+index d2698e847..edc4a5c34 100644
 --- a/src/main/java/net/minecraft/server/SlotFurnaceResult.java
 +++ b/src/main/java/net/minecraft/server/SlotFurnaceResult.java
 @@ -2,7 +2,7 @@ package net.minecraft.server;
@@ -252,7 +252,7 @@ index d2698e847c..edc4a5c34e 100644
  
      public SlotFurnaceResult(EntityHuman entityhuman, IInventory iinventory, int i, int j, int k) {
 diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java
-index adb1a09133..be16fe9a9e 100644
+index adb1a0913..be16fe9a9 100644
 --- a/src/main/java/net/minecraft/server/TileEntityFurnace.java
 +++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java
 @@ -554,7 +554,7 @@ public abstract class TileEntityFurnace extends TileEntityContainer implements I
@@ -265,7 +265,7 @@ index adb1a09133..be16fe9a9e 100644
  
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 38e10017d8..842c28f311 100644
+index 38e10017d..842c28f31 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1608,7 +1608,7 @@ public class CraftWorld implements World {
@@ -278,7 +278,7 @@ index 38e10017d8..842c28f311 100644
              entity = new EntityLightning(world, x, y, z, false);
          } else if (Firework.class.isAssignableFrom(clazz)) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
-index 1b512cc45c..fbad045675 100644
+index 1b512cc45..fbad04567 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
 @@ -20,6 +20,18 @@ public class CraftExperienceOrb extends CraftEntity implements ExperienceOrb {
diff --git a/Spigot-Server-Patches/0146-Cap-Entity-Collisions.patch b/Spigot-Server-Patches/0148-Cap-Entity-Collisions.patch
similarity index 93%
rename from Spigot-Server-Patches/0146-Cap-Entity-Collisions.patch
rename to Spigot-Server-Patches/0148-Cap-Entity-Collisions.patch
index 305d436667..9c5a07f670 100644
--- a/Spigot-Server-Patches/0146-Cap-Entity-Collisions.patch
+++ b/Spigot-Server-Patches/0148-Cap-Entity-Collisions.patch
@@ -1,4 +1,4 @@
-From 2019fa14fe25d17f8cac6ab5908927c9ba8a7ce1 Mon Sep 17 00:00:00 2001
+From a81213ba21250a6959d78fa7412104ac7291492e 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
@@ -12,7 +12,7 @@ just as it does in Vanilla, but entity pushing logic will be capped.
 You can set this to 0 to disable collisions.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 406bc611c1..58fe5a8c4d 100644
+index 406bc611c..58fe5a8c4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -320,4 +320,10 @@ public class PaperWorldConfig {
@@ -27,7 +27,7 @@ index 406bc611c1..58fe5a8c4d 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 92e450f668..14fbea5460 100644
+index c649507c8..596804637 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
@@ -39,7 +39,7 @@ index 92e450f668..14fbea5460 100644
      // Spigot end
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 567112ffc7..177051699f 100644
+index 6df98f845..1603a9b5e 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2553,8 +2553,11 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0147-Remove-CraftScheduler-Async-Task-Debugger.patch b/Spigot-Server-Patches/0149-Remove-CraftScheduler-Async-Task-Debugger.patch
similarity index 95%
rename from Spigot-Server-Patches/0147-Remove-CraftScheduler-Async-Task-Debugger.patch
rename to Spigot-Server-Patches/0149-Remove-CraftScheduler-Async-Task-Debugger.patch
index ec558994df..e2e087b4f5 100644
--- a/Spigot-Server-Patches/0147-Remove-CraftScheduler-Async-Task-Debugger.patch
+++ b/Spigot-Server-Patches/0149-Remove-CraftScheduler-Async-Task-Debugger.patch
@@ -1,4 +1,4 @@
-From d272757d9e21e1082eb9be530126f9f0344a3a74 Mon Sep 17 00:00:00 2001
+From ed4fd5f49c80eea691f8ef028e22d70391985383 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 552daf4376..e102be583c 100644
+index 552daf437..e102be583 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -414,7 +414,7 @@ public class CraftScheduler implements BukkitScheduler {
diff --git a/Spigot-Server-Patches/0148-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch b/Spigot-Server-Patches/0150-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
similarity index 91%
rename from Spigot-Server-Patches/0148-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
rename to Spigot-Server-Patches/0150-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
index 2f75a3b829..c7f26ffc04 100644
--- a/Spigot-Server-Patches/0148-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
+++ b/Spigot-Server-Patches/0150-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
@@ -1,11 +1,11 @@
-From f78c4709a8e3fcb9903cbcd51b1d838f8aeba7a7 Mon Sep 17 00:00:00 2001
+From cace80ec6eddf66b5e7415fe4d2df93727f66d82 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
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 7ee32d4922..f2b024857c 100644
+index 7ee32d492..f2b024857 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -310,7 +310,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
diff --git a/Spigot-Server-Patches/0149-Do-not-let-armorstands-drown.patch b/Spigot-Server-Patches/0151-Do-not-let-armorstands-drown.patch
similarity index 93%
rename from Spigot-Server-Patches/0149-Do-not-let-armorstands-drown.patch
rename to Spigot-Server-Patches/0151-Do-not-let-armorstands-drown.patch
index 7e76de5b2a..0d36495027 100644
--- a/Spigot-Server-Patches/0149-Do-not-let-armorstands-drown.patch
+++ b/Spigot-Server-Patches/0151-Do-not-let-armorstands-drown.patch
@@ -1,11 +1,11 @@
-From 8fea9a77074a96d162428e31992ca045043601e6 Mon Sep 17 00:00:00 2001
+From 54a3823be4633427663be25d3a76357f7e36faee 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index ebedb41787..06b274a71a 100644
+index ebedb4178..06b274a71 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -798,5 +798,10 @@ public class EntityArmorStand extends EntityLiving {
@@ -20,7 +20,7 @@ index ebedb41787..06b274a71a 100644
      // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 1603a9b5eb..91d6e3c229 100644
+index 1603a9b5e..91d6e3c22 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -223,6 +223,7 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0150-Properly-handle-async-calls-to-restart-the-server.patch b/Spigot-Server-Patches/0152-Properly-handle-async-calls-to-restart-the-server.patch
similarity index 99%
rename from Spigot-Server-Patches/0150-Properly-handle-async-calls-to-restart-the-server.patch
rename to Spigot-Server-Patches/0152-Properly-handle-async-calls-to-restart-the-server.patch
index d28a234767..095988aa60 100644
--- a/Spigot-Server-Patches/0150-Properly-handle-async-calls-to-restart-the-server.patch
+++ b/Spigot-Server-Patches/0152-Properly-handle-async-calls-to-restart-the-server.patch
@@ -1,4 +1,4 @@
-From 96e9ac054004602ee4a59599848d078a7de53ab4 Mon Sep 17 00:00:00 2001
+From 0aa47587c6fc96c817a9019e0d578a39a955c194 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 852d827c1..119730460 100644
+index f142ed9a3..e7b89b320 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -80,6 +80,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
diff --git a/Spigot-Server-Patches/0151-Add-system-property-to-disable-book-size-limits.patch b/Spigot-Server-Patches/0153-Add-system-property-to-disable-book-size-limits.patch
similarity index 96%
rename from Spigot-Server-Patches/0151-Add-system-property-to-disable-book-size-limits.patch
rename to Spigot-Server-Patches/0153-Add-system-property-to-disable-book-size-limits.patch
index 473d95fafa..50d0c98dbd 100644
--- a/Spigot-Server-Patches/0151-Add-system-property-to-disable-book-size-limits.patch
+++ b/Spigot-Server-Patches/0153-Add-system-property-to-disable-book-size-limits.patch
@@ -1,4 +1,4 @@
-From fb7829457c361493e1d405c657122abd1dc625bc Mon Sep 17 00:00:00 2001
+From a4f4a5c2f2eb67e343c7116e4c87f957d343c1a6 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 fe8e6dcb77..f8a3c9718d 100644
+index fe8e6dcb7..f8a3c9718 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
 @@ -36,6 +36,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
diff --git a/Spigot-Server-Patches/0152-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/Spigot-Server-Patches/0154-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
similarity index 94%
rename from Spigot-Server-Patches/0152-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
rename to Spigot-Server-Patches/0154-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
index f7e095d278..55a6a5f035 100644
--- a/Spigot-Server-Patches/0152-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/Spigot-Server-Patches/0154-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
@@ -1,4 +1,4 @@
-From 0fd3f99953ccbf38ef0022ec4926b61cd0e1e934 Mon Sep 17 00:00:00 2001
+From c567f375e3f6aca9815321e9431d443210da195c 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
@@ -11,7 +11,7 @@ I suspect Mojang may switch to this behavior before full release.
 To be converted into a Paper-API event at some point in the future?
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 58fe5a8c4d..a341214952 100644
+index 58fe5a8c4..a34121495 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -326,4 +326,10 @@ public class PaperWorldConfig {
@@ -26,7 +26,7 @@ index 58fe5a8c4d..a341214952 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 8a6f8e8756..5df763d925 100644
+index 7143ec7bb..3cb04543d 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -436,7 +436,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -39,7 +39,7 @@ index 8a6f8e8756..5df763d925 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 24615c5bfe..939061b40f 100644
+index cb9a7b68c..51720a31b 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1783,6 +1783,13 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0153-Add-configuration-option-to-prevent-player-names-fro.patch b/Spigot-Server-Patches/0155-Add-configuration-option-to-prevent-player-names-fro.patch
similarity index 94%
rename from Spigot-Server-Patches/0153-Add-configuration-option-to-prevent-player-names-fro.patch
rename to Spigot-Server-Patches/0155-Add-configuration-option-to-prevent-player-names-fro.patch
index 20b1663729..cfa51dfa52 100644
--- a/Spigot-Server-Patches/0153-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/Spigot-Server-Patches/0155-Add-configuration-option-to-prevent-player-names-fro.patch
@@ -1,4 +1,4 @@
-From b5f8fdb9fed6e54ca13ab872b52442fefd7bb5f9 Mon Sep 17 00:00:00 2001
+From 514ab505a10d9c63f9771b06b0338fc97ad8df8a 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
@@ -20,7 +20,7 @@ index 503e13775..56cea23b0 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7d05d8757..abbdb1f64 100644
+index e79ea322a..e5360b950 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2081,5 +2081,10 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0154-Use-TerminalConsoleAppender-for-console-improvements.patch b/Spigot-Server-Patches/0156-Use-TerminalConsoleAppender-for-console-improvements.patch
similarity index 99%
rename from Spigot-Server-Patches/0154-Use-TerminalConsoleAppender-for-console-improvements.patch
rename to Spigot-Server-Patches/0156-Use-TerminalConsoleAppender-for-console-improvements.patch
index 413d86a245..ca138c10db 100644
--- a/Spigot-Server-Patches/0154-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/Spigot-Server-Patches/0156-Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -1,4 +1,4 @@
-From cb43684f70ce6bf169893e745001addc1087aa05 Mon Sep 17 00:00:00 2001
+From 4bc8854be175c2923fe2da08779d1584af00c2dc 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
@@ -143,7 +143,7 @@ index 000000000..685deaa0e
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 19e2df309..3d0cb874d 100644
+index f0e2250cd..37020dcba 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -83,6 +83,9 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -185,7 +185,7 @@ index 19e2df309..3d0cb874d 100644
          System.setOut(new PrintStream(new LoggerOutputStream(logger, Level.INFO), true));
          System.setErr(new PrintStream(new LoggerOutputStream(logger, Level.WARN), true));
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 2ccee100e..cdf162a95 100644
+index e7b89b320..6b83f9769 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -50,7 +50,7 @@ import org.apache.commons.lang3.Validate;
@@ -258,7 +258,7 @@ index 3158197cd..b746e7ad3 100644
  
          this.k = new GameProfileBanList(PlayerList.a);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2f349ff3d..a9fe6c51d 100644
+index e5360b950..0dda95ba8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -41,7 +41,6 @@ import java.util.function.Consumer;
diff --git a/Spigot-Server-Patches/0155-provide-a-configurable-option-to-disable-creeper-lin.patch b/Spigot-Server-Patches/0157-provide-a-configurable-option-to-disable-creeper-lin.patch
similarity index 96%
rename from Spigot-Server-Patches/0155-provide-a-configurable-option-to-disable-creeper-lin.patch
rename to Spigot-Server-Patches/0157-provide-a-configurable-option-to-disable-creeper-lin.patch
index 5248224419..bb489a0ae9 100644
--- a/Spigot-Server-Patches/0155-provide-a-configurable-option-to-disable-creeper-lin.patch
+++ b/Spigot-Server-Patches/0157-provide-a-configurable-option-to-disable-creeper-lin.patch
@@ -1,4 +1,4 @@
-From e79896a5e06f75fb67c7c3a3506da1332b7abb26 Mon Sep 17 00:00:00 2001
+From 6b7d5cdf9b66081bf07edbdc5912353ce205d2ff 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/0156-Item-canEntityPickup.patch b/Spigot-Server-Patches/0158-Item-canEntityPickup.patch
similarity index 92%
rename from Spigot-Server-Patches/0156-Item-canEntityPickup.patch
rename to Spigot-Server-Patches/0158-Item-canEntityPickup.patch
index 9066ad6843..605b5c0f41 100644
--- a/Spigot-Server-Patches/0156-Item-canEntityPickup.patch
+++ b/Spigot-Server-Patches/0158-Item-canEntityPickup.patch
@@ -1,11 +1,11 @@
-From 0fcebb3fdb6b1e7a0f3b7aac127c5b2b7ac9eb8d Mon Sep 17 00:00:00 2001
+From 672ef01070780e3d981347f7ddb87c7ef8b0484c 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 5d830b245d..f1621a9e9d 100644
+index 00b51d88b..11652628b 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -510,6 +510,11 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -21,7 +21,7 @@ index 5d830b245d..f1621a9e9d 100644
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index fe70a3a8b6..36b5fb537e 100644
+index ba2ca1185..9c743de8d 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -19,6 +19,7 @@ public class EntityItem extends Entity {
@@ -33,7 +33,7 @@ index fe70a3a8b6..36b5fb537e 100644
      public EntityItem(EntityTypes<? extends EntityItem> entitytypes, World world) {
          super(entitytypes, world);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-index cc593fbc99..3f552b5905 100644
+index cc593fbc9..3f552b590 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 @@ -48,6 +48,16 @@ public class CraftItem extends CraftEntity implements Item {
diff --git a/Spigot-Server-Patches/0157-PlayerPickupItemEvent-setFlyAtPlayer.patch b/Spigot-Server-Patches/0159-PlayerPickupItemEvent-setFlyAtPlayer.patch
similarity index 97%
rename from Spigot-Server-Patches/0157-PlayerPickupItemEvent-setFlyAtPlayer.patch
rename to Spigot-Server-Patches/0159-PlayerPickupItemEvent-setFlyAtPlayer.patch
index 8df8e7dd15..577248a32b 100644
--- a/Spigot-Server-Patches/0157-PlayerPickupItemEvent-setFlyAtPlayer.patch
+++ b/Spigot-Server-Patches/0159-PlayerPickupItemEvent-setFlyAtPlayer.patch
@@ -1,4 +1,4 @@
-From 866cadb89f21268850f4ec0bdd25e26e73c6d679 Mon Sep 17 00:00:00 2001
+From 98f98df260c50a7ca6bc2bfcce13abeeb68fa6f8 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/Spigot-Server-Patches/0158-PlayerAttemptPickupItemEvent.patch b/Spigot-Server-Patches/0160-PlayerAttemptPickupItemEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0158-PlayerAttemptPickupItemEvent.patch
rename to Spigot-Server-Patches/0160-PlayerAttemptPickupItemEvent.patch
index 23cebd33ac..ee85bd27df 100644
--- a/Spigot-Server-Patches/0158-PlayerAttemptPickupItemEvent.patch
+++ b/Spigot-Server-Patches/0160-PlayerAttemptPickupItemEvent.patch
@@ -1,4 +1,4 @@
-From d482a5bc4f483c161399595bafbf4f5803a3d6cf Mon Sep 17 00:00:00 2001
+From 74d956e17d0ab409ddfbf3d6dab9ac74ef9c202f 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/Spigot-Server-Patches/0159-Add-UnknownCommandEvent.patch b/Spigot-Server-Patches/0161-Add-UnknownCommandEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0159-Add-UnknownCommandEvent.patch
rename to Spigot-Server-Patches/0161-Add-UnknownCommandEvent.patch
index 164d81bb41..cb74b29ad5 100644
--- a/Spigot-Server-Patches/0159-Add-UnknownCommandEvent.patch
+++ b/Spigot-Server-Patches/0161-Add-UnknownCommandEvent.patch
@@ -1,11 +1,11 @@
-From 8f7fbaba6699e1bf6d7bd89a9a805ec36b36fc05 Mon Sep 17 00:00:00 2001
+From 69b3d26c5d5729f4f5fe7be3eff49ceb86cdd95c 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 69f65eec10..4077c54892 100644
+index 0dda95ba8..a79403cbc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -77,6 +77,7 @@ import net.minecraft.server.WorldServer;
diff --git a/Spigot-Server-Patches/0160-Basic-PlayerProfile-API.patch b/Spigot-Server-Patches/0162-Basic-PlayerProfile-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0160-Basic-PlayerProfile-API.patch
rename to Spigot-Server-Patches/0162-Basic-PlayerProfile-API.patch
index a2c1955bc5..e50adc0841 100644
--- a/Spigot-Server-Patches/0160-Basic-PlayerProfile-API.patch
+++ b/Spigot-Server-Patches/0162-Basic-PlayerProfile-API.patch
@@ -1,4 +1,4 @@
-From 769191c6a329f12bc0b71fb682ab228bd5181e34 Mon Sep 17 00:00:00 2001
+From c1cb5f3655ba9abdf7e60c6227fff0057a613cc8 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
@@ -7,7 +7,7 @@ Establishes base extension of profile systems for future edits too
 
 diff --git a/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
 new file mode 100644
-index 0000000000..b151a13c1b
+index 000000000..b151a13c1
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
 @@ -0,0 +1,280 @@
@@ -293,7 +293,7 @@ index 0000000000..b151a13c1b
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperAuthenticationService.java b/src/main/java/com/destroystokyo/paper/profile/PaperAuthenticationService.java
 new file mode 100644
-index 0000000000..25836b975b
+index 000000000..25836b975
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperAuthenticationService.java
 @@ -0,0 +1,30 @@
@@ -329,7 +329,7 @@ index 0000000000..25836b975b
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
 new file mode 100644
-index 0000000000..3bcdb8f93f
+index 000000000..3bcdb8f93
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
 @@ -0,0 +1,17 @@
@@ -352,7 +352,7 @@ index 0000000000..3bcdb8f93f
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
 new file mode 100644
-index 0000000000..4b2a67423f
+index 000000000..4b2a67423
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
 @@ -0,0 +1,29 @@
@@ -387,7 +387,7 @@ index 0000000000..4b2a67423f
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperUserAuthentication.java b/src/main/java/com/destroystokyo/paper/profile/PaperUserAuthentication.java
 new file mode 100644
-index 0000000000..3aceb0ea8a
+index 000000000..3aceb0ea8
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperUserAuthentication.java
 @@ -0,0 +1,11 @@
@@ -403,7 +403,7 @@ index 0000000000..3aceb0ea8a
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index 1f6a126329..6d278a0da5 100644
+index 1f6a12632..6d278a0da 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -1,7 +1,10 @@
@@ -429,7 +429,7 @@ index 1f6a126329..6d278a0da5 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 6b83f9769a..5817e94525 100644
+index 6b83f9769..5817e9452 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1246,7 +1246,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -450,7 +450,7 @@ index 6b83f9769a..5817e94525 100644
          return this.minecraftSessionService;
      }
 diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java
-index fd17a3e93a..d88a510bd0 100644
+index fd17a3e93..d88a510bd 100644
 --- a/src/main/java/net/minecraft/server/UserCache.java
 +++ b/src/main/java/net/minecraft/server/UserCache.java
 @@ -43,7 +43,7 @@ public class UserCache {
@@ -486,7 +486,7 @@ index fd17a3e93a..d88a510bd0 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 a79403cbce..8f7fd3490f 100644
+index a79403cbc..8f7fd3490 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -196,6 +196,9 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
diff --git a/Spigot-Server-Patches/0161-Shoulder-Entities-Release-API.patch b/Spigot-Server-Patches/0163-Shoulder-Entities-Release-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0161-Shoulder-Entities-Release-API.patch
rename to Spigot-Server-Patches/0163-Shoulder-Entities-Release-API.patch
index ccae561a82..913a295c9c 100644
--- a/Spigot-Server-Patches/0161-Shoulder-Entities-Release-API.patch
+++ b/Spigot-Server-Patches/0163-Shoulder-Entities-Release-API.patch
@@ -1,11 +1,11 @@
-From a38c394099198387d94095fd1536ab7583ef2c45 Mon Sep 17 00:00:00 2001
+From ea9af052181269122e56df10df5ac3a9768d09cb 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 3cb04543d1..05942fb7ed 100644
+index 3cb04543d..05942fb7e 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1781,20 +1781,45 @@ public abstract class EntityHuman extends EntityLiving {
@@ -59,7 +59,7 @@ index 3cb04543d1..05942fb7ed 100644
      public abstract boolean isSpectator();
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 772f919b6c..bb4dde0de0 100644
+index 772f919b6..bb4dde0de 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -660,6 +660,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/Spigot-Server-Patches/0162-Profile-Lookup-Events.patch b/Spigot-Server-Patches/0164-Profile-Lookup-Events.patch
similarity index 98%
rename from Spigot-Server-Patches/0162-Profile-Lookup-Events.patch
rename to Spigot-Server-Patches/0164-Profile-Lookup-Events.patch
index b4bd7f85d2..c36998ad17 100644
--- a/Spigot-Server-Patches/0162-Profile-Lookup-Events.patch
+++ b/Spigot-Server-Patches/0164-Profile-Lookup-Events.patch
@@ -1,4 +1,4 @@
-From bc9cdd4a213d9542dd238b6a697aa19183b607b5 Mon Sep 17 00:00:00 2001
+From c92972668193e410f38f1bb378000aaa1c43e513 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
diff --git a/Spigot-Server-Patches/0163-Block-player-logins-during-server-shutdown.patch b/Spigot-Server-Patches/0165-Block-player-logins-during-server-shutdown.patch
similarity index 94%
rename from Spigot-Server-Patches/0163-Block-player-logins-during-server-shutdown.patch
rename to Spigot-Server-Patches/0165-Block-player-logins-during-server-shutdown.patch
index 6eeefdd34f..88f904242b 100644
--- a/Spigot-Server-Patches/0163-Block-player-logins-during-server-shutdown.patch
+++ b/Spigot-Server-Patches/0165-Block-player-logins-during-server-shutdown.patch
@@ -1,4 +1,4 @@
-From 1c3408f1b9315a7932749a79efb2890814994c4e Mon Sep 17 00:00:00 2001
+From 469412b6d973c55f65841d6d40b05000574526ba 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/Spigot-Server-Patches/0164-Entity-fromMobSpawner.patch b/Spigot-Server-Patches/0166-Entity-fromMobSpawner.patch
similarity index 95%
rename from Spigot-Server-Patches/0164-Entity-fromMobSpawner.patch
rename to Spigot-Server-Patches/0166-Entity-fromMobSpawner.patch
index c5096eb882..bf8d2d0b3f 100644
--- a/Spigot-Server-Patches/0164-Entity-fromMobSpawner.patch
+++ b/Spigot-Server-Patches/0166-Entity-fromMobSpawner.patch
@@ -1,11 +1,11 @@
-From bae762930f9cd951d3d9e47e48866a1b478b2d41 Mon Sep 17 00:00:00 2001
+From 77dedb3dc8183ec61e222fc5ada13fe513a3ee42 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 5968046370..d5d86d0f1d 100644
+index 596804637..d5d86d0f1 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 5968046370..d5d86d0f1d 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 b3af4ba233..7d140a6f5a 100644
+index b3af4ba23..7d140a6f5 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -133,6 +133,7 @@ public abstract class MobSpawnerAbstract {
@@ -49,7 +49,7 @@ index b3af4ba233..7d140a6f5a 100644
                          if ( entity.world.spigotConfig.nerfSpawnerMobs )
                          {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index ed496d03ae..b000bc8c71 100644
+index ed496d03a..b000bc8c7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1047,5 +1047,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/Spigot-Server-Patches/0165-Improve-the-Saddle-API-for-Horses.patch b/Spigot-Server-Patches/0167-Improve-the-Saddle-API-for-Horses.patch
similarity index 94%
rename from Spigot-Server-Patches/0165-Improve-the-Saddle-API-for-Horses.patch
rename to Spigot-Server-Patches/0167-Improve-the-Saddle-API-for-Horses.patch
index 67a871e48e..8924f8d5b2 100644
--- a/Spigot-Server-Patches/0165-Improve-the-Saddle-API-for-Horses.patch
+++ b/Spigot-Server-Patches/0167-Improve-the-Saddle-API-for-Horses.patch
@@ -1,4 +1,4 @@
-From 26d89a2eeaa02fd155a59f45c7b1ee3aaa44ece1 Mon Sep 17 00:00:00 2001
+From 5759adc1ce63ee021fd1b482f18f996cf8d3cd12 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 09016e3547..9952db3eb5 100644
+index 09016e354..9952db3eb 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 09016e3547..9952db3eb5 100644
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java
-index 63991bf4be..9a47a1adc1 100644
+index 63991bf4b..9a47a1adc 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 63991bf4be..9a47a1adc1 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 @@
diff --git a/Spigot-Server-Patches/0166-Implement-ensureServerConversions-API.patch b/Spigot-Server-Patches/0168-Implement-ensureServerConversions-API.patch
similarity index 91%
rename from Spigot-Server-Patches/0166-Implement-ensureServerConversions-API.patch
rename to Spigot-Server-Patches/0168-Implement-ensureServerConversions-API.patch
index ad2e15a007..0e87f1260b 100644
--- a/Spigot-Server-Patches/0166-Implement-ensureServerConversions-API.patch
+++ b/Spigot-Server-Patches/0168-Implement-ensureServerConversions-API.patch
@@ -1,4 +1,4 @@
-From 8c1e731358dc64c98eadcd0ad88ebae60fdf9339 Mon Sep 17 00:00:00 2001
+From 3a91c595520f4e2f4f025714dde30f9890c23765 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
@@ -7,7 +7,7 @@ This will take a Bukkit ItemStack and run it through any conversions a server pr
 to ensure it meets latest minecraft expectations.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index a4320f8446..af1db68aa7 100644
+index a4320f844..af1db68aa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 @@ -321,4 +321,10 @@ public final class CraftItemFactory implements ItemFactory {
diff --git a/Spigot-Server-Patches/0167-Implement-getI18NDisplayName.patch b/Spigot-Server-Patches/0169-Implement-getI18NDisplayName.patch
similarity index 93%
rename from Spigot-Server-Patches/0167-Implement-getI18NDisplayName.patch
rename to Spigot-Server-Patches/0169-Implement-getI18NDisplayName.patch
index 254dc79855..ebc7462676 100644
--- a/Spigot-Server-Patches/0167-Implement-getI18NDisplayName.patch
+++ b/Spigot-Server-Patches/0169-Implement-getI18NDisplayName.patch
@@ -1,4 +1,4 @@
-From 1f1766228187bb45fdb46d714879bb3106dd1f82 Mon Sep 17 00:00:00 2001
+From b44ed17521d95d5fd90ea2b1aebf991166dacbc9 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
@@ -8,7 +8,7 @@ Currently the server only supports the English language. To override this,
 You must replace the language file embedded in the server jar.
 
 diff --git a/src/main/java/net/minecraft/server/LocaleLanguage.java b/src/main/java/net/minecraft/server/LocaleLanguage.java
-index 8fe8e28aa3..295c01b281 100644
+index 8fe8e28aa..295c01b28 100644
 --- a/src/main/java/net/minecraft/server/LocaleLanguage.java
 +++ b/src/main/java/net/minecraft/server/LocaleLanguage.java
 @@ -44,10 +44,12 @@ public class LocaleLanguage {
@@ -25,7 +25,7 @@ index 8fe8e28aa3..295c01b281 100644
          return this.c(s);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index af1db68aa7..929d73692a 100644
+index af1db68aa..929d73692 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 @@ -326,5 +326,18 @@ public final class CraftItemFactory implements ItemFactory {
diff --git a/Spigot-Server-Patches/0168-ProfileWhitelistVerifyEvent.patch b/Spigot-Server-Patches/0170-ProfileWhitelistVerifyEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0168-ProfileWhitelistVerifyEvent.patch
rename to Spigot-Server-Patches/0170-ProfileWhitelistVerifyEvent.patch
index 998c030d75..fd48ca11eb 100644
--- a/Spigot-Server-Patches/0168-ProfileWhitelistVerifyEvent.patch
+++ b/Spigot-Server-Patches/0170-ProfileWhitelistVerifyEvent.patch
@@ -1,4 +1,4 @@
-From 7c9560783091a441d9927d219d8a40c51adae42b Mon Sep 17 00:00:00 2001
+From 8a6c19d9a5fcd931baef80d2e10c62e39fb5547b 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/Spigot-Server-Patches/0169-Fix-this-stupid-bullshit.patch b/Spigot-Server-Patches/0171-Fix-this-stupid-bullshit.patch
similarity index 94%
rename from Spigot-Server-Patches/0169-Fix-this-stupid-bullshit.patch
rename to Spigot-Server-Patches/0171-Fix-this-stupid-bullshit.patch
index 0ec577cd7e..8cc853585b 100644
--- a/Spigot-Server-Patches/0169-Fix-this-stupid-bullshit.patch
+++ b/Spigot-Server-Patches/0171-Fix-this-stupid-bullshit.patch
@@ -1,4 +1,4 @@
-From 9f279b64f8437fda9e1888d14208617321137760 Mon Sep 17 00:00:00 2001
+From 76d0897115304161ea2df8d8846b1133de6653cf 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
@@ -9,7 +9,7 @@ modified in order to prevent merge conflicts when Spigot changes/disables the wa
 and to provide some level of hint without being disruptive.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 4aebe53f8a..405ea5c465 100644
+index 4aebe53f8..405ea5c46 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -217,10 +217,12 @@ public class Main {
diff --git a/Spigot-Server-Patches/0170-Ocelot-despawns-should-honor-nametags-and-leash.patch b/Spigot-Server-Patches/0172-Ocelot-despawns-should-honor-nametags-and-leash.patch
similarity index 92%
rename from Spigot-Server-Patches/0170-Ocelot-despawns-should-honor-nametags-and-leash.patch
rename to Spigot-Server-Patches/0172-Ocelot-despawns-should-honor-nametags-and-leash.patch
index 69216b549a..3ba09fe0d5 100644
--- a/Spigot-Server-Patches/0170-Ocelot-despawns-should-honor-nametags-and-leash.patch
+++ b/Spigot-Server-Patches/0172-Ocelot-despawns-should-honor-nametags-and-leash.patch
@@ -1,4 +1,4 @@
-From 3fa0d4dcc51608fefd241573f1184466504f9194 Mon Sep 17 00:00:00 2001
+From 6e902e4c9d44de19206fcc7967e4ceae4c41c2d2 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/Spigot-Server-Patches/0171-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/Spigot-Server-Patches/0173-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
similarity index 92%
rename from Spigot-Server-Patches/0171-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
rename to Spigot-Server-Patches/0173-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
index dafd6bcbc2..3acb8f7972 100644
--- a/Spigot-Server-Patches/0171-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
+++ b/Spigot-Server-Patches/0173-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
@@ -1,11 +1,11 @@
-From 3c650d7970db805f3d67068ad9d1c189c9d6ec42 Mon Sep 17 00:00:00 2001
+From 7098a89418d9a77aeefb877af5fabd6f01789d6e 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 2b2af2daa..d8ae336e9 100644
+index 7d140a6f5..93fad14d3 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -139,6 +139,9 @@ public abstract class MobSpawnerAbstract {
diff --git a/Spigot-Server-Patches/0172-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/Spigot-Server-Patches/0174-Fix-MC-117075-TE-Unload-Lag-Spike.patch
similarity index 92%
rename from Spigot-Server-Patches/0172-Fix-MC-117075-TE-Unload-Lag-Spike.patch
rename to Spigot-Server-Patches/0174-Fix-MC-117075-TE-Unload-Lag-Spike.patch
index 58686bef3f..2ca3d308bf 100644
--- a/Spigot-Server-Patches/0172-Fix-MC-117075-TE-Unload-Lag-Spike.patch
+++ b/Spigot-Server-Patches/0174-Fix-MC-117075-TE-Unload-Lag-Spike.patch
@@ -1,11 +1,11 @@
-From b27774888fd71a46840514dfbe7365bd5b3a7e96 Mon Sep 17 00:00:00 2001
+From 5a73c1dbbd07e2ebeda89b6ed04edc5694e70697 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 6b2769343a..3e5c76d320 100644
+index 6b2769343..3e5c76d32 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -738,7 +738,11 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
diff --git a/Spigot-Server-Patches/0173-Allow-specifying-a-custom-authentication-servers-dow.patch b/Spigot-Server-Patches/0175-Allow-specifying-a-custom-authentication-servers-dow.patch
similarity index 97%
rename from Spigot-Server-Patches/0173-Allow-specifying-a-custom-authentication-servers-dow.patch
rename to Spigot-Server-Patches/0175-Allow-specifying-a-custom-authentication-servers-dow.patch
index 48c0dbd045..ab52e0546f 100644
--- a/Spigot-Server-Patches/0173-Allow-specifying-a-custom-authentication-servers-dow.patch
+++ b/Spigot-Server-Patches/0175-Allow-specifying-a-custom-authentication-servers-dow.patch
@@ -1,4 +1,4 @@
-From 3cd606e0561f34ef63d799f80b1ab12fbac01227 Mon Sep 17 00:00:00 2001
+From 0f32a1be8ccb2b28d30637765777a3599c3aa2ae 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
diff --git a/Spigot-Server-Patches/0174-LivingEntity-setKiller.patch b/Spigot-Server-Patches/0176-LivingEntity-setKiller.patch
similarity index 93%
rename from Spigot-Server-Patches/0174-LivingEntity-setKiller.patch
rename to Spigot-Server-Patches/0176-LivingEntity-setKiller.patch
index b1c56e1fbc..5b4b283a17 100644
--- a/Spigot-Server-Patches/0174-LivingEntity-setKiller.patch
+++ b/Spigot-Server-Patches/0176-LivingEntity-setKiller.patch
@@ -1,11 +1,11 @@
-From d5e2a9836544cba3722ea3ed5aa45dcbc082341c Mon Sep 17 00:00:00 2001
+From 08fc03285cae604c643ec14ea692a7a94946ea70 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 06f09d7b5d..e2921de48b 100644
+index 91d6e3c22..b28e21b92 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -76,7 +76,7 @@ public abstract class EntityLiving extends Entity {
@@ -18,7 +18,7 @@ index 06f09d7b5d..e2921de48b 100644
      protected int ticksFarFromPlayer;
      protected float aT;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index aa50435bec..42cc158824 100644
+index aa50435be..42cc15882 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -304,6 +304,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/Spigot-Server-Patches/0175-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch b/Spigot-Server-Patches/0177-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
similarity index 93%
rename from Spigot-Server-Patches/0175-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
rename to Spigot-Server-Patches/0177-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
index 57e4c14dbe..a774a75322 100644
--- a/Spigot-Server-Patches/0175-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
+++ b/Spigot-Server-Patches/0177-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
@@ -1,4 +1,4 @@
-From 3e140363bc07b0523ddad00c7c75be134d659023 Mon Sep 17 00:00:00 2001
+From 7e2949595248e7d8f8222e0ea14770a8191382ec 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 108c8c05e..183c3c4c8 100644
+index 851646727..ae42b1d66 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -63,6 +63,11 @@
@@ -28,7 +28,7 @@ index 108c8c05e..183c3c4c8 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 3d0cb874d..d9f1c2205 100644
+index 37020dcba..c2c676e3b 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -135,8 +135,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
diff --git a/Spigot-Server-Patches/0176-Handle-plugin-prefixes-using-Log4J-configuration.patch b/Spigot-Server-Patches/0178-Handle-plugin-prefixes-using-Log4J-configuration.patch
similarity index 96%
rename from Spigot-Server-Patches/0176-Handle-plugin-prefixes-using-Log4J-configuration.patch
rename to Spigot-Server-Patches/0178-Handle-plugin-prefixes-using-Log4J-configuration.patch
index 6f4b01f353..17d8583aee 100644
--- a/Spigot-Server-Patches/0176-Handle-plugin-prefixes-using-Log4J-configuration.patch
+++ b/Spigot-Server-Patches/0178-Handle-plugin-prefixes-using-Log4J-configuration.patch
@@ -1,4 +1,4 @@
-From 87bb6601d0339ee3dab7789689dd29d3351710d0 Mon Sep 17 00:00:00 2001
+From f1f6daaaaa929959b09f1debda7b34067f28618b 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 183c3c4c8..c18a7f5ca 100644
+index ae42b1d66..6e4924fff 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -61,7 +61,7 @@
@@ -28,7 +28,7 @@ index 183c3c4c8..c18a7f5ca 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 b171bdfaa..0d827815c 100644
+index fc6cb9306..bd601333e 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -291,7 +291,7 @@ public class SpigotConfig
diff --git a/Spigot-Server-Patches/0177-Include-Log4J2-SLF4J-implementation.patch b/Spigot-Server-Patches/0179-Include-Log4J2-SLF4J-implementation.patch
similarity index 87%
rename from Spigot-Server-Patches/0177-Include-Log4J2-SLF4J-implementation.patch
rename to Spigot-Server-Patches/0179-Include-Log4J2-SLF4J-implementation.patch
index 46d2f5e489..68a7144e48 100644
--- a/Spigot-Server-Patches/0177-Include-Log4J2-SLF4J-implementation.patch
+++ b/Spigot-Server-Patches/0179-Include-Log4J2-SLF4J-implementation.patch
@@ -1,11 +1,11 @@
-From e010dba56ef78266584c5dd25d612b51c1ed7ab1 Mon Sep 17 00:00:00 2001
+From c2dd83d35d585049990ef5aea557a3a28941f442 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 c18a7f5ca..16799b4cd 100644
+index 6e4924fff..3d2065fd7 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -63,6 +63,12 @@
diff --git a/Spigot-Server-Patches/0178-Disable-logger-prefix-for-various-plugins-bypassing-.patch b/Spigot-Server-Patches/0180-Disable-logger-prefix-for-various-plugins-bypassing-.patch
similarity index 97%
rename from Spigot-Server-Patches/0178-Disable-logger-prefix-for-various-plugins-bypassing-.patch
rename to Spigot-Server-Patches/0180-Disable-logger-prefix-for-various-plugins-bypassing-.patch
index 4ba478f333..7e2a132b34 100644
--- a/Spigot-Server-Patches/0178-Disable-logger-prefix-for-various-plugins-bypassing-.patch
+++ b/Spigot-Server-Patches/0180-Disable-logger-prefix-for-various-plugins-bypassing-.patch
@@ -1,4 +1,4 @@
-From 0fecfb589e5732e28c516ad6d7f8f25534eaedb7 Mon Sep 17 00:00:00 2001
+From b4197229bcfa8d2747673bcd169b8eb1b5403044 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
diff --git a/Spigot-Server-Patches/0179-Add-PlayerJumpEvent.patch b/Spigot-Server-Patches/0181-Add-PlayerJumpEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0179-Add-PlayerJumpEvent.patch
rename to Spigot-Server-Patches/0181-Add-PlayerJumpEvent.patch
index 4a5b7659bb..97127cc5d2 100644
--- a/Spigot-Server-Patches/0179-Add-PlayerJumpEvent.patch
+++ b/Spigot-Server-Patches/0181-Add-PlayerJumpEvent.patch
@@ -1,11 +1,11 @@
-From cd5b61c4c8aae7b976325746682fa18065e62ba6 Mon Sep 17 00:00:00 2001
+From ce3de016bdac085c7ebeab5c3493157970c2ba63 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
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 939061b40f..7a4b14f865 100644
+index 51720a31b..572da14f9 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -58,6 +58,8 @@ import org.bukkit.inventory.CraftingInventory;
diff --git a/Spigot-Server-Patches/0180-handle-PacketPlayInKeepAlive-async.patch b/Spigot-Server-Patches/0182-handle-PacketPlayInKeepAlive-async.patch
similarity index 95%
rename from Spigot-Server-Patches/0180-handle-PacketPlayInKeepAlive-async.patch
rename to Spigot-Server-Patches/0182-handle-PacketPlayInKeepAlive-async.patch
index 7fe615b24b..19f243cd80 100644
--- a/Spigot-Server-Patches/0180-handle-PacketPlayInKeepAlive-async.patch
+++ b/Spigot-Server-Patches/0182-handle-PacketPlayInKeepAlive-async.patch
@@ -1,4 +1,4 @@
-From cfd22ead4cb25fe8ae29104637a52f3a53cb76a0 Mon Sep 17 00:00:00 2001
+From 330817dca764349bb50c946483075807774e49e8 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
@@ -15,7 +15,7 @@ also adding some additional logging in order to help work out what is causing
 random disconnections for clients.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 7a4b14f86..2dd092f0a 100644
+index 572da14f9..61793dd1d 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2503,14 +2503,18 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0181-Expose-client-protocol-version-and-virtual-host.patch b/Spigot-Server-Patches/0183-Expose-client-protocol-version-and-virtual-host.patch
similarity index 95%
rename from Spigot-Server-Patches/0181-Expose-client-protocol-version-and-virtual-host.patch
rename to Spigot-Server-Patches/0183-Expose-client-protocol-version-and-virtual-host.patch
index a94474b341..2967faf8f7 100644
--- a/Spigot-Server-Patches/0181-Expose-client-protocol-version-and-virtual-host.patch
+++ b/Spigot-Server-Patches/0183-Expose-client-protocol-version-and-virtual-host.patch
@@ -1,4 +1,4 @@
-From 180375855a3a2db7d76c294ae6e06ad4edead878 Mon Sep 17 00:00:00 2001
+From 1d41034554922dc26a4e7c9fc67e8d8ecd6995bb 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose client protocol version and virtual host
 
 diff --git a/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java b/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java
 new file mode 100644
-index 0000000000..5caca6439d
+index 000000000..5caca6439
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java
 @@ -0,0 +1,50 @@
@@ -61,7 +61,7 @@ index 0000000000..5caca6439d
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
-index 60be2fa991..da88978db7 100644
+index 60be2fa99..da88978db 100644
 --- a/src/main/java/net/minecraft/server/HandshakeListener.java
 +++ b/src/main/java/net/minecraft/server/HandshakeListener.java
 @@ -15,6 +15,7 @@ public class HandshakeListener implements PacketHandshakingInListener {
@@ -84,7 +84,7 @@ index 60be2fa991..da88978db7 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 2db7229e91..5d5e23c187 100644
+index 2db7229e9..5d5e23c18 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -62,6 +62,10 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -99,7 +99,7 @@ index 2db7229e91..5d5e23c187 100644
      public NetworkManager(EnumProtocolDirection enumprotocoldirection) {
          this.h = enumprotocoldirection;
 diff --git a/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
-index 4f008e4723..8545146fb1 100644
+index 4f008e472..8545146fb 100644
 --- a/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
 +++ b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
 @@ -35,6 +35,7 @@ public class PacketHandshakingInSetProtocol implements Packet<PacketHandshakingI
@@ -111,7 +111,7 @@ index 4f008e4723..8545146fb1 100644
          return this.a;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 37e9c86375..ec52987820 100644
+index f7ce4b106..0e0421a22 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -181,6 +181,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0182-revert-serverside-behavior-of-keepalives.patch b/Spigot-Server-Patches/0184-revert-serverside-behavior-of-keepalives.patch
similarity index 98%
rename from Spigot-Server-Patches/0182-revert-serverside-behavior-of-keepalives.patch
rename to Spigot-Server-Patches/0184-revert-serverside-behavior-of-keepalives.patch
index 0c241a1678..a8122641c2 100644
--- a/Spigot-Server-Patches/0182-revert-serverside-behavior-of-keepalives.patch
+++ b/Spigot-Server-Patches/0184-revert-serverside-behavior-of-keepalives.patch
@@ -1,4 +1,4 @@
-From 4e485cbab344eb8fc53ff37f217af37f7fcb7fee Mon Sep 17 00:00:00 2001
+From 88d25dca0531df3fbffe0ddf4868e6cea6ba1b34 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
diff --git a/Spigot-Server-Patches/0183-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/Spigot-Server-Patches/0185-Send-attack-SoundEffects-only-to-players-who-can-see.patch
similarity index 97%
rename from Spigot-Server-Patches/0183-Send-attack-SoundEffects-only-to-players-who-can-see.patch
rename to Spigot-Server-Patches/0185-Send-attack-SoundEffects-only-to-players-who-can-see.patch
index 34d9164ffd..ab35bc8c92 100644
--- a/Spigot-Server-Patches/0183-Send-attack-SoundEffects-only-to-players-who-can-see.patch
+++ b/Spigot-Server-Patches/0185-Send-attack-SoundEffects-only-to-players-who-can-see.patch
@@ -1,4 +1,4 @@
-From e7cb55b9daedaadf7d829281d5b1fd6c20bbd32e Mon Sep 17 00:00:00 2001
+From 6bc4623ee2b675436be3fbb00f1374b7f81acf3c 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Send attack SoundEffects only to players who can see the
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 05942fb7ed..b97e341635 100644
+index 05942fb7e..b97e34163 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -941,6 +941,15 @@ public abstract class EntityHuman extends EntityLiving {
@@ -72,7 +72,7 @@ index 05942fb7ed..b97e341635 100644
                              entity.extinguish();
                          }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 3e5c76d320..80e4b1184b 100644
+index 3e5c76d32..80e4b1184 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -675,6 +675,10 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
diff --git a/Spigot-Server-Patches/0184-Option-for-maximum-exp-value-when-merging-orbs.patch b/Spigot-Server-Patches/0186-Option-for-maximum-exp-value-when-merging-orbs.patch
similarity index 98%
rename from Spigot-Server-Patches/0184-Option-for-maximum-exp-value-when-merging-orbs.patch
rename to Spigot-Server-Patches/0186-Option-for-maximum-exp-value-when-merging-orbs.patch
index 4d07046348..0e36a5efab 100644
--- a/Spigot-Server-Patches/0184-Option-for-maximum-exp-value-when-merging-orbs.patch
+++ b/Spigot-Server-Patches/0186-Option-for-maximum-exp-value-when-merging-orbs.patch
@@ -1,4 +1,4 @@
-From 8f08b9dfa6889a3b87f06a79c53ef8195facebe5 Mon Sep 17 00:00:00 2001
+From 200313071eb368d0db320744442eafe908e0c2bd 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/0185-Add-PlayerArmorChangeEvent.patch b/Spigot-Server-Patches/0187-Add-PlayerArmorChangeEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0185-Add-PlayerArmorChangeEvent.patch
rename to Spigot-Server-Patches/0187-Add-PlayerArmorChangeEvent.patch
index 03ebfe3ddf..4b37560a6f 100644
--- a/Spigot-Server-Patches/0185-Add-PlayerArmorChangeEvent.patch
+++ b/Spigot-Server-Patches/0187-Add-PlayerArmorChangeEvent.patch
@@ -1,11 +1,11 @@
-From 4b68adef0da9d19e413ba0179905f856b9418e42 Mon Sep 17 00:00:00 2001
+From 5f2a0cfad1df55ddf36540f2be464c2f367f49d7 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index e2921de48..864204078 100644
+index b28e21b92..fd8e625ff 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1,5 +1,6 @@
diff --git a/Spigot-Server-Patches/0186-Prevent-logins-from-being-processed-when-the-player-.patch b/Spigot-Server-Patches/0188-Prevent-logins-from-being-processed-when-the-player-.patch
similarity index 94%
rename from Spigot-Server-Patches/0186-Prevent-logins-from-being-processed-when-the-player-.patch
rename to Spigot-Server-Patches/0188-Prevent-logins-from-being-processed-when-the-player-.patch
index 0d3c253eaa..2ce680aa01 100644
--- a/Spigot-Server-Patches/0186-Prevent-logins-from-being-processed-when-the-player-.patch
+++ b/Spigot-Server-Patches/0188-Prevent-logins-from-being-processed-when-the-player-.patch
@@ -1,4 +1,4 @@
-From 7d0c76996f72ee5518fad9520c12c975f177fb75 Mon Sep 17 00:00:00 2001
+From f5872a35462aef5babc7f83861bc66943b3de093 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
diff --git a/Spigot-Server-Patches/0187-use-CB-BlockState-implementations-for-captured-block.patch b/Spigot-Server-Patches/0189-use-CB-BlockState-implementations-for-captured-block.patch
similarity index 94%
rename from Spigot-Server-Patches/0187-use-CB-BlockState-implementations-for-captured-block.patch
rename to Spigot-Server-Patches/0189-use-CB-BlockState-implementations-for-captured-block.patch
index ccdca89985..f6306d3bd4 100644
--- a/Spigot-Server-Patches/0187-use-CB-BlockState-implementations-for-captured-block.patch
+++ b/Spigot-Server-Patches/0189-use-CB-BlockState-implementations-for-captured-block.patch
@@ -1,4 +1,4 @@
-From dc14b767e4ac680892daed467628dfcaf97ab900 Mon Sep 17 00:00:00 2001
+From f092b6126dc2cb49cbc28c5eaa33697e792b1ff6 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 80e4b1184b..eed3fa615f 100644
+index 80e4b1184..eed3fa615 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -352,7 +352,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
diff --git a/Spigot-Server-Patches/0188-API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-Server-Patches/0190-API-to-get-a-BlockState-without-a-snapshot.patch
similarity index 98%
rename from Spigot-Server-Patches/0188-API-to-get-a-BlockState-without-a-snapshot.patch
rename to Spigot-Server-Patches/0190-API-to-get-a-BlockState-without-a-snapshot.patch
index 52791c4f1d..4fae660f6a 100644
--- a/Spigot-Server-Patches/0188-API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/Spigot-Server-Patches/0190-API-to-get-a-BlockState-without-a-snapshot.patch
@@ -1,4 +1,4 @@
-From d60f08ef39ec6643ebfe0664bd1071a5c0219a8b Mon Sep 17 00:00:00 2001
+From 2e6c0b492bc716a339b1f0a1ebe7609dd7159956 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 013745f82..9f31f071b 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 a36876e49..d31447ccd 100644
+index 2bc0b2e09..166c918d7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -312,6 +312,20 @@ public class CraftBlock implements Block {
diff --git a/Spigot-Server-Patches/0189-AsyncTabCompleteEvent.patch b/Spigot-Server-Patches/0191-AsyncTabCompleteEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0189-AsyncTabCompleteEvent.patch
rename to Spigot-Server-Patches/0191-AsyncTabCompleteEvent.patch
index 6e9f22473a..75a92be542 100644
--- a/Spigot-Server-Patches/0189-AsyncTabCompleteEvent.patch
+++ b/Spigot-Server-Patches/0191-AsyncTabCompleteEvent.patch
@@ -1,4 +1,4 @@
-From 656a998539570c42454901792d293db9d564a39f Mon Sep 17 00:00:00 2001
+From 53ad330eb173779d8cd27564a7723dd578b96201 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 26 Nov 2017 13:19:58 -0500
 Subject: [PATCH] AsyncTabCompleteEvent
@@ -70,7 +70,7 @@ index 43d760bed..49dd552e1 100644
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index cdf3b6b6c..d4c8c4259 100644
+index 8f7fd3490..746d2888d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1662,7 +1662,7 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0190-Avoid-NPE-in-PathfinderGoalTempt.patch b/Spigot-Server-Patches/0192-Avoid-NPE-in-PathfinderGoalTempt.patch
similarity index 93%
rename from Spigot-Server-Patches/0190-Avoid-NPE-in-PathfinderGoalTempt.patch
rename to Spigot-Server-Patches/0192-Avoid-NPE-in-PathfinderGoalTempt.patch
index 1a4ccd8a06..b9b14f8b90 100644
--- a/Spigot-Server-Patches/0190-Avoid-NPE-in-PathfinderGoalTempt.patch
+++ b/Spigot-Server-Patches/0192-Avoid-NPE-in-PathfinderGoalTempt.patch
@@ -1,4 +1,4 @@
-From f57d861b40cb8509e25d88098722a762ef33cd4e Mon Sep 17 00:00:00 2001
+From 7a96bdd3f46ac6baae6c777bbb16cbda2eb82491 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/Spigot-Server-Patches/0191-PlayerPickupExperienceEvent.patch b/Spigot-Server-Patches/0193-PlayerPickupExperienceEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0191-PlayerPickupExperienceEvent.patch
rename to Spigot-Server-Patches/0193-PlayerPickupExperienceEvent.patch
index 230f2a8bfc..d6b173ae65 100644
--- a/Spigot-Server-Patches/0191-PlayerPickupExperienceEvent.patch
+++ b/Spigot-Server-Patches/0193-PlayerPickupExperienceEvent.patch
@@ -1,4 +1,4 @@
-From cfc2812c7616898fa461e2f2a0fc4bd5d6d62820 Mon Sep 17 00:00:00 2001
+From 5d47fbc07dc301f495e0238f2303c9504b7382c6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 22:02:53 -0500
 Subject: [PATCH] PlayerPickupExperienceEvent
diff --git a/Spigot-Server-Patches/0192-ExperienceOrbMergeEvent.patch b/Spigot-Server-Patches/0194-ExperienceOrbMergeEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0192-ExperienceOrbMergeEvent.patch
rename to Spigot-Server-Patches/0194-ExperienceOrbMergeEvent.patch
index b1b6b58649..26667d5e35 100644
--- a/Spigot-Server-Patches/0192-ExperienceOrbMergeEvent.patch
+++ b/Spigot-Server-Patches/0194-ExperienceOrbMergeEvent.patch
@@ -1,4 +1,4 @@
-From 19d8f5f5e055a592c2e9f77df9aa519667028d4a Mon Sep 17 00:00:00 2001
+From 2d63efb2a34a5f6fbac76c524f6f5689bf24404f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 22:57:26 -0500
 Subject: [PATCH] ExperienceOrbMergeEvent
diff --git a/Spigot-Server-Patches/0193-Ability-to-apply-mending-to-XP-API.patch b/Spigot-Server-Patches/0195-Ability-to-apply-mending-to-XP-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0193-Ability-to-apply-mending-to-XP-API.patch
rename to Spigot-Server-Patches/0195-Ability-to-apply-mending-to-XP-API.patch
index 1c2aa2ca30..4586acd4ea 100644
--- a/Spigot-Server-Patches/0193-Ability-to-apply-mending-to-XP-API.patch
+++ b/Spigot-Server-Patches/0195-Ability-to-apply-mending-to-XP-API.patch
@@ -1,4 +1,4 @@
-From 0f4e846e31f326ca9ff66a460b347eb9ff46a725 Mon Sep 17 00:00:00 2001
+From b936f03abebb6c6cd75a8f359cbdae6968d6c3a3 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
diff --git a/Spigot-Server-Patches/0194-Make-max-squid-spawn-height-configurable.patch b/Spigot-Server-Patches/0196-Make-max-squid-spawn-height-configurable.patch
similarity index 96%
rename from Spigot-Server-Patches/0194-Make-max-squid-spawn-height-configurable.patch
rename to Spigot-Server-Patches/0196-Make-max-squid-spawn-height-configurable.patch
index fdd7ad735c..c86fe242be 100644
--- a/Spigot-Server-Patches/0194-Make-max-squid-spawn-height-configurable.patch
+++ b/Spigot-Server-Patches/0196-Make-max-squid-spawn-height-configurable.patch
@@ -1,4 +1,4 @@
-From f89d9937f9523a2d3000d9907c854111ff866e25 Mon Sep 17 00:00:00 2001
+From 0dc4abf28b9814de7d311c672f52d0a28fc22057 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/0195-PreCreatureSpawnEvent.patch b/Spigot-Server-Patches/0197-PreCreatureSpawnEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0195-PreCreatureSpawnEvent.patch
rename to Spigot-Server-Patches/0197-PreCreatureSpawnEvent.patch
index 00b382b89b..bf1dcc869b 100644
--- a/Spigot-Server-Patches/0195-PreCreatureSpawnEvent.patch
+++ b/Spigot-Server-Patches/0197-PreCreatureSpawnEvent.patch
@@ -1,4 +1,4 @@
-From 31553b6ff48f0728ccdab436857ba9ea9c9b0f29 Mon Sep 17 00:00:00 2001
+From c5e3b702cf65b17d698c24701f07f1b2bed64823 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 14 Jan 2018 17:01:31 -0500
 Subject: [PATCH] PreCreatureSpawnEvent
diff --git a/Spigot-Server-Patches/0196-PlayerNaturallySpawnCreaturesEvent.patch b/Spigot-Server-Patches/0198-PlayerNaturallySpawnCreaturesEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0196-PlayerNaturallySpawnCreaturesEvent.patch
rename to Spigot-Server-Patches/0198-PlayerNaturallySpawnCreaturesEvent.patch
index a5526e4691..f457bbcd1b 100644
--- a/Spigot-Server-Patches/0196-PlayerNaturallySpawnCreaturesEvent.patch
+++ b/Spigot-Server-Patches/0198-PlayerNaturallySpawnCreaturesEvent.patch
@@ -1,4 +1,4 @@
-From 87d7cc421201c5f02eb7239f622105656d7da142 Mon Sep 17 00:00:00 2001
+From c51e1da52848ab61068b678c97edcd3e8f0c5479 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/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index f2b024857c..ed9e2e3e18 100644
+index f2b024857..ed9e2e3e1 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -693,12 +693,17 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
diff --git a/Spigot-Server-Patches/0197-Add-setPlayerProfile-API-for-Skulls.patch b/Spigot-Server-Patches/0199-Add-setPlayerProfile-API-for-Skulls.patch
similarity index 98%
rename from Spigot-Server-Patches/0197-Add-setPlayerProfile-API-for-Skulls.patch
rename to Spigot-Server-Patches/0199-Add-setPlayerProfile-API-for-Skulls.patch
index 0508683372..3fab3d366b 100644
--- a/Spigot-Server-Patches/0197-Add-setPlayerProfile-API-for-Skulls.patch
+++ b/Spigot-Server-Patches/0199-Add-setPlayerProfile-API-for-Skulls.patch
@@ -1,4 +1,4 @@
-From aaaac679239827b55e690edffe62cddc8f082a29 Mon Sep 17 00:00:00 2001
+From 350a1c89cdd732572904ea9abead1257c0a63777 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
diff --git a/Spigot-Server-Patches/0198-Fill-Profile-Property-Events.patch b/Spigot-Server-Patches/0200-Fill-Profile-Property-Events.patch
similarity index 96%
rename from Spigot-Server-Patches/0198-Fill-Profile-Property-Events.patch
rename to Spigot-Server-Patches/0200-Fill-Profile-Property-Events.patch
index a21a7b80b2..e77fe8f1e6 100644
--- a/Spigot-Server-Patches/0198-Fill-Profile-Property-Events.patch
+++ b/Spigot-Server-Patches/0200-Fill-Profile-Property-Events.patch
@@ -1,4 +1,4 @@
-From 42e6a4c1631ac80556542d00dfe1c3cb73c7ee52 Mon Sep 17 00:00:00 2001
+From d300db084daf942cbdca05c47603970b777ba751 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
diff --git a/Spigot-Server-Patches/0199-PlayerAdvancementCriterionGrantEvent.patch b/Spigot-Server-Patches/0201-PlayerAdvancementCriterionGrantEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0199-PlayerAdvancementCriterionGrantEvent.patch
rename to Spigot-Server-Patches/0201-PlayerAdvancementCriterionGrantEvent.patch
index 78369d9b74..0dd4dfe67c 100644
--- a/Spigot-Server-Patches/0199-PlayerAdvancementCriterionGrantEvent.patch
+++ b/Spigot-Server-Patches/0201-PlayerAdvancementCriterionGrantEvent.patch
@@ -1,4 +1,4 @@
-From 17b2ad1e5cef6cf031fb86d740f03a5cb9e81e7e Mon Sep 17 00:00:00 2001
+From 13869858a3cb2dbe588c58079dc6cc83b3ba6c87 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/Spigot-Server-Patches/0200-Add-ArmorStand-Item-Meta.patch b/Spigot-Server-Patches/0202-Add-ArmorStand-Item-Meta.patch
similarity index 99%
rename from Spigot-Server-Patches/0200-Add-ArmorStand-Item-Meta.patch
rename to Spigot-Server-Patches/0202-Add-ArmorStand-Item-Meta.patch
index d504a3a44a..bd31245100 100644
--- a/Spigot-Server-Patches/0200-Add-ArmorStand-Item-Meta.patch
+++ b/Spigot-Server-Patches/0202-Add-ArmorStand-Item-Meta.patch
@@ -1,4 +1,4 @@
-From c9383f72b378e02c8fb4dca1392f6a816dccf95f Mon Sep 17 00:00:00 2001
+From 76e612ae800a3ee57b272e1997e561f82381db02 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
@@ -356,7 +356,7 @@ index 000000000..c00b89c8d
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 0d513e1f3..159037fc3 100644
+index bf7b226a4..a8b267487 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -161,6 +161,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
diff --git a/Spigot-Server-Patches/0201-Extend-Player-Interact-cancellation.patch b/Spigot-Server-Patches/0203-Extend-Player-Interact-cancellation.patch
similarity index 98%
rename from Spigot-Server-Patches/0201-Extend-Player-Interact-cancellation.patch
rename to Spigot-Server-Patches/0203-Extend-Player-Interact-cancellation.patch
index 7333d07033..1ddc955783 100644
--- a/Spigot-Server-Patches/0201-Extend-Player-Interact-cancellation.patch
+++ b/Spigot-Server-Patches/0203-Extend-Player-Interact-cancellation.patch
@@ -1,4 +1,4 @@
-From 0cb9cc2517f0e2fe518b8650eb849be0dc9dd48b Mon Sep 17 00:00:00 2001
+From d239fb6d181f735359b93aae0112d80522551540 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
diff --git a/Spigot-Server-Patches/0202-Tameable-getOwnerUniqueId-API.patch b/Spigot-Server-Patches/0204-Tameable-getOwnerUniqueId-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0202-Tameable-getOwnerUniqueId-API.patch
rename to Spigot-Server-Patches/0204-Tameable-getOwnerUniqueId-API.patch
index 7cc8ba1b44..d26f0ce554 100644
--- a/Spigot-Server-Patches/0202-Tameable-getOwnerUniqueId-API.patch
+++ b/Spigot-Server-Patches/0204-Tameable-getOwnerUniqueId-API.patch
@@ -1,4 +1,4 @@
-From f828c35f29e7ea0af0e0cdb6c02f584860659519 Mon Sep 17 00:00:00 2001
+From d0b71980f779cace8fb05ad100382a8457ed0eee 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
diff --git a/Spigot-Server-Patches/0203-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/Spigot-Server-Patches/0205-Toggleable-player-crits-helps-mitigate-hacked-client.patch
similarity index 96%
rename from Spigot-Server-Patches/0203-Toggleable-player-crits-helps-mitigate-hacked-client.patch
rename to Spigot-Server-Patches/0205-Toggleable-player-crits-helps-mitigate-hacked-client.patch
index 995d513079..a9177a8a98 100644
--- a/Spigot-Server-Patches/0203-Toggleable-player-crits-helps-mitigate-hacked-client.patch
+++ b/Spigot-Server-Patches/0205-Toggleable-player-crits-helps-mitigate-hacked-client.patch
@@ -1,4 +1,4 @@
-From ee8d66e3a254792907ff2ab982f77e14e7e8c52b Mon Sep 17 00:00:00 2001
+From 9c9cea700073fb5db72d186b593c9e14016dcb6a 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/Spigot-Server-Patches/0204-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch b/Spigot-Server-Patches/0206-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
similarity index 95%
rename from Spigot-Server-Patches/0204-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
rename to Spigot-Server-Patches/0206-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
index 3c3c44b845..a659b347ca 100644
--- a/Spigot-Server-Patches/0204-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
+++ b/Spigot-Server-Patches/0206-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
@@ -1,4 +1,4 @@
-From 268a73860e33fa98c54470ffb7de2ee3f16ed6f4 Mon Sep 17 00:00:00 2001
+From 62d13da4f1288d50d15c2d1b5bcf1f2a9c237e8f 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
diff --git a/Spigot-Server-Patches/0205-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/Spigot-Server-Patches/0207-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
similarity index 96%
rename from Spigot-Server-Patches/0205-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
rename to Spigot-Server-Patches/0207-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
index dc5c2a5e97..8f707da3bb 100644
--- a/Spigot-Server-Patches/0205-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
+++ b/Spigot-Server-Patches/0207-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
@@ -1,4 +1,4 @@
-From 8c39ac12cabf0929c69641e0d509b0427498b8f3 Mon Sep 17 00:00:00 2001
+From b1f2876582b31afb35a34d8bac104d854c3afa1b 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/Spigot-Server-Patches/0206-Disable-Explicit-Network-Manager-Flushing.patch b/Spigot-Server-Patches/0208-Disable-Explicit-Network-Manager-Flushing.patch
similarity index 96%
rename from Spigot-Server-Patches/0206-Disable-Explicit-Network-Manager-Flushing.patch
rename to Spigot-Server-Patches/0208-Disable-Explicit-Network-Manager-Flushing.patch
index fbb0602345..6f45e50f4c 100644
--- a/Spigot-Server-Patches/0206-Disable-Explicit-Network-Manager-Flushing.patch
+++ b/Spigot-Server-Patches/0208-Disable-Explicit-Network-Manager-Flushing.patch
@@ -1,4 +1,4 @@
-From 6ef4c09ca221c0a6d30e1f8b32e4ce28aa40c874 Mon Sep 17 00:00:00 2001
+From 513e37fb92321b4b4a7a0d47a2fb470eaf3bda93 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
diff --git a/Spigot-Server-Patches/0207-Implement-extended-PaperServerListPingEvent.patch b/Spigot-Server-Patches/0209-Implement-extended-PaperServerListPingEvent.patch
similarity index 99%
rename from Spigot-Server-Patches/0207-Implement-extended-PaperServerListPingEvent.patch
rename to Spigot-Server-Patches/0209-Implement-extended-PaperServerListPingEvent.patch
index e2788b5845..8734f90b7d 100644
--- a/Spigot-Server-Patches/0207-Implement-extended-PaperServerListPingEvent.patch
+++ b/Spigot-Server-Patches/0209-Implement-extended-PaperServerListPingEvent.patch
@@ -1,4 +1,4 @@
-From 83ea81696792e0e9158b42e3e95833939a862d21 Mon Sep 17 00:00:00 2001
+From 23a98f20471a931dadc359fd9451cac5319e372d 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
@@ -177,7 +177,7 @@ index 000000000..a85466bc7
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d909ad682..e5b3dc9e2 100644
+index 5817e9452..7e27f1079 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1,6 +1,7 @@
diff --git a/Spigot-Server-Patches/0208-Improved-Async-Task-Scheduler.patch b/Spigot-Server-Patches/0210-Improved-Async-Task-Scheduler.patch
similarity index 99%
rename from Spigot-Server-Patches/0208-Improved-Async-Task-Scheduler.patch
rename to Spigot-Server-Patches/0210-Improved-Async-Task-Scheduler.patch
index 7c05f36c81..7a8c53ae11 100644
--- a/Spigot-Server-Patches/0208-Improved-Async-Task-Scheduler.patch
+++ b/Spigot-Server-Patches/0210-Improved-Async-Task-Scheduler.patch
@@ -1,4 +1,4 @@
-From 0b46b3e63b9c59ae3da52b9bd3ec7f456e3217b1 Mon Sep 17 00:00:00 2001
+From 51a1b2fdfcfd901bcbb703965cb9e71815229d28 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
diff --git a/Spigot-Server-Patches/0209-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/Spigot-Server-Patches/0211-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
similarity index 97%
rename from Spigot-Server-Patches/0209-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
rename to Spigot-Server-Patches/0211-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
index acc79cca8f..0ee2acd2c4 100644
--- a/Spigot-Server-Patches/0209-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
+++ b/Spigot-Server-Patches/0211-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
@@ -1,4 +1,4 @@
-From e8b48e35704ac20d175d9fda1a7b1b65005bff05 Mon Sep 17 00:00:00 2001
+From ea4fc54b91e1b7089cfec2ab28a24a428c822bf3 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
diff --git a/Spigot-Server-Patches/0210-Player.setPlayerProfile-API.patch b/Spigot-Server-Patches/0212-Player.setPlayerProfile-API.patch
similarity index 99%
rename from Spigot-Server-Patches/0210-Player.setPlayerProfile-API.patch
rename to Spigot-Server-Patches/0212-Player.setPlayerProfile-API.patch
index 8023899aec..5300145337 100644
--- a/Spigot-Server-Patches/0210-Player.setPlayerProfile-API.patch
+++ b/Spigot-Server-Patches/0212-Player.setPlayerProfile-API.patch
@@ -1,4 +1,4 @@
-From 4ae489261829222b96472c09200385ca09733236 Mon Sep 17 00:00:00 2001
+From 5071cf8eaa93f16225860890465a996e7f5a0701 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
diff --git a/Spigot-Server-Patches/0211-Fix-Dragon-Server-Crashes.patch b/Spigot-Server-Patches/0213-Fix-Dragon-Server-Crashes.patch
similarity index 94%
rename from Spigot-Server-Patches/0211-Fix-Dragon-Server-Crashes.patch
rename to Spigot-Server-Patches/0213-Fix-Dragon-Server-Crashes.patch
index 23724652ad..9e094a88b9 100644
--- a/Spigot-Server-Patches/0211-Fix-Dragon-Server-Crashes.patch
+++ b/Spigot-Server-Patches/0213-Fix-Dragon-Server-Crashes.patch
@@ -1,4 +1,4 @@
-From ad97f7eebebed0934e2101b38b6910ce8de3cebd Mon Sep 17 00:00:00 2001
+From 29900b9f545b9f8ecc624fd5bcbc34fbac0f6206 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
diff --git a/Spigot-Server-Patches/0212-getPlayerUniqueId-API.patch b/Spigot-Server-Patches/0214-getPlayerUniqueId-API.patch
similarity index 94%
rename from Spigot-Server-Patches/0212-getPlayerUniqueId-API.patch
rename to Spigot-Server-Patches/0214-getPlayerUniqueId-API.patch
index 3b411a78e7..954223ad76 100644
--- a/Spigot-Server-Patches/0212-getPlayerUniqueId-API.patch
+++ b/Spigot-Server-Patches/0214-getPlayerUniqueId-API.patch
@@ -1,4 +1,4 @@
-From 0478c931e23f3952dd48fe4be7f457f4373acb75 Mon Sep 17 00:00:00 2001
+From 272bed4023311ec64b7a6756561e374583ad49a3 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 d4c8c4259..4fe8e198f 100644
+index 746d2888d..ad1950980 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1355,6 +1355,26 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0213-Make-player-data-saving-configurable.patch b/Spigot-Server-Patches/0215-Make-player-data-saving-configurable.patch
similarity index 96%
rename from Spigot-Server-Patches/0213-Make-player-data-saving-configurable.patch
rename to Spigot-Server-Patches/0215-Make-player-data-saving-configurable.patch
index 5eae33b1a7..e527d7cfa9 100644
--- a/Spigot-Server-Patches/0213-Make-player-data-saving-configurable.patch
+++ b/Spigot-Server-Patches/0215-Make-player-data-saving-configurable.patch
@@ -1,4 +1,4 @@
-From 006293719b6966549e326c55587dafd894d7dcbc Mon Sep 17 00:00:00 2001
+From 49fcbc988197de97e26d7a0cbc43168c7f75a2bd 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/Spigot-Server-Patches/0214-Make-legacy-ping-handler-more-reliable.patch b/Spigot-Server-Patches/0216-Make-legacy-ping-handler-more-reliable.patch
similarity index 98%
rename from Spigot-Server-Patches/0214-Make-legacy-ping-handler-more-reliable.patch
rename to Spigot-Server-Patches/0216-Make-legacy-ping-handler-more-reliable.patch
index fda5cf5b51..573d0c12f2 100644
--- a/Spigot-Server-Patches/0214-Make-legacy-ping-handler-more-reliable.patch
+++ b/Spigot-Server-Patches/0216-Make-legacy-ping-handler-more-reliable.patch
@@ -1,4 +1,4 @@
-From a045575f71bd8967abbb2a007bc9d74b219169e4 Mon Sep 17 00:00:00 2001
+From 97a5ba6d85f2ff791193b6f2bb804700a92cdb21 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
diff --git a/Spigot-Server-Patches/0215-Call-PaperServerListPingEvent-for-legacy-pings.patch b/Spigot-Server-Patches/0217-Call-PaperServerListPingEvent-for-legacy-pings.patch
similarity index 99%
rename from Spigot-Server-Patches/0215-Call-PaperServerListPingEvent-for-legacy-pings.patch
rename to Spigot-Server-Patches/0217-Call-PaperServerListPingEvent-for-legacy-pings.patch
index 6c86adb92f..3ec7e35cc3 100644
--- a/Spigot-Server-Patches/0215-Call-PaperServerListPingEvent-for-legacy-pings.patch
+++ b/Spigot-Server-Patches/0217-Call-PaperServerListPingEvent-for-legacy-pings.patch
@@ -1,4 +1,4 @@
-From 377398d718b3643d8a65138c4c5748b9a990d0b6 Mon Sep 17 00:00:00 2001
+From 968d88906cc479a86a1b297d47455982f3c35f3b 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
diff --git a/Spigot-Server-Patches/0216-Flag-to-disable-the-channel-limit.patch b/Spigot-Server-Patches/0218-Flag-to-disable-the-channel-limit.patch
similarity index 96%
rename from Spigot-Server-Patches/0216-Flag-to-disable-the-channel-limit.patch
rename to Spigot-Server-Patches/0218-Flag-to-disable-the-channel-limit.patch
index 8ff718e080..ed4e9b270d 100644
--- a/Spigot-Server-Patches/0216-Flag-to-disable-the-channel-limit.patch
+++ b/Spigot-Server-Patches/0218-Flag-to-disable-the-channel-limit.patch
@@ -1,4 +1,4 @@
-From bf12bbe1828f2b1cf3a259862df5c71675611bf7 Mon Sep 17 00:00:00 2001
+From 2183732c4ccd68294c1567f64cdf528dbd53ac5a 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
diff --git a/Spigot-Server-Patches/0218-Load-version-history-at-server-start.patch b/Spigot-Server-Patches/0218-Load-version-history-at-server-start.patch
deleted file mode 100644
index 6af5580ed0..0000000000
--- a/Spigot-Server-Patches/0218-Load-version-history-at-server-start.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From ddeda45f212404065b346d694bffc2f37e76a769 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 d9f1c2205..c2c676e3b 100644
---- a/src/main/java/net/minecraft/server/DedicatedServer.java
-+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
-@@ -172,6 +172,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
-             return false;
-         }
-         com.destroystokyo.paper.PaperConfig.registerCommands();
-+        com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now
-         // Paper end
- 
-         this.setSpawnAnimals(dedicatedserverproperties.spawnAnimals);
--- 
-2.21.0
-
diff --git a/Spigot-Server-Patches/0217-Add-method-to-open-already-placed-sign.patch b/Spigot-Server-Patches/0219-Add-method-to-open-already-placed-sign.patch
similarity index 92%
rename from Spigot-Server-Patches/0217-Add-method-to-open-already-placed-sign.patch
rename to Spigot-Server-Patches/0219-Add-method-to-open-already-placed-sign.patch
index af32c4775c..879482db2d 100644
--- a/Spigot-Server-Patches/0217-Add-method-to-open-already-placed-sign.patch
+++ b/Spigot-Server-Patches/0219-Add-method-to-open-already-placed-sign.patch
@@ -1,11 +1,11 @@
-From fa555fb840460e7eb156ff1790b3e035b156c23e Mon Sep 17 00:00:00 2001
+From d1b141797220036ffea3ebe16dc6d86302cab4b7 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 bb4dde0de0..60f839056b 100644
+index bb4dde0de..60f839056 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -759,4 +759,17 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/Spigot-Server-Patches/0219-Configurable-sprint-interruption-on-attack.patch b/Spigot-Server-Patches/0220-Configurable-sprint-interruption-on-attack.patch
similarity index 96%
rename from Spigot-Server-Patches/0219-Configurable-sprint-interruption-on-attack.patch
rename to Spigot-Server-Patches/0220-Configurable-sprint-interruption-on-attack.patch
index ea45405664..35ef5eddb9 100644
--- a/Spigot-Server-Patches/0219-Configurable-sprint-interruption-on-attack.patch
+++ b/Spigot-Server-Patches/0220-Configurable-sprint-interruption-on-attack.patch
@@ -1,4 +1,4 @@
-From 41305423d682a6b9bbc04d7ad00cc8df619cc030 Mon Sep 17 00:00:00 2001
+From ffb2dc40daa5cc08ed8e08a261d19946bde4d517 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/0220-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/Spigot-Server-Patches/0221-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
similarity index 94%
rename from Spigot-Server-Patches/0220-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
rename to Spigot-Server-Patches/0221-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
index 2f83da1eff..99a7a8cc91 100644
--- a/Spigot-Server-Patches/0220-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
+++ b/Spigot-Server-Patches/0221-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
@@ -1,4 +1,4 @@
-From 8ae85ac32ee954771ed025321ec96f1bd6a8a870 Mon Sep 17 00:00:00 2001
+From 9a27f60d8c4a94f29081110e21dd296ab7f08b8e 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
diff --git a/Spigot-Server-Patches/0221-EndermanEscapeEvent.patch b/Spigot-Server-Patches/0222-EndermanEscapeEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0221-EndermanEscapeEvent.patch
rename to Spigot-Server-Patches/0222-EndermanEscapeEvent.patch
index 538e917b66..1930fa14d4 100644
--- a/Spigot-Server-Patches/0221-EndermanEscapeEvent.patch
+++ b/Spigot-Server-Patches/0222-EndermanEscapeEvent.patch
@@ -1,4 +1,4 @@
-From b369d2542ce8ed4fa380bd97966921b2eb857b92 Mon Sep 17 00:00:00 2001
+From 27db11cf803d6f4354cef0a2c77d43dea2fcfeb1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 13:15:55 -0400
 Subject: [PATCH] EndermanEscapeEvent
diff --git a/Spigot-Server-Patches/0222-Enderman.teleportRandomly.patch b/Spigot-Server-Patches/0223-Enderman.teleportRandomly.patch
similarity index 95%
rename from Spigot-Server-Patches/0222-Enderman.teleportRandomly.patch
rename to Spigot-Server-Patches/0223-Enderman.teleportRandomly.patch
index 6f160cbc6e..05430c546b 100644
--- a/Spigot-Server-Patches/0222-Enderman.teleportRandomly.patch
+++ b/Spigot-Server-Patches/0223-Enderman.teleportRandomly.patch
@@ -1,4 +1,4 @@
-From 032459db8e7bcd285fd8b1cff9d0fe72ea2c483b Mon Sep 17 00:00:00 2001
+From fa54fe81ecae1320f93493f4ab09155607ebeb84 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()
diff --git a/Spigot-Server-Patches/0223-Block-Enderpearl-Travel-Exploit.patch b/Spigot-Server-Patches/0224-Block-Enderpearl-Travel-Exploit.patch
similarity index 97%
rename from Spigot-Server-Patches/0223-Block-Enderpearl-Travel-Exploit.patch
rename to Spigot-Server-Patches/0224-Block-Enderpearl-Travel-Exploit.patch
index 439d04200d..b269f2ba1e 100644
--- a/Spigot-Server-Patches/0223-Block-Enderpearl-Travel-Exploit.patch
+++ b/Spigot-Server-Patches/0224-Block-Enderpearl-Travel-Exploit.patch
@@ -1,4 +1,4 @@
-From 3df4f86bb5558e85d306669c733165d9ec6cf589 Mon Sep 17 00:00:00 2001
+From cde906c641086a32658d0ee9f69374581e984215 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/0224-Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-Server-Patches/0225-Expand-World.spawnParticle-API-and-add-Builder.patch
similarity index 96%
rename from Spigot-Server-Patches/0224-Expand-World.spawnParticle-API-and-add-Builder.patch
rename to Spigot-Server-Patches/0225-Expand-World.spawnParticle-API-and-add-Builder.patch
index 5f32fc82ea..26f9a0764d 100644
--- a/Spigot-Server-Patches/0224-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/Spigot-Server-Patches/0225-Expand-World.spawnParticle-API-and-add-Builder.patch
@@ -1,4 +1,4 @@
-From c9fe4ab598f91f6f0766aa0410bd5c6bc120e31d Mon Sep 17 00:00:00 2001
+From 83d47677f2fc2bbe9c66a0ca32fcc5930f8559d9 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 9fdc8f5b02..8bc0a8cca8 100644
+index 9fdc8f5b0..8bc0a8cca 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -48,7 +48,7 @@ public class WorldServer extends World {
@@ -43,7 +43,7 @@ index 9fdc8f5b02..8bc0a8cca8 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 842c28f311..8ed22217da 100644
+index 842c28f31..8ed22217d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -2037,11 +2037,17 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0225-EndermanAttackPlayerEvent.patch b/Spigot-Server-Patches/0226-EndermanAttackPlayerEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0225-EndermanAttackPlayerEvent.patch
rename to Spigot-Server-Patches/0226-EndermanAttackPlayerEvent.patch
index 69a41f05af..916a282d80 100644
--- a/Spigot-Server-Patches/0225-EndermanAttackPlayerEvent.patch
+++ b/Spigot-Server-Patches/0226-EndermanAttackPlayerEvent.patch
@@ -1,4 +1,4 @@
-From 938a8456594d8cc6e6d7000ee807c67a213104eb Mon Sep 17 00:00:00 2001
+From c1e8cc5b95fa04549889bee6fbf16fe1d17b79bc Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 May 2018 20:18:54 -0400
 Subject: [PATCH] EndermanAttackPlayerEvent
diff --git a/Spigot-Server-Patches/0226-WitchConsumePotionEvent.patch b/Spigot-Server-Patches/0227-WitchConsumePotionEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0226-WitchConsumePotionEvent.patch
rename to Spigot-Server-Patches/0227-WitchConsumePotionEvent.patch
index 186c3c7887..479a222c34 100644
--- a/Spigot-Server-Patches/0226-WitchConsumePotionEvent.patch
+++ b/Spigot-Server-Patches/0227-WitchConsumePotionEvent.patch
@@ -1,4 +1,4 @@
-From dfc082b148fa4673aa922cc98437427bf7d1603f Mon Sep 17 00:00:00 2001
+From c518ab779cf71f5684249de8f862ae2553f734c7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 16 May 2018 20:35:16 -0400
 Subject: [PATCH] WitchConsumePotionEvent
diff --git a/Spigot-Server-Patches/0227-WitchThrowPotionEvent.patch b/Spigot-Server-Patches/0228-WitchThrowPotionEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0227-WitchThrowPotionEvent.patch
rename to Spigot-Server-Patches/0228-WitchThrowPotionEvent.patch
index f0979b508b..352c1535bb 100644
--- a/Spigot-Server-Patches/0227-WitchThrowPotionEvent.patch
+++ b/Spigot-Server-Patches/0228-WitchThrowPotionEvent.patch
@@ -1,4 +1,4 @@
-From 0b8caecf3df48d173c86a4ec402edb296172be58 Mon Sep 17 00:00:00 2001
+From e3456fbd0608f874cbb438b4aec6efc29e2e4757 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 16 May 2018 20:44:58 -0400
 Subject: [PATCH] WitchThrowPotionEvent
diff --git a/Spigot-Server-Patches/0228-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/Spigot-Server-Patches/0229-Allow-spawning-Item-entities-with-World.spawnEntity.patch
similarity index 92%
rename from Spigot-Server-Patches/0228-Allow-spawning-Item-entities-with-World.spawnEntity.patch
rename to Spigot-Server-Patches/0229-Allow-spawning-Item-entities-with-World.spawnEntity.patch
index d683959574..633a3a55f2 100644
--- a/Spigot-Server-Patches/0228-Allow-spawning-Item-entities-with-World.spawnEntity.patch
+++ b/Spigot-Server-Patches/0229-Allow-spawning-Item-entities-with-World.spawnEntity.patch
@@ -1,4 +1,4 @@
-From 49401a6fbf671bfeefc6345ccb5a41939e31cfac Mon Sep 17 00:00:00 2001
+From 8548ec8d893e3f2f8a1a6e51d005542f8f8c358a 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 8ed22217da..8fa9346cfe 100644
+index 8ed22217d..8fa9346cf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1304,6 +1304,10 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0229-WitchReadyPotionEvent.patch b/Spigot-Server-Patches/0230-WitchReadyPotionEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0229-WitchReadyPotionEvent.patch
rename to Spigot-Server-Patches/0230-WitchReadyPotionEvent.patch
index 75da291859..e8a5cd3596 100644
--- a/Spigot-Server-Patches/0229-WitchReadyPotionEvent.patch
+++ b/Spigot-Server-Patches/0230-WitchReadyPotionEvent.patch
@@ -1,4 +1,4 @@
-From eefeefe9fd82c22af80dbfd9660fcd16d3037def Mon Sep 17 00:00:00 2001
+From 65ffa74665176584d251ac883242866208de3a58 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/Spigot-Server-Patches/0230-ItemStack-getMaxItemUseDuration.patch b/Spigot-Server-Patches/0231-ItemStack-getMaxItemUseDuration.patch
similarity index 96%
rename from Spigot-Server-Patches/0230-ItemStack-getMaxItemUseDuration.patch
rename to Spigot-Server-Patches/0231-ItemStack-getMaxItemUseDuration.patch
index ff02a66a54..98df85f9d2 100644
--- a/Spigot-Server-Patches/0230-ItemStack-getMaxItemUseDuration.patch
+++ b/Spigot-Server-Patches/0231-ItemStack-getMaxItemUseDuration.patch
@@ -1,4 +1,4 @@
-From 328d1473bd7465351d1fca668adf81155cebbc67 Mon Sep 17 00:00:00 2001
+From 52e712c639fa1fff30acb46129f4dd26137ea23a 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
diff --git a/Spigot-Server-Patches/0231-Implement-EntityTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0232-Implement-EntityTeleportEndGatewayEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0231-Implement-EntityTeleportEndGatewayEvent.patch
rename to Spigot-Server-Patches/0232-Implement-EntityTeleportEndGatewayEvent.patch
index c6dc1a13ab..d7a24ee233 100644
--- a/Spigot-Server-Patches/0231-Implement-EntityTeleportEndGatewayEvent.patch
+++ b/Spigot-Server-Patches/0232-Implement-EntityTeleportEndGatewayEvent.patch
@@ -1,4 +1,4 @@
-From 7d5bacdeefd6c1a2a77d3e9ef72c761099532492 Mon Sep 17 00:00:00 2001
+From a4be144d0ed58fb12871d6874c43d42832b3347e 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/Spigot-Server-Patches/0232-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/Spigot-Server-Patches/0233-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
similarity index 95%
rename from Spigot-Server-Patches/0232-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
rename to Spigot-Server-Patches/0233-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
index 404f9058f5..e7159098dd 100644
--- a/Spigot-Server-Patches/0232-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
+++ b/Spigot-Server-Patches/0233-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
@@ -1,4 +1,4 @@
-From 1661e09044bf24b7d4f44a46b5ae45bfa540827c Mon Sep 17 00:00:00 2001
+From 810df168f3f9d24649dbb668359a5155163d1b11 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
diff --git a/Spigot-Server-Patches/0233-Fix-CraftEntity-hashCode.patch b/Spigot-Server-Patches/0234-Fix-CraftEntity-hashCode.patch
similarity index 94%
rename from Spigot-Server-Patches/0233-Fix-CraftEntity-hashCode.patch
rename to Spigot-Server-Patches/0234-Fix-CraftEntity-hashCode.patch
index 35855ae71e..e0c4cd129b 100644
--- a/Spigot-Server-Patches/0233-Fix-CraftEntity-hashCode.patch
+++ b/Spigot-Server-Patches/0234-Fix-CraftEntity-hashCode.patch
@@ -1,4 +1,4 @@
-From 9b1184419b914ffd2ca89a549c25c13c23d44ff6 Mon Sep 17 00:00:00 2001
+From 46b6981ff1b0e0f82a01d035f8957cfce5f43947 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
@@ -21,7 +21,7 @@ check is essentially the same as this.getHandle() == other.getHandle()
 However, replaced it too to make it clearer of intent.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index ebcd971fb..52f72e147 100644
+index b000bc8c7..1cd3448e5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -720,14 +720,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/Spigot-Server-Patches/0234-Configurable-Alternative-LootPool-Luck-Formula.patch b/Spigot-Server-Patches/0235-Configurable-Alternative-LootPool-Luck-Formula.patch
similarity index 98%
rename from Spigot-Server-Patches/0234-Configurable-Alternative-LootPool-Luck-Formula.patch
rename to Spigot-Server-Patches/0235-Configurable-Alternative-LootPool-Luck-Formula.patch
index 82bee912f4..bddc1d3bdb 100644
--- a/Spigot-Server-Patches/0234-Configurable-Alternative-LootPool-Luck-Formula.patch
+++ b/Spigot-Server-Patches/0235-Configurable-Alternative-LootPool-Luck-Formula.patch
@@ -1,4 +1,4 @@
-From ac8162ea4e6fcaf31087081680b02ac598b383aa Mon Sep 17 00:00:00 2001
+From 939c154d7d138ceb717b45c9aa6d631025abd410 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
diff --git a/Spigot-Server-Patches/0235-Print-Error-details-when-failing-to-save-player-data.patch b/Spigot-Server-Patches/0236-Print-Error-details-when-failing-to-save-player-data.patch
similarity index 93%
rename from Spigot-Server-Patches/0235-Print-Error-details-when-failing-to-save-player-data.patch
rename to Spigot-Server-Patches/0236-Print-Error-details-when-failing-to-save-player-data.patch
index 6d22bbb118..4777db8c02 100644
--- a/Spigot-Server-Patches/0235-Print-Error-details-when-failing-to-save-player-data.patch
+++ b/Spigot-Server-Patches/0236-Print-Error-details-when-failing-to-save-player-data.patch
@@ -1,4 +1,4 @@
-From ab31f6c6b798199d28843947ddfda7d308b8342a Mon Sep 17 00:00:00 2001
+From a97e11a7eb0ecf2d092cc3e507832bd1bdc2acc5 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/Spigot-Server-Patches/0236-Make-shield-blocking-delay-configurable.patch b/Spigot-Server-Patches/0237-Make-shield-blocking-delay-configurable.patch
similarity index 94%
rename from Spigot-Server-Patches/0236-Make-shield-blocking-delay-configurable.patch
rename to Spigot-Server-Patches/0237-Make-shield-blocking-delay-configurable.patch
index 6018d19114..0acf1be39d 100644
--- a/Spigot-Server-Patches/0236-Make-shield-blocking-delay-configurable.patch
+++ b/Spigot-Server-Patches/0237-Make-shield-blocking-delay-configurable.patch
@@ -1,11 +1,11 @@
-From 826ed7c578e0407b493c1c1785164b47c705aa98 Mon Sep 17 00:00:00 2001
+From b8c39b42a48bb1b8c079996659d8bbb568c396a8 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/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index fe9415b1de..ce17447faf 100644
+index fe9415b1d..ce17447fa 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -365,4 +365,9 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index fe9415b1de..ce17447faf 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 8642040786..be60f35de1 100644
+index fd8e625ff..c22e8bd17 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2915,7 +2915,7 @@ public abstract class EntityLiving extends Entity {
@@ -48,7 +48,7 @@ index 8642040786..be60f35de1 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 42cc158824..513b3fac7f 100644
+index 42cc15882..513b3fac7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -619,5 +619,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/Spigot-Server-Patches/0237-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch b/Spigot-Server-Patches/0238-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
similarity index 95%
rename from Spigot-Server-Patches/0237-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
rename to Spigot-Server-Patches/0238-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
index 0d5be906e2..d627b03e78 100644
--- a/Spigot-Server-Patches/0237-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
+++ b/Spigot-Server-Patches/0238-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
@@ -1,4 +1,4 @@
-From 5e67496180189eb198ca1edb924a62679000c812 Mon Sep 17 00:00:00 2001
+From 453c9662414093f38b5608b9945a423e1eafa7a8 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
diff --git a/Spigot-Server-Patches/0238-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/Spigot-Server-Patches/0239-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
similarity index 99%
rename from Spigot-Server-Patches/0238-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
rename to Spigot-Server-Patches/0239-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
index b05fa2b63f..2b5ab6b8ba 100644
--- a/Spigot-Server-Patches/0238-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
+++ b/Spigot-Server-Patches/0239-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
@@ -1,4 +1,4 @@
-From 71dac4714cff48c23f3eed560c4043fddad86f3a Mon Sep 17 00:00:00 2001
+From cc53806909130715b4523ff21e3a0fbabd12fec9 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
diff --git a/Spigot-Server-Patches/0239-PlayerReadyArrowEvent.patch b/Spigot-Server-Patches/0240-PlayerReadyArrowEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0239-PlayerReadyArrowEvent.patch
rename to Spigot-Server-Patches/0240-PlayerReadyArrowEvent.patch
index 69985053f2..ae402542d8 100644
--- a/Spigot-Server-Patches/0239-PlayerReadyArrowEvent.patch
+++ b/Spigot-Server-Patches/0240-PlayerReadyArrowEvent.patch
@@ -1,4 +1,4 @@
-From e67acc61108ac7a18c19e8cec280c96112f05082 Mon Sep 17 00:00:00 2001
+From cb99386240e413850d0fe825677bea789d4c2ed9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 18 Jun 2018 01:12:53 -0400
 Subject: [PATCH] PlayerReadyArrowEvent
diff --git a/Spigot-Server-Patches/0240-Fire-EntityShootBowEvent-for-Illusioner.patch b/Spigot-Server-Patches/0241-Fire-EntityShootBowEvent-for-Illusioner.patch
similarity index 95%
rename from Spigot-Server-Patches/0240-Fire-EntityShootBowEvent-for-Illusioner.patch
rename to Spigot-Server-Patches/0241-Fire-EntityShootBowEvent-for-Illusioner.patch
index 5a04da1b00..b84ef37300 100644
--- a/Spigot-Server-Patches/0240-Fire-EntityShootBowEvent-for-Illusioner.patch
+++ b/Spigot-Server-Patches/0241-Fire-EntityShootBowEvent-for-Illusioner.patch
@@ -1,4 +1,4 @@
-From 88310538f1bb07800c053eced66ec713d4b9bd40 Mon Sep 17 00:00:00 2001
+From c128a3620a1bc6a88369bee577338c70c39b5377 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/Spigot-Server-Patches/0241-Implement-EntityKnockbackByEntityEvent.patch b/Spigot-Server-Patches/0242-Implement-EntityKnockbackByEntityEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0241-Implement-EntityKnockbackByEntityEvent.patch
rename to Spigot-Server-Patches/0242-Implement-EntityKnockbackByEntityEvent.patch
index 98086a347f..480df8b537 100644
--- a/Spigot-Server-Patches/0241-Implement-EntityKnockbackByEntityEvent.patch
+++ b/Spigot-Server-Patches/0242-Implement-EntityKnockbackByEntityEvent.patch
@@ -1,4 +1,4 @@
-From db219566c720e58261a6b9ef8c8f2b15eda1f7f8 Mon Sep 17 00:00:00 2001
+From 21935368bd8a3d339ffe0fcf660317289cfbc511 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 be60f35de..6faed231a 100644
+index c22e8bd17..92b284099 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1424,6 +1424,16 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0242-Expand-Explosions-API.patch b/Spigot-Server-Patches/0243-Expand-Explosions-API.patch
similarity index 92%
rename from Spigot-Server-Patches/0242-Expand-Explosions-API.patch
rename to Spigot-Server-Patches/0243-Expand-Explosions-API.patch
index 9dfbc9d6f1..73ec9e98ac 100644
--- a/Spigot-Server-Patches/0242-Expand-Explosions-API.patch
+++ b/Spigot-Server-Patches/0243-Expand-Explosions-API.patch
@@ -1,4 +1,4 @@
-From a83e67078718ca23e078c070d46b1ece98d53db4 Mon Sep 17 00:00:00 2001
+From 8ff5fe014acc20e4991e9d007dc6cb2fa2d34a2d 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 8fa9346cfe..83a8f083af 100644
+index 8fa9346cf..83a8f083a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -753,6 +753,11 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0243-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-Server-Patches/0244-LivingEntity-Hand-Raised-Item-Use-API.patch
similarity index 94%
rename from Spigot-Server-Patches/0243-LivingEntity-Hand-Raised-Item-Use-API.patch
rename to Spigot-Server-Patches/0244-LivingEntity-Hand-Raised-Item-Use-API.patch
index e10ab939a6..4a59f10c22 100644
--- a/Spigot-Server-Patches/0243-LivingEntity-Hand-Raised-Item-Use-API.patch
+++ b/Spigot-Server-Patches/0244-LivingEntity-Hand-Raised-Item-Use-API.patch
@@ -1,4 +1,4 @@
-From 895511bc00fe6fe7784bf51e57d5a2a572514328 Mon Sep 17 00:00:00 2001
+From cfda4f58d04c2519ee0280283843c7f0680e8e0f 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
@@ -6,7 +6,7 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API
 How long an entity has raised hands to charge an attack or use an item
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 6faed231a5..d52c0d81dc 100644
+index 92b284099..165e28992 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -109,7 +109,7 @@ public abstract class EntityLiving extends Entity {
@@ -32,7 +32,7 @@ index 6faed231a5..d52c0d81dc 100644
          return this.isHandRaised() ? this.activeItem.k() - this.dm() : 0;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 513b3fac7f..8dea7d36b6 100644
+index 513b3fac7..8dea7d36b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -629,5 +629,25 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/Spigot-Server-Patches/0244-RangedEntity-API.patch b/Spigot-Server-Patches/0245-RangedEntity-API.patch
similarity index 99%
rename from Spigot-Server-Patches/0244-RangedEntity-API.patch
rename to Spigot-Server-Patches/0245-RangedEntity-API.patch
index eaf5ed5ab3..eb4daaf453 100644
--- a/Spigot-Server-Patches/0244-RangedEntity-API.patch
+++ b/Spigot-Server-Patches/0245-RangedEntity-API.patch
@@ -1,4 +1,4 @@
-From 76593e2fed619b553868c22a7b48298380c3dbde Mon Sep 17 00:00:00 2001
+From c2649f2a1cb5d9cf649e2b903088b67974cc1437 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
diff --git a/Spigot-Server-Patches/0245-Add-config-to-disable-ender-dragon-legacy-check.patch b/Spigot-Server-Patches/0246-Add-config-to-disable-ender-dragon-legacy-check.patch
similarity index 97%
rename from Spigot-Server-Patches/0245-Add-config-to-disable-ender-dragon-legacy-check.patch
rename to Spigot-Server-Patches/0246-Add-config-to-disable-ender-dragon-legacy-check.patch
index dbb20fbf43..d97c7213e7 100644
--- a/Spigot-Server-Patches/0245-Add-config-to-disable-ender-dragon-legacy-check.patch
+++ b/Spigot-Server-Patches/0246-Add-config-to-disable-ender-dragon-legacy-check.patch
@@ -1,4 +1,4 @@
-From 03e6d66ec19560e069e220b1b272dc1287ffcbe3 Mon Sep 17 00:00:00 2001
+From 0365c9c7e44ea4326f46d4cf77d2fe11f9586010 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
diff --git a/Spigot-Server-Patches/0246-Implement-World.getEntity-UUID-API.patch b/Spigot-Server-Patches/0247-Implement-World.getEntity-UUID-API.patch
similarity index 89%
rename from Spigot-Server-Patches/0246-Implement-World.getEntity-UUID-API.patch
rename to Spigot-Server-Patches/0247-Implement-World.getEntity-UUID-API.patch
index 1dec0db4f0..05e3ebc14f 100644
--- a/Spigot-Server-Patches/0246-Implement-World.getEntity-UUID-API.patch
+++ b/Spigot-Server-Patches/0247-Implement-World.getEntity-UUID-API.patch
@@ -1,11 +1,11 @@
-From 327a00bc3afedc3657767dbda2e569561225f2d4 Mon Sep 17 00:00:00 2001
+From 4d9a417496995c21613e5e027553b0354bf120a5 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 83a8f083af..4c67f071b1 100644
+index 83a8f083a..4c67f071b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1107,6 +1107,15 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0247-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0248-InventoryCloseEvent-Reason-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0247-InventoryCloseEvent-Reason-API.patch
rename to Spigot-Server-Patches/0248-InventoryCloseEvent-Reason-API.patch
index 74dae4e410..2f5875a341 100644
--- a/Spigot-Server-Patches/0247-InventoryCloseEvent-Reason-API.patch
+++ b/Spigot-Server-Patches/0248-InventoryCloseEvent-Reason-API.patch
@@ -1,4 +1,4 @@
-From 1b3618da7548f0296c4f8d84bab2dd7344673248 Mon Sep 17 00:00:00 2001
+From fb58f2953744c93f4c74193e543b562fb27add66 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/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index f5dac50826..d1a7a873b9 100644
+index f5dac5082..d1a7a873b 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -149,7 +149,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -34,7 +34,7 @@ index f5dac50826..d1a7a873b9 100644
          this.activeContainer = this.defaultContainer;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index c3026530d2..0a575456a1 100644
+index c3026530d..0a575456a 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -360,7 +360,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -88,7 +88,7 @@ index c3026530d2..0a575456a1 100644
          this.m();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 8be09b1d03..0385eced64 100644
+index 8be09b1d0..0385eced6 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2050,7 +2050,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -101,7 +101,7 @@ index 8be09b1d03..0385eced64 100644
          this.player.m();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 5ac4a7c284..006f7b8b9f 100644
+index 5ac4a7c28..006f7b8b9 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -402,7 +402,7 @@ public abstract class PlayerList {
@@ -114,7 +114,7 @@ index 5ac4a7c284..006f7b8b9f 100644
          PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(cserver.getPlayer(entityplayer), "\u00A7e" + entityplayer.getName() + " left the game");
          cserver.getPluginManager().callEvent(playerQuitEvent);
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 8bc0a8cca8..067379252d 100644
+index 8bc0a8cca..067379252 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -981,7 +981,7 @@ public class WorldServer extends World {
@@ -136,7 +136,7 @@ index 8bc0a8cca8..067379252d 100644
                      }
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 60f839056b..948eef8689 100644
+index 60f839056..948eef868 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -614,8 +614,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -155,7 +155,7 @@ index 60f839056b..948eef8689 100644
      @Override
      public boolean isBlocking() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index be7c5d1747..ba60ece457 100644
+index be7c5d174..ba60ece45 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -771,7 +771,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -168,7 +168,7 @@ index be7c5d1747..ba60ece457 100644
  
          // Check if the fromWorld and toWorld are the same.
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index ef62edec48..dc83a90a4d 100644
+index ef62edec4..dc83a90a4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1241,8 +1241,19 @@ public class CraftEventFactory {
diff --git a/Spigot-Server-Patches/0248-Configurable-Bed-Search-Radius.patch b/Spigot-Server-Patches/0249-Configurable-Bed-Search-Radius.patch
similarity index 97%
rename from Spigot-Server-Patches/0248-Configurable-Bed-Search-Radius.patch
rename to Spigot-Server-Patches/0249-Configurable-Bed-Search-Radius.patch
index 205643462b..ee99b33f3f 100644
--- a/Spigot-Server-Patches/0248-Configurable-Bed-Search-Radius.patch
+++ b/Spigot-Server-Patches/0249-Configurable-Bed-Search-Radius.patch
@@ -1,4 +1,4 @@
-From 41222eb065b39b4d29971c7d1b570ebca24305c0 Mon Sep 17 00:00:00 2001
+From d3c304ba037b964dd8e7d7c60aceccf5cd941a7c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 15:22:06 -0400
 Subject: [PATCH] Configurable Bed Search Radius
@@ -10,7 +10,7 @@ player at their bed should it of became obstructed.
 Defaults to vanilla 1.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 3294fbbeaf..83e54cb904 100644
+index 3294fbbea..83e54cb90 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -375,4 +375,15 @@ public class PaperWorldConfig {
@@ -30,7 +30,7 @@ index 3294fbbeaf..83e54cb904 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockBed.java b/src/main/java/net/minecraft/server/BlockBed.java
-index 3ef19c0c2e..07e530666e 100644
+index 3ef19c0c2..07e530666 100644
 --- a/src/main/java/net/minecraft/server/BlockBed.java
 +++ b/src/main/java/net/minecraft/server/BlockBed.java
 @@ -171,6 +171,58 @@ public class BlockBed extends BlockFacingHorizontal implements ITileEntity {
diff --git a/Spigot-Server-Patches/0249-Vex-getSummoner-API.patch b/Spigot-Server-Patches/0250-Vex-getSummoner-API.patch
similarity index 92%
rename from Spigot-Server-Patches/0249-Vex-getSummoner-API.patch
rename to Spigot-Server-Patches/0250-Vex-getSummoner-API.patch
index 8fec71eeba..5f6b6804f3 100644
--- a/Spigot-Server-Patches/0249-Vex-getSummoner-API.patch
+++ b/Spigot-Server-Patches/0250-Vex-getSummoner-API.patch
@@ -1,4 +1,4 @@
-From 031e2b3a398bd8d0bb64f2b939bf29b870492469 Mon Sep 17 00:00:00 2001
+From aca49231eae17fd7b76f6e694dfd77a9a17a9cdb 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 ecfc057a18..83e022c91b 100644
+index ecfc057a1..83e022c91 100644
 --- a/src/main/java/net/minecraft/server/EntityVex.java
 +++ b/src/main/java/net/minecraft/server/EntityVex.java
 @@ -92,6 +92,7 @@ public class EntityVex extends EntityMonster {
@@ -18,7 +18,7 @@ index ecfc057a18..83e022c91b 100644
          return this.c;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
-index 737a37b6fe..169c951ec3 100644
+index 737a37b6f..169c951ec 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
 @@ -1,8 +1,10 @@
diff --git a/Spigot-Server-Patches/0250-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/Spigot-Server-Patches/0251-Refresh-player-inventory-when-cancelling-PlayerInter.patch
similarity index 92%
rename from Spigot-Server-Patches/0250-Refresh-player-inventory-when-cancelling-PlayerInter.patch
rename to Spigot-Server-Patches/0251-Refresh-player-inventory-when-cancelling-PlayerInter.patch
index 040c13e5e7..94beabb01f 100644
--- a/Spigot-Server-Patches/0250-Refresh-player-inventory-when-cancelling-PlayerInter.patch
+++ b/Spigot-Server-Patches/0251-Refresh-player-inventory-when-cancelling-PlayerInter.patch
@@ -1,4 +1,4 @@
-From f3e0cb55c655bae2f08eefec86a03c00b2b0a865 Mon Sep 17 00:00:00 2001
+From f676d523fe518937a9057af3610a57a5e8fa119f Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Fri, 13 Jul 2018 14:54:43 +0200
 Subject: [PATCH] Refresh player inventory when cancelling
@@ -16,7 +16,7 @@ Refresh the player inventory when PlayerInteractEntityEvent is
 cancelled to avoid this problem.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 0385eced64..4c99a321b7 100644
+index 0385eced6..4c99a321b 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1964,6 +1964,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0251-Don-t-change-the-Entity-Random-seed-for-squids.patch b/Spigot-Server-Patches/0252-Don-t-change-the-Entity-Random-seed-for-squids.patch
similarity index 88%
rename from Spigot-Server-Patches/0251-Don-t-change-the-Entity-Random-seed-for-squids.patch
rename to Spigot-Server-Patches/0252-Don-t-change-the-Entity-Random-seed-for-squids.patch
index bd5390eeb2..c5d6a160c2 100644
--- a/Spigot-Server-Patches/0251-Don-t-change-the-Entity-Random-seed-for-squids.patch
+++ b/Spigot-Server-Patches/0252-Don-t-change-the-Entity-Random-seed-for-squids.patch
@@ -1,11 +1,11 @@
-From ae6b17a6485b10d0dee2b5e291f8a559abc9123a Mon Sep 17 00:00:00 2001
+From 5b0db2592123e745f32863009745fc7171e7d6d7 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 d5dff4b88c..77c0ed42f4 100644
+index d5dff4b88..77c0ed42f 100644
 --- a/src/main/java/net/minecraft/server/EntitySquid.java
 +++ b/src/main/java/net/minecraft/server/EntitySquid.java
 @@ -19,7 +19,7 @@ public class EntitySquid extends EntityWaterAnimal {
diff --git a/Spigot-Server-Patches/0252-Re-add-vanilla-entity-warnings-for-duplicates.patch b/Spigot-Server-Patches/0253-Re-add-vanilla-entity-warnings-for-duplicates.patch
similarity index 92%
rename from Spigot-Server-Patches/0252-Re-add-vanilla-entity-warnings-for-duplicates.patch
rename to Spigot-Server-Patches/0253-Re-add-vanilla-entity-warnings-for-duplicates.patch
index cc2ac5eb05..14f7ffacf7 100644
--- a/Spigot-Server-Patches/0252-Re-add-vanilla-entity-warnings-for-duplicates.patch
+++ b/Spigot-Server-Patches/0253-Re-add-vanilla-entity-warnings-for-duplicates.patch
@@ -1,4 +1,4 @@
-From 127bfea5a9352e569678cfff0289d97192b7134d Mon Sep 17 00:00:00 2001
+From a84f053e31b506b807cfbaa53efceccbe638e435 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 067379252d..bac458fa54 100644
+index 067379252..bac458fa5 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -966,7 +966,8 @@ public class WorldServer extends World {
diff --git a/Spigot-Server-Patches/0253-Avoid-item-merge-if-stack-size-above-max-stack-size.patch b/Spigot-Server-Patches/0254-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
similarity index 90%
rename from Spigot-Server-Patches/0253-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
rename to Spigot-Server-Patches/0254-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
index cc972328a7..af22dfef58 100644
--- a/Spigot-Server-Patches/0253-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
+++ b/Spigot-Server-Patches/0254-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
@@ -1,11 +1,11 @@
-From b4e4fa6908e7d18c22bb6975982b0abb7dac2b3e Mon Sep 17 00:00:00 2001
+From 4ec3c92456d00800b0fc1434d78792ea0666c62a 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 bda5ea4632..ddd1f63073 100644
+index bda5ea463..ddd1f6307 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -168,6 +168,10 @@ public class EntityItem extends Entity {
diff --git a/Spigot-Server-Patches/0254-Use-asynchronous-Log4j-2-loggers.patch b/Spigot-Server-Patches/0255-Use-asynchronous-Log4j-2-loggers.patch
similarity index 88%
rename from Spigot-Server-Patches/0254-Use-asynchronous-Log4j-2-loggers.patch
rename to Spigot-Server-Patches/0255-Use-asynchronous-Log4j-2-loggers.patch
index caaab158cd..35ce8109c7 100644
--- a/Spigot-Server-Patches/0254-Use-asynchronous-Log4j-2-loggers.patch
+++ b/Spigot-Server-Patches/0255-Use-asynchronous-Log4j-2-loggers.patch
@@ -1,11 +1,11 @@
-From 795db2797f8881fc60d2c1b4056fe909dfe75074 Mon Sep 17 00:00:00 2001
+From 5688621e649d0231db63467f9ff9cdadc2435428 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 3d2065fd75..e01d95f17d 100644
+index 3d2065fd7..e01d95f17 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -74,6 +74,13 @@
@@ -24,7 +24,7 @@ index 3d2065fd75..e01d95f17d 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 @@
diff --git a/Spigot-Server-Patches/0255-add-more-information-to-Entity.toString.patch b/Spigot-Server-Patches/0256-add-more-information-to-Entity.toString.patch
similarity index 93%
rename from Spigot-Server-Patches/0255-add-more-information-to-Entity.toString.patch
rename to Spigot-Server-Patches/0256-add-more-information-to-Entity.toString.patch
index 2bae26fd1a..fc7a500259 100644
--- a/Spigot-Server-Patches/0255-add-more-information-to-Entity.toString.patch
+++ b/Spigot-Server-Patches/0256-add-more-information-to-Entity.toString.patch
@@ -1,4 +1,4 @@
-From 00207f39a4fde43b78c2b2bac17875745a96ccbc Mon Sep 17 00:00:00 2001
+From 758511ff8ae95de6652894487450399dfaed7dfe Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 19 Jul 2018 01:13:28 -0400
 Subject: [PATCH] add more information to Entity.toString()
@@ -6,7 +6,7 @@ Subject: [PATCH] add more information to Entity.toString()
 UUID, ticks lived, valid, dead
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index d5d86d0f1d..4701cc46ef 100644
+index d5d86d0f1..4701cc46e 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2442,7 +2442,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/Spigot-Server-Patches/0256-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/Spigot-Server-Patches/0257-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
similarity index 96%
rename from Spigot-Server-Patches/0256-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
rename to Spigot-Server-Patches/0257-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
index 32e1083c85..ea030281a2 100644
--- a/Spigot-Server-Patches/0256-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
+++ b/Spigot-Server-Patches/0257-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
@@ -1,4 +1,4 @@
-From bfc9c19acdc9fbe4f30d639349845ba52d5bb8d2 Mon Sep 17 00:00:00 2001
+From e1ee4c339a50f702de172ea2f2215f3595cc4b14 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 4701cc46ef..41559d3baf 100644
+index 4701cc46e..41559d3ba 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -75,6 +75,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -19,7 +19,7 @@ index 4701cc46ef..41559d3baf 100644
          if (bukkitEntity == null) {
              bukkitEntity = CraftEntity.getEntity(world.getServer(), this);
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index ed9e2e3e18..047d6df9c1 100644
+index ed9e2e3e1..047d6df9c 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -855,6 +855,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -40,7 +40,7 @@ index ed9e2e3e18..047d6df9c1 100644
  
      protected void g() {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index eed3fa615f..f93e3faae2 100644
+index eed3fa615..f93e3faae 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -68,6 +68,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
@@ -52,7 +52,7 @@ index eed3fa615f..f93e3faae2 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 bac458fa54..957ca12e4a 100644
+index bac458fa5..957ca12e4 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -69,6 +69,9 @@ public class WorldServer extends World {
diff --git a/Spigot-Server-Patches/0257-EnderDragon-Events.patch b/Spigot-Server-Patches/0258-EnderDragon-Events.patch
similarity index 95%
rename from Spigot-Server-Patches/0257-EnderDragon-Events.patch
rename to Spigot-Server-Patches/0258-EnderDragon-Events.patch
index 9dd0182517..498c998eec 100644
--- a/Spigot-Server-Patches/0257-EnderDragon-Events.patch
+++ b/Spigot-Server-Patches/0258-EnderDragon-Events.patch
@@ -1,11 +1,11 @@
-From 6895d564dbcdf151c559133974d76b1c22552c24 Mon Sep 17 00:00:00 2001
+From dffbb87fbab5fa0d05c2dd60d7e56c6d36045ca9 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 4ab310cd6b..90f6d58ddd 100644
+index 4ab310cd6..90f6d58dd 100644
 --- a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
 +++ b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
 @@ -65,7 +65,9 @@ public class DragonControllerLandedFlame extends AbstractDragonControllerLanded
@@ -28,7 +28,7 @@ index 4ab310cd6b..90f6d58ddd 100644
      public void e() {
          if (this.d != null) {
 diff --git a/src/main/java/net/minecraft/server/DragonControllerStrafe.java b/src/main/java/net/minecraft/server/DragonControllerStrafe.java
-index b466605762..bf15964e78 100644
+index b46660576..bf15964e7 100644
 --- a/src/main/java/net/minecraft/server/DragonControllerStrafe.java
 +++ b/src/main/java/net/minecraft/server/DragonControllerStrafe.java
 @@ -68,7 +68,9 @@ public class DragonControllerStrafe extends AbstractDragonController {
@@ -42,7 +42,7 @@ index b466605762..bf15964e78 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 239be99c51..2195b83ce2 100644
+index 239be99c5..2195b83ce 100644
 --- a/src/main/java/net/minecraft/server/EntityDragonFireball.java
 +++ b/src/main/java/net/minecraft/server/EntityDragonFireball.java
 @@ -40,8 +40,10 @@ public class EntityDragonFireball extends EntityFireball {
diff --git a/Spigot-Server-Patches/0258-PlayerElytraBoostEvent.patch b/Spigot-Server-Patches/0259-PlayerElytraBoostEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0258-PlayerElytraBoostEvent.patch
rename to Spigot-Server-Patches/0259-PlayerElytraBoostEvent.patch
index aea4e37a13..f1eee276e8 100644
--- a/Spigot-Server-Patches/0258-PlayerElytraBoostEvent.patch
+++ b/Spigot-Server-Patches/0259-PlayerElytraBoostEvent.patch
@@ -1,11 +1,11 @@
-From 9383864ec9d2e19b7038d6e6b11b3b711a16e614 Mon Sep 17 00:00:00 2001
+From 5c9b1b12639ffaf18d5c904ca9c101195b9c955d 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 aea46ffae5..9e86ef4ce2 100644
+index aea46ffae..9e86ef4ce 100644
 --- a/src/main/java/net/minecraft/server/ItemFireworks.java
 +++ b/src/main/java/net/minecraft/server/ItemFireworks.java
 @@ -35,11 +35,16 @@ public class ItemFireworks extends Item {
diff --git a/Spigot-Server-Patches/0259-PlayerLaunchProjectileEvent.patch b/Spigot-Server-Patches/0260-PlayerLaunchProjectileEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0259-PlayerLaunchProjectileEvent.patch
rename to Spigot-Server-Patches/0260-PlayerLaunchProjectileEvent.patch
index b7ee7649d5..9008d4968a 100644
--- a/Spigot-Server-Patches/0259-PlayerLaunchProjectileEvent.patch
+++ b/Spigot-Server-Patches/0260-PlayerLaunchProjectileEvent.patch
@@ -1,11 +1,11 @@
-From 594478a4810ff512d5eb66427cc6648714a770d9 Mon Sep 17 00:00:00 2001
+From c974fc5c3fb82c035b04931c06d610ae425a3770 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 2bdb65bf87..f526af45fb 100644
+index 2bdb65bf8..f526af45f 100644
 --- a/src/main/java/net/minecraft/server/ItemEgg.java
 +++ b/src/main/java/net/minecraft/server/ItemEgg.java
 @@ -10,17 +10,35 @@ public class ItemEgg extends Item {
@@ -46,7 +46,7 @@ index 2bdb65bf87..f526af45fb 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 eb5f62dec2..e8e52d726e 100644
+index eb5f62dec..e8e52d726 100644
 --- a/src/main/java/net/minecraft/server/ItemEnderPearl.java
 +++ b/src/main/java/net/minecraft/server/ItemEnderPearl.java
 @@ -16,7 +16,19 @@ public class ItemEnderPearl extends Item {
@@ -94,7 +94,7 @@ index eb5f62dec2..e8e52d726e 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 35f842ede5..eb626a6f05 100644
+index 35f842ede..eb626a6f0 100644
 --- a/src/main/java/net/minecraft/server/ItemExpBottle.java
 +++ b/src/main/java/net/minecraft/server/ItemExpBottle.java
 @@ -9,18 +9,35 @@ public class ItemExpBottle extends Item {
@@ -136,7 +136,7 @@ index 35f842ede5..eb626a6f05 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 e3683bdaef..f3ad1cd6d3 100644
+index e3683bdae..f3ad1cd6d 100644
 --- a/src/main/java/net/minecraft/server/ItemLingeringPotion.java
 +++ b/src/main/java/net/minecraft/server/ItemLingeringPotion.java
 @@ -9,15 +9,40 @@ public class ItemLingeringPotion extends ItemPotion {
@@ -182,7 +182,7 @@ index e3683bdaef..f3ad1cd6d3 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 624989dd7b..c119785b78 100644
+index 624989dd7..c119785b7 100644
 --- a/src/main/java/net/minecraft/server/ItemSnowball.java
 +++ b/src/main/java/net/minecraft/server/ItemSnowball.java
 @@ -23,15 +23,23 @@ public class ItemSnowball extends Item {
@@ -215,7 +215,7 @@ index 624989dd7b..c119785b78 100644
          // CraftBukkit end
  
 diff --git a/src/main/java/net/minecraft/server/ItemSplashPotion.java b/src/main/java/net/minecraft/server/ItemSplashPotion.java
-index e267e43fe5..fa6d627db4 100644
+index e267e43fe..fa6d627db 100644
 --- a/src/main/java/net/minecraft/server/ItemSplashPotion.java
 +++ b/src/main/java/net/minecraft/server/ItemSplashPotion.java
 @@ -9,15 +9,39 @@ public class ItemSplashPotion extends ItemPotion {
diff --git a/Spigot-Server-Patches/0260-Speedup-BlockPos-by-fixing-inlining.patch b/Spigot-Server-Patches/0261-Speedup-BlockPos-by-fixing-inlining.patch
similarity index 98%
rename from Spigot-Server-Patches/0260-Speedup-BlockPos-by-fixing-inlining.patch
rename to Spigot-Server-Patches/0261-Speedup-BlockPos-by-fixing-inlining.patch
index 3e4ccaeb51..b18e931a08 100644
--- a/Spigot-Server-Patches/0260-Speedup-BlockPos-by-fixing-inlining.patch
+++ b/Spigot-Server-Patches/0261-Speedup-BlockPos-by-fixing-inlining.patch
@@ -1,4 +1,4 @@
-From b5a51584adeb6c21dd7e08e08deaf7a1caa6727e Mon Sep 17 00:00:00 2001
+From e88db1b4370e9f8c046e3c8f72329be516a7728e 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 7cb46d7a9c..e96428bb2b 100644
+index 7cb46d7a9..e96428bb2 100644
 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java
 @@ -7,22 +7,22 @@ import javax.annotation.concurrent.Immutable;
@@ -101,7 +101,7 @@ index 7cb46d7a9c..e96428bb2b 100644
          return (int) (f + f1 + f2);
      }
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 64700b97c0..a5e5a4ebae 100644
+index 64700b97c..a5e5a4eba 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -335,11 +335,12 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali
diff --git a/Spigot-Server-Patches/0261-Don-t-save-Proto-Chunks.patch b/Spigot-Server-Patches/0262-Don-t-save-Proto-Chunks.patch
similarity index 91%
rename from Spigot-Server-Patches/0261-Don-t-save-Proto-Chunks.patch
rename to Spigot-Server-Patches/0262-Don-t-save-Proto-Chunks.patch
index 1b6e7550cf..a24c3832f1 100644
--- a/Spigot-Server-Patches/0261-Don-t-save-Proto-Chunks.patch
+++ b/Spigot-Server-Patches/0262-Don-t-save-Proto-Chunks.patch
@@ -1,4 +1,4 @@
-From 8bbb87374ea587a7f8569a0fc0cf6f1c976f72c6 Mon Sep 17 00:00:00 2001
+From 1b993eb9d127808b6c024b3abed5275dc6e2d2a4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 22 Jul 2018 21:21:41 -0400
 Subject: [PATCH] Don't save Proto Chunks
@@ -8,7 +8,7 @@ the loadChunk method refuses to acknoledge they exists, and will restart
 a new chunk generation process to begin with, so saving them serves no benefit.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 047d6df9c1..21c4b56427 100644
+index 047d6df9c..21c4b5642 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -570,6 +570,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
diff --git a/Spigot-Server-Patches/0262-Optimize-RegistryID.c.patch b/Spigot-Server-Patches/0263-Optimize-RegistryID.c.patch
similarity index 95%
rename from Spigot-Server-Patches/0262-Optimize-RegistryID.c.patch
rename to Spigot-Server-Patches/0263-Optimize-RegistryID.c.patch
index 786dbab496..7a225643f2 100644
--- a/Spigot-Server-Patches/0262-Optimize-RegistryID.c.patch
+++ b/Spigot-Server-Patches/0263-Optimize-RegistryID.c.patch
@@ -1,4 +1,4 @@
-From 72176dd7071a4145bdb6a9f0eb962a0f96a14e9c Mon Sep 17 00:00:00 2001
+From db1163c8e5d2121e3ae5b048a1d68a66290344a4 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 e15d286710..e8a48b9a4c 100644
+index e15d28671..e8a48b9a4 100644
 --- a/src/main/java/net/minecraft/server/RegistryID.java
 +++ b/src/main/java/net/minecraft/server/RegistryID.java
 @@ -14,12 +14,14 @@ public class RegistryID<K> implements Registry<K> {
diff --git a/Spigot-Server-Patches/0263-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/0264-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
similarity index 92%
rename from Spigot-Server-Patches/0263-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
rename to Spigot-Server-Patches/0264-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
index c6d061dd13..1086093e5e 100644
--- a/Spigot-Server-Patches/0263-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/Spigot-Server-Patches/0264-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
@@ -1,11 +1,11 @@
-From 01aa2958b9b145420ae4c3f8e52eb6de7e8322c6 Mon Sep 17 00:00:00 2001
+From dc6e06893ec22da27116d0a1bc7a7b0d6bff1835 Mon Sep 17 00:00:00 2001
 From: Hugo Manrique <hugmanrique@gmail.com>
 Date: Mon, 23 Jul 2018 12:57:39 +0200
 Subject: [PATCH] Option to prevent armor stands from doing entity lookups
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 83e54cb904..f06bb3ae19 100644
+index 83e54cb90..f06bb3ae1 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -326,6 +326,11 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index 83e54cb904..f06bb3ae19 100644
      private void maxEntityCollision() {
          maxCollisionsPerEntity = getInt( "max-entity-collisions", this.spigotConfig.getInt("max-entity-collisions", 8) );
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f93e3faae2..1f2e2cd873 100644
+index f93e3faae..1f2e2cd87 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -877,6 +877,14 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
diff --git a/Spigot-Server-Patches/0264-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0265-Vanished-players-don-t-have-rights.patch
similarity index 95%
rename from Spigot-Server-Patches/0264-Vanished-players-don-t-have-rights.patch
rename to Spigot-Server-Patches/0265-Vanished-players-don-t-have-rights.patch
index e65ee3c3fe..f34db14ed4 100644
--- a/Spigot-Server-Patches/0264-Vanished-players-don-t-have-rights.patch
+++ b/Spigot-Server-Patches/0265-Vanished-players-don-t-have-rights.patch
@@ -1,11 +1,11 @@
-From b888645445f5dcb5604850e8540b19f5b0582f5e Mon Sep 17 00:00:00 2001
+From 103d45933aaf1353eddf3f3e984c2afaba1402df Mon Sep 17 00:00:00 2001
 From: Hugo Manrique <hugmanrique@gmail.com>
 Date: Mon, 23 Jul 2018 14:22:26 +0200
 Subject: [PATCH] Vanished players don't have rights
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 54d025bf7d..e3b1ebe629 100644
+index 41559d3ba..7f6e20e4b 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -97,7 +97,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -18,7 +18,7 @@ index 54d025bf7d..e3b1ebe629 100644
      protected int j;
      private Entity vehicle;
 diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
-index ee22bb0387..e5a013ffd2 100644
+index ee22bb038..e5a013ffd 100644
 --- a/src/main/java/net/minecraft/server/IEntityAccess.java
 +++ b/src/main/java/net/minecraft/server/IEntityAccess.java
 @@ -22,9 +22,18 @@ public interface IEntityAccess {
@@ -41,7 +41,7 @@ index ee22bb0387..e5a013ffd2 100644
              return VoxelShapes.c(voxelshape, VoxelShapes.a(entity1.getBoundingBox()), OperatorBoolean.AND);
          });
 diff --git a/src/main/java/net/minecraft/server/IWorldReader.java b/src/main/java/net/minecraft/server/IWorldReader.java
-index 17dac8dfa4..5b422eaa2d 100644
+index 17dac8dfa..5b422eaa2 100644
 --- a/src/main/java/net/minecraft/server/IWorldReader.java
 +++ b/src/main/java/net/minecraft/server/IWorldReader.java
 @@ -84,7 +84,12 @@ public interface IWorldReader extends IIBlockAccess {
@@ -58,7 +58,7 @@ index 17dac8dfa4..5b422eaa2d 100644
  
          return voxelshape.isEmpty() || this.a((Entity) null, voxelshape.a((double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ()));
 diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java
-index 59b1e6ce2e..b90cc6652b 100644
+index 59b1e6ce2..b90cc6652 100644
 --- a/src/main/java/net/minecraft/server/ItemBlock.java
 +++ b/src/main/java/net/minecraft/server/ItemBlock.java
 @@ -126,7 +126,8 @@ public class ItemBlock extends Item {
@@ -72,7 +72,7 @@ index 59b1e6ce2e..b90cc6652b 100644
  
          BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(blockactioncontext.getWorld(), blockactioncontext.getClickPosition()), player, CraftBlockData.fromData(iblockdata), defaultReturn);
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index dc83a90a4d..063ad48ce7 100644
+index dc83a90a4..063ad48ce 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1122,6 +1122,14 @@ public class CraftEventFactory {
diff --git a/Spigot-Server-Patches/0265-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch b/Spigot-Server-Patches/0266-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
similarity index 89%
rename from Spigot-Server-Patches/0265-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
rename to Spigot-Server-Patches/0266-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
index db97521b53..f240d9816c 100644
--- a/Spigot-Server-Patches/0265-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
+++ b/Spigot-Server-Patches/0266-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
@@ -1,4 +1,4 @@
-From 8695afeaff8a60bc42ea5aca6cf889515b0f9a43 Mon Sep 17 00:00:00 2001
+From 98faf4aceec854a6ea132d828ca8dd1a0c7c0707 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 7bd5a0a8cd..f2ca391bfe 100644
+index 7bd5a0a8c..f2ca391bf 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -416,6 +416,7 @@ public class Chunk implements IChunkAccess {
diff --git a/Spigot-Server-Patches/0266-Add-some-Debug-to-Chunk-Entity-slices.patch b/Spigot-Server-Patches/0267-Add-some-Debug-to-Chunk-Entity-slices.patch
similarity index 95%
rename from Spigot-Server-Patches/0266-Add-some-Debug-to-Chunk-Entity-slices.patch
rename to Spigot-Server-Patches/0267-Add-some-Debug-to-Chunk-Entity-slices.patch
index 15bf28ac39..801c0e8a25 100644
--- a/Spigot-Server-Patches/0266-Add-some-Debug-to-Chunk-Entity-slices.patch
+++ b/Spigot-Server-Patches/0267-Add-some-Debug-to-Chunk-Entity-slices.patch
@@ -1,4 +1,4 @@
-From 2797bf80829c701816bee734e542f0ea1021bd25 Mon Sep 17 00:00:00 2001
+From 094bd1612b657efc827a240c88378f6a1948db2d 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 f2ca391bfe..2cb3e36965 100644
+index f2ca391bf..2cb3e3696 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -408,6 +408,25 @@ public class Chunk implements IChunkAccess {
@@ -57,7 +57,7 @@ index f2ca391bfe..2cb3e36965 100644
              return;
          }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 7f6e20e4b9..a273bec565 100644
+index 7f6e20e4b..a273bec56 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -67,6 +67,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/Spigot-Server-Patches/0267-EntityTransformedEvent.patch b/Spigot-Server-Patches/0268-EntityTransformedEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0267-EntityTransformedEvent.patch
rename to Spigot-Server-Patches/0268-EntityTransformedEvent.patch
index 04bb3ae2c8..c33967adf1 100644
--- a/Spigot-Server-Patches/0267-EntityTransformedEvent.patch
+++ b/Spigot-Server-Patches/0268-EntityTransformedEvent.patch
@@ -1,11 +1,11 @@
-From 842e70df880203be20a474b4d34105c5e47ec387 Mon Sep 17 00:00:00 2001
+From b1cc6bcaac49728af30e6c3cbd5752f816bc276f Mon Sep 17 00:00:00 2001
 From: Anthony MacAllister <anthonymmacallister@gmail.com>
 Date: Thu, 26 Jul 2018 15:30:03 -0400
 Subject: [PATCH] EntityTransformedEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java
-index bb3493c14f..de787d8614 100644
+index bb3493c14..de787d861 100644
 --- a/src/main/java/net/minecraft/server/EntityMushroomCow.java
 +++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java
 @@ -101,6 +101,7 @@ public class EntityMushroomCow extends EntityCow {
@@ -17,7 +17,7 @@ index bb3493c14f..de787d8614 100644
  
                      this.die(); // CraftBukkit - from above
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 53e2266a99..f2b46d4e3b 100644
+index 53e2266a9..f2b46d4e3 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -596,6 +596,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -29,7 +29,7 @@ index 53e2266a99..f2b46d4e3b 100644
          // CraftBukkit end
          this.die();
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 4cb305ff28..171c1ae4ad 100644
+index 4cb305ff2..171c1ae4a 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -247,6 +247,7 @@ public class EntityZombie extends EntityMonster {
@@ -49,7 +49,7 @@ index 4cb305ff28..171c1ae4ad 100644
              this.world.addEntity(entityzombievillager, CreatureSpawnEvent.SpawnReason.INFECTION); // CraftBukkit - add SpawnReason
              // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java
-index b5d0792332..a857d70e98 100644
+index 2c8f489dd..5e9efd795 100644
 --- a/src/main/java/net/minecraft/server/EntityZombieVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java
 @@ -157,6 +157,7 @@ public class EntityZombieVillager extends EntityZombie implements VillagerDataHo
diff --git a/Spigot-Server-Patches/0268-SkeletonHorse-Additions.patch b/Spigot-Server-Patches/0269-SkeletonHorse-Additions.patch
similarity index 94%
rename from Spigot-Server-Patches/0268-SkeletonHorse-Additions.patch
rename to Spigot-Server-Patches/0269-SkeletonHorse-Additions.patch
index 05cdc7a332..e8e21464a7 100644
--- a/Spigot-Server-Patches/0268-SkeletonHorse-Additions.patch
+++ b/Spigot-Server-Patches/0269-SkeletonHorse-Additions.patch
@@ -1,11 +1,11 @@
-From 12804043aa8b6dbe1e09df215fdd14b4ce33b110 Mon Sep 17 00:00:00 2001
+From a9f9d0460f6d51811ea8adfc2398eb8613575f0c 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 9ac34dfa8c..b967264562 100644
+index 9ac34dfa8..b96726456 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
 @@ -6,7 +6,7 @@ public class EntityHorseSkeleton extends EntityHorseAbstract {
@@ -31,7 +31,7 @@ index 9ac34dfa8c..b967264562 100644
          if (flag != this.bK) {
              this.bK = flag;
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
-index 7b0a6f82fb..f093744136 100644
+index 7b0a6f82f..f09374413 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
 @@ -15,6 +15,7 @@ public class PathfinderGoalHorseTrap extends PathfinderGoal {
@@ -43,7 +43,7 @@ index 7b0a6f82fb..f093744136 100644
  
          this.a.r(false);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java
-index e822c2200d..2a7d1d4ec2 100644
+index e822c2200..2a7d1d4ec 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java
 @@ -26,4 +26,26 @@ public class CraftSkeletonHorse extends CraftAbstractHorse implements SkeletonHo
diff --git a/Spigot-Server-Patches/0269-Prevent-Saving-Bad-entities-to-chunks.patch b/Spigot-Server-Patches/0270-Prevent-Saving-Bad-entities-to-chunks.patch
similarity index 96%
rename from Spigot-Server-Patches/0269-Prevent-Saving-Bad-entities-to-chunks.patch
rename to Spigot-Server-Patches/0270-Prevent-Saving-Bad-entities-to-chunks.patch
index 1fc1aeba37..b5c4b27f10 100644
--- a/Spigot-Server-Patches/0269-Prevent-Saving-Bad-entities-to-chunks.patch
+++ b/Spigot-Server-Patches/0270-Prevent-Saving-Bad-entities-to-chunks.patch
@@ -1,4 +1,4 @@
-From 491ddba93727b3dcf83e066b54dd33d9759adabb Mon Sep 17 00:00:00 2001
+From 46aaf3409c3fd5b6b7e363cb71eba5c3e27eb8f3 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 2b8148fbda..9038d17fde 100644
+index 2b8148fbd..9038d17fd 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -332,6 +332,7 @@ public class ChunkRegionLoader {
diff --git a/Spigot-Server-Patches/0270-Don-t-call-getItemMeta-on-hasItemMeta.patch b/Spigot-Server-Patches/0271-Don-t-call-getItemMeta-on-hasItemMeta.patch
similarity index 97%
rename from Spigot-Server-Patches/0270-Don-t-call-getItemMeta-on-hasItemMeta.patch
rename to Spigot-Server-Patches/0271-Don-t-call-getItemMeta-on-hasItemMeta.patch
index 82990a1685..f1755b4785 100644
--- a/Spigot-Server-Patches/0270-Don-t-call-getItemMeta-on-hasItemMeta.patch
+++ b/Spigot-Server-Patches/0271-Don-t-call-getItemMeta-on-hasItemMeta.patch
@@ -1,4 +1,4 @@
-From f0b06a840addc891ecede4b0a2d6c58b1ae85515 Mon Sep 17 00:00:00 2001
+From a9a10de78a820a47f07c2b62a31bc46ee49d0350 Mon Sep 17 00:00:00 2001
 From: Hugo Manrique <hugmanrique@gmail.com>
 Date: Thu, 26 Jul 2018 14:10:23 +0200
 Subject: [PATCH] Don't call getItemMeta on hasItemMeta
@@ -11,7 +11,7 @@ Returns true if getDamage() == 0 or has damage tag or other tag is set.
 Check the `ItemMetaTest#testTaggedButNotMeta` method to see how this method behaves.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 1609e6bbb6..8a6a135372 100644
+index 1609e6bbb..8a6a13537 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -536,7 +536,7 @@ public final class CraftItemStack extends ItemStack {
@@ -24,7 +24,7 @@ index 1609e6bbb6..8a6a135372 100644
  
      static boolean hasItemMeta(net.minecraft.server.ItemStack item) {
 diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
-index 2a0852675b..f30f743121 100644
+index 2a0852675..f30f74312 100644
 --- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
 +++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
 @@ -4,6 +4,7 @@ import static org.hamcrest.Matchers.*;
diff --git a/Spigot-Server-Patches/0271-Ignore-Dead-Entities-in-entityList-iteration.patch b/Spigot-Server-Patches/0272-Ignore-Dead-Entities-in-entityList-iteration.patch
similarity index 96%
rename from Spigot-Server-Patches/0271-Ignore-Dead-Entities-in-entityList-iteration.patch
rename to Spigot-Server-Patches/0272-Ignore-Dead-Entities-in-entityList-iteration.patch
index e08b7e97b4..9f6b5cc8ea 100644
--- a/Spigot-Server-Patches/0271-Ignore-Dead-Entities-in-entityList-iteration.patch
+++ b/Spigot-Server-Patches/0272-Ignore-Dead-Entities-in-entityList-iteration.patch
@@ -1,4 +1,4 @@
-From dafb3b539a1907f09d784e4f34f7c5dd3f3f5ab7 Mon Sep 17 00:00:00 2001
+From dff75715a97eaf90819ee1dce9d019d5057babd3 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 ce190d88d6..352a39dcb3 100644
+index ce190d88d..352a39dcb 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
 @@ -176,6 +176,7 @@ public class PaperCommand extends Command {
@@ -23,7 +23,7 @@ index ce190d88d6..352a39dcb3 100644
                      MutablePair<Integer, Map<ChunkCoordIntPair, Integer>> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap()));
                      ChunkCoordIntPair chunk = new ChunkCoordIntPair(e.getChunkX(), e.getChunkZ());
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 2cb3e36965..1ba855786c 100644
+index 2cb3e3696..1ba855786 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -657,6 +657,7 @@ public class Chunk implements IChunkAccess {
@@ -51,7 +51,7 @@ index 2cb3e36965..1ba855786c 100644
                  if (oclass.isInstance(t0) && t0.getBoundingBox().c(axisalignedbb) && (predicate == null || predicate.test(t0))) { // Spigot - instance check
                      list.add(t0);
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index a273bec565..1d8b420272 100644
+index a273bec56..1d8b42027 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -126,6 +126,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -63,7 +63,7 @@ index a273bec565..1d8b420272 100644
      private float av;
      private float aw;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 957ca12e4a..364f26b556 100644
+index 957ca12e4..364f26b55 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -836,6 +836,7 @@ public class WorldServer extends World {
@@ -91,7 +91,7 @@ index 957ca12e4a..364f26b556 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 4c67f071b1..1adced482b 100644
+index 4c67f071b..1adced482 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -846,6 +846,7 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0272-Provide-option-to-use-a-versioned-world-folder-for-t.patch b/Spigot-Server-Patches/0273-Provide-option-to-use-a-versioned-world-folder-for-t.patch
similarity index 98%
rename from Spigot-Server-Patches/0272-Provide-option-to-use-a-versioned-world-folder-for-t.patch
rename to Spigot-Server-Patches/0273-Provide-option-to-use-a-versioned-world-folder-for-t.patch
index aabb9ad8de..3a4e043fc6 100644
--- a/Spigot-Server-Patches/0272-Provide-option-to-use-a-versioned-world-folder-for-t.patch
+++ b/Spigot-Server-Patches/0273-Provide-option-to-use-a-versioned-world-folder-for-t.patch
@@ -1,4 +1,4 @@
-From cfb0efe00f65ee5d31eab9a11261f0481b22cdb1 Mon Sep 17 00:00:00 2001
+From d7b88cefa760decb99ba9b5e7f6fb8d9c28edf3f 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 a9b71c85d5..8c3880c838 100644
+index a9b71c85d..8c3880c83 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -13,6 +13,7 @@ import java.util.List;
@@ -59,7 +59,7 @@ index a9b71c85d5..8c3880c838 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index 6425b14f2c..74f102adf5 100644
+index 6425b14f2..74f102adf 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -10,13 +10,41 @@ import java.io.IOException;
@@ -163,7 +163,7 @@ index 6425b14f2c..74f102adf5 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
-index 350ac42d6b..eaae446861 100644
+index 350ac42d6..eaae44686 100644
 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
 +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
 @@ -31,6 +31,58 @@ public class WorldNBTStorage implements IPlayerFileData {
diff --git a/Spigot-Server-Patches/0273-MC-111480-Start-Entity-ID-s-at-1.patch b/Spigot-Server-Patches/0274-MC-111480-Start-Entity-ID-s-at-1.patch
similarity index 91%
rename from Spigot-Server-Patches/0273-MC-111480-Start-Entity-ID-s-at-1.patch
rename to Spigot-Server-Patches/0274-MC-111480-Start-Entity-ID-s-at-1.patch
index 6ce78531ed..b54c15824b 100644
--- a/Spigot-Server-Patches/0273-MC-111480-Start-Entity-ID-s-at-1.patch
+++ b/Spigot-Server-Patches/0274-MC-111480-Start-Entity-ID-s-at-1.patch
@@ -1,4 +1,4 @@
-From a42c3271ebaa68a39a5ab5f426f91de7a9528d9c Mon Sep 17 00:00:00 2001
+From 3d192f6936af9c31f5f49a0ed85d84d303a2d9c8 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 622160ff4e..e1c793aad5 100644
+index 1d8b42027..69087c7ef 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -92,7 +92,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/Spigot-Server-Patches/0274-Implement-Expanded-ArmorStand-API.patch b/Spigot-Server-Patches/0275-Implement-Expanded-ArmorStand-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0274-Implement-Expanded-ArmorStand-API.patch
rename to Spigot-Server-Patches/0275-Implement-Expanded-ArmorStand-API.patch
index 89631b4600..356f10a011 100644
--- a/Spigot-Server-Patches/0274-Implement-Expanded-ArmorStand-API.patch
+++ b/Spigot-Server-Patches/0275-Implement-Expanded-ArmorStand-API.patch
@@ -1,4 +1,4 @@
-From ac627e942e7d52d39d98ee92cbee0c16c853d60e Mon Sep 17 00:00:00 2001
+From d69d7ed327962ee55ab7648aa1a1f9fb8fc3b179 Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Thu, 26 Jul 2018 02:25:46 -0400
 Subject: [PATCH] Implement Expanded ArmorStand API
@@ -8,7 +8,7 @@ Add the following:
 - Enable/Disable slot interactions
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 916eaa7b90..00ff1e80de 100644
+index 06b274a71..96d9e8da8 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -36,7 +36,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -29,7 +29,7 @@ index 916eaa7b90..00ff1e80de 100644
          return (this.bE & 1 << enumitemslot.c()) != 0 || enumitemslot.a() == EnumItemSlot.Function.HAND && !this.hasArms();
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-index 124c3185bc..9f5c3b92e3 100644
+index 124c3185b..9f5c3b92e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 @@ -30,11 +30,13 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
diff --git a/Spigot-Server-Patches/0275-AnvilDamageEvent.patch b/Spigot-Server-Patches/0276-AnvilDamageEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0275-AnvilDamageEvent.patch
rename to Spigot-Server-Patches/0276-AnvilDamageEvent.patch
index 9905e2c8dc..0eb91f10b6 100644
--- a/Spigot-Server-Patches/0275-AnvilDamageEvent.patch
+++ b/Spigot-Server-Patches/0276-AnvilDamageEvent.patch
@@ -1,11 +1,11 @@
-From 4dc9d56762d4f1da8a2af8923e803f7e7f8bff73 Mon Sep 17 00:00:00 2001
+From ec6b054f08dae92ee154bd9759944984f1f7eeef 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 ada5cf982e..9e73e731b5 100644
+index ada5cf982..9e73e731b 100644
 --- a/src/main/java/net/minecraft/server/ContainerAnvil.java
 +++ b/src/main/java/net/minecraft/server/ContainerAnvil.java
 @@ -85,6 +85,16 @@ public class ContainerAnvil extends Container {
diff --git a/Spigot-Server-Patches/0276-Add-TNTPrimeEvent.patch b/Spigot-Server-Patches/0277-Add-TNTPrimeEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0276-Add-TNTPrimeEvent.patch
rename to Spigot-Server-Patches/0277-Add-TNTPrimeEvent.patch
index 2dae214c33..f6260060e9 100644
--- a/Spigot-Server-Patches/0276-Add-TNTPrimeEvent.patch
+++ b/Spigot-Server-Patches/0277-Add-TNTPrimeEvent.patch
@@ -1,11 +1,11 @@
-From 30f65ec54840c18c24d0a459f73d77de7cd6d3c4 Mon Sep 17 00:00:00 2001
+From 64f11268880afe697165bd8a80ad96496559374f Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Mon, 16 Jul 2018 00:05:05 +0300
 Subject: [PATCH] Add TNTPrimeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java
-index f769df41a6..087535caf9 100644
+index f769df41a..087535caf 100644
 --- a/src/main/java/net/minecraft/server/BlockFire.java
 +++ b/src/main/java/net/minecraft/server/BlockFire.java
 @@ -2,6 +2,7 @@ package net.minecraft.server;
@@ -39,7 +39,7 @@ index f769df41a6..087535caf9 100644
              }
          }
 diff --git a/src/main/java/net/minecraft/server/BlockTNT.java b/src/main/java/net/minecraft/server/BlockTNT.java
-index 013fa35241..7e534417ba 100644
+index 013fa3524..7e534417b 100644
 --- a/src/main/java/net/minecraft/server/BlockTNT.java
 +++ b/src/main/java/net/minecraft/server/BlockTNT.java
 @@ -1,6 +1,7 @@
@@ -114,7 +114,7 @@ index 013fa35241..7e534417ba 100644
                  world.a(blockposition, false);
              }
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index d42d4e83ef..9ada10cc73 100644
+index d42d4e83e..9ada10cc7 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -11,6 +11,7 @@ import org.bukkit.craftbukkit.block.CraftBlock;
diff --git a/Spigot-Server-Patches/0277-Break-up-and-make-tab-spam-limits-configurable.patch b/Spigot-Server-Patches/0278-Break-up-and-make-tab-spam-limits-configurable.patch
similarity index 97%
rename from Spigot-Server-Patches/0277-Break-up-and-make-tab-spam-limits-configurable.patch
rename to Spigot-Server-Patches/0278-Break-up-and-make-tab-spam-limits-configurable.patch
index d86861dc7e..899fce5b33 100644
--- a/Spigot-Server-Patches/0277-Break-up-and-make-tab-spam-limits-configurable.patch
+++ b/Spigot-Server-Patches/0278-Break-up-and-make-tab-spam-limits-configurable.patch
@@ -1,4 +1,4 @@
-From c7fd6f4d00a7b5a70cb146a6b6cdd587665b172d Mon Sep 17 00:00:00 2001
+From 857d9e53fdaa40d9764c085983bfb7eb59bfb4f6 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 29 Jul 2018 05:02:15 +0100
 Subject: [PATCH] Break up and make tab spam limits configurable
@@ -22,7 +22,7 @@ to take the burden of this into their own hand without having to rely on
 plugins doing unsafe things.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 8c3880c838..d773ef5b0d 100644
+index 8c3880c83..d773ef5b0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -311,4 +311,18 @@ public class PaperConfig {
@@ -45,7 +45,7 @@ index 8c3880c838..d773ef5b0d 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 4c99a321b7..07e9abda96 100644
+index 4c99a321b..07e9abda9 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -76,6 +76,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0278-Add-hand-to-bucket-events.patch b/Spigot-Server-Patches/0279-Add-hand-to-bucket-events.patch
similarity index 99%
rename from Spigot-Server-Patches/0278-Add-hand-to-bucket-events.patch
rename to Spigot-Server-Patches/0279-Add-hand-to-bucket-events.patch
index b7cea29b71..fccd740b83 100644
--- a/Spigot-Server-Patches/0278-Add-hand-to-bucket-events.patch
+++ b/Spigot-Server-Patches/0279-Add-hand-to-bucket-events.patch
@@ -1,4 +1,4 @@
-From 1af0f7f327c7546722f204cba4974633b16ad2a9 Mon Sep 17 00:00:00 2001
+From 0e002c1216bfe64d5191ea106bd1c03d716ace95 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 2 Aug 2018 08:44:35 -0500
 Subject: [PATCH] Add hand to bucket events
diff --git a/Spigot-Server-Patches/0279-MC-135506-Experience-should-save-as-Integers.patch b/Spigot-Server-Patches/0280-MC-135506-Experience-should-save-as-Integers.patch
similarity index 92%
rename from Spigot-Server-Patches/0279-MC-135506-Experience-should-save-as-Integers.patch
rename to Spigot-Server-Patches/0280-MC-135506-Experience-should-save-as-Integers.patch
index c5a728f5f8..431dbb0640 100644
--- a/Spigot-Server-Patches/0279-MC-135506-Experience-should-save-as-Integers.patch
+++ b/Spigot-Server-Patches/0280-MC-135506-Experience-should-save-as-Integers.patch
@@ -1,11 +1,11 @@
-From 86cc4d27c6c9b1f4295f5f516d1b327e13b88856 Mon Sep 17 00:00:00 2001
+From 56b6b14c85f4b13bb2b415d2fa32ad4f7cb54b36 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 64d71a9a2a..65c9969613 100644
+index 64d71a9a2..65c996961 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -204,7 +204,7 @@ public class EntityExperienceOrb extends Entity {
diff --git a/Spigot-Server-Patches/0280-Fix-client-rendering-skulls-from-same-user.patch b/Spigot-Server-Patches/0281-Fix-client-rendering-skulls-from-same-user.patch
similarity index 96%
rename from Spigot-Server-Patches/0280-Fix-client-rendering-skulls-from-same-user.patch
rename to Spigot-Server-Patches/0281-Fix-client-rendering-skulls-from-same-user.patch
index cef788cd88..ed769a62db 100644
--- a/Spigot-Server-Patches/0280-Fix-client-rendering-skulls-from-same-user.patch
+++ b/Spigot-Server-Patches/0281-Fix-client-rendering-skulls-from-same-user.patch
@@ -1,4 +1,4 @@
-From e1f63e935ea51043e1b30c5f7876aa27643e2826 Mon Sep 17 00:00:00 2001
+From 4d50c898cf30fab7f58def127feab7a6ed89ae3c 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 2acd02f2f4..ca1bd02995 100644
+index 2acd02f2f..ca1bd0299 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -54,7 +54,7 @@ public final class ItemStack {
@@ -25,7 +25,7 @@ index 2acd02f2f4..ca1bd02995 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 0d67676f7d..fa2d3ce8cb 100644
+index 0d67676f7..fa2d3ce8c 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 0d67676f7d..fa2d3ce8cb 100644
              }
              // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
-index 363ab5da12..d19a30ad87 100644
+index 363ab5da1..d19a30ad8 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 @@ -51,6 +51,7 @@ public class PacketPlayOutMapChunk implements Packet<PacketListenerPlayOut> {
@@ -74,7 +74,7 @@ index 363ab5da12..d19a30ad87 100644
                  this.f.add(nbttagcompound);
              }
 diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java
-index f6a80a00f4..5306574e55 100644
+index f6a80a00f..5306574e5 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySkull.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySkull.java
 @@ -142,9 +142,37 @@ public class TileEntitySkull extends TileEntity /*implements ITickable*/ { // Pa
diff --git a/Spigot-Server-Patches/0281-Add-Early-Warning-Feature-to-WatchDog.patch b/Spigot-Server-Patches/0282-Add-Early-Warning-Feature-to-WatchDog.patch
similarity index 98%
rename from Spigot-Server-Patches/0281-Add-Early-Warning-Feature-to-WatchDog.patch
rename to Spigot-Server-Patches/0282-Add-Early-Warning-Feature-to-WatchDog.patch
index 58795e513b..1b365e6209 100644
--- a/Spigot-Server-Patches/0281-Add-Early-Warning-Feature-to-WatchDog.patch
+++ b/Spigot-Server-Patches/0282-Add-Early-Warning-Feature-to-WatchDog.patch
@@ -1,4 +1,4 @@
-From 9305bed7b7d8a7a5990dc0ac7448d4141a314491 Mon Sep 17 00:00:00 2001
+From 328ceba36730635c7fc487f90944d51dae4dc398 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
@@ -36,7 +36,7 @@ index d773ef5b0..833659bbb 100644
      public static int tabSpamLimit = 500;
      private static void tabSpamLimiters() {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e5b3dc9e2..35cd6f9bf 100644
+index 7e27f1079..3f2a3dd17 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -847,6 +847,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -48,7 +48,7 @@ index e5b3dc9e2..35cd6f9bf 100644
                  long start = System.nanoTime(), curTime, tickSection = start; // Paper - Further improve server tick loop
                  lastTick = start - TICK_TIME; // Paper
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4fe8e198f..770dbf605 100644
+index ad1950980..824d1cb49 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -754,6 +754,7 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0282-Make-EnderDragon-implement-Mob.patch b/Spigot-Server-Patches/0283-Make-EnderDragon-implement-Mob.patch
similarity index 93%
rename from Spigot-Server-Patches/0282-Make-EnderDragon-implement-Mob.patch
rename to Spigot-Server-Patches/0283-Make-EnderDragon-implement-Mob.patch
index 3c8c726c1e..469c000ce5 100644
--- a/Spigot-Server-Patches/0282-Make-EnderDragon-implement-Mob.patch
+++ b/Spigot-Server-Patches/0283-Make-EnderDragon-implement-Mob.patch
@@ -1,11 +1,11 @@
-From 038cd7f34628d8e3c4712879305f52cbc05ef016 Mon Sep 17 00:00:00 2001
+From dae24cf43533a4882d0a2e5e0240145da6600f47 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 @@
diff --git a/Spigot-Server-Patches/0283-Detect-and-repair-corrupt-Region-Files.patch b/Spigot-Server-Patches/0284-Detect-and-repair-corrupt-Region-Files.patch
similarity index 98%
rename from Spigot-Server-Patches/0283-Detect-and-repair-corrupt-Region-Files.patch
rename to Spigot-Server-Patches/0284-Detect-and-repair-corrupt-Region-Files.patch
index ab2f28086d..6b53711bbb 100644
--- a/Spigot-Server-Patches/0283-Detect-and-repair-corrupt-Region-Files.patch
+++ b/Spigot-Server-Patches/0284-Detect-and-repair-corrupt-Region-Files.patch
@@ -1,4 +1,4 @@
-From 1907814dffa81dcc72a3072d1d75c6b98ea6aae1 Mon Sep 17 00:00:00 2001
+From 3691197a487e286eaecab0599fed5036d95629b5 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 4e6288e8bb..e68f901943 100644
+index 4e6288e8b..e68f90194 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -27,13 +27,13 @@ public class RegionFile implements AutoCloseable {
diff --git a/Spigot-Server-Patches/0284-Use-ConcurrentHashMap-in-JsonList.patch b/Spigot-Server-Patches/0285-Use-ConcurrentHashMap-in-JsonList.patch
similarity index 97%
rename from Spigot-Server-Patches/0284-Use-ConcurrentHashMap-in-JsonList.patch
rename to Spigot-Server-Patches/0285-Use-ConcurrentHashMap-in-JsonList.patch
index b554d6fc9e..0ef1f2518e 100644
--- a/Spigot-Server-Patches/0284-Use-ConcurrentHashMap-in-JsonList.patch
+++ b/Spigot-Server-Patches/0285-Use-ConcurrentHashMap-in-JsonList.patch
@@ -1,4 +1,4 @@
-From 00cace922105b799fc3723606102a64381927a37 Mon Sep 17 00:00:00 2001
+From 898bb04554739891efabfcbe7ea02aa267c9ad72 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 04f98167d3..c169d01762 100644
+index 04f98167d..c169d0176 100644
 --- a/src/main/java/net/minecraft/server/JsonList.java
 +++ b/src/main/java/net/minecraft/server/JsonList.java
 @@ -35,7 +35,8 @@ public class JsonList<K, V extends JsonListEntry<K>> {
diff --git a/Spigot-Server-Patches/0285-Use-a-Queue-for-Queueing-Commands.patch b/Spigot-Server-Patches/0286-Use-a-Queue-for-Queueing-Commands.patch
similarity index 94%
rename from Spigot-Server-Patches/0285-Use-a-Queue-for-Queueing-Commands.patch
rename to Spigot-Server-Patches/0286-Use-a-Queue-for-Queueing-Commands.patch
index 6b391c3363..637f77cc16 100644
--- a/Spigot-Server-Patches/0285-Use-a-Queue-for-Queueing-Commands.patch
+++ b/Spigot-Server-Patches/0286-Use-a-Queue-for-Queueing-Commands.patch
@@ -1,4 +1,4 @@
-From aefc2a0f2769affc8daa6457811693f98a76b9a9 Mon Sep 17 00:00:00 2001
+From 0e16e3ccb3e277055b24f23ecca8699c275896d5 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 c2c676e3bb..3d452fe0e3 100644
+index c2c676e3b..3d452fe0e 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -41,7 +41,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
diff --git a/Spigot-Server-Patches/0286-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/Spigot-Server-Patches/0287-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
similarity index 93%
rename from Spigot-Server-Patches/0286-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
rename to Spigot-Server-Patches/0287-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
index ad191e244e..e1ce3d36d5 100644
--- a/Spigot-Server-Patches/0286-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
+++ b/Spigot-Server-Patches/0287-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
@@ -1,11 +1,11 @@
-From a25ee60e64f1c2292035ce111496ae6711ee80dd Mon Sep 17 00:00:00 2001
+From f3b0557217bb8565f2d1f21b6c8163f278dfc238 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 08f8d80965..011e40458e 100644
+index 08f8d8096..011e40458 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 @@ -121,9 +121,16 @@ public class CraftChunk implements Chunk {
diff --git a/Spigot-Server-Patches/0287-Allow-disabling-armour-stand-ticking.patch b/Spigot-Server-Patches/0288-Allow-disabling-armour-stand-ticking.patch
similarity index 98%
rename from Spigot-Server-Patches/0287-Allow-disabling-armour-stand-ticking.patch
rename to Spigot-Server-Patches/0288-Allow-disabling-armour-stand-ticking.patch
index 851a986d3d..deaf32a7c6 100644
--- a/Spigot-Server-Patches/0287-Allow-disabling-armour-stand-ticking.patch
+++ b/Spigot-Server-Patches/0288-Allow-disabling-armour-stand-ticking.patch
@@ -1,11 +1,11 @@
-From d856f2df81c023c4f1d10cb63069c925327dc733 Mon Sep 17 00:00:00 2001
+From 3b2a54d3ee10502ae47a45eb8f7dc662b28e8495 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 15 Aug 2018 01:26:09 -0700
 Subject: [PATCH] Allow disabling armour stand ticking
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index f06bb3ae19..a5b4f99901 100644
+index f06bb3ae1..a5b4f9990 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -391,4 +391,10 @@ public class PaperWorldConfig {
@@ -20,7 +20,7 @@ index f06bb3ae19..a5b4f99901 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 96d9e8da88..480298a02a 100644
+index 96d9e8da8..480298a02 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -44,6 +44,11 @@ public class EntityArmorStand extends EntityLiving {
@@ -140,7 +140,7 @@ index 96d9e8da88..480298a02a 100644
  
      public Vector3f r() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 165e289921..2c29c8943f 100644
+index 165e28992..2c29c8943 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2259,52 +2259,7 @@ public abstract class EntityLiving extends Entity {
@@ -256,7 +256,7 @@ index 165e289921..2c29c8943f 100644
          float f2 = MathHelper.g(f - this.aK);
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-index 9f5c3b92e3..07ce93f17c 100644
+index 9f5c3b92e..07ce93f17 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 @@ -297,5 +297,15 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
diff --git a/Spigot-Server-Patches/0288-Optimize-BlockPosition-helper-methods.patch b/Spigot-Server-Patches/0289-Optimize-BlockPosition-helper-methods.patch
similarity index 97%
rename from Spigot-Server-Patches/0288-Optimize-BlockPosition-helper-methods.patch
rename to Spigot-Server-Patches/0289-Optimize-BlockPosition-helper-methods.patch
index 748dc980d3..1d2f2a590d 100644
--- a/Spigot-Server-Patches/0288-Optimize-BlockPosition-helper-methods.patch
+++ b/Spigot-Server-Patches/0289-Optimize-BlockPosition-helper-methods.patch
@@ -1,4 +1,4 @@
-From 79c849ce04f1493659885a9ba00fcd9eb7a978e0 Mon Sep 17 00:00:00 2001
+From 05d907ca0562ea18473f54ccae9bb776b1f4a951 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 a5e5a4ebae..6ed584f8dd 100644
+index a5e5a4eba..6ed584f8d 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -134,55 +134,72 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali
diff --git a/Spigot-Server-Patches/0289-Send-nearby-packets-from-world-player-list-not-serve.patch b/Spigot-Server-Patches/0290-Send-nearby-packets-from-world-player-list-not-serve.patch
similarity index 96%
rename from Spigot-Server-Patches/0289-Send-nearby-packets-from-world-player-list-not-serve.patch
rename to Spigot-Server-Patches/0290-Send-nearby-packets-from-world-player-list-not-serve.patch
index e7fdc69d39..adca1abf4b 100644
--- a/Spigot-Server-Patches/0289-Send-nearby-packets-from-world-player-list-not-serve.patch
+++ b/Spigot-Server-Patches/0290-Send-nearby-packets-from-world-player-list-not-serve.patch
@@ -1,11 +1,11 @@
-From 14850d20f5c196db4b2ee557eea55c8339b2c35a Mon Sep 17 00:00:00 2001
+From ae46a33de0bf185f7e6f2a8887e509e0ea6a30cc 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 006f7b8b9f..af437120ec 100644
+index 006f7b8b9..af437120e 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -922,8 +922,25 @@ public abstract class PlayerList {
@@ -46,7 +46,7 @@ index 006f7b8b9f..af437120ec 100644
                  double d5 = d1 - entityplayer.locY;
                  double d6 = d2 - entityplayer.locZ;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 364f26b556..9860175ec4 100644
+index 364f26b55..9860175ec 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1179,7 +1179,7 @@ public class WorldServer extends World {
@@ -68,7 +68,7 @@ index 364f26b556..9860175ec4 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 1adced482b..1dee895958 100644
+index 1adced482..1dee89595 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1909,7 +1909,7 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0290-Restore-vanlla-default-mob-spawn-range.patch b/Spigot-Server-Patches/0291-Restore-vanlla-default-mob-spawn-range.patch
similarity index 87%
rename from Spigot-Server-Patches/0290-Restore-vanlla-default-mob-spawn-range.patch
rename to Spigot-Server-Patches/0291-Restore-vanlla-default-mob-spawn-range.patch
index 68b26ffd80..f9d5abdc31 100644
--- a/Spigot-Server-Patches/0290-Restore-vanlla-default-mob-spawn-range.patch
+++ b/Spigot-Server-Patches/0291-Restore-vanlla-default-mob-spawn-range.patch
@@ -1,11 +1,11 @@
-From 1d6b7fcd69eb411a3d49314954fc80054cab1d52 Mon Sep 17 00:00:00 2001
+From 4a07c43a0a2b9d10c75fc3dfa8d91ea53182977c 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 9a51c0ef7a..c2bf481a60 100644
+index 9a51c0ef7..c2bf481a6 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -152,7 +152,7 @@ public class SpigotWorldConfig
diff --git a/Spigot-Server-Patches/0291-Optimize-Hoppers.patch b/Spigot-Server-Patches/0292-Optimize-Hoppers.patch
similarity index 99%
rename from Spigot-Server-Patches/0291-Optimize-Hoppers.patch
rename to Spigot-Server-Patches/0292-Optimize-Hoppers.patch
index 272804f585..0f0add405d 100644
--- a/Spigot-Server-Patches/0291-Optimize-Hoppers.patch
+++ b/Spigot-Server-Patches/0292-Optimize-Hoppers.patch
@@ -1,4 +1,4 @@
-From 8ea741a76d6668e395e1946809378cf1ba23220f Mon Sep 17 00:00:00 2001
+From 39f5ad58e9ffd067731b6dcf05eb2e2b9c8a444b 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
@@ -47,7 +47,7 @@ index ca1bd0299..2d83c9e79 100644
          itemstack.d(this.C());
          if (this.tag != null) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 35cd6f9bf..2ed49dceb 100644
+index 3f2a3dd17..e5c148c48 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1126,6 +1126,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
diff --git a/Spigot-Server-Patches/0292-Optimize-CraftBlockData-Creation.patch b/Spigot-Server-Patches/0293-Optimize-CraftBlockData-Creation.patch
similarity index 94%
rename from Spigot-Server-Patches/0292-Optimize-CraftBlockData-Creation.patch
rename to Spigot-Server-Patches/0293-Optimize-CraftBlockData-Creation.patch
index 9208a367f3..3d115cf17c 100644
--- a/Spigot-Server-Patches/0292-Optimize-CraftBlockData-Creation.patch
+++ b/Spigot-Server-Patches/0293-Optimize-CraftBlockData-Creation.patch
@@ -1,4 +1,4 @@
-From ed020cefa418b0ec20f621bbce505ffb319c0de1 Mon Sep 17 00:00:00 2001
+From b41062570d02f4c230d59ec9b4a7eebab57e19b8 Mon Sep 17 00:00:00 2001
 From: miclebrick <miclebrick@outlook.com>
 Date: Thu, 23 Aug 2018 11:45:32 -0400
 Subject: [PATCH] Optimize CraftBlockData Creation
@@ -7,7 +7,7 @@ Avoids a hashmap lookup by cacheing a reference to the CraftBlockData
 and cloning it when one is needed.
 
 diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java
-index 0f4aa698aa..c66cabe82f 100644
+index 0f4aa698a..c66cabe82 100644
 --- a/src/main/java/net/minecraft/server/IBlockData.java
 +++ b/src/main/java/net/minecraft/server/IBlockData.java
 @@ -4,6 +4,8 @@ import com.google.common.collect.ImmutableMap;
@@ -36,7 +36,7 @@ index 0f4aa698aa..c66cabe82f 100644
          return this.getBlock().l(this);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
-index c1666a9baf..3c29abd525 100644
+index c1666a9ba..3c29abd52 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
 @@ -539,7 +539,17 @@ public class CraftBlockData implements BlockData {
diff --git a/Spigot-Server-Patches/0293-Fix-MC-124320.patch b/Spigot-Server-Patches/0294-Fix-MC-124320.patch
similarity index 95%
rename from Spigot-Server-Patches/0293-Fix-MC-124320.patch
rename to Spigot-Server-Patches/0294-Fix-MC-124320.patch
index f5cff0eff2..b790474782 100644
--- a/Spigot-Server-Patches/0293-Fix-MC-124320.patch
+++ b/Spigot-Server-Patches/0294-Fix-MC-124320.patch
@@ -1,11 +1,11 @@
-From 0d60a09b2e5e12c669cbbb0880c8ac78ee63c3c2 Mon Sep 17 00:00:00 2001
+From 26c33d8a37a75167d696ea1c7279368c74518842 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 dedb063de8..8d69a1556a 100644
+index dedb063de..8d69a1556 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -168,6 +168,7 @@ public class Block implements IMaterial {
@@ -17,7 +17,7 @@ index dedb063de8..8d69a1556a 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 79d23f1522..ad1553f6e9 100644
+index 79d23f152..ad1553f6e 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -335,8 +335,9 @@ public class EntityEnderman extends EntityMonster {
diff --git a/Spigot-Server-Patches/0294-Slime-Pathfinder-Events.patch b/Spigot-Server-Patches/0295-Slime-Pathfinder-Events.patch
similarity index 98%
rename from Spigot-Server-Patches/0294-Slime-Pathfinder-Events.patch
rename to Spigot-Server-Patches/0295-Slime-Pathfinder-Events.patch
index 91a899e0c7..44d4f77caa 100644
--- a/Spigot-Server-Patches/0294-Slime-Pathfinder-Events.patch
+++ b/Spigot-Server-Patches/0295-Slime-Pathfinder-Events.patch
@@ -1,11 +1,11 @@
-From 57c6b03b5166380b8f24dfaee2ad8d2851bbf8fd Mon Sep 17 00:00:00 2001
+From d8e8c0739a9ccbfe94ad583c56067f59493d9055 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 24 Aug 2018 08:18:42 -0500
 Subject: [PATCH] Slime Pathfinder Events
 
 
 diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java
-index 96cf4bccea..e28c0673dd 100644
+index 96cf4bcce..e28c0673d 100644
 --- a/src/main/java/net/minecraft/server/EntitySlime.java
 +++ b/src/main/java/net/minecraft/server/EntitySlime.java
 @@ -2,6 +2,14 @@ package net.minecraft.server;
@@ -147,7 +147,7 @@ index 96cf4bccea..e28c0673dd 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
-index ce6ed6e890..6e9f1b66df 100644
+index ce6ed6e89..6e9f1b66d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
 @@ -35,4 +35,14 @@ public class CraftSlime extends CraftMob implements Slime {
diff --git a/Spigot-Server-Patches/0295-Configurable-speed-for-water-flowing-over-lava.patch b/Spigot-Server-Patches/0296-Configurable-speed-for-water-flowing-over-lava.patch
similarity index 96%
rename from Spigot-Server-Patches/0295-Configurable-speed-for-water-flowing-over-lava.patch
rename to Spigot-Server-Patches/0296-Configurable-speed-for-water-flowing-over-lava.patch
index b7132342f9..06edd3ad73 100644
--- a/Spigot-Server-Patches/0295-Configurable-speed-for-water-flowing-over-lava.patch
+++ b/Spigot-Server-Patches/0296-Configurable-speed-for-water-flowing-over-lava.patch
@@ -1,11 +1,11 @@
-From e239a54a6ced679fb3e92c1caa50abd682ce598d Mon Sep 17 00:00:00 2001
+From ee09a7f9177ec8f49cec7b223be7dee1e1224179 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 8 Aug 2018 16:33:21 -0600
 Subject: [PATCH] Configurable speed for water flowing over lava
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 2b5402b009..2c27be63ea 100644
+index 2b5402b00..2c27be63e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -401,6 +401,12 @@ public class PaperWorldConfig {
@@ -22,7 +22,7 @@ index 2b5402b009..2c27be63ea 100644
      private void armorStandTick() {
          this.armorStandTick = this.getBoolean("armor-stands-tick", this.armorStandTick);
 diff --git a/src/main/java/net/minecraft/server/BlockFluids.java b/src/main/java/net/minecraft/server/BlockFluids.java
-index 44e00339f2..b4616f259e 100644
+index 44e00339f..b4616f259 100644
 --- a/src/main/java/net/minecraft/server/BlockFluids.java
 +++ b/src/main/java/net/minecraft/server/BlockFluids.java
 @@ -70,11 +70,27 @@ public class BlockFluids extends Block implements IFluidSource {
diff --git a/Spigot-Server-Patches/0296-Optimize-RegistryMaterials.patch b/Spigot-Server-Patches/0297-Optimize-RegistryMaterials.patch
similarity index 94%
rename from Spigot-Server-Patches/0296-Optimize-RegistryMaterials.patch
rename to Spigot-Server-Patches/0297-Optimize-RegistryMaterials.patch
index e69c1dfd1c..234324ee0f 100644
--- a/Spigot-Server-Patches/0296-Optimize-RegistryMaterials.patch
+++ b/Spigot-Server-Patches/0297-Optimize-RegistryMaterials.patch
@@ -1,4 +1,4 @@
-From 61f14ee6694a89bbd6a0888d95535aa7ade9d667 Mon Sep 17 00:00:00 2001
+From 84528f3c4f2ba7346c3a5066dea2c584a92bd51c 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 f291e05b26..fed38e6ef0 100644
+index f291e05b2..fed38e6ef 100644
 --- a/src/main/java/net/minecraft/server/RegistryMaterials.java
 +++ b/src/main/java/net/minecraft/server/RegistryMaterials.java
 @@ -16,9 +16,9 @@ import org.apache.logging.log4j.Logger;
diff --git a/Spigot-Server-Patches/0297-Add-PhantomPreSpawnEvent.patch b/Spigot-Server-Patches/0298-Add-PhantomPreSpawnEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0297-Add-PhantomPreSpawnEvent.patch
rename to Spigot-Server-Patches/0298-Add-PhantomPreSpawnEvent.patch
index 89cd2f7f15..45c446877b 100644
--- a/Spigot-Server-Patches/0297-Add-PhantomPreSpawnEvent.patch
+++ b/Spigot-Server-Patches/0298-Add-PhantomPreSpawnEvent.patch
@@ -1,11 +1,11 @@
-From 08def75c3cf04fd95baa56cb28f25c27f7005909 Mon Sep 17 00:00:00 2001
+From 7f3a15f4c5ca98d157c99ed50dcadd31ee55f8ca 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 e5ed5a3dcc..e5d032d02b 100644
+index e5ed5a3dc..e5d032d02 100644
 --- a/src/main/java/net/minecraft/server/EntityPhantom.java
 +++ b/src/main/java/net/minecraft/server/EntityPhantom.java
 @@ -129,6 +129,11 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@@ -48,7 +48,7 @@ index e5ed5a3dcc..e5d032d02b 100644
  
          private final PathfinderTargetCondition b;
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
-index 9f64d81c64..1818e7c384 100644
+index 9f64d81c6..1818e7c38 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 9f64d81c64..1818e7c384 100644
                                                  groupdataentity = entityphantom.prepare(worldserver, difficultydamagescaler, EnumMobSpawn.NATURAL, groupdataentity, (NBTTagCompound) null);
                                                  worldserver.addEntity(entityphantom, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.NATURAL); // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
-index 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 {
diff --git a/Spigot-Server-Patches/0298-Add-More-Creeper-API.patch b/Spigot-Server-Patches/0299-Add-More-Creeper-API.patch
similarity index 95%
rename from Spigot-Server-Patches/0298-Add-More-Creeper-API.patch
rename to Spigot-Server-Patches/0299-Add-More-Creeper-API.patch
index ac3b6ef221..bddfc25fa3 100644
--- a/Spigot-Server-Patches/0298-Add-More-Creeper-API.patch
+++ b/Spigot-Server-Patches/0299-Add-More-Creeper-API.patch
@@ -1,11 +1,11 @@
-From 7f389a7f31a6f26910ff135b6c4cf67b376a36bb Mon Sep 17 00:00:00 2001
+From a64875c5420b62df4ca8f1362501bb5e7a93b2b9 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 24 Aug 2018 11:50:26 -0500
 Subject: [PATCH] Add More Creeper API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
-index 29569805cb..0c2c3c7308 100644
+index 29569805c..0c2c3c730 100644
 --- a/src/main/java/net/minecraft/server/EntityCreeper.java
 +++ b/src/main/java/net/minecraft/server/EntityCreeper.java
 @@ -13,7 +13,7 @@ public class EntityCreeper extends EntityMonster {
@@ -47,7 +47,7 @@ index 29569805cb..0c2c3c7308 100644
  
      public boolean canCauseHeadDrop() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
-index 796ee9e40d..2d38823c57 100644
+index 796ee9e40..2d38823c5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
 @@ -78,4 +78,22 @@ public class CraftCreeper extends CraftMonster implements Creeper {
diff --git a/Spigot-Server-Patches/0299-Inventory-removeItemAnySlot.patch b/Spigot-Server-Patches/0300-Inventory-removeItemAnySlot.patch
similarity index 95%
rename from Spigot-Server-Patches/0299-Inventory-removeItemAnySlot.patch
rename to Spigot-Server-Patches/0300-Inventory-removeItemAnySlot.patch
index b68cedc0f9..e20be256be 100644
--- a/Spigot-Server-Patches/0299-Inventory-removeItemAnySlot.patch
+++ b/Spigot-Server-Patches/0300-Inventory-removeItemAnySlot.patch
@@ -1,11 +1,11 @@
-From cd5d9adc4c98b58d552e13e7887fa43a006974ad Mon Sep 17 00:00:00 2001
+From 06b562c471e8a68cd53db34d91f007e7dbe0a3d0 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 deb9de366a..f05f4c1da6 100644
+index deb9de366..f05f4c1da 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
 @@ -224,10 +224,16 @@ public class CraftInventory implements Inventory {
diff --git a/Spigot-Server-Patches/0300-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/Spigot-Server-Patches/0301-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
similarity index 91%
rename from Spigot-Server-Patches/0300-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
rename to Spigot-Server-Patches/0301-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
index f8b10f9eaf..88a2711d00 100644
--- a/Spigot-Server-Patches/0300-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
+++ b/Spigot-Server-Patches/0301-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
@@ -1,4 +1,4 @@
-From 61813151e10f74a0e8e813ca2af9fba5b5526d37 Mon Sep 17 00:00:00 2001
+From aac7776d42f44bf1548dfc206d1e0c51d88abfe1 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 1dee895958..1b2c5012e9 100644
+index 1dee89595..1b2c5012e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -477,7 +477,7 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0301-Add-ray-tracing-methods-to-LivingEntity.patch b/Spigot-Server-Patches/0302-Add-ray-tracing-methods-to-LivingEntity.patch
similarity index 96%
rename from Spigot-Server-Patches/0301-Add-ray-tracing-methods-to-LivingEntity.patch
rename to Spigot-Server-Patches/0302-Add-ray-tracing-methods-to-LivingEntity.patch
index 7803180d80..c45be78aab 100644
--- a/Spigot-Server-Patches/0301-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/Spigot-Server-Patches/0302-Add-ray-tracing-methods-to-LivingEntity.patch
@@ -1,11 +1,11 @@
-From 49aa5bb2b68542c46c52083dc7a37473287081c3 Mon Sep 17 00:00:00 2001
+From b6105261367e63baf2e1ce70a806a9bde3d2273e Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 3 Sep 2018 18:20:03 -0500
 Subject: [PATCH] Add ray tracing methods to LivingEntity
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 6334d3dea4..ef24896c0f 100644
+index 2c29c8943..b9fc57eae 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -3170,6 +3170,23 @@ public abstract class EntityLiving extends Entity {
@@ -33,7 +33,7 @@ index 6334d3dea4..ef24896c0f 100644
  
      public int getShieldBlockingDelay() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 8dea7d36b6..d5c4115a85 100644
+index 8dea7d36b..d5c4115a8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -182,6 +182,28 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/Spigot-Server-Patches/0302-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-Server-Patches/0303-Expose-attack-cooldown-methods-for-Player.patch
similarity index 93%
rename from Spigot-Server-Patches/0302-Expose-attack-cooldown-methods-for-Player.patch
rename to Spigot-Server-Patches/0303-Expose-attack-cooldown-methods-for-Player.patch
index ae80b2c998..281b6308d3 100644
--- a/Spigot-Server-Patches/0302-Expose-attack-cooldown-methods-for-Player.patch
+++ b/Spigot-Server-Patches/0303-Expose-attack-cooldown-methods-for-Player.patch
@@ -1,11 +1,11 @@
-From 57ebaabf637c0aca1bd24a3c908e4a78452226ed Mon Sep 17 00:00:00 2001
+From edf5208ca4bb1be36b24db9a856c07d1f6472c7b Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 4 Sep 2018 15:02:00 -0500
 Subject: [PATCH] Expose attack cooldown methods for Player
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index d1a7a873b9..2f614dfb6b 100644
+index d1a7a873b..2f614dfb6 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -2003,14 +2003,17 @@ public abstract class EntityHuman extends EntityLiving {
@@ -27,7 +27,7 @@ index d1a7a873b9..2f614dfb6b 100644
          this.aD = 0;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ba60ece457..0386452a8d 100644
+index ba60ece45..0386452a8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1908,6 +1908,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0303-Improve-death-events.patch b/Spigot-Server-Patches/0304-Improve-death-events.patch
similarity index 98%
rename from Spigot-Server-Patches/0303-Improve-death-events.patch
rename to Spigot-Server-Patches/0304-Improve-death-events.patch
index bc28bad420..83fed15bd7 100644
--- a/Spigot-Server-Patches/0303-Improve-death-events.patch
+++ b/Spigot-Server-Patches/0304-Improve-death-events.patch
@@ -1,4 +1,4 @@
-From e3d9e0889df66a7b3a3d03d8e559237e57a89b00 Mon Sep 17 00:00:00 2001
+From 12b939a208dedab6e06e0aeb30c0462f1da4cc36 Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Tue, 21 Aug 2018 01:39:35 +0100
 Subject: [PATCH] Improve death events
@@ -15,7 +15,7 @@ items and experience which is otherwise only properly possible by using
 internal code.
 
 diff --git a/src/main/java/net/minecraft/server/CombatTracker.java b/src/main/java/net/minecraft/server/CombatTracker.java
-index 20db76abd7..a148cd437c 100644
+index 20db76abd..a148cd437 100644
 --- a/src/main/java/net/minecraft/server/CombatTracker.java
 +++ b/src/main/java/net/minecraft/server/CombatTracker.java
 @@ -175,6 +175,7 @@ public class CombatTracker {
@@ -27,7 +27,7 @@ index 20db76abd7..a148cd437c 100644
          int i = this.f ? 300 : 100;
  
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 69087c7ef9..efda90f6e3 100644
+index 69087c7ef..efda90f6e 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1467,6 +1467,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -47,7 +47,7 @@ index 69087c7ef9..efda90f6e3 100644
  
      protected void i(double d0, double d1, double d2) {
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 480298a02a..26302c36e9 100644
+index 480298a02..26302c36e 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -676,7 +676,8 @@ public class EntityArmorStand extends EntityLiving {
@@ -61,7 +61,7 @@ index 480298a02a..26302c36e9 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java
-index c7a744355a..2f4657596c 100644
+index c7a744355..2f4657596 100644
 --- a/src/main/java/net/minecraft/server/EntityFox.java
 +++ b/src/main/java/net/minecraft/server/EntityFox.java
 @@ -597,15 +597,25 @@ public class EntityFox extends EntityAnimal {
@@ -94,7 +94,7 @@ index c7a744355a..2f4657596c 100644
  
      public static boolean a(EntityFox entityfox, EntityLiving entityliving) {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index b9fc57eae0..76aba7ea5b 100644
+index b9fc57eae..76aba7ea5 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -85,7 +85,7 @@ public abstract class EntityLiving extends Entity {
@@ -249,7 +249,7 @@ index b9fc57eae0..76aba7ea5b 100644
          return this.isBaby() ? (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.5F : (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 0a575456a1..251166c4fe 100644
+index 0a575456a..251166c4f 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -75,6 +75,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -300,7 +300,7 @@ index 0a575456a1..251166c4fe 100644
          }
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftSound.java b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
-index 73cb64e09d..9f317ff2e8 100644
+index 73cb64e09..9f317ff2e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftSound.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
 @@ -806,6 +806,22 @@ public enum CraftSound {
@@ -327,7 +327,7 @@ index 73cb64e09d..9f317ff2e8 100644
          this.minecraftKey = minecraftKey;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0386452a8d..deacc21873 100644
+index 0386452a8..deacc2187 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1712,7 +1712,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -348,7 +348,7 @@ index 0386452a8d..deacc21873 100644
  
      public void injectScaledMaxHealth(Collection<AttributeInstance> collection, boolean force) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 8aeba7ca97..ee32517163 100644
+index 8aeba7ca9..ee3251716 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -722,9 +722,16 @@ public class CraftEventFactory {
diff --git a/Spigot-Server-Patches/0304-Allow-chests-to-be-placed-with-NBT-data.patch b/Spigot-Server-Patches/0305-Allow-chests-to-be-placed-with-NBT-data.patch
similarity index 91%
rename from Spigot-Server-Patches/0304-Allow-chests-to-be-placed-with-NBT-data.patch
rename to Spigot-Server-Patches/0305-Allow-chests-to-be-placed-with-NBT-data.patch
index ae43fb904b..2524ff0d44 100644
--- a/Spigot-Server-Patches/0304-Allow-chests-to-be-placed-with-NBT-data.patch
+++ b/Spigot-Server-Patches/0305-Allow-chests-to-be-placed-with-NBT-data.patch
@@ -1,11 +1,11 @@
-From a5d0a3e78906d23ab5d742ef2189983955d00422 Mon Sep 17 00:00:00 2001
+From 93f8bc143c52867231425ae8a296a420305d5c4c Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 8 Sep 2018 18:43:31 -0500
 Subject: [PATCH] Allow chests to be placed with NBT data
 
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 2d83c9e79c..dec5894637 100644
+index 2d83c9e79..dec589463 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -235,6 +235,7 @@ public final class ItemStack {
@@ -17,7 +17,7 @@ index 2d83c9e79c..dec5894637 100644
                      for (BlockState blockstate : blocks) {
                          blockstate.update(true, false);
 diff --git a/src/main/java/net/minecraft/server/TileEntityChest.java b/src/main/java/net/minecraft/server/TileEntityChest.java
-index 85b450c054..efc153de5f 100644
+index 85b450c05..efc153de5 100644
 --- a/src/main/java/net/minecraft/server/TileEntityChest.java
 +++ b/src/main/java/net/minecraft/server/TileEntityChest.java
 @@ -309,7 +309,7 @@ public class TileEntityChest extends TileEntityLootable { // Paper - Remove ITic
diff --git a/Spigot-Server-Patches/0305-Mob-Pathfinding-API.patch b/Spigot-Server-Patches/0306-Mob-Pathfinding-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0305-Mob-Pathfinding-API.patch
rename to Spigot-Server-Patches/0306-Mob-Pathfinding-API.patch
index 500bbad08b..fbdbfba5ba 100644
--- a/Spigot-Server-Patches/0305-Mob-Pathfinding-API.patch
+++ b/Spigot-Server-Patches/0306-Mob-Pathfinding-API.patch
@@ -1,4 +1,4 @@
-From 121d7f887740202b19df915eeb349ac5d89f57b5 Mon Sep 17 00:00:00 2001
+From d01297e9be72fe5a7826eba646e12579e112ebb1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 9 Sep 2018 13:30:00 -0400
 Subject: [PATCH] Mob Pathfinding API
@@ -7,7 +7,7 @@ Implements Pathfinding API for mobs
 
 diff --git a/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java b/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java
 new file mode 100644
-index 0000000000..f68a07cb96
+index 000000000..f68a07cb9
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java
 @@ -0,0 +1,111 @@
@@ -123,7 +123,7 @@ index 0000000000..f68a07cb96
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
-index a473c03b9d..856ff22b04 100644
+index a473c03b9..856ff22b0 100644
 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java
 +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
 @@ -67,7 +67,7 @@ public abstract class NavigationAbstract {
@@ -170,7 +170,7 @@ index a473c03b9d..856ff22b04 100644
          this.pathfindFailures = 0; this.lastFailure = 0; // Paper - Pathfinding optimizations
          this.c = null;
 diff --git a/src/main/java/net/minecraft/server/PathEntity.java b/src/main/java/net/minecraft/server/PathEntity.java
-index f1d94420c8..5fdb601801 100644
+index f1d94420c..5fdb60180 100644
 --- a/src/main/java/net/minecraft/server/PathEntity.java
 +++ b/src/main/java/net/minecraft/server/PathEntity.java
 @@ -5,11 +5,12 @@ import javax.annotation.Nullable;
@@ -208,7 +208,7 @@ index f1d94420c8..5fdb601801 100644
  
          return new Vec3D((double) pathpoint.a, (double) pathpoint.b, (double) pathpoint.c);
 diff --git a/src/main/java/net/minecraft/server/PathPoint.java b/src/main/java/net/minecraft/server/PathPoint.java
-index 955152ef4e..4e2cef8f67 100644
+index 955152ef4..4e2cef8f6 100644
 --- a/src/main/java/net/minecraft/server/PathPoint.java
 +++ b/src/main/java/net/minecraft/server/PathPoint.java
 @@ -2,9 +2,9 @@ package net.minecraft.server;
@@ -225,7 +225,7 @@ index 955152ef4e..4e2cef8f67 100644
      public int d = -1;
      public float e;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-index 5bf1cd06fa..53c2d154ed 100644
+index 5bf1cd06f..53c2d154e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 @@ -12,8 +12,11 @@ import org.bukkit.loot.LootTable;
diff --git a/Spigot-Server-Patches/0306-Prevent-chunk-loading-from-Fluid-Flowing.patch b/Spigot-Server-Patches/0307-Prevent-chunk-loading-from-Fluid-Flowing.patch
similarity index 97%
rename from Spigot-Server-Patches/0306-Prevent-chunk-loading-from-Fluid-Flowing.patch
rename to Spigot-Server-Patches/0307-Prevent-chunk-loading-from-Fluid-Flowing.patch
index bc99e64de6..7e1ab61a18 100644
--- a/Spigot-Server-Patches/0306-Prevent-chunk-loading-from-Fluid-Flowing.patch
+++ b/Spigot-Server-Patches/0307-Prevent-chunk-loading-from-Fluid-Flowing.patch
@@ -1,11 +1,11 @@
-From 2cededad82edc0d12c8b78ddd01dde479630f6ad Mon Sep 17 00:00:00 2001
+From 11644ed0883c8d95df9351037c9808358b246d17 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 10 Sep 2018 23:36:16 -0400
 Subject: [PATCH] Prevent chunk loading from Fluid Flowing
 
 
 diff --git a/src/main/java/net/minecraft/server/FluidTypeFlowing.java b/src/main/java/net/minecraft/server/FluidTypeFlowing.java
-index c76fa0b4bf..5f15143603 100644
+index c76fa0b4b..5f1514360 100644
 --- a/src/main/java/net/minecraft/server/FluidTypeFlowing.java
 +++ b/src/main/java/net/minecraft/server/FluidTypeFlowing.java
 @@ -178,7 +178,8 @@ public abstract class FluidTypeFlowing extends FluidType {
diff --git a/Spigot-Server-Patches/0307-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/Spigot-Server-Patches/0308-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
similarity index 99%
rename from Spigot-Server-Patches/0307-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
rename to Spigot-Server-Patches/0308-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
index 3052b17633..3641f727b9 100644
--- a/Spigot-Server-Patches/0307-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
+++ b/Spigot-Server-Patches/0308-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
@@ -1,4 +1,4 @@
-From 03504f1bffd46f5e345a95ecaed1afed938c9ae7 Mon Sep 17 00:00:00 2001
+From 845d0f511164ef67e365f79a2cf62af979e1cd33 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Wed, 12 Sep 2018 18:53:55 +0300
 Subject: [PATCH] Implement an API for CanPlaceOn and CanDestroy NBT values
diff --git a/Spigot-Server-Patches/0308-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/Spigot-Server-Patches/0309-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
similarity index 96%
rename from Spigot-Server-Patches/0308-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
rename to Spigot-Server-Patches/0309-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
index c4e1a605e2..9d51e32f61 100644
--- a/Spigot-Server-Patches/0308-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
+++ b/Spigot-Server-Patches/0309-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
@@ -1,11 +1,11 @@
-From c2e447783c204162a3c084c8817173f678edcb33 Mon Sep 17 00:00:00 2001
+From e35f496e4f4ec5fe4b0e3ac230d2c3888a428c8f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 10 Sep 2018 23:56:36 -0400
 Subject: [PATCH] Prevent Mob AI Rules from Loading Chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java b/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java
-index ce9318c575..541d97344e 100644
+index ce9318c57..541d97344 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java
 @@ -12,11 +12,13 @@ public class PathfinderGoalRemoveBlock extends PathfinderGoalGotoTarget {
@@ -53,7 +53,7 @@ index ce9318c575..541d97344e 100644
          return block == this.g && iworldreader.getType(blockposition.up()).isAir() && iworldreader.getType(blockposition.up(2)).isAir();
      }
 diff --git a/src/main/java/net/minecraft/server/RandomPositionGenerator.java b/src/main/java/net/minecraft/server/RandomPositionGenerator.java
-index b286934aa8..c7e25e2be8 100644
+index b286934aa..c7e25e2be 100644
 --- a/src/main/java/net/minecraft/server/RandomPositionGenerator.java
 +++ b/src/main/java/net/minecraft/server/RandomPositionGenerator.java
 @@ -93,6 +93,7 @@ public class RandomPositionGenerator {
diff --git a/Spigot-Server-Patches/0309-Prevent-mob-spawning-from-loading-generating-chunks.patch b/Spigot-Server-Patches/0310-Prevent-mob-spawning-from-loading-generating-chunks.patch
similarity index 95%
rename from Spigot-Server-Patches/0309-Prevent-mob-spawning-from-loading-generating-chunks.patch
rename to Spigot-Server-Patches/0310-Prevent-mob-spawning-from-loading-generating-chunks.patch
index 80072b34bb..1b61be22be 100644
--- a/Spigot-Server-Patches/0309-Prevent-mob-spawning-from-loading-generating-chunks.patch
+++ b/Spigot-Server-Patches/0310-Prevent-mob-spawning-from-loading-generating-chunks.patch
@@ -1,4 +1,4 @@
-From 7a9fa948ba5ff3fbe51bf1ec22f5f06a3ea0c091 Mon Sep 17 00:00:00 2001
+From a84f6f7e85fd4ac90b5869c6d71bc7d65342ae89 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 14e2f3ca71..5824cbba67 100644
+index 14e2f3ca7..5824cbba6 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -25,9 +25,9 @@ public final class SpawnerCreature {
diff --git a/Spigot-Server-Patches/0310-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/Spigot-Server-Patches/0311-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 96%
rename from Spigot-Server-Patches/0310-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to Spigot-Server-Patches/0311-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
index a89e3f402b..a1bcabb6db 100644
--- a/Spigot-Server-Patches/0310-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
+++ b/Spigot-Server-Patches/0311-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
@@ -1,4 +1,4 @@
-From 531922c361738780d5ad940b3417d385268439f3 Mon Sep 17 00:00:00 2001
+From aa598d5390c662cdb4aaa311a5c4d7ab92e1f2a2 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 9a839d6540..72eb669c50 100644
+index 9a839d654..72eb669c5 100644
 --- a/src/main/java/net/minecraft/server/BiomeBase.java
 +++ b/src/main/java/net/minecraft/server/BiomeBase.java
 @@ -38,7 +38,7 @@ public abstract class BiomeBase {
diff --git a/Spigot-Server-Patches/0311-Implement-furnace-cook-speed-multiplier-API.patch b/Spigot-Server-Patches/0312-Implement-furnace-cook-speed-multiplier-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0311-Implement-furnace-cook-speed-multiplier-API.patch
rename to Spigot-Server-Patches/0312-Implement-furnace-cook-speed-multiplier-API.patch
index eaa501ad66..72a7f5d937 100644
--- a/Spigot-Server-Patches/0311-Implement-furnace-cook-speed-multiplier-API.patch
+++ b/Spigot-Server-Patches/0312-Implement-furnace-cook-speed-multiplier-API.patch
@@ -1,4 +1,4 @@
-From 88622e1383001ad29592cc4e6fd9dba28f849c7b Mon Sep 17 00:00:00 2001
+From 37db6150821f83e9fa58b97186ee816fa587f87e 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 be16fe9a9e..b9f3a952e8 100644
+index be16fe9a9..b9f3a952e 100644
 --- a/src/main/java/net/minecraft/server/TileEntityFurnace.java
 +++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java
 @@ -8,6 +8,7 @@ import java.util.Map;
@@ -57,7 +57,7 @@ index be16fe9a9e..b9f3a952e8 100644
                          this.cookTimeTotal = this.getRecipeCookingTime();
                          this.burn(irecipe);
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java b/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java
-index 9cc67915ca..1ce10ea049 100644
+index 9cc67915c..1ce10ea04 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java
 @@ -63,4 +63,18 @@ public class CraftFurnace<T extends TileEntityFurnace> extends CraftContainer<T>
diff --git a/Spigot-Server-Patches/0312-Support-Overriding-World-Seeds.patch b/Spigot-Server-Patches/0313-Support-Overriding-World-Seeds.patch
similarity index 96%
rename from Spigot-Server-Patches/0312-Support-Overriding-World-Seeds.patch
rename to Spigot-Server-Patches/0313-Support-Overriding-World-Seeds.patch
index 67ba127604..2d078f8bf7 100644
--- a/Spigot-Server-Patches/0312-Support-Overriding-World-Seeds.patch
+++ b/Spigot-Server-Patches/0313-Support-Overriding-World-Seeds.patch
@@ -1,4 +1,4 @@
-From 29e65558defe03fa9e5b995a8cbad3a1db22a687 Mon Sep 17 00:00:00 2001
+From 260f1e88e76a4d59213381b18cb34739ffba07df 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 833659bbb2..ffb18902ff 100644
+index 833659bbb..ffb18902f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -11,6 +11,7 @@ import java.lang.reflect.Modifier;
@@ -59,7 +59,7 @@ index 833659bbb2..ffb18902ff 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 6a3776091e..0209330ad4 100644
+index e5c148c48..74cdf4945 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -363,7 +363,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -72,7 +72,7 @@ index 6a3776091e..0209330ad4 100644
  
              if (j == 0) {
 diff --git a/src/main/java/net/minecraft/server/WorldData.java b/src/main/java/net/minecraft/server/WorldData.java
-index 9ecd412ae3..eb14649830 100644
+index 9ecd412ae..eb1464983 100644
 --- a/src/main/java/net/minecraft/server/WorldData.java
 +++ b/src/main/java/net/minecraft/server/WorldData.java
 @@ -116,7 +116,7 @@ public class WorldData {
@@ -85,7 +85,7 @@ index 9ecd412ae3..eb14649830 100644
              String s = nbttagcompound.getString("generatorName");
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 770dbf6052..2e03556f2b 100644
+index 824d1cb49..eb8eecde6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -985,7 +985,7 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0313-Optimize-Server-World-Map.patch b/Spigot-Server-Patches/0314-Optimize-Server-World-Map.patch
similarity index 98%
rename from Spigot-Server-Patches/0313-Optimize-Server-World-Map.patch
rename to Spigot-Server-Patches/0314-Optimize-Server-World-Map.patch
index 7ecf418529..5b5154e5eb 100644
--- a/Spigot-Server-Patches/0313-Optimize-Server-World-Map.patch
+++ b/Spigot-Server-Patches/0314-Optimize-Server-World-Map.patch
@@ -1,4 +1,4 @@
-From fe9c34162b8ad9499acf895ef24bae9ea09cced2 Mon Sep 17 00:00:00 2001
+From 477a54637fe3c5b15011d7ee4ce0c3b75204ffe8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 17 Sep 2018 23:37:31 -0400
 Subject: [PATCH] Optimize Server World Map
@@ -21,7 +21,7 @@ known NMS used methods, but we can add more if naughty plugins are found later.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldMap.java b/src/main/java/com/destroystokyo/paper/PaperWorldMap.java
 new file mode 100644
-index 0000000000..6bb2f98b45
+index 000000000..6bb2f98b4
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldMap.java
 @@ -0,0 +1,191 @@
@@ -217,7 +217,7 @@ index 0000000000..6bb2f98b45
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0209330ad4..0a02dece68 100644
+index 74cdf4945..2bd1e7370 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -78,7 +78,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
diff --git a/Spigot-Server-Patches/0314-PreSpawnerSpawnEvent.patch b/Spigot-Server-Patches/0315-PreSpawnerSpawnEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0314-PreSpawnerSpawnEvent.patch
rename to Spigot-Server-Patches/0315-PreSpawnerSpawnEvent.patch
index 83c008361f..9c8570ab11 100644
--- a/Spigot-Server-Patches/0314-PreSpawnerSpawnEvent.patch
+++ b/Spigot-Server-Patches/0315-PreSpawnerSpawnEvent.patch
@@ -1,4 +1,4 @@
-From d5b65eb227e255c2ec85ed6bdcb4bd04a6c7f4d4 Mon Sep 17 00:00:00 2001
+From 63ba073d09459ccd57076cbfd0883d504ad21cd3 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 55764deec4..dbb8098d6c 100644
+index 55764deec..dbb8098d6 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -108,11 +108,11 @@ public abstract class MobSpawnerAbstract {
diff --git a/Spigot-Server-Patches/0315-Catch-JsonParseException-in-Entity-and-TE-names.patch b/Spigot-Server-Patches/0316-Catch-JsonParseException-in-Entity-and-TE-names.patch
similarity index 95%
rename from Spigot-Server-Patches/0315-Catch-JsonParseException-in-Entity-and-TE-names.patch
rename to Spigot-Server-Patches/0316-Catch-JsonParseException-in-Entity-and-TE-names.patch
index b6b011c676..513359b9d0 100644
--- a/Spigot-Server-Patches/0315-Catch-JsonParseException-in-Entity-and-TE-names.patch
+++ b/Spigot-Server-Patches/0316-Catch-JsonParseException-in-Entity-and-TE-names.patch
@@ -1,4 +1,4 @@
-From ba069fb3ec9315a3d5860151f681617c1ed2da89 Mon Sep 17 00:00:00 2001
+From fd55b0f55604e74068b6bc19e6fedf2f7141b2c7 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 22 Sep 2018 15:56:59 -0400
 Subject: [PATCH] Catch JsonParseException in Entity and TE names
@@ -13,7 +13,7 @@ Shulkers) may need to be changed in order for it to re-save properly
 No more crashing though.
 
 diff --git a/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java b/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java
-index 4b7aefb7a7..9e568d5d15 100644
+index 4b7aefb7a..9e568d5d1 100644
 --- a/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java
 +++ b/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java
 @@ -56,7 +56,7 @@ public abstract class CommandBlockListenerAbstract implements ICommandListener {
@@ -26,7 +26,7 @@ index 4b7aefb7a7..9e568d5d15 100644
  
          if (nbttagcompound.hasKeyOfType("TrackOutput", 1)) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index efda90f6e3..b63a8ad985 100644
+index efda90f6e..b63a8ad98 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1651,7 +1651,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -39,7 +39,7 @@ index efda90f6e3..b63a8ad985 100644
  
                      this.setCustomNameVisible(nbttagcompound.getBoolean("CustomNameVisible"));
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index 6d278a0da5..ec3732193f 100644
+index 6d278a0da..ec3732193 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -339,4 +339,19 @@ public final class MCUtil {
@@ -63,7 +63,7 @@ index 6d278a0da5..ec3732193f 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/TileEntityBanner.java b/src/main/java/net/minecraft/server/TileEntityBanner.java
-index 1f26d8a022..12264c4d03 100644
+index 1f26d8a02..12264c4d0 100644
 --- a/src/main/java/net/minecraft/server/TileEntityBanner.java
 +++ b/src/main/java/net/minecraft/server/TileEntityBanner.java
 @@ -57,7 +57,7 @@ public class TileEntityBanner extends TileEntity implements INamableTileEntity {
@@ -76,7 +76,7 @@ index 1f26d8a022..12264c4d03 100644
  
          if (this.hasWorld()) {
 diff --git a/src/main/java/net/minecraft/server/TileEntityContainer.java b/src/main/java/net/minecraft/server/TileEntityContainer.java
-index 3590b4e317..ea7d5a430a 100644
+index 3590b4e31..ea7d5a430 100644
 --- a/src/main/java/net/minecraft/server/TileEntityContainer.java
 +++ b/src/main/java/net/minecraft/server/TileEntityContainer.java
 @@ -17,7 +17,7 @@ public abstract class TileEntityContainer extends TileEntity implements IInvento
diff --git a/Spigot-Server-Patches/0316-Avoid-dimension-id-collisions.patch b/Spigot-Server-Patches/0317-Avoid-dimension-id-collisions.patch
similarity index 91%
rename from Spigot-Server-Patches/0316-Avoid-dimension-id-collisions.patch
rename to Spigot-Server-Patches/0317-Avoid-dimension-id-collisions.patch
index fd8137ba48..0c5f6bd009 100644
--- a/Spigot-Server-Patches/0316-Avoid-dimension-id-collisions.patch
+++ b/Spigot-Server-Patches/0317-Avoid-dimension-id-collisions.patch
@@ -1,4 +1,4 @@
-From 5e1bf74c8276c66d67df69c4482c4a11727b0c7f Mon Sep 17 00:00:00 2001
+From 598cd2370f3c79ea2a7e1145c1e71a52157bea96 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 25 Sep 2018 06:53:43 +0200
 Subject: [PATCH] Avoid dimension id collisions
@@ -8,7 +8,7 @@ we would reuse an existing dimension id, if some other dimension was
 unloaded before.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2e03556f2b..467583f1dc 100644
+index eb8eecde6..c97bf8a05 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -971,7 +971,7 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0317-Honor-EntityAgeable.ageLock.patch b/Spigot-Server-Patches/0318-Honor-EntityAgeable.ageLock.patch
similarity index 86%
rename from Spigot-Server-Patches/0317-Honor-EntityAgeable.ageLock.patch
rename to Spigot-Server-Patches/0318-Honor-EntityAgeable.ageLock.patch
index 8afbdef2f0..e36aec1809 100644
--- a/Spigot-Server-Patches/0317-Honor-EntityAgeable.ageLock.patch
+++ b/Spigot-Server-Patches/0318-Honor-EntityAgeable.ageLock.patch
@@ -1,11 +1,11 @@
-From ec2beef52dccd22c1ade05df0dd2f9e31ab01dcf Mon Sep 17 00:00:00 2001
+From 1df9c8bc97b11ccc9306eb858b37b7186a68ccd2 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 da9740a99e..e87754ef33 100644
+index da9740a99..e87754ef3 100644
 --- a/src/main/java/net/minecraft/server/EntityAgeable.java
 +++ b/src/main/java/net/minecraft/server/EntityAgeable.java
 @@ -85,6 +85,7 @@ public abstract class EntityAgeable extends EntityCreature {
diff --git a/Spigot-Server-Patches/0318-Configurable-connection-throttle-kick-message.patch b/Spigot-Server-Patches/0319-Configurable-connection-throttle-kick-message.patch
similarity index 94%
rename from Spigot-Server-Patches/0318-Configurable-connection-throttle-kick-message.patch
rename to Spigot-Server-Patches/0319-Configurable-connection-throttle-kick-message.patch
index 1332688dd7..c35753fbe7 100644
--- a/Spigot-Server-Patches/0318-Configurable-connection-throttle-kick-message.patch
+++ b/Spigot-Server-Patches/0319-Configurable-connection-throttle-kick-message.patch
@@ -1,11 +1,11 @@
-From 9369be9dc507ddb8928ed6a56838542d50abad44 Mon Sep 17 00:00:00 2001
+From d669857002039b1f6dea3e391b333dfda8235765 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 ffb18902ff..2d3861c184 100644
+index ffb18902f..2d3861c18 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -275,6 +275,11 @@ public class PaperConfig {
@@ -21,7 +21,7 @@ index ffb18902ff..2d3861c184 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 da88978db7..1dad796206 100644
+index da88978db..1dad79620 100644
 --- a/src/main/java/net/minecraft/server/HandshakeListener.java
 +++ b/src/main/java/net/minecraft/server/HandshakeListener.java
 @@ -38,7 +38,7 @@ public class HandshakeListener implements PacketHandshakingInListener {
diff --git a/Spigot-Server-Patches/0319-Hook-into-CB-plugin-rewrites.patch b/Spigot-Server-Patches/0320-Hook-into-CB-plugin-rewrites.patch
similarity index 98%
rename from Spigot-Server-Patches/0319-Hook-into-CB-plugin-rewrites.patch
rename to Spigot-Server-Patches/0320-Hook-into-CB-plugin-rewrites.patch
index e40d06db12..4cbc918b06 100644
--- a/Spigot-Server-Patches/0319-Hook-into-CB-plugin-rewrites.patch
+++ b/Spigot-Server-Patches/0320-Hook-into-CB-plugin-rewrites.patch
@@ -1,4 +1,4 @@
-From 7e5af8a33716abcf9ebcec662de098ec17eb8c98 Mon Sep 17 00:00:00 2001
+From 71bea266bdba742adeac29964e9738d67cbba8b8 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Wed, 3 Oct 2018 20:09:18 -0400
 Subject: [PATCH] Hook into CB plugin rewrites
@@ -8,7 +8,7 @@ our own relocation. Also lets us rewrite NMS calls for when we're
 debugging in an IDE pre-relocate.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
-index 467b2d9385..61f1023557 100644
+index 467b2d938..61f102355 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
 @@ -6,7 +6,9 @@ import java.io.FileOutputStream;
diff --git a/Spigot-Server-Patches/0320-Allow-setting-the-vex-s-summoner.patch b/Spigot-Server-Patches/0321-Allow-setting-the-vex-s-summoner.patch
similarity index 90%
rename from Spigot-Server-Patches/0320-Allow-setting-the-vex-s-summoner.patch
rename to Spigot-Server-Patches/0321-Allow-setting-the-vex-s-summoner.patch
index 36e18f5156..bcb7227544 100644
--- a/Spigot-Server-Patches/0320-Allow-setting-the-vex-s-summoner.patch
+++ b/Spigot-Server-Patches/0321-Allow-setting-the-vex-s-summoner.patch
@@ -1,11 +1,11 @@
-From f1681fe836fb4372b4423fb0d870b14be94e7772 Mon Sep 17 00:00:00 2001
+From e40b050f7de5fdf2cf4eeef058651ad9929b9992 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 83e022c91b..c569330689 100644
+index 83e022c91..c56933068 100644
 --- a/src/main/java/net/minecraft/server/EntityVex.java
 +++ b/src/main/java/net/minecraft/server/EntityVex.java
 @@ -133,6 +133,7 @@ public class EntityVex extends EntityMonster {
@@ -17,7 +17,7 @@ index 83e022c91b..c569330689 100644
          this.c = entityinsentient;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
-index 169c951ec3..2f7df3074f 100644
+index 169c951ec..2f7df3074 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
 @@ -23,6 +23,10 @@ public class CraftVex extends CraftMonster implements Vex {
diff --git a/Spigot-Server-Patches/0321-Add-sun-related-API.patch b/Spigot-Server-Patches/0322-Add-sun-related-API.patch
similarity index 91%
rename from Spigot-Server-Patches/0321-Add-sun-related-API.patch
rename to Spigot-Server-Patches/0322-Add-sun-related-API.patch
index 7115b18f1d..8148742dd8 100644
--- a/Spigot-Server-Patches/0321-Add-sun-related-API.patch
+++ b/Spigot-Server-Patches/0322-Add-sun-related-API.patch
@@ -1,11 +1,11 @@
-From bb46608200343486496988e68b6ec359e891dd0d Mon Sep 17 00:00:00 2001
+From a531f99a0c6b8b2236658d2b56d3ad8775b73819 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 Oct 2018 00:54:21 -0500
 Subject: [PATCH] Add sun related API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 11652628b1..90923c7536 100644
+index 11652628b..90923c753 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -1326,6 +1326,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -17,7 +17,7 @@ index 11652628b1..90923c7536 100644
          if (this.world.J() && !this.world.isClientSide) {
              float f = this.aE();
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 1f2e2cd873..163d7f37c9 100644
+index 1f2e2cd87..163d7f37c 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -667,6 +667,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
@@ -29,7 +29,7 @@ index 1f2e2cd873..163d7f37c9 100644
          return this.d < 4;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 1b2c5012e9..3ebea96931 100644
+index 1b2c5012e..3ebea9693 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -739,6 +739,13 @@ public class CraftWorld implements World {
@@ -47,7 +47,7 @@ index 1b2c5012e9..3ebea96931 100644
      public boolean createExplosion(double x, double y, double z, float power) {
          return createExplosion(x, y, z, power, false, true);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-index 53c2d154ed..56c233872b 100644
+index 53c2d154e..56c233872 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 @@ -68,4 +68,11 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {
diff --git a/Spigot-Server-Patches/0322-Check-Drowned-for-Villager-Aggression-Config.patch b/Spigot-Server-Patches/0323-Check-Drowned-for-Villager-Aggression-Config.patch
similarity index 93%
rename from Spigot-Server-Patches/0322-Check-Drowned-for-Villager-Aggression-Config.patch
rename to Spigot-Server-Patches/0323-Check-Drowned-for-Villager-Aggression-Config.patch
index a4ae434b51..fb71779139 100644
--- a/Spigot-Server-Patches/0322-Check-Drowned-for-Villager-Aggression-Config.patch
+++ b/Spigot-Server-Patches/0323-Check-Drowned-for-Villager-Aggression-Config.patch
@@ -1,11 +1,11 @@
-From b7abe6ba04979e1cedde9ff41593574ff66ebb70 Mon Sep 17 00:00:00 2001
+From c63f1d3334314685ee605e2449e69d7220414005 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Wed, 10 Oct 2018 21:22:44 -0500
 Subject: [PATCH] Check Drowned for Villager Aggression Config
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityDrowned.java b/src/main/java/net/minecraft/server/EntityDrowned.java
-index 3d41af8637..8177697644 100644
+index 3d41af863..817769764 100644
 --- a/src/main/java/net/minecraft/server/EntityDrowned.java
 +++ b/src/main/java/net/minecraft/server/EntityDrowned.java
 @@ -29,7 +29,7 @@ public class EntityDrowned extends EntityZombie implements IRangedEntity {
diff --git a/Spigot-Server-Patches/0323-Here-s-Johnny.patch b/Spigot-Server-Patches/0324-Here-s-Johnny.patch
similarity index 92%
rename from Spigot-Server-Patches/0323-Here-s-Johnny.patch
rename to Spigot-Server-Patches/0324-Here-s-Johnny.patch
index 4b0e0ad75a..b7bd9c6ec9 100644
--- a/Spigot-Server-Patches/0323-Here-s-Johnny.patch
+++ b/Spigot-Server-Patches/0324-Here-s-Johnny.patch
@@ -1,11 +1,11 @@
-From 829d99cc682f515a8e0465ed67d101cd5fc94800 Mon Sep 17 00:00:00 2001
+From 67311c301581a2b14d9aa52fe8fa4445be839709 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 12 Oct 2018 01:37:22 -0500
 Subject: [PATCH] Here's Johnny!
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityVindicator.java b/src/main/java/net/minecraft/server/EntityVindicator.java
-index dbd189afe6..9d3c37dce9 100644
+index dbd189afe..9d3c37dce 100644
 --- a/src/main/java/net/minecraft/server/EntityVindicator.java
 +++ b/src/main/java/net/minecraft/server/EntityVindicator.java
 @@ -11,7 +11,7 @@ public class EntityVindicator extends EntityIllagerAbstract {
@@ -18,7 +18,7 @@ index dbd189afe6..9d3c37dce9 100644
      public EntityVindicator(EntityTypes<? extends EntityVindicator> entitytypes, World world) {
          super(entitytypes, world);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java
-index 951d479298..5ff957ced7 100644
+index 951d47929..5ff957ced 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java
 @@ -25,4 +25,14 @@ public class CraftVindicator extends CraftIllager implements Vindicator {
diff --git a/Spigot-Server-Patches/0324-Turtle-API.patch b/Spigot-Server-Patches/0325-Turtle-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0324-Turtle-API.patch
rename to Spigot-Server-Patches/0325-Turtle-API.patch
index 0cebe2c2b2..fd5323385f 100644
--- a/Spigot-Server-Patches/0324-Turtle-API.patch
+++ b/Spigot-Server-Patches/0325-Turtle-API.patch
@@ -1,11 +1,11 @@
-From 34da2a3cab5b5559a7408dfd08b622b23caa7541 Mon Sep 17 00:00:00 2001
+From 5bb24023575ad2d99db5d967a7d5f05069c2cb60 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 29 Sep 2018 16:08:23 -0500
 Subject: [PATCH] Turtle API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java
-index 1b4933c077..b7929c5c46 100644
+index 1b4933c07..b7929c5c4 100644
 --- a/src/main/java/net/minecraft/server/EntityTurtle.java
 +++ b/src/main/java/net/minecraft/server/EntityTurtle.java
 @@ -27,51 +27,63 @@ public class EntityTurtle extends EntityAnimal {
@@ -104,7 +104,7 @@ index 1b4933c077..b7929c5c46 100644
  
          @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
-index 123a2c75ca..8edcf7af65 100644
+index 123a2c75c..8edcf7af6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
 @@ -1,6 +1,8 @@
diff --git a/Spigot-Server-Patches/0325-Limit-lightning-strike-effect-distance.patch b/Spigot-Server-Patches/0326-Limit-lightning-strike-effect-distance.patch
similarity index 96%
rename from Spigot-Server-Patches/0325-Limit-lightning-strike-effect-distance.patch
rename to Spigot-Server-Patches/0326-Limit-lightning-strike-effect-distance.patch
index 15b6096152..3839ad0a0b 100644
--- a/Spigot-Server-Patches/0325-Limit-lightning-strike-effect-distance.patch
+++ b/Spigot-Server-Patches/0326-Limit-lightning-strike-effect-distance.patch
@@ -1,11 +1,11 @@
-From 9fc5f13a395b716bfaf1aae52a2165375a5310cf Mon Sep 17 00:00:00 2001
+From d7357332195bb4df6bacf96931c384251fa361f9 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 2c27be63ea..fb44fccc92 100644
+index 2c27be63e..fb44fccc9 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -234,6 +234,28 @@ public class PaperWorldConfig {
@@ -38,7 +38,7 @@ index 2c27be63ea..fb44fccc92 100644
      public boolean firePhysicsEventForRedstone = false;
      private void firePhysicsEventForRedstone() {
 diff --git a/src/main/java/net/minecraft/server/EntityLightning.java b/src/main/java/net/minecraft/server/EntityLightning.java
-index adf68d1650..fbcda86b38 100644
+index adf68d165..fbcda86b3 100644
 --- a/src/main/java/net/minecraft/server/EntityLightning.java
 +++ b/src/main/java/net/minecraft/server/EntityLightning.java
 @@ -64,6 +64,17 @@ public class EntityLightning extends Entity {
@@ -69,7 +69,7 @@ index adf68d1650..fbcda86b38 100644
  
          --this.lifeTicks;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 9860175ec4..9c4ef2e004 100644
+index 9860175ec..9c4ef2e00 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1179,7 +1179,7 @@ public class WorldServer extends World {
diff --git a/Spigot-Server-Patches/0326-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/Spigot-Server-Patches/0327-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
similarity index 94%
rename from Spigot-Server-Patches/0326-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
rename to Spigot-Server-Patches/0327-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
index 11c3380668..f60a215703 100644
--- a/Spigot-Server-Patches/0326-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
+++ b/Spigot-Server-Patches/0327-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
@@ -1,4 +1,4 @@
-From 10b1b03db9330bb0d0b96d612a892779b22e1435 Mon Sep 17 00:00:00 2001
+From 9a3add5fb92ddc2ecc088790c29a15ada35f49e2 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 c19828ed56..7deeaa0834 100644
+index c19828ed5..7deeaa083 100644
 --- a/src/main/java/net/minecraft/server/EntityProjectile.java
 +++ b/src/main/java/net/minecraft/server/EntityProjectile.java
 @@ -213,11 +213,21 @@ public abstract class EntityProjectile extends Entity implements IProjectile {
diff --git a/Spigot-Server-Patches/0327-Call-player-spectator-target-events.patch b/Spigot-Server-Patches/0328-Call-player-spectator-target-events.patch
similarity index 96%
rename from Spigot-Server-Patches/0327-Call-player-spectator-target-events.patch
rename to Spigot-Server-Patches/0328-Call-player-spectator-target-events.patch
index 1080c5f1c3..7709687910 100644
--- a/Spigot-Server-Patches/0327-Call-player-spectator-target-events.patch
+++ b/Spigot-Server-Patches/0328-Call-player-spectator-target-events.patch
@@ -1,11 +1,11 @@
-From 4611e03e312ad16587c541642b5edf6819ce9b73 Mon Sep 17 00:00:00 2001
+From d65a9afe62205e6f3a61a443a5220039640c27c7 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 251166c4fe..bf1a38eb9e 100644
+index 251166c4f..bf1a38eb9 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -60,7 +60,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0328-Add-Velocity-IP-Forwarding-Support.patch b/Spigot-Server-Patches/0329-Add-Velocity-IP-Forwarding-Support.patch
similarity index 97%
rename from Spigot-Server-Patches/0328-Add-Velocity-IP-Forwarding-Support.patch
rename to Spigot-Server-Patches/0329-Add-Velocity-IP-Forwarding-Support.patch
index 067fa1f15b..abe0fc0743 100644
--- a/Spigot-Server-Patches/0328-Add-Velocity-IP-Forwarding-Support.patch
+++ b/Spigot-Server-Patches/0329-Add-Velocity-IP-Forwarding-Support.patch
@@ -1,4 +1,4 @@
-From 381b300d8708d513fbb99b392f64a2f1e897f03e Mon Sep 17 00:00:00 2001
+From 6511b39d67f36e19eb4c9ada89e8930652b35761 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 2d3861c184..a79cba50e0 100644
+index 2d3861c18..a79cba50e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -8,6 +8,7 @@ import java.io.IOException;
@@ -55,7 +55,7 @@ index 2d3861c184..a79cba50e0 100644
  }
 diff --git a/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java b/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java
 new file mode 100644
-index 0000000000..fdd8708f97
+index 000000000..fdd8708f9
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java
 @@ -0,0 +1,67 @@
@@ -127,7 +127,7 @@ index 0000000000..fdd8708f97
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index d4d752ddb4..5d46a975e3 100644
+index d4d752ddb..5d46a975e 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -42,6 +42,7 @@ public class LoginListener implements PacketLoginInListener {
@@ -203,7 +203,7 @@ index d4d752ddb4..5d46a975e3 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 6c55448078..38386d5886 100644
+index 6c5544807..38386d588 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -46,7 +46,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -216,7 +216,7 @@ index 6c55448078..38386d5886 100644
      public java.util.UUID spoofedUUID;
      public com.mojang.authlib.properties.Property[] spoofedProfile;
 diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java
-index fa2d3ce8cb..dac560c63f 100644
+index fa2d3ce8c..dac560c63 100644
 --- a/src/main/java/net/minecraft/server/PacketDataSerializer.java
 +++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java
 @@ -140,6 +140,7 @@ public class PacketDataSerializer extends ByteBuf {
@@ -244,7 +244,7 @@ index fa2d3ce8cb..dac560c63f 100644
          int j = this.i();
  
 diff --git a/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java b/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java
-index 4d1f441395..c1ca6f9501 100644
+index 4d1f44139..c1ca6f950 100644
 --- a/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java
 +++ b/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java
 @@ -4,8 +4,8 @@ import java.io.IOException;
@@ -259,7 +259,7 @@ index 4d1f441395..c1ca6f9501 100644
      public PacketLoginInCustomPayload() {}
  
 diff --git a/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java b/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java
-index ae74dc9e18..7eb230f1b2 100644
+index ae74dc9e1..7eb230f1b 100644
 --- a/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java
 +++ b/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java
 @@ -10,6 +10,14 @@ public class PacketLoginOutCustomPayload implements Packet<PacketLoginOutListene
diff --git a/Spigot-Server-Patches/0329-Add-more-Witch-API.patch b/Spigot-Server-Patches/0330-Add-more-Witch-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0329-Add-more-Witch-API.patch
rename to Spigot-Server-Patches/0330-Add-more-Witch-API.patch
index c5a5c23569..7530c37fea 100644
--- a/Spigot-Server-Patches/0329-Add-more-Witch-API.patch
+++ b/Spigot-Server-Patches/0330-Add-more-Witch-API.patch
@@ -1,11 +1,11 @@
-From 761a1274842ea4d6324083164916b56ea3925570 Mon Sep 17 00:00:00 2001
+From 393284c65e13b67068ff9340f6f7ff9f25333f5c Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 12 Oct 2018 14:10:46 -0500
 Subject: [PATCH] Add more Witch API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
-index ae9efb72c1..3cbb34a0ce 100644
+index ae9efb72c..3cbb34a0c 100644
 --- a/src/main/java/net/minecraft/server/EntityWitch.java
 +++ b/src/main/java/net/minecraft/server/EntityWitch.java
 @@ -1,5 +1,11 @@
@@ -96,7 +96,7 @@ index ae9efb72c1..3cbb34a0ce 100644
      public SoundEffect dW() {
          return SoundEffects.ENTITY_WITCH_CELEBRATE;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
-index bae107e76e..b43a2bbd5b 100644
+index bae107e76..b43a2bbd5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
 @@ -1,12 +1,18 @@
diff --git a/Spigot-Server-Patches/0330-Fix-MC-93764.patch b/Spigot-Server-Patches/0331-Fix-MC-93764.patch
similarity index 86%
rename from Spigot-Server-Patches/0330-Fix-MC-93764.patch
rename to Spigot-Server-Patches/0331-Fix-MC-93764.patch
index 796b972f87..3939e38030 100644
--- a/Spigot-Server-Patches/0330-Fix-MC-93764.patch
+++ b/Spigot-Server-Patches/0331-Fix-MC-93764.patch
@@ -1,11 +1,11 @@
-From 28acedbe36fa7727e1a151ac97d1ecbd5887ff93 Mon Sep 17 00:00:00 2001
+From f589d2e0a6939cef88911747f5207b1b8f238d87 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 19 Oct 2018 19:38:45 -0500
 Subject: [PATCH] Fix MC-93764
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldProviderTheEnd.java b/src/main/java/net/minecraft/server/WorldProviderTheEnd.java
-index 715faef171..b97408cffa 100644
+index 715faef17..b97408cff 100644
 --- a/src/main/java/net/minecraft/server/WorldProviderTheEnd.java
 +++ b/src/main/java/net/minecraft/server/WorldProviderTheEnd.java
 @@ -27,7 +27,7 @@ public class WorldProviderTheEnd extends WorldProvider {
diff --git a/Spigot-Server-Patches/0331-Add-option-to-prevent-players-from-moving-into-unloa.patch b/Spigot-Server-Patches/0332-Add-option-to-prevent-players-from-moving-into-unloa.patch
similarity index 96%
rename from Spigot-Server-Patches/0331-Add-option-to-prevent-players-from-moving-into-unloa.patch
rename to Spigot-Server-Patches/0332-Add-option-to-prevent-players-from-moving-into-unloa.patch
index e648969ec9..e60b20eaff 100644
--- a/Spigot-Server-Patches/0331-Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/Spigot-Server-Patches/0332-Add-option-to-prevent-players-from-moving-into-unloa.patch
@@ -1,4 +1,4 @@
-From f1683e79b45cd1fa6785059d3f3d2a45e9a8a501 Mon Sep 17 00:00:00 2001
+From 9433377ed63c501082a19eeb78b3270eeb8a80c3 Mon Sep 17 00:00:00 2001
 From: Gabriele C <sgdc3.mail@gmail.com>
 Date: Mon, 22 Oct 2018 17:34:10 +0200
 Subject: [PATCH] Add option to prevent players from moving into unloaded
@@ -6,7 +6,7 @@ Subject: [PATCH] Add option to prevent players from moving into unloaded
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index fb44fccc92..ad793ffa38 100644
+index fb44fccc9..ad793ffa3 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -434,4 +434,9 @@ public class PaperWorldConfig {
@@ -20,7 +20,7 @@ index fb44fccc92..ad793ffa38 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 07e9abda96..4ba13da1ad 100644
+index 07e9abda9..4ba13da1a 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -347,6 +347,13 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0332-Reset-players-airTicks-on-respawn.patch b/Spigot-Server-Patches/0333-Reset-players-airTicks-on-respawn.patch
similarity index 89%
rename from Spigot-Server-Patches/0332-Reset-players-airTicks-on-respawn.patch
rename to Spigot-Server-Patches/0333-Reset-players-airTicks-on-respawn.patch
index 8148fcee61..38b80500ff 100644
--- a/Spigot-Server-Patches/0332-Reset-players-airTicks-on-respawn.patch
+++ b/Spigot-Server-Patches/0333-Reset-players-airTicks-on-respawn.patch
@@ -1,11 +1,11 @@
-From 7696bfb71fd64aa2f863ee12ae55027ab50cf60b Mon Sep 17 00:00:00 2001
+From d8cf0ed68f026f58597ce1a0ffccf4767f2743e1 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 b63a8ad985..e58c68275b 100644
+index b63a8ad98..e58c68275 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2273,7 +2273,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -18,7 +18,7 @@ index b63a8ad985..e58c68275b 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index bf1a38eb9e..2e068ec2d9 100644
+index bf1a38eb9..2e068ec2d 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1857,6 +1857,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0333-Strip-private-area-unicode-characters-from-signs.patch b/Spigot-Server-Patches/0334-Strip-private-area-unicode-characters-from-signs.patch
similarity index 97%
rename from Spigot-Server-Patches/0333-Strip-private-area-unicode-characters-from-signs.patch
rename to Spigot-Server-Patches/0334-Strip-private-area-unicode-characters-from-signs.patch
index 4409195d6d..73204c4ac7 100644
--- a/Spigot-Server-Patches/0333-Strip-private-area-unicode-characters-from-signs.patch
+++ b/Spigot-Server-Patches/0334-Strip-private-area-unicode-characters-from-signs.patch
@@ -1,4 +1,4 @@
-From 47cd3f5ce2c63b5ad23cf4921080dafa88d87d33 Mon Sep 17 00:00:00 2001
+From 7b6141329b843781e3a5df023fb2229632de5327 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Tue, 23 Oct 2018 20:53:43 -0400
 Subject: [PATCH] Strip private area unicode characters from signs
@@ -20,7 +20,7 @@ think of no reason to use it.
 Fixes GH-1571
 
 diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
-index 626ba9b178..7b5d534f4b 100644
+index 626ba9b17..7b5d534f4 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySign.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySign.java
 @@ -14,6 +14,11 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
diff --git a/Spigot-Server-Patches/0334-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/Spigot-Server-Patches/0335-Don-t-sleep-after-profile-lookups-if-not-needed.patch
similarity index 94%
rename from Spigot-Server-Patches/0334-Don-t-sleep-after-profile-lookups-if-not-needed.patch
rename to Spigot-Server-Patches/0335-Don-t-sleep-after-profile-lookups-if-not-needed.patch
index 838c692d20..ad9be68089 100644
--- a/Spigot-Server-Patches/0334-Don-t-sleep-after-profile-lookups-if-not-needed.patch
+++ b/Spigot-Server-Patches/0335-Don-t-sleep-after-profile-lookups-if-not-needed.patch
@@ -1,4 +1,4 @@
-From b4ee01ca744d07be91ef950dfcbfd7029e32aa22 Mon Sep 17 00:00:00 2001
+From 61e56a4fe07e8c62743d11128e7cfdf299c9ffe7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 23 Oct 2018 20:25:05 -0400
 Subject: [PATCH] Don't sleep after profile lookups if not needed
@@ -7,7 +7,7 @@ Mojang was sleeping even if we had no more requests to go after
 the current one finished, resulting in 100ms lost per profile lookup
 
 diff --git a/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java b/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java
-index 71e48e87b4..23f1447cfc 100644
+index 71e48e87b..23f1447cf 100644
 --- a/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java
 +++ b/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java
 @@ -42,6 +42,7 @@ public class YggdrasilGameProfileRepository implements GameProfileRepository {
diff --git a/Spigot-Server-Patches/0335-Use-more-reasonable-thread-count-default-for-bootstr.patch b/Spigot-Server-Patches/0336-Use-more-reasonable-thread-count-default-for-bootstr.patch
similarity index 89%
rename from Spigot-Server-Patches/0335-Use-more-reasonable-thread-count-default-for-bootstr.patch
rename to Spigot-Server-Patches/0336-Use-more-reasonable-thread-count-default-for-bootstr.patch
index 7c3c008dba..f3a5b46e4c 100644
--- a/Spigot-Server-Patches/0335-Use-more-reasonable-thread-count-default-for-bootstr.patch
+++ b/Spigot-Server-Patches/0336-Use-more-reasonable-thread-count-default-for-bootstr.patch
@@ -1,11 +1,11 @@
-From b4bd9456ff2c621dbf0c29ec6c251c44e844d982 Mon Sep 17 00:00:00 2001
+From 751ed975c22f7fd9c400d0c038fddd3f23c5d158 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 23 Oct 2018 23:14:38 -0400
 Subject: [PATCH] Use more reasonable thread count default for bootstrap
 
 
 diff --git a/src/main/java/net/minecraft/server/SystemUtils.java b/src/main/java/net/minecraft/server/SystemUtils.java
-index 5fae5a1233..6bc576f10f 100644
+index 5fae5a123..6bc576f10 100644
 --- a/src/main/java/net/minecraft/server/SystemUtils.java
 +++ b/src/main/java/net/minecraft/server/SystemUtils.java
 @@ -66,7 +66,7 @@ public class SystemUtils {
diff --git a/Spigot-Server-Patches/0336-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch b/Spigot-Server-Patches/0337-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
similarity index 94%
rename from Spigot-Server-Patches/0336-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
rename to Spigot-Server-Patches/0337-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
index 6099f3a0a0..a1c9d86925 100644
--- a/Spigot-Server-Patches/0336-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
+++ b/Spigot-Server-Patches/0337-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
@@ -1,4 +1,4 @@
-From 2e3a28385a86ec41fa6c4cc4e1f1865511bf23b9 Mon Sep 17 00:00:00 2001
+From 78cc77a1b623ffb5f63d6495d5490313e5689200 Mon Sep 17 00:00:00 2001
 From: MisterVector <whizkid3000@hotmail.com>
 Date: Thu, 1 Nov 2018 14:50:05 -0700
 Subject: [PATCH] MC-136865: Use valid item for enchantment checks on block
@@ -13,7 +13,7 @@ keep the clone of the item used to a non empty value so it represents
 the item used.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index f692da609b..5bc8bd7cdc 100644
+index f692da609..5bc8bd7cd 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -354,10 +354,11 @@ public class PlayerInteractManager {
diff --git a/Spigot-Server-Patches/0337-Optimize-World-Time-Updates.patch b/Spigot-Server-Patches/0338-Optimize-World-Time-Updates.patch
similarity index 96%
rename from Spigot-Server-Patches/0337-Optimize-World-Time-Updates.patch
rename to Spigot-Server-Patches/0338-Optimize-World-Time-Updates.patch
index 40aa9e367f..2372b4391d 100644
--- a/Spigot-Server-Patches/0337-Optimize-World-Time-Updates.patch
+++ b/Spigot-Server-Patches/0338-Optimize-World-Time-Updates.patch
@@ -1,4 +1,4 @@
-From 183b805b46cbcebc5fca39e0a3d20457bc3de4f5 Mon Sep 17 00:00:00 2001
+From 84475f986b799dadb19ad533e08cf00add03268e 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 2bd1e73702..99306781f7 100644
+index 2bd1e7370..99306781f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1110,12 +1110,24 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
diff --git a/Spigot-Server-Patches/0338-Restore-custom-InventoryHolder-support.patch b/Spigot-Server-Patches/0339-Restore-custom-InventoryHolder-support.patch
similarity index 95%
rename from Spigot-Server-Patches/0338-Restore-custom-InventoryHolder-support.patch
rename to Spigot-Server-Patches/0339-Restore-custom-InventoryHolder-support.patch
index 17b09b5c79..bd429b53f8 100644
--- a/Spigot-Server-Patches/0338-Restore-custom-InventoryHolder-support.patch
+++ b/Spigot-Server-Patches/0339-Restore-custom-InventoryHolder-support.patch
@@ -1,4 +1,4 @@
-From efb81ba7e3ce6e4579527cb42e252c93e46f1308 Mon Sep 17 00:00:00 2001
+From fd24db3c4af203dd891fee90a16380c08f0dd0ef Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Mon, 5 Nov 2018 04:23:51 +0000
 Subject: [PATCH] Restore custom InventoryHolder support
@@ -17,7 +17,7 @@ will always work as intended in the past, those without will create implementati
 based inventories.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java b/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java
-index 9957ed0402..ae280dd40b 100644
+index 9957ed040..ae280dd40 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java
 @@ -39,10 +39,20 @@ public final class CraftInventoryCreator {
diff --git a/Spigot-Server-Patches/0339-Use-Vanilla-Minecart-Speeds.patch b/Spigot-Server-Patches/0340-Use-Vanilla-Minecart-Speeds.patch
similarity index 91%
rename from Spigot-Server-Patches/0339-Use-Vanilla-Minecart-Speeds.patch
rename to Spigot-Server-Patches/0340-Use-Vanilla-Minecart-Speeds.patch
index fea60e7730..f53ce511e6 100644
--- a/Spigot-Server-Patches/0339-Use-Vanilla-Minecart-Speeds.patch
+++ b/Spigot-Server-Patches/0340-Use-Vanilla-Minecart-Speeds.patch
@@ -1,4 +1,4 @@
-From d4d24addafbe9cc10946d514c6ce807f480ba5f1 Mon Sep 17 00:00:00 2001
+From c00cc02a372fb4d9749a8bb8f696b6b36190dc7b 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 6fc332dbff..828a8711d1 100644
+index 6fc332dbf..828a8711d 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 @@ -35,9 +35,9 @@ public abstract class EntityMinecartAbstract extends Entity {
diff --git a/Spigot-Server-Patches/0340-Fix-SpongeAbsortEvent-handling.patch b/Spigot-Server-Patches/0341-Fix-SpongeAbsortEvent-handling.patch
similarity index 93%
rename from Spigot-Server-Patches/0340-Fix-SpongeAbsortEvent-handling.patch
rename to Spigot-Server-Patches/0341-Fix-SpongeAbsortEvent-handling.patch
index d469ce91cd..28e5ab6faf 100644
--- a/Spigot-Server-Patches/0340-Fix-SpongeAbsortEvent-handling.patch
+++ b/Spigot-Server-Patches/0341-Fix-SpongeAbsortEvent-handling.patch
@@ -1,4 +1,4 @@
-From 1eb671b66b367e279d12bbe309a3108ff633fafe Mon Sep 17 00:00:00 2001
+From 85d1e390445ebaba7ac36e0957f53731d61f82f9 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 10 Nov 2018 05:15:21 +0000
 Subject: [PATCH] Fix SpongeAbsortEvent handling
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix SpongeAbsortEvent handling
 Only process drops when the block is actually going to be removed
 
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index 8d69a1556a..5b98c52559 100644
+index 8d69a1556..5b98c5255 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -473,7 +473,7 @@ public class Block implements IMaterial {
@@ -19,7 +19,7 @@ index 8d69a1556a..5b98c52559 100644
          if (world instanceof WorldServer) {
              a(iblockdata, (WorldServer) world, blockposition, tileentity).forEach((itemstack) -> {
 diff --git a/src/main/java/net/minecraft/server/BlockSponge.java b/src/main/java/net/minecraft/server/BlockSponge.java
-index 4e281ce6dd..6a64af71b9 100644
+index 4e281ce6d..6a64af71b 100644
 --- a/src/main/java/net/minecraft/server/BlockSponge.java
 +++ b/src/main/java/net/minecraft/server/BlockSponge.java
 @@ -113,8 +113,11 @@ public class BlockSponge extends Block {
diff --git a/Spigot-Server-Patches/0341-Don-t-allow-digging-into-unloaded-chunks.patch b/Spigot-Server-Patches/0342-Don-t-allow-digging-into-unloaded-chunks.patch
similarity index 91%
rename from Spigot-Server-Patches/0341-Don-t-allow-digging-into-unloaded-chunks.patch
rename to Spigot-Server-Patches/0342-Don-t-allow-digging-into-unloaded-chunks.patch
index ef6c8386c6..349d6694ea 100644
--- a/Spigot-Server-Patches/0341-Don-t-allow-digging-into-unloaded-chunks.patch
+++ b/Spigot-Server-Patches/0342-Don-t-allow-digging-into-unloaded-chunks.patch
@@ -1,11 +1,11 @@
-From 9f3d70e52efe6d239769232b0e385bdf4ed5bf65 Mon Sep 17 00:00:00 2001
+From f9c025ded37f68725219fa378e63f9a0409a8318 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 11 Nov 2018 21:01:09 +0000
 Subject: [PATCH] Don't allow digging into unloaded chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 4ba13da1ad..a887be15cc 100644
+index 4ba13da1a..a887be15c 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1246,6 +1246,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0342-Optimize-redstone-algorithm.patch b/Spigot-Server-Patches/0343-Optimize-redstone-algorithm.patch
similarity index 99%
rename from Spigot-Server-Patches/0342-Optimize-redstone-algorithm.patch
rename to Spigot-Server-Patches/0343-Optimize-redstone-algorithm.patch
index c5bef9cd28..deb6662bad 100644
--- a/Spigot-Server-Patches/0342-Optimize-redstone-algorithm.patch
+++ b/Spigot-Server-Patches/0343-Optimize-redstone-algorithm.patch
@@ -1,4 +1,4 @@
-From e0cd7adf613a995721814ad8bff58f90a6f20ab7 Mon Sep 17 00:00:00 2001
+From c938f619260d75439a43abea3641d20f383687b9 Mon Sep 17 00:00:00 2001
 From: theosib <millerti@172.16.221.1>
 Date: Thu, 27 Sep 2018 01:43:35 -0600
 Subject: [PATCH] Optimize redstone algorithm
@@ -19,7 +19,7 @@ Aside from making the obvious class/function renames and obfhelpers I didn't nee
 Just added Bukkit's event system and took a few liberties with dead code and comment misspellings.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index ad793ffa38..ef882b897f 100644
+index ad793ffa3..ef882b897 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -439,4 +439,14 @@ public class PaperWorldConfig {
@@ -39,7 +39,7 @@ index ad793ffa38..ef882b897f 100644
  }
 diff --git a/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java
 new file mode 100644
-index 0000000000..cf5661f1c5
+index 000000000..cf5661f1c
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java
 @@ -0,0 +1,912 @@
@@ -956,7 +956,7 @@ index 0000000000..cf5661f1c5
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/BlockRedstoneWire.java b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
-index da903f74b6..aa35e0d061 100644
+index da903f74b..aa35e0d06 100644
 --- a/src/main/java/net/minecraft/server/BlockRedstoneWire.java
 +++ b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
 @@ -1,5 +1,7 @@
@@ -1124,7 +1124,7 @@ index da903f74b6..aa35e0d061 100644
                  c(iblockdata, world, blockposition);
                  world.a(blockposition, false);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 163d7f37c9..3425f034c8 100644
+index 163d7f37c..3425f034c 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -556,6 +556,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
diff --git a/Spigot-Server-Patches/0343-force-entity-dismount-during-teleportation.patch b/Spigot-Server-Patches/0344-force-entity-dismount-during-teleportation.patch
similarity index 96%
rename from Spigot-Server-Patches/0343-force-entity-dismount-during-teleportation.patch
rename to Spigot-Server-Patches/0344-force-entity-dismount-during-teleportation.patch
index 5d3d368d43..e3dbf38bc4 100644
--- a/Spigot-Server-Patches/0343-force-entity-dismount-during-teleportation.patch
+++ b/Spigot-Server-Patches/0344-force-entity-dismount-during-teleportation.patch
@@ -1,4 +1,4 @@
-From 9de336b7403dc0d8519df139cbe9360be9c162c6 Mon Sep 17 00:00:00 2001
+From b248d1a836ab67a2d50a2d7d47908fe35e23a6d5 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Thu, 15 Nov 2018 13:38:37 +0000
 Subject: [PATCH] force entity dismount during teleportation
@@ -20,7 +20,7 @@ this is going to be the best soultion all around.
 Improvements/suggestions welcome!
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index e58c68275b..a9d85e71f1 100644
+index e58c68275..a9d85e71f 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1995,12 +1995,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -72,7 +72,7 @@ index e58c68275b..a9d85e71f1 100644
              if (event.isCancelled()) {
                  return false;
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 2f614dfb6b..4bea5f1ea2 100644
+index 2f614dfb6..4bea5f1ea 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -937,9 +937,11 @@ public abstract class EntityHuman extends EntityLiving {
@@ -91,7 +91,7 @@ index 2f614dfb6b..4bea5f1ea2 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 76aba7ea5b..1d8d589efb 100644
+index 76aba7ea5..1d8d589ef 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2661,11 +2661,13 @@ public abstract class EntityLiving extends Entity {
@@ -112,7 +112,7 @@ index 76aba7ea5b..1d8d589efb 100644
              this.B(entity);
          }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 2e068ec2d9..a05b31f73f 100644
+index 2e068ec2d..a05b31f73 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -997,11 +997,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0344-Book-Size-Limits.patch b/Spigot-Server-Patches/0345-Book-Size-Limits.patch
similarity index 96%
rename from Spigot-Server-Patches/0344-Book-Size-Limits.patch
rename to Spigot-Server-Patches/0345-Book-Size-Limits.patch
index a591ef51b4..c9df2e84c1 100644
--- a/Spigot-Server-Patches/0344-Book-Size-Limits.patch
+++ b/Spigot-Server-Patches/0345-Book-Size-Limits.patch
@@ -1,4 +1,4 @@
-From 2e1bbe500cf316fdc9d43efb43c515bdbfcdcf7f Mon Sep 17 00:00:00 2001
+From a4a3be2e676fd159d16b7497205c1a5749a393f9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 16 Nov 2018 23:08:50 -0500
 Subject: [PATCH] Book Size Limits
@@ -6,7 +6,7 @@ Subject: [PATCH] Book Size Limits
 Puts some limits on the size of books.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index a79cba50e0..e5e41c6621 100644
+index a79cba50e..e5e41c662 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -375,4 +375,11 @@ public class PaperConfig {
@@ -22,7 +22,7 @@ index a79cba50e0..e5e41c6621 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index a887be15cc..baab1a88a4 100644
+index a887be15c..baab1a88a 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -14,6 +14,7 @@ import java.util.Iterator;
diff --git a/Spigot-Server-Patches/0345-Make-the-default-permission-message-configurable.patch b/Spigot-Server-Patches/0346-Make-the-default-permission-message-configurable.patch
similarity index 94%
rename from Spigot-Server-Patches/0345-Make-the-default-permission-message-configurable.patch
rename to Spigot-Server-Patches/0346-Make-the-default-permission-message-configurable.patch
index 105459f4d3..14a43a6b9d 100644
--- a/Spigot-Server-Patches/0345-Make-the-default-permission-message-configurable.patch
+++ b/Spigot-Server-Patches/0346-Make-the-default-permission-message-configurable.patch
@@ -1,11 +1,11 @@
-From 989e90cf5780bdc6ac562c0b9a9804d3ef963660 Mon Sep 17 00:00:00 2001
+From 00f5928f1768ce8b1de130933c391da8fd09fbb1 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 e5e41c6621..8942a06bfe 100644
+index e5e41c662..8942a06bf 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -21,6 +21,7 @@ import java.util.regex.Pattern;
@@ -29,7 +29,7 @@ index e5e41c6621..8942a06bfe 100644
      private static void savePlayerData() {
          savePlayerData = getBoolean("settings.save-player-data", savePlayerData);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c97bf8a05c..88b416f600 100644
+index c97bf8a05..88b416f60 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2123,6 +2123,11 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0346-Add-more-Zombie-API.patch b/Spigot-Server-Patches/0347-Add-more-Zombie-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0346-Add-more-Zombie-API.patch
rename to Spigot-Server-Patches/0347-Add-more-Zombie-API.patch
index bc44348883..86b0025d27 100644
--- a/Spigot-Server-Patches/0346-Add-more-Zombie-API.patch
+++ b/Spigot-Server-Patches/0347-Add-more-Zombie-API.patch
@@ -1,11 +1,11 @@
-From 38d1696fcf324d1e290120399948fa79fb81ed10 Mon Sep 17 00:00:00 2001
+From 738ad01b1c3aedf48337837713706ce5d488893c Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 Oct 2018 04:29:59 -0500
 Subject: [PATCH] Add more Zombie API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 90923c7536..5cc08ca7c6 100644
+index 90923c753..5cc08ca7c 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -1246,6 +1246,8 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -18,7 +18,7 @@ index 90923c7536..5cc08ca7c6 100644
          byte b0 = (Byte) this.datawatcher.get(EntityInsentient.b);
  
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 171c1ae4ad..b20fe8e521 100644
+index 171c1ae4a..b20fe8e52 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -31,6 +31,7 @@ public class EntityZombie extends EntityMonster {
@@ -92,7 +92,7 @@ index 171c1ae4ad..b20fe8e521 100644
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
-index 0429cf020e..c4320dbb67 100644
+index 0429cf020..c4320dbb6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
 @@ -80,4 +80,41 @@ public class CraftZombie extends CraftMonster implements Zombie {
diff --git a/Spigot-Server-Patches/0347-Prevent-rayTrace-from-loading-chunks.patch b/Spigot-Server-Patches/0348-Prevent-rayTrace-from-loading-chunks.patch
similarity index 93%
rename from Spigot-Server-Patches/0347-Prevent-rayTrace-from-loading-chunks.patch
rename to Spigot-Server-Patches/0348-Prevent-rayTrace-from-loading-chunks.patch
index cee43b8aa2..68992c10ea 100644
--- a/Spigot-Server-Patches/0347-Prevent-rayTrace-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0348-Prevent-rayTrace-from-loading-chunks.patch
@@ -1,4 +1,4 @@
-From 9b61494eaa31126974f10637653cf39c1fcca4d2 Mon Sep 17 00:00:00 2001
+From ccc47d2376f1f6f4a464cdd086135dfc7801b7f1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 26 Nov 2018 19:21:58 -0500
 Subject: [PATCH] Prevent rayTrace from loading chunks
@@ -7,7 +7,7 @@ ray tracing into an unloaded chunk should be treated as a miss
 this saves a ton of lag for when AI tries to raytrace near unloaded chunks.
 
 diff --git a/src/main/java/net/minecraft/server/IBlockAccess.java b/src/main/java/net/minecraft/server/IBlockAccess.java
-index 577b227758..c5586e44d4 100644
+index 577b22775..c5586e44d 100644
 --- a/src/main/java/net/minecraft/server/IBlockAccess.java
 +++ b/src/main/java/net/minecraft/server/IBlockAccess.java
 @@ -41,7 +41,15 @@ public interface IBlockAccess {
diff --git a/Spigot-Server-Patches/0348-Handle-Large-Packets-disconnecting-client.patch b/Spigot-Server-Patches/0349-Handle-Large-Packets-disconnecting-client.patch
similarity index 95%
rename from Spigot-Server-Patches/0348-Handle-Large-Packets-disconnecting-client.patch
rename to Spigot-Server-Patches/0349-Handle-Large-Packets-disconnecting-client.patch
index dcd30dc330..7a61932994 100644
--- a/Spigot-Server-Patches/0348-Handle-Large-Packets-disconnecting-client.patch
+++ b/Spigot-Server-Patches/0349-Handle-Large-Packets-disconnecting-client.patch
@@ -1,4 +1,4 @@
-From 5d9c6194fb0111c19e6f4898f2f320f13a6d6e6e Mon Sep 17 00:00:00 2001
+From 43963caa455961da93ac4e202a2afbddf3b6f15f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 27 Nov 2018 21:18:06 -0500
 Subject: [PATCH] Handle Large Packets disconnecting client
@@ -7,7 +7,7 @@ If a players inventory is too big to send in a single packet,
 split the inventory set into multiple packets instead.
 
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 38386d5886..2c28b97d81 100644
+index 38386d588..2c28b97d8 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -99,6 +99,15 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -27,7 +27,7 @@ index 38386d5886..2c28b97d81 100644
              NetworkManager.LOGGER.debug("Skipping packet due to errors", throwable.getCause());
          } else {
 diff --git a/src/main/java/net/minecraft/server/Packet.java b/src/main/java/net/minecraft/server/Packet.java
-index 601d4d0fa2..2d8e6a2f4a 100644
+index 601d4d0fa..2d8e6a2f4 100644
 --- a/src/main/java/net/minecraft/server/Packet.java
 +++ b/src/main/java/net/minecraft/server/Packet.java
 @@ -10,6 +10,12 @@ public interface Packet<T extends PacketListener> {
@@ -44,7 +44,7 @@ index 601d4d0fa2..2d8e6a2f4a 100644
          return false;
      }
 diff --git a/src/main/java/net/minecraft/server/PacketEncoder.java b/src/main/java/net/minecraft/server/PacketEncoder.java
-index 63c4dbd327..b0cfef52cb 100644
+index 63c4dbd32..b0cfef52c 100644
 --- a/src/main/java/net/minecraft/server/PacketEncoder.java
 +++ b/src/main/java/net/minecraft/server/PacketEncoder.java
 @@ -49,7 +49,31 @@ public class PacketEncoder extends MessageToByteEncoder<Packet<?>> {
@@ -80,7 +80,7 @@ index 63c4dbd327..b0cfef52cb 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
-index d19a30ad87..58eccd9c63 100644
+index d19a30ad8..58eccd9c6 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 @@ -68,7 +68,7 @@ public class PacketPlayOutMapChunk implements Packet<PacketListenerPlayOut> {
@@ -93,7 +93,7 @@ index d19a30ad87..58eccd9c63 100644
          } else {
              this.e = new byte[i];
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutWindowItems.java b/src/main/java/net/minecraft/server/PacketPlayOutWindowItems.java
-index f7c3655671..631234324d 100644
+index f7c365567..631234324 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutWindowItems.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutWindowItems.java
 @@ -9,6 +9,15 @@ public class PacketPlayOutWindowItems implements Packet<PacketListenerPlayOut> {
diff --git a/Spigot-Server-Patches/0349-Lazy-init-world-storage-in-CraftOfflinePlayer.patch b/Spigot-Server-Patches/0350-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
similarity index 96%
rename from Spigot-Server-Patches/0349-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
rename to Spigot-Server-Patches/0350-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
index b2788c21c8..137ff65794 100644
--- a/Spigot-Server-Patches/0349-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
+++ b/Spigot-Server-Patches/0350-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
@@ -1,4 +1,4 @@
-From 1eae9651c00449affd6c0fdba6c2a3bf3fa67865 Mon Sep 17 00:00:00 2001
+From 7a8de00ab10ca0a140ab7adc0460553932af3942 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Tue, 11 Dec 2018 22:25:07 -0500
 Subject: [PATCH] Lazy init world storage in CraftOfflinePlayer
@@ -8,7 +8,7 @@ worlds loaded. This is typically a rare occurrence but probably one that
 should be covered as best we can.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-index 6a448c02ec..c1ef1c950d 100644
+index 6a448c02e..c1ef1c950 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 @@ -25,12 +25,12 @@ import org.bukkit.plugin.Plugin;
diff --git a/Spigot-Server-Patches/0350-Add-PlayerConnectionCloseEvent.patch b/Spigot-Server-Patches/0351-Add-PlayerConnectionCloseEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0350-Add-PlayerConnectionCloseEvent.patch
rename to Spigot-Server-Patches/0351-Add-PlayerConnectionCloseEvent.patch
index e2b0f16cd8..c0b092a6a6 100644
--- a/Spigot-Server-Patches/0350-Add-PlayerConnectionCloseEvent.patch
+++ b/Spigot-Server-Patches/0351-Add-PlayerConnectionCloseEvent.patch
@@ -1,4 +1,4 @@
-From fcf594bad553b6f165af034d325b4062edbb55d3 Mon Sep 17 00:00:00 2001
+From 120808b9ed9305c487d75470dadd345c67c0cc19 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sun, 7 Oct 2018 12:05:28 -0700
 Subject: [PATCH] Add PlayerConnectionCloseEvent
@@ -34,7 +34,7 @@ how PlayerPreLoginEvent interacts with PlayerConnectionCloseEvent
 is undefined.
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 5d46a975e3..9e4bc24058 100644
+index 5d46a975e..9e4bc2405 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -35,9 +35,9 @@ public class LoginListener implements PacketLoginInListener {
@@ -50,7 +50,7 @@ index 5d46a975e3..9e4bc24058 100644
      private SecretKey loginKey;
      private EntityPlayer l;
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 2c28b97d81..1b0643c27f 100644
+index 2c28b97d8..1b0643c27 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -346,6 +346,26 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
diff --git a/Spigot-Server-Patches/0351-Prevent-Enderman-from-loading-chunks.patch b/Spigot-Server-Patches/0352-Prevent-Enderman-from-loading-chunks.patch
similarity index 95%
rename from Spigot-Server-Patches/0351-Prevent-Enderman-from-loading-chunks.patch
rename to Spigot-Server-Patches/0352-Prevent-Enderman-from-loading-chunks.patch
index 8388a96108..388c68d4bc 100644
--- a/Spigot-Server-Patches/0351-Prevent-Enderman-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0352-Prevent-Enderman-from-loading-chunks.patch
@@ -1,11 +1,11 @@
-From da02e594ba25f6dd6fad129ca695a5d0acefb775 Mon Sep 17 00:00:00 2001
+From fc6ba51276935a15372f60dd20880fcd5c2a1c57 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Tue, 18 Dec 2018 02:15:08 +0000
 Subject: [PATCH] Prevent Enderman from loading chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index ad1553f6e9..c6a2e0839b 100644
+index ad1553f6e..c6a2e0839 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -325,7 +325,8 @@ public class EntityEnderman extends EntityMonster {
diff --git a/Spigot-Server-Patches/0352-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/Spigot-Server-Patches/0353-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
similarity index 96%
rename from Spigot-Server-Patches/0352-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
rename to Spigot-Server-Patches/0353-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index f8826a8c92..da11b7b21c 100644
--- a/Spigot-Server-Patches/0352-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/Spigot-Server-Patches/0353-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
@@ -1,4 +1,4 @@
-From 27165ddde31cb7ca45ad96981e26eef277bd48ed Mon Sep 17 00:00:00 2001
+From a906f9dff899ba0376b820d012236439d968674e Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Wed, 2 Jan 2019 00:35:43 -0600
 Subject: [PATCH] Add APIs to replace OfflinePlayer#getLastPlayed
@@ -16,7 +16,7 @@ intent to remove) and replace it with two new methods, clearly named and
 documented as to their purpose.
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index a05b31f73f..79139be389 100644
+index a05b31f73..79139be38 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -75,6 +75,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -28,7 +28,7 @@ index a05b31f73f..79139be389 100644
      public boolean queueHealthUpdatePacket = false;
      public net.minecraft.server.PacketPlayOutUpdateHealth queuedHealthUpdatePacket;
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index af437120ec..1eae8057d0 100644
+index af437120e..1eae8057d 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -94,6 +94,7 @@ public abstract class PlayerList {
@@ -40,7 +40,7 @@ index af437120ec..1eae8057d0 100644
          UserCache usercache = this.server.getUserCache();
          GameProfile gameprofile1 = usercache.a(gameprofile.getId());
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-index c1ef1c950d..3824180ee5 100644
+index c1ef1c950..3824180ee 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 @@ -256,6 +256,61 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
@@ -106,7 +106,7 @@ index c1ef1c950d..3824180ee5 100644
      public Location getBedSpawnLocation() {
          NBTTagCompound data = getData();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index deacc21873..367e8cfc13 100644
+index deacc2187..367e8cfc1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -137,6 +137,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0353-Fix-PlayerEditBookEvent.patch b/Spigot-Server-Patches/0354-Fix-PlayerEditBookEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0353-Fix-PlayerEditBookEvent.patch
rename to Spigot-Server-Patches/0354-Fix-PlayerEditBookEvent.patch
index 44339ed051..32ef46142e 100644
--- a/Spigot-Server-Patches/0353-Fix-PlayerEditBookEvent.patch
+++ b/Spigot-Server-Patches/0354-Fix-PlayerEditBookEvent.patch
@@ -1,4 +1,4 @@
-From 75c388ae8efdabad3fb9a599baa74263f32113c4 Mon Sep 17 00:00:00 2001
+From 4d0a37f46e4edd5bd6438eb4c6ae0a7e5214064d Mon Sep 17 00:00:00 2001
 From: Michael Himing <mhiming@gmail.com>
 Date: Sun, 16 Dec 2018 13:07:33 +1100
 Subject: [PATCH] Fix PlayerEditBookEvent
@@ -10,7 +10,7 @@ it impossible to properly cancel the event or modify the book meta
 cancelled writing
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index baab1a88a4..f007290ff0 100644
+index baab1a88a..f007290ff 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -860,9 +860,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0354-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/Spigot-Server-Patches/0355-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
similarity index 90%
rename from Spigot-Server-Patches/0354-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
rename to Spigot-Server-Patches/0355-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
index 75be42c6f3..5865e95935 100644
--- a/Spigot-Server-Patches/0354-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
+++ b/Spigot-Server-Patches/0355-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
@@ -1,11 +1,11 @@
-From a05976de516ef8433d2116731f04852d7c5c4730 Mon Sep 17 00:00:00 2001
+From 0b348726ba58833452b50fc0d6e5ac8ce349c5a9 Mon Sep 17 00:00:00 2001
 From: connorhartley <vectrixu+gh@gmail.com>
 Date: Mon, 7 Jan 2019 14:43:48 -0600
 Subject: [PATCH] Workaround for vehicle tracking issue on disconnect
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 79139be389..c7f22870b6 100644
+index 79139be38..c7f22870b 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1280,6 +1280,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0355-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch b/Spigot-Server-Patches/0356-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
similarity index 96%
rename from Spigot-Server-Patches/0355-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
rename to Spigot-Server-Patches/0356-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
index a2488ea005..a4969995a1 100644
--- a/Spigot-Server-Patches/0355-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
+++ b/Spigot-Server-Patches/0356-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
@@ -1,4 +1,4 @@
-From 09f0f1e10341b6b3ff895713bb2f67cceec79e7d Mon Sep 17 00:00:00 2001
+From 526e77b1d53264548589704961c8e62942ffc0f0 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Thu, 31 Jan 2019 16:33:36 -0500
 Subject: [PATCH] Fire BlockPistonRetractEvent for all empty pistons
@@ -24,7 +24,7 @@ Instead we opt to remove the check entirely so that the event fires for
 all piston types.
 
 diff --git a/src/main/java/net/minecraft/server/BlockPiston.java b/src/main/java/net/minecraft/server/BlockPiston.java
-index 141006e36e..78603d2cb5 100644
+index 141006e36..78603d2cb 100644
 --- a/src/main/java/net/minecraft/server/BlockPiston.java
 +++ b/src/main/java/net/minecraft/server/BlockPiston.java
 @@ -121,7 +121,7 @@ public class BlockPiston extends BlockDirectional {
diff --git a/Spigot-Server-Patches/0356-Block-Entity-remove-from-being-called-on-Players.patch b/Spigot-Server-Patches/0357-Block-Entity-remove-from-being-called-on-Players.patch
similarity index 93%
rename from Spigot-Server-Patches/0356-Block-Entity-remove-from-being-called-on-Players.patch
rename to Spigot-Server-Patches/0357-Block-Entity-remove-from-being-called-on-Players.patch
index 1b1ec94e76..8f1a2c36c0 100644
--- a/Spigot-Server-Patches/0356-Block-Entity-remove-from-being-called-on-Players.patch
+++ b/Spigot-Server-Patches/0357-Block-Entity-remove-from-being-called-on-Players.patch
@@ -1,4 +1,4 @@
-From b2d8db60f5a9a45204395def23dba33639082503 Mon Sep 17 00:00:00 2001
+From ffa6d841ac14b1b378e3a19fe391af3344c50e0d Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Mon, 4 Feb 2019 23:33:24 -0500
 Subject: [PATCH] Block Entity#remove from being called on Players
@@ -12,7 +12,7 @@ Player we will look at limiting the scope of this change. It appears to
 be unintentional in the few cases we've seen so far.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 367e8cfc13..c020d0b4e6 100644
+index 367e8cfc1..c020d0b4e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1953,6 +1953,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0357-Allow-Saving-of-Oversized-Chunks.patch b/Spigot-Server-Patches/0358-Allow-Saving-of-Oversized-Chunks.patch
similarity index 99%
rename from Spigot-Server-Patches/0357-Allow-Saving-of-Oversized-Chunks.patch
rename to Spigot-Server-Patches/0358-Allow-Saving-of-Oversized-Chunks.patch
index 410cfdbe48..80845d225c 100644
--- a/Spigot-Server-Patches/0357-Allow-Saving-of-Oversized-Chunks.patch
+++ b/Spigot-Server-Patches/0358-Allow-Saving-of-Oversized-Chunks.patch
@@ -1,4 +1,4 @@
-From 8fe59ba0e9e5ea59b6886dd20bd9eb72a1abe87f Mon Sep 17 00:00:00 2001
+From 9d6f89ebd925e3ceb8114f517c4827d0bc344b46 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 15 Feb 2019 01:08:19 -0500
 Subject: [PATCH] Allow Saving of Oversized Chunks
@@ -31,7 +31,7 @@ this fix, as the data will remain in the oversized file. Once the server returns
 to a jar with this fix, the data will be restored.
 
 diff --git a/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java b/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java
-index 9fd8a75dae..d49afd622e 100644
+index 9fd8a75da..d49afd622 100644
 --- a/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java
 +++ b/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java
 @@ -69,6 +69,7 @@ public class NBTCompressedStreamTools {
@@ -51,7 +51,7 @@ index 9fd8a75dae..d49afd622e 100644
          a((NBTBase) nbttagcompound, dataoutput);
      }
 diff --git a/src/main/java/net/minecraft/server/NBTTagList.java b/src/main/java/net/minecraft/server/NBTTagList.java
-index b7c94fe238..80eea5dfbd 100644
+index b7c94fe23..80eea5dfb 100644
 --- a/src/main/java/net/minecraft/server/NBTTagList.java
 +++ b/src/main/java/net/minecraft/server/NBTTagList.java
 @@ -11,7 +11,7 @@ import java.util.Objects;
@@ -64,7 +64,7 @@ index b7c94fe238..80eea5dfbd 100644
  
      public NBTTagList() {}
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index e68f901943..ed2ccebb23 100644
+index e68f90194..ed2ccebb2 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -23,7 +23,7 @@ public class RegionFile implements AutoCloseable {
@@ -286,7 +286,7 @@ index e68f901943..ed2ccebb23 100644
 +
  }
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index 74f102adf5..3f7190b6a2 100644
+index 74f102adf..3f7190b6a 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -47,6 +47,7 @@ public abstract class RegionFileCache implements AutoCloseable {
diff --git a/Spigot-Server-Patches/0358-BlockDestroyEvent.patch b/Spigot-Server-Patches/0359-BlockDestroyEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0358-BlockDestroyEvent.patch
rename to Spigot-Server-Patches/0359-BlockDestroyEvent.patch
index ade6640a3e..e920a592e7 100644
--- a/Spigot-Server-Patches/0358-BlockDestroyEvent.patch
+++ b/Spigot-Server-Patches/0359-BlockDestroyEvent.patch
@@ -1,4 +1,4 @@
-From 5cf57792306a23fa4b0472b61bfe4715d96a3b6b Mon Sep 17 00:00:00 2001
+From 1413bae6de96ea8e6d20801ec5e5505e23e09f9c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 6 Feb 2019 00:20:33 -0500
 Subject: [PATCH] BlockDestroyEvent
@@ -11,7 +11,7 @@ floating in the air.
 This can replace many uses of BlockPhysicsEvent
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 3425f034c8..4280fdf807 100644
+index 3425f034c..4280fdf80 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -486,8 +486,20 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
diff --git a/Spigot-Server-Patches/0359-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/Spigot-Server-Patches/0360-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
similarity index 96%
rename from Spigot-Server-Patches/0359-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
rename to Spigot-Server-Patches/0360-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
index c2786f8c8c..5904e93b83 100644
--- a/Spigot-Server-Patches/0359-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
+++ b/Spigot-Server-Patches/0360-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
@@ -1,4 +1,4 @@
-From dcfd1de5071f7ce5878b0d7e1e53ffbe1ae1925e Mon Sep 17 00:00:00 2001
+From 1f27a68ba3937a8da619a8755a4351b83244053c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Jan 2019 00:08:15 -0500
 Subject: [PATCH] Fix Custom Shapeless Custom Crafting Recipes
@@ -10,7 +10,7 @@ This made the Bukkit RecipeChoice API not work for Shapeless.
 This reimplements vanilla logic using the same test logic as Shaped
 
 diff --git a/src/main/java/net/minecraft/server/ShapelessRecipes.java b/src/main/java/net/minecraft/server/ShapelessRecipes.java
-index 070fc1e3ec..691e697d68 100644
+index 070fc1e3e..691e697d6 100644
 --- a/src/main/java/net/minecraft/server/ShapelessRecipes.java
 +++ b/src/main/java/net/minecraft/server/ShapelessRecipes.java
 @@ -63,16 +63,46 @@ public class ShapelessRecipes implements RecipeCrafting {
diff --git a/Spigot-Server-Patches/0360-Fix-sign-edit-memory-leak.patch b/Spigot-Server-Patches/0361-Fix-sign-edit-memory-leak.patch
similarity index 94%
rename from Spigot-Server-Patches/0360-Fix-sign-edit-memory-leak.patch
rename to Spigot-Server-Patches/0361-Fix-sign-edit-memory-leak.patch
index 0496eb0e9b..4ea147515e 100644
--- a/Spigot-Server-Patches/0360-Fix-sign-edit-memory-leak.patch
+++ b/Spigot-Server-Patches/0361-Fix-sign-edit-memory-leak.patch
@@ -1,4 +1,4 @@
-From 5c8217ef0e4c8ab41f46a343a67b796cc6159c2f Mon Sep 17 00:00:00 2001
+From 52569d04f6fedc9278ab2c566445671539eec8db Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 28 Feb 2019 00:15:28 -0500
 Subject: [PATCH] Fix sign edit memory leak
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix sign edit memory leak
 when a player edits a sign, a reference to their Entity is never cleand up.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index f007290ff0..7c9cd1aa42 100644
+index f007290ff..7c9cd1aa4 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2561,7 +2561,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -19,7 +19,7 @@ index f007290ff0..7c9cd1aa42 100644
                  this.sendPacket(tileentity.getUpdatePacket()); // CraftBukkit
                  return;
 diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
-index 7b5d534f4b..daf0aeb43f 100644
+index 7b5d534f4..daf0aeb43 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySign.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySign.java
 @@ -17,6 +17,7 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
diff --git a/Spigot-Server-Patches/0361-Limit-Client-Sign-length-more.patch b/Spigot-Server-Patches/0362-Limit-Client-Sign-length-more.patch
similarity index 96%
rename from Spigot-Server-Patches/0361-Limit-Client-Sign-length-more.patch
rename to Spigot-Server-Patches/0362-Limit-Client-Sign-length-more.patch
index e67d080309..36d08ec72b 100644
--- a/Spigot-Server-Patches/0361-Limit-Client-Sign-length-more.patch
+++ b/Spigot-Server-Patches/0362-Limit-Client-Sign-length-more.patch
@@ -1,4 +1,4 @@
-From 68315cf5d912f3820f42d0f2ae4fdf3c0af52ddb Mon Sep 17 00:00:00 2001
+From 42359cbc6d4c23f027c0ebbf478569390d916464 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 27 Feb 2019 22:18:40 -0500
 Subject: [PATCH] Limit Client Sign length more
@@ -22,7 +22,7 @@ it only impacts data sent from the client.
 Set -DPaper.maxSignLength=XX to change limit or -1 to disable
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 7c9cd1aa42..09030abc72 100644
+index 7c9cd1aa4..09030abc7 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -103,6 +103,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0362-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/Spigot-Server-Patches/0363-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
similarity index 93%
rename from Spigot-Server-Patches/0362-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
rename to Spigot-Server-Patches/0363-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
index 7f9d29f3fa..24a44a43a3 100644
--- a/Spigot-Server-Patches/0362-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
+++ b/Spigot-Server-Patches/0363-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
@@ -1,4 +1,4 @@
-From 7a46ee14fc852322b30a13ec1a3b5999c3f2ba4a Mon Sep 17 00:00:00 2001
+From 8b5be03f29233ec04460af50651a60799c74acc0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 2 Mar 2019 11:11:29 -0500
 Subject: [PATCH] Don't check ConvertSigns boolean every sign save
@@ -7,7 +7,7 @@ property lookups arent super cheap. they synchronize, validate
 and check security managers.
 
 diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
-index daf0aeb43f..91c99222d5 100644
+index daf0aeb43..91c99222d 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySign.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySign.java
 @@ -18,6 +18,7 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
diff --git a/Spigot-Server-Patches/0363-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch b/Spigot-Server-Patches/0364-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
similarity index 95%
rename from Spigot-Server-Patches/0363-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
rename to Spigot-Server-Patches/0364-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
index 60a0f9c7c3..5c25c86283 100644
--- a/Spigot-Server-Patches/0363-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
+++ b/Spigot-Server-Patches/0364-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
@@ -1,4 +1,4 @@
-From b38593b691414de05b216c11ea24e87058b9b9fb Mon Sep 17 00:00:00 2001
+From a1999499091cbd5b29e9c051cc32f9beb2d1df39 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 2 Mar 2019 14:55:01 -0500
 Subject: [PATCH] Handle Excessive Signs in Chunks creating too large of
@@ -11,7 +11,7 @@ Use -DPaper.excessiveSignsLimit=500 to configure that limit, or -1
 to disable the limit and let your players be abused.
 
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 1b0643c27f..4766f7b773 100644
+index 1b0643c27..4766f7b77 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -220,6 +220,15 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -31,7 +31,7 @@ index 1b0643c27f..4766f7b773 100644
  
      private void sendPacketQueue() { this.o(); } // Paper - OBFHELPER
 diff --git a/src/main/java/net/minecraft/server/Packet.java b/src/main/java/net/minecraft/server/Packet.java
-index 2d8e6a2f4a..8d0965a053 100644
+index 2d8e6a2f4..8d0965a05 100644
 --- a/src/main/java/net/minecraft/server/Packet.java
 +++ b/src/main/java/net/minecraft/server/Packet.java
 @@ -11,6 +11,7 @@ public interface Packet<T extends PacketListener> {
@@ -43,7 +43,7 @@ index 2d8e6a2f4a..8d0965a053 100644
          return false;
      }
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
-index 58eccd9c63..ef71a1feb3 100644
+index 58eccd9c6..ef71a1feb 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 @@ -20,6 +20,15 @@ public class PacketPlayOutMapChunk implements Packet<PacketListenerPlayOut> {
diff --git a/Spigot-Server-Patches/0364-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch b/Spigot-Server-Patches/0365-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
similarity index 95%
rename from Spigot-Server-Patches/0364-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
rename to Spigot-Server-Patches/0365-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
index 6f86840d29..68d1d22b56 100644
--- a/Spigot-Server-Patches/0364-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
+++ b/Spigot-Server-Patches/0365-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
@@ -1,4 +1,4 @@
-From bd800599343bcabf709745330c1dfcd9bf243dcf Mon Sep 17 00:00:00 2001
+From cbcb45ce92a783630c26656564b1d99326d43266 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 2 Mar 2019 16:12:35 -0500
 Subject: [PATCH] MC-145260: Fix Whitelist On/Off inconsistency
@@ -11,7 +11,7 @@ everything to the Whitelist object.
 https://github.com/PaperMC/Paper/issues/1880
 
 diff --git a/src/main/java/net/minecraft/server/JsonList.java b/src/main/java/net/minecraft/server/JsonList.java
-index c169d01762..55bc4b265d 100644
+index c169d0176..55bc4b265 100644
 --- a/src/main/java/net/minecraft/server/JsonList.java
 +++ b/src/main/java/net/minecraft/server/JsonList.java
 @@ -64,6 +64,7 @@ public class JsonList<K, V extends JsonListEntry<K>> {
@@ -23,7 +23,7 @@ index c169d01762..55bc4b265d 100644
          this.e = flag;
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 1eae8057d0..e6c894463b 100644
+index 1eae8057d..e6c894463 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -62,7 +62,7 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0365-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/Spigot-Server-Patches/0366-Set-Zombie-last-tick-at-start-of-drowning-process.patch
similarity index 89%
rename from Spigot-Server-Patches/0365-Set-Zombie-last-tick-at-start-of-drowning-process.patch
rename to Spigot-Server-Patches/0366-Set-Zombie-last-tick-at-start-of-drowning-process.patch
index ee8439930d..be167ff817 100644
--- a/Spigot-Server-Patches/0365-Set-Zombie-last-tick-at-start-of-drowning-process.patch
+++ b/Spigot-Server-Patches/0366-Set-Zombie-last-tick-at-start-of-drowning-process.patch
@@ -1,4 +1,4 @@
-From 719fd3eb1c543a96df1149d27be9a07cf254f401 Mon Sep 17 00:00:00 2001
+From 9990944cbb2b0f091fd26a876c6e9bbab7bf4212 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Mon, 4 Mar 2019 02:23:28 -0500
 Subject: [PATCH] Set Zombie last tick at start of drowning process
@@ -6,7 +6,7 @@ Subject: [PATCH] Set Zombie last tick at start of drowning process
 Fixes GH-1887
 
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index b20fe8e521..40a796384c 100644
+index b20fe8e52..40a796384 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -167,6 +167,7 @@ public class EntityZombie extends EntityMonster {
diff --git a/Spigot-Server-Patches/0366-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/Spigot-Server-Patches/0367-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
similarity index 87%
rename from Spigot-Server-Patches/0366-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
rename to Spigot-Server-Patches/0367-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
index 40f8ed3896..5b2362495c 100644
--- a/Spigot-Server-Patches/0366-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
+++ b/Spigot-Server-Patches/0367-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
@@ -1,11 +1,11 @@
-From bdc54a426e6f5a6b451ebfd539529c870c923f22 Mon Sep 17 00:00:00 2001
+From f49d4f07fe1c441001d5116594585e3bad5eb04f Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Wed, 13 Mar 2019 20:08:09 +0200
 Subject: [PATCH] Call WhitelistToggleEvent when whitelist is toggled
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index e6c894463b..ce66596c63 100644
+index e6c894463..ce66596c6 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1034,6 +1034,7 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0367-Add-LivingEntity-getTargetEntity.patch b/Spigot-Server-Patches/0368-Add-LivingEntity-getTargetEntity.patch
similarity index 96%
rename from Spigot-Server-Patches/0367-Add-LivingEntity-getTargetEntity.patch
rename to Spigot-Server-Patches/0368-Add-LivingEntity-getTargetEntity.patch
index 0d187b16b8..a2754fdab3 100644
--- a/Spigot-Server-Patches/0367-Add-LivingEntity-getTargetEntity.patch
+++ b/Spigot-Server-Patches/0368-Add-LivingEntity-getTargetEntity.patch
@@ -1,11 +1,11 @@
-From 83591a77f12c29f01b8411e0946b3f8fa276c29d Mon Sep 17 00:00:00 2001
+From 118af91da8b23d665b578d184d16dc1d9a257dae Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 22 Sep 2018 00:33:08 -0500
 Subject: [PATCH] Add LivingEntity#getTargetEntity
 
 
 diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java
-index b38fc50bb7..d02c77664c 100644
+index b38fc50bb..d02c77664 100644
 --- a/src/main/java/net/minecraft/server/AxisAlignedBB.java
 +++ b/src/main/java/net/minecraft/server/AxisAlignedBB.java
 @@ -108,6 +108,7 @@ public class AxisAlignedBB {
@@ -46,7 +46,7 @@ index b38fc50bb7..d02c77664c 100644
          double[] adouble = new double[] { 1.0D};
          double d0 = vec3d1.x - vec3d.x;
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index a9d85e71f1..35ec15b392 100644
+index a9d85e71f..35ec15b39 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1447,6 +1447,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -66,7 +66,7 @@ index a9d85e71f1..35ec15b392 100644
          return 0.0F;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 1d8d589efb..f55ace4bc3 100644
+index 1d8d589ef..f55ace4bc 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -3217,6 +3217,37 @@ public abstract class EntityLiving extends Entity {
@@ -108,7 +108,7 @@ index 1d8d589efb..f55ace4bc3 100644
  
      public int getShieldBlockingDelay() {
 diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
-index 035d70419d..2ebcbe17ce 100644
+index 035d70419..2ebcbe17c 100644
 --- a/src/main/java/net/minecraft/server/IEntitySelector.java
 +++ b/src/main/java/net/minecraft/server/IEntitySelector.java
 @@ -18,6 +18,7 @@ public final class IEntitySelector {
@@ -120,7 +120,7 @@ index 035d70419d..2ebcbe17ce 100644
          return !entity.t();
      };
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index d5c4115a85..c4aa1945ff 100644
+index d5c4115a8..c4aa1945f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -202,6 +202,33 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/Spigot-Server-Patches/0368-Use-proper-max-length-when-serialising-BungeeCord-te.patch b/Spigot-Server-Patches/0369-Use-proper-max-length-when-serialising-BungeeCord-te.patch
similarity index 94%
rename from Spigot-Server-Patches/0368-Use-proper-max-length-when-serialising-BungeeCord-te.patch
rename to Spigot-Server-Patches/0369-Use-proper-max-length-when-serialising-BungeeCord-te.patch
index ffef09440b..94555cffd5 100644
--- a/Spigot-Server-Patches/0368-Use-proper-max-length-when-serialising-BungeeCord-te.patch
+++ b/Spigot-Server-Patches/0369-Use-proper-max-length-when-serialising-BungeeCord-te.patch
@@ -1,4 +1,4 @@
-From 138544dcafd7d03b00c677847ec99d4e12a809c8 Mon Sep 17 00:00:00 2001
+From 8c00a5074a4e7a81b0222950ad3568bcfff15191 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 20 Mar 2019 21:19:29 -0700
 Subject: [PATCH] Use proper max length when serialising BungeeCord text
@@ -6,7 +6,7 @@ Subject: [PATCH] Use proper max length when serialising BungeeCord text
 
 
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutChat.java b/src/main/java/net/minecraft/server/PacketPlayOutChat.java
-index 0ab611564e..f7b2095bb7 100644
+index 0ab611564..f7b2095bb 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutChat.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutChat.java
 @@ -3,7 +3,7 @@ package net.minecraft.server;
diff --git a/Spigot-Server-Patches/0369-Entity-getEntitySpawnReason.patch b/Spigot-Server-Patches/0370-Entity-getEntitySpawnReason.patch
similarity index 96%
rename from Spigot-Server-Patches/0369-Entity-getEntitySpawnReason.patch
rename to Spigot-Server-Patches/0370-Entity-getEntitySpawnReason.patch
index 308bb57ecb..cd5cc934ff 100644
--- a/Spigot-Server-Patches/0369-Entity-getEntitySpawnReason.patch
+++ b/Spigot-Server-Patches/0370-Entity-getEntitySpawnReason.patch
@@ -1,4 +1,4 @@
-From e6629488796d9f20e9d7d2e5bafd8e30b403d610 Mon Sep 17 00:00:00 2001
+From ff16b5f55a5a4b182b35a3fcd8b704b7a1aedf03 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 24 Mar 2019 00:24:52 -0400
 Subject: [PATCH] Entity#getEntitySpawnReason
@@ -10,7 +10,7 @@ persistenting Living Entity, SPAWNER for spawners,
 or DEFAULT since data was not stored.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 35ec15b392..7ded9bc6ce 100644
+index 35ec15b39..7ded9bc6c 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -68,6 +68,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -59,7 +59,7 @@ index 35ec15b392..7ded9bc6ce 100644
  
          } catch (Throwable throwable) {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index ce66596c63..5645147dad 100644
+index ce66596c6..5645147da 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -250,7 +250,7 @@ public abstract class PlayerList {
@@ -72,7 +72,7 @@ index ce66596c63..5645147dad 100644
              });
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 9c4ef2e004..1a01e5e696 100644
+index 9c4ef2e00..1a01e5e69 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -932,6 +932,7 @@ public class WorldServer extends World {
@@ -84,7 +84,7 @@ index 9c4ef2e004..1a01e5e696 100644
          if (entity.dead) {
              // Paper start
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 1cd3448e57..15042943c9 100644
+index 1cd3448e5..15042943c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1053,5 +1053,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/Spigot-Server-Patches/0370-Update-entity-Metadata-for-all-tracked-players.patch b/Spigot-Server-Patches/0371-Update-entity-Metadata-for-all-tracked-players.patch
similarity index 92%
rename from Spigot-Server-Patches/0370-Update-entity-Metadata-for-all-tracked-players.patch
rename to Spigot-Server-Patches/0371-Update-entity-Metadata-for-all-tracked-players.patch
index c3b2bce39e..225f314845 100644
--- a/Spigot-Server-Patches/0370-Update-entity-Metadata-for-all-tracked-players.patch
+++ b/Spigot-Server-Patches/0371-Update-entity-Metadata-for-all-tracked-players.patch
@@ -1,11 +1,11 @@
-From 253f6c27ac6f10c57ae517b3f391ddfae86c9f53 Mon Sep 17 00:00:00 2001
+From 51a4c256dd261b208e9b03e00e79022fbbf41a60 Mon Sep 17 00:00:00 2001
 From: AgentTroll <woodyc40@gmail.com>
 Date: Fri, 22 Mar 2019 22:24:03 -0700
 Subject: [PATCH] Update entity Metadata for all tracked players
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index afd8748da8..17b6ab57c2 100644
+index afd8748da..17b6ab57c 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -379,6 +379,12 @@ public class EntityTrackerEntry {
@@ -22,7 +22,7 @@ index afd8748da8..17b6ab57c2 100644
          this.f.accept(packet);
          if (this.tracker instanceof EntityPlayer) {
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 09030abc72..5b45763886 100644
+index 09030abc7..5b4576388 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2021,7 +2021,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0371-Fire-event-on-GS4-query.patch b/Spigot-Server-Patches/0372-Fire-event-on-GS4-query.patch
similarity index 98%
rename from Spigot-Server-Patches/0371-Fire-event-on-GS4-query.patch
rename to Spigot-Server-Patches/0372-Fire-event-on-GS4-query.patch
index b437b4ec83..19d86e1c77 100644
--- a/Spigot-Server-Patches/0371-Fire-event-on-GS4-query.patch
+++ b/Spigot-Server-Patches/0372-Fire-event-on-GS4-query.patch
@@ -1,11 +1,11 @@
-From e9541b5a0040dcaa3d103b945c488684a44df5a3 Mon Sep 17 00:00:00 2001
+From 5b1d72647f333376a2c59ce57ab20d1ec05e9119 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Sun, 17 Mar 2019 21:46:56 +0200
 Subject: [PATCH] Fire event on GS4 query
 
 
 diff --git a/src/main/java/net/minecraft/server/RemoteConnectionThread.java b/src/main/java/net/minecraft/server/RemoteConnectionThread.java
-index 66bfbcf02b..d821ef9a75 100644
+index 66bfbcf02..d821ef9a7 100644
 --- a/src/main/java/net/minecraft/server/RemoteConnectionThread.java
 +++ b/src/main/java/net/minecraft/server/RemoteConnectionThread.java
 @@ -15,7 +15,7 @@ public abstract class RemoteConnectionThread implements Runnable {
@@ -26,7 +26,7 @@ index 66bfbcf02b..d821ef9a75 100644
          return this.b.getPlayerCount();
      }
 diff --git a/src/main/java/net/minecraft/server/RemoteStatusListener.java b/src/main/java/net/minecraft/server/RemoteStatusListener.java
-index ddb4ba4899..3770334fc4 100644
+index ddb4ba489..3770334fc 100644
 --- a/src/main/java/net/minecraft/server/RemoteStatusListener.java
 +++ b/src/main/java/net/minecraft/server/RemoteStatusListener.java
 @@ -21,19 +21,19 @@ public class RemoteStatusListener extends RemoteConnectionThread {
@@ -184,7 +184,7 @@ index ddb4ba4899..3770334fc4 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/RemoteStatusReply.java b/src/main/java/net/minecraft/server/RemoteStatusReply.java
-index 848b5c3f0e..73efea7e13 100644
+index 848b5c3f0..73efea7e1 100644
 --- a/src/main/java/net/minecraft/server/RemoteStatusReply.java
 +++ b/src/main/java/net/minecraft/server/RemoteStatusReply.java
 @@ -18,15 +18,27 @@ public class RemoteStatusReply {
diff --git a/Spigot-Server-Patches/0372-Implement-PlayerPostRespawnEvent.patch b/Spigot-Server-Patches/0373-Implement-PlayerPostRespawnEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0372-Implement-PlayerPostRespawnEvent.patch
rename to Spigot-Server-Patches/0373-Implement-PlayerPostRespawnEvent.patch
index 39eca02bdd..15e9acf43c 100644
--- a/Spigot-Server-Patches/0372-Implement-PlayerPostRespawnEvent.patch
+++ b/Spigot-Server-Patches/0373-Implement-PlayerPostRespawnEvent.patch
@@ -1,11 +1,11 @@
-From c3c147043d8ca596d238e835eef6e613b7af7c50 Mon Sep 17 00:00:00 2001
+From 4586cbcfa44debe50fe0af9ba9a9fa61f7dea122 Mon Sep 17 00:00:00 2001
 From: MisterVector <whizkid3000@hotmail.com>
 Date: Fri, 26 Oct 2018 21:31:00 -0700
 Subject: [PATCH] Implement PlayerPostRespawnEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 5645147dad..0e7e47f831 100644
+index 5645147da..0e7e47f83 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -637,9 +637,14 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0373-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/Spigot-Server-Patches/0374-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
similarity index 93%
rename from Spigot-Server-Patches/0373-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
rename to Spigot-Server-Patches/0374-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
index 82c1d5bc59..69eb37627b 100644
--- a/Spigot-Server-Patches/0373-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
+++ b/Spigot-Server-Patches/0374-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
@@ -1,4 +1,4 @@
-From 6ffd63eb0fe5f5e727e758e082bc8bdb6e9b2fbc Mon Sep 17 00:00:00 2001
+From e37f1eb51738e8092a3111dcd21a3ef5bf2ea0c9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 24 Mar 2019 18:09:20 -0400
 Subject: [PATCH] don't go below 0 for pickupDelay, breaks picking up items
@@ -6,7 +6,7 @@ Subject: [PATCH] don't go below 0 for pickupDelay, breaks picking up items
 vanilla checks for == 0
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index ddd1f63073..7e92563141 100644
+index ddd1f6307..7e9256314 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -59,6 +59,7 @@ public class EntityItem extends Entity {
diff --git a/Spigot-Server-Patches/0374-Implement-getters-and-setters-for-EntityItem-owner-a.patch b/Spigot-Server-Patches/0375-Implement-getters-and-setters-for-EntityItem-owner-a.patch
similarity index 93%
rename from Spigot-Server-Patches/0374-Implement-getters-and-setters-for-EntityItem-owner-a.patch
rename to Spigot-Server-Patches/0375-Implement-getters-and-setters-for-EntityItem-owner-a.patch
index 1702af9830..200d35018e 100644
--- a/Spigot-Server-Patches/0374-Implement-getters-and-setters-for-EntityItem-owner-a.patch
+++ b/Spigot-Server-Patches/0375-Implement-getters-and-setters-for-EntityItem-owner-a.patch
@@ -1,4 +1,4 @@
-From c281ef7d1be29122f33777860b53e21bfc176e2c Mon Sep 17 00:00:00 2001
+From 2545cd7990271021c0219055a0e75eb53f48e638 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 6 Oct 2018 20:54:23 -0500
 Subject: [PATCH] Implement getters and setters for EntityItem owner and
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement getters and setters for EntityItem owner and
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-index 3f552b5905..cb756b1ba0 100644
+index 3f552b590..cb756b1ba 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 @@ -8,6 +8,11 @@ import org.bukkit.entity.EntityType;
diff --git a/Spigot-Server-Patches/0375-Server-Tick-Events.patch b/Spigot-Server-Patches/0376-Server-Tick-Events.patch
similarity index 93%
rename from Spigot-Server-Patches/0375-Server-Tick-Events.patch
rename to Spigot-Server-Patches/0376-Server-Tick-Events.patch
index f745a2c3ae..eabdac3d84 100644
--- a/Spigot-Server-Patches/0375-Server-Tick-Events.patch
+++ b/Spigot-Server-Patches/0376-Server-Tick-Events.patch
@@ -1,4 +1,4 @@
-From 5bdac7cd7f735c0aee0a7d6b28a0f5125cbe5e41 Mon Sep 17 00:00:00 2001
+From 3420e2ae9b6259d364e6dc8467e4e248451b3736 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 27 Mar 2019 22:48:45 -0400
 Subject: [PATCH] Server Tick Events
@@ -6,7 +6,7 @@ Subject: [PATCH] Server Tick Events
 Fires event at start and end of a server tick
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 99306781f7..cbb4280631 100644
+index 99306781f..cbb428063 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1041,6 +1041,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
diff --git a/Spigot-Server-Patches/0376-PlayerDeathEvent-getItemsToKeep.patch b/Spigot-Server-Patches/0377-PlayerDeathEvent-getItemsToKeep.patch
similarity index 96%
rename from Spigot-Server-Patches/0376-PlayerDeathEvent-getItemsToKeep.patch
rename to Spigot-Server-Patches/0377-PlayerDeathEvent-getItemsToKeep.patch
index 4ed8f9ac59..2f4088d2d7 100644
--- a/Spigot-Server-Patches/0376-PlayerDeathEvent-getItemsToKeep.patch
+++ b/Spigot-Server-Patches/0377-PlayerDeathEvent-getItemsToKeep.patch
@@ -1,4 +1,4 @@
-From 25fb7f8f2a379a0b0e2a6e88dcbf68b37a475529 Mon Sep 17 00:00:00 2001
+From 96e9cba58589bb68363db3553a5d1e968f6b23d7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 27 Mar 2019 23:01:33 -0400
 Subject: [PATCH] PlayerDeathEvent#getItemsToKeep
@@ -8,7 +8,7 @@ Exposes a mutable array on items a player should keep on death
 Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index c7f22870b6..21ec45e6ff 100644
+index c7f22870b..21ec45e6f 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -508,6 +508,46 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0377-Optimize-Persistent-Data-Loading.patch b/Spigot-Server-Patches/0378-Optimize-Persistent-Data-Loading.patch
similarity index 96%
rename from Spigot-Server-Patches/0377-Optimize-Persistent-Data-Loading.patch
rename to Spigot-Server-Patches/0378-Optimize-Persistent-Data-Loading.patch
index 23819f11c3..174ba834e8 100644
--- a/Spigot-Server-Patches/0377-Optimize-Persistent-Data-Loading.patch
+++ b/Spigot-Server-Patches/0378-Optimize-Persistent-Data-Loading.patch
@@ -1,4 +1,4 @@
-From 2c62759f8e80c9e46913bbc55a24c1a384f1acdb Mon Sep 17 00:00:00 2001
+From 3e8131a0eaca92facca6ca11ef032922ddeb455d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 29 Mar 2019 01:25:11 -0400
 Subject: [PATCH] Optimize Persistent Data Loading
@@ -14,7 +14,7 @@ These files take a long time to convert on large worlds and crashes the server.
 Additionally, cache the result of a file being missing so we don't keep spam checking it.
 
 diff --git a/src/main/java/net/minecraft/server/WorldPersistentData.java b/src/main/java/net/minecraft/server/WorldPersistentData.java
-index 47a4ea9985..62081349f1 100644
+index 47a4ea998..62081349f 100644
 --- a/src/main/java/net/minecraft/server/WorldPersistentData.java
 +++ b/src/main/java/net/minecraft/server/WorldPersistentData.java
 @@ -26,6 +26,7 @@ public class WorldPersistentData {
diff --git a/Spigot-Server-Patches/0378-Allow-login-events-to-fire-only-after-the-server-plu.patch b/Spigot-Server-Patches/0379-Allow-login-events-to-fire-only-after-the-server-plu.patch
similarity index 95%
rename from Spigot-Server-Patches/0378-Allow-login-events-to-fire-only-after-the-server-plu.patch
rename to Spigot-Server-Patches/0379-Allow-login-events-to-fire-only-after-the-server-plu.patch
index 1510c5a41f..bb04660f76 100644
--- a/Spigot-Server-Patches/0378-Allow-login-events-to-fire-only-after-the-server-plu.patch
+++ b/Spigot-Server-Patches/0379-Allow-login-events-to-fire-only-after-the-server-plu.patch
@@ -1,4 +1,4 @@
-From 5e7412130954ff4b3df31fcb0adab92f6008539d Mon Sep 17 00:00:00 2001
+From b32b8d3116d036ba691bbf5526e0fb3a28b736fa Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sun, 31 Mar 2019 22:02:24 -0700
 Subject: [PATCH] Allow login events to fire only after the server plugins are
@@ -7,7 +7,7 @@ Subject: [PATCH] Allow login events to fire only after the server plugins are
 Event threads will simply block until they're ready to accept.
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 9e4bc24058..028c23dbe6 100644
+index 9e4bc2405..028c23dbe 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -285,6 +285,36 @@ public class LoginListener implements PacketLoginInListener {
@@ -56,7 +56,7 @@ index 9e4bc24058..028c23dbe6 100644
                              java.net.InetAddress address = ((java.net.InetSocketAddress) networkManager.getSocketAddress()).getAddress();
                              java.util.UUID uniqueId = i.getId();
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index cbb4280631..ba68d7f833 100644
+index cbb428063..ba68d7f83 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -462,6 +462,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
diff --git a/Spigot-Server-Patches/0379-Make-region-files-more-reliable-to-write-to.patch b/Spigot-Server-Patches/0380-Make-region-files-more-reliable-to-write-to.patch
similarity index 98%
rename from Spigot-Server-Patches/0379-Make-region-files-more-reliable-to-write-to.patch
rename to Spigot-Server-Patches/0380-Make-region-files-more-reliable-to-write-to.patch
index 78389068b9..961ac8b00c 100644
--- a/Spigot-Server-Patches/0379-Make-region-files-more-reliable-to-write-to.patch
+++ b/Spigot-Server-Patches/0380-Make-region-files-more-reliable-to-write-to.patch
@@ -1,4 +1,4 @@
-From d6cb15c2269bdf95000692dfc65c338240cbba4e Mon Sep 17 00:00:00 2001
+From 67ee8261046196bb0c1b3472296709b0e8c77b9f Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Mon, 1 Apr 2019 18:57:32 -0700
 Subject: [PATCH] Make region files more reliable to write to
@@ -37,7 +37,7 @@ affect save performance if the startup flag is used (especially on
 HDDs).
 
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index ed2ccebb23..2e14d84657 100644
+index ed2ccebb2..2e14d8465 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -29,7 +29,7 @@ public class RegionFile implements AutoCloseable {
diff --git a/Spigot-Server-Patches/0380-Optimize-GameRules-to-use-LinkedHashMap.patch b/Spigot-Server-Patches/0381-Optimize-GameRules-to-use-LinkedHashMap.patch
similarity index 96%
rename from Spigot-Server-Patches/0380-Optimize-GameRules-to-use-LinkedHashMap.patch
rename to Spigot-Server-Patches/0381-Optimize-GameRules-to-use-LinkedHashMap.patch
index dd78a78ec3..953c0db0be 100644
--- a/Spigot-Server-Patches/0380-Optimize-GameRules-to-use-LinkedHashMap.patch
+++ b/Spigot-Server-Patches/0381-Optimize-GameRules-to-use-LinkedHashMap.patch
@@ -1,4 +1,4 @@
-From 1c02201f7e159f2b888817b398e3c4dc820e2efc Mon Sep 17 00:00:00 2001
+From 1fda00658411d9f5f8423038438f04f429f50aae Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Thu, 4 Apr 2019 17:55:05 -0700
 Subject: [PATCH] Optimize GameRules to use LinkedHashMap
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize GameRules to use LinkedHashMap
 Previously TreeMap was used which has poor get(K) performance.
 
 diff --git a/src/main/java/net/minecraft/server/GameRules.java b/src/main/java/net/minecraft/server/GameRules.java
-index 3de9d264db..c6a8004745 100644
+index 3de9d264d..c6a800474 100644
 --- a/src/main/java/net/minecraft/server/GameRules.java
 +++ b/src/main/java/net/minecraft/server/GameRules.java
 @@ -17,7 +17,17 @@ import javax.annotation.Nullable;
@@ -49,7 +49,7 @@ index 3de9d264db..c6a8004745 100644
      }
  
 diff --git a/src/test/java/org/bukkit/GameRuleTest.java b/src/test/java/org/bukkit/GameRuleTest.java
-index 1ed0f4cf2b..40edb8d668 100644
+index 1ed0f4cf2..40edb8d66 100644
 --- a/src/test/java/org/bukkit/GameRuleTest.java
 +++ b/src/test/java/org/bukkit/GameRuleTest.java
 @@ -21,7 +21,7 @@ public class GameRuleTest {
diff --git a/Spigot-Server-Patches/0381-Optimize-Captured-TileEntity-Lookup.patch b/Spigot-Server-Patches/0382-Optimize-Captured-TileEntity-Lookup.patch
similarity index 93%
rename from Spigot-Server-Patches/0381-Optimize-Captured-TileEntity-Lookup.patch
rename to Spigot-Server-Patches/0382-Optimize-Captured-TileEntity-Lookup.patch
index 24834f1634..1209b28aff 100644
--- a/Spigot-Server-Patches/0381-Optimize-Captured-TileEntity-Lookup.patch
+++ b/Spigot-Server-Patches/0382-Optimize-Captured-TileEntity-Lookup.patch
@@ -1,4 +1,4 @@
-From a403d5b632681d503b715b6df60fffa30a6ad3b3 Mon Sep 17 00:00:00 2001
+From 4ade6daf8cd140e254b7959c7a3ccef5b30b6dad Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 6 Apr 2019 10:16:48 -0400
 Subject: [PATCH] Optimize Captured TileEntity Lookup
@@ -10,7 +10,7 @@ Optimize to check if the captured list even has values in it, and also to
 just do a get call since the value can never be null.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 4280fdf807..6a36c4467f 100644
+index 4280fdf80..6a36c4467 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1049,12 +1049,13 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
diff --git a/Spigot-Server-Patches/0382-Add-Heightmap-API.patch b/Spigot-Server-Patches/0383-Add-Heightmap-API.patch
similarity index 94%
rename from Spigot-Server-Patches/0382-Add-Heightmap-API.patch
rename to Spigot-Server-Patches/0383-Add-Heightmap-API.patch
index 214f89f793..cc6adfa7fd 100644
--- a/Spigot-Server-Patches/0382-Add-Heightmap-API.patch
+++ b/Spigot-Server-Patches/0383-Add-Heightmap-API.patch
@@ -1,11 +1,11 @@
-From 019901c28c5d4058c1492ac756b7d2d316ff50ed Mon Sep 17 00:00:00 2001
+From 7f663a3b842b9aa8cc50b9841270f995e40c3d03 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Tue, 1 Jan 2019 02:22:01 -0800
 Subject: [PATCH] Add Heightmap API
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 6a36c4467f..d4789478b6 100644
+index 6a36c4467..d4789478b 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -625,8 +625,8 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
@@ -20,7 +20,7 @@ index 6a36c4467f..d4789478b6 100644
  
          if (i >= -30000000 && j >= -30000000 && i < 30000000 && j < 30000000) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 3ebea96931..2c6a42d921 100644
+index 3ebea9693..2c6a42d92 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -317,6 +317,29 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0383-Handle-bad-chunks-more-gracefully.patch b/Spigot-Server-Patches/0384-Handle-bad-chunks-more-gracefully.patch
similarity index 96%
rename from Spigot-Server-Patches/0383-Handle-bad-chunks-more-gracefully.patch
rename to Spigot-Server-Patches/0384-Handle-bad-chunks-more-gracefully.patch
index 591387dcb3..1859b0e20c 100644
--- a/Spigot-Server-Patches/0383-Handle-bad-chunks-more-gracefully.patch
+++ b/Spigot-Server-Patches/0384-Handle-bad-chunks-more-gracefully.patch
@@ -1,4 +1,4 @@
-From 04cd5fec4ba1b6b6f5a14946727eb310f5c0b6f3 Mon Sep 17 00:00:00 2001
+From 621fec7667224efd7d2c9c75fc25d5220c810714 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Mon, 15 Apr 2019 02:24:52 +0100
 Subject: [PATCH] Handle bad chunks more gracefully
@@ -15,7 +15,7 @@ Should Mojang choose to alter this behavior in the future, this change
 will simply defer to whatever that new behavior is.
 
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index 3f7190b6a2..844f491c70 100644
+index 3f7190b6a..844f491c7 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -171,8 +171,21 @@ public abstract class RegionFileCache implements AutoCloseable {
diff --git a/Spigot-Server-Patches/0384-Mob-Spawner-API-Enhancements.patch b/Spigot-Server-Patches/0385-Mob-Spawner-API-Enhancements.patch
similarity index 97%
rename from Spigot-Server-Patches/0384-Mob-Spawner-API-Enhancements.patch
rename to Spigot-Server-Patches/0385-Mob-Spawner-API-Enhancements.patch
index 41463c3d88..809e934cc9 100644
--- a/Spigot-Server-Patches/0384-Mob-Spawner-API-Enhancements.patch
+++ b/Spigot-Server-Patches/0385-Mob-Spawner-API-Enhancements.patch
@@ -1,11 +1,11 @@
-From 67af57c7e860285baacc674e9c7896f35550875a Mon Sep 17 00:00:00 2001
+From c596f9df47e0204ca49538a3b3f5d198baaacb6d Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 19 Apr 2019 12:41:13 -0500
 Subject: [PATCH] Mob Spawner API Enhancements
 
 
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index dbb8098d6c..e9bcb5abaa 100644
+index dbb8098d6..e9bcb5aba 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -46,6 +46,7 @@ public abstract class MobSpawnerAbstract {
@@ -82,7 +82,7 @@ index dbb8098d6c..e9bcb5abaa 100644
              nbttagcompound.setShort("MaxNearbyEntities", (short) this.maxNearbyEntities);
              nbttagcompound.setShort("RequiredPlayerRange", (short) this.requiredPlayerRange);
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java b/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java
-index 5c4c3c70c7..e78e3804ba 100644
+index 5c4c3c70c..e78e3804b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java
 @@ -121,4 +121,16 @@ public class CraftCreatureSpawner extends CraftBlockEntityState<TileEntityMobSpa
diff --git a/Spigot-Server-Patches/0385-Per-Player-View-Distance-API-placeholders.patch b/Spigot-Server-Patches/0386-Per-Player-View-Distance-API-placeholders.patch
similarity index 95%
rename from Spigot-Server-Patches/0385-Per-Player-View-Distance-API-placeholders.patch
rename to Spigot-Server-Patches/0386-Per-Player-View-Distance-API-placeholders.patch
index a2a451b027..c5d5a26789 100644
--- a/Spigot-Server-Patches/0385-Per-Player-View-Distance-API-placeholders.patch
+++ b/Spigot-Server-Patches/0386-Per-Player-View-Distance-API-placeholders.patch
@@ -1,4 +1,4 @@
-From e6f314e067d03f7988508c0d4f06c551dfedb1c8 Mon Sep 17 00:00:00 2001
+From 482f1ab8fa309232376ebeff7361a705adaa26bb Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Mon, 6 May 2019 01:29:25 -0400
 Subject: [PATCH] Per-Player View Distance API placeholders
@@ -7,7 +7,7 @@ I hope to look at this more in-depth soon. It appears doable.
 However this should not block the update.
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index 9ada10cc73..5751d39e0b 100644
+index 9ada10cc7..5751d39e0 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -570,9 +570,9 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
@@ -23,7 +23,7 @@ index 9ada10cc73..5751d39e0b 100644
                      double deltaX = this.locX - player.locX;
                      double deltaZ = this.locZ - player.locZ;
 diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java
-index 48b22894aa..dbd8542069 100644
+index 48b22894a..dbd854206 100644
 --- a/src/main/java/net/minecraft/server/EntityWither.java
 +++ b/src/main/java/net/minecraft/server/EntityWither.java
 @@ -208,9 +208,9 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@@ -39,7 +39,7 @@ index 48b22894aa..dbd8542069 100644
                      double deltaX = this.locX - player.locX;
                      double deltaZ = this.locZ - player.locZ;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index c020d0b4e6..9f267414da 100644
+index c020d0b4e..9f267414d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1962,6 +1962,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0386-Async-Chunk-placeholder.patch b/Spigot-Server-Patches/0387-Async-Chunk-placeholder.patch
similarity index 96%
rename from Spigot-Server-Patches/0386-Async-Chunk-placeholder.patch
rename to Spigot-Server-Patches/0387-Async-Chunk-placeholder.patch
index 09e28b1a09..29813f7cb0 100644
--- a/Spigot-Server-Patches/0386-Async-Chunk-placeholder.patch
+++ b/Spigot-Server-Patches/0387-Async-Chunk-placeholder.patch
@@ -1,4 +1,4 @@
-From 62c010009cad9abf6d7b19dd939feb348453fdee Mon Sep 17 00:00:00 2001
+From a435fc5184fe7389b693cffe4966ba92f758b737 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Mon, 6 May 2019 12:29:24 -0700
 Subject: [PATCH] Async Chunk placeholder
@@ -6,7 +6,7 @@ Subject: [PATCH] Async Chunk placeholder
 Until we figure out Mojang's ticket system.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 2c6a42d921..63f953617d 100644
+index 2c6a42d92..63f953617 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -14,6 +14,7 @@ import java.util.Objects;
diff --git a/Spigot-Server-Patches/0387-Fix-CB-call-to-changed-postToMainThread-method.patch b/Spigot-Server-Patches/0388-Fix-CB-call-to-changed-postToMainThread-method.patch
similarity index 88%
rename from Spigot-Server-Patches/0387-Fix-CB-call-to-changed-postToMainThread-method.patch
rename to Spigot-Server-Patches/0388-Fix-CB-call-to-changed-postToMainThread-method.patch
index 2817ba67e6..8dfcbfe8ab 100644
--- a/Spigot-Server-Patches/0387-Fix-CB-call-to-changed-postToMainThread-method.patch
+++ b/Spigot-Server-Patches/0388-Fix-CB-call-to-changed-postToMainThread-method.patch
@@ -1,11 +1,11 @@
-From bf01712e9dcd531d46e543a354dfea1c78506676 Mon Sep 17 00:00:00 2001
+From 03bf5c7b4e5227f828b28a61cc0013a9f0809db7 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Fri, 10 May 2019 18:38:19 +0100
 Subject: [PATCH] Fix CB call to changed postToMainThread method
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 5b45763886..e517e9f9fc 100644
+index 5b4576388..e517e9f9f 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -282,7 +282,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0388-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/Spigot-Server-Patches/0389-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
similarity index 92%
rename from Spigot-Server-Patches/0388-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
rename to Spigot-Server-Patches/0389-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
index 164e9e06e9..d7c00dbfe1 100644
--- a/Spigot-Server-Patches/0388-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
+++ b/Spigot-Server-Patches/0389-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
@@ -1,4 +1,4 @@
-From 0df9e531505be10483df1c11356afa65db95d0ec Mon Sep 17 00:00:00 2001
+From f6e6aa4920408febe133917cfc3265a38dae1dab Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Sat, 27 Apr 2019 20:00:43 +0100
 Subject: [PATCH] Fix sounds when item frames are modified (MC-123450)
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix sounds when item frames are modified (MC-123450)
 This also fixes the adding sound playing when the item frame direction is changed.
 
 diff --git a/src/main/java/net/minecraft/server/EntityItemFrame.java b/src/main/java/net/minecraft/server/EntityItemFrame.java
-index 816f7ae6b7..3064bce494 100644
+index 816f7ae6b..3064bce49 100644
 --- a/src/main/java/net/minecraft/server/EntityItemFrame.java
 +++ b/src/main/java/net/minecraft/server/EntityItemFrame.java
 @@ -211,7 +211,7 @@ public class EntityItemFrame extends EntityHanging {
@@ -19,7 +19,7 @@ index 816f7ae6b7..3064bce494 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
-index 70127520a2..712ec431f0 100644
+index 70127520a..712ec431f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
 @@ -49,7 +49,7 @@ public class CraftItemFrame extends CraftHanging implements ItemFrame {
diff --git a/Spigot-Server-Patches/0389-Fix-MC-151674-Close-RegionFiles-when-they-get-evicte.patch b/Spigot-Server-Patches/0390-Fix-MC-151674-Close-RegionFiles-when-they-get-evicte.patch
similarity index 89%
rename from Spigot-Server-Patches/0389-Fix-MC-151674-Close-RegionFiles-when-they-get-evicte.patch
rename to Spigot-Server-Patches/0390-Fix-MC-151674-Close-RegionFiles-when-they-get-evicte.patch
index a5dd37d16a..adafd2c2f6 100644
--- a/Spigot-Server-Patches/0389-Fix-MC-151674-Close-RegionFiles-when-they-get-evicte.patch
+++ b/Spigot-Server-Patches/0390-Fix-MC-151674-Close-RegionFiles-when-they-get-evicte.patch
@@ -1,4 +1,4 @@
-From 3229813d3b958fa4061c1d31e26a44dce8dc713c Mon Sep 17 00:00:00 2001
+From 3232ce9d80f024b54c48fe2b1805bdf2e20acc59 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sun, 12 May 2019 19:25:53 -0700
 Subject: [PATCH] Fix MC-151674 Close RegionFiles when they get evicted from
@@ -7,7 +7,7 @@ Subject: [PATCH] Fix MC-151674 Close RegionFiles when they get evicted from
 https://bugs.mojang.com/browse/MC-151674
 
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index 844f491c70..1371834817 100644
+index 844f491c7..137183481 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -56,7 +56,7 @@ public abstract class RegionFileCache implements AutoCloseable {
diff --git a/Spigot-Server-Patches/0390-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch b/Spigot-Server-Patches/0391-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
similarity index 93%
rename from Spigot-Server-Patches/0390-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
rename to Spigot-Server-Patches/0391-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
index 2837d808c1..78941e3fd6 100644
--- a/Spigot-Server-Patches/0390-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
+++ b/Spigot-Server-Patches/0391-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
@@ -1,4 +1,4 @@
-From 953d6c76af62284f082c1a2a8659f430ff5159ba Mon Sep 17 00:00:00 2001
+From 534281ebb98cd82d59750beeff481f2f2376cc19 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Mon, 13 May 2019 21:10:59 -0700
 Subject: [PATCH] Fix CraftServer#isPrimaryThread and MinecraftServer
@@ -16,7 +16,7 @@ handling that should have been handled synchronously will be handled
 synchronously when the server gets shut down.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ba68d7f833..f1cd38d421 100644
+index ba68d7f83..f1cd38d42 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1936,7 +1936,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -29,7 +29,7 @@ index ba68d7f833..f1cd38d421 100644
  
      @Deprecated
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 88b416f600..62cfb6e423 100644
+index 88b416f60..62cfb6e42 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1658,7 +1658,7 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0391-Elide-lock-in-DataWatcher.patch b/Spigot-Server-Patches/0392-Elide-lock-in-DataWatcher.patch
similarity index 98%
rename from Spigot-Server-Patches/0391-Elide-lock-in-DataWatcher.patch
rename to Spigot-Server-Patches/0392-Elide-lock-in-DataWatcher.patch
index c48e5fff1b..f346195557 100644
--- a/Spigot-Server-Patches/0391-Elide-lock-in-DataWatcher.patch
+++ b/Spigot-Server-Patches/0392-Elide-lock-in-DataWatcher.patch
@@ -1,4 +1,4 @@
-From a0c71eaa15f1f96e20743cc0c3d5cc59129b860b Mon Sep 17 00:00:00 2001
+From 84cc80b03ef7a414edf4279aa1b6c6588a21a886 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sat, 11 May 2019 08:19:27 -0700
 Subject: [PATCH] Elide lock in DataWatcher
@@ -17,7 +17,7 @@ of the Entity, the further readlocks are actually
 useless (which get obtained on set, get, etc calls).
 
 diff --git a/src/main/java/net/minecraft/server/DataWatcher.java b/src/main/java/net/minecraft/server/DataWatcher.java
-index f224043d8e..bbea8ef726 100644
+index f224043d8..bbea8ef72 100644
 --- a/src/main/java/net/minecraft/server/DataWatcher.java
 +++ b/src/main/java/net/minecraft/server/DataWatcher.java
 @@ -23,7 +23,7 @@ public class DataWatcher {
diff --git a/Spigot-Server-Patches/0392-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch b/Spigot-Server-Patches/0393-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
similarity index 95%
rename from Spigot-Server-Patches/0392-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
rename to Spigot-Server-Patches/0393-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
index f3adbacb0b..3a9d24d2a6 100644
--- a/Spigot-Server-Patches/0392-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
+++ b/Spigot-Server-Patches/0393-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
@@ -1,4 +1,4 @@
-From 5d6980b9c9925f9369f86c8a7e8e5a39edf457b8 Mon Sep 17 00:00:00 2001
+From 2559ccb6ede819d825bb466f3d90513f38de050b 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
@@ -19,7 +19,7 @@ This change ensures the chunks are always loaded when entities are
 added to the world, or a valid entity moves between chunks.
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 1a01e5e696..be3ce3f130 100644
+index 1a01e5e69..be3ce3f13 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -635,7 +635,7 @@ public class WorldServer extends World {
diff --git a/Spigot-Server-Patches/0393-Duplicate-UUID-Resolve-Option.patch b/Spigot-Server-Patches/0394-Duplicate-UUID-Resolve-Option.patch
similarity index 98%
rename from Spigot-Server-Patches/0393-Duplicate-UUID-Resolve-Option.patch
rename to Spigot-Server-Patches/0394-Duplicate-UUID-Resolve-Option.patch
index dd8347d843..6a5cebbf02 100644
--- a/Spigot-Server-Patches/0393-Duplicate-UUID-Resolve-Option.patch
+++ b/Spigot-Server-Patches/0394-Duplicate-UUID-Resolve-Option.patch
@@ -1,4 +1,4 @@
-From f2d0e742169ec0b8a62b4cb6295afefaba70894c Mon Sep 17 00:00:00 2001
+From 7ec41d55e228cbc6587414d09b1aace8e87f318d 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
@@ -33,7 +33,7 @@ But for those who are ok with leaving this inconsistent behavior, you may use WA
 It is recommended you regenerate the entities, as these were legit entities, and deserve your love.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index ef882b897f..385b3ac0ce 100644
+index ef882b897..385b3ac0c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -449,4 +449,43 @@ public class PaperWorldConfig {
@@ -81,7 +81,7 @@ index ef882b897f..385b3ac0ce 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 1ba855786c..1bbac46f6a 100644
+index 1ba855786..1bbac46f6 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -397,6 +397,7 @@ public class Chunk implements IChunkAccess {
@@ -93,7 +93,7 @@ index 1ba855786c..1bbac46f6a 100644
  
          int k = MathHelper.floor(entity.locY / 16.0D);
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 7ded9bc6ce..3c6dc5ef03 100644
+index 7ded9bc6c..3c6dc5ef0 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2674,6 +2674,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -105,7 +105,7 @@ index 7ded9bc6ce..3c6dc5ef03 100644
          this.uniqueID = uuid;
          this.ap = this.uniqueID.toString();
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 21c4b56427..932772331a 100644
+index 21c4b5642..932772331 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -1,5 +1,6 @@
@@ -193,7 +193,7 @@ index 21c4b56427..932772331a 100644
  
                      if (list != null) {
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index be3ce3f130..3ed12672e3 100644
+index be3ce3f13..3ed12672e 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -2,6 +2,8 @@ package net.minecraft.server;
diff --git a/Spigot-Server-Patches/0394-improve-CraftWorld-isChunkLoaded.patch b/Spigot-Server-Patches/0395-improve-CraftWorld-isChunkLoaded.patch
similarity index 91%
rename from Spigot-Server-Patches/0394-improve-CraftWorld-isChunkLoaded.patch
rename to Spigot-Server-Patches/0395-improve-CraftWorld-isChunkLoaded.patch
index f3f61d3c86..2b68fd2ef5 100644
--- a/Spigot-Server-Patches/0394-improve-CraftWorld-isChunkLoaded.patch
+++ b/Spigot-Server-Patches/0395-improve-CraftWorld-isChunkLoaded.patch
@@ -1,4 +1,4 @@
-From 7eeef7267b0163f40237b783c6ec316df5497925 Mon Sep 17 00:00:00 2001
+From a7d0a14bfad6b16f43caea8778de15a4398b2f0b Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Tue, 21 May 2019 02:34:04 +0100
 Subject: [PATCH] improve CraftWorld#isChunkLoaded
@@ -9,7 +9,7 @@ waiting for the execution queue to get to our request; We can just query
 the chunk status and get a response now, vs having to wait
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 63f953617d..c0207694ac 100644
+index 63f953617..c0207694a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -382,8 +382,7 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0395-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0396-Configurable-Keep-Spawn-Loaded-range-per-world.patch
similarity index 96%
rename from Spigot-Server-Patches/0395-Configurable-Keep-Spawn-Loaded-range-per-world.patch
rename to Spigot-Server-Patches/0396-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index 224a0ab0c2..fc7dbc1c42 100644
--- a/Spigot-Server-Patches/0395-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/Spigot-Server-Patches/0396-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -1,4 +1,4 @@
-From c93fcfab9d89dda4a68f1e2e3b589f13716a7bff Mon Sep 17 00:00:00 2001
+From ec4028f2618c908a5c212b64c090c866864f3717 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 13 Sep 2014 23:14:43 -0400
 Subject: [PATCH] Configurable Keep Spawn Loaded range per world
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Keep Spawn Loaded range per world
 This lets you disable it for some worlds and lower it for others.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 385b3ac0ce..b854061983 100644
+index 385b3ac0c..b85406198 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -488,4 +488,10 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index 385b3ac0ce..b854061983 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f1cd38d421..184f1b00f0 100644
+index f1cd38d42..184f1b00f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -570,6 +570,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -61,7 +61,7 @@ index f1cd38d421..184f1b00f0 100644
          // CraftBukkit start
          // this.nextTick = SystemUtils.getMonotonicMillis() + 10L;
 diff --git a/src/main/java/net/minecraft/server/WorldLoadListener.java b/src/main/java/net/minecraft/server/WorldLoadListener.java
-index d6762d3853..7b6f5b2da0 100644
+index d6762d385..7b6f5b2da 100644
 --- a/src/main/java/net/minecraft/server/WorldLoadListener.java
 +++ b/src/main/java/net/minecraft/server/WorldLoadListener.java
 @@ -9,4 +9,6 @@ public interface WorldLoadListener {
@@ -72,7 +72,7 @@ index d6762d3853..7b6f5b2da0 100644
 +    void setChunkRadius(int radius); // Paper - allow changing chunk radius
  }
 diff --git a/src/main/java/net/minecraft/server/WorldLoadListenerLogger.java b/src/main/java/net/minecraft/server/WorldLoadListenerLogger.java
-index f71e1aece1..e1efc61724 100644
+index f71e1aece..e1efc6172 100644
 --- a/src/main/java/net/minecraft/server/WorldLoadListenerLogger.java
 +++ b/src/main/java/net/minecraft/server/WorldLoadListenerLogger.java
 @@ -7,16 +7,24 @@ import org.apache.logging.log4j.Logger;
@@ -103,7 +103,7 @@ index f71e1aece1..e1efc61724 100644
      @Override
      public void a(ChunkCoordIntPair chunkcoordintpair) {
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 3ed12672e3..dd2133665f 100644
+index 3ed12672e..dd2133665 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1487,13 +1487,37 @@ public class WorldServer extends World {
@@ -148,7 +148,7 @@ index 3ed12672e3..dd2133665f 100644
  
      public LongSet getForceLoadedChunks() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index c0207694ac..feb673ae9d 100644
+index c0207694a..feb673ae9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1748,15 +1748,21 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0396-Fix-some-generation-concurrency-issues.patch b/Spigot-Server-Patches/0397-Fix-some-generation-concurrency-issues.patch
similarity index 98%
rename from Spigot-Server-Patches/0396-Fix-some-generation-concurrency-issues.patch
rename to Spigot-Server-Patches/0397-Fix-some-generation-concurrency-issues.patch
index 085cc28fa6..adef8e42b9 100644
--- a/Spigot-Server-Patches/0396-Fix-some-generation-concurrency-issues.patch
+++ b/Spigot-Server-Patches/0397-Fix-some-generation-concurrency-issues.patch
@@ -1,11 +1,11 @@
-From 7e294072578e17fe885b5e3e109b4f943d52e202 Mon Sep 17 00:00:00 2001
+From 8fc0ebf1a30561fad58ac525ecbba349c01adf8a Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Fri, 24 May 2019 07:53:16 +0100
 Subject: [PATCH] Fix some generation concurrency issues
 
 
 diff --git a/src/main/java/net/minecraft/server/DefinedStructureManager.java b/src/main/java/net/minecraft/server/DefinedStructureManager.java
-index 6aa0ca3959..ed9b5c63f0 100644
+index 6aa0ca395..ed9b5c63f 100644
 --- a/src/main/java/net/minecraft/server/DefinedStructureManager.java
 +++ b/src/main/java/net/minecraft/server/DefinedStructureManager.java
 @@ -20,7 +20,7 @@ import org.apache.logging.log4j.Logger;
@@ -18,7 +18,7 @@ index 6aa0ca3959..ed9b5c63f0 100644
      private final MinecraftServer d;
      private final java.nio.file.Path e;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index d4789478b6..3110b510b0 100644
+index d4789478b..3110b510b 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -101,6 +101,23 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
@@ -46,7 +46,7 @@ index d4789478b6..3110b510b0 100644
      public CraftWorld getWorld() {
          return this.world;
 diff --git a/src/main/java/net/minecraft/server/WorldGenStronghold.java b/src/main/java/net/minecraft/server/WorldGenStronghold.java
-index eca27e52e9..fb3463fcce 100644
+index eca27e52e..fb3463fcc 100644
 --- a/src/main/java/net/minecraft/server/WorldGenStronghold.java
 +++ b/src/main/java/net/minecraft/server/WorldGenStronghold.java
 @@ -10,10 +10,12 @@ import javax.annotation.Nullable;