From c02c01b2c531384dfe8f2d1d721113bada4892cb Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sat, 10 Sep 2016 21:42:47 -0500
Subject: [PATCH] Add rate limiting to PacketPlayInUseItem as well

Also removes our toggle for Spigot's option, I doubt anyone uses it.
---
 ... 0012-Player-Exhaustion-Multipliers.patch} |  4 +-
 ...2-Toggle-for-player-interact-limiter.patch | 40 ----------
 ...despawn-distances-for-living-entiti.patch} |  4 +-
 ...-Allow-for-toggling-of-spawn-chunks.patch} |  6 +-
 ...k-and-tnt-entities-at-the-specified.patch} |  6 +-
 ...e-speed-for-water-flowing-over-lava.patch} |  4 +-
 ...ent-crashes-server-lists-and-Mojang.patch} |  4 +-
 ...=> 0018-Player-affects-spawning-API.patch} |  6 +-
 ...{0020-Metrics.patch => 0019-Metrics.patch} |  4 +-
 ...e-invalid-mob-spawner-tile-entities.patch} |  6 +-
 ...=> 0021-Optimize-TileEntity-Ticking.patch} |  4 +-
 ...22-Further-improve-server-tick-loop.patch} |  4 +-
 ...23-Only-refresh-abilities-if-needed.patch} |  6 +-
 ...ch => 0024-Add-async-chunk-load-API.patch} |  6 +-
 ...API.patch => 0025-Entity-Origin-API.patch} |  2 +-
 ...vent-tile-entity-and-entity-crashes.patch} |  6 +-
 ...figurable-top-of-nether-void-damage.patch} |  6 +-
 ...-before-converting-and-renaming-pla.patch} |  4 +-
 ... => 0029-Always-tick-falling-blocks.patch} |  4 +-
 ...-Queue.patch => 0030-Lighting-Queue.patch} |  4 +-
 ...ing.patch => 0031-Optimize-draining.patch} |  4 +-
 ...ch => 0032-Configurable-end-credits.patch} |  4 +-
 ...explosions-processing-dead-entities.patch} |  4 +-
 ...gs.patch => 0034-Generator-Settings.patch} |  4 +-
 ...s.patch => 0035-Optimize-explosions.patch} |  6 +-
 ...owing-block-if-material-has-changed.patch} |  4 +-
 ...raining.patch => 0037-Fast-draining.patch} |  4 +-
 ...> 0038-Configurable-lava-flow-speed.patch} |  4 +-
 ...> 0039-Add-player-view-distance-API.patch} |  6 +-
 ...=> 0040-Disable-explosion-knockback.patch} |  6 +-
 ...under.patch => 0041-Disable-thunder.patch} |  6 +-
 ....patch => 0042-Disable-ice-and-snow.patch} |  6 +-
 ...-Configurable-mob-spawner-tick-rate.patch} |  4 +-
 ...ition-the-first-time-an-entity-is-s.patch} |  4 +-
 ...patch => 0045-Add-BeaconEffectEvent.patch} |  4 +-
 ...igurable-container-update-tick-rate.patch} |  4 +-
 ...me-times-creating-air-instead-of-co.patch} |  4 +-
 ...0048-Use-UserCache-for-player-heads.patch} |  4 +-
 ...> 0049-Disable-spigot-tick-limiters.patch} |  6 +-
 ...igurable-Chunk-IO-Thread-Base-Count.patch} | 12 +--
 ...on-File-s-when-checking-if-chunk-ex.patch} |  8 +-
 ...=> 0052-Add-PlayerInitialSpawnEvent.patch} |  6 +-
 ...=> 0053-Disable-chest-cat-detection.patch} |  4 +-
 ...4-Ensure-commands-are-not-ran-async.patch} |  8 +-
 ...hunks-are-slime-spawn-chunks-toggle.patch} |  4 +-
 ....patch => 0056-Optimize-Pathfinding.patch} |  4 +-
 ...pper-searches-if-there-are-no-items.patch} |  6 +-
 ...ch => 0058-Expose-server-CommandMap.patch} |  4 +-
 ...-informative-in-maxHealth-exception.patch} |  4 +-
 ...ord-chat-API-from-spigot-subclasses.patch} |  4 +-
 ...0061-Player-Tab-List-and-Title-APIs.patch} |  4 +-
 ...> 0062-Ensure-inv-drag-is-in-bounds.patch} |  4 +-
 ...ntation-of-tile-entity-removal-list.patch} |  6 +-
 ...d-configurable-portal-search-radius.patch} |  4 +-
 ...patch => 0065-Add-velocity-warnings.patch} |  4 +-
 ...-inter-world-teleportation-glitches.patch} |  4 +-
 ... 0067-Add-exception-reporting-event.patch} |  6 +-
 ...don-t-need-to-when-cerealising-text.patch} |  4 +-
 ...reboards-for-non-players-by-default.patch} |  2 +-
 ...orking-with-arrows-stuck-in-living-.patch} |  4 +-
 ... => 0071-Complete-resource-pack-API.patch} |  8 +-
 ... 0072-Chunk-save-queue-improvements.patch} |  8 +-
 ....patch => 0073-Chunk-Save-Reattempt.patch} |  6 +-
 ...ding-permissions.yml-before-plugins.patch} |  8 +-
 ...low-Reloading-of-Custom-Permissions.patch} |  4 +-
 ...h => 0076-Remove-Metadata-on-reload.patch} |  4 +-
 ...patch => 0077-Undead-horse-leashing.patch} |  4 +-
 ...h => 0078-Fix-Furnace-cook-time-bug.patch} |  4 +-
 ...79-Handle-Item-Meta-Inconsistencies.patch} |  4 +-
 ...rable-Non-Player-Arrow-Despawn-Rate.patch} |  4 +-
 ...atch => 0081-Add-World-Util-Methods.patch} |  4 +-
 ...2-Optimized-Light-Level-Comparisons.patch} |  4 +-
 ...0083-Pass-world-to-Village-creation.patch} |  4 +-
 ...-Custom-replacement-for-eaten-items.patch} |  4 +-
 ... 0085-Set-health-before-death-event.patch} |  8 +-
 ...h-absorb-values-and-repair-bad-data.patch} |  4 +-
 ...tch-Async-PlayerChunkMap-operations.patch} |  4 +-
 ...e-mode-in-whitelist-command-as-well.patch} |  4 +-
 ...tch => 0089-Fix-SkullCache-case-bug.patch} |  4 +-
 ...ch => 0090-Waving-banner-workaround.patch} |  4 +-
 ...91-Use-a-Shared-Random-for-Entities.patch} |  6 +-
 ...> 0092-Don-t-teleport-dead-entities.patch} |  2 +-
 ...patch => 0093-Optimize-Chunk-Access.patch} |  4 +-
 ...e-spawn-chances-for-skeleton-horses.patch} |  6 +-
 ...ocation-getType-and-getBlockData-fo.patch} |  6 +-
 ...-correct-item-in-arrow-pickup-event.patch} |  4 +-
 ... 0097-Fix-cooked-fish-legacy-import.patch} |  4 +-
 ...infinite-loop-in-BlockPosition-iter.patch} |  4 +-
 ... 0099-Access-items-by-EquipmentSlot.patch} |  4 +-
 ...eck-async-remove-unused-vars-GH-159.patch} |  4 +-
 ...able-BlockPhysicsEvent-for-Redstone.patch} |  6 +-
 ...ntity-AddTo-RemoveFrom-World-Events.patch} |  4 +-
 ...-Configurable-Chunk-Inhabited-Timer.patch} |  4 +-
 ...t.patch => 0104-EntityPathfindEvent.patch} |  4 +-
 ...-BlockFromToEvent-from-loading-chun.patch} |  4 +-
 ... 0106-Minecart-drop-name-workaround.patch} |  4 +-
 ...ce-IO-ops-opening-a-new-region-file.patch} |  4 +-
 ...gionFileCache-and-make-configurable.patch} |  8 +-
 ...h => 0109-Add-getEntity-by-UUID-API.patch} |  4 +-
 ...h => 0110-Use-Optimized-Collections.patch} |  4 +-
 ...Do-not-load-chunks-for-light-checks.patch} |  4 +-
 ...112-Add-PlayerUseUnknownEntityEvent.patch} |  8 +-
 ...DebugInfo-not-initialized-on-client.patch} |  4 +-
 ...Configurable-Grass-Spread-Tick-Rate.patch} |  4 +-
 ...e-Keep-Spawn-Loaded-range-per-world.patch} |  4 +-
 ...-BlockPlaceEvent-triggering-physics.patch} |  4 +-
 ...m-reload-spawn-chunks-in-nether-end.patch} |  4 +-
 ...8-Remove-Debug-checks-from-DataBits.patch} |  4 +-
 ...illa-per-world-scoreboard-coloring-.patch} |  6 +-
 ...d-for-setting-passengers-on-players.patch} |  4 +-
 ...e-PlayerConnection-on-teleporting-p.patch} |  8 +-
 ...emove-unused-World-Tile-Entity-List.patch} |  4 +-
 ... 0123-Don-t-tick-Skulls-unused-code.patch} |  4 +-
 ... 0124-Configurable-Player-Collision.patch} |  8 +-
 ...nt-to-allow-plugins-to-handle-clien.patch} |  4 +-
 ...mobs-should-only-spawn-in-the-water.patch} |  4 +-
 ...ix-Bugs-with-Spigot-Mob-Spawn-Logic.patch} |  6 +-
 ...> 0128-Configurable-RCON-IP-address.patch} |  4 +-
 ...29-Prevent-Fire-from-loading-chunks.patch} |  4 +-
 ...0-Implement-PlayerLocaleChangeEvent.patch} |  4 +-
 ...tyRegainHealthEvent-isFastRegen-API.patch} |  4 +-
 ...to-configure-frosted_ice-properties.patch} |  4 +-
 ...-Vehicle-Event-Cancellation-Changes.patch} |  2 +-
 ...patch => 0134-Arrow-pickup-rule-API.patch} |  4 +-
 ...dispenser-dropper-furnace-placement.patch} |  4 +-
 ...mprove-Minecraft-Hopper-Performance.patch} |  4 +-
 ...possibility-for-getServer-singleton.patch} |  4 +-
 ...tem-frames-performance-and-bug-fixe.patch} |  4 +-
 ...API-Replenishable-Lootables-Feature.patch} |  4 +-
 ...-Do-not-load-chunks-for-pathfinding.patch} |  4 +-
 ...> 0141-Entity-Tracking-Improvements.patch} |  6 +-
 ...-scoreboard-teams-to-scoreboard.dat.patch} |  8 +-
 ...unks-as-active-for-neighbor-updates.patch} |  4 +-
 ... 0144-Fix-Chunk-Unload-Queue-Issues.patch} |  6 +-
 ...em-property-for-disabling-watchdoge.patch} |  4 +-
 ...mize-EAR.patch => 0146-Optimize-EAR.patch} |  4 +-
 ...0147-Optimize-UserCache-Thread-Safe.patch} |  4 +-
 ...locking-on-Network-Manager-creation.patch} |  4 +-
 ...9-Optional-old-TNT-cannon-behaviors.patch} |  2 +-
 ...-redstone-torch-rapid-clock-removal.patch} |  4 +-
 ...Ensure-Chunks-never-ever-load-async.patch} |  4 +-
 ...h => 0152-Add-server-name-parameter.patch} |  4 +-
 ...n-Wither-Death-sounds-to-same-world.patch} |  4 +-
 ...FallingBlocks-being-stuck-on-fences.patch} |  4 +-
 ...0155-Make-entities-look-for-hoppers.patch} |  6 +-
 ...rom-the-correct-hand-when-spawn-egg.patch} |  4 +-
 ...nk-Unloads-based-on-Player-Movement.patch} |  4 +-
 ... 0158-Toggleable-Elytra-Wall-Damage.patch} |  4 +-
 ...=> 0159-Fix-Double-World-Add-issues.patch} |  4 +-
 ...tch => 0160-Fix-Old-Sign-Conversion.patch} |  4 +-
 ...ix-TileEntities-as-they-are-removed.patch} |  6 +-
 ...-profiles-that-have-no-UUID-and-no-.patch} |  4 +-
 ...ative-vehicle-moved-wrongly-message.patch} |  6 +-
 ...rs-that-dismount-from-other-players.patch} |  4 +-
 ...etting-for-proxy-online-mode-status.patch} |  8 +-
 ...-BlockStateEnum-hashCode-and-equals.patch} |  4 +-
 ...0167-Disable-ticking-of-snow-blocks.patch} |  4 +-
 ...rt-new-health-to-a-float-during-set.patch} |  2 +-
 ...69-Fix-AIOOBE-in-inventory-handling.patch} |  6 +-
 .../0170-Rate-limit-PacketPlayInUseItem.patch | 78 +++++++++++++++++++
 scripts/importmcdev.sh                        |  1 +
 161 files changed, 448 insertions(+), 409 deletions(-)
 rename Spigot-Server-Patches/{0013-Player-Exhaustion-Multipliers.patch => 0012-Player-Exhaustion-Multipliers.patch} (97%)
 delete mode 100644 Spigot-Server-Patches/0012-Toggle-for-player-interact-limiter.patch
 rename Spigot-Server-Patches/{0014-Add-configurable-despawn-distances-for-living-entiti.patch => 0013-Add-configurable-despawn-distances-for-living-entiti.patch} (97%)
 rename Spigot-Server-Patches/{0015-Allow-for-toggling-of-spawn-chunks.patch => 0014-Allow-for-toggling-of-spawn-chunks.patch} (93%)
 rename Spigot-Server-Patches/{0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch => 0015-Drop-falling-block-and-tnt-entities-at-the-specified.patch} (96%)
 rename Spigot-Server-Patches/{0017-Configurable-speed-for-water-flowing-over-lava.patch => 0016-Configurable-speed-for-water-flowing-over-lava.patch} (97%)
 rename Spigot-Server-Patches/{0018-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch => 0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch} (98%)
 rename Spigot-Server-Patches/{0019-Player-affects-spawning-API.patch => 0018-Player-affects-spawning-API.patch} (99%)
 rename Spigot-Server-Patches/{0020-Metrics.patch => 0019-Metrics.patch} (92%)
 rename Spigot-Server-Patches/{0021-Remove-invalid-mob-spawner-tile-entities.patch => 0020-Remove-invalid-mob-spawner-tile-entities.patch} (91%)
 rename Spigot-Server-Patches/{0022-Optimize-TileEntity-Ticking.patch => 0021-Optimize-TileEntity-Ticking.patch} (98%)
 rename Spigot-Server-Patches/{0023-Further-improve-server-tick-loop.patch => 0022-Further-improve-server-tick-loop.patch} (99%)
 rename Spigot-Server-Patches/{0024-Only-refresh-abilities-if-needed.patch => 0023-Only-refresh-abilities-if-needed.patch} (90%)
 rename Spigot-Server-Patches/{0025-Add-async-chunk-load-API.patch => 0024-Add-async-chunk-load-API.patch} (92%)
 rename Spigot-Server-Patches/{0026-Entity-Origin-API.patch => 0025-Entity-Origin-API.patch} (99%)
 rename Spigot-Server-Patches/{0027-Prevent-tile-entity-and-entity-crashes.patch => 0026-Prevent-tile-entity-and-entity-crashes.patch} (96%)
 rename Spigot-Server-Patches/{0028-Configurable-top-of-nether-void-damage.patch => 0027-Configurable-top-of-nether-void-damage.patch} (96%)
 rename Spigot-Server-Patches/{0029-Check-online-mode-before-converting-and-renaming-pla.patch => 0028-Check-online-mode-before-converting-and-renaming-pla.patch} (92%)
 rename Spigot-Server-Patches/{0030-Always-tick-falling-blocks.patch => 0029-Always-tick-falling-blocks.patch} (93%)
 rename Spigot-Server-Patches/{0031-Lighting-Queue.patch => 0030-Lighting-Queue.patch} (99%)
 rename Spigot-Server-Patches/{0032-Optimize-draining.patch => 0031-Optimize-draining.patch} (93%)
 rename Spigot-Server-Patches/{0033-Configurable-end-credits.patch => 0032-Configurable-end-credits.patch} (96%)
 rename Spigot-Server-Patches/{0034-Fix-lag-from-explosions-processing-dead-entities.patch => 0033-Fix-lag-from-explosions-processing-dead-entities.patch} (94%)
 rename Spigot-Server-Patches/{0035-Generator-Settings.patch => 0034-Generator-Settings.patch} (99%)
 rename Spigot-Server-Patches/{0036-Optimize-explosions.patch => 0035-Optimize-explosions.patch} (98%)
 rename Spigot-Server-Patches/{0037-Stop-updating-flowing-block-if-material-has-changed.patch => 0036-Stop-updating-flowing-block-if-material-has-changed.patch} (91%)
 rename Spigot-Server-Patches/{0038-Fast-draining.patch => 0037-Fast-draining.patch} (98%)
 rename Spigot-Server-Patches/{0039-Configurable-lava-flow-speed.patch => 0038-Configurable-lava-flow-speed.patch} (95%)
 rename Spigot-Server-Patches/{0040-Add-player-view-distance-API.patch => 0039-Add-player-view-distance-API.patch} (98%)
 rename Spigot-Server-Patches/{0041-Disable-explosion-knockback.patch => 0040-Disable-explosion-knockback.patch} (97%)
 rename Spigot-Server-Patches/{0042-Disable-thunder.patch => 0041-Disable-thunder.patch} (93%)
 rename Spigot-Server-Patches/{0043-Disable-ice-and-snow.patch => 0042-Disable-ice-and-snow.patch} (93%)
 rename Spigot-Server-Patches/{0044-Configurable-mob-spawner-tick-rate.patch => 0043-Configurable-mob-spawner-tick-rate.patch} (97%)
 rename Spigot-Server-Patches/{0045-Send-absolute-position-the-first-time-an-entity-is-s.patch => 0044-Send-absolute-position-the-first-time-an-entity-is-s.patch} (98%)
 rename Spigot-Server-Patches/{0046-Add-BeaconEffectEvent.patch => 0045-Add-BeaconEffectEvent.patch} (97%)
 rename Spigot-Server-Patches/{0047-Configurable-container-update-tick-rate.patch => 0046-Configurable-container-update-tick-rate.patch} (95%)
 rename Spigot-Server-Patches/{0048-Fix-lava-water-some-times-creating-air-instead-of-co.patch => 0047-Fix-lava-water-some-times-creating-air-instead-of-co.patch} (91%)
 rename Spigot-Server-Patches/{0049-Use-UserCache-for-player-heads.patch => 0048-Use-UserCache-for-player-heads.patch} (94%)
 rename Spigot-Server-Patches/{0050-Disable-spigot-tick-limiters.patch => 0049-Disable-spigot-tick-limiters.patch} (94%)
 rename Spigot-Server-Patches/{0051-Configurable-Chunk-IO-Thread-Base-Count.patch => 0050-Configurable-Chunk-IO-Thread-Base-Count.patch} (84%)
 rename Spigot-Server-Patches/{0052-Don-t-create-Region-File-s-when-checking-if-chunk-ex.patch => 0051-Don-t-create-Region-File-s-when-checking-if-chunk-ex.patch} (93%)
 rename Spigot-Server-Patches/{0053-Add-PlayerInitialSpawnEvent.patch => 0052-Add-PlayerInitialSpawnEvent.patch} (93%)
 rename Spigot-Server-Patches/{0054-Disable-chest-cat-detection.patch => 0053-Disable-chest-cat-detection.patch} (95%)
 rename Spigot-Server-Patches/{0055-Ensure-commands-are-not-ran-async.patch => 0054-Ensure-commands-are-not-ran-async.patch} (96%)
 rename Spigot-Server-Patches/{0056-All-chunks-are-slime-spawn-chunks-toggle.patch => 0055-All-chunks-are-slime-spawn-chunks-toggle.patch} (95%)
 rename Spigot-Server-Patches/{0057-Optimize-Pathfinding.patch => 0056-Optimize-Pathfinding.patch} (95%)
 rename Spigot-Server-Patches/{0058-Avoid-hopper-searches-if-there-are-no-items.patch => 0057-Avoid-hopper-searches-if-there-are-no-items.patch} (97%)
 rename Spigot-Server-Patches/{0059-Expose-server-CommandMap.patch => 0058-Expose-server-CommandMap.patch} (88%)
 rename Spigot-Server-Patches/{0060-Be-a-bit-more-informative-in-maxHealth-exception.patch => 0059-Be-a-bit-more-informative-in-maxHealth-exception.patch} (93%)
 rename Spigot-Server-Patches/{0061-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch => 0060-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch} (95%)
 rename Spigot-Server-Patches/{0062-Player-Tab-List-and-Title-APIs.patch => 0061-Player-Tab-List-and-Title-APIs.patch} (98%)
 rename Spigot-Server-Patches/{0063-Ensure-inv-drag-is-in-bounds.patch => 0062-Ensure-inv-drag-is-in-bounds.patch} (92%)
 rename Spigot-Server-Patches/{0064-Change-implementation-of-tile-entity-removal-list.patch => 0063-Change-implementation-of-tile-entity-removal-list.patch} (97%)
 rename Spigot-Server-Patches/{0065-Add-configurable-portal-search-radius.patch => 0064-Add-configurable-portal-search-radius.patch} (96%)
 rename Spigot-Server-Patches/{0066-Add-velocity-warnings.patch => 0065-Add-velocity-warnings.patch} (93%)
 rename Spigot-Server-Patches/{0067-Fix-inter-world-teleportation-glitches.patch => 0066-Fix-inter-world-teleportation-glitches.patch} (96%)
 rename Spigot-Server-Patches/{0068-Add-exception-reporting-event.patch => 0067-Add-exception-reporting-event.patch} (99%)
 rename Spigot-Server-Patches/{0069-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch => 0068-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch} (94%)
 rename Spigot-Server-Patches/{0070-Disable-Scoreboards-for-non-players-by-default.patch => 0069-Disable-Scoreboards-for-non-players-by-default.patch} (97%)
 rename Spigot-Server-Patches/{0071-Add-methods-for-working-with-arrows-stuck-in-living-.patch => 0070-Add-methods-for-working-with-arrows-stuck-in-living-.patch} (95%)
 rename Spigot-Server-Patches/{0072-Complete-resource-pack-API.patch => 0071-Complete-resource-pack-API.patch} (95%)
 rename Spigot-Server-Patches/{0073-Chunk-save-queue-improvements.patch => 0072-Chunk-save-queue-improvements.patch} (98%)
 rename Spigot-Server-Patches/{0074-Chunk-Save-Reattempt.patch => 0073-Chunk-Save-Reattempt.patch} (95%)
 rename Spigot-Server-Patches/{0075-Default-loading-permissions.yml-before-plugins.patch => 0074-Default-loading-permissions.yml-before-plugins.patch} (94%)
 rename Spigot-Server-Patches/{0076-Allow-Reloading-of-Custom-Permissions.patch => 0075-Allow-Reloading-of-Custom-Permissions.patch} (94%)
 rename Spigot-Server-Patches/{0077-Remove-Metadata-on-reload.patch => 0076-Remove-Metadata-on-reload.patch} (92%)
 rename Spigot-Server-Patches/{0078-Undead-horse-leashing.patch => 0077-Undead-horse-leashing.patch} (94%)
 rename Spigot-Server-Patches/{0079-Fix-Furnace-cook-time-bug.patch => 0078-Fix-Furnace-cook-time-bug.patch} (93%)
 rename Spigot-Server-Patches/{0080-Handle-Item-Meta-Inconsistencies.patch => 0079-Handle-Item-Meta-Inconsistencies.patch} (99%)
 rename Spigot-Server-Patches/{0081-Configurable-Non-Player-Arrow-Despawn-Rate.patch => 0080-Configurable-Non-Player-Arrow-Despawn-Rate.patch} (95%)
 rename Spigot-Server-Patches/{0082-Add-World-Util-Methods.patch => 0081-Add-World-Util-Methods.patch} (97%)
 rename Spigot-Server-Patches/{0083-Optimized-Light-Level-Comparisons.patch => 0082-Optimized-Light-Level-Comparisons.patch} (99%)
 rename Spigot-Server-Patches/{0084-Pass-world-to-Village-creation.patch => 0083-Pass-world-to-Village-creation.patch} (94%)
 rename Spigot-Server-Patches/{0085-Custom-replacement-for-eaten-items.patch => 0084-Custom-replacement-for-eaten-items.patch} (95%)
 rename Spigot-Server-Patches/{0086-Set-health-before-death-event.patch => 0085-Set-health-before-death-event.patch} (92%)
 rename Spigot-Server-Patches/{0087-handle-NaN-health-absorb-values-and-repair-bad-data.patch => 0086-handle-NaN-health-absorb-values-and-repair-bad-data.patch} (96%)
 rename Spigot-Server-Patches/{0088-Catch-Async-PlayerChunkMap-operations.patch => 0087-Catch-Async-PlayerChunkMap-operations.patch} (91%)
 rename Spigot-Server-Patches/{0089-Support-offline-mode-in-whitelist-command-as-well.patch => 0088-Support-offline-mode-in-whitelist-command-as-well.patch} (98%)
 rename Spigot-Server-Patches/{0090-Fix-SkullCache-case-bug.patch => 0089-Fix-SkullCache-case-bug.patch} (92%)
 rename Spigot-Server-Patches/{0091-Waving-banner-workaround.patch => 0090-Waving-banner-workaround.patch} (93%)
 rename Spigot-Server-Patches/{0092-Use-a-Shared-Random-for-Entities.patch => 0091-Use-a-Shared-Random-for-Entities.patch} (91%)
 rename Spigot-Server-Patches/{0093-Don-t-teleport-dead-entities.patch => 0092-Don-t-teleport-dead-entities.patch} (93%)
 rename Spigot-Server-Patches/{0094-Optimize-Chunk-Access.patch => 0093-Optimize-Chunk-Access.patch} (95%)
 rename Spigot-Server-Patches/{0095-Configurable-spawn-chances-for-skeleton-horses.patch => 0094-Configurable-spawn-chances-for-skeleton-horses.patch} (94%)
 rename Spigot-Server-Patches/{0096-Optimize-isValidLocation-getType-and-getBlockData-fo.patch => 0095-Optimize-isValidLocation-getType-and-getBlockData-fo.patch} (99%)
 rename Spigot-Server-Patches/{0097-Use-correct-item-in-arrow-pickup-event.patch => 0096-Use-correct-item-in-arrow-pickup-event.patch} (95%)
 rename Spigot-Server-Patches/{0098-Fix-cooked-fish-legacy-import.patch => 0097-Fix-cooked-fish-legacy-import.patch} (93%)
 rename Spigot-Server-Patches/{0099-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch => 0098-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch} (98%)
 rename Spigot-Server-Patches/{0100-Access-items-by-EquipmentSlot.patch => 0099-Access-items-by-EquipmentSlot.patch} (96%)
 rename Spigot-Server-Patches/{0101-Check-async-remove-unused-vars-GH-159.patch => 0100-Check-async-remove-unused-vars-GH-159.patch} (95%)
 rename Spigot-Server-Patches/{0102-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch => 0101-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch} (97%)
 rename Spigot-Server-Patches/{0103-Entity-AddTo-RemoveFrom-World-Events.patch => 0102-Entity-AddTo-RemoveFrom-World-Events.patch} (92%)
 rename Spigot-Server-Patches/{0104-Configurable-Chunk-Inhabited-Timer.patch => 0103-Configurable-Chunk-Inhabited-Timer.patch} (94%)
 rename Spigot-Server-Patches/{0105-EntityPathfindEvent.patch => 0104-EntityPathfindEvent.patch} (95%)
 rename Spigot-Server-Patches/{0106-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch => 0105-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch} (97%)
 rename Spigot-Server-Patches/{0107-Minecart-drop-name-workaround.patch => 0106-Minecart-drop-name-workaround.patch} (92%)
 rename Spigot-Server-Patches/{0108-Reduce-IO-ops-opening-a-new-region-file.patch => 0107-Reduce-IO-ops-opening-a-new-region-file.patch} (95%)
 rename Spigot-Server-Patches/{0109-Sanitise-RegionFileCache-and-make-configurable.patch => 0108-Sanitise-RegionFileCache-and-make-configurable.patch} (95%)
 rename Spigot-Server-Patches/{0110-Add-getEntity-by-UUID-API.patch => 0109-Add-getEntity-by-UUID-API.patch} (96%)
 rename Spigot-Server-Patches/{0111-Use-Optimized-Collections.patch => 0110-Use-Optimized-Collections.patch} (96%)
 rename Spigot-Server-Patches/{0112-Do-not-load-chunks-for-light-checks.patch => 0111-Do-not-load-chunks-for-light-checks.patch} (92%)
 rename Spigot-Server-Patches/{0113-Add-PlayerUseUnknownEntityEvent.patch => 0112-Add-PlayerUseUnknownEntityEvent.patch} (90%)
 rename Spigot-Server-Patches/{0114-Fix-reducedDebugInfo-not-initialized-on-client.patch => 0113-Fix-reducedDebugInfo-not-initialized-on-client.patch} (93%)
 rename Spigot-Server-Patches/{0115-Configurable-Grass-Spread-Tick-Rate.patch => 0114-Configurable-Grass-Spread-Tick-Rate.patch} (95%)
 rename Spigot-Server-Patches/{0116-Configurable-Keep-Spawn-Loaded-range-per-world.patch => 0115-Configurable-Keep-Spawn-Loaded-range-per-world.patch} (98%)
 rename Spigot-Server-Patches/{0117-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch => 0116-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch} (90%)
 rename Spigot-Server-Patches/{0118-Don-t-spam-reload-spawn-chunks-in-nether-end.patch => 0117-Don-t-spam-reload-spawn-chunks-in-nether-end.patch} (94%)
 rename Spigot-Server-Patches/{0119-Remove-Debug-checks-from-DataBits.patch => 0118-Remove-Debug-checks-from-DataBits.patch} (95%)
 rename Spigot-Server-Patches/{0120-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch => 0119-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch} (94%)
 rename Spigot-Server-Patches/{0121-Workaround-for-setting-passengers-on-players.patch => 0120-Workaround-for-setting-passengers-on-players.patch} (93%)
 rename Spigot-Server-Patches/{0122-SPIGOT-1903-Update-PlayerConnection-on-teleporting-p.patch => 0121-SPIGOT-1903-Update-PlayerConnection-on-teleporting-p.patch} (91%)
 rename Spigot-Server-Patches/{0123-Remove-unused-World-Tile-Entity-List.patch => 0122-Remove-unused-World-Tile-Entity-List.patch} (97%)
 rename Spigot-Server-Patches/{0124-Don-t-tick-Skulls-unused-code.patch => 0123-Don-t-tick-Skulls-unused-code.patch} (90%)
 rename Spigot-Server-Patches/{0125-Configurable-Player-Collision.patch => 0124-Configurable-Player-Collision.patch} (97%)
 rename Spigot-Server-Patches/{0126-Add-handshake-event-to-allow-plugins-to-handle-clien.patch => 0125-Add-handshake-event-to-allow-plugins-to-handle-clien.patch} (97%)
 rename Spigot-Server-Patches/{0127-Water-mobs-should-only-spawn-in-the-water.patch => 0126-Water-mobs-should-only-spawn-in-the-water.patch} (93%)
 rename Spigot-Server-Patches/{0128-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch => 0127-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch} (96%)
 rename Spigot-Server-Patches/{0129-Configurable-RCON-IP-address.patch => 0128-Configurable-RCON-IP-address.patch} (92%)
 rename Spigot-Server-Patches/{0130-Prevent-Fire-from-loading-chunks.patch => 0129-Prevent-Fire-from-loading-chunks.patch} (96%)
 rename Spigot-Server-Patches/{0131-Implement-PlayerLocaleChangeEvent.patch => 0130-Implement-PlayerLocaleChangeEvent.patch} (96%)
 rename Spigot-Server-Patches/{0132-EntityRegainHealthEvent-isFastRegen-API.patch => 0131-EntityRegainHealthEvent-isFastRegen-API.patch} (96%)
 rename Spigot-Server-Patches/{0133-Add-ability-to-configure-frosted_ice-properties.patch => 0132-Add-ability-to-configure-frosted_ice-properties.patch} (96%)
 rename Spigot-Server-Patches/{0134-Vehicle-Event-Cancellation-Changes.patch => 0133-Vehicle-Event-Cancellation-Changes.patch} (98%)
 rename Spigot-Server-Patches/{0135-Arrow-pickup-rule-API.patch => 0134-Arrow-pickup-rule-API.patch} (95%)
 rename Spigot-Server-Patches/{0136-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch => 0135-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch} (97%)
 rename Spigot-Server-Patches/{0137-Improve-Minecraft-Hopper-Performance.patch => 0136-Improve-Minecraft-Hopper-Performance.patch} (97%)
 rename Spigot-Server-Patches/{0138-remove-null-possibility-for-getServer-singleton.patch => 0137-remove-null-possibility-for-getServer-singleton.patch} (95%)
 rename Spigot-Server-Patches/{0139-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch => 0138-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch} (98%)
 rename Spigot-Server-Patches/{0140-LootTable-API-Replenishable-Lootables-Feature.patch => 0139-LootTable-API-Replenishable-Lootables-Feature.patch} (99%)
 rename Spigot-Server-Patches/{0141-Do-not-load-chunks-for-pathfinding.patch => 0140-Do-not-load-chunks-for-pathfinding.patch} (90%)
 rename Spigot-Server-Patches/{0142-Entity-Tracking-Improvements.patch => 0141-Entity-Tracking-Improvements.patch} (97%)
 rename Spigot-Server-Patches/{0143-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch => 0142-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch} (90%)
 rename Spigot-Server-Patches/{0144-Do-not-mark-chunks-as-active-for-neighbor-updates.patch => 0143-Do-not-mark-chunks-as-active-for-neighbor-updates.patch} (97%)
 rename Spigot-Server-Patches/{0145-Fix-Chunk-Unload-Queue-Issues.patch => 0144-Fix-Chunk-Unload-Queue-Issues.patch} (93%)
 rename Spigot-Server-Patches/{0146-System-property-for-disabling-watchdoge.patch => 0145-System-property-for-disabling-watchdoge.patch} (91%)
 rename Spigot-Server-Patches/{0147-Optimize-EAR.patch => 0146-Optimize-EAR.patch} (96%)
 rename Spigot-Server-Patches/{0148-Optimize-UserCache-Thread-Safe.patch => 0147-Optimize-UserCache-Thread-Safe.patch} (97%)
 rename Spigot-Server-Patches/{0149-Avoid-blocking-on-Network-Manager-creation.patch => 0148-Avoid-blocking-on-Network-Manager-creation.patch} (97%)
 rename Spigot-Server-Patches/{0150-Optional-old-TNT-cannon-behaviors.patch => 0149-Optional-old-TNT-cannon-behaviors.patch} (99%)
 rename Spigot-Server-Patches/{0151-Faster-redstone-torch-rapid-clock-removal.patch => 0150-Faster-redstone-torch-rapid-clock-removal.patch} (95%)
 rename Spigot-Server-Patches/{0152-Ensure-Chunks-never-ever-load-async.patch => 0151-Ensure-Chunks-never-ever-load-async.patch} (97%)
 rename Spigot-Server-Patches/{0153-Add-server-name-parameter.patch => 0152-Add-server-name-parameter.patch} (92%)
 rename Spigot-Server-Patches/{0154-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch => 0153-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch} (97%)
 rename Spigot-Server-Patches/{0155-Fix-FallingBlocks-being-stuck-on-fences.patch => 0154-Fix-FallingBlocks-being-stuck-on-fences.patch} (98%)
 rename Spigot-Server-Patches/{0156-Make-entities-look-for-hoppers.patch => 0155-Make-entities-look-for-hoppers.patch} (99%)
 rename Spigot-Server-Patches/{0157-Remove-the-item-from-the-correct-hand-when-spawn-egg.patch => 0156-Remove-the-item-from-the-correct-hand-when-spawn-egg.patch} (95%)
 rename Spigot-Server-Patches/{0158-Delay-Chunk-Unloads-based-on-Player-Movement.patch => 0157-Delay-Chunk-Unloads-based-on-Player-Movement.patch} (98%)
 rename Spigot-Server-Patches/{0159-Toggleable-Elytra-Wall-Damage.patch => 0158-Toggleable-Elytra-Wall-Damage.patch} (95%)
 rename Spigot-Server-Patches/{0160-Fix-Double-World-Add-issues.patch => 0159-Fix-Double-World-Add-issues.patch} (95%)
 rename Spigot-Server-Patches/{0161-Fix-Old-Sign-Conversion.patch => 0160-Fix-Old-Sign-Conversion.patch} (98%)
 rename Spigot-Server-Patches/{0162-Don-t-try-and-fix-TileEntities-as-they-are-removed.patch => 0161-Don-t-try-and-fix-TileEntities-as-they-are-removed.patch} (98%)
 rename Spigot-Server-Patches/{0163-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch => 0162-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch} (92%)
 rename Spigot-Server-Patches/{0164-More-informative-vehicle-moved-wrongly-message.patch => 0163-More-informative-vehicle-moved-wrongly-message.patch} (89%)
 rename Spigot-Server-Patches/{0165-Re-track-players-that-dismount-from-other-players.patch => 0164-Re-track-players-that-dismount-from-other-players.patch} (93%)
 rename Spigot-Server-Patches/{0166-Add-setting-for-proxy-online-mode-status.patch => 0165-Add-setting-for-proxy-online-mode-status.patch} (94%)
 rename Spigot-Server-Patches/{0167-Optimise-BlockStateEnum-hashCode-and-equals.patch => 0166-Optimise-BlockStateEnum-hashCode-and-equals.patch} (96%)
 rename Spigot-Server-Patches/{0168-Disable-ticking-of-snow-blocks.patch => 0167-Disable-ticking-of-snow-blocks.patch} (93%)
 rename Spigot-Server-Patches/{0169-Convert-new-health-to-a-float-during-set.patch => 0168-Convert-new-health-to-a-float-during-set.patch} (94%)
 rename Spigot-Server-Patches/{0170-Fix-AIOOBE-in-inventory-handling.patch => 0169-Fix-AIOOBE-in-inventory-handling.patch} (85%)
 create mode 100644 Spigot-Server-Patches/0170-Rate-limit-PacketPlayInUseItem.patch

diff --git a/Spigot-Server-Patches/0013-Player-Exhaustion-Multipliers.patch b/Spigot-Server-Patches/0012-Player-Exhaustion-Multipliers.patch
similarity index 97%
rename from Spigot-Server-Patches/0013-Player-Exhaustion-Multipliers.patch
rename to Spigot-Server-Patches/0012-Player-Exhaustion-Multipliers.patch
index 3f46bdfaff..1c6c36fa62 100644
--- a/Spigot-Server-Patches/0013-Player-Exhaustion-Multipliers.patch
+++ b/Spigot-Server-Patches/0012-Player-Exhaustion-Multipliers.patch
@@ -1,4 +1,4 @@
-From b7d32c2cb04b15597d51c3b33499d01a086ad70d Mon Sep 17 00:00:00 2001
+From da91460fe9c232759f9523b67a9f656cf4a2a854 Mon Sep 17 00:00:00 2001
 From: gsand <gsandowns@gmail.com>
 Date: Tue, 1 Mar 2016 13:43:16 -0600
 Subject: [PATCH] Player Exhaustion Multipliers
@@ -56,5 +56,5 @@ index 30c5116..ffcc235 100644
              } else if (this.m_()) {
                  if (d1 > 0.0D) {
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0012-Toggle-for-player-interact-limiter.patch b/Spigot-Server-Patches/0012-Toggle-for-player-interact-limiter.patch
deleted file mode 100644
index 04469946aa..0000000000
--- a/Spigot-Server-Patches/0012-Toggle-for-player-interact-limiter.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From e0a86e364a8ce22e9465fdbb332de75844adfc1a Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Tue, 1 Mar 2016 13:31:05 -0600
-Subject: [PATCH] Toggle for player interact limiter
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 7739e78..87bae87 100644
---- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -184,4 +184,12 @@ public class PaperConfig {
-                 " - Interval: " + timeSummary(Timings.getHistoryInterval() / 20) +
-                 " - Length: " + timeSummary(Timings.getHistoryLength() / 20));
-     }
-+
-+    public static boolean useInteractLimiter;
-+    private static void useInteractLimiter() {
-+        useInteractLimiter = getBoolean("settings.limit-player-interactions", true);
-+        if (!useInteractLimiter) {
-+            Bukkit.getLogger().log(Level.INFO, "Disabling player interaction limiter, your server may be more vulnerable to malicious users");
-+        }
-+    }
- }
-diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 1a39ba3..5bbb644 100644
---- a/src/main/java/net/minecraft/server/PlayerConnection.java
-+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -914,7 +914,8 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
-         this.player.resetIdleTimer();
-         // Spigot start
-         boolean throttled = false;
--        if (lastPlace != -1 && packetplayinblockplace.timestamp - lastPlace < 30 && packets++ >= 4) {
-+        // Paper - Allow disabling interact limiter
-+        if (com.destroystokyo.paper.PaperConfig.useInteractLimiter && lastPlace != -1 && packetplayinblockplace.timestamp - lastPlace < 30 && packets++ >= 4) {
-             throttled = true;
-         } else if ( packetplayinblockplace.timestamp - lastPlace >= 30 || lastPlace == -1 )
-         {
--- 
-2.8.3.windows.1
-
diff --git a/Spigot-Server-Patches/0014-Add-configurable-despawn-distances-for-living-entiti.patch b/Spigot-Server-Patches/0013-Add-configurable-despawn-distances-for-living-entiti.patch
similarity index 97%
rename from Spigot-Server-Patches/0014-Add-configurable-despawn-distances-for-living-entiti.patch
rename to Spigot-Server-Patches/0013-Add-configurable-despawn-distances-for-living-entiti.patch
index 3e74d30d81..c5567efd9f 100644
--- a/Spigot-Server-Patches/0014-Add-configurable-despawn-distances-for-living-entiti.patch
+++ b/Spigot-Server-Patches/0013-Add-configurable-despawn-distances-for-living-entiti.patch
@@ -1,4 +1,4 @@
-From f40e12f5196e4d6a1f4b5a216616133016dc780b Mon Sep 17 00:00:00 2001
+From 0765aaedfd591133840b85dd8399cedb173a3b46 Mon Sep 17 00:00:00 2001
 From: Suddenly <suddenly@suddenly.coffee>
 Date: Tue, 1 Mar 2016 13:51:54 -0600
 Subject: [PATCH] Add configurable despawn distances for living entities
@@ -51,5 +51,5 @@ index bbf7f02..85d4b81 100644
                  }
              }
 -- 
-2.8.3
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0015-Allow-for-toggling-of-spawn-chunks.patch b/Spigot-Server-Patches/0014-Allow-for-toggling-of-spawn-chunks.patch
similarity index 93%
rename from Spigot-Server-Patches/0015-Allow-for-toggling-of-spawn-chunks.patch
rename to Spigot-Server-Patches/0014-Allow-for-toggling-of-spawn-chunks.patch
index 9f2b4cef1d..474c52a81c 100644
--- a/Spigot-Server-Patches/0015-Allow-for-toggling-of-spawn-chunks.patch
+++ b/Spigot-Server-Patches/0014-Allow-for-toggling-of-spawn-chunks.patch
@@ -1,4 +1,4 @@
-From 87ba7a3f09983fa690278baf262b8ba6c3823e37 Mon Sep 17 00:00:00 2001
+From 2a60bdf1a9f93a1969dfe37d9e6a73fd27dddb2f Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 3 Mar 2016 03:53:43 -0600
 Subject: [PATCH] Allow for toggling of spawn chunks
@@ -20,7 +20,7 @@ index 402dbe7..78dcf26 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f8c8e4b..c110c74 100644
+index 932e826..3e79e02 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -198,6 +198,7 @@ public abstract class World implements IBlockAccess {
@@ -32,5 +32,5 @@ index f8c8e4b..c110c74 100644
          this.tileLimiter = new org.spigotmc.TickLimiter(spigotConfig.tileMaxTickTime);
      }
 -- 
-2.8.3
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch b/Spigot-Server-Patches/0015-Drop-falling-block-and-tnt-entities-at-the-specified.patch
similarity index 96%
rename from Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch
rename to Spigot-Server-Patches/0015-Drop-falling-block-and-tnt-entities-at-the-specified.patch
index 1ff27abe2e..38205893ba 100644
--- a/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch
+++ b/Spigot-Server-Patches/0015-Drop-falling-block-and-tnt-entities-at-the-specified.patch
@@ -1,4 +1,4 @@
-From 32ef7d31604f2cf0aee7bae369ab702f2e626441 Mon Sep 17 00:00:00 2001
+From 2180a0f774d1077f684fbee8360b9f9db2c84be2 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 14:14:15 -0600
 Subject: [PATCH] Drop falling block and tnt entities at the specified height
@@ -24,7 +24,7 @@ index 78dcf26..f19ae97 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index 4514401..65c1150 100644
+index b8449fe..dbcda27 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
 @@ -80,6 +80,17 @@ public class EntityFallingBlock extends Entity {
@@ -64,5 +64,5 @@ index 0ed3f89..2745c49 100644
          this.motY *= 0.9800000190734863D;
          this.motZ *= 0.9800000190734863D;
 -- 
-2.8.3
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0017-Configurable-speed-for-water-flowing-over-lava.patch b/Spigot-Server-Patches/0016-Configurable-speed-for-water-flowing-over-lava.patch
similarity index 97%
rename from Spigot-Server-Patches/0017-Configurable-speed-for-water-flowing-over-lava.patch
rename to Spigot-Server-Patches/0016-Configurable-speed-for-water-flowing-over-lava.patch
index 44cdf51ca3..98ae3be961 100644
--- a/Spigot-Server-Patches/0017-Configurable-speed-for-water-flowing-over-lava.patch
+++ b/Spigot-Server-Patches/0016-Configurable-speed-for-water-flowing-over-lava.patch
@@ -1,4 +1,4 @@
-From 95738bca3c885025041cad1726919f30b68a8055 Mon Sep 17 00:00:00 2001
+From 1cf26e0671905c3572a05a55b68d4c04d934fb4b Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 14:27:13 -0600
 Subject: [PATCH] Configurable speed for water flowing over lava
@@ -57,5 +57,5 @@ index c0f4961..b00865e 100644
 +    }
  }
 -- 
-2.8.3
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0018-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
similarity index 98%
rename from Spigot-Server-Patches/0018-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
rename to Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
index e928dbc3f0..94bee2a22f 100644
--- a/Spigot-Server-Patches/0018-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
+++ b/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
@@ -1,4 +1,4 @@
-From 2053173e8972809f9e883ec0633d325101aad5c9 Mon Sep 17 00:00:00 2001
+From 6758ff9e302ca3dc0b004c9724d49d831026dcc2 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 14:32:43 -0600
 Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang
@@ -80,5 +80,5 @@ index 94a3d42..3ed983c 100644
                  log.log( Level.SEVERE, "------------------------------" );
                  //
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0019-Player-affects-spawning-API.patch b/Spigot-Server-Patches/0018-Player-affects-spawning-API.patch
similarity index 99%
rename from Spigot-Server-Patches/0019-Player-affects-spawning-API.patch
rename to Spigot-Server-Patches/0018-Player-affects-spawning-API.patch
index 859266f22c..112830b733 100644
--- a/Spigot-Server-Patches/0019-Player-affects-spawning-API.patch
+++ b/Spigot-Server-Patches/0018-Player-affects-spawning-API.patch
@@ -1,4 +1,4 @@
-From 299aa64e2a7e8669521ab3a452d925f128308304 Mon Sep 17 00:00:00 2001
+From 97bbce71d023974e57cfae01c96b05e7086e2d77 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
@@ -184,7 +184,7 @@ index 3e79e02..e3d971c 100644
                  double d4 = entityhuman.e(d0, d1, d2);
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d6cf997..f678d7f 100644
+index 5874554..95cdbab 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1427,6 +1427,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -205,5 +205,5 @@ index d6cf997..f678d7f 100644
      private final Player.Spigot spigot = new Player.Spigot()
      {
 -- 
-2.9.0.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0020-Metrics.patch b/Spigot-Server-Patches/0019-Metrics.patch
similarity index 92%
rename from Spigot-Server-Patches/0020-Metrics.patch
rename to Spigot-Server-Patches/0019-Metrics.patch
index aedb7d43d3..856ba24490 100644
--- a/Spigot-Server-Patches/0020-Metrics.patch
+++ b/Spigot-Server-Patches/0019-Metrics.patch
@@ -1,4 +1,4 @@
-From 0a3ca307c7e50e0961b26442794c63bf7c356be6 Mon Sep 17 00:00:00 2001
+From d8a42f222d0f8146e852a3895d3a7eb0e9c267c2 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 14:54:32 -0600
 Subject: [PATCH] Metrics
@@ -18,5 +18,5 @@ index a5fd59d..680283c 100644
          String pluginVersion = (Metrics.class.getPackage().getImplementationVersion() != null) ? Metrics.class.getPackage().getImplementationVersion() : "unknown";
          String serverVersion = Bukkit.getVersion();
 -- 
-2.8.3
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0021-Remove-invalid-mob-spawner-tile-entities.patch b/Spigot-Server-Patches/0020-Remove-invalid-mob-spawner-tile-entities.patch
similarity index 91%
rename from Spigot-Server-Patches/0021-Remove-invalid-mob-spawner-tile-entities.patch
rename to Spigot-Server-Patches/0020-Remove-invalid-mob-spawner-tile-entities.patch
index 296c01eca2..9497f8b02e 100644
--- a/Spigot-Server-Patches/0021-Remove-invalid-mob-spawner-tile-entities.patch
+++ b/Spigot-Server-Patches/0020-Remove-invalid-mob-spawner-tile-entities.patch
@@ -1,11 +1,11 @@
-From 32b85f0c39860801e6a9a399fe6125effef5d3b9 Mon Sep 17 00:00:00 2001
+From f4ee8852de88f04a10452efeadde65721090b7a2 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 b651edc..015a223 100644
+index 5807bb8..445419f 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -722,6 +722,10 @@ public class Chunk {
@@ -20,5 +20,5 @@ index b651edc..015a223 100644
              System.out.println("Attempted to place a tile entity (" + tileentity + ") at " + tileentity.position.getX() + "," + tileentity.position.getY() + "," + tileentity.position.getZ()
                  + " (" + org.bukkit.craftbukkit.util.CraftMagicNumbers.getMaterial(getBlockData(blockposition).getBlock()) + ") where there was no entity tile!");
 -- 
-2.9.0
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0022-Optimize-TileEntity-Ticking.patch b/Spigot-Server-Patches/0021-Optimize-TileEntity-Ticking.patch
similarity index 98%
rename from Spigot-Server-Patches/0022-Optimize-TileEntity-Ticking.patch
rename to Spigot-Server-Patches/0021-Optimize-TileEntity-Ticking.patch
index ccb2751798..10fd997609 100644
--- a/Spigot-Server-Patches/0022-Optimize-TileEntity-Ticking.patch
+++ b/Spigot-Server-Patches/0021-Optimize-TileEntity-Ticking.patch
@@ -1,4 +1,4 @@
-From b2d99fa9ab15185be72c51be72eadd7f05406428 Mon Sep 17 00:00:00 2001
+From acf62d273a781fa52762156b98d76d0f27e28a4d Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 22:01:19 -0600
 Subject: [PATCH] Optimize TileEntity Ticking
@@ -186,5 +186,5 @@ index d5f0d61..b257bc4 100644
      }
  
 -- 
-2.8.3
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0023-Further-improve-server-tick-loop.patch b/Spigot-Server-Patches/0022-Further-improve-server-tick-loop.patch
similarity index 99%
rename from Spigot-Server-Patches/0023-Further-improve-server-tick-loop.patch
rename to Spigot-Server-Patches/0022-Further-improve-server-tick-loop.patch
index 4ec72ceed6..af750c823c 100644
--- a/Spigot-Server-Patches/0023-Further-improve-server-tick-loop.patch
+++ b/Spigot-Server-Patches/0022-Further-improve-server-tick-loop.patch
@@ -1,4 +1,4 @@
-From 047c0e003720a57493daadd0211932a833a55331 Mon Sep 17 00:00:00 2001
+From 01d6f991f6f4b263e38da7878cad63b7a7cd7b1b 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
@@ -211,5 +211,5 @@ index be2e31d..6d21c32 100644
          return ( ( tps > 18.0 ) ? ChatColor.GREEN : ( tps > 16.0 ) ? ChatColor.YELLOW : ChatColor.RED ).toString()
                  + ( ( tps > 20.0 ) ? "*" : "" ) + Math.min( Math.round( tps * 100.0 ) / 100.0, 20.0 );
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0024-Only-refresh-abilities-if-needed.patch b/Spigot-Server-Patches/0023-Only-refresh-abilities-if-needed.patch
similarity index 90%
rename from Spigot-Server-Patches/0024-Only-refresh-abilities-if-needed.patch
rename to Spigot-Server-Patches/0023-Only-refresh-abilities-if-needed.patch
index 8b85c1c1ef..e4a5af94a3 100644
--- a/Spigot-Server-Patches/0024-Only-refresh-abilities-if-needed.patch
+++ b/Spigot-Server-Patches/0023-Only-refresh-abilities-if-needed.patch
@@ -1,11 +1,11 @@
-From 3329d9605d312326a35d19f576307a30694bff8f Mon Sep 17 00:00:00 2001
+From 52edc592b137c32d87f8ead08ea7b011614b406e 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 11e3028..eac8062 100644
+index 95cdbab..3b0e58b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1151,12 +1151,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -24,5 +24,5 @@ index 11e3028..eac8062 100644
  
      @Override
 -- 
-2.8.3
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0025-Add-async-chunk-load-API.patch b/Spigot-Server-Patches/0024-Add-async-chunk-load-API.patch
similarity index 92%
rename from Spigot-Server-Patches/0025-Add-async-chunk-load-API.patch
rename to Spigot-Server-Patches/0024-Add-async-chunk-load-API.patch
index 0f08e0b404..c2298dcb12 100644
--- a/Spigot-Server-Patches/0025-Add-async-chunk-load-API.patch
+++ b/Spigot-Server-Patches/0024-Add-async-chunk-load-API.patch
@@ -1,11 +1,11 @@
-From dbace07a52c033002d6798acd32beea67d52d9d8 Mon Sep 17 00:00:00 2001
+From c4f8d2a04dc43344dc465aeee0ad81a67677ea1e Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 23:19:01 -0600
 Subject: [PATCH] Add async chunk load API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 4eacee7..4ab7efc 100644
+index b1e4026..9ef8fc1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -125,6 +125,26 @@ public class CraftWorld implements World {
@@ -36,5 +36,5 @@ index 4eacee7..4ab7efc 100644
          return this.world.getChunkProviderServer().getChunkAt(x, z).bukkitChunk;
      }
 -- 
-2.8.3
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0026-Entity-Origin-API.patch b/Spigot-Server-Patches/0025-Entity-Origin-API.patch
similarity index 99%
rename from Spigot-Server-Patches/0026-Entity-Origin-API.patch
rename to Spigot-Server-Patches/0025-Entity-Origin-API.patch
index 17d6b2eb2f..88aa186d65 100644
--- a/Spigot-Server-Patches/0026-Entity-Origin-API.patch
+++ b/Spigot-Server-Patches/0025-Entity-Origin-API.patch
@@ -1,4 +1,4 @@
-From fbab4ca7a4c094c2b6f537d701af390f8e33c8cc Mon Sep 17 00:00:00 2001
+From ed3cf379c0f5d770f5cf271899c9e6e86803d915 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/Spigot-Server-Patches/0027-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/0027-Prevent-tile-entity-and-entity-crashes.patch
rename to Spigot-Server-Patches/0026-Prevent-tile-entity-and-entity-crashes.patch
index d5c7ee8443..870bbe8457 100644
--- a/Spigot-Server-Patches/0027-Prevent-tile-entity-and-entity-crashes.patch
+++ b/Spigot-Server-Patches/0026-Prevent-tile-entity-and-entity-crashes.patch
@@ -1,4 +1,4 @@
-From 68a72eaea8d7ded8e658aebf0bc89951e62c99bb Mon Sep 17 00:00:00 2001
+From 9180cb4c79c197a377028ff0066f36a57010f7e3 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
@@ -23,7 +23,7 @@ index 2b82312..9fa93ed 100644
                  public String a() throws Exception {
                      int i = Block.getId(TileEntity.this.world.getType(TileEntity.this.position).getBlock());
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 8b133c1..746438f 100644
+index 5b3e50c..8fb8176 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1445,10 +1445,12 @@ public abstract class World implements IBlockAccess {
@@ -62,5 +62,5 @@ index 8b133c1..746438f 100644
                      // Spigot start
                      finally {
 -- 
-2.8.3.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0028-Configurable-top-of-nether-void-damage.patch b/Spigot-Server-Patches/0027-Configurable-top-of-nether-void-damage.patch
similarity index 96%
rename from Spigot-Server-Patches/0028-Configurable-top-of-nether-void-damage.patch
rename to Spigot-Server-Patches/0027-Configurable-top-of-nether-void-damage.patch
index 021d06b1b0..4ee0762fb0 100644
--- a/Spigot-Server-Patches/0028-Configurable-top-of-nether-void-damage.patch
+++ b/Spigot-Server-Patches/0027-Configurable-top-of-nether-void-damage.patch
@@ -1,4 +1,4 @@
-From 57fda9063cff2eb244d9802e4a449f30ff528f56 Mon Sep 17 00:00:00 2001
+From a926366fca50262a094af3fe90e733f386d83b7c 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
@@ -20,7 +20,7 @@ index 8fc2f6c..d78b688 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 395811a..3228932 100644
+index 38df1c6..fd51ecb 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -386,9 +386,15 @@ public abstract class Entity implements ICommandListener {
@@ -87,5 +87,5 @@ index 36ef2da..4438d83 100644
          int i;
  
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0029-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 92%
rename from Spigot-Server-Patches/0029-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 4fb568e658..15d8f26c0c 100644
--- a/Spigot-Server-Patches/0029-Check-online-mode-before-converting-and-renaming-pla.patch
+++ b/Spigot-Server-Patches/0028-Check-online-mode-before-converting-and-renaming-pla.patch
@@ -1,4 +1,4 @@
-From 44bda2888bfd777effdc6a9c6569801f2637263a Mon Sep 17 00:00:00 2001
+From 1f849507582b5b1dae133b05b73c29aa78ef9d14 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
@@ -18,5 +18,5 @@ index 75e2338..f077398 100644
                  file = new File( this.playerDir, UUID.nameUUIDFromBytes( ( "OfflinePlayer:" + entityhuman.getName() ).getBytes( "UTF-8" ) ).toString() + ".dat");
                  if ( file.exists() )
 -- 
-2.8.3
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0030-Always-tick-falling-blocks.patch b/Spigot-Server-Patches/0029-Always-tick-falling-blocks.patch
similarity index 93%
rename from Spigot-Server-Patches/0030-Always-tick-falling-blocks.patch
rename to Spigot-Server-Patches/0029-Always-tick-falling-blocks.patch
index 6d91139ccd..9e14fafde8 100644
--- a/Spigot-Server-Patches/0030-Always-tick-falling-blocks.patch
+++ b/Spigot-Server-Patches/0029-Always-tick-falling-blocks.patch
@@ -1,4 +1,4 @@
-From 765f4d691c277fc18b11ad8e045bc30a691d3dc2 Mon Sep 17 00:00:00 2001
+From 67763518c9084c592b734afd2bd4118da9127b92 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
@@ -25,5 +25,5 @@ index eb30abe..c4ed64a 100644
                  || entity instanceof EntityFireworks )
          {
 -- 
-2.8.3
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0031-Lighting-Queue.patch b/Spigot-Server-Patches/0030-Lighting-Queue.patch
similarity index 99%
rename from Spigot-Server-Patches/0031-Lighting-Queue.patch
rename to Spigot-Server-Patches/0030-Lighting-Queue.patch
index 43523925f4..b0eaa09c7a 100644
--- a/Spigot-Server-Patches/0031-Lighting-Queue.patch
+++ b/Spigot-Server-Patches/0030-Lighting-Queue.patch
@@ -1,4 +1,4 @@
-From 55cfaf3677015d0009f483b6c496d43dc1c4c8b7 Mon Sep 17 00:00:00 2001
+From 92e46c6a80210fe9152b447e7dc2275dadb8e575 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 00:52:31 -0600
 Subject: [PATCH] Lighting Queue
@@ -235,5 +235,5 @@ index 8fb8176..672167a 100644
                  }
  
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0032-Optimize-draining.patch b/Spigot-Server-Patches/0031-Optimize-draining.patch
similarity index 93%
rename from Spigot-Server-Patches/0032-Optimize-draining.patch
rename to Spigot-Server-Patches/0031-Optimize-draining.patch
index a632e350c4..52e556076d 100644
--- a/Spigot-Server-Patches/0032-Optimize-draining.patch
+++ b/Spigot-Server-Patches/0031-Optimize-draining.patch
@@ -1,4 +1,4 @@
-From a403f340774e9d181e2ddd8c2d7f4f738ae0b170 Mon Sep 17 00:00:00 2001
+From 06168b7a4b64d23e90503435a82258588871d586 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 00:55:24 -0600
 Subject: [PATCH] Optimize draining
@@ -24,5 +24,5 @@ index b00865e..72654df 100644
              }
          } else {
 -- 
-2.8.3
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0033-Configurable-end-credits.patch b/Spigot-Server-Patches/0032-Configurable-end-credits.patch
similarity index 96%
rename from Spigot-Server-Patches/0033-Configurable-end-credits.patch
rename to Spigot-Server-Patches/0032-Configurable-end-credits.patch
index f50ded6154..ae823e1f46 100644
--- a/Spigot-Server-Patches/0033-Configurable-end-credits.patch
+++ b/Spigot-Server-Patches/0032-Configurable-end-credits.patch
@@ -1,4 +1,4 @@
-From efc0f30551d46d77f1132db3ebe51095e79f64c6 Mon Sep 17 00:00:00 2001
+From 40b69207b686437a0b1414c9f46ad9c3d11f5d6f 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
@@ -52,5 +52,5 @@ index 37c94f8..522c7f2 100644
                  } else {
                      this.b((Statistic) AchievementList.D);
 -- 
-2.8.3
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0034-Fix-lag-from-explosions-processing-dead-entities.patch b/Spigot-Server-Patches/0033-Fix-lag-from-explosions-processing-dead-entities.patch
similarity index 94%
rename from Spigot-Server-Patches/0034-Fix-lag-from-explosions-processing-dead-entities.patch
rename to Spigot-Server-Patches/0033-Fix-lag-from-explosions-processing-dead-entities.patch
index a0c1a25081..b6a2fa5f60 100644
--- a/Spigot-Server-Patches/0034-Fix-lag-from-explosions-processing-dead-entities.patch
+++ b/Spigot-Server-Patches/0033-Fix-lag-from-explosions-processing-dead-entities.patch
@@ -1,4 +1,4 @@
-From 38d908fa1f68546678a01f1a50ab203cf69a1a7d Mon Sep 17 00:00:00 2001
+From 8bd58b6f24a637fc603a703b2d20cc4208c564ac 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
@@ -25,5 +25,5 @@ index acbf7a8..f4765d3 100644
  
          for (int l1 = 0; l1 < list.size(); ++l1) {
 -- 
-2.8.3
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0035-Generator-Settings.patch b/Spigot-Server-Patches/0034-Generator-Settings.patch
similarity index 99%
rename from Spigot-Server-Patches/0035-Generator-Settings.patch
rename to Spigot-Server-Patches/0034-Generator-Settings.patch
index 383effdc46..51bc251622 100644
--- a/Spigot-Server-Patches/0035-Generator-Settings.patch
+++ b/Spigot-Server-Patches/0034-Generator-Settings.patch
@@ -1,4 +1,4 @@
-From 165f860eb9571e17f3ffefd6cc4259cee7f21592 Mon Sep 17 00:00:00 2001
+From b183f14705315562623ffaa7bdfce84d4855c4f3 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 02:17:54 -0600
 Subject: [PATCH] Generator Settings
@@ -265,5 +265,5 @@ index c965af1..3ce4449 100644
          Iterator iterator = this.c.values().iterator();
  
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0036-Optimize-explosions.patch b/Spigot-Server-Patches/0035-Optimize-explosions.patch
similarity index 98%
rename from Spigot-Server-Patches/0036-Optimize-explosions.patch
rename to Spigot-Server-Patches/0035-Optimize-explosions.patch
index 70e44b3fac..584cc7adbc 100644
--- a/Spigot-Server-Patches/0036-Optimize-explosions.patch
+++ b/Spigot-Server-Patches/0035-Optimize-explosions.patch
@@ -1,4 +1,4 @@
-From 6eed8e312a9ea1123c11b99233f9411bfc7a0e03 Mon Sep 17 00:00:00 2001
+From 428b111b0dd4542d55db721110adf33e7feead76 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
@@ -124,7 +124,7 @@ index f4765d3..caf29c7 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 7f6a29d..a41c931 100644
+index d0060d0..d1d268f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -872,6 +872,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -156,5 +156,5 @@ index 672167a..e8cfe2b 100644
      public CraftWorld getWorld() {
          return this.world;
 -- 
-2.9.0.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0037-Stop-updating-flowing-block-if-material-has-changed.patch b/Spigot-Server-Patches/0036-Stop-updating-flowing-block-if-material-has-changed.patch
similarity index 91%
rename from Spigot-Server-Patches/0037-Stop-updating-flowing-block-if-material-has-changed.patch
rename to Spigot-Server-Patches/0036-Stop-updating-flowing-block-if-material-has-changed.patch
index 0076fe15bf..f1796ae7a2 100644
--- a/Spigot-Server-Patches/0037-Stop-updating-flowing-block-if-material-has-changed.patch
+++ b/Spigot-Server-Patches/0036-Stop-updating-flowing-block-if-material-has-changed.patch
@@ -1,4 +1,4 @@
-From 0334b767beb65705a85a902bb77a5da60faff822 Mon Sep 17 00:00:00 2001
+From dac6bac6e17684e8b5b4b0fa5e51fe76f0f5b92f Mon Sep 17 00:00:00 2001
 From: Iceee <andrew@opticgaming.tv>
 Date: Wed, 2 Mar 2016 12:03:23 -0600
 Subject: [PATCH] Stop updating flowing block if material has changed
@@ -17,5 +17,5 @@ index 72654df..def694a 100644
  
          if (this.h(world, blockposition.down(), iblockdata2)) {
 -- 
-2.8.3
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0038-Fast-draining.patch b/Spigot-Server-Patches/0037-Fast-draining.patch
similarity index 98%
rename from Spigot-Server-Patches/0038-Fast-draining.patch
rename to Spigot-Server-Patches/0037-Fast-draining.patch
index f6154e3a34..d206662261 100644
--- a/Spigot-Server-Patches/0038-Fast-draining.patch
+++ b/Spigot-Server-Patches/0037-Fast-draining.patch
@@ -1,4 +1,4 @@
-From a4d358914233d0cb8f5ac40de23b832507fb39e2 Mon Sep 17 00:00:00 2001
+From 678a7464e92867731d118c7beea8f565e5ad6c69 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 12:20:52 -0600
 Subject: [PATCH] Fast draining
@@ -109,5 +109,5 @@ index def694a..0b5bc19 100644
 +    // Paper end
  }
 -- 
-2.8.3
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0039-Configurable-lava-flow-speed.patch b/Spigot-Server-Patches/0038-Configurable-lava-flow-speed.patch
similarity index 95%
rename from Spigot-Server-Patches/0039-Configurable-lava-flow-speed.patch
rename to Spigot-Server-Patches/0038-Configurable-lava-flow-speed.patch
index 4bebfda141..10525302c3 100644
--- a/Spigot-Server-Patches/0039-Configurable-lava-flow-speed.patch
+++ b/Spigot-Server-Patches/0038-Configurable-lava-flow-speed.patch
@@ -1,4 +1,4 @@
-From b24e5f750fea9cddda7c7379f0e0d3a041c6c4d3 Mon Sep 17 00:00:00 2001
+From 2ce25ad8cfc444a0f5bf7e327e99ce0f05618bfe Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 12:27:07 -0600
 Subject: [PATCH] Configurable lava flow speed
@@ -35,5 +35,5 @@ index 0b5bc19..0336b9c 100644
                  world.getType(blockposition.north(1)).getBlock().material == Material.LAVA ||
                          world.getType(blockposition.south(1)).getBlock().material == Material.LAVA ||
 -- 
-2.8.3
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0040-Add-player-view-distance-API.patch b/Spigot-Server-Patches/0039-Add-player-view-distance-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0040-Add-player-view-distance-API.patch
rename to Spigot-Server-Patches/0039-Add-player-view-distance-API.patch
index 142d873f5d..bf34763a9d 100644
--- a/Spigot-Server-Patches/0040-Add-player-view-distance-API.patch
+++ b/Spigot-Server-Patches/0039-Add-player-view-distance-API.patch
@@ -1,4 +1,4 @@
-From 32205193321f857475c11a9e4b1e30a7d9031817 Mon Sep 17 00:00:00 2001
+From 47bf3a4b1683d16807ed8e5af8ac10fae61beb57 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 14:35:27 -0600
 Subject: [PATCH] Add player view distance API
@@ -194,7 +194,7 @@ index 797a84f..fcd0186 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 64c9c1c..e09dc78 100644
+index 3b0e58b..75c7ece 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1438,6 +1438,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -215,5 +215,5 @@ index 64c9c1c..e09dc78 100644
      private final Player.Spigot spigot = new Player.Spigot()
      {
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0041-Disable-explosion-knockback.patch b/Spigot-Server-Patches/0040-Disable-explosion-knockback.patch
similarity index 97%
rename from Spigot-Server-Patches/0041-Disable-explosion-knockback.patch
rename to Spigot-Server-Patches/0040-Disable-explosion-knockback.patch
index f9aaa1a568..4479052eff 100644
--- a/Spigot-Server-Patches/0041-Disable-explosion-knockback.patch
+++ b/Spigot-Server-Patches/0040-Disable-explosion-knockback.patch
@@ -1,4 +1,4 @@
-From aee68d2743a1f3e7e3633cd3b348282fc2c26fa3 Mon Sep 17 00:00:00 2001
+From b17bd30962bd0c8bf018b8e06301ccb0670b0dfa 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
@@ -19,7 +19,7 @@ index 004d4c0..87979dd 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index b5db35f..c1c6822 100644
+index 0a583bc..8aaab9e 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -872,12 +872,14 @@ public abstract class EntityLiving extends Entity {
@@ -69,5 +69,5 @@ index caf29c7..6cdc3a3 100644
                              }
                          }
 -- 
-2.8.3
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0042-Disable-thunder.patch b/Spigot-Server-Patches/0041-Disable-thunder.patch
similarity index 93%
rename from Spigot-Server-Patches/0042-Disable-thunder.patch
rename to Spigot-Server-Patches/0041-Disable-thunder.patch
index 46200eed1f..a21fadf114 100644
--- a/Spigot-Server-Patches/0042-Disable-thunder.patch
+++ b/Spigot-Server-Patches/0041-Disable-thunder.patch
@@ -1,4 +1,4 @@
-From c711eee0e721258c1a39c806dc080353e634b425 Mon Sep 17 00:00:00 2001
+From c5512f2eb68c4789b22668680af20606826726e6 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
@@ -19,7 +19,7 @@ index 87979dd..076fcbb 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index a691d8f..651ce53 100644
+index 94d07eb..9b5142c 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -423,7 +423,8 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -33,5 +33,5 @@ index a691d8f..651ce53 100644
                      l = this.l >> 2;
                      blockposition = this.a(new BlockPosition(j + (l & 15), 0, k + (l >> 8 & 15)));
 -- 
-2.8.3
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0043-Disable-ice-and-snow.patch b/Spigot-Server-Patches/0042-Disable-ice-and-snow.patch
similarity index 93%
rename from Spigot-Server-Patches/0043-Disable-ice-and-snow.patch
rename to Spigot-Server-Patches/0042-Disable-ice-and-snow.patch
index 21575c0637..8992f659db 100644
--- a/Spigot-Server-Patches/0043-Disable-ice-and-snow.patch
+++ b/Spigot-Server-Patches/0042-Disable-ice-and-snow.patch
@@ -1,4 +1,4 @@
-From 724df761f25877ebcb44e2353b1c6d6eb036522f Mon Sep 17 00:00:00 2001
+From 767a9ef7974c8e7f760f8bae8cfcb2c6207e8c71 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
@@ -19,7 +19,7 @@ index 076fcbb..9018df5 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 651ce53..bc6ddc7 100644
+index 9b5142c..54446aa 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -447,7 +447,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -32,5 +32,5 @@ index 651ce53..bc6ddc7 100644
                      l = this.l >> 2;
                      blockposition = this.p(new BlockPosition(j + (l & 15), 0, k + (l >> 8 & 15)));
 -- 
-2.8.3
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0044-Configurable-mob-spawner-tick-rate.patch b/Spigot-Server-Patches/0043-Configurable-mob-spawner-tick-rate.patch
similarity index 97%
rename from Spigot-Server-Patches/0044-Configurable-mob-spawner-tick-rate.patch
rename to Spigot-Server-Patches/0043-Configurable-mob-spawner-tick-rate.patch
index e40112131d..060dbb741d 100644
--- a/Spigot-Server-Patches/0044-Configurable-mob-spawner-tick-rate.patch
+++ b/Spigot-Server-Patches/0043-Configurable-mob-spawner-tick-rate.patch
@@ -1,4 +1,4 @@
-From f9f44c91550d016394da0bdaacc52398e4f35589 Mon Sep 17 00:00:00 2001
+From 8515d9b08aa94851190b4db7d33556486959394f 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
@@ -64,5 +64,5 @@ index f040775..f17aea4 100644
                  }
  
 -- 
-2.8.3
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0045-Send-absolute-position-the-first-time-an-entity-is-s.patch b/Spigot-Server-Patches/0044-Send-absolute-position-the-first-time-an-entity-is-s.patch
similarity index 98%
rename from Spigot-Server-Patches/0045-Send-absolute-position-the-first-time-an-entity-is-s.patch
rename to Spigot-Server-Patches/0044-Send-absolute-position-the-first-time-an-entity-is-s.patch
index 2ee5670b5f..dde3dd24fe 100644
--- a/Spigot-Server-Patches/0045-Send-absolute-position-the-first-time-an-entity-is-s.patch
+++ b/Spigot-Server-Patches/0044-Send-absolute-position-the-first-time-an-entity-is-s.patch
@@ -1,4 +1,4 @@
-From 467701b9fae3fe6b53c2c3d46a4240f50ddc43ed Mon Sep 17 00:00:00 2001
+From dd7e4e1f6e09b5ca1cd4fec140922e502897e0b5 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
@@ -76,5 +76,5 @@ index af32116..413925e 100644
  
                      entityplayer.playerConnection.sendPacket(packet);
 -- 
-2.8.3
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0046-Add-BeaconEffectEvent.patch b/Spigot-Server-Patches/0045-Add-BeaconEffectEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0046-Add-BeaconEffectEvent.patch
rename to Spigot-Server-Patches/0045-Add-BeaconEffectEvent.patch
index b4c2234f73..e0180b7a35 100644
--- a/Spigot-Server-Patches/0046-Add-BeaconEffectEvent.patch
+++ b/Spigot-Server-Patches/0045-Add-BeaconEffectEvent.patch
@@ -1,4 +1,4 @@
-From a73b6bfd3a69352a8bf17b618de3549a8a32dbc4 Mon Sep 17 00:00:00 2001
+From 22b4e5883590e2eaf7bc9b74535c121415f700e2 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
@@ -69,5 +69,5 @@ index 48f8793..9b0a1c4 100644
          }
  
 -- 
-2.9.0
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0047-Configurable-container-update-tick-rate.patch b/Spigot-Server-Patches/0046-Configurable-container-update-tick-rate.patch
similarity index 95%
rename from Spigot-Server-Patches/0047-Configurable-container-update-tick-rate.patch
rename to Spigot-Server-Patches/0046-Configurable-container-update-tick-rate.patch
index 7688e7f7e5..d7fe653ca6 100644
--- a/Spigot-Server-Patches/0047-Configurable-container-update-tick-rate.patch
+++ b/Spigot-Server-Patches/0046-Configurable-container-update-tick-rate.patch
@@ -1,4 +1,4 @@
-From c9968ad7e95cefe2bb154eec2b9695f711e8fa10 Mon Sep 17 00:00:00 2001
+From e808b68be47b3f1ce457b049edda796ef093895c 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
@@ -45,5 +45,5 @@ index 4950db4..e9baaa2 100644
              this.closeInventory();
              this.activeContainer = this.defaultContainer;
 -- 
-2.8.3
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0048-Fix-lava-water-some-times-creating-air-instead-of-co.patch b/Spigot-Server-Patches/0047-Fix-lava-water-some-times-creating-air-instead-of-co.patch
similarity index 91%
rename from Spigot-Server-Patches/0048-Fix-lava-water-some-times-creating-air-instead-of-co.patch
rename to Spigot-Server-Patches/0047-Fix-lava-water-some-times-creating-air-instead-of-co.patch
index 08b0750bcc..4722002902 100644
--- a/Spigot-Server-Patches/0048-Fix-lava-water-some-times-creating-air-instead-of-co.patch
+++ b/Spigot-Server-Patches/0047-Fix-lava-water-some-times-creating-air-instead-of-co.patch
@@ -1,4 +1,4 @@
-From 123e2e4ee662aefbaf32cce1397b45b43e6c9aee Mon Sep 17 00:00:00 2001
+From 09fc25a75ad2b07d03779bba1a2e1daf5552f12a Mon Sep 17 00:00:00 2001
 From: Iceee <andrew@opticgaming.tv>
 Date: Wed, 2 Mar 2016 23:38:52 -0600
 Subject: [PATCH] Fix lava/water some times creating air instead of cobblestone
@@ -18,5 +18,5 @@ index ddd5199..d7308dd 100644
                      this.fizz(world, blockposition);
                      return true;
 -- 
-2.8.3
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0049-Use-UserCache-for-player-heads.patch b/Spigot-Server-Patches/0048-Use-UserCache-for-player-heads.patch
similarity index 94%
rename from Spigot-Server-Patches/0049-Use-UserCache-for-player-heads.patch
rename to Spigot-Server-Patches/0048-Use-UserCache-for-player-heads.patch
index 445d3d8186..66e80334af 100644
--- a/Spigot-Server-Patches/0049-Use-UserCache-for-player-heads.patch
+++ b/Spigot-Server-Patches/0048-Use-UserCache-for-player-heads.patch
@@ -1,4 +1,4 @@
-From 020ae40d595f94caf0b507f1da371109cc8a07b7 Mon Sep 17 00:00:00 2001
+From 9aa63267f4da12a9959ab0593cd83f192e05297d 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
@@ -32,5 +32,5 @@ index 2abca0c..7d83bbe 100644
  
          return true;
 -- 
-2.8.3
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0050-Disable-spigot-tick-limiters.patch b/Spigot-Server-Patches/0049-Disable-spigot-tick-limiters.patch
similarity index 94%
rename from Spigot-Server-Patches/0050-Disable-spigot-tick-limiters.patch
rename to Spigot-Server-Patches/0049-Disable-spigot-tick-limiters.patch
index 5a2aa0727e..2170065bbc 100644
--- a/Spigot-Server-Patches/0050-Disable-spigot-tick-limiters.patch
+++ b/Spigot-Server-Patches/0049-Disable-spigot-tick-limiters.patch
@@ -1,11 +1,11 @@
-From 0127334be1d39b225f0f7257a5fd53b1bb453122 Mon Sep 17 00:00:00 2001
+From d1bde73c4ab05ed8bcabd66007507773a57976b0 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 f9c803f..c8c7a41 100644
+index e8cfe2b..5881ffb 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1422,10 +1422,10 @@ public abstract class World implements IBlockAccess {
@@ -35,5 +35,5 @@ index f9c803f..c8c7a41 100644
              TileEntity tileentity = (TileEntity) this.tileEntityListTick.get(tileTickPosition);
              // Spigot start
 -- 
-2.8.3.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0051-Configurable-Chunk-IO-Thread-Base-Count.patch b/Spigot-Server-Patches/0050-Configurable-Chunk-IO-Thread-Base-Count.patch
similarity index 84%
rename from Spigot-Server-Patches/0051-Configurable-Chunk-IO-Thread-Base-Count.patch
rename to Spigot-Server-Patches/0050-Configurable-Chunk-IO-Thread-Base-Count.patch
index f017a590bb..e11b71e2e8 100644
--- a/Spigot-Server-Patches/0051-Configurable-Chunk-IO-Thread-Base-Count.patch
+++ b/Spigot-Server-Patches/0050-Configurable-Chunk-IO-Thread-Base-Count.patch
@@ -1,16 +1,16 @@
-From e423c9fa1d8a9de6de4cf6b62658cbe3e15d421f Mon Sep 17 00:00:00 2001
+From 0bc1fd3d9584ce9a5afc3aba22e151b72549ca70 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 2 Mar 2016 23:46:57 -0600
 Subject: [PATCH] Configurable Chunk IO Thread Base Count
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 87bae87..9ab6445 100644
+index 858eb9a..de13cf7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -192,4 +192,9 @@ public class PaperConfig {
-             Bukkit.getLogger().log(Level.INFO, "Disabling player interaction limiter, your server may be more vulnerable to malicious users");
-         }
+@@ -184,4 +184,9 @@ public class PaperConfig {
+                 " - Interval: " + timeSummary(Timings.getHistoryInterval() / 20) +
+                 " - Length: " + timeSummary(Timings.getHistoryLength() / 20));
      }
 +
 +    public static int minChunkLoadThreads = 2;
@@ -39,5 +39,5 @@ index e4fd9bc..7b7a3d0 100644
  
      private static final AsynchronousExecutor<QueuedChunk, Chunk, Runnable, RuntimeException> instance = new AsynchronousExecutor<QueuedChunk, Chunk, Runnable, RuntimeException>(new ChunkIOProvider(), BASE_THREADS);
 -- 
-2.8.3
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0052-Don-t-create-Region-File-s-when-checking-if-chunk-ex.patch b/Spigot-Server-Patches/0051-Don-t-create-Region-File-s-when-checking-if-chunk-ex.patch
similarity index 93%
rename from Spigot-Server-Patches/0052-Don-t-create-Region-File-s-when-checking-if-chunk-ex.patch
rename to Spigot-Server-Patches/0051-Don-t-create-Region-File-s-when-checking-if-chunk-ex.patch
index f1859c4fe6..d95a3a3c47 100644
--- a/Spigot-Server-Patches/0052-Don-t-create-Region-File-s-when-checking-if-chunk-ex.patch
+++ b/Spigot-Server-Patches/0051-Don-t-create-Region-File-s-when-checking-if-chunk-ex.patch
@@ -1,4 +1,4 @@
-From 0d36bbd3acce3758461d6acd54014d4c68560a25 Mon Sep 17 00:00:00 2001
+From 7abfa914ed445aecdbb95b38452cc08c28d035f5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 2 Mar 2016 23:51:51 -0600
 Subject: [PATCH] Don't create Region File's when checking if chunk exists
@@ -7,7 +7,7 @@ Plugins like Dynmap can end up creating tons of emtpy Region Files
 when using chunkExists.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 665851a..24cb51b 100644
+index 17dd7bb..162cdd6 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -39,7 +39,10 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -23,7 +23,7 @@ index 665851a..24cb51b 100644
      // CraftBukkit end
  
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index 5528019..01a08d4 100644
+index 01b54e7..49fa5e4 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -12,7 +12,13 @@ public class RegionFileCache {
@@ -49,5 +49,5 @@ index 5528019..01a08d4 100644
                  file1.mkdirs();
              }
 -- 
-2.8.3
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0053-Add-PlayerInitialSpawnEvent.patch b/Spigot-Server-Patches/0052-Add-PlayerInitialSpawnEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0053-Add-PlayerInitialSpawnEvent.patch
rename to Spigot-Server-Patches/0052-Add-PlayerInitialSpawnEvent.patch
index f2edadf5e5..fb24b33229 100644
--- a/Spigot-Server-Patches/0053-Add-PlayerInitialSpawnEvent.patch
+++ b/Spigot-Server-Patches/0052-Add-PlayerInitialSpawnEvent.patch
@@ -1,4 +1,4 @@
-From 6c0ffed335679f15e993b32da3a4a85ae91ac371 Mon Sep 17 00:00:00 2001
+From e6aac3fdbf9ad18ef5a42c10511f2eb1849fbe5e 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerInitialSpawnEvent
 For modifying a player's initial spawn location as they join the server
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index f6a9384..6e51c43 100644
+index 6bd7151..e88e918 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -100,6 +100,21 @@ public abstract class PlayerList {
@@ -32,5 +32,5 @@ index f6a9384..6e51c43 100644
          entityplayer.playerInteractManager.a((WorldServer) entityplayer.world);
          String s1 = "local";
 -- 
-2.9.0
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0054-Disable-chest-cat-detection.patch b/Spigot-Server-Patches/0053-Disable-chest-cat-detection.patch
similarity index 95%
rename from Spigot-Server-Patches/0054-Disable-chest-cat-detection.patch
rename to Spigot-Server-Patches/0053-Disable-chest-cat-detection.patch
index 826cd6248d..eb0c6af59b 100644
--- a/Spigot-Server-Patches/0054-Disable-chest-cat-detection.patch
+++ b/Spigot-Server-Patches/0053-Disable-chest-cat-detection.patch
@@ -1,4 +1,4 @@
-From 473d1b5f5ed6afeb1c58f652c01c6baea142f695 Mon Sep 17 00:00:00 2001
+From 6dde4f165a8a3f04b039b1145e575b35a4de7950 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 01:13:45 -0600
 Subject: [PATCH] Disable chest cat detection
@@ -35,5 +35,5 @@ index 21be295..a5f2fc0 100644
  
          EntityOcelot entityocelot;
 -- 
-2.9.0
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0055-Ensure-commands-are-not-ran-async.patch b/Spigot-Server-Patches/0054-Ensure-commands-are-not-ran-async.patch
similarity index 96%
rename from Spigot-Server-Patches/0055-Ensure-commands-are-not-ran-async.patch
rename to Spigot-Server-Patches/0054-Ensure-commands-are-not-ran-async.patch
index 174deb033c..7945bda98a 100644
--- a/Spigot-Server-Patches/0055-Ensure-commands-are-not-ran-async.patch
+++ b/Spigot-Server-Patches/0054-Ensure-commands-are-not-ran-async.patch
@@ -1,4 +1,4 @@
-From ba0189de9deaa9bdd967c32551bdb726c63979d6 Mon Sep 17 00:00:00 2001
+From a3f1b920e6fe3e658415a0a3b8b4ea9bff990ab1 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,10 +14,10 @@ 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 06f394b..7d67e67 100644
+index f1ac7bc..c6785c8 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1266,6 +1266,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1265,6 +1265,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
          }
  
          if (!async && s.startsWith("/")) {
@@ -82,5 +82,5 @@ index b5132cd..8e501b6 100644
              return true;
          }
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0056-All-chunks-are-slime-spawn-chunks-toggle.patch b/Spigot-Server-Patches/0055-All-chunks-are-slime-spawn-chunks-toggle.patch
similarity index 95%
rename from Spigot-Server-Patches/0056-All-chunks-are-slime-spawn-chunks-toggle.patch
rename to Spigot-Server-Patches/0055-All-chunks-are-slime-spawn-chunks-toggle.patch
index e13126da88..80743e09ad 100644
--- a/Spigot-Server-Patches/0056-All-chunks-are-slime-spawn-chunks-toggle.patch
+++ b/Spigot-Server-Patches/0055-All-chunks-are-slime-spawn-chunks-toggle.patch
@@ -1,4 +1,4 @@
-From af8a36af99cd46c231933a0a8908ae22784f1236 Mon Sep 17 00:00:00 2001
+From bc0fc5be08c6177fa6f078a0607bf3f450734fb4 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
@@ -33,5 +33,5 @@ index 334505f..616c2e8 100644
                  }
              }
 -- 
-2.9.0
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0057-Optimize-Pathfinding.patch b/Spigot-Server-Patches/0056-Optimize-Pathfinding.patch
similarity index 95%
rename from Spigot-Server-Patches/0057-Optimize-Pathfinding.patch
rename to Spigot-Server-Patches/0056-Optimize-Pathfinding.patch
index d6d1bf39a0..aa77ed423b 100644
--- a/Spigot-Server-Patches/0057-Optimize-Pathfinding.patch
+++ b/Spigot-Server-Patches/0056-Optimize-Pathfinding.patch
@@ -1,4 +1,4 @@
-From 945883cc3c1607c13de3b07dc660287c8d5d87ac Mon Sep 17 00:00:00 2001
+From 9d545994314c0b641e4f24f76479e3c4135b52ad 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
@@ -47,5 +47,5 @@ index c9cfe3f..b1a90c1 100644
      }
  
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0058-Avoid-hopper-searches-if-there-are-no-items.patch b/Spigot-Server-Patches/0057-Avoid-hopper-searches-if-there-are-no-items.patch
similarity index 97%
rename from Spigot-Server-Patches/0058-Avoid-hopper-searches-if-there-are-no-items.patch
rename to Spigot-Server-Patches/0057-Avoid-hopper-searches-if-there-are-no-items.patch
index 191ccb7909..7a11b83cc4 100644
--- a/Spigot-Server-Patches/0058-Avoid-hopper-searches-if-there-are-no-items.patch
+++ b/Spigot-Server-Patches/0057-Avoid-hopper-searches-if-there-are-no-items.patch
@@ -1,4 +1,4 @@
-From fb9bba1325d10fa5e1b3b026cf23084d07259544 Mon Sep 17 00:00:00 2001
+From 3c9f00d356700b2c9288061db06adf8fcd38c9d4 Mon Sep 17 00:00:00 2001
 From: CullanP <cullanpage@gmail.com>
 Date: Thu, 3 Mar 2016 02:13:38 -0600
 Subject: [PATCH] Avoid hopper searches if there are no items
@@ -14,7 +14,7 @@ And since minecart hoppers are used _very_ rarely near we can avoid alot of sear
 Combined, this adds up a lot.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 0fae95d..684e5f7 100644
+index 76130c9..989d510 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -47,6 +47,13 @@ public class Chunk {
@@ -95,5 +95,5 @@ index 0fae95d..684e5f7 100644
  
              while (iterator.hasNext()) {
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0059-Expose-server-CommandMap.patch b/Spigot-Server-Patches/0058-Expose-server-CommandMap.patch
similarity index 88%
rename from Spigot-Server-Patches/0059-Expose-server-CommandMap.patch
rename to Spigot-Server-Patches/0058-Expose-server-CommandMap.patch
index 11b855c1ef..c96e87c65d 100644
--- a/Spigot-Server-Patches/0059-Expose-server-CommandMap.patch
+++ b/Spigot-Server-Patches/0058-Expose-server-CommandMap.patch
@@ -1,4 +1,4 @@
-From c3907844a571935fcc6702d446cdb9a4f86c4354 Mon Sep 17 00:00:00 2001
+From 028e0e4e1c31a297efd9b0b7c469885c0260b4de 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
@@ -17,5 +17,5 @@ index 8e501b6..c7cd3f7 100644
          return commandMap;
      }
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0060-Be-a-bit-more-informative-in-maxHealth-exception.patch b/Spigot-Server-Patches/0059-Be-a-bit-more-informative-in-maxHealth-exception.patch
similarity index 93%
rename from Spigot-Server-Patches/0060-Be-a-bit-more-informative-in-maxHealth-exception.patch
rename to Spigot-Server-Patches/0059-Be-a-bit-more-informative-in-maxHealth-exception.patch
index 0f244040ea..ae541a2fab 100644
--- a/Spigot-Server-Patches/0060-Be-a-bit-more-informative-in-maxHealth-exception.patch
+++ b/Spigot-Server-Patches/0059-Be-a-bit-more-informative-in-maxHealth-exception.patch
@@ -1,4 +1,4 @@
-From 2d0f7682e747d6066192545d2d664a974b7fd112 Mon Sep 17 00:00:00 2001
+From 61f47aad92e775d2245d216fd1fa0cd76ac96efc 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
@@ -21,5 +21,5 @@ index cffa778..a123d5e 100644
  
          if (health == 0) {
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0061-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/Spigot-Server-Patches/0060-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
similarity index 95%
rename from Spigot-Server-Patches/0061-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
rename to Spigot-Server-Patches/0060-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
index 4bf6e804b9..2f258350a1 100644
--- a/Spigot-Server-Patches/0061-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
+++ b/Spigot-Server-Patches/0060-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
@@ -1,4 +1,4 @@
-From 24439dcdd7417c184668ebb038d974f5abea1224 Mon Sep 17 00:00:00 2001
+From f7a77a02bb5af91929d969693245c5b4c88c9c85 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 3 Mar 2016 02:21:58 -0600
 Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
@@ -56,5 +56,5 @@ index 75c7ece..ed69814 100644
      public String getDisplayName() {
          return getHandle().displayName;
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0062-Player-Tab-List-and-Title-APIs.patch b/Spigot-Server-Patches/0061-Player-Tab-List-and-Title-APIs.patch
similarity index 98%
rename from Spigot-Server-Patches/0062-Player-Tab-List-and-Title-APIs.patch
rename to Spigot-Server-Patches/0061-Player-Tab-List-and-Title-APIs.patch
index c2a0e839e1..f064127bfc 100644
--- a/Spigot-Server-Patches/0062-Player-Tab-List-and-Title-APIs.patch
+++ b/Spigot-Server-Patches/0061-Player-Tab-List-and-Title-APIs.patch
@@ -1,4 +1,4 @@
-From 759dd716bdc7dfccd3b4450b6ea6321cf7114434 Mon Sep 17 00:00:00 2001
+From c1a0abb30cce9a96969b18361556a6ad34138742 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
@@ -173,5 +173,5 @@ index ed69814..86286a5 100644
  
      @Override
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0063-Ensure-inv-drag-is-in-bounds.patch b/Spigot-Server-Patches/0062-Ensure-inv-drag-is-in-bounds.patch
similarity index 92%
rename from Spigot-Server-Patches/0063-Ensure-inv-drag-is-in-bounds.patch
rename to Spigot-Server-Patches/0062-Ensure-inv-drag-is-in-bounds.patch
index c65b639577..55bb0c81a9 100644
--- a/Spigot-Server-Patches/0063-Ensure-inv-drag-is-in-bounds.patch
+++ b/Spigot-Server-Patches/0062-Ensure-inv-drag-is-in-bounds.patch
@@ -1,4 +1,4 @@
-From 95706d529b7c7d6d68f3c5d9ab39b8c00db8febe Mon Sep 17 00:00:00 2001
+From 9c5904d0c9c48916644ebd66cf9f5faa167c5e75 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
@@ -18,5 +18,5 @@ index 02b1fb1..d39ffbe 100644
                  if (slot != null && a(slot, playerinventory.getCarried(), true) && slot.isAllowed(playerinventory.getCarried()) && playerinventory.getCarried().count > this.h.size() && this.b(slot)) {
                      this.h.add(slot);
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0064-Change-implementation-of-tile-entity-removal-list.patch b/Spigot-Server-Patches/0063-Change-implementation-of-tile-entity-removal-list.patch
similarity index 97%
rename from Spigot-Server-Patches/0064-Change-implementation-of-tile-entity-removal-list.patch
rename to Spigot-Server-Patches/0063-Change-implementation-of-tile-entity-removal-list.patch
index a4775ab390..3beb36b8a5 100644
--- a/Spigot-Server-Patches/0064-Change-implementation-of-tile-entity-removal-list.patch
+++ b/Spigot-Server-Patches/0063-Change-implementation-of-tile-entity-removal-list.patch
@@ -1,11 +1,11 @@
-From e13c2b098cff6523e0f9bdaabe9fbb759c7b173f Mon Sep 17 00:00:00 2001
+From dfdacf75724fe2b443ab11fb59134edf4426a997 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
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 3228932..cc484dc 100644
+index fd51ecb..14c2d2c 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -120,10 +120,10 @@ public abstract class Entity implements ICommandListener {
@@ -84,5 +84,5 @@ index 5881ffb..a905ff9 100644
          this.f.clear();
          this.l();
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0065-Add-configurable-portal-search-radius.patch b/Spigot-Server-Patches/0064-Add-configurable-portal-search-radius.patch
similarity index 96%
rename from Spigot-Server-Patches/0065-Add-configurable-portal-search-radius.patch
rename to Spigot-Server-Patches/0064-Add-configurable-portal-search-radius.patch
index 2cba5f1642..d02e5ed76b 100644
--- a/Spigot-Server-Patches/0065-Add-configurable-portal-search-radius.patch
+++ b/Spigot-Server-Patches/0064-Add-configurable-portal-search-radius.patch
@@ -1,4 +1,4 @@
-From 0f11e06322d6f8d2678033081b477196fb5d9d77 Mon Sep 17 00:00:00 2001
+From 4f23bd2161337be926d6e5de1047307b278c7fef 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
@@ -54,5 +54,5 @@ index 1d5dce1..7ca2617 100644
      private boolean canCreatePortal = true;
  
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0066-Add-velocity-warnings.patch b/Spigot-Server-Patches/0065-Add-velocity-warnings.patch
similarity index 93%
rename from Spigot-Server-Patches/0066-Add-velocity-warnings.patch
rename to Spigot-Server-Patches/0065-Add-velocity-warnings.patch
index 3089b17202..0bddd139f4 100644
--- a/Spigot-Server-Patches/0066-Add-velocity-warnings.patch
+++ b/Spigot-Server-Patches/0065-Add-velocity-warnings.patch
@@ -1,4 +1,4 @@
-From e03a75ce7f4d8561cd2ae428ed4b5c4a2d1054cb Mon Sep 17 00:00:00 2001
+From 94f85cb0553842b03af9aeeaa90a338663423cb2 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
@@ -22,5 +22,5 @@ index 6f6b90b..719dd66 100644
          entity.motY = vel.getY();
          entity.motZ = vel.getZ();
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0067-Fix-inter-world-teleportation-glitches.patch b/Spigot-Server-Patches/0066-Fix-inter-world-teleportation-glitches.patch
similarity index 96%
rename from Spigot-Server-Patches/0067-Fix-inter-world-teleportation-glitches.patch
rename to Spigot-Server-Patches/0066-Fix-inter-world-teleportation-glitches.patch
index 9c5451be4f..8883f6cdd7 100644
--- a/Spigot-Server-Patches/0067-Fix-inter-world-teleportation-glitches.patch
+++ b/Spigot-Server-Patches/0066-Fix-inter-world-teleportation-glitches.patch
@@ -1,4 +1,4 @@
-From 6b98bfa4a580925dc777e7182ab2d6e17d7b381a Mon Sep 17 00:00:00 2001
+From c0feff9eee686659da793e2e1312911148b8cee5 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Thu, 3 Mar 2016 02:50:31 -0600
 Subject: [PATCH] Fix inter-world teleportation glitches
@@ -39,5 +39,5 @@ index 86286a5..a6851e6 100644
          return true;
      }
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0068-Add-exception-reporting-event.patch b/Spigot-Server-Patches/0067-Add-exception-reporting-event.patch
similarity index 99%
rename from Spigot-Server-Patches/0068-Add-exception-reporting-event.patch
rename to Spigot-Server-Patches/0067-Add-exception-reporting-event.patch
index fdf1ad6cc9..6a6288dbf3 100644
--- a/Spigot-Server-Patches/0068-Add-exception-reporting-event.patch
+++ b/Spigot-Server-Patches/0067-Add-exception-reporting-event.patch
@@ -1,4 +1,4 @@
-From 108eb9cb891131532840f1a0cc670a5ae1f92409 Mon Sep 17 00:00:00 2001
+From 67cefb5448ca6c3964a3a37e7e423f068901f12a 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
@@ -50,7 +50,7 @@ index 0000000..9339718
 +}
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 684e5f7..bc55a2b 100644
+index 989d510..9118e4d 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -1,5 +1,6 @@
@@ -372,5 +372,5 @@ index 2a22697..d82dddf 100644
                  // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
              }
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0069-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch b/Spigot-Server-Patches/0068-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
similarity index 94%
rename from Spigot-Server-Patches/0069-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
rename to Spigot-Server-Patches/0068-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
index 653ce981c8..0ae6ae8a46 100644
--- a/Spigot-Server-Patches/0069-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
+++ b/Spigot-Server-Patches/0068-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
@@ -1,4 +1,4 @@
-From a829086a2ebc2b827c4b58d4c2fba1b0d5d14728 Mon Sep 17 00:00:00 2001
+From 0cc68b6860a5cd71a47e24323700f4060852e7b4 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
@@ -26,5 +26,5 @@ index c0e1199..bc6c054 100644
              packetdataserializer.a(this.a);
          }
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0070-Disable-Scoreboards-for-non-players-by-default.patch b/Spigot-Server-Patches/0069-Disable-Scoreboards-for-non-players-by-default.patch
similarity index 97%
rename from Spigot-Server-Patches/0070-Disable-Scoreboards-for-non-players-by-default.patch
rename to Spigot-Server-Patches/0069-Disable-Scoreboards-for-non-players-by-default.patch
index e26a24a08e..e39def2bb6 100644
--- a/Spigot-Server-Patches/0070-Disable-Scoreboards-for-non-players-by-default.patch
+++ b/Spigot-Server-Patches/0069-Disable-Scoreboards-for-non-players-by-default.patch
@@ -1,4 +1,4 @@
-From 90efcaee9d494cc9c411001c68a80095c498aa5d Mon Sep 17 00:00:00 2001
+From 102e4f5e00e09d8d0c5c918d2a4f201736c79130 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
diff --git a/Spigot-Server-Patches/0071-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-Server-Patches/0070-Add-methods-for-working-with-arrows-stuck-in-living-.patch
similarity index 95%
rename from Spigot-Server-Patches/0071-Add-methods-for-working-with-arrows-stuck-in-living-.patch
rename to Spigot-Server-Patches/0070-Add-methods-for-working-with-arrows-stuck-in-living-.patch
index d35d42b0c4..c0df9b0dcc 100644
--- a/Spigot-Server-Patches/0071-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/Spigot-Server-Patches/0070-Add-methods-for-working-with-arrows-stuck-in-living-.patch
@@ -1,4 +1,4 @@
-From 154d80b8db25446e496480dedefa1f4c4d9f4537 Mon Sep 17 00:00:00 2001
+From 82702a3641371be61590cb8432fe5c6ed836fa94 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
@@ -43,5 +43,5 @@ index a123d5e..79d60a6 100644
 +    // Paper end
  }
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0072-Complete-resource-pack-API.patch b/Spigot-Server-Patches/0071-Complete-resource-pack-API.patch
similarity index 95%
rename from Spigot-Server-Patches/0072-Complete-resource-pack-API.patch
rename to Spigot-Server-Patches/0071-Complete-resource-pack-API.patch
index e975812c13..5a04373d20 100644
--- a/Spigot-Server-Patches/0072-Complete-resource-pack-API.patch
+++ b/Spigot-Server-Patches/0071-Complete-resource-pack-API.patch
@@ -1,14 +1,14 @@
-From 07bd002edcb8a62463ae788686c76f84ac2474d2 Mon Sep 17 00:00:00 2001
+From f865c4ed737abbf9b84a2b21cebdf4641b0e57e7 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/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 7d67e67..d5e06f0 100644
+index c6785c8..4911787 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1027,7 +1027,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1026,7 +1026,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
  
      // CraftBukkit start
      public void a(PacketPlayInResourcePackStatus packetplayinresourcepackstatus) {
@@ -72,5 +72,5 @@ index a6851e6..8ac7ec5 100644
      private final Player.Spigot spigot = new Player.Spigot()
      {
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0073-Chunk-save-queue-improvements.patch b/Spigot-Server-Patches/0072-Chunk-save-queue-improvements.patch
similarity index 98%
rename from Spigot-Server-Patches/0073-Chunk-save-queue-improvements.patch
rename to Spigot-Server-Patches/0072-Chunk-save-queue-improvements.patch
index c528b40903..89b53daac4 100644
--- a/Spigot-Server-Patches/0073-Chunk-save-queue-improvements.patch
+++ b/Spigot-Server-Patches/0072-Chunk-save-queue-improvements.patch
@@ -1,4 +1,4 @@
-From be477a85ae20e7d9e729c909da01a8bb3e5f0734 Mon Sep 17 00:00:00 2001
+From fe4a48095ff2b4486e3ee9f7d514b998823d3d7c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 4 Mar 2016 18:18:37 -0600
 Subject: [PATCH] Chunk save queue improvements
@@ -26,10 +26,10 @@ Then finally, Sleeping will by default be removed, but due to known issues with
 But if sleeps are to remain enabled, we at least lower the sleep interval so it doesn't have as much negative impact.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 9ab6445..d01bca1 100644
+index de13cf7..8c1d6ac 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -197,4 +197,10 @@ public class PaperConfig {
+@@ -189,4 +189,10 @@ public class PaperConfig {
      private static void chunkLoadThreads() {
          minChunkLoadThreads = Math.min(6, getInt("settings.min-chunk-load-threads", 2)); // Keep people from doing stupid things with max of 6
      }
@@ -177,5 +177,5 @@ index acfdd52..fdbaf5f 100644
  
          if (this.b.isEmpty()) {
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0074-Chunk-Save-Reattempt.patch b/Spigot-Server-Patches/0073-Chunk-Save-Reattempt.patch
similarity index 95%
rename from Spigot-Server-Patches/0074-Chunk-Save-Reattempt.patch
rename to Spigot-Server-Patches/0073-Chunk-Save-Reattempt.patch
index 81291a145a..8cac0dda34 100644
--- a/Spigot-Server-Patches/0074-Chunk-Save-Reattempt.patch
+++ b/Spigot-Server-Patches/0073-Chunk-Save-Reattempt.patch
@@ -1,4 +1,4 @@
-From 5f1fd279518e6cd364df680680f68e978bdff8ec Mon Sep 17 00:00:00 2001
+From ab76a45357dcabf90d3b249332f063abae6f5a89 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Chunk Save Reattempt
 We commonly have "Stream Closed" errors on chunk saving, so this code should re-try to save the chunk in the event of failure and hopefully prevent rollbacks.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 73b8b8b..d68bd28 100644
+index e6e7626..eb36e1f 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -174,11 +174,16 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -42,5 +42,5 @@ index c9bd856..1fe5019 100644
  
      }
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0075-Default-loading-permissions.yml-before-plugins.patch b/Spigot-Server-Patches/0074-Default-loading-permissions.yml-before-plugins.patch
similarity index 94%
rename from Spigot-Server-Patches/0075-Default-loading-permissions.yml-before-plugins.patch
rename to Spigot-Server-Patches/0074-Default-loading-permissions.yml-before-plugins.patch
index 475beab04c..4c9502e45e 100644
--- a/Spigot-Server-Patches/0075-Default-loading-permissions.yml-before-plugins.patch
+++ b/Spigot-Server-Patches/0074-Default-loading-permissions.yml-before-plugins.patch
@@ -1,4 +1,4 @@
-From aac4eafc0b5c966555720e61adea0f17d43be2e6 Mon Sep 17 00:00:00 2001
+From fc30732d2a216d6882bbcbe75e2c09b6df297cd6 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
@@ -16,10 +16,10 @@ modify that. Under the previous logic, plugins were unable (cleanly) override pe
 A config option has been added for those who depend on the previous behavior, but I don't expect that.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index d01bca1..2e17397 100644
+index 8c1d6ac..4a4043e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -203,4 +203,9 @@ public class PaperConfig {
+@@ -195,4 +195,9 @@ public class PaperConfig {
          enableFileIOThreadSleep = getBoolean("settings.sleep-between-chunk-saves", false);
          if (enableFileIOThreadSleep) Bukkit.getLogger().info("Enabled sleeping between chunk saves, beware of memory issues");
      }
@@ -51,5 +51,5 @@ index b44808f..034f8ed 100644
              CraftDefaultPermissions.registerCorePermissions();
              helpMap.initializeCommands();
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0076-Allow-Reloading-of-Custom-Permissions.patch b/Spigot-Server-Patches/0075-Allow-Reloading-of-Custom-Permissions.patch
similarity index 94%
rename from Spigot-Server-Patches/0076-Allow-Reloading-of-Custom-Permissions.patch
rename to Spigot-Server-Patches/0075-Allow-Reloading-of-Custom-Permissions.patch
index f4dc241b29..03475d8afe 100644
--- a/Spigot-Server-Patches/0076-Allow-Reloading-of-Custom-Permissions.patch
+++ b/Spigot-Server-Patches/0075-Allow-Reloading-of-Custom-Permissions.patch
@@ -1,4 +1,4 @@
-From ac5650f87ce333c15cb6386da4243c8132497ba6 Mon Sep 17 00:00:00 2001
+From c89b153ed8441d201cc65ea8a414d111352b5973 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
@@ -32,5 +32,5 @@ index 034f8ed..1609b07 100644
 +    // Paper end
  }
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0077-Remove-Metadata-on-reload.patch b/Spigot-Server-Patches/0076-Remove-Metadata-on-reload.patch
similarity index 92%
rename from Spigot-Server-Patches/0077-Remove-Metadata-on-reload.patch
rename to Spigot-Server-Patches/0076-Remove-Metadata-on-reload.patch
index 635ee103de..182e99eae1 100644
--- a/Spigot-Server-Patches/0077-Remove-Metadata-on-reload.patch
+++ b/Spigot-Server-Patches/0076-Remove-Metadata-on-reload.patch
@@ -1,4 +1,4 @@
-From d473ed0e9183c9884c773f74eda8649df8a67a1f Mon Sep 17 00:00:00 2001
+From 9406ab6fe06587ae33af9378d98cae65d734c761 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
@@ -26,5 +26,5 @@ index 1609b07..15bef42 100644
          commandMap.clearCommands();
          resetRecipes();
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0078-Undead-horse-leashing.patch b/Spigot-Server-Patches/0077-Undead-horse-leashing.patch
similarity index 94%
rename from Spigot-Server-Patches/0078-Undead-horse-leashing.patch
rename to Spigot-Server-Patches/0077-Undead-horse-leashing.patch
index 36bc10a4fb..034ddde855 100644
--- a/Spigot-Server-Patches/0078-Undead-horse-leashing.patch
+++ b/Spigot-Server-Patches/0077-Undead-horse-leashing.patch
@@ -1,4 +1,4 @@
-From 7279a750c265627cbc2a1fae0b3b55e7ef3dd626 Mon Sep 17 00:00:00 2001
+From 0be5ec05d4859565b5882514e5baa36b84e42513 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
@@ -32,5 +32,5 @@ index ef429c1..38c4f61 100644
      }
  
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0079-Fix-Furnace-cook-time-bug.patch b/Spigot-Server-Patches/0078-Fix-Furnace-cook-time-bug.patch
similarity index 93%
rename from Spigot-Server-Patches/0079-Fix-Furnace-cook-time-bug.patch
rename to Spigot-Server-Patches/0078-Fix-Furnace-cook-time-bug.patch
index da258aafd8..e24fc16597 100644
--- a/Spigot-Server-Patches/0079-Fix-Furnace-cook-time-bug.patch
+++ b/Spigot-Server-Patches/0078-Fix-Furnace-cook-time-bug.patch
@@ -1,4 +1,4 @@
-From 20fc130a9938e0150010d5167509874426a80209 Mon Sep 17 00:00:00 2001
+From 4ad90c5c991a89873d11100f71c5d1da2aa702ed Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 14:24:53 -0400
 Subject: [PATCH] Fix Furnace cook time bug
@@ -22,5 +22,5 @@ index fd6c246..db235c3 100644
                  this.burn();
                  flag1 = true;
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0080-Handle-Item-Meta-Inconsistencies.patch b/Spigot-Server-Patches/0079-Handle-Item-Meta-Inconsistencies.patch
similarity index 99%
rename from Spigot-Server-Patches/0080-Handle-Item-Meta-Inconsistencies.patch
rename to Spigot-Server-Patches/0079-Handle-Item-Meta-Inconsistencies.patch
index 47ab04f274..3d474e62c5 100644
--- a/Spigot-Server-Patches/0080-Handle-Item-Meta-Inconsistencies.patch
+++ b/Spigot-Server-Patches/0079-Handle-Item-Meta-Inconsistencies.patch
@@ -1,4 +1,4 @@
-From 402afb8adba1a22e669b87d6b4cfadc466393385 Mon Sep 17 00:00:00 2001
+From 6fd544c68b28a552dfe94301008aaa522dcc4580 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
@@ -293,5 +293,5 @@ index 22cc267..94f2ba0 100644
      private final Spigot spigot = new Spigot()
      {
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0081-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/Spigot-Server-Patches/0080-Configurable-Non-Player-Arrow-Despawn-Rate.patch
similarity index 95%
rename from Spigot-Server-Patches/0081-Configurable-Non-Player-Arrow-Despawn-Rate.patch
rename to Spigot-Server-Patches/0080-Configurable-Non-Player-Arrow-Despawn-Rate.patch
index 290b76a0f7..5d7a5f5917 100644
--- a/Spigot-Server-Patches/0081-Configurable-Non-Player-Arrow-Despawn-Rate.patch
+++ b/Spigot-Server-Patches/0080-Configurable-Non-Player-Arrow-Despawn-Rate.patch
@@ -1,4 +1,4 @@
-From e721477da0a544ce6a720cb99d03bafa9e068547 Mon Sep 17 00:00:00 2001
+From 04cbb784fabeaca52caa2a70f748c21693fa39a0 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
@@ -37,5 +37,5 @@ index ccbf47e..b7ac5f7 100644
                  }
              } else {
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0082-Add-World-Util-Methods.patch b/Spigot-Server-Patches/0081-Add-World-Util-Methods.patch
similarity index 97%
rename from Spigot-Server-Patches/0082-Add-World-Util-Methods.patch
rename to Spigot-Server-Patches/0081-Add-World-Util-Methods.patch
index ae576c84fc..c9533ad7bb 100644
--- a/Spigot-Server-Patches/0082-Add-World-Util-Methods.patch
+++ b/Spigot-Server-Patches/0081-Add-World-Util-Methods.patch
@@ -1,4 +1,4 @@
-From 3ef8c34d7825dbf1baedc8ce07899569f7248ada Mon Sep 17 00:00:00 2001
+From fcd4926f5eb3b787aa3be7f625e93b249e34dc51 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
@@ -93,5 +93,5 @@ index 48c0e14..a3bce9a 100644
          // CraftBukkit start - tree generation
          if (captureTreeGeneration) {
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0083-Optimized-Light-Level-Comparisons.patch b/Spigot-Server-Patches/0082-Optimized-Light-Level-Comparisons.patch
similarity index 99%
rename from Spigot-Server-Patches/0083-Optimized-Light-Level-Comparisons.patch
rename to Spigot-Server-Patches/0082-Optimized-Light-Level-Comparisons.patch
index ad96c4d517..cd6e4dc994 100644
--- a/Spigot-Server-Patches/0083-Optimized-Light-Level-Comparisons.patch
+++ b/Spigot-Server-Patches/0082-Optimized-Light-Level-Comparisons.patch
@@ -1,4 +1,4 @@
-From f3e4a3fcceff16f90d7c8ea2d84e5130ca202dac Mon Sep 17 00:00:00 2001
+From 0f9e01ade8983db89a2e945bfbcb04169590f2fa Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 21:22:56 -0400
 Subject: [PATCH] Optimized Light Level Comparisons
@@ -131,5 +131,5 @@ index 6981185..798b9c5 100644
                          if (!this.world.isPlayerNearby((double) i1, (double) j1, (double) k1, 7.0D, EntityHuman.affectsSpawningFilter()) && this.world.a(entityzombie.getBoundingBox(), (Entity) entityzombie) && this.world.getCubes(entityzombie, entityzombie.getBoundingBox()).isEmpty() && !this.world.containsLiquid(entityzombie.getBoundingBox())) { // Paper - affectsSpawning filter
                              this.world.addEntity(entityzombie, CreatureSpawnEvent.SpawnReason.REINFORCEMENTS); // CraftBukkit
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0084-Pass-world-to-Village-creation.patch b/Spigot-Server-Patches/0083-Pass-world-to-Village-creation.patch
similarity index 94%
rename from Spigot-Server-Patches/0084-Pass-world-to-Village-creation.patch
rename to Spigot-Server-Patches/0083-Pass-world-to-Village-creation.patch
index 3759ed76e7..b059e65fae 100644
--- a/Spigot-Server-Patches/0084-Pass-world-to-Village-creation.patch
+++ b/Spigot-Server-Patches/0083-Pass-world-to-Village-creation.patch
@@ -1,4 +1,4 @@
-From 73fca77c401a155b2b8106d07ef9e21f3b2d99fe Mon Sep 17 00:00:00 2001
+From 07d8e704ef4a680c1b1b82c7cabbc674dccc5904 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 19 Mar 2016 15:16:54 -0400
 Subject: [PATCH] Pass world to Village creation
@@ -32,5 +32,5 @@ index 1fa7cb2..fc3a6ab 100644
          this.d = BlockPosition.ZERO;
          this.j = new TreeMap();
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0085-Custom-replacement-for-eaten-items.patch b/Spigot-Server-Patches/0084-Custom-replacement-for-eaten-items.patch
similarity index 95%
rename from Spigot-Server-Patches/0085-Custom-replacement-for-eaten-items.patch
rename to Spigot-Server-Patches/0084-Custom-replacement-for-eaten-items.patch
index 4a8dca42af..2495d9985c 100644
--- a/Spigot-Server-Patches/0085-Custom-replacement-for-eaten-items.patch
+++ b/Spigot-Server-Patches/0084-Custom-replacement-for-eaten-items.patch
@@ -1,4 +1,4 @@
-From 10d82cfe5366d9756a1ef587ded186f646f0c834 Mon Sep 17 00:00:00 2001
+From bdf88901a30aee6aaf5f3f6d869c2ea8ebde0ebd 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
@@ -34,5 +34,5 @@ index 89e6ef5..ad320c2 100644
  
      }
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0086-Set-health-before-death-event.patch b/Spigot-Server-Patches/0085-Set-health-before-death-event.patch
similarity index 92%
rename from Spigot-Server-Patches/0086-Set-health-before-death-event.patch
rename to Spigot-Server-Patches/0085-Set-health-before-death-event.patch
index b9f988476c..53eedfcf9d 100644
--- a/Spigot-Server-Patches/0086-Set-health-before-death-event.patch
+++ b/Spigot-Server-Patches/0085-Set-health-before-death-event.patch
@@ -1,14 +1,14 @@
-From 3d192ba83e69c17fb5d9b21a9e30b0f1c72a4076 Mon Sep 17 00:00:00 2001
+From b62a77541e096a2f2f265d404adc1bd6a8b5bf17 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 19 Jul 2015 16:51:38 -0400
 Subject: [PATCH] Set health before death event
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 2e17397..f0f8cb2 100644
+index 4a4043e..c1c168a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -208,4 +208,9 @@ public class PaperConfig {
+@@ -200,4 +200,9 @@ public class PaperConfig {
      private static void loadPermsBeforePlugins() {
          loadPermsBeforePlugins = getBoolean("settings.load-permissions-yml-before-plugins", true);
      }
@@ -45,5 +45,5 @@ index 79d60a6..b807a3f 100644
  
      public double getMaxHealth() {
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0087-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/Spigot-Server-Patches/0086-handle-NaN-health-absorb-values-and-repair-bad-data.patch
similarity index 96%
rename from Spigot-Server-Patches/0087-handle-NaN-health-absorb-values-and-repair-bad-data.patch
rename to Spigot-Server-Patches/0086-handle-NaN-health-absorb-values-and-repair-bad-data.patch
index 154ff8a018..a6c3d064b5 100644
--- a/Spigot-Server-Patches/0087-handle-NaN-health-absorb-values-and-repair-bad-data.patch
+++ b/Spigot-Server-Patches/0086-handle-NaN-health-absorb-values-and-repair-bad-data.patch
@@ -1,4 +1,4 @@
-From 471a920a25cd0d6f11228593543823c7a0b967a8 Mon Sep 17 00:00:00 2001
+From 20ec082afd5d349eee7bf6d5c7e2fa30ed605224 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
@@ -56,5 +56,5 @@ index 8ac7ec5..d5aed11 100644
      }
  
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0088-Catch-Async-PlayerChunkMap-operations.patch b/Spigot-Server-Patches/0087-Catch-Async-PlayerChunkMap-operations.patch
similarity index 91%
rename from Spigot-Server-Patches/0088-Catch-Async-PlayerChunkMap-operations.patch
rename to Spigot-Server-Patches/0087-Catch-Async-PlayerChunkMap-operations.patch
index 8e8ed96af7..d850a0ce40 100644
--- a/Spigot-Server-Patches/0088-Catch-Async-PlayerChunkMap-operations.patch
+++ b/Spigot-Server-Patches/0087-Catch-Async-PlayerChunkMap-operations.patch
@@ -1,4 +1,4 @@
-From bec543d7b63fca82cd25dde00b15f8f631eb247f Mon Sep 17 00:00:00 2001
+From 694f9d8f5ef28f63522d63d422677147164f23b1 Mon Sep 17 00:00:00 2001
 From: Daniel Ennis <dennis@icontact.com>
 Date: Sun, 20 Mar 2016 15:22:42 -0400
 Subject: [PATCH] Catch Async PlayerChunkMap operations
@@ -22,5 +22,5 @@ index fcd0186..c9d48ac 100644
          long i = d(chunkcoordintpair.x, chunkcoordintpair.z);
  
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0089-Support-offline-mode-in-whitelist-command-as-well.patch b/Spigot-Server-Patches/0088-Support-offline-mode-in-whitelist-command-as-well.patch
similarity index 98%
rename from Spigot-Server-Patches/0089-Support-offline-mode-in-whitelist-command-as-well.patch
rename to Spigot-Server-Patches/0088-Support-offline-mode-in-whitelist-command-as-well.patch
index 7e1fcb640b..99c3caee01 100644
--- a/Spigot-Server-Patches/0089-Support-offline-mode-in-whitelist-command-as-well.patch
+++ b/Spigot-Server-Patches/0088-Support-offline-mode-in-whitelist-command-as-well.patch
@@ -1,4 +1,4 @@
-From c1334946dd4f272895db6244f2c3a453edf42916 Mon Sep 17 00:00:00 2001
+From 7815a7f52dd5b61a214ed564bf3aa586d2383f8c Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 21 Mar 2016 00:19:18 -0500
 Subject: [PATCH] Support offline mode in whitelist command as well
@@ -89,5 +89,5 @@ index c74d1d2..0f4237d 100644
 +    // Paper end
  }
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0090-Fix-SkullCache-case-bug.patch b/Spigot-Server-Patches/0089-Fix-SkullCache-case-bug.patch
similarity index 92%
rename from Spigot-Server-Patches/0090-Fix-SkullCache-case-bug.patch
rename to Spigot-Server-Patches/0089-Fix-SkullCache-case-bug.patch
index eb13bdd5e6..19b19e23f2 100644
--- a/Spigot-Server-Patches/0090-Fix-SkullCache-case-bug.patch
+++ b/Spigot-Server-Patches/0089-Fix-SkullCache-case-bug.patch
@@ -1,4 +1,4 @@
-From 24e61a8f91668f86b4113d87034bb68bbf65cecc Mon Sep 17 00:00:00 2001
+From bcff5421212a9cc6abcbc97a51794617060d5433 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Jan 2016 21:48:24 -0500
 Subject: [PATCH] Fix SkullCache case bug
@@ -18,5 +18,5 @@ index 654b51d..a8adbcb 100644
                      callback.apply(profile);
                  } else {
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0091-Waving-banner-workaround.patch b/Spigot-Server-Patches/0090-Waving-banner-workaround.patch
similarity index 93%
rename from Spigot-Server-Patches/0091-Waving-banner-workaround.patch
rename to Spigot-Server-Patches/0090-Waving-banner-workaround.patch
index 3cd9dd88a4..7ca111eedb 100644
--- a/Spigot-Server-Patches/0091-Waving-banner-workaround.patch
+++ b/Spigot-Server-Patches/0090-Waving-banner-workaround.patch
@@ -1,4 +1,4 @@
-From 977583ad1bb17c4efb0d70b9c9516e7b248283ba Mon Sep 17 00:00:00 2001
+From a2e556037eb637dd250e998dc57b83e6618e9e56 Mon Sep 17 00:00:00 2001
 From: Gabscap <sonstige.netzwerke@gabriel-paradzik.de>
 Date: Sat, 19 Mar 2016 22:25:11 +0100
 Subject: [PATCH] Waving banner workaround
@@ -34,5 +34,5 @@ index c5c3f40..6413f76 100644
  
      public void a(PacketDataSerializer packetdataserializer) throws IOException {
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0092-Use-a-Shared-Random-for-Entities.patch b/Spigot-Server-Patches/0091-Use-a-Shared-Random-for-Entities.patch
similarity index 91%
rename from Spigot-Server-Patches/0092-Use-a-Shared-Random-for-Entities.patch
rename to Spigot-Server-Patches/0091-Use-a-Shared-Random-for-Entities.patch
index 3192e9ec8b..100337ab5e 100644
--- a/Spigot-Server-Patches/0092-Use-a-Shared-Random-for-Entities.patch
+++ b/Spigot-Server-Patches/0091-Use-a-Shared-Random-for-Entities.patch
@@ -1,4 +1,4 @@
-From b87a7a33be7a5198c4839566f7b13de67dc3a1a4 Mon Sep 17 00:00:00 2001
+From 047148112d1e51f5165c68449b3b84ef1146c4aa 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 e1cc3fd..a331888 100644
+index 232ba8e..fab8eb4 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -45,6 +45,7 @@ public abstract class Entity implements ICommandListener {
@@ -27,5 +27,5 @@ index e1cc3fd..a331888 100644
          this.justCreated = true;
          this.uniqueID = MathHelper.a(this.random);
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0093-Don-t-teleport-dead-entities.patch b/Spigot-Server-Patches/0092-Don-t-teleport-dead-entities.patch
similarity index 93%
rename from Spigot-Server-Patches/0093-Don-t-teleport-dead-entities.patch
rename to Spigot-Server-Patches/0092-Don-t-teleport-dead-entities.patch
index 1ea21b8123..90a7b206f1 100644
--- a/Spigot-Server-Patches/0093-Don-t-teleport-dead-entities.patch
+++ b/Spigot-Server-Patches/0092-Don-t-teleport-dead-entities.patch
@@ -1,4 +1,4 @@
-From 8e4e9acbf0011264d6385b2b79b26726cff04415 Mon Sep 17 00:00:00 2001
+From 26da32e5e28a2611a881625cfb24d7190e337633 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 22 Mar 2016 00:55:23 -0400
 Subject: [PATCH] Don't teleport dead entities
diff --git a/Spigot-Server-Patches/0094-Optimize-Chunk-Access.patch b/Spigot-Server-Patches/0093-Optimize-Chunk-Access.patch
similarity index 95%
rename from Spigot-Server-Patches/0094-Optimize-Chunk-Access.patch
rename to Spigot-Server-Patches/0093-Optimize-Chunk-Access.patch
index 46eb622c36..dce122f854 100644
--- a/Spigot-Server-Patches/0094-Optimize-Chunk-Access.patch
+++ b/Spigot-Server-Patches/0093-Optimize-Chunk-Access.patch
@@ -1,4 +1,4 @@
-From 329cc97ccf1645837c504b25c06fd42f7f06ee78 Mon Sep 17 00:00:00 2001
+From 11adf2a4659244e5bbb675c50b3516608b48a860 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 27 Aug 2015 01:15:02 -0400
 Subject: [PATCH] Optimize Chunk Access
@@ -42,5 +42,5 @@ index 299cc91..9077696 100644
  
      public ChunkProviderServer(WorldServer worldserver, IChunkLoader ichunkloader, ChunkGenerator chunkgenerator) {
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0095-Configurable-spawn-chances-for-skeleton-horses.patch b/Spigot-Server-Patches/0094-Configurable-spawn-chances-for-skeleton-horses.patch
similarity index 94%
rename from Spigot-Server-Patches/0095-Configurable-spawn-chances-for-skeleton-horses.patch
rename to Spigot-Server-Patches/0094-Configurable-spawn-chances-for-skeleton-horses.patch
index bd3afb55ff..38a8ce313a 100644
--- a/Spigot-Server-Patches/0095-Configurable-spawn-chances-for-skeleton-horses.patch
+++ b/Spigot-Server-Patches/0094-Configurable-spawn-chances-for-skeleton-horses.patch
@@ -1,4 +1,4 @@
-From 65acc19909c2fccb23de55b6c1a11a6e61d1f17c Mon Sep 17 00:00:00 2001
+From d5594099e7d56ad2c0b61376bd58ad98359c851b 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
@@ -22,7 +22,7 @@ index b701e5e..d29f2a4 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 60696ea..72a604a 100644
+index 54446aa..db71eef 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -431,7 +431,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -35,5 +35,5 @@ index 60696ea..72a604a 100644
  
                              entityhorse.setType(EnumHorseType.SKELETON);
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0096-Optimize-isValidLocation-getType-and-getBlockData-fo.patch b/Spigot-Server-Patches/0095-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
similarity index 99%
rename from Spigot-Server-Patches/0096-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
rename to Spigot-Server-Patches/0095-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
index 06104a1367..2b980359df 100644
--- a/Spigot-Server-Patches/0096-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
+++ b/Spigot-Server-Patches/0095-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
@@ -1,4 +1,4 @@
-From af32c8a3329ffeab7d8d49f4ee952da1a917c2b2 Mon Sep 17 00:00:00 2001
+From 829bb30a29ee26ea339d2f531d8053acdb6a6ce7 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
@@ -52,7 +52,7 @@ index 8603d83..704faa9 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 bc55a2b..c7452d9 100644
+index 9118e4d..63e11aa 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -406,11 +406,26 @@ public class Chunk {
@@ -255,5 +255,5 @@ index a3bce9a..b683c3e 100644
          } else {
              Chunk chunk = this.chunkProvider.getLoadedChunkAt(blockposition.getX() >> 4, blockposition.getZ() >> 4);
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0097-Use-correct-item-in-arrow-pickup-event.patch b/Spigot-Server-Patches/0096-Use-correct-item-in-arrow-pickup-event.patch
similarity index 95%
rename from Spigot-Server-Patches/0097-Use-correct-item-in-arrow-pickup-event.patch
rename to Spigot-Server-Patches/0096-Use-correct-item-in-arrow-pickup-event.patch
index 8967379af7..6288e1a23c 100644
--- a/Spigot-Server-Patches/0097-Use-correct-item-in-arrow-pickup-event.patch
+++ b/Spigot-Server-Patches/0096-Use-correct-item-in-arrow-pickup-event.patch
@@ -1,4 +1,4 @@
-From 29da1473760184b2509d1dca0926be9cbf52a558 Mon Sep 17 00:00:00 2001
+From 15e946b55fd9b5ac3de05556f9be1cd875ca480b Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Tue, 22 Mar 2016 16:00:16 -0400
 Subject: [PATCH] Use correct item in arrow pickup event
@@ -27,5 +27,5 @@ index b7ac5f7..37cb17c 100644
              }
  
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0098-Fix-cooked-fish-legacy-import.patch b/Spigot-Server-Patches/0097-Fix-cooked-fish-legacy-import.patch
similarity index 93%
rename from Spigot-Server-Patches/0098-Fix-cooked-fish-legacy-import.patch
rename to Spigot-Server-Patches/0097-Fix-cooked-fish-legacy-import.patch
index c160d67cb4..879068c08e 100644
--- a/Spigot-Server-Patches/0098-Fix-cooked-fish-legacy-import.patch
+++ b/Spigot-Server-Patches/0097-Fix-cooked-fish-legacy-import.patch
@@ -1,4 +1,4 @@
-From 3dcbfd6d24e6d06d0efc34c3150a5402a3813eed Mon Sep 17 00:00:00 2001
+From 9962daf76e84e4a612e7eb16a38022a93a9d5a92 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Tue, 1 Mar 2016 04:32:08 -0500
 Subject: [PATCH] Fix cooked fish legacy import
@@ -18,5 +18,5 @@ index 87b82eb..a7c71f4 100644
          DataConverterMaterialId.a[352] = "minecraft:bone";
          DataConverterMaterialId.a[353] = "minecraft:sugar";
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0099-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch b/Spigot-Server-Patches/0098-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch
similarity index 98%
rename from Spigot-Server-Patches/0099-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch
rename to Spigot-Server-Patches/0098-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch
index 8978131ab8..e6450cd5f9 100644
--- a/Spigot-Server-Patches/0099-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch
+++ b/Spigot-Server-Patches/0098-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch
@@ -1,4 +1,4 @@
-From 558f80834dec489fa405e3cbe67c9d54cdb3c577 Mon Sep 17 00:00:00 2001
+From e00b889aae810de1bf509a3f407f8c42993668cc Mon Sep 17 00:00:00 2001
 From: DemonWav <demonwav@gmail.com>
 Date: Sat, 26 Mar 2016 21:36:05 -0500
 Subject: [PATCH] Prevent possible infinite loop in BlockPosition iterator
@@ -87,5 +87,5 @@ index 704faa9..d6cc51b 100644
                              this.b.b = i;
                              this.b.c = j;
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0100-Access-items-by-EquipmentSlot.patch b/Spigot-Server-Patches/0099-Access-items-by-EquipmentSlot.patch
similarity index 96%
rename from Spigot-Server-Patches/0100-Access-items-by-EquipmentSlot.patch
rename to Spigot-Server-Patches/0099-Access-items-by-EquipmentSlot.patch
index 05ec32085d..cd7339ce18 100644
--- a/Spigot-Server-Patches/0100-Access-items-by-EquipmentSlot.patch
+++ b/Spigot-Server-Patches/0099-Access-items-by-EquipmentSlot.patch
@@ -1,4 +1,4 @@
-From d791d634713d7e261e2100d77e4b80edd40f74b2 Mon Sep 17 00:00:00 2001
+From cf650dfca5010124a180cee6604395233b5c2bf7 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
@@ -64,5 +64,5 @@ index 51a8b4e..47654a0 100644
 +    // Paper end
  }
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0101-Check-async-remove-unused-vars-GH-159.patch b/Spigot-Server-Patches/0100-Check-async-remove-unused-vars-GH-159.patch
similarity index 95%
rename from Spigot-Server-Patches/0101-Check-async-remove-unused-vars-GH-159.patch
rename to Spigot-Server-Patches/0100-Check-async-remove-unused-vars-GH-159.patch
index cab6868106..6772718330 100644
--- a/Spigot-Server-Patches/0101-Check-async-remove-unused-vars-GH-159.patch
+++ b/Spigot-Server-Patches/0100-Check-async-remove-unused-vars-GH-159.patch
@@ -1,4 +1,4 @@
-From 7474360dfd11de2dce0e701f7a0ea28ec251007c Mon Sep 17 00:00:00 2001
+From ba8c69221abe7ea03db5e311d97710c737807d88 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 27 Mar 2016 20:24:05 -0500
 Subject: [PATCH] Check async, remove unused vars, GH-159
@@ -28,5 +28,5 @@ index b3edaee..ea0a145 100644
                      if ((mobcnt = getEntityCount(worldserver, enumcreaturetype.a())) <= limit * i / 256) {
                          BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition();
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0102-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch b/Spigot-Server-Patches/0101-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
similarity index 97%
rename from Spigot-Server-Patches/0102-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
rename to Spigot-Server-Patches/0101-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
index 5378822a87..da83051006 100644
--- a/Spigot-Server-Patches/0102-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
+++ b/Spigot-Server-Patches/0101-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
@@ -1,4 +1,4 @@
-From 70d03c83ecc34c518360084ab4a0e5e2ba5cec37 Mon Sep 17 00:00:00 2001
+From a665617ef7bb355cd7ca3ab6d21f0b136dbaa9ce Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 19:55:45 -0400
 Subject: [PATCH] Option to disable BlockPhysicsEvent for Redstone
@@ -38,7 +38,7 @@ index b683c3e..0c7558f 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 72a604a..d448277 100644
+index db71eef..87abf7f 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -33,6 +33,7 @@ import org.bukkit.event.weather.LightningStrikeEvent;
@@ -67,5 +67,5 @@ index 72a604a..d448277 100644
                          timing.stopTiming(); // Paper
                      } else {
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0103-Entity-AddTo-RemoveFrom-World-Events.patch b/Spigot-Server-Patches/0102-Entity-AddTo-RemoveFrom-World-Events.patch
similarity index 92%
rename from Spigot-Server-Patches/0103-Entity-AddTo-RemoveFrom-World-Events.patch
rename to Spigot-Server-Patches/0102-Entity-AddTo-RemoveFrom-World-Events.patch
index 8d9999a1e6..eae798707b 100644
--- a/Spigot-Server-Patches/0103-Entity-AddTo-RemoveFrom-World-Events.patch
+++ b/Spigot-Server-Patches/0102-Entity-AddTo-RemoveFrom-World-Events.patch
@@ -1,4 +1,4 @@
-From fbe7a5ea13e1cebf44901f7561480ed2e78a06b9 Mon Sep 17 00:00:00 2001
+From 429e147d3bdd2f258f81059023ec3197ea0bb90e 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
@@ -25,5 +25,5 @@ index 0c7558f..a494569 100644
      }
  
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0104-Configurable-Chunk-Inhabited-Timer.patch b/Spigot-Server-Patches/0103-Configurable-Chunk-Inhabited-Timer.patch
similarity index 94%
rename from Spigot-Server-Patches/0104-Configurable-Chunk-Inhabited-Timer.patch
rename to Spigot-Server-Patches/0103-Configurable-Chunk-Inhabited-Timer.patch
index f3518f18d9..f11f1be20a 100644
--- a/Spigot-Server-Patches/0104-Configurable-Chunk-Inhabited-Timer.patch
+++ b/Spigot-Server-Patches/0103-Configurable-Chunk-Inhabited-Timer.patch
@@ -1,4 +1,4 @@
-From d8659025421b5fd8ab7fbb2a32fe39689d5d49f0 Mon Sep 17 00:00:00 2001
+From a5d07ebe4f66acd155172c044bc2cbbfbf0785e1 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 Timer
@@ -36,5 +36,5 @@ index 63e11aa..74ffa66 100644
  
      public void c(long i) {
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0105-EntityPathfindEvent.patch b/Spigot-Server-Patches/0104-EntityPathfindEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0105-EntityPathfindEvent.patch
rename to Spigot-Server-Patches/0104-EntityPathfindEvent.patch
index 08ef993b60..8bc31e5f67 100644
--- a/Spigot-Server-Patches/0105-EntityPathfindEvent.patch
+++ b/Spigot-Server-Patches/0104-EntityPathfindEvent.patch
@@ -1,4 +1,4 @@
-From dc12e66c9b125599754adf9ad30cde24a3a63122 Mon Sep 17 00:00:00 2001
+From 11fe39b95d0d96d380cee15223eb4153a987f2ce Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 21:22:26 -0400
 Subject: [PATCH] EntityPathfindEvent
@@ -35,5 +35,5 @@ index b1a90c1..5d0b5a4 100644
                  float f = this.h();
  
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0106-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch b/Spigot-Server-Patches/0105-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
similarity index 97%
rename from Spigot-Server-Patches/0106-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
rename to Spigot-Server-Patches/0105-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
index 75498c215a..fcd9a99a16 100644
--- a/Spigot-Server-Patches/0106-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
+++ b/Spigot-Server-Patches/0105-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
@@ -1,4 +1,4 @@
-From 84d52cc4bf3b5ec096d1c29e0042ccfd83734aec Mon Sep 17 00:00:00 2001
+From e4cb01011a8eac5453584a41f68a05436b1e6f8c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 22:03:09 -0400
 Subject: [PATCH] Prevent Waterflow BlockFromToEvent from loading chunks
@@ -48,5 +48,5 @@ index 0336b9c..044ad71 100644
                  if (this.material == Material.LAVA) {
                      this.fizz(world, blockposition);
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0107-Minecart-drop-name-workaround.patch b/Spigot-Server-Patches/0106-Minecart-drop-name-workaround.patch
similarity index 92%
rename from Spigot-Server-Patches/0107-Minecart-drop-name-workaround.patch
rename to Spigot-Server-Patches/0106-Minecart-drop-name-workaround.patch
index 81a416a6b0..505c55fb54 100644
--- a/Spigot-Server-Patches/0107-Minecart-drop-name-workaround.patch
+++ b/Spigot-Server-Patches/0106-Minecart-drop-name-workaround.patch
@@ -1,4 +1,4 @@
-From e035cc22efde49cb0ce7a107bc992be863a6bd42 Mon Sep 17 00:00:00 2001
+From 7eb8cf7577ac2dfcca7744c89c9dfe883b5aa356 Mon Sep 17 00:00:00 2001
 From: Fabse <fabse@uwmc.info>
 Date: Mon, 28 Mar 2016 00:46:46 +0200
 Subject: [PATCH] Minecart drop name workaround
@@ -20,5 +20,5 @@ index 4438d83..9df7dfc 100644
              }
  
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0108-Reduce-IO-ops-opening-a-new-region-file.patch b/Spigot-Server-Patches/0107-Reduce-IO-ops-opening-a-new-region-file.patch
similarity index 95%
rename from Spigot-Server-Patches/0108-Reduce-IO-ops-opening-a-new-region-file.patch
rename to Spigot-Server-Patches/0107-Reduce-IO-ops-opening-a-new-region-file.patch
index 9c7663561a..b3f26dda54 100644
--- a/Spigot-Server-Patches/0108-Reduce-IO-ops-opening-a-new-region-file.patch
+++ b/Spigot-Server-Patches/0107-Reduce-IO-ops-opening-a-new-region-file.patch
@@ -1,4 +1,4 @@
-From cdc7c47397def03707027d5f174d8ff691533397 Mon Sep 17 00:00:00 2001
+From d099ea7b5cb2c8828602a35a4195c14aa1911a3a 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.
@@ -49,5 +49,5 @@ index 1fe5019..45d490e 100644
              }
          } catch (IOException ioexception) {
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0109-Sanitise-RegionFileCache-and-make-configurable.patch b/Spigot-Server-Patches/0108-Sanitise-RegionFileCache-and-make-configurable.patch
similarity index 95%
rename from Spigot-Server-Patches/0109-Sanitise-RegionFileCache-and-make-configurable.patch
rename to Spigot-Server-Patches/0108-Sanitise-RegionFileCache-and-make-configurable.patch
index 977d7d0d04..a7068c4c58 100644
--- a/Spigot-Server-Patches/0109-Sanitise-RegionFileCache-and-make-configurable.patch
+++ b/Spigot-Server-Patches/0108-Sanitise-RegionFileCache-and-make-configurable.patch
@@ -1,4 +1,4 @@
-From 767ab4912331bac74784499d8dccb5f3db99ef6e Mon Sep 17 00:00:00 2001
+From 51ef59e61048ce1cf3722e0e58a2314a441ef011 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.
@@ -11,10 +11,10 @@ The implementation uses a LinkedHashMap as an LRU cache (modified from HashMap).
 The maximum size of the RegionFileCache is also made configurable.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index f0f8cb2..22c7dea 100644
+index c1c168a..d5ee3ae 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -213,4 +213,9 @@ public class PaperConfig {
+@@ -205,4 +205,9 @@ public class PaperConfig {
      private static void healthDeath() {
          setHealthBeforeDeathEvent = getBoolean("settings.set-health-before-death-event", false);
      }
@@ -77,5 +77,5 @@ index 2121e84..a7ab262 100644
          Iterator iterator = RegionFileCache.a.values().iterator();
  
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0110-Add-getEntity-by-UUID-API.patch b/Spigot-Server-Patches/0109-Add-getEntity-by-UUID-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0110-Add-getEntity-by-UUID-API.patch
rename to Spigot-Server-Patches/0109-Add-getEntity-by-UUID-API.patch
index 44833f81e4..d32b111685 100644
--- a/Spigot-Server-Patches/0110-Add-getEntity-by-UUID-API.patch
+++ b/Spigot-Server-Patches/0109-Add-getEntity-by-UUID-API.patch
@@ -1,4 +1,4 @@
-From 20dffc64e29b1d40122a76c32012992ea674346c Mon Sep 17 00:00:00 2001
+From 027f133012b8a6625b8188ad57a7a007a7c377db Mon Sep 17 00:00:00 2001
 From: DemonWav <demonwav@gmail.com>
 Date: Wed, 30 Mar 2016 01:20:11 -0500
 Subject: [PATCH] Add getEntity by UUID API
@@ -53,5 +53,5 @@ index 15bef42..703aff1 100644
      // Paper end
  }
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0111-Use-Optimized-Collections.patch b/Spigot-Server-Patches/0110-Use-Optimized-Collections.patch
similarity index 96%
rename from Spigot-Server-Patches/0111-Use-Optimized-Collections.patch
rename to Spigot-Server-Patches/0110-Use-Optimized-Collections.patch
index c66b8678af..f938404fcb 100644
--- a/Spigot-Server-Patches/0111-Use-Optimized-Collections.patch
+++ b/Spigot-Server-Patches/0110-Use-Optimized-Collections.patch
@@ -1,4 +1,4 @@
-From 3b0df507ab8e1866e84440941a95d178563bfd08 Mon Sep 17 00:00:00 2001
+From 28ae278b19a3091b675ae90c7dfeb2eb220bf351 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
@@ -47,5 +47,5 @@ index 47968a8..1f5e6c0 100644
      private boolean f = true;
      private boolean g;
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0112-Do-not-load-chunks-for-light-checks.patch b/Spigot-Server-Patches/0111-Do-not-load-chunks-for-light-checks.patch
similarity index 92%
rename from Spigot-Server-Patches/0112-Do-not-load-chunks-for-light-checks.patch
rename to Spigot-Server-Patches/0111-Do-not-load-chunks-for-light-checks.patch
index 22bde92e26..d3f4860338 100644
--- a/Spigot-Server-Patches/0112-Do-not-load-chunks-for-light-checks.patch
+++ b/Spigot-Server-Patches/0111-Do-not-load-chunks-for-light-checks.patch
@@ -1,4 +1,4 @@
-From 8ee19cf90c31e5ee9d29eccf64670bbb789ea2c7 Mon Sep 17 00:00:00 2001
+From 37abd77dffd548b87c9185481c42944c56394873 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
@@ -19,5 +19,5 @@ index a494569..1dc8af1 100644
                  Chunk chunk = this.getChunkAtWorldCoords(blockposition);
  
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0113-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-Server-Patches/0112-Add-PlayerUseUnknownEntityEvent.patch
similarity index 90%
rename from Spigot-Server-Patches/0113-Add-PlayerUseUnknownEntityEvent.patch
rename to Spigot-Server-Patches/0112-Add-PlayerUseUnknownEntityEvent.patch
index e635890a88..dc05343146 100644
--- a/Spigot-Server-Patches/0113-Add-PlayerUseUnknownEntityEvent.patch
+++ b/Spigot-Server-Patches/0112-Add-PlayerUseUnknownEntityEvent.patch
@@ -1,4 +1,4 @@
-From e849a26b3b600023fd469653db936bb0f93e3530 Mon Sep 17 00:00:00 2001
+From eaaea6854f6043beee68f09d8fa74e1cab306c90 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
@@ -18,10 +18,10 @@ index 2b23a5d..6464a84 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 d5e06f0..b983540 100644
+index 4911787..d087f86 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1616,6 +1616,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1615,6 +1615,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                  }
              }
          }
@@ -39,5 +39,5 @@ index d5e06f0..b983540 100644
      }
  
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0114-Fix-reducedDebugInfo-not-initialized-on-client.patch b/Spigot-Server-Patches/0113-Fix-reducedDebugInfo-not-initialized-on-client.patch
similarity index 93%
rename from Spigot-Server-Patches/0114-Fix-reducedDebugInfo-not-initialized-on-client.patch
rename to Spigot-Server-Patches/0113-Fix-reducedDebugInfo-not-initialized-on-client.patch
index f5329dc77c..f6228bad24 100644
--- a/Spigot-Server-Patches/0114-Fix-reducedDebugInfo-not-initialized-on-client.patch
+++ b/Spigot-Server-Patches/0113-Fix-reducedDebugInfo-not-initialized-on-client.patch
@@ -1,4 +1,4 @@
-From fd9bf3fcdb8a1c280df5edf173d1b74ad9f69486 Mon Sep 17 00:00:00 2001
+From 3ebce7ad05c9d5960572e7674e531ee57e45ca3b 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
@@ -17,5 +17,5 @@ index e88e918..a41bc5f 100644
          entityplayer.getStatisticManager().d();
          entityplayer.getStatisticManager().updateStatistics(entityplayer);
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0115-Configurable-Grass-Spread-Tick-Rate.patch b/Spigot-Server-Patches/0114-Configurable-Grass-Spread-Tick-Rate.patch
similarity index 95%
rename from Spigot-Server-Patches/0115-Configurable-Grass-Spread-Tick-Rate.patch
rename to Spigot-Server-Patches/0114-Configurable-Grass-Spread-Tick-Rate.patch
index 89bb3010d5..de1841bb3d 100644
--- a/Spigot-Server-Patches/0115-Configurable-Grass-Spread-Tick-Rate.patch
+++ b/Spigot-Server-Patches/0114-Configurable-Grass-Spread-Tick-Rate.patch
@@ -1,4 +1,4 @@
-From d04763e1d3778c4157f814243105fec5e36ff613 Mon Sep 17 00:00:00 2001
+From 6dc4b9f917be307b6b5473fcd4b59fe82555a7fa 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
@@ -32,5 +32,5 @@ index 21e722d..e41f2b2 100644
              int lightLevel = -1; // Paper
              if (world.getType(blockposition.up()).c() > 2 && (lightLevel = world.getLightLevel(blockposition.up())) < 4) { // Paper - move light check to end to avoid unneeded light lookups
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0116-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0115-Configurable-Keep-Spawn-Loaded-range-per-world.patch
similarity index 98%
rename from Spigot-Server-Patches/0116-Configurable-Keep-Spawn-Loaded-range-per-world.patch
rename to Spigot-Server-Patches/0115-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index 3a10153288..10874393b3 100644
--- a/Spigot-Server-Patches/0116-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/Spigot-Server-Patches/0115-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -1,4 +1,4 @@
-From 4498a7300a12e6a21c216f0ee001a9b2e9d7ae76 Mon Sep 17 00:00:00 2001
+From e72874054a8fd9ee684a1ab104561c6952713daf 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
@@ -81,5 +81,5 @@ index 9ef8fc1..e85a0a0 100644
                      loadChunk(chunkCoordX + x, chunkCoordZ + z);
                  } else {
 -- 
-2.9.3
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0117-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/Spigot-Server-Patches/0116-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
similarity index 90%
rename from Spigot-Server-Patches/0117-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
rename to Spigot-Server-Patches/0116-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
index 3e79079585..38afec787b 100644
--- a/Spigot-Server-Patches/0117-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
+++ b/Spigot-Server-Patches/0116-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
@@ -1,4 +1,4 @@
-From 8d455ccf4c75da5b9448642a71e465e709692ca8 Mon Sep 17 00:00:00 2001
+From 9d594315e16f67e42a026ecc7088aa2903889248 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
@@ -17,5 +17,5 @@ index bb578d9..4452107 100644
          this.e(blockposition.east(), block);
          this.e(blockposition.down(), block);
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0118-Don-t-spam-reload-spawn-chunks-in-nether-end.patch b/Spigot-Server-Patches/0117-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
similarity index 94%
rename from Spigot-Server-Patches/0118-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
rename to Spigot-Server-Patches/0117-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
index e53b0beaf3..7cec4417de 100644
--- a/Spigot-Server-Patches/0118-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
+++ b/Spigot-Server-Patches/0117-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
@@ -1,4 +1,4 @@
-From 7aecf78faa71b889cafcca8b21e7b6fb23a5f89f Mon Sep 17 00:00:00 2001
+From f92ff94754c90af1cc7556ed76a3f6c69baac671 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Apr 2016 19:42:22 -0400
 Subject: [PATCH] Don't spam reload spawn chunks in nether/end
@@ -31,5 +31,5 @@ index e30d346..d1b2d15 100644
      }
  }
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0119-Remove-Debug-checks-from-DataBits.patch b/Spigot-Server-Patches/0118-Remove-Debug-checks-from-DataBits.patch
similarity index 95%
rename from Spigot-Server-Patches/0119-Remove-Debug-checks-from-DataBits.patch
rename to Spigot-Server-Patches/0118-Remove-Debug-checks-from-DataBits.patch
index f157945df4..326c14e0ef 100644
--- a/Spigot-Server-Patches/0119-Remove-Debug-checks-from-DataBits.patch
+++ b/Spigot-Server-Patches/0118-Remove-Debug-checks-from-DataBits.patch
@@ -1,4 +1,4 @@
-From a1156e2f6d4fa43ce44ad0c868ab98b3098d6458 Mon Sep 17 00:00:00 2001
+From b465b832aa290d4f490a966fe12bfbec7186059e 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
@@ -42,5 +42,5 @@ index f3a6799..fa0fd8a 100644
          int k = j / 64;
          int l = ((i + 1) * this.b - 1) / 64;
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0120-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/Spigot-Server-Patches/0119-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
similarity index 94%
rename from Spigot-Server-Patches/0120-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
rename to Spigot-Server-Patches/0119-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
index 045f35f76a..ace2cd85fa 100644
--- a/Spigot-Server-Patches/0120-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+++ b/Spigot-Server-Patches/0119-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
@@ -1,4 +1,4 @@
-From d2d0657eeb709504ef94fef87c8a2f8f8410de33 Mon Sep 17 00:00:00 2001
+From 00cfdb221ae532845b6c8373225fdb0f1ecac463 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
@@ -31,10 +31,10 @@ index 1106bd8..a17355c 100644
      public ScoreboardTeamBase aQ() {
          if (!this.world.paperConfig.nonPlayerEntitiesOnScoreboards && !(this instanceof EntityHuman)) { return null; } // Paper
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index b983540..999f381 100644
+index d087f86..89bf52f 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1346,7 +1346,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1345,7 +1345,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                      return;
                  }
  
diff --git a/Spigot-Server-Patches/0121-Workaround-for-setting-passengers-on-players.patch b/Spigot-Server-Patches/0120-Workaround-for-setting-passengers-on-players.patch
similarity index 93%
rename from Spigot-Server-Patches/0121-Workaround-for-setting-passengers-on-players.patch
rename to Spigot-Server-Patches/0120-Workaround-for-setting-passengers-on-players.patch
index e4eae8a72f..d7392b6482 100644
--- a/Spigot-Server-Patches/0121-Workaround-for-setting-passengers-on-players.patch
+++ b/Spigot-Server-Patches/0120-Workaround-for-setting-passengers-on-players.patch
@@ -1,4 +1,4 @@
-From 16ac4baffca999c374ebb6f7bc8d6ff41b028d77 Mon Sep 17 00:00:00 2001
+From f304394cd9cccd385159a8aa904c9770e6ac7ef8 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
@@ -28,5 +28,5 @@ index d5aed11..5b6d4aa 100644
      public void setSneaking(boolean sneak) {
          getHandle().setSneaking(sneak);
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0122-SPIGOT-1903-Update-PlayerConnection-on-teleporting-p.patch b/Spigot-Server-Patches/0121-SPIGOT-1903-Update-PlayerConnection-on-teleporting-p.patch
similarity index 91%
rename from Spigot-Server-Patches/0122-SPIGOT-1903-Update-PlayerConnection-on-teleporting-p.patch
rename to Spigot-Server-Patches/0121-SPIGOT-1903-Update-PlayerConnection-on-teleporting-p.patch
index 757b2ec57d..4f5ca3de5e 100644
--- a/Spigot-Server-Patches/0122-SPIGOT-1903-Update-PlayerConnection-on-teleporting-p.patch
+++ b/Spigot-Server-Patches/0121-SPIGOT-1903-Update-PlayerConnection-on-teleporting-p.patch
@@ -1,4 +1,4 @@
-From aca821f184aaa694af46849ab84284ddcff53892 Mon Sep 17 00:00:00 2001
+From 0be73628c26f8911b84923c97bdc8e9bcb909e9a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 10 Apr 2016 22:36:10 -0400
 Subject: [PATCH] SPIGOT-1903: Update PlayerConnection on teleporting players
@@ -7,7 +7,7 @@ Otherwise the player will trigger a "moved too quickly" next movement packet
 and rubber band.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 34c00eb..b38cb3f 100644
+index a17355c..66337e4 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -293,6 +293,7 @@ public abstract class Entity implements ICommandListener {
@@ -19,7 +19,7 @@ index 34c00eb..b38cb3f 100644
          float f1 = this.length;
  
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 999f381..301c67d 100644
+index 89bf52f..9911265 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -204,7 +204,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -32,5 +32,5 @@ index 999f381..301c67d 100644
          this.m = this.player.locY;
          this.n = this.player.locZ;
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0123-Remove-unused-World-Tile-Entity-List.patch b/Spigot-Server-Patches/0122-Remove-unused-World-Tile-Entity-List.patch
similarity index 97%
rename from Spigot-Server-Patches/0123-Remove-unused-World-Tile-Entity-List.patch
rename to Spigot-Server-Patches/0122-Remove-unused-World-Tile-Entity-List.patch
index fb7e88fd2f..1f016acb36 100644
--- a/Spigot-Server-Patches/0123-Remove-unused-World-Tile-Entity-List.patch
+++ b/Spigot-Server-Patches/0122-Remove-unused-World-Tile-Entity-List.patch
@@ -1,4 +1,4 @@
-From 17e0fad8b8cc8d031c8d0a882e6b3f93b58a8dc0 Mon Sep 17 00:00:00 2001
+From c0dabbd533b543eeffa6229e3b4aeec8fba3b92d 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
@@ -67,5 +67,5 @@ index 34b10c4..71c5596 100644
              }
  
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0124-Don-t-tick-Skulls-unused-code.patch b/Spigot-Server-Patches/0123-Don-t-tick-Skulls-unused-code.patch
similarity index 90%
rename from Spigot-Server-Patches/0124-Don-t-tick-Skulls-unused-code.patch
rename to Spigot-Server-Patches/0123-Don-t-tick-Skulls-unused-code.patch
index 57fa35fdac..24700b8cae 100644
--- a/Spigot-Server-Patches/0124-Don-t-tick-Skulls-unused-code.patch
+++ b/Spigot-Server-Patches/0123-Don-t-tick-Skulls-unused-code.patch
@@ -1,4 +1,4 @@
-From f8660750f3c0acc1ed5882def60f3bc51ade8eaa Mon Sep 17 00:00:00 2001
+From 58796ebaa0bc32c6cf5a65a71644676a1f886363 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
@@ -18,5 +18,5 @@ index a8adbcb..ff5929f 100644
      private int a;
      public int rotation;
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0125-Configurable-Player-Collision.patch b/Spigot-Server-Patches/0124-Configurable-Player-Collision.patch
similarity index 97%
rename from Spigot-Server-Patches/0125-Configurable-Player-Collision.patch
rename to Spigot-Server-Patches/0124-Configurable-Player-Collision.patch
index 5bcf01e8d7..1767b54426 100644
--- a/Spigot-Server-Patches/0125-Configurable-Player-Collision.patch
+++ b/Spigot-Server-Patches/0124-Configurable-Player-Collision.patch
@@ -1,14 +1,14 @@
-From da5892eee2a2ac6740883752a020de6c4a06d355 Mon Sep 17 00:00:00 2001
+From 73ca36d4eb5cce121347d7379071a5bca7da2027 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 17c05f8..d9d8904 100644
+index d5ee3ae..e6e7739 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -218,4 +218,9 @@ public class PaperConfig {
+@@ -210,4 +210,9 @@ public class PaperConfig {
      private static void regionFileCacheSize() {
          regionFileCacheSize = getInt("settings.region-file-cache-size", 256);
      }
@@ -107,5 +107,5 @@ index a41bc5f..ea4c7ee 100644
  
      // CraftBukkit start
 -- 
-2.9.3
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0126-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/Spigot-Server-Patches/0125-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
similarity index 97%
rename from Spigot-Server-Patches/0126-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
rename to Spigot-Server-Patches/0125-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
index 292f575c57..fff78f86b4 100644
--- a/Spigot-Server-Patches/0126-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
+++ b/Spigot-Server-Patches/0125-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
@@ -1,4 +1,4 @@
-From 5f254ede8fb4f33d126ecddd00dc17484eb38d33 Mon Sep 17 00:00:00 2001
+From 5c270ca60b81177dc92acd54f577142611c1267b 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
@@ -45,5 +45,5 @@ index e6b6a5f..4924114 100644
                      if ( split.length == 3 || split.length == 4 ) {
                          packethandshakinginsetprotocol.hostname = split[0];
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0127-Water-mobs-should-only-spawn-in-the-water.patch b/Spigot-Server-Patches/0126-Water-mobs-should-only-spawn-in-the-water.patch
similarity index 93%
rename from Spigot-Server-Patches/0127-Water-mobs-should-only-spawn-in-the-water.patch
rename to Spigot-Server-Patches/0126-Water-mobs-should-only-spawn-in-the-water.patch
index bdf1460715..3b319af097 100644
--- a/Spigot-Server-Patches/0127-Water-mobs-should-only-spawn-in-the-water.patch
+++ b/Spigot-Server-Patches/0126-Water-mobs-should-only-spawn-in-the-water.patch
@@ -1,4 +1,4 @@
-From 7638367fef21cb7ab26a8df82a1273f47a9736c8 Mon Sep 17 00:00:00 2001
+From d717b8e7a3dacbccd8efc83a643e200bd766cbbe Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 14 Apr 2016 17:48:56 -0500
 Subject: [PATCH] Water mobs should only spawn in the water
@@ -26,5 +26,5 @@ index 76394a3..e61f9a2 100644
  
      public boolean canSpawn() {
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0128-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch b/Spigot-Server-Patches/0127-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
similarity index 96%
rename from Spigot-Server-Patches/0128-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
rename to Spigot-Server-Patches/0127-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
index 374f6b7943..2ed51da6ef 100644
--- a/Spigot-Server-Patches/0128-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
+++ b/Spigot-Server-Patches/0127-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
@@ -1,4 +1,4 @@
-From ed806f08a7583b79b1b77d6607b2ceac985b966e Mon Sep 17 00:00:00 2001
+From dfced2e8a52e47983a3c7639108fb9e1ef69740c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 14 Apr 2016 21:01:39 -0400
 Subject: [PATCH] Fix Bugs with Spigot Mob Spawn Logic
@@ -14,7 +14,7 @@ Specially with servers using smaller mob spawn ranges than view distance, as wel
 This patch returns mob counting to use all loaded chunks, and 17x17 division.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index e36525a..3419d0f 100644
+index 74ffa66..0ee8a13 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -680,7 +680,7 @@ public class Chunk {
@@ -56,5 +56,5 @@ index ea0a145..689d664 100644
                          Iterator iterator1 = this.b.iterator();
  
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0129-Configurable-RCON-IP-address.patch b/Spigot-Server-Patches/0128-Configurable-RCON-IP-address.patch
similarity index 92%
rename from Spigot-Server-Patches/0129-Configurable-RCON-IP-address.patch
rename to Spigot-Server-Patches/0128-Configurable-RCON-IP-address.patch
index 94a0568eaa..6c9292fa9a 100644
--- a/Spigot-Server-Patches/0129-Configurable-RCON-IP-address.patch
+++ b/Spigot-Server-Patches/0128-Configurable-RCON-IP-address.patch
@@ -1,4 +1,4 @@
-From 82e21c2a6f9cb8eba92a573473373037a499294d Mon Sep 17 00:00:00 2001
+From e6361230d793f51272a23b9dfb422507c5645cfd 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
@@ -19,5 +19,5 @@ index a6a0d5a..efcafe7 100644
          if (0 == this.h) {
              this.h = this.i + 10;
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0130-Prevent-Fire-from-loading-chunks.patch b/Spigot-Server-Patches/0129-Prevent-Fire-from-loading-chunks.patch
similarity index 96%
rename from Spigot-Server-Patches/0130-Prevent-Fire-from-loading-chunks.patch
rename to Spigot-Server-Patches/0129-Prevent-Fire-from-loading-chunks.patch
index 147c7ff007..b5e75a135c 100644
--- a/Spigot-Server-Patches/0130-Prevent-Fire-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0129-Prevent-Fire-from-loading-chunks.patch
@@ -1,4 +1,4 @@
-From bd85604af18fc4293a5d9ec3bb0d72ae4d38f8ee Mon Sep 17 00:00:00 2001
+From 72649486d710ff8a72fa0d26f18ed110a679d3be 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
@@ -45,5 +45,5 @@ index 1b91f58..c348221 100644
  
              return i;
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0131-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0130-Implement-PlayerLocaleChangeEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0131-Implement-PlayerLocaleChangeEvent.patch
rename to Spigot-Server-Patches/0130-Implement-PlayerLocaleChangeEvent.patch
index bcf9465bb1..06602e34f1 100644
--- a/Spigot-Server-Patches/0131-Implement-PlayerLocaleChangeEvent.patch
+++ b/Spigot-Server-Patches/0130-Implement-PlayerLocaleChangeEvent.patch
@@ -1,4 +1,4 @@
-From b35ca103dd5735fd19b560ee03720d838de64356 Mon Sep 17 00:00:00 2001
+From 1d59f02b06670f9f58a4065545dd94b61b81c174 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
@@ -50,5 +50,5 @@ index 5b6d4aa..3c63d1f 100644
  
          @Override
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0132-EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-Server-Patches/0131-EntityRegainHealthEvent-isFastRegen-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0132-EntityRegainHealthEvent-isFastRegen-API.patch
rename to Spigot-Server-Patches/0131-EntityRegainHealthEvent-isFastRegen-API.patch
index 7cd3adaf64..1f84d8eae4 100644
--- a/Spigot-Server-Patches/0132-EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/Spigot-Server-Patches/0131-EntityRegainHealthEvent-isFastRegen-API.patch
@@ -1,4 +1,4 @@
-From 276d9bba1ea00717e239ff3ad5cfe5d1e7440043 Mon Sep 17 00:00:00 2001
+From 8b08f744ef059f26814f4abaf18e2e338f764168 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
@@ -41,5 +41,5 @@ index 3a7ce8d..46acda8 100644
                  this.foodTickTimer = 0;
              }
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0133-Add-ability-to-configure-frosted_ice-properties.patch b/Spigot-Server-Patches/0132-Add-ability-to-configure-frosted_ice-properties.patch
similarity index 96%
rename from Spigot-Server-Patches/0133-Add-ability-to-configure-frosted_ice-properties.patch
rename to Spigot-Server-Patches/0132-Add-ability-to-configure-frosted_ice-properties.patch
index 5f323816f5..90f5d6471d 100644
--- a/Spigot-Server-Patches/0133-Add-ability-to-configure-frosted_ice-properties.patch
+++ b/Spigot-Server-Patches/0132-Add-ability-to-configure-frosted_ice-properties.patch
@@ -1,4 +1,4 @@
-From 3cf60a9b04c766d8be6027f44bd8c250a86ed413 Mon Sep 17 00:00:00 2001
+From 78f6ceb0064ea2747fa625a3a36ce88ae912afab 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
@@ -44,5 +44,5 @@ index 8f502b9..bddfea0 100644
  
      }
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0134-Vehicle-Event-Cancellation-Changes.patch b/Spigot-Server-Patches/0133-Vehicle-Event-Cancellation-Changes.patch
similarity index 98%
rename from Spigot-Server-Patches/0134-Vehicle-Event-Cancellation-Changes.patch
rename to Spigot-Server-Patches/0133-Vehicle-Event-Cancellation-Changes.patch
index 1996eb1326..f6634c1619 100644
--- a/Spigot-Server-Patches/0134-Vehicle-Event-Cancellation-Changes.patch
+++ b/Spigot-Server-Patches/0133-Vehicle-Event-Cancellation-Changes.patch
@@ -1,4 +1,4 @@
-From a721a2a4c936858a894fe43395ff86fe8fd5f99d Mon Sep 17 00:00:00 2001
+From 7833d4c0dbdc60825c22eed518768eef034531d4 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 22 Apr 2016 18:20:05 -0500
 Subject: [PATCH] Vehicle Event Cancellation Changes
diff --git a/Spigot-Server-Patches/0135-Arrow-pickup-rule-API.patch b/Spigot-Server-Patches/0134-Arrow-pickup-rule-API.patch
similarity index 95%
rename from Spigot-Server-Patches/0135-Arrow-pickup-rule-API.patch
rename to Spigot-Server-Patches/0134-Arrow-pickup-rule-API.patch
index 473eb392a4..ddf46fe900 100644
--- a/Spigot-Server-Patches/0135-Arrow-pickup-rule-API.patch
+++ b/Spigot-Server-Patches/0134-Arrow-pickup-rule-API.patch
@@ -1,4 +1,4 @@
-From 47aa4891a959f61334dcc3cb0cb2e5c607456428 Mon Sep 17 00:00:00 2001
+From d9c348e694dd50b9bdae8ed4aaf91dabff55b519 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Fri, 4 Mar 2016 03:16:11 -0500
 Subject: [PATCH] Arrow pickup rule API
@@ -54,5 +54,5 @@ index 2a3482c..fbf289f 100644
      private final Arrow.Spigot spigot = new Arrow.Spigot()
      {
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0136-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch b/Spigot-Server-Patches/0135-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
similarity index 97%
rename from Spigot-Server-Patches/0136-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
rename to Spigot-Server-Patches/0135-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
index 31b4cc09c9..0f4537cab8 100644
--- a/Spigot-Server-Patches/0136-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
+++ b/Spigot-Server-Patches/0135-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
@@ -1,4 +1,4 @@
-From 3a61ded2e5353d45223721338a9567d06de5b103 Mon Sep 17 00:00:00 2001
+From 2a951c9f066b67a6db6a9278353e6e59835eb25f Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 24 Apr 2016 19:49:33 -0500
 Subject: [PATCH] SPIGOT-1401: Fix dispenser, dropper, furnace placement
@@ -51,5 +51,5 @@ index 61a6b8a..25f7b4b 100644
      public boolean interact(World world, BlockPosition blockposition, IBlockData iblockdata, EntityHuman entityhuman, EnumHand enumhand, @Nullable ItemStack itemstack, EnumDirection enumdirection, float f, float f1, float f2) {
          if (world.isClientSide) {
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0137-Improve-Minecraft-Hopper-Performance.patch b/Spigot-Server-Patches/0136-Improve-Minecraft-Hopper-Performance.patch
similarity index 97%
rename from Spigot-Server-Patches/0137-Improve-Minecraft-Hopper-Performance.patch
rename to Spigot-Server-Patches/0136-Improve-Minecraft-Hopper-Performance.patch
index 4b41768429..06fe72c417 100644
--- a/Spigot-Server-Patches/0137-Improve-Minecraft-Hopper-Performance.patch
+++ b/Spigot-Server-Patches/0136-Improve-Minecraft-Hopper-Performance.patch
@@ -1,4 +1,4 @@
-From cabf4d121a1c5db55fe69b58015d9f62232a9e29 Mon Sep 17 00:00:00 2001
+From 0fff7c225ea6e505c6b8c70ac074c67aed84737d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 27 Apr 2016 22:09:52 -0400
 Subject: [PATCH] Improve Minecraft Hopper Performance
@@ -66,5 +66,5 @@ index d1ce2b9..a651961 100644
          return this.g > 0;
      }
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0138-remove-null-possibility-for-getServer-singleton.patch b/Spigot-Server-Patches/0137-remove-null-possibility-for-getServer-singleton.patch
similarity index 95%
rename from Spigot-Server-Patches/0138-remove-null-possibility-for-getServer-singleton.patch
rename to Spigot-Server-Patches/0137-remove-null-possibility-for-getServer-singleton.patch
index 14b13519e0..fc44aa2d51 100644
--- a/Spigot-Server-Patches/0138-remove-null-possibility-for-getServer-singleton.patch
+++ b/Spigot-Server-Patches/0137-remove-null-possibility-for-getServer-singleton.patch
@@ -1,4 +1,4 @@
-From 87108169b3fd2c3f92b9367a43d6a66dabbedf95 Mon Sep 17 00:00:00 2001
+From 06e01fb6a3f8c1dcddbd94fbf188f16cf1816ab8 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
@@ -35,5 +35,5 @@ index 90cce4a..25c4f9f 100644
      // CraftBukkit end
  }
 -- 
-2.9.3
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0139-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/Spigot-Server-Patches/0138-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
similarity index 98%
rename from Spigot-Server-Patches/0139-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
rename to Spigot-Server-Patches/0138-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index 10ca50938d..7f20618dc0 100644
--- a/Spigot-Server-Patches/0139-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/Spigot-Server-Patches/0138-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
@@ -1,4 +1,4 @@
-From e932caa069c7f622604724e162151b6e5082f8c6 Mon Sep 17 00:00:00 2001
+From d554f157aaf7bd0b13337733d67e5062a32521cc 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
@@ -145,5 +145,5 @@ index 256a131..5768cd5 100644
  
      public RenderData() {
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0140-LootTable-API-Replenishable-Lootables-Feature.patch b/Spigot-Server-Patches/0139-LootTable-API-Replenishable-Lootables-Feature.patch
similarity index 99%
rename from Spigot-Server-Patches/0140-LootTable-API-Replenishable-Lootables-Feature.patch
rename to Spigot-Server-Patches/0139-LootTable-API-Replenishable-Lootables-Feature.patch
index c3b96f2904..a0200030dc 100644
--- a/Spigot-Server-Patches/0140-LootTable-API-Replenishable-Lootables-Feature.patch
+++ b/Spigot-Server-Patches/0139-LootTable-API-Replenishable-Lootables-Feature.patch
@@ -1,4 +1,4 @@
-From 61519982a43461d6ccaa5a77c0b546cd7f99a32a Mon Sep 17 00:00:00 2001
+From 4b57c2643714635049c7b638ac751b6c8bc9c8b6 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
@@ -752,5 +752,5 @@ index e9963e2..acb4dee 100644
  
      CraftMinecartHopper(CraftServer server, EntityMinecartHopper entity) {
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0141-Do-not-load-chunks-for-pathfinding.patch b/Spigot-Server-Patches/0140-Do-not-load-chunks-for-pathfinding.patch
similarity index 90%
rename from Spigot-Server-Patches/0141-Do-not-load-chunks-for-pathfinding.patch
rename to Spigot-Server-Patches/0140-Do-not-load-chunks-for-pathfinding.patch
index 93969bc02a..eca2b8ad06 100644
--- a/Spigot-Server-Patches/0141-Do-not-load-chunks-for-pathfinding.patch
+++ b/Spigot-Server-Patches/0140-Do-not-load-chunks-for-pathfinding.patch
@@ -1,4 +1,4 @@
-From a6c90688f4b621536fc50d611019c67236e4d3a3 Mon Sep 17 00:00:00 2001
+From 70f5e6b8db75750b358ce6dabe3a4ea4f69b7263 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Jan 2016 00:13:19 -0500
 Subject: [PATCH] Do not load chunks for pathfinding
@@ -18,5 +18,5 @@ index 08b986f..786d1dd 100644
          }
  
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0142-Entity-Tracking-Improvements.patch b/Spigot-Server-Patches/0141-Entity-Tracking-Improvements.patch
similarity index 97%
rename from Spigot-Server-Patches/0142-Entity-Tracking-Improvements.patch
rename to Spigot-Server-Patches/0141-Entity-Tracking-Improvements.patch
index fc63d05e1b..da0a250fa2 100644
--- a/Spigot-Server-Patches/0142-Entity-Tracking-Improvements.patch
+++ b/Spigot-Server-Patches/0141-Entity-Tracking-Improvements.patch
@@ -1,4 +1,4 @@
-From afd6eee2ce91d6a41747612cd0fb42556e1c2875 Mon Sep 17 00:00:00 2001
+From a6a8914a4d8f045b6cced8533e214241ad577d01 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 17 Jun 2013 01:24:00 -0400
 Subject: [PATCH] Entity Tracking Improvements
@@ -7,7 +7,7 @@ If any part of a Vehicle/Passenger relationship is visible to a player,
 send all passenger/vehicles to the player in the chain.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 10d732f..68f9175 100644
+index afbc204..059042e 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -52,6 +52,7 @@ public abstract class Entity implements ICommandListener {
@@ -99,5 +99,5 @@ index f505e3c..c2113d7 100644
  
      }
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0143-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/Spigot-Server-Patches/0142-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
similarity index 90%
rename from Spigot-Server-Patches/0143-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
rename to Spigot-Server-Patches/0142-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
index 4eceb6a036..8351f3a41c 100644
--- a/Spigot-Server-Patches/0143-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
+++ b/Spigot-Server-Patches/0142-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
@@ -1,14 +1,14 @@
-From a561985ad9643f4db27e46a215d9c5594ab20176 Mon Sep 17 00:00:00 2001
+From 7721a93822a2fa9fc0f16f325ed36f7ea13bf761 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/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 24fb01c..058720f 100644
+index e6e7739..82e6365 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -223,4 +223,9 @@ public class PaperConfig {
+@@ -215,4 +215,9 @@ public class PaperConfig {
      private static void enablePlayerCollisions() {
          enablePlayerCollisions = getBoolean("settings.enable-player-collisions", true);
      }
@@ -31,5 +31,5 @@ index 230004b..62752f8 100644
  
              nbttagcompound.setString("Name", scoreboardteam.getName());
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0144-Do-not-mark-chunks-as-active-for-neighbor-updates.patch b/Spigot-Server-Patches/0143-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
similarity index 97%
rename from Spigot-Server-Patches/0144-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
rename to Spigot-Server-Patches/0143-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
index 1d10a2545f..ec33ed6a14 100644
--- a/Spigot-Server-Patches/0144-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
+++ b/Spigot-Server-Patches/0143-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
@@ -1,4 +1,4 @@
-From 800aec526783fdd35ccfe8a181c76f75ada3c11a Mon Sep 17 00:00:00 2001
+From 3997e8d790922ae9f871e773b89df69e3603dba1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 12 May 2016 01:55:17 -0400
 Subject: [PATCH] Do not mark chunks as active for neighbor updates
@@ -44,5 +44,5 @@ index 0ee8a13..1ec820f 100644
              if (chunk4 != null) {
                  chunk4.a(chunkgenerator);
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0145-Fix-Chunk-Unload-Queue-Issues.patch b/Spigot-Server-Patches/0144-Fix-Chunk-Unload-Queue-Issues.patch
similarity index 93%
rename from Spigot-Server-Patches/0145-Fix-Chunk-Unload-Queue-Issues.patch
rename to Spigot-Server-Patches/0144-Fix-Chunk-Unload-Queue-Issues.patch
index 4f5379f8b8..f7690babe5 100644
--- a/Spigot-Server-Patches/0145-Fix-Chunk-Unload-Queue-Issues.patch
+++ b/Spigot-Server-Patches/0144-Fix-Chunk-Unload-Queue-Issues.patch
@@ -1,4 +1,4 @@
-From 830edfa4d686a7762c9c92bc19020c15819ba895 Mon Sep 17 00:00:00 2001
+From 78a3b6853055e9d9675199c3b53cbff2e469ba30 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 12 May 2016 02:03:56 -0400
 Subject: [PATCH] Fix Chunk Unload Queue Issues
@@ -9,7 +9,7 @@ has not resolved all the bugs with the changes.
 This patch fixes known issues and really should be applied by Spigot team.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index a2d9f62..a9f6efa 100644
+index 1ec820f..b0453ca 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -46,7 +46,7 @@ public class Chunk {
@@ -34,5 +34,5 @@ index d4587c7..804a0ca 100644
                              continue;
                          }
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0146-System-property-for-disabling-watchdoge.patch b/Spigot-Server-Patches/0145-System-property-for-disabling-watchdoge.patch
similarity index 91%
rename from Spigot-Server-Patches/0146-System-property-for-disabling-watchdoge.patch
rename to Spigot-Server-Patches/0145-System-property-for-disabling-watchdoge.patch
index bd66e7ad31..87553966cf 100644
--- a/Spigot-Server-Patches/0146-System-property-for-disabling-watchdoge.patch
+++ b/Spigot-Server-Patches/0145-System-property-for-disabling-watchdoge.patch
@@ -1,4 +1,4 @@
-From 21d09aa878ff9919708c5931d8438adc4593fcd4 Mon Sep 17 00:00:00 2001
+From ba9bd40106462da733ff34ab75818eb1e4f909cb 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
@@ -18,5 +18,5 @@ index 3ed983c..fb57e0d 100644
                  Logger log = Bukkit.getServer().getLogger();
                  log.log( Level.SEVERE, "The server has stopped responding!" );
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0147-Optimize-EAR.patch b/Spigot-Server-Patches/0146-Optimize-EAR.patch
similarity index 96%
rename from Spigot-Server-Patches/0147-Optimize-EAR.patch
rename to Spigot-Server-Patches/0146-Optimize-EAR.patch
index 7ec51807c7..a65d605236 100644
--- a/Spigot-Server-Patches/0147-Optimize-EAR.patch
+++ b/Spigot-Server-Patches/0146-Optimize-EAR.patch
@@ -1,4 +1,4 @@
-From 1d7c5962e2a1dfff0b015b166bff5333042d8185 Mon Sep 17 00:00:00 2001
+From 72b3cf583161fb407f82938a0f8f4a93dff22696 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 13 May 2016 01:38:06 -0400
 Subject: [PATCH] Optimize EAR
@@ -65,5 +65,5 @@ index c4ed64a..4a4d64e 100644
                  }
              }
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0148-Optimize-UserCache-Thread-Safe.patch b/Spigot-Server-Patches/0147-Optimize-UserCache-Thread-Safe.patch
similarity index 97%
rename from Spigot-Server-Patches/0148-Optimize-UserCache-Thread-Safe.patch
rename to Spigot-Server-Patches/0147-Optimize-UserCache-Thread-Safe.patch
index eb3602f5d6..c803657e1e 100644
--- a/Spigot-Server-Patches/0148-Optimize-UserCache-Thread-Safe.patch
+++ b/Spigot-Server-Patches/0147-Optimize-UserCache-Thread-Safe.patch
@@ -1,4 +1,4 @@
-From f69529e8ae915db7197f5cbc39f551cbbfe4c936 Mon Sep 17 00:00:00 2001
+From 0872f7843a9510bc64d506766a34d8854466f927 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
@@ -96,5 +96,5 @@ index ccfc755..989758c 100644
      }
  
 -- 
-2.9.3
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0149-Avoid-blocking-on-Network-Manager-creation.patch b/Spigot-Server-Patches/0148-Avoid-blocking-on-Network-Manager-creation.patch
similarity index 97%
rename from Spigot-Server-Patches/0149-Avoid-blocking-on-Network-Manager-creation.patch
rename to Spigot-Server-Patches/0148-Avoid-blocking-on-Network-Manager-creation.patch
index 5ff42ecfe0..df063e9311 100644
--- a/Spigot-Server-Patches/0149-Avoid-blocking-on-Network-Manager-creation.patch
+++ b/Spigot-Server-Patches/0148-Avoid-blocking-on-Network-Manager-creation.patch
@@ -1,4 +1,4 @@
-From 93278e4396b2469478b7d05b47465e0a2c02bf99 Mon Sep 17 00:00:00 2001
+From cfa9670f71909f78fadc59118fbb42c5ca7959f4 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
@@ -45,5 +45,5 @@ index 5b0488a..8906d7c 100644
              if ( org.spigotmc.SpigotConfig.playerShuffle > 0 && MinecraftServer.currentTick % org.spigotmc.SpigotConfig.playerShuffle == 0 )
              {
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0150-Optional-old-TNT-cannon-behaviors.patch b/Spigot-Server-Patches/0149-Optional-old-TNT-cannon-behaviors.patch
similarity index 99%
rename from Spigot-Server-Patches/0150-Optional-old-TNT-cannon-behaviors.patch
rename to Spigot-Server-Patches/0149-Optional-old-TNT-cannon-behaviors.patch
index d0c2abe32a..a2430df609 100644
--- a/Spigot-Server-Patches/0150-Optional-old-TNT-cannon-behaviors.patch
+++ b/Spigot-Server-Patches/0149-Optional-old-TNT-cannon-behaviors.patch
@@ -1,4 +1,4 @@
-From cf538b617c3412544b4ec983d5b7f8347d71db55 Mon Sep 17 00:00:00 2001
+From 447be950266364ba6f54a3a5544b7ceef4c8838a 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 old TNT cannon behaviors
diff --git a/Spigot-Server-Patches/0151-Faster-redstone-torch-rapid-clock-removal.patch b/Spigot-Server-Patches/0150-Faster-redstone-torch-rapid-clock-removal.patch
similarity index 95%
rename from Spigot-Server-Patches/0151-Faster-redstone-torch-rapid-clock-removal.patch
rename to Spigot-Server-Patches/0150-Faster-redstone-torch-rapid-clock-removal.patch
index 3eeb632a53..571115c05b 100644
--- a/Spigot-Server-Patches/0151-Faster-redstone-torch-rapid-clock-removal.patch
+++ b/Spigot-Server-Patches/0150-Faster-redstone-torch-rapid-clock-removal.patch
@@ -1,4 +1,4 @@
-From 30315c75cbb97908d199739e6990924a7adf5e81 Mon Sep 17 00:00:00 2001
+From e71fd9b4b4702a0696ec04989b089ce14d552b3e 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
@@ -39,5 +39,5 @@ index 7866bd9..606f982 100644
          public RedstoneUpdateInfo(BlockPosition blockposition, long i) {
              this.a = blockposition;
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0152-Ensure-Chunks-never-ever-load-async.patch b/Spigot-Server-Patches/0151-Ensure-Chunks-never-ever-load-async.patch
similarity index 97%
rename from Spigot-Server-Patches/0152-Ensure-Chunks-never-ever-load-async.patch
rename to Spigot-Server-Patches/0151-Ensure-Chunks-never-ever-load-async.patch
index 05d8f9c837..f6882f35dd 100644
--- a/Spigot-Server-Patches/0152-Ensure-Chunks-never-ever-load-async.patch
+++ b/Spigot-Server-Patches/0151-Ensure-Chunks-never-ever-load-async.patch
@@ -1,4 +1,4 @@
-From 51da3caf6f0b0d7a6cdea101aa9c4a273726edf8 Mon Sep 17 00:00:00 2001
+From 62db4aaef486a25c551d384a766254144f398495 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 27 May 2016 21:41:26 -0400
 Subject: [PATCH] Ensure Chunks never ever load async
@@ -42,5 +42,5 @@ index b5efb9c..ef9529a 100644
              return;
          }
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0153-Add-server-name-parameter.patch b/Spigot-Server-Patches/0152-Add-server-name-parameter.patch
similarity index 92%
rename from Spigot-Server-Patches/0153-Add-server-name-parameter.patch
rename to Spigot-Server-Patches/0152-Add-server-name-parameter.patch
index dd0f6fdf6b..99db1b6ee2 100644
--- a/Spigot-Server-Patches/0153-Add-server-name-parameter.patch
+++ b/Spigot-Server-Patches/0152-Add-server-name-parameter.patch
@@ -1,4 +1,4 @@
-From dfc36f8e68787108de6da6156075bc821706b422 Mon Sep 17 00:00:00 2001
+From 51392d298660f38a042f81f9191e78110ad5989c 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
@@ -24,5 +24,5 @@ index 979adad..2aad1e8 100644
          };
  
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0154-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch b/Spigot-Server-Patches/0153-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
similarity index 97%
rename from Spigot-Server-Patches/0154-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
rename to Spigot-Server-Patches/0153-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
index 54911150cc..37b15c49de 100644
--- a/Spigot-Server-Patches/0154-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
+++ b/Spigot-Server-Patches/0153-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
@@ -1,4 +1,4 @@
-From 01b8d0ea25644c7aede1485b3cd3d2df67422179 Mon Sep 17 00:00:00 2001
+From f68a321f88b0ffcbbc13a6590fe9235f5b26b616 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
@@ -44,5 +44,5 @@ index 48b5b2c..6749211 100644
                      double deltaZ = this.locZ - player.locZ;
                      double distanceSquared = deltaX * deltaX + deltaZ * deltaZ;
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0155-Fix-FallingBlocks-being-stuck-on-fences.patch b/Spigot-Server-Patches/0154-Fix-FallingBlocks-being-stuck-on-fences.patch
similarity index 98%
rename from Spigot-Server-Patches/0155-Fix-FallingBlocks-being-stuck-on-fences.patch
rename to Spigot-Server-Patches/0154-Fix-FallingBlocks-being-stuck-on-fences.patch
index dbd80ff131..44462b6f04 100644
--- a/Spigot-Server-Patches/0155-Fix-FallingBlocks-being-stuck-on-fences.patch
+++ b/Spigot-Server-Patches/0154-Fix-FallingBlocks-being-stuck-on-fences.patch
@@ -1,4 +1,4 @@
-From 630980b17cd17106905b005076662e28408a42e3 Mon Sep 17 00:00:00 2001
+From 16b6ee261a933a76d6c60f1af4ad7cb1cd1b7e73 Mon Sep 17 00:00:00 2001
 From: Martin Panzer <postremus1996@googlemail.com>
 Date: Fri, 3 Jun 2016 23:13:39 +0200
 Subject: [PATCH] Fix FallingBlocks being stuck on fences
@@ -101,5 +101,5 @@ index 4fd4371..dcfdd31 100644
          Block block = this.block.getBlock();
  
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0156-Make-entities-look-for-hoppers.patch b/Spigot-Server-Patches/0155-Make-entities-look-for-hoppers.patch
similarity index 99%
rename from Spigot-Server-Patches/0156-Make-entities-look-for-hoppers.patch
rename to Spigot-Server-Patches/0155-Make-entities-look-for-hoppers.patch
index 0f002f6e26..f438d6fbf1 100644
--- a/Spigot-Server-Patches/0156-Make-entities-look-for-hoppers.patch
+++ b/Spigot-Server-Patches/0155-Make-entities-look-for-hoppers.patch
@@ -1,4 +1,4 @@
-From 585575cdb2d56f646058571cbdaddd4004a79409 Mon Sep 17 00:00:00 2001
+From c87534e092cff7992c0f4e96f9c6f2567cea4fd4 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Sat, 18 Jun 2016 01:01:37 -0500
 Subject: [PATCH] Make entities look for hoppers
@@ -132,7 +132,7 @@ index d6cc51b..5bbaa87 100644
              this.b = i;
              this.c = j;
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 41ef058..de78029 100644
+index 7fc3e57..57988e2 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -78,6 +78,19 @@ public abstract class Entity implements ICommandListener {
@@ -370,5 +370,5 @@ index a651961..1f5de89 100644
  
              if (!list.isEmpty()) {
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0157-Remove-the-item-from-the-correct-hand-when-spawn-egg.patch b/Spigot-Server-Patches/0156-Remove-the-item-from-the-correct-hand-when-spawn-egg.patch
similarity index 95%
rename from Spigot-Server-Patches/0157-Remove-the-item-from-the-correct-hand-when-spawn-egg.patch
rename to Spigot-Server-Patches/0156-Remove-the-item-from-the-correct-hand-when-spawn-egg.patch
index 1460dfba99..fc6ccb6a67 100644
--- a/Spigot-Server-Patches/0157-Remove-the-item-from-the-correct-hand-when-spawn-egg.patch
+++ b/Spigot-Server-Patches/0156-Remove-the-item-from-the-correct-hand-when-spawn-egg.patch
@@ -1,4 +1,4 @@
-From 6e27e470548042ae38fa0b8595c1396524374026 Mon Sep 17 00:00:00 2001
+From 3c7d1a025675485ca08a251f4f5463bb32cdb840 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 18 Jun 2016 01:49:22 -0400
 Subject: [PATCH] Remove the item from the correct hand when spawn egg depletes
@@ -30,5 +30,5 @@ index 526a608..c0c60a7 100644
          if (enumhand == EnumHand.MAIN_HAND) {
              this.setSlot(EnumItemSlot.MAINHAND, itemstack);
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0158-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/0157-Delay-Chunk-Unloads-based-on-Player-Movement.patch
similarity index 98%
rename from Spigot-Server-Patches/0158-Delay-Chunk-Unloads-based-on-Player-Movement.patch
rename to Spigot-Server-Patches/0157-Delay-Chunk-Unloads-based-on-Player-Movement.patch
index fddeb2b351..582572f082 100644
--- a/Spigot-Server-Patches/0158-Delay-Chunk-Unloads-based-on-Player-Movement.patch
+++ b/Spigot-Server-Patches/0157-Delay-Chunk-Unloads-based-on-Player-Movement.patch
@@ -1,4 +1,4 @@
-From bd2c221318693b3106af24c0c577ee785e8e5fb5 Mon Sep 17 00:00:00 2001
+From 18cec5d14ced4ca22349dea910203e837031cecc Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 18 Jun 2016 23:22:12 -0400
 Subject: [PATCH] Delay Chunk Unloads based on Player Movement
@@ -140,5 +140,5 @@ index e85a0a0..c28c505 100644
              }
  
 -- 
-2.9.3
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0159-Toggleable-Elytra-Wall-Damage.patch b/Spigot-Server-Patches/0158-Toggleable-Elytra-Wall-Damage.patch
similarity index 95%
rename from Spigot-Server-Patches/0159-Toggleable-Elytra-Wall-Damage.patch
rename to Spigot-Server-Patches/0158-Toggleable-Elytra-Wall-Damage.patch
index eeafbce216..32b4772379 100644
--- a/Spigot-Server-Patches/0159-Toggleable-Elytra-Wall-Damage.patch
+++ b/Spigot-Server-Patches/0158-Toggleable-Elytra-Wall-Damage.patch
@@ -1,4 +1,4 @@
-From f356c0493929af40b3940f6e3d6dc45a4d87a05b Mon Sep 17 00:00:00 2001
+From 2288e7a229b738e7de1ee68ba4e2131f788c50d4 Mon Sep 17 00:00:00 2001
 From: Jadon Fowler <jadonflower@gmail.com>
 Date: Sat, 18 Jun 2016 23:13:59 -0700
 Subject: [PATCH] Toggleable Elytra Wall Damage
@@ -41,5 +41,5 @@ index c0c60a7..8c98a19 100644
                  if (this.onGround && !this.world.isClientSide) {
                      if (getFlag(7) && !CraftEventFactory.callToggleGlideEvent(this, false).isCancelled()) // CraftBukkit
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0160-Fix-Double-World-Add-issues.patch b/Spigot-Server-Patches/0159-Fix-Double-World-Add-issues.patch
similarity index 95%
rename from Spigot-Server-Patches/0160-Fix-Double-World-Add-issues.patch
rename to Spigot-Server-Patches/0159-Fix-Double-World-Add-issues.patch
index 16ceb00aa2..2effe80b3c 100644
--- a/Spigot-Server-Patches/0160-Fix-Double-World-Add-issues.patch
+++ b/Spigot-Server-Patches/0159-Fix-Double-World-Add-issues.patch
@@ -1,4 +1,4 @@
-From b2b83ce857f36558201df4545b39d92511d9dc85 Mon Sep 17 00:00:00 2001
+From 5ac6ef5ec3966a96a72feb81de1f03c8b4a049d4 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
@@ -33,5 +33,5 @@ index 1d47a11..f7d9a7c 100644
          int i = MathHelper.floor(entity.locX / 16.0D);
          int j = MathHelper.floor(entity.locZ / 16.0D);
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0161-Fix-Old-Sign-Conversion.patch b/Spigot-Server-Patches/0160-Fix-Old-Sign-Conversion.patch
similarity index 98%
rename from Spigot-Server-Patches/0161-Fix-Old-Sign-Conversion.patch
rename to Spigot-Server-Patches/0160-Fix-Old-Sign-Conversion.patch
index f18c11314d..1214320216 100644
--- a/Spigot-Server-Patches/0161-Fix-Old-Sign-Conversion.patch
+++ b/Spigot-Server-Patches/0160-Fix-Old-Sign-Conversion.patch
@@ -1,4 +1,4 @@
-From da802c2fef049fd54050d150edf5d82c9ba98b7f Mon Sep 17 00:00:00 2001
+From 6d6666240e69a1d3d0d99abb53cba217342fbd38 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
@@ -67,5 +67,5 @@ index 5694ff7..f5ba2dd 100644
                  try {
                      this.lines[i] = ChatComponentUtils.filterForDisplay(icommandlistener, ichatbasecomponent, (Entity) null);
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0162-Don-t-try-and-fix-TileEntities-as-they-are-removed.patch b/Spigot-Server-Patches/0161-Don-t-try-and-fix-TileEntities-as-they-are-removed.patch
similarity index 98%
rename from Spigot-Server-Patches/0162-Don-t-try-and-fix-TileEntities-as-they-are-removed.patch
rename to Spigot-Server-Patches/0161-Don-t-try-and-fix-TileEntities-as-they-are-removed.patch
index 50acff6df7..41ad00d1ac 100644
--- a/Spigot-Server-Patches/0162-Don-t-try-and-fix-TileEntities-as-they-are-removed.patch
+++ b/Spigot-Server-Patches/0161-Don-t-try-and-fix-TileEntities-as-they-are-removed.patch
@@ -1,4 +1,4 @@
-From 96fb3b6c1042f833bdf3b90e2e82c0652796e9da Mon Sep 17 00:00:00 2001
+From b9c0f03504ca656ebe63b673f857b6ef62759c30 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 25 Jun 2016 23:55:56 -0500
 Subject: [PATCH] Don't try and fix TileEntities as they are removed
@@ -93,7 +93,7 @@ index f7d9a7c..383eef2 100644
          if (tileentity != null && this.M) {
              tileentity.y();
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index d448277..bd43075 100644
+index 87abf7f..5ed6d3e 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -123,8 +123,16 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -115,5 +115,5 @@ index d448277..bd43075 100644
  
          if (type == Blocks.CHEST || type == Blocks.TRAPPED_CHEST) { // Spigot
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0163-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/Spigot-Server-Patches/0162-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
similarity index 92%
rename from Spigot-Server-Patches/0163-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
rename to Spigot-Server-Patches/0162-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
index 431b5870ae..64f7357f80 100644
--- a/Spigot-Server-Patches/0163-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
+++ b/Spigot-Server-Patches/0162-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
@@ -1,4 +1,4 @@
-From 9ef998e3678205795747368ced9400fc514b5979 Mon Sep 17 00:00:00 2001
+From e972102cd812e252b5ad14ae0254c4b060a50907 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
@@ -18,5 +18,5 @@ index 989758c..1c619c5 100644
              GameProfile gameprofile = new GameProfile(uuid, s);
  
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0164-More-informative-vehicle-moved-wrongly-message.patch b/Spigot-Server-Patches/0163-More-informative-vehicle-moved-wrongly-message.patch
similarity index 89%
rename from Spigot-Server-Patches/0164-More-informative-vehicle-moved-wrongly-message.patch
rename to Spigot-Server-Patches/0163-More-informative-vehicle-moved-wrongly-message.patch
index 35a61c1675..1c5f6fc334 100644
--- a/Spigot-Server-Patches/0164-More-informative-vehicle-moved-wrongly-message.patch
+++ b/Spigot-Server-Patches/0163-More-informative-vehicle-moved-wrongly-message.patch
@@ -1,11 +1,11 @@
-From f6501f3b7153c50b94966a9c67040bad162f8899 Mon Sep 17 00:00:00 2001
+From 559fff38085830930c7e8c381e505aafb7cec4d8 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 301c67d..882d82a 100644
+index 9911265..90f2247 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -343,7 +343,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -18,5 +18,5 @@ index 301c67d..882d82a 100644
  
                  entity.setLocation(d3, d4, d5, f, f1);
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0165-Re-track-players-that-dismount-from-other-players.patch b/Spigot-Server-Patches/0164-Re-track-players-that-dismount-from-other-players.patch
similarity index 93%
rename from Spigot-Server-Patches/0165-Re-track-players-that-dismount-from-other-players.patch
rename to Spigot-Server-Patches/0164-Re-track-players-that-dismount-from-other-players.patch
index f6201fe9b4..2b51ba8c9a 100644
--- a/Spigot-Server-Patches/0165-Re-track-players-that-dismount-from-other-players.patch
+++ b/Spigot-Server-Patches/0164-Re-track-players-that-dismount-from-other-players.patch
@@ -1,4 +1,4 @@
-From 89a5d2bf5922e2e430f947d46c01492d9ebbabf6 Mon Sep 17 00:00:00 2001
+From b7fff98e508a6e9bcb41fb6d11e6328d4a7de102 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
@@ -23,5 +23,5 @@ index d084fc2..ec3a60a 100644
      }
  
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0166-Add-setting-for-proxy-online-mode-status.patch b/Spigot-Server-Patches/0165-Add-setting-for-proxy-online-mode-status.patch
similarity index 94%
rename from Spigot-Server-Patches/0166-Add-setting-for-proxy-online-mode-status.patch
rename to Spigot-Server-Patches/0165-Add-setting-for-proxy-online-mode-status.patch
index 5e2b556b0a..38c8618c0d 100644
--- a/Spigot-Server-Patches/0166-Add-setting-for-proxy-online-mode-status.patch
+++ b/Spigot-Server-Patches/0165-Add-setting-for-proxy-online-mode-status.patch
@@ -1,14 +1,14 @@
-From 29bd92440728d0e01154fe07e4a3cf6fff536122 Mon Sep 17 00:00:00 2001
+From 6b5df38a5b989dff9296d93f1c27f18559b22cd9 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 058720f..ab4e305 100644
+index 82e6365..f40440f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -228,4 +228,9 @@ public class PaperConfig {
+@@ -220,4 +220,9 @@ public class PaperConfig {
      private static void saveEmptyScoreboardTeams() {
          saveEmptyScoreboardTeams = getBoolean("settings.save-empty-scoreboard-teams", false);
      }
@@ -47,5 +47,5 @@ index 100142e..4fb9c5e 100644
                  profile = console.getUserCache().getProfile( name );
              }
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0167-Optimise-BlockStateEnum-hashCode-and-equals.patch b/Spigot-Server-Patches/0166-Optimise-BlockStateEnum-hashCode-and-equals.patch
similarity index 96%
rename from Spigot-Server-Patches/0167-Optimise-BlockStateEnum-hashCode-and-equals.patch
rename to Spigot-Server-Patches/0166-Optimise-BlockStateEnum-hashCode-and-equals.patch
index fbd26c4a9b..51d2439274 100644
--- a/Spigot-Server-Patches/0167-Optimise-BlockStateEnum-hashCode-and-equals.patch
+++ b/Spigot-Server-Patches/0166-Optimise-BlockStateEnum-hashCode-and-equals.patch
@@ -1,4 +1,4 @@
-From 64360e184599c895a9c26a46cf1e7e2f91e80b92 Mon Sep 17 00:00:00 2001
+From f4ce497b75a49f07923d20fe17383d5e90133202 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 BlockStateEnum hashCode and equals
@@ -58,5 +58,5 @@ index 288c52c..66c459d 100644
  
      public static <T extends Enum<T> & INamable> BlockStateEnum<T> of(String s, Class<T> oclass) {
 -- 
-2.9.3
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0168-Disable-ticking-of-snow-blocks.patch b/Spigot-Server-Patches/0167-Disable-ticking-of-snow-blocks.patch
similarity index 93%
rename from Spigot-Server-Patches/0168-Disable-ticking-of-snow-blocks.patch
rename to Spigot-Server-Patches/0167-Disable-ticking-of-snow-blocks.patch
index 4ecdea9383..6827852b31 100644
--- a/Spigot-Server-Patches/0168-Disable-ticking-of-snow-blocks.patch
+++ b/Spigot-Server-Patches/0167-Disable-ticking-of-snow-blocks.patch
@@ -1,4 +1,4 @@
-From a7532ff3e8feb8093c83ac7e6604b5e6cba8546c Mon Sep 17 00:00:00 2001
+From f2cbfdf2075c15a632cecaa3d7885a7479ef9c95 Mon Sep 17 00:00:00 2001
 From: killme <killme-git@ibts.me>
 Date: Tue, 30 Aug 2016 16:39:48 +0200
 Subject: [PATCH] Disable ticking of snow blocks
@@ -34,5 +34,5 @@ index 1c43a37..a3b1998 100644
 +    //Paper end
  }
 -- 
-2.7.4
+2.10.0.windows.1
 
diff --git a/Spigot-Server-Patches/0169-Convert-new-health-to-a-float-during-set.patch b/Spigot-Server-Patches/0168-Convert-new-health-to-a-float-during-set.patch
similarity index 94%
rename from Spigot-Server-Patches/0169-Convert-new-health-to-a-float-during-set.patch
rename to Spigot-Server-Patches/0168-Convert-new-health-to-a-float-during-set.patch
index 1bd033ddb3..a86bc0c524 100644
--- a/Spigot-Server-Patches/0169-Convert-new-health-to-a-float-during-set.patch
+++ b/Spigot-Server-Patches/0168-Convert-new-health-to-a-float-during-set.patch
@@ -1,4 +1,4 @@
-From f875aa3ec413dd58b41f26cb298e7969bee22bed Mon Sep 17 00:00:00 2001
+From d99c319cab6c38f3ca1eb048cd23af14d66a25a6 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 1 Sep 2016 09:51:31 +0000
 Subject: [PATCH] Convert new health to a float during set
diff --git a/Spigot-Server-Patches/0170-Fix-AIOOBE-in-inventory-handling.patch b/Spigot-Server-Patches/0169-Fix-AIOOBE-in-inventory-handling.patch
similarity index 85%
rename from Spigot-Server-Patches/0170-Fix-AIOOBE-in-inventory-handling.patch
rename to Spigot-Server-Patches/0169-Fix-AIOOBE-in-inventory-handling.patch
index b43d34a21f..e4a1a8a761 100644
--- a/Spigot-Server-Patches/0170-Fix-AIOOBE-in-inventory-handling.patch
+++ b/Spigot-Server-Patches/0169-Fix-AIOOBE-in-inventory-handling.patch
@@ -1,14 +1,14 @@
-From e213810b08430378c89b236a2bb3378603f79a0e Mon Sep 17 00:00:00 2001
+From 0dfc95c05231450a8acec2d8d53c6e8c492b3b63 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Sun, 4 Sep 2016 16:35:43 -0500
 Subject: [PATCH] Fix AIOOBE in inventory handling
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 882d82a..c9787ff 100644
+index 90f2247..3d04119 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1816,7 +1816,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1815,7 +1815,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                      case CLONE:
                          if (packetplayinwindowclick.c() == 2) {
                              click = ClickType.MIDDLE;
diff --git a/Spigot-Server-Patches/0170-Rate-limit-PacketPlayInUseItem.patch b/Spigot-Server-Patches/0170-Rate-limit-PacketPlayInUseItem.patch
new file mode 100644
index 0000000000..dcec25f768
--- /dev/null
+++ b/Spigot-Server-Patches/0170-Rate-limit-PacketPlayInUseItem.patch
@@ -0,0 +1,78 @@
+From a0ec9a7743d2349b280cd1d91559a659e61e7b08 Mon Sep 17 00:00:00 2001
+From: Zach Brown <zach.brown@destroystokyo.com>
+Date: Sat, 10 Sep 2016 21:40:51 -0500
+Subject: [PATCH] Rate limit PacketPlayInUseItem
+
+
+diff --git a/src/main/java/net/minecraft/server/PacketPlayInUseItem.java b/src/main/java/net/minecraft/server/PacketPlayInUseItem.java
+index 82e09c1..88ac278 100644
+--- a/src/main/java/net/minecraft/server/PacketPlayInUseItem.java
++++ b/src/main/java/net/minecraft/server/PacketPlayInUseItem.java
+@@ -10,6 +10,7 @@ public class PacketPlayInUseItem implements Packet<PacketListenerPlayIn> {
+     private float d;
+     private float e;
+     private float f;
++    public long timestamp; // Paper - Used for rate limiting
+ 
+     public PacketPlayInUseItem() {}
+ 
+@@ -20,6 +21,7 @@ public class PacketPlayInUseItem implements Packet<PacketListenerPlayIn> {
+         this.d = (float) packetdataserializer.readUnsignedByte() / 16.0F;
+         this.e = (float) packetdataserializer.readUnsignedByte() / 16.0F;
+         this.f = (float) packetdataserializer.readUnsignedByte() / 16.0F;
++        this.timestamp = System.currentTimeMillis(); // Paper
+     }
+ 
+     public void b(PacketDataSerializer packetdataserializer) throws IOException {
+@@ -29,6 +31,7 @@ public class PacketPlayInUseItem implements Packet<PacketListenerPlayIn> {
+         packetdataserializer.writeByte((int) (this.d * 16.0F));
+         packetdataserializer.writeByte((int) (this.e * 16.0F));
+         packetdataserializer.writeByte((int) (this.f * 16.0F));
++        this.timestamp = System.currentTimeMillis(); // Paper
+     }
+ 
+     public void a(PacketListenerPlayIn packetlistenerplayin) {
+diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
+index 3d04119..1e01951 100644
+--- a/src/main/java/net/minecraft/server/PlayerConnection.java
++++ b/src/main/java/net/minecraft/server/PlayerConnection.java
+@@ -865,6 +865,10 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+         // CraftBukkit end
+     }
+ 
++    // Paper start - Rate limit UseItem as well, copied from Spigot implementation below in BlockPlace
++    private long lastPlaceUse = -1;
++    private int packetsUse = 0;
++    // Paper end
+     public void a(PacketPlayInUseItem packetplayinuseitem) {
+         PlayerConnectionUtils.ensureMainThread(packetplayinuseitem, this, this.player.x());
+         if (this.player.cj()) return; // CraftBukkit
+@@ -875,12 +879,24 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+         EnumDirection enumdirection = packetplayinuseitem.b();
+ 
+         this.player.resetIdleTimer();
++
++        // Paper start - Rate limit UseItem as well, copied from Spigot implementation below in BlockPlace
++        boolean throttled = false;
++        if (lastPlaceUse != -1 && packetplayinuseitem.timestamp - lastPlaceUse < 30 && packetsUse++ >= 4) {
++            throttled = true;
++        } else if (packetplayinuseitem.timestamp - lastPlaceUse >= 30 || lastPlaceUse == -1) {
++            lastPlaceUse = packetplayinuseitem.timestamp;
++            packetsUse = 0;
++        }
++        // Paper end
++        
+         if (blockposition.getY() >= this.minecraftServer.getMaxBuildHeight() - 1 && (enumdirection == EnumDirection.UP || blockposition.getY() >= this.minecraftServer.getMaxBuildHeight())) {
+             ChatMessage chatmessage = new ChatMessage("build.tooHigh", new Object[] { Integer.valueOf(this.minecraftServer.getMaxBuildHeight())});
+ 
+             chatmessage.getChatModifier().setColor(EnumChatFormat.RED);
+             this.player.playerConnection.sendPacket(new PacketPlayOutChat(chatmessage));
+-        } else if (this.teleportPos == null && this.player.e((double) blockposition.getX() + 0.5D, (double) blockposition.getY() + 0.5D, (double) blockposition.getZ() + 0.5D) < 64.0D && !this.minecraftServer.a(worldserver, blockposition, this.player) && worldserver.getWorldBorder().a(blockposition)) {
++        // Paper - Ignore if throttled
++        } else if (!throttled && this.teleportPos == null && this.player.e((double) blockposition.getX() + 0.5D, (double) blockposition.getY() + 0.5D, (double) blockposition.getZ() + 0.5D) < 64.0D && !this.minecraftServer.a(worldserver, blockposition, this.player) && worldserver.getWorldBorder().a(blockposition)) {
+             // CraftBukkit start - Check if we can actually do something over this large a distance
+             Location eyeLoc = this.getPlayer().getEyeLocation();
+             double reachDistance = NumberConversions.square(eyeLoc.getX() - blockposition.getX()) + NumberConversions.square(eyeLoc.getY() - blockposition.getY()) + NumberConversions.square(eyeLoc.getZ() - blockposition.getZ());
+-- 
+2.10.0.windows.1
+
diff --git a/scripts/importmcdev.sh b/scripts/importmcdev.sh
index c4d6dd50de..2c07a45038 100755
--- a/scripts/importmcdev.sh
+++ b/scripts/importmcdev.sh
@@ -68,6 +68,7 @@ import NBTTagCompound
 import NBTTagList
 import PersistentScoreboard
 import PacketPlayInUseEntity
+import PacketPlayInUseItem
 import PacketPlayOutPlayerListHeaderFooter
 import PacketPlayOutScoreboardTeam
 import PacketPlayOutTitle