From d8c81d20d8c16cd66754688c04cb31a9f6c25113 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Wed, 10 Jan 2018 23:31:19 -0600
Subject: [PATCH] Update upstream B/CB/S

---
 Spigot-Server-Patches/0003-MC-Dev-fixes.patch | 17 +-------
 Spigot-Server-Patches/0006-Timings-v2.patch   | 14 +++----
 ...tus-and-reed-natural-growth-heights.patch} | 18 ++++-----
 ...0007-Configurable-squid-spawn-ranges.patch | 39 -------------------
 ...igurable-baby-zombie-movement-speed.patch} | 10 ++---
 ...09-Configurable-fishing-time-ranges.patch} | 10 ++---
 ...h => 0010-Allow-nerfed-mobs-to-jump.patch} | 12 +++---
 ...despawn-distances-for-living-entiti.patch} | 10 ++---
 ...-Allow-for-toggling-of-spawn-chunks.patch} | 10 ++---
 ...k-and-tnt-entities-at-the-specified.patch} | 12 +++---
 ...e-speed-for-water-flowing-over-lava.patch} | 10 ++---
 ...ent-crashes-server-lists-and-Mojang.patch} |  6 +--
 ...=> 0016-Player-affects-spawning-API.patch} | 16 ++++----
 ...e-invalid-mob-spawner-tile-entities.patch} |  6 +--
 ...=> 0018-Optimize-TileEntity-Ticking.patch} |  8 ++--
 ...19-Further-improve-server-tick-loop.patch} |  6 +--
 ...20-Only-refresh-abilities-if-needed.patch} |  6 +--
 ...ch => 0021-Add-async-chunk-load-API.patch} |  6 +--
 ...API.patch => 0022-Entity-Origin-API.patch} | 16 ++++----
 ...vent-tile-entity-and-entity-crashes.patch} |  8 ++--
 ...figurable-top-of-nether-void-damage.patch} | 10 ++---
 ...-before-converting-and-renaming-pla.patch} |  6 +--
 ... => 0026-Always-tick-falling-blocks.patch} |  6 +--
 ...-Queue.patch => 0027-Lighting-Queue.patch} |  8 ++--
 ...ch => 0028-Configurable-end-credits.patch} | 10 ++---
 ...explosions-processing-dead-entities.patch} |  6 +--
 ...gs.patch => 0030-Generator-Settings.patch} | 20 +++++-----
 ...s.patch => 0031-Optimize-explosions.patch} | 14 +++----
 ...owing-block-if-material-has-changed.patch} |  6 +--
 ...raining.patch => 0033-Fast-draining.patch} | 10 ++---
 ...> 0034-Configurable-lava-flow-speed.patch} | 12 +++---
 ...> 0035-Add-player-view-distance-API.patch} | 10 ++---
 ...=> 0036-Disable-explosion-knockback.patch} | 10 ++---
 ...under.patch => 0037-Disable-thunder.patch} | 10 ++---
 ....patch => 0038-Disable-ice-and-snow.patch} | 10 ++---
 ...-Configurable-mob-spawner-tick-rate.patch} | 10 ++---
 ...ition-the-first-time-an-entity-is-s.patch} |  6 +--
 ...patch => 0041-Add-BeaconEffectEvent.patch} |  6 +--
 ...igurable-container-update-tick-rate.patch} | 10 ++---
 ...0043-Use-UserCache-for-player-heads.patch} |  6 +--
 ...> 0044-Disable-spigot-tick-limiters.patch} |  6 +--
 ...igurable-Chunk-IO-Thread-Base-Count.patch} |  8 ++--
 ...=> 0046-Add-PlayerInitialSpawnEvent.patch} |  6 +--
 ...=> 0047-Disable-chest-cat-detection.patch} | 10 ++---
 ...8-Ensure-commands-are-not-ran-async.patch} |  6 +--
 ...hunks-are-slime-spawn-chunks-toggle.patch} | 10 ++---
 ....patch => 0050-Optimize-Pathfinding.patch} |  6 +--
 ...pper-searches-if-there-are-no-items.patch} |  4 +-
 ...ch => 0052-Expose-server-CommandMap.patch} |  6 +--
 ...-informative-in-maxHealth-exception.patch} |  6 +--
 ...0054-Player-Tab-List-and-Title-APIs.patch} | 10 ++---
 ...> 0055-Ensure-inv-drag-is-in-bounds.patch} |  6 +--
 ...ntation-of-tile-entity-removal-list.patch} |  8 ++--
 ...d-configurable-portal-search-radius.patch} | 12 +++---
 ...patch => 0058-Add-velocity-warnings.patch} |  6 +--
 ...-inter-world-teleportation-glitches.patch} | 10 ++---
 ... 0060-Add-exception-reporting-event.patch} |  4 +-
 ...don-t-need-to-when-cerealising-text.patch} |  6 +--
 ...reboards-for-non-players-by-default.patch} | 10 ++---
 ...orking-with-arrows-stuck-in-living-.patch} |  6 +--
 ... => 0064-Complete-resource-pack-API.patch} |  8 ++--
 ... 0065-Chunk-save-queue-improvements.patch} | 10 ++---
 ....patch => 0066-Chunk-Save-Reattempt.patch} |  8 ++--
 ...ding-permissions.yml-before-plugins.patch} |  6 +--
 ...low-Reloading-of-Custom-Permissions.patch} |  6 +--
 ...h => 0069-Remove-Metadata-on-reload.patch} |  6 +--
 ...patch => 0070-Undead-horse-leashing.patch} | 10 ++---
 ...h => 0071-Fix-Furnace-cook-time-bug.patch} |  6 +--
 ...72-Handle-Item-Meta-Inconsistencies.patch} | 12 +++---
 ...rable-Non-Player-Arrow-Despawn-Rate.patch} | 10 ++---
 ...atch => 0074-Add-World-Util-Methods.patch} |  4 +-
 ...5-Optimized-Light-Level-Comparisons.patch} | 16 ++++----
 ...0076-Pass-world-to-Village-creation.patch} |  8 ++--
 ...-Custom-replacement-for-eaten-items.patch} |  4 +-
 ...h-absorb-values-and-repair-bad-data.patch} |  8 ++--
 ...tch-Async-PlayerChunkMap-operations.patch} |  6 +--
 ...e-mode-in-whitelist-command-as-well.patch} |  6 +--
 ...ch => 0081-Waving-banner-workaround.patch} |  4 +-
 ...82-Use-a-Shared-Random-for-Entities.patch} |  4 +-
 ...> 0083-Don-t-teleport-dead-entities.patch} |  4 +-
 ...patch => 0084-Optimize-Chunk-Access.patch} |  6 +--
 ...e-spawn-chances-for-skeleton-horses.patch} | 10 ++---
 ...ocation-getType-and-getBlockData-fo.patch} | 14 +++----
 ... 0087-Fix-cooked-fish-legacy-import.patch} |  4 +-
 ... 0088-Access-items-by-EquipmentSlot.patch} |  6 +--
 ...eck-async-remove-unused-vars-GH-159.patch} |  4 +-
 ...able-BlockPhysicsEvent-for-Redstone.patch} | 12 +++---
 ...ntity-AddTo-RemoveFrom-World-Events.patch} |  6 +--
 ...-Configurable-Chunk-Inhabited-Timer.patch} |  8 ++--
 ...t.patch => 0093-EntityPathfindEvent.patch} |  4 +-
 ...-BlockFromToEvent-from-loading-chun.patch} |  4 +-
 ...ce-IO-ops-opening-a-new-region-file.patch} |  4 +-
 ...gionFileCache-and-make-configurable.patch} |  4 +-
 ...h => 0097-Use-Optimized-Collections.patch} |  6 +--
 ...Do-not-load-chunks-for-light-checks.patch} |  6 +--
 ...099-Add-PlayerUseUnknownEntityEvent.patch} |  6 +--
 ...DebugInfo-not-initialized-on-client.patch} |  6 +--
 ...Configurable-Grass-Spread-Tick-Rate.patch} |  8 ++--
 ...e-Keep-Spawn-Loaded-range-per-world.patch} | 16 ++++----
 ...-BlockPlaceEvent-triggering-physics.patch} |  6 +--
 ...m-reload-spawn-chunks-in-nether-end.patch} |  8 ++--
 ...5-Remove-Debug-checks-from-DataBits.patch} |  4 +-
 ...illa-per-world-scoreboard-coloring-.patch} | 10 ++---
 ...d-for-setting-passengers-on-players.patch} |  6 +--
 ...emove-unused-World-Tile-Entity-List.patch} |  6 +--
 ... 0109-Don-t-tick-Skulls-unused-code.patch} |  6 +--
 ... 0110-Configurable-Player-Collision.patch} | 18 ++++-----
 ...nt-to-allow-plugins-to-handle-clien.patch} |  6 +--
 ...mobs-should-only-spawn-in-the-water.patch} |  4 +-
 ...ix-Bugs-with-Spigot-Mob-Spawn-Logic.patch} |  4 +-
 ...> 0114-Configurable-RCON-IP-address.patch} |  4 +-
 ...15-Prevent-Fire-from-loading-chunks.patch} |  4 +-
 ...6-Implement-PlayerLocaleChangeEvent.patch} |  8 ++--
 ...tyRegainHealthEvent-isFastRegen-API.patch} |  6 +--
 ...to-configure-frosted_ice-properties.patch} |  8 ++--
 ...-Vehicle-Event-Cancellation-Changes.patch} |  4 +-
 ...dispenser-dropper-furnace-placement.patch} |  4 +-
 ...mprove-Minecraft-Hopper-Performance.patch} |  8 ++--
 ...possibility-for-getServer-singleton.patch} |  6 +--
 ...tem-frames-performance-and-bug-fixe.patch} | 14 +++----
 ...API-Replenishable-Lootables-Feature.patch} | 36 ++++++++---------
 ...-Do-not-load-chunks-for-pathfinding.patch} |  4 +-
 ...> 0126-Entity-Tracking-Improvements.patch} |  6 +--
 ...-scoreboard-teams-to-scoreboard.dat.patch} |  4 +-
 ...unks-as-active-for-neighbor-updates.patch} |  4 +-
 ... 0129-Fix-Chunk-Unload-Queue-Issues.patch} |  8 ++--
 ...em-property-for-disabling-watchdoge.patch} |  4 +-
 ...mize-EAR.patch => 0131-Optimize-EAR.patch} |  4 +-
 ...0132-Optimize-UserCache-Thread-Safe.patch} |  8 ++--
 ...locking-on-Network-Manager-creation.patch} |  6 +--
 ...-Optional-TNT-doesn-t-move-in-water.patch} | 10 ++---
 ...-redstone-torch-rapid-clock-removal.patch} |  4 +-
 ...Ensure-Chunks-never-ever-load-async.patch} |  8 ++--
 ...h => 0137-Add-server-name-parameter.patch} |  6 +--
 ...n-Wither-Death-sounds-to-same-world.patch} |  4 +-
 ...FallingBlocks-being-stuck-on-fences.patch} | 10 ++---
 ...0140-Make-entities-look-for-hoppers.patch} | 24 ++++++------
 ...nk-Unloads-based-on-Player-Movement.patch} | 18 ++++-----
 ... 0142-Toggleable-Elytra-Wall-Damage.patch} |  8 ++--
 ...=> 0143-Fix-Double-World-Add-issues.patch} |  8 ++--
 ...tch => 0144-Fix-Old-Sign-Conversion.patch} | 10 ++---
 ...-profiles-that-have-no-UUID-and-no-.patch} |  4 +-
 ...ative-vehicle-moved-wrongly-message.patch} |  6 +--
 ...rs-that-dismount-from-other-players.patch} |  6 +--
 ...etting-for-proxy-online-mode-status.patch} |  6 +--
 ...-BlockStateEnum-hashCode-and-equals.patch} | 26 ++++++++-----
 ...0150-Disable-ticking-of-snow-blocks.patch} |  4 +-
 ...51-Fix-AIOOBE-in-inventory-handling.patch} |  4 +-
 ...nfigurable-packet-in-spam-threshold.patch} |  8 ++--
 ...3-Configurable-flying-kick-messages.patch} |  8 ++--
 ...atch => 0154-Auto-Save-Improvements.patch} | 12 +++---
 ...ch => 0155-Chunk-registration-fixes.patch} |  6 +--
 ...k-reference-on-Craft-Entity-removal.patch} |  6 +--
 ...to-fix-bad-Y-levels-on-player-login.patch} |  6 +--
 ...ring-limit-for-packet-serialization.patch} |  4 +-
 ...ch => 0159-Disable-Vanilla-Chunk-GC.patch} |  6 +--
 ...ion-to-remove-corrupt-tile-entities.patch} |  8 ++--
 ...nt.patch => 0161-Add-EntityZapEvent.patch} | 10 ++---
 ...hunks-from-Hoppers-and-other-things.patch} |  6 +--
 ...ent-Auto-Save-if-Save-Queue-is-full.patch} | 12 +++---
 ... 0164-Chunk-Save-Stats-Debug-Option.patch} |  8 ++--
 ...-from-ArmorStand-and-SpawnEgg-items.patch} | 12 +++---
 ...66-Cache-user-authenticator-threads.patch} |  4 +-
 ...atch => 0167-Optimize-Network-Queue.patch} |  6 +--
 ....patch => 0168-Optimise-removeQueue.patch} |  6 +--
 ...-Allow-Reloading-of-Command-Aliases.patch} |  6 +--
 ...-Add-source-to-PlayerExpChangeEvent.patch} |  8 ++--
 ...mize-World.isLoaded-BlockPosition-Z.patch} |  6 +--
 ...Speedup-BlockPos-by-fixing-inlining.patch} |  8 ++--
 ...-Don-t-let-fishinghooks-use-portals.patch} |  8 ++--
 ... => 0174-Add-ProjectileCollideEvent.patch} | 14 +++----
 ...-Vanished-players-don-t-have-rights.patch} | 12 +++---
 ...ent-Pathfinding-out-of-World-Border.patch} |  8 ++--
 ...Bound-Treasure-Maps-to-World-Border.patch} |  8 ++--
 ...igurable-Cartographer-Treasure-Maps.patch} |  8 ++--
 ... => 0179-Optimize-ItemStack.isEmpty.patch} |  6 +--
 ...o-control-if-armour-stands-can-move.patch} |  6 +--
 ...-armor-stands-from-doing-entity-loo.patch} | 10 ++---
 ...option-to-remove-invalid-statistics.patch} |  8 ++--
 ...nt.patch => 0183-IllegalPacketEvent.patch} |  4 +-
 ...4-Properly-fix-item-duplication-bug.patch} |  6 +--
 ...=> 0185-String-based-Action-Bar-API.patch} |  8 ++--
 ... 0186-Activation-Range-Improvements.patch} |  4 +-
 ...-API-s.patch => 0187-Firework-API-s.patch} | 12 +++---
 ... 0188-PlayerTeleportEndGatewayEvent.patch} |  6 +--
 ... => 0189-ShulkerBox-Dupe-Prevention.patch} |  6 +--
 ...ovide-E-TE-Chunk-count-stat-methods.patch} |  6 +--
 ...h => 0191-Enforce-Sync-Player-Saves.patch} | 10 ++---
 ... => 0192-Enforce-Sync-Chunk-Unloads.patch} |  6 +--
 ...low-entities-to-ride-themselves-572.patch} |  4 +-
 ...atch => 0194-Fix-block-break-desync.patch} |  6 +--
 ...ign-the-World-in-WorldGenStronghold.patch} |  6 +--
 ...I-for-Reason-Source-Triggering-play.patch} | 28 ++++++-------
 ...-Remove-the-Vanilla-Method-Profiler.patch} |  8 ++--
 ...patch => 0198-Cap-Entity-Collisions.patch} | 12 +++---
 ...ow-a-zero-max-height-in-BiomeJungle.patch} |  8 ++--
 ...-CraftScheduler-Async-Task-Debugger.patch} |  6 +--
 ...g.patch => 0201-Shame-on-you-Mojang.patch} |  6 +--
 ...ore-aggressive-in-the-chunk-unload-.patch} |  6 +--
 ...> 0203-Do-not-let-armorstands-drown.patch} |  6 +--
 ...-attempting-to-read-EMPTY-ItemStack.patch} |  6 +--
 ...e-async-calls-to-restart-the-server.patch} | 14 +++----
 ...roperty-to-disable-book-size-limits.patch} |  6 +--
 ...e-parrots-stay-on-shoulders-despite.patch} | 10 ++---
 ...-option-to-prevent-player-names-fro.patch} |  6 +--
 ...leAppender-for-console-improvements.patch} | 10 ++---
 ...rable-option-to-disable-creeper-lin.patch} | 10 ++---
 ....patch => 0211-Item-canEntityPickup.patch} | 10 ++---
 ...layerPickupItemEvent-setFlyAtPlayer.patch} |  6 +--
 ...> 0213-PlayerAttemptPickupItemEvent.patch} |  4 +-
 ...tch => 0214-Add-UnknownCommandEvent.patch} |  6 +--
 ... 0215-Shoulder-Entities-Release-API.patch} |  8 ++--
 ...patch => 0216-Profile-Lookup-Events.patch} |  6 +--
 ...layer-logins-during-server-shutdown.patch} |  6 +--
 ...patch => 0218-Entity-fromMobSpawner.patch} |  8 ++--
 ...0219-Fix-Anvil-Level-sync-to-client.patch} |  8 ++--
 ...ages-for-getTileEntity-in-order-to-.patch} |  6 +--
 ...-Player-Sample-in-ServerListPingEve.patch} |  6 +--
 ...2-Improve-the-Saddle-API-for-Horses.patch} | 10 ++---
 ...plement-ensureServerConversions-API.patch} |  6 +--
 ...> 0224-Implement-getI18NDisplayName.patch} |  6 +--
 ...ving-disabled-before-unloading-all-.patch} |  6 +--
 ...=> 0226-ProfileWhitelistVerifyEvent.patch} | 10 ++---
 ...ch => 0227-Fix-this-stupid-bullshit.patch} |  6 +--
 ...wns-should-honor-nametags-and-leash.patch} |  6 +--
 ...mer-when-spawner-event-is-cancelled.patch} |  6 +--
 ...x-dragon-egg-falling-in-lazy-chunks.patch} |  6 +--
 ...1-Fix-MC-117075-TE-Unload-Lag-Spike.patch} |  6 +--
 ...a-custom-authentication-servers-dow.patch} |  8 ++--
 ...atch => 0233-LivingEntity-setKiller.patch} |  6 +--
 ...E-during-CraftBlockEntityState-load.patch} |  8 ++--
 ...6-Anti-Xray.patch => 0235-Anti-Xray.patch} |  8 ++--
 ...ms-to-redirect-System.out-err-to-lo.patch} |  8 ++--
 ...-prefixes-using-Log4J-configuration.patch} | 10 ++---
 ...Include-Log4J2-SLF4J-implementation.patch} |  6 +--
 ...efix-for-various-plugins-bypassing-.patch} |  6 +--
 ...t.patch => 0240-Add-PlayerJumpEvent.patch} |  8 ++--
 ...-handle-PacketPlayInKeepAlive-async.patch} |  4 +-
 ...t-protocol-version-and-virtual-host.patch} | 14 +++----
 ...t-serverside-behavior-of-keepalives.patch} |  6 +--
 ...ith-fastutil-s-ObjectOpenHashSet-in.patch} |  6 +--
 ...Effects-only-to-players-who-can-see.patch} |  8 ++--
 ...maximum-exp-value-when-merging-orbs.patch} | 10 ++---
 ... => 0247-Add-PlayerArmorChangeEvent.patch} |  8 ++--
 ...=> 0248-Improve-Structures-Checking.patch} | 12 +++---
 ...om-being-processed-when-the-player-.patch} |  6 +--
 ...-implementations-for-captured-block.patch} |  6 +--
 ...get-a-BlockState-without-a-snapshot.patch} | 10 ++---
 ...2-Do-not-use-a-snapshot-for-hoppers.patch} |  6 +--
 ...patch => 0253-AsyncTabCompleteEvent.patch} |  6 +--
 ...54-Avoid-NPE-in-PathfinderGoalTempt.patch} |  6 +--
 ...d-unlit-chunks-when-lighting-update.patch} |  4 +-
 ...=> 0256-PlayerPickupExperienceEvent.patch} |  6 +--
 ...tch => 0257-ExperienceOrbMergeEvent.patch} |  6 +--
 ...-Ability-to-apply-mending-to-XP-API.patch} | 14 +++----
 ...rable-Chunks-Sends-per-Tick-setting.patch} | 10 ++---
 ...onfigurable-Max-Chunk-Gens-per-Tick.patch} | 16 ++++----
 work/Bukkit                                   |  2 +-
 work/CraftBukkit                              |  2 +-
 work/Spigot                                   |  2 +-
 260 files changed, 1026 insertions(+), 1070 deletions(-)
 rename Spigot-Server-Patches/{0008-Configurable-cactus-and-reed-natural-growth-heights.patch => 0007-Configurable-cactus-and-reed-natural-growth-heights.patch} (82%)
 delete mode 100644 Spigot-Server-Patches/0007-Configurable-squid-spawn-ranges.patch
 rename Spigot-Server-Patches/{0009-Configurable-baby-zombie-movement-speed.patch => 0008-Configurable-baby-zombie-movement-speed.patch} (93%)
 rename Spigot-Server-Patches/{0010-Configurable-fishing-time-ranges.patch => 0009-Configurable-fishing-time-ranges.patch} (89%)
 rename Spigot-Server-Patches/{0011-Allow-nerfed-mobs-to-jump.patch => 0010-Allow-nerfed-mobs-to-jump.patch} (93%)
 rename Spigot-Server-Patches/{0012-Add-configurable-despawn-distances-for-living-entiti.patch => 0011-Add-configurable-despawn-distances-for-living-entiti.patch} (93%)
 rename Spigot-Server-Patches/{0013-Allow-for-toggling-of-spawn-chunks.patch => 0012-Allow-for-toggling-of-spawn-chunks.patch} (88%)
 rename Spigot-Server-Patches/{0014-Drop-falling-block-and-tnt-entities-at-the-specified.patch => 0013-Drop-falling-block-and-tnt-entities-at-the-specified.patch} (93%)
 rename Spigot-Server-Patches/{0015-Configurable-speed-for-water-flowing-over-lava.patch => 0014-Configurable-speed-for-water-flowing-over-lava.patch} (92%)
 rename Spigot-Server-Patches/{0016-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch => 0015-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch} (97%)
 rename Spigot-Server-Patches/{0017-Player-affects-spawning-API.patch => 0016-Player-affects-spawning-API.patch} (93%)
 rename Spigot-Server-Patches/{0018-Remove-invalid-mob-spawner-tile-entities.patch => 0017-Remove-invalid-mob-spawner-tile-entities.patch} (92%)
 rename Spigot-Server-Patches/{0019-Optimize-TileEntity-Ticking.patch => 0018-Optimize-TileEntity-Ticking.patch} (98%)
 rename Spigot-Server-Patches/{0020-Further-improve-server-tick-loop.patch => 0019-Further-improve-server-tick-loop.patch} (98%)
 rename Spigot-Server-Patches/{0021-Only-refresh-abilities-if-needed.patch => 0020-Only-refresh-abilities-if-needed.patch} (91%)
 rename Spigot-Server-Patches/{0022-Add-async-chunk-load-API.patch => 0021-Add-async-chunk-load-API.patch} (92%)
 rename Spigot-Server-Patches/{0023-Entity-Origin-API.patch => 0022-Entity-Origin-API.patch} (95%)
 rename Spigot-Server-Patches/{0024-Prevent-tile-entity-and-entity-crashes.patch => 0023-Prevent-tile-entity-and-entity-crashes.patch} (96%)
 rename Spigot-Server-Patches/{0025-Configurable-top-of-nether-void-damage.patch => 0024-Configurable-top-of-nether-void-damage.patch} (93%)
 rename Spigot-Server-Patches/{0026-Check-online-mode-before-converting-and-renaming-pla.patch => 0025-Check-online-mode-before-converting-and-renaming-pla.patch} (90%)
 rename Spigot-Server-Patches/{0027-Always-tick-falling-blocks.patch => 0026-Always-tick-falling-blocks.patch} (91%)
 rename Spigot-Server-Patches/{0028-Lighting-Queue.patch => 0027-Lighting-Queue.patch} (98%)
 rename Spigot-Server-Patches/{0029-Configurable-end-credits.patch => 0028-Configurable-end-credits.patch} (91%)
 rename Spigot-Server-Patches/{0030-Fix-lag-from-explosions-processing-dead-entities.patch => 0029-Fix-lag-from-explosions-processing-dead-entities.patch} (93%)
 rename Spigot-Server-Patches/{0031-Generator-Settings.patch => 0030-Generator-Settings.patch} (96%)
 rename Spigot-Server-Patches/{0032-Optimize-explosions.patch => 0031-Optimize-explosions.patch} (96%)
 rename Spigot-Server-Patches/{0033-Stop-updating-flowing-block-if-material-has-changed.patch => 0032-Stop-updating-flowing-block-if-material-has-changed.patch} (89%)
 rename Spigot-Server-Patches/{0034-Fast-draining.patch => 0033-Fast-draining.patch} (96%)
 rename Spigot-Server-Patches/{0035-Configurable-lava-flow-speed.patch => 0034-Configurable-lava-flow-speed.patch} (90%)
 rename Spigot-Server-Patches/{0036-Add-player-view-distance-API.patch => 0035-Add-player-view-distance-API.patch} (98%)
 rename Spigot-Server-Patches/{0037-Disable-explosion-knockback.patch => 0036-Disable-explosion-knockback.patch} (94%)
 rename Spigot-Server-Patches/{0038-Disable-thunder.patch => 0037-Disable-thunder.patch} (88%)
 rename Spigot-Server-Patches/{0039-Disable-ice-and-snow.patch => 0038-Disable-ice-and-snow.patch} (88%)
 rename Spigot-Server-Patches/{0040-Configurable-mob-spawner-tick-rate.patch => 0039-Configurable-mob-spawner-tick-rate.patch} (92%)
 rename Spigot-Server-Patches/{0041-Send-absolute-position-the-first-time-an-entity-is-s.patch => 0040-Send-absolute-position-the-first-time-an-entity-is-s.patch} (97%)
 rename Spigot-Server-Patches/{0042-Add-BeaconEffectEvent.patch => 0041-Add-BeaconEffectEvent.patch} (96%)
 rename Spigot-Server-Patches/{0043-Configurable-container-update-tick-rate.patch => 0042-Configurable-container-update-tick-rate.patch} (90%)
 rename Spigot-Server-Patches/{0044-Use-UserCache-for-player-heads.patch => 0043-Use-UserCache-for-player-heads.patch} (92%)
 rename Spigot-Server-Patches/{0045-Disable-spigot-tick-limiters.patch => 0044-Disable-spigot-tick-limiters.patch} (95%)
 rename Spigot-Server-Patches/{0046-Configurable-Chunk-IO-Thread-Base-Count.patch => 0045-Configurable-Chunk-IO-Thread-Base-Count.patch} (93%)
 rename Spigot-Server-Patches/{0047-Add-PlayerInitialSpawnEvent.patch => 0046-Add-PlayerInitialSpawnEvent.patch} (94%)
 rename Spigot-Server-Patches/{0048-Disable-chest-cat-detection.patch => 0047-Disable-chest-cat-detection.patch} (88%)
 rename Spigot-Server-Patches/{0049-Ensure-commands-are-not-ran-async.patch => 0048-Ensure-commands-are-not-ran-async.patch} (97%)
 rename Spigot-Server-Patches/{0050-All-chunks-are-slime-spawn-chunks-toggle.patch => 0049-All-chunks-are-slime-spawn-chunks-toggle.patch} (90%)
 rename Spigot-Server-Patches/{0051-Optimize-Pathfinding.patch => 0050-Optimize-Pathfinding.patch} (94%)
 rename Spigot-Server-Patches/{0052-Avoid-hopper-searches-if-there-are-no-items.patch => 0051-Avoid-hopper-searches-if-there-are-no-items.patch} (98%)
 rename Spigot-Server-Patches/{0053-Expose-server-CommandMap.patch => 0052-Expose-server-CommandMap.patch} (84%)
 rename Spigot-Server-Patches/{0054-Be-a-bit-more-informative-in-maxHealth-exception.patch => 0053-Be-a-bit-more-informative-in-maxHealth-exception.patch} (91%)
 rename Spigot-Server-Patches/{0055-Player-Tab-List-and-Title-APIs.patch => 0054-Player-Tab-List-and-Title-APIs.patch} (97%)
 rename Spigot-Server-Patches/{0056-Ensure-inv-drag-is-in-bounds.patch => 0055-Ensure-inv-drag-is-in-bounds.patch} (89%)
 rename Spigot-Server-Patches/{0057-Change-implementation-of-tile-entity-removal-list.patch => 0056-Change-implementation-of-tile-entity-removal-list.patch} (96%)
 rename Spigot-Server-Patches/{0058-Add-configurable-portal-search-radius.patch => 0057-Add-configurable-portal-search-radius.patch} (91%)
 rename Spigot-Server-Patches/{0059-Add-velocity-warnings.patch => 0058-Add-velocity-warnings.patch} (97%)
 rename Spigot-Server-Patches/{0060-Fix-inter-world-teleportation-glitches.patch => 0059-Fix-inter-world-teleportation-glitches.patch} (92%)
 rename Spigot-Server-Patches/{0061-Add-exception-reporting-event.patch => 0060-Add-exception-reporting-event.patch} (99%)
 rename Spigot-Server-Patches/{0062-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch => 0061-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch} (92%)
 rename Spigot-Server-Patches/{0063-Disable-Scoreboards-for-non-players-by-default.patch => 0062-Disable-Scoreboards-for-non-players-by-default.patch} (91%)
 rename Spigot-Server-Patches/{0064-Add-methods-for-working-with-arrows-stuck-in-living-.patch => 0063-Add-methods-for-working-with-arrows-stuck-in-living-.patch} (88%)
 rename Spigot-Server-Patches/{0065-Complete-resource-pack-API.patch => 0064-Complete-resource-pack-API.patch} (96%)
 rename Spigot-Server-Patches/{0066-Chunk-save-queue-improvements.patch => 0065-Chunk-save-queue-improvements.patch} (97%)
 rename Spigot-Server-Patches/{0067-Chunk-Save-Reattempt.patch => 0066-Chunk-Save-Reattempt.patch} (94%)
 rename Spigot-Server-Patches/{0068-Default-loading-permissions.yml-before-plugins.patch => 0067-Default-loading-permissions.yml-before-plugins.patch} (95%)
 rename Spigot-Server-Patches/{0069-Allow-Reloading-of-Custom-Permissions.patch => 0068-Allow-Reloading-of-Custom-Permissions.patch} (91%)
 rename Spigot-Server-Patches/{0070-Remove-Metadata-on-reload.patch => 0069-Remove-Metadata-on-reload.patch} (91%)
 rename Spigot-Server-Patches/{0071-Undead-horse-leashing.patch => 0070-Undead-horse-leashing.patch} (89%)
 rename Spigot-Server-Patches/{0072-Fix-Furnace-cook-time-bug.patch => 0071-Fix-Furnace-cook-time-bug.patch} (90%)
 rename Spigot-Server-Patches/{0073-Handle-Item-Meta-Inconsistencies.patch => 0072-Handle-Item-Meta-Inconsistencies.patch} (98%)
 rename Spigot-Server-Patches/{0074-Configurable-Non-Player-Arrow-Despawn-Rate.patch => 0073-Configurable-Non-Player-Arrow-Despawn-Rate.patch} (89%)
 rename Spigot-Server-Patches/{0075-Add-World-Util-Methods.patch => 0074-Add-World-Util-Methods.patch} (98%)
 rename Spigot-Server-Patches/{0076-Optimized-Light-Level-Comparisons.patch => 0075-Optimized-Light-Level-Comparisons.patch} (96%)
 rename Spigot-Server-Patches/{0077-Pass-world-to-Village-creation.patch => 0076-Pass-world-to-Village-creation.patch} (90%)
 rename Spigot-Server-Patches/{0078-Custom-replacement-for-eaten-items.patch => 0077-Custom-replacement-for-eaten-items.patch} (95%)
 rename Spigot-Server-Patches/{0079-handle-NaN-health-absorb-values-and-repair-bad-data.patch => 0078-handle-NaN-health-absorb-values-and-repair-bad-data.patch} (94%)
 rename Spigot-Server-Patches/{0080-Catch-Async-PlayerChunkMap-operations.patch => 0079-Catch-Async-PlayerChunkMap-operations.patch} (89%)
 rename Spigot-Server-Patches/{0081-Support-offline-mode-in-whitelist-command-as-well.patch => 0080-Support-offline-mode-in-whitelist-command-as-well.patch} (97%)
 rename Spigot-Server-Patches/{0082-Waving-banner-workaround.patch => 0081-Waving-banner-workaround.patch} (93%)
 rename Spigot-Server-Patches/{0083-Use-a-Shared-Random-for-Entities.patch => 0082-Use-a-Shared-Random-for-Entities.patch} (92%)
 rename Spigot-Server-Patches/{0084-Don-t-teleport-dead-entities.patch => 0083-Don-t-teleport-dead-entities.patch} (90%)
 rename Spigot-Server-Patches/{0085-Optimize-Chunk-Access.patch => 0084-Optimize-Chunk-Access.patch} (94%)
 rename Spigot-Server-Patches/{0086-Configurable-spawn-chances-for-skeleton-horses.patch => 0085-Configurable-spawn-chances-for-skeleton-horses.patch} (89%)
 rename Spigot-Server-Patches/{0087-Optimize-isValidLocation-getType-and-getBlockData-fo.patch => 0086-Optimize-isValidLocation-getType-and-getBlockData-fo.patch} (97%)
 rename Spigot-Server-Patches/{0088-Fix-cooked-fish-legacy-import.patch => 0087-Fix-cooked-fish-legacy-import.patch} (93%)
 rename Spigot-Server-Patches/{0089-Access-items-by-EquipmentSlot.patch => 0088-Access-items-by-EquipmentSlot.patch} (95%)
 rename Spigot-Server-Patches/{0090-Check-async-remove-unused-vars-GH-159.patch => 0089-Check-async-remove-unused-vars-GH-159.patch} (95%)
 rename Spigot-Server-Patches/{0091-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch => 0090-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch} (94%)
 rename Spigot-Server-Patches/{0092-Entity-AddTo-RemoveFrom-World-Events.patch => 0091-Entity-AddTo-RemoveFrom-World-Events.patch} (90%)
 rename Spigot-Server-Patches/{0093-Configurable-Chunk-Inhabited-Timer.patch => 0092-Configurable-Chunk-Inhabited-Timer.patch} (89%)
 rename Spigot-Server-Patches/{0094-EntityPathfindEvent.patch => 0093-EntityPathfindEvent.patch} (95%)
 rename Spigot-Server-Patches/{0095-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch => 0094-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch} (97%)
 rename Spigot-Server-Patches/{0096-Reduce-IO-ops-opening-a-new-region-file.patch => 0095-Reduce-IO-ops-opening-a-new-region-file.patch} (95%)
 rename Spigot-Server-Patches/{0097-Sanitise-RegionFileCache-and-make-configurable.patch => 0096-Sanitise-RegionFileCache-and-make-configurable.patch} (97%)
 rename Spigot-Server-Patches/{0098-Use-Optimized-Collections.patch => 0097-Use-Optimized-Collections.patch} (94%)
 rename Spigot-Server-Patches/{0099-Do-not-load-chunks-for-light-checks.patch => 0098-Do-not-load-chunks-for-light-checks.patch} (88%)
 rename Spigot-Server-Patches/{0100-Add-PlayerUseUnknownEntityEvent.patch => 0099-Add-PlayerUseUnknownEntityEvent.patch} (92%)
 rename Spigot-Server-Patches/{0101-Fix-reducedDebugInfo-not-initialized-on-client.patch => 0100-Fix-reducedDebugInfo-not-initialized-on-client.patch} (91%)
 rename Spigot-Server-Patches/{0102-Configurable-Grass-Spread-Tick-Rate.patch => 0101-Configurable-Grass-Spread-Tick-Rate.patch} (91%)
 rename Spigot-Server-Patches/{0103-Configurable-Keep-Spawn-Loaded-range-per-world.patch => 0102-Configurable-Keep-Spawn-Loaded-range-per-world.patch} (93%)
 rename Spigot-Server-Patches/{0104-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch => 0103-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch} (87%)
 rename Spigot-Server-Patches/{0105-Don-t-spam-reload-spawn-chunks-in-nether-end.patch => 0104-Don-t-spam-reload-spawn-chunks-in-nether-end.patch} (89%)
 rename Spigot-Server-Patches/{0106-Remove-Debug-checks-from-DataBits.patch => 0105-Remove-Debug-checks-from-DataBits.patch} (95%)
 rename Spigot-Server-Patches/{0107-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch => 0106-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch} (92%)
 rename Spigot-Server-Patches/{0108-Workaround-for-setting-passengers-on-players.patch => 0107-Workaround-for-setting-passengers-on-players.patch} (91%)
 rename Spigot-Server-Patches/{0109-Remove-unused-World-Tile-Entity-List.patch => 0108-Remove-unused-World-Tile-Entity-List.patch} (97%)
 rename Spigot-Server-Patches/{0110-Don-t-tick-Skulls-unused-code.patch => 0109-Don-t-tick-Skulls-unused-code.patch} (87%)
 rename Spigot-Server-Patches/{0111-Configurable-Player-Collision.patch => 0110-Configurable-Player-Collision.patch} (94%)
 rename Spigot-Server-Patches/{0112-Add-handshake-event-to-allow-plugins-to-handle-clien.patch => 0111-Add-handshake-event-to-allow-plugins-to-handle-clien.patch} (96%)
 rename Spigot-Server-Patches/{0113-Water-mobs-should-only-spawn-in-the-water.patch => 0112-Water-mobs-should-only-spawn-in-the-water.patch} (93%)
 rename Spigot-Server-Patches/{0114-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch => 0113-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch} (97%)
 rename Spigot-Server-Patches/{0115-Configurable-RCON-IP-address.patch => 0114-Configurable-RCON-IP-address.patch} (92%)
 rename Spigot-Server-Patches/{0116-Prevent-Fire-from-loading-chunks.patch => 0115-Prevent-Fire-from-loading-chunks.patch} (96%)
 rename Spigot-Server-Patches/{0117-Implement-PlayerLocaleChangeEvent.patch => 0116-Implement-PlayerLocaleChangeEvent.patch} (96%)
 rename Spigot-Server-Patches/{0118-EntityRegainHealthEvent-isFastRegen-API.patch => 0117-EntityRegainHealthEvent-isFastRegen-API.patch} (94%)
 rename Spigot-Server-Patches/{0119-Add-ability-to-configure-frosted_ice-properties.patch => 0118-Add-ability-to-configure-frosted_ice-properties.patch} (93%)
 rename Spigot-Server-Patches/{0120-Vehicle-Event-Cancellation-Changes.patch => 0119-Vehicle-Event-Cancellation-Changes.patch} (95%)
 rename Spigot-Server-Patches/{0121-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch => 0120-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch} (97%)
 rename Spigot-Server-Patches/{0122-Improve-Minecraft-Hopper-Performance.patch => 0121-Improve-Minecraft-Hopper-Performance.patch} (96%)
 rename Spigot-Server-Patches/{0123-remove-null-possibility-for-getServer-singleton.patch => 0122-remove-null-possibility-for-getServer-singleton.patch} (94%)
 rename Spigot-Server-Patches/{0124-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch => 0123-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch} (96%)
 rename Spigot-Server-Patches/{0125-LootTable-API-Replenishable-Lootables-Feature.patch => 0124-LootTable-API-Replenishable-Lootables-Feature.patch} (98%)
 rename Spigot-Server-Patches/{0126-Do-not-load-chunks-for-pathfinding.patch => 0125-Do-not-load-chunks-for-pathfinding.patch} (90%)
 rename Spigot-Server-Patches/{0127-Entity-Tracking-Improvements.patch => 0126-Entity-Tracking-Improvements.patch} (97%)
 rename Spigot-Server-Patches/{0128-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch => 0127-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch} (95%)
 rename Spigot-Server-Patches/{0129-Do-not-mark-chunks-as-active-for-neighbor-updates.patch => 0128-Do-not-mark-chunks-as-active-for-neighbor-updates.patch} (97%)
 rename Spigot-Server-Patches/{0130-Fix-Chunk-Unload-Queue-Issues.patch => 0129-Fix-Chunk-Unload-Queue-Issues.patch} (92%)
 rename Spigot-Server-Patches/{0131-System-property-for-disabling-watchdoge.patch => 0130-System-property-for-disabling-watchdoge.patch} (92%)
 rename Spigot-Server-Patches/{0132-Optimize-EAR.patch => 0131-Optimize-EAR.patch} (96%)
 rename Spigot-Server-Patches/{0133-Optimize-UserCache-Thread-Safe.patch => 0132-Optimize-UserCache-Thread-Safe.patch} (96%)
 rename Spigot-Server-Patches/{0134-Avoid-blocking-on-Network-Manager-creation.patch => 0133-Avoid-blocking-on-Network-Manager-creation.patch} (96%)
 rename Spigot-Server-Patches/{0135-Optional-TNT-doesn-t-move-in-water.patch => 0134-Optional-TNT-doesn-t-move-in-water.patch} (95%)
 rename Spigot-Server-Patches/{0136-Faster-redstone-torch-rapid-clock-removal.patch => 0135-Faster-redstone-torch-rapid-clock-removal.patch} (95%)
 rename Spigot-Server-Patches/{0137-Ensure-Chunks-never-ever-load-async.patch => 0136-Ensure-Chunks-never-ever-load-async.patch} (95%)
 rename Spigot-Server-Patches/{0138-Add-server-name-parameter.patch => 0137-Add-server-name-parameter.patch} (88%)
 rename Spigot-Server-Patches/{0139-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch => 0138-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch} (97%)
 rename Spigot-Server-Patches/{0140-Fix-FallingBlocks-being-stuck-on-fences.patch => 0139-Fix-FallingBlocks-being-stuck-on-fences.patch} (95%)
 rename Spigot-Server-Patches/{0141-Make-entities-look-for-hoppers.patch => 0140-Make-entities-look-for-hoppers.patch} (97%)
 rename Spigot-Server-Patches/{0142-Delay-Chunk-Unloads-based-on-Player-Movement.patch => 0141-Delay-Chunk-Unloads-based-on-Player-Movement.patch} (94%)
 rename Spigot-Server-Patches/{0143-Toggleable-Elytra-Wall-Damage.patch => 0142-Toggleable-Elytra-Wall-Damage.patch} (90%)
 rename Spigot-Server-Patches/{0144-Fix-Double-World-Add-issues.patch => 0143-Fix-Double-World-Add-issues.patch} (92%)
 rename Spigot-Server-Patches/{0145-Fix-Old-Sign-Conversion.patch => 0144-Fix-Old-Sign-Conversion.patch} (95%)
 rename Spigot-Server-Patches/{0146-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch => 0145-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch} (92%)
 rename Spigot-Server-Patches/{0147-More-informative-vehicle-moved-wrongly-message.patch => 0146-More-informative-vehicle-moved-wrongly-message.patch} (90%)
 rename Spigot-Server-Patches/{0148-Re-track-players-that-dismount-from-other-players.patch => 0147-Re-track-players-that-dismount-from-other-players.patch} (90%)
 rename Spigot-Server-Patches/{0149-Add-setting-for-proxy-online-mode-status.patch => 0148-Add-setting-for-proxy-online-mode-status.patch} (95%)
 rename Spigot-Server-Patches/{0150-Optimise-BlockStateEnum-hashCode-and-equals.patch => 0149-Optimise-BlockStateEnum-hashCode-and-equals.patch} (75%)
 rename Spigot-Server-Patches/{0151-Disable-ticking-of-snow-blocks.patch => 0150-Disable-ticking-of-snow-blocks.patch} (93%)
 rename Spigot-Server-Patches/{0152-Fix-AIOOBE-in-inventory-handling.patch => 0151-Fix-AIOOBE-in-inventory-handling.patch} (91%)
 rename Spigot-Server-Patches/{0153-Configurable-packet-in-spam-threshold.patch => 0152-Configurable-packet-in-spam-threshold.patch} (94%)
 rename Spigot-Server-Patches/{0154-Configurable-flying-kick-messages.patch => 0153-Configurable-flying-kick-messages.patch} (94%)
 rename Spigot-Server-Patches/{0155-Auto-Save-Improvements.patch => 0154-Auto-Save-Improvements.patch} (97%)
 rename Spigot-Server-Patches/{0156-Chunk-registration-fixes.patch => 0155-Chunk-registration-fixes.patch} (89%)
 rename Spigot-Server-Patches/{0157-Remove-FishingHook-reference-on-Craft-Entity-removal.patch => 0156-Remove-FishingHook-reference-on-Craft-Entity-removal.patch} (88%)
 rename Spigot-Server-Patches/{0158-Auto-fix-bad-Y-levels-on-player-login.patch => 0157-Auto-fix-bad-Y-levels-on-player-login.patch} (89%)
 rename Spigot-Server-Patches/{0159-Raise-string-limit-for-packet-serialization.patch => 0158-Raise-string-limit-for-packet-serialization.patch} (93%)
 rename Spigot-Server-Patches/{0160-Disable-Vanilla-Chunk-GC.patch => 0159-Disable-Vanilla-Chunk-GC.patch} (91%)
 rename Spigot-Server-Patches/{0161-Option-to-remove-corrupt-tile-entities.patch => 0160-Option-to-remove-corrupt-tile-entities.patch} (91%)
 rename Spigot-Server-Patches/{0162-Add-EntityZapEvent.patch => 0161-Add-EntityZapEvent.patch} (95%)
 rename Spigot-Server-Patches/{0163-Don-t-load-Chunks-from-Hoppers-and-other-things.patch => 0162-Don-t-load-Chunks-from-Hoppers-and-other-things.patch} (94%)
 rename Spigot-Server-Patches/{0164-Prevent-Auto-Save-if-Save-Queue-is-full.patch => 0163-Prevent-Auto-Save-if-Save-Queue-is-full.patch} (93%)
 rename Spigot-Server-Patches/{0165-Chunk-Save-Stats-Debug-Option.patch => 0164-Chunk-Save-Stats-Debug-Option.patch} (96%)
 rename Spigot-Server-Patches/{0166-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch => 0165-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch} (93%)
 rename Spigot-Server-Patches/{0167-Cache-user-authenticator-threads.patch => 0166-Cache-user-authenticator-threads.patch} (97%)
 rename Spigot-Server-Patches/{0168-Optimize-Network-Queue.patch => 0167-Optimize-Network-Queue.patch} (89%)
 rename Spigot-Server-Patches/{0169-Optimise-removeQueue.patch => 0168-Optimise-removeQueue.patch} (96%)
 rename Spigot-Server-Patches/{0170-Allow-Reloading-of-Command-Aliases.patch => 0169-Allow-Reloading-of-Command-Aliases.patch} (92%)
 rename Spigot-Server-Patches/{0171-Add-source-to-PlayerExpChangeEvent.patch => 0170-Add-source-to-PlayerExpChangeEvent.patch} (94%)
 rename Spigot-Server-Patches/{0172-Optimize-World.isLoaded-BlockPosition-Z.patch => 0171-Optimize-World.isLoaded-BlockPosition-Z.patch} (88%)
 rename Spigot-Server-Patches/{0173-Speedup-BlockPos-by-fixing-inlining.patch => 0172-Speedup-BlockPos-by-fixing-inlining.patch} (98%)
 rename Spigot-Server-Patches/{0174-Don-t-let-fishinghooks-use-portals.patch => 0173-Don-t-let-fishinghooks-use-portals.patch} (90%)
 rename Spigot-Server-Patches/{0175-Add-ProjectileCollideEvent.patch => 0174-Add-ProjectileCollideEvent.patch} (95%)
 rename Spigot-Server-Patches/{0176-Vanished-players-don-t-have-rights.patch => 0175-Vanished-players-don-t-have-rights.patch} (96%)
 rename Spigot-Server-Patches/{0177-Prevent-Pathfinding-out-of-World-Border.patch => 0176-Prevent-Pathfinding-out-of-World-Border.patch} (93%)
 rename Spigot-Server-Patches/{0178-Bound-Treasure-Maps-to-World-Border.patch => 0177-Bound-Treasure-Maps-to-World-Border.patch} (94%)
 rename Spigot-Server-Patches/{0179-Configurable-Cartographer-Treasure-Maps.patch => 0178-Configurable-Cartographer-Treasure-Maps.patch} (92%)
 rename Spigot-Server-Patches/{0180-Optimize-ItemStack.isEmpty.patch => 0179-Optimize-ItemStack.isEmpty.patch} (92%)
 rename Spigot-Server-Patches/{0181-Add-API-methods-to-control-if-armour-stands-can-move.patch => 0180-Add-API-methods-to-control-if-armour-stands-can-move.patch} (92%)
 rename Spigot-Server-Patches/{0182-Option-to-prevent-armor-stands-from-doing-entity-loo.patch => 0181-Option-to-prevent-armor-stands-from-doing-entity-loo.patch} (87%)
 rename Spigot-Server-Patches/{0183-Add-option-to-remove-invalid-statistics.patch => 0182-Add-option-to-remove-invalid-statistics.patch} (94%)
 rename Spigot-Server-Patches/{0184-IllegalPacketEvent.patch => 0183-IllegalPacketEvent.patch} (97%)
 rename Spigot-Server-Patches/{0185-Properly-fix-item-duplication-bug.patch => 0184-Properly-fix-item-duplication-bug.patch} (91%)
 rename Spigot-Server-Patches/{0186-String-based-Action-Bar-API.patch => 0185-String-based-Action-Bar-API.patch} (95%)
 rename Spigot-Server-Patches/{0187-Activation-Range-Improvements.patch => 0186-Activation-Range-Improvements.patch} (98%)
 rename Spigot-Server-Patches/{0188-Firework-API-s.patch => 0187-Firework-API-s.patch} (96%)
 rename Spigot-Server-Patches/{0189-PlayerTeleportEndGatewayEvent.patch => 0188-PlayerTeleportEndGatewayEvent.patch} (92%)
 rename Spigot-Server-Patches/{0190-ShulkerBox-Dupe-Prevention.patch => 0189-ShulkerBox-Dupe-Prevention.patch} (90%)
 rename Spigot-Server-Patches/{0191-Provide-E-TE-Chunk-count-stat-methods.patch => 0190-Provide-E-TE-Chunk-count-stat-methods.patch} (93%)
 rename Spigot-Server-Patches/{0192-Enforce-Sync-Player-Saves.patch => 0191-Enforce-Sync-Player-Saves.patch} (80%)
 rename Spigot-Server-Patches/{0193-Enforce-Sync-Chunk-Unloads.patch => 0192-Enforce-Sync-Chunk-Unloads.patch} (92%)
 rename Spigot-Server-Patches/{0194-Don-t-allow-entities-to-ride-themselves-572.patch => 0193-Don-t-allow-entities-to-ride-themselves-572.patch} (88%)
 rename Spigot-Server-Patches/{0195-Fix-block-break-desync.patch => 0194-Fix-block-break-desync.patch} (88%)
 rename Spigot-Server-Patches/{0196-Assign-the-World-in-WorldGenStronghold.patch => 0195-Assign-the-World-in-WorldGenStronghold.patch} (87%)
 rename Spigot-Server-Patches/{0197-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch => 0196-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch} (96%)
 rename Spigot-Server-Patches/{0198-Remove-the-Vanilla-Method-Profiler.patch => 0197-Remove-the-Vanilla-Method-Profiler.patch} (96%)
 rename Spigot-Server-Patches/{0199-Cap-Entity-Collisions.patch => 0198-Cap-Entity-Collisions.patch} (91%)
 rename Spigot-Server-Patches/{0200-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch => 0199-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch} (92%)
 rename Spigot-Server-Patches/{0201-Remove-CraftScheduler-Async-Task-Debugger.patch => 0200-Remove-CraftScheduler-Async-Task-Debugger.patch} (96%)
 rename Spigot-Server-Patches/{0202-Shame-on-you-Mojang.patch => 0201-Shame-on-you-Mojang.patch} (95%)
 rename Spigot-Server-Patches/{0203-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch => 0202-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch} (91%)
 rename Spigot-Server-Patches/{0204-Do-not-let-armorstands-drown.patch => 0203-Do-not-let-armorstands-drown.patch} (93%)
 rename Spigot-Server-Patches/{0205-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch => 0204-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch} (90%)
 rename Spigot-Server-Patches/{0206-Properly-handle-async-calls-to-restart-the-server.patch => 0205-Properly-handle-async-calls-to-restart-the-server.patch} (97%)
 rename Spigot-Server-Patches/{0207-Add-system-property-to-disable-book-size-limits.patch => 0206-Add-system-property-to-disable-book-size-limits.patch} (96%)
 rename Spigot-Server-Patches/{0208-Add-option-to-make-parrots-stay-on-shoulders-despite.patch => 0207-Add-option-to-make-parrots-stay-on-shoulders-despite.patch} (92%)
 rename Spigot-Server-Patches/{0209-Add-configuration-option-to-prevent-player-names-fro.patch => 0208-Add-configuration-option-to-prevent-player-names-fro.patch} (92%)
 rename Spigot-Server-Patches/{0210-Use-TerminalConsoleAppender-for-console-improvements.patch => 0209-Use-TerminalConsoleAppender-for-console-improvements.patch} (99%)
 rename Spigot-Server-Patches/{0211-provide-a-configurable-option-to-disable-creeper-lin.patch => 0210-provide-a-configurable-option-to-disable-creeper-lin.patch} (89%)
 rename Spigot-Server-Patches/{0212-Item-canEntityPickup.patch => 0211-Item-canEntityPickup.patch} (92%)
 rename Spigot-Server-Patches/{0213-PlayerPickupItemEvent-setFlyAtPlayer.patch => 0212-PlayerPickupItemEvent-setFlyAtPlayer.patch} (95%)
 rename Spigot-Server-Patches/{0214-PlayerAttemptPickupItemEvent.patch => 0213-PlayerAttemptPickupItemEvent.patch} (96%)
 rename Spigot-Server-Patches/{0215-Add-UnknownCommandEvent.patch => 0214-Add-UnknownCommandEvent.patch} (93%)
 rename Spigot-Server-Patches/{0216-Shoulder-Entities-Release-API.patch => 0215-Shoulder-Entities-Release-API.patch} (96%)
 rename Spigot-Server-Patches/{0217-Profile-Lookup-Events.patch => 0216-Profile-Lookup-Events.patch} (93%)
 rename Spigot-Server-Patches/{0218-Block-player-logins-during-server-shutdown.patch => 0217-Block-player-logins-during-server-shutdown.patch} (90%)
 rename Spigot-Server-Patches/{0219-Entity-fromMobSpawner.patch => 0218-Entity-fromMobSpawner.patch} (95%)
 rename Spigot-Server-Patches/{0220-Fix-Anvil-Level-sync-to-client.patch => 0219-Fix-Anvil-Level-sync-to-client.patch} (93%)
 rename Spigot-Server-Patches/{0221-Add-missing-coverages-for-getTileEntity-in-order-to-.patch => 0220-Add-missing-coverages-for-getTileEntity-in-order-to-.patch} (90%)
 rename Spigot-Server-Patches/{0222-Allow-Changing-of-Player-Sample-in-ServerListPingEve.patch => 0221-Allow-Changing-of-Player-Sample-in-ServerListPingEve.patch} (96%)
 rename Spigot-Server-Patches/{0223-Improve-the-Saddle-API-for-Horses.patch => 0222-Improve-the-Saddle-API-for-Horses.patch} (94%)
 rename Spigot-Server-Patches/{0224-Implement-ensureServerConversions-API.patch => 0223-Implement-ensureServerConversions-API.patch} (90%)
 rename Spigot-Server-Patches/{0225-Implement-getI18NDisplayName.patch => 0224-Implement-getI18NDisplayName.patch} (92%)
 rename Spigot-Server-Patches/{0226-GH-806-Respect-saving-disabled-before-unloading-all-.patch => 0225-GH-806-Respect-saving-disabled-before-unloading-all-.patch} (90%)
 rename Spigot-Server-Patches/{0227-ProfileWhitelistVerifyEvent.patch => 0226-ProfileWhitelistVerifyEvent.patch} (92%)
 rename Spigot-Server-Patches/{0228-Fix-this-stupid-bullshit.patch => 0227-Fix-this-stupid-bullshit.patch} (93%)
 rename Spigot-Server-Patches/{0229-Ocelot-despawns-should-honor-nametags-and-leash.patch => 0228-Ocelot-despawns-should-honor-nametags-and-leash.patch} (88%)
 rename Spigot-Server-Patches/{0230-Reset-spawner-timer-when-spawner-event-is-cancelled.patch => 0229-Reset-spawner-timer-when-spawner-event-is-cancelled.patch} (91%)
 rename Spigot-Server-Patches/{0231-MC-94186-Fix-dragon-egg-falling-in-lazy-chunks.patch => 0230-MC-94186-Fix-dragon-egg-falling-in-lazy-chunks.patch} (89%)
 rename Spigot-Server-Patches/{0232-Fix-MC-117075-TE-Unload-Lag-Spike.patch => 0231-Fix-MC-117075-TE-Unload-Lag-Spike.patch} (91%)
 rename Spigot-Server-Patches/{0233-Allow-specifying-a-custom-authentication-servers-dow.patch => 0232-Allow-specifying-a-custom-authentication-servers-dow.patch} (94%)
 rename Spigot-Server-Patches/{0234-LivingEntity-setKiller.patch => 0233-LivingEntity-setKiller.patch} (91%)
 rename Spigot-Server-Patches/{0235-Avoid-NPE-during-CraftBlockEntityState-load.patch => 0234-Avoid-NPE-during-CraftBlockEntityState-load.patch} (92%)
 rename Spigot-Server-Patches/{0236-Anti-Xray.patch => 0235-Anti-Xray.patch} (99%)
 rename Spigot-Server-Patches/{0237-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch => 0236-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch} (93%)
 rename Spigot-Server-Patches/{0238-Handle-plugin-prefixes-using-Log4J-configuration.patch => 0237-Handle-plugin-prefixes-using-Log4J-configuration.patch} (95%)
 rename Spigot-Server-Patches/{0239-Include-Log4J2-SLF4J-implementation.patch => 0238-Include-Log4J2-SLF4J-implementation.patch} (86%)
 rename Spigot-Server-Patches/{0240-Disable-logger-prefix-for-various-plugins-bypassing-.patch => 0239-Disable-logger-prefix-for-various-plugins-bypassing-.patch} (95%)
 rename Spigot-Server-Patches/{0241-Add-PlayerJumpEvent.patch => 0240-Add-PlayerJumpEvent.patch} (96%)
 rename Spigot-Server-Patches/{0242-handle-PacketPlayInKeepAlive-async.patch => 0241-handle-PacketPlayInKeepAlive-async.patch} (95%)
 rename Spigot-Server-Patches/{0243-Expose-client-protocol-version-and-virtual-host.patch => 0242-Expose-client-protocol-version-and-virtual-host.patch} (95%)
 rename Spigot-Server-Patches/{0244-revert-serverside-behavior-of-keepalives.patch => 0243-revert-serverside-behavior-of-keepalives.patch} (97%)
 rename Spigot-Server-Patches/{0245-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch => 0244-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch} (92%)
 rename Spigot-Server-Patches/{0246-Send-attack-SoundEffects-only-to-players-who-can-see.patch => 0245-Send-attack-SoundEffects-only-to-players-who-can-see.patch} (97%)
 rename Spigot-Server-Patches/{0247-Option-for-maximum-exp-value-when-merging-orbs.patch => 0246-Option-for-maximum-exp-value-when-merging-orbs.patch} (93%)
 rename Spigot-Server-Patches/{0248-Add-PlayerArmorChangeEvent.patch => 0247-Add-PlayerArmorChangeEvent.patch} (94%)
 rename Spigot-Server-Patches/{0249-Improve-Structures-Checking.patch => 0248-Improve-Structures-Checking.patch} (97%)
 rename Spigot-Server-Patches/{0250-Prevent-logins-from-being-processed-when-the-player-.patch => 0249-Prevent-logins-from-being-processed-when-the-player-.patch} (90%)
 rename Spigot-Server-Patches/{0251-use-CB-BlockState-implementations-for-captured-block.patch => 0250-use-CB-BlockState-implementations-for-captured-block.patch} (94%)
 rename Spigot-Server-Patches/{0252-API-to-get-a-BlockState-without-a-snapshot.patch => 0251-API-to-get-a-BlockState-without-a-snapshot.patch} (95%)
 rename Spigot-Server-Patches/{0253-Do-not-use-a-snapshot-for-hoppers.patch => 0252-Do-not-use-a-snapshot-for-hoppers.patch} (97%)
 rename Spigot-Server-Patches/{0254-AsyncTabCompleteEvent.patch => 0253-AsyncTabCompleteEvent.patch} (98%)
 rename Spigot-Server-Patches/{0255-Avoid-NPE-in-PathfinderGoalTempt.patch => 0254-Avoid-NPE-in-PathfinderGoalTempt.patch} (88%)
 rename Spigot-Server-Patches/{0256-Don-t-blindly-send-unlit-chunks-when-lighting-update.patch => 0255-Don-t-blindly-send-unlit-chunks-when-lighting-update.patch} (96%)
 rename Spigot-Server-Patches/{0257-PlayerPickupExperienceEvent.patch => 0256-PlayerPickupExperienceEvent.patch} (91%)
 rename Spigot-Server-Patches/{0258-ExperienceOrbMergeEvent.patch => 0257-ExperienceOrbMergeEvent.patch} (93%)
 rename Spigot-Server-Patches/{0259-Ability-to-apply-mending-to-XP-API.patch => 0258-Ability-to-apply-mending-to-XP-API.patch} (95%)
 rename Spigot-Server-Patches/{0260-Configurable-Chunks-Sends-per-Tick-setting.patch => 0259-Configurable-Chunks-Sends-per-Tick-setting.patch} (89%)
 rename Spigot-Server-Patches/{0261-Configurable-Max-Chunk-Gens-per-Tick.patch => 0260-Configurable-Max-Chunk-Gens-per-Tick.patch} (94%)

diff --git a/Spigot-Server-Patches/0003-MC-Dev-fixes.patch b/Spigot-Server-Patches/0003-MC-Dev-fixes.patch
index 321083df12..5fd851bd3b 100644
--- a/Spigot-Server-Patches/0003-MC-Dev-fixes.patch
+++ b/Spigot-Server-Patches/0003-MC-Dev-fixes.patch
@@ -1,4 +1,4 @@
-From b9b1f576225aa45f5638304a76b5764f5c4c85f5 Mon Sep 17 00:00:00 2001
+From de28e5dbfe736bdec1a553e02b88ee1e682de92a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 30 Mar 2016 19:36:20 -0400
 Subject: [PATCH] MC Dev fixes
@@ -30,19 +30,6 @@ index 62a9c92f..1b759976 100644
      }
  
      @Nullable
-diff --git a/src/main/java/net/minecraft/server/BlockStateEnum.java b/src/main/java/net/minecraft/server/BlockStateEnum.java
-index 71524f2c..288c52c5 100644
---- a/src/main/java/net/minecraft/server/BlockStateEnum.java
-+++ b/src/main/java/net/minecraft/server/BlockStateEnum.java
-@@ -29,7 +29,7 @@ public class BlockStateEnum<T extends Enum<T> & INamable> extends BlockState<T>
-                 throw new IllegalArgumentException("Multiple values have the same name \'" + s1 + "\'");
-             }
- 
--            this.b.put(s1, oenum);
-+            this.b.put(s1, (T) oenum);
-         }
- 
-     }
 diff --git a/src/main/java/net/minecraft/server/CommandAbstract.java b/src/main/java/net/minecraft/server/CommandAbstract.java
 index 76bf04f5..a99d0f87 100644
 --- a/src/main/java/net/minecraft/server/CommandAbstract.java
@@ -141,5 +128,5 @@ index f5bcbdbe..3190cadf 100644
          for (ZipEntry clazzEntry; (clazzEntry = nmsZipStream.getNextEntry()) != null; ) {
              final String entryName = clazzEntry.getName();
 -- 
-2.14.2.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0006-Timings-v2.patch b/Spigot-Server-Patches/0006-Timings-v2.patch
index a233780cb4..bd8e7e3545 100644
--- a/Spigot-Server-Patches/0006-Timings-v2.patch
+++ b/Spigot-Server-Patches/0006-Timings-v2.patch
@@ -1,4 +1,4 @@
-From 8e28c20dbf59bb8d63c126f63d7ecd46298f9b0b Mon Sep 17 00:00:00 2001
+From 274261a0b59be13d67b3034b87f563f7e5751f58 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2
@@ -706,7 +706,7 @@ index ee2d1f9a..e8401bba 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
-index 284d1204..3aab5420 100644
+index ce012402..a60f9460 100644
 --- a/src/main/java/net/minecraft/server/EntityTracker.java
 +++ b/src/main/java/net/minecraft/server/EntityTracker.java
 @@ -175,7 +175,7 @@ public class EntityTracker {
@@ -1062,7 +1062,7 @@ index f74b0679..1fc632e0 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index c00aee88..b3356b40 100644
+index 588e9bd8..784d6b62 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1,5 +1,6 @@
@@ -1072,7 +1072,7 @@ index c00aee88..b3356b40 100644
  import com.google.common.collect.Lists;
  import com.google.common.collect.Maps;
  import com.google.common.collect.Sets;
-@@ -1203,10 +1204,11 @@ public abstract class PlayerList {
+@@ -1205,10 +1206,11 @@ public abstract class PlayerList {
      }
  
      public void savePlayers() {
@@ -1388,7 +1388,7 @@ index d4f25cbf..e492913a 100644
  
      // CraftBukkit start
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b2bbccb5..7e1df932 100644
+index 14851a3a..9042deed 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1756,12 +1756,31 @@ public final class CraftServer implements Server {
@@ -1648,7 +1648,7 @@ index 3a95b446..b5efb9c3 100644
  
      public void callStage3(QueuedChunk queuedChunk, Chunk chunk, Runnable runnable) throws RuntimeException {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 328a81dc..f387b623 100644
+index e12e45e0..dfb5731c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -41,7 +41,7 @@ import org.bukkit.configuration.serialization.DelegateDeserialization;
@@ -1906,5 +1906,5 @@ index 2bd690fd..38be7ed7 100644
      }
  }
 -- 
-2.15.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0008-Configurable-cactus-and-reed-natural-growth-heights.patch b/Spigot-Server-Patches/0007-Configurable-cactus-and-reed-natural-growth-heights.patch
similarity index 82%
rename from Spigot-Server-Patches/0008-Configurable-cactus-and-reed-natural-growth-heights.patch
rename to Spigot-Server-Patches/0007-Configurable-cactus-and-reed-natural-growth-heights.patch
index 99df807c18..0cf785f263 100644
--- a/Spigot-Server-Patches/0008-Configurable-cactus-and-reed-natural-growth-heights.patch
+++ b/Spigot-Server-Patches/0007-Configurable-cactus-and-reed-natural-growth-heights.patch
@@ -1,21 +1,21 @@
-From 2df13908f2a9a16aedcfb2d7c56fa578181ffb97 Mon Sep 17 00:00:00 2001
+From 7861a759da2fec72229a685817cd2e0efdf916cb Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 13:02:51 -0600
 Subject: [PATCH] Configurable cactus and reed natural growth heights
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index f24839378..6228bc1f6 100644
+index 621bf705..4a692ac1 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -71,4 +71,13 @@ public class PaperWorldConfig {
-         squidMaxSpawnHeight = getDouble("squid-spawn-height.maximum", 63.0D);
-         log("Squids will spawn between Y: " + squidMinSpawnHeight + " and Y: " + squidMaxSpawnHeight);
+@@ -63,4 +63,13 @@ public class PaperWorldConfig {
+         config.addDefault("world-settings.default." + path, def);
+         return config.getString("world-settings." + worldName + "." + path, config.getString("world-settings.default." + path));
      }
 +
 +    public int cactusMaxHeight;
 +    public int reedMaxHeight;
-+    private void blowGrowthHeight() {
++    private void blockGrowthHeight() {
 +        cactusMaxHeight = getInt("max-growth-height.cactus", 3);
 +        reedMaxHeight = getInt("max-growth-height.reeds", 3);
 +        log("Max height for cactus growth " + cactusMaxHeight + ". Max height for reed growth " + reedMaxHeight);
@@ -23,7 +23,7 @@ index f24839378..6228bc1f6 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockCactus.java b/src/main/java/net/minecraft/server/BlockCactus.java
-index 3f579fbdb..a69a707aa 100644
+index 64b7d08f..d8fb87f7 100644
 --- a/src/main/java/net/minecraft/server/BlockCactus.java
 +++ b/src/main/java/net/minecraft/server/BlockCactus.java
 @@ -28,7 +28,7 @@ public class BlockCactus extends Block {
@@ -36,7 +36,7 @@ index 3f579fbdb..a69a707aa 100644
  
                  if (j >= (byte) range(3, ((100.0F / world.spigotConfig.cactusModifier) * 15) + 0.5F, 15)) { // Spigot
 diff --git a/src/main/java/net/minecraft/server/BlockReed.java b/src/main/java/net/minecraft/server/BlockReed.java
-index 84014b1c7..9d1af2adc 100644
+index 57f24f55..d19dce83 100644
 --- a/src/main/java/net/minecraft/server/BlockReed.java
 +++ b/src/main/java/net/minecraft/server/BlockReed.java
 @@ -28,7 +28,7 @@ public class BlockReed extends Block {
@@ -49,5 +49,5 @@ index 84014b1c7..9d1af2adc 100644
  
                      if (j >= (byte) range(3, ((100.0F / world.spigotConfig.caneModifier) * 15) + 0.5F, 15)) { // Spigot
 -- 
-2.12.0.windows.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0007-Configurable-squid-spawn-ranges.patch b/Spigot-Server-Patches/0007-Configurable-squid-spawn-ranges.patch
deleted file mode 100644
index a38c2cdcd2..0000000000
--- a/Spigot-Server-Patches/0007-Configurable-squid-spawn-ranges.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From fbea6e7aa23f4b7e63d3ad5671c1bc18a1e4189d Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Tue, 1 Mar 2016 12:45:11 -0600
-Subject: [PATCH] Configurable squid spawn ranges
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 621bf7051..f24839378 100644
---- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -63,4 +63,12 @@ public class PaperWorldConfig {
-         config.addDefault("world-settings.default." + path, def);
-         return config.getString("world-settings." + worldName + "." + path, config.getString("world-settings.default." + path));
-     }
-+
-+    public double squidMinSpawnHeight;
-+    public double squidMaxSpawnHeight;
-+    private void squidSpawnHeights() {
-+        squidMinSpawnHeight = getDouble("squid-spawn-height.minimum", 45.0D);
-+        squidMaxSpawnHeight = getDouble("squid-spawn-height.maximum", 63.0D);
-+        log("Squids will spawn between Y: " + squidMinSpawnHeight + " and Y: " + squidMaxSpawnHeight);
-+    }
- }
-diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
-index 20b71b455..ee8e50706 100644
---- a/src/main/java/net/minecraft/server/EntitySquid.java
-+++ b/src/main/java/net/minecraft/server/EntitySquid.java
-@@ -141,7 +141,7 @@ public class EntitySquid extends EntityWaterAnimal {
-     }
- 
-     public boolean P() {
--        return this.locY > 45.0D && this.locY < (double) this.world.getSeaLevel() && super.P();
-+        return this.locY > world.paperConfig.squidMinSpawnHeight && this.locY < world.paperConfig.squidMaxSpawnHeight && super.P(); // Paper - Configurable squid spawn height range
-     }
- 
-     public void b(float f, float f1, float f2) {
--- 
-2.13.0
-
diff --git a/Spigot-Server-Patches/0009-Configurable-baby-zombie-movement-speed.patch b/Spigot-Server-Patches/0008-Configurable-baby-zombie-movement-speed.patch
similarity index 93%
rename from Spigot-Server-Patches/0009-Configurable-baby-zombie-movement-speed.patch
rename to Spigot-Server-Patches/0008-Configurable-baby-zombie-movement-speed.patch
index 7c53d06b58..1821204017 100644
--- a/Spigot-Server-Patches/0009-Configurable-baby-zombie-movement-speed.patch
+++ b/Spigot-Server-Patches/0008-Configurable-baby-zombie-movement-speed.patch
@@ -1,14 +1,14 @@
-From 729eb0ea88be715b9a00822f01f963c86361ecd0 Mon Sep 17 00:00:00 2001
+From 44b326120889fe804c445ea78a23b9e5dfa5b050 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 13:09:16 -0600
 Subject: [PATCH] Configurable baby zombie movement speed
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 6228bc1f6..fe9e7b342 100644
+index 4a692ac1..d44cacc7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -80,4 +80,10 @@ public class PaperWorldConfig {
+@@ -72,4 +72,10 @@ public class PaperWorldConfig {
          log("Max height for cactus growth " + cactusMaxHeight + ". Max height for reed growth " + reedMaxHeight);
  
      }
@@ -20,7 +20,7 @@ index 6228bc1f6..fe9e7b342 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 36afc8f07..bf059a746 100644
+index 11c0f24f..277f1414 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -16,7 +16,7 @@ public class EntityZombie extends EntityMonster {
@@ -45,5 +45,5 @@ index 36afc8f07..bf059a746 100644
          }
  
 -- 
-2.13.0
+2.14.3
 
diff --git a/Spigot-Server-Patches/0010-Configurable-fishing-time-ranges.patch b/Spigot-Server-Patches/0009-Configurable-fishing-time-ranges.patch
similarity index 89%
rename from Spigot-Server-Patches/0010-Configurable-fishing-time-ranges.patch
rename to Spigot-Server-Patches/0009-Configurable-fishing-time-ranges.patch
index b71e559dcc..18db59bc71 100644
--- a/Spigot-Server-Patches/0010-Configurable-fishing-time-ranges.patch
+++ b/Spigot-Server-Patches/0009-Configurable-fishing-time-ranges.patch
@@ -1,14 +1,14 @@
-From 16212de7e01256c4ac01f0e1fab71bcee9e1c7e8 Mon Sep 17 00:00:00 2001
+From 9980c5d3448b67ab839e76f49a17c970d55c23ff Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 13:14:11 -0600
 Subject: [PATCH] Configurable fishing time ranges
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index fe9e7b342..22999f0d2 100644
+index d44cacc7..45bddf3f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -86,4 +86,12 @@ public class PaperWorldConfig {
+@@ -78,4 +78,12 @@ public class PaperWorldConfig {
          babyZombieMovementSpeed = getDouble("baby-zombie-movement-speed", 0.5D); // Player moves at 0.1F, for reference
          log("Baby zombies will move at the speed of " + babyZombieMovementSpeed);
      }
@@ -22,7 +22,7 @@ index fe9e7b342..22999f0d2 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 472f36774..0c528c699 100644
+index b4d3bcb4..339d1f1b 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
 @@ -381,7 +381,7 @@ public class EntityFishingHook extends Entity {
@@ -35,5 +35,5 @@ index 472f36774..0c528c699 100644
              }
          }
 -- 
-2.12.0.windows.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0011-Allow-nerfed-mobs-to-jump.patch b/Spigot-Server-Patches/0010-Allow-nerfed-mobs-to-jump.patch
similarity index 93%
rename from Spigot-Server-Patches/0011-Allow-nerfed-mobs-to-jump.patch
rename to Spigot-Server-Patches/0010-Allow-nerfed-mobs-to-jump.patch
index e0d65753da..433e0cf793 100644
--- a/Spigot-Server-Patches/0011-Allow-nerfed-mobs-to-jump.patch
+++ b/Spigot-Server-Patches/0010-Allow-nerfed-mobs-to-jump.patch
@@ -1,14 +1,14 @@
-From 65725cb96944989051fc5bf381b31cff4967682b Mon Sep 17 00:00:00 2001
+From 9c02dc7968f42b1d0a021055f6d72c5d074eeb48 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 13:24:16 -0600
 Subject: [PATCH] Allow nerfed mobs to jump
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 22999f0d2..5f13fbff3 100644
+index 45bddf3f..1d9dd0e0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -94,4 +94,9 @@ public class PaperWorldConfig {
+@@ -86,4 +86,9 @@ public class PaperWorldConfig {
          fishingMaxTicks = getInt("fishing-time-range.MaximumTicks", 600);
          log("Fishing time ranges are between " + fishingMinTicks +" and " + fishingMaxTicks + " ticks");
      }
@@ -19,7 +19,7 @@ index 22999f0d2..5f13fbff3 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/ControllerJump.java b/src/main/java/net/minecraft/server/ControllerJump.java
-index 4f2fa59ac..8af52a61f 100644
+index 4f2fa59a..8af52a61 100644
 --- a/src/main/java/net/minecraft/server/ControllerJump.java
 +++ b/src/main/java/net/minecraft/server/ControllerJump.java
 @@ -13,6 +13,7 @@ public class ControllerJump {
@@ -31,7 +31,7 @@ index 4f2fa59ac..8af52a61f 100644
          this.b.l(this.a);
          this.a = false;
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 3c48d9463..7b02b253c 100644
+index 3c48d946..7b02b253 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -46,6 +46,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -56,7 +56,7 @@ index 3c48d9463..7b02b253c 100644
          }
          // Spigot End
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalFloat.java b/src/main/java/net/minecraft/server/PathfinderGoalFloat.java
-index b3b303b3b..fc6c3bf71 100644
+index b3b303b3..fc6c3bf7 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalFloat.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalFloat.java
 @@ -6,6 +6,7 @@ public class PathfinderGoalFloat extends PathfinderGoal {
diff --git a/Spigot-Server-Patches/0012-Add-configurable-despawn-distances-for-living-entiti.patch b/Spigot-Server-Patches/0011-Add-configurable-despawn-distances-for-living-entiti.patch
similarity index 93%
rename from Spigot-Server-Patches/0012-Add-configurable-despawn-distances-for-living-entiti.patch
rename to Spigot-Server-Patches/0011-Add-configurable-despawn-distances-for-living-entiti.patch
index 12020d3c33..6ed80a425d 100644
--- a/Spigot-Server-Patches/0012-Add-configurable-despawn-distances-for-living-entiti.patch
+++ b/Spigot-Server-Patches/0011-Add-configurable-despawn-distances-for-living-entiti.patch
@@ -1,14 +1,14 @@
-From dca2ae19f2d3a3f260e74471a5a53d7a9b019b67 Mon Sep 17 00:00:00 2001
+From 2f9986be69c453815c9f2a218ceec0adaca29119 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 5f13fbff3..4b64ccaa0 100644
+index 1d9dd0e0..22c1113a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -99,4 +99,20 @@ public class PaperWorldConfig {
+@@ -91,4 +91,20 @@ public class PaperWorldConfig {
      private void nerfedMobsShouldJump() {
          nerfedMobsShouldJump = getBoolean("spawner-nerfed-mobs-should-jump", false);
      }
@@ -30,7 +30,7 @@ index 5f13fbff3..4b64ccaa0 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 7b02b253c..94967e6b6 100644
+index 7b02b253..94967e6b 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -630,13 +630,13 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -51,5 +51,5 @@ index 7b02b253c..94967e6b6 100644
                  }
              }
 -- 
-2.13.3
+2.14.3
 
diff --git a/Spigot-Server-Patches/0013-Allow-for-toggling-of-spawn-chunks.patch b/Spigot-Server-Patches/0012-Allow-for-toggling-of-spawn-chunks.patch
similarity index 88%
rename from Spigot-Server-Patches/0013-Allow-for-toggling-of-spawn-chunks.patch
rename to Spigot-Server-Patches/0012-Allow-for-toggling-of-spawn-chunks.patch
index 33e50d02d7..10602b0d5c 100644
--- a/Spigot-Server-Patches/0013-Allow-for-toggling-of-spawn-chunks.patch
+++ b/Spigot-Server-Patches/0012-Allow-for-toggling-of-spawn-chunks.patch
@@ -1,14 +1,14 @@
-From 95f35af2f0cbcd086e82db7f001ed34265d28217 Mon Sep 17 00:00:00 2001
+From 6f59e21ac8b3574bd3fe990f51b95928994cbf23 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 4b64ccaa0..7ac6a5f1f 100644
+index 22c1113a..0094d1a8 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -115,4 +115,10 @@ public class PaperWorldConfig {
+@@ -107,4 +107,10 @@ public class PaperWorldConfig {
          softDespawnDistance = softDespawnDistance*softDespawnDistance;
          hardDespawnDistance = hardDespawnDistance*hardDespawnDistance;
      }
@@ -20,7 +20,7 @@ index 4b64ccaa0..7ac6a5f1f 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f06b82ec5..5c44e0ed4 100644
+index d902e263..759964b0 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -202,6 +202,7 @@ public abstract class World implements IBlockAccess {
@@ -32,5 +32,5 @@ index f06b82ec5..5c44e0ed4 100644
          this.tileLimiter = new org.spigotmc.TickLimiter(spigotConfig.tileMaxTickTime);
      }
 -- 
-2.13.3.windows.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0014-Drop-falling-block-and-tnt-entities-at-the-specified.patch b/Spigot-Server-Patches/0013-Drop-falling-block-and-tnt-entities-at-the-specified.patch
similarity index 93%
rename from Spigot-Server-Patches/0014-Drop-falling-block-and-tnt-entities-at-the-specified.patch
rename to Spigot-Server-Patches/0013-Drop-falling-block-and-tnt-entities-at-the-specified.patch
index 95a718c8f4..793c5db1bb 100644
--- a/Spigot-Server-Patches/0014-Drop-falling-block-and-tnt-entities-at-the-specified.patch
+++ b/Spigot-Server-Patches/0013-Drop-falling-block-and-tnt-entities-at-the-specified.patch
@@ -1,14 +1,14 @@
-From ff154bbf35dc82b964857cdc0ae1a2ab09a5c05a Mon Sep 17 00:00:00 2001
+From 5327fcad175af329bb3166193bd03cea317db5c2 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 7ac6a5f1f..8cdeb34d4 100644
+index 0094d1a8..4da84671 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -121,4 +121,14 @@ public class PaperWorldConfig {
+@@ -113,4 +113,14 @@ public class PaperWorldConfig {
          keepSpawnInMemory = getBoolean("keep-spawn-loaded", true);
          log("Keep spawn chunk loaded: " + keepSpawnInMemory);
      }
@@ -24,7 +24,7 @@ index 7ac6a5f1f..8cdeb34d4 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 4c794a098..90be49189 100644
+index 4c794a09..90be4918 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1751,6 +1751,7 @@ public abstract class Entity implements ICommandListener {
@@ -36,7 +36,7 @@ index 4c794a098..90be49189 100644
      public EntityItem a(ItemStack itemstack, float f) {
          if (itemstack.isEmpty()) {
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index 579e51a0a..2ba5d51a5 100644
+index 579e51a0..2ba5d51a 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
 @@ -84,6 +84,17 @@ public class EntityFallingBlock extends Entity {
@@ -58,7 +58,7 @@ index 579e51a0a..2ba5d51a5 100644
                  blockposition = new BlockPosition(this);
                  boolean flag = this.block.getBlock() == Blocks.dS;
 diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
-index 44b2d4735..0d70dd1d2 100644
+index 44b2d473..0d70dd1d 100644
 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 @@ -57,6 +57,13 @@ public class EntityTNTPrimed extends Entity {
diff --git a/Spigot-Server-Patches/0015-Configurable-speed-for-water-flowing-over-lava.patch b/Spigot-Server-Patches/0014-Configurable-speed-for-water-flowing-over-lava.patch
similarity index 92%
rename from Spigot-Server-Patches/0015-Configurable-speed-for-water-flowing-over-lava.patch
rename to Spigot-Server-Patches/0014-Configurable-speed-for-water-flowing-over-lava.patch
index 8b020b012e..cefb14da80 100644
--- a/Spigot-Server-Patches/0015-Configurable-speed-for-water-flowing-over-lava.patch
+++ b/Spigot-Server-Patches/0014-Configurable-speed-for-water-flowing-over-lava.patch
@@ -1,14 +1,14 @@
-From 16b591982a8417b9f551dd06a73d25cdf82842e1 Mon Sep 17 00:00:00 2001
+From cb2a71023bfe9b8c9de796ca43cce768d2b4aa6a 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 8cdeb34d4..62e6830aa 100644
+index 4da84671..d3484489 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -131,4 +131,10 @@ public class PaperWorldConfig {
+@@ -123,4 +123,10 @@ public class PaperWorldConfig {
          if (fallingBlockHeightNerf != 0) log("Falling Block Height Limit set to Y: " + fallingBlockHeightNerf);
          if (entityTNTHeightNerf != 0) log("TNT Entity Height Limit set to Y: " + entityTNTHeightNerf);
      }
@@ -20,7 +20,7 @@ index 8cdeb34d4..62e6830aa 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java
-index c9294a58d..f4ac7bafa 100644
+index 7b74df5b..62234a7c 100644
 --- a/src/main/java/net/minecraft/server/BlockFlowing.java
 +++ b/src/main/java/net/minecraft/server/BlockFlowing.java
 @@ -30,7 +30,7 @@ public class BlockFlowing extends BlockFluids {
@@ -57,5 +57,5 @@ index c9294a58d..f4ac7bafa 100644
 +    }
  }
 -- 
-2.12.0.windows.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0016-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/Spigot-Server-Patches/0015-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
similarity index 97%
rename from Spigot-Server-Patches/0016-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
rename to Spigot-Server-Patches/0015-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
index 32bf1ad171..c941636782 100644
--- a/Spigot-Server-Patches/0016-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
+++ b/Spigot-Server-Patches/0015-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
@@ -1,4 +1,4 @@
-From 17fe4583cab6632ee9ec76e92101474233148721 Mon Sep 17 00:00:00 2001
+From f1d0beef43c007994fc2f16ad9e5d7ab9d85d02b 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
@@ -33,7 +33,7 @@ index 8d08b536..92d48025 100644
  
      public CrashReport b(CrashReport crashreport) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7e1df932..d6fdc535 100644
+index 9042deed..33b40ffc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -136,7 +136,7 @@ import org.bukkit.event.server.TabCompleteEvent;
@@ -93,5 +93,5 @@ index 94a3d423..3ed983cc 100644
                  log.log( Level.SEVERE, "------------------------------" );
                  //
 -- 
-2.15.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0017-Player-affects-spawning-API.patch b/Spigot-Server-Patches/0016-Player-affects-spawning-API.patch
similarity index 93%
rename from Spigot-Server-Patches/0017-Player-affects-spawning-API.patch
rename to Spigot-Server-Patches/0016-Player-affects-spawning-API.patch
index 2f415faaf8..216029271a 100644
--- a/Spigot-Server-Patches/0017-Player-affects-spawning-API.patch
+++ b/Spigot-Server-Patches/0016-Player-affects-spawning-API.patch
@@ -1,11 +1,11 @@
-From 431256683eff92a78786d888c39861a814291811 Mon Sep 17 00:00:00 2001
+From 5ca9db8b97b3c8ed1997ede12c32121bf26b5175 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Tue, 1 Mar 2016 14:47:52 -0600
 Subject: [PATCH] Player affects spawning API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index c374efd79..467c5bf1a 100644
+index c374efd7..467c5bf1 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -64,6 +64,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -17,7 +17,7 @@ index c374efd79..467c5bf1a 100644
      // CraftBukkit start
      public boolean fauxSleeping;
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 94967e6b6..5ea9f3097 100644
+index 94967e6b..5ea9f309 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -624,7 +624,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -30,7 +30,7 @@ index 94967e6b6..5ea9f3097 100644
                  double d1 = entityhuman.locY - this.locY;
                  double d2 = entityhuman.locZ - this.locZ;
 diff --git a/src/main/java/net/minecraft/server/EntitySilverfish.java b/src/main/java/net/minecraft/server/EntitySilverfish.java
-index 50bca48bf..57552c522 100644
+index 50bca48b..57552c52 100644
 --- a/src/main/java/net/minecraft/server/EntitySilverfish.java
 +++ b/src/main/java/net/minecraft/server/EntitySilverfish.java
 @@ -99,8 +99,7 @@ public class EntitySilverfish extends EntityMonster {
@@ -44,7 +44,7 @@ index 50bca48bf..57552c522 100644
              return false;
          }
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index a599a043d..1c7c187c7 100644
+index a599a043..1c7c187c 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -52,7 +52,7 @@ public final class SpawnerCreature {
@@ -57,7 +57,7 @@ index a599a043d..1c7c187c7 100644
  
                      j = MathHelper.floor(entityhuman.locZ / 16.0D);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 759964b0f..26d4bd690 100644
+index 759964b0..26d4bd69 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -2727,7 +2727,7 @@ public abstract class World implements IBlockAccess {
@@ -70,7 +70,7 @@ index 759964b0f..26d4bd690 100644
  
                  if (d3 < 0.0D || d4 < d3 * d3) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f387b623d..fa91ecbef 100644
+index dfb5731c..aec4f8aa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1542,6 +1542,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -91,5 +91,5 @@ index f387b623d..fa91ecbef 100644
  
      // Spigot start
 -- 
-2.15.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0018-Remove-invalid-mob-spawner-tile-entities.patch b/Spigot-Server-Patches/0017-Remove-invalid-mob-spawner-tile-entities.patch
similarity index 92%
rename from Spigot-Server-Patches/0018-Remove-invalid-mob-spawner-tile-entities.patch
rename to Spigot-Server-Patches/0017-Remove-invalid-mob-spawner-tile-entities.patch
index 4823367970..a654d5359c 100644
--- a/Spigot-Server-Patches/0018-Remove-invalid-mob-spawner-tile-entities.patch
+++ b/Spigot-Server-Patches/0017-Remove-invalid-mob-spawner-tile-entities.patch
@@ -1,11 +1,11 @@
-From ae8b5ae151c33ea2fb2dbdda86cc8eb3922ccf47 Mon Sep 17 00:00:00 2001
+From c24578957f9f544e023cf837aceadd650feec34e 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 bd3b16025..1c0108ef1 100644
+index 350e0991..66c78083 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 bd3b16025..1c0108ef1 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.12.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0019-Optimize-TileEntity-Ticking.patch b/Spigot-Server-Patches/0018-Optimize-TileEntity-Ticking.patch
similarity index 98%
rename from Spigot-Server-Patches/0019-Optimize-TileEntity-Ticking.patch
rename to Spigot-Server-Patches/0018-Optimize-TileEntity-Ticking.patch
index addf9eab92..967728a5ba 100644
--- a/Spigot-Server-Patches/0019-Optimize-TileEntity-Ticking.patch
+++ b/Spigot-Server-Patches/0018-Optimize-TileEntity-Ticking.patch
@@ -1,11 +1,11 @@
-From ca3dd164ec111c629ea4e92778c786d2d9a61ba2 Mon Sep 17 00:00:00 2001
+From dcf282ac28b3cca835ce72abf3f69cea9bf4e8ff 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
 
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityChest.java b/src/main/java/net/minecraft/server/TileEntityChest.java
-index af8c2cfa8..3cf80495e 100644
+index 3b5af473..63130412 100644
 --- a/src/main/java/net/minecraft/server/TileEntityChest.java
 +++ b/src/main/java/net/minecraft/server/TileEntityChest.java
 @@ -8,17 +8,17 @@ import org.bukkit.craftbukkit.entity.CraftHumanEntity;
@@ -117,7 +117,7 @@ index af8c2cfa8..3cf80495e 100644
              this.world.applyPhysics(this.position, this.getBlock(), false);
  
 diff --git a/src/main/java/net/minecraft/server/TileEntityEnderChest.java b/src/main/java/net/minecraft/server/TileEntityEnderChest.java
-index 31585757b..1c1741c56 100644
+index 31585757..1c1741c5 100644
 --- a/src/main/java/net/minecraft/server/TileEntityEnderChest.java
 +++ b/src/main/java/net/minecraft/server/TileEntityEnderChest.java
 @@ -1,15 +1,17 @@
@@ -186,5 +186,5 @@ index 31585757b..1c1741c56 100644
      }
  
 -- 
-2.13.0
+2.14.3
 
diff --git a/Spigot-Server-Patches/0020-Further-improve-server-tick-loop.patch b/Spigot-Server-Patches/0019-Further-improve-server-tick-loop.patch
similarity index 98%
rename from Spigot-Server-Patches/0020-Further-improve-server-tick-loop.patch
rename to Spigot-Server-Patches/0019-Further-improve-server-tick-loop.patch
index 2625c1f5ba..7e09cfdbd9 100644
--- a/Spigot-Server-Patches/0020-Further-improve-server-tick-loop.patch
+++ b/Spigot-Server-Patches/0019-Further-improve-server-tick-loop.patch
@@ -1,4 +1,4 @@
-From 9106bda96d42fe08b005d0ed685fbf3cdd8e6cc7 Mon Sep 17 00:00:00 2001
+From 18e7bb3d26d123c1b7a26e2d0a2b3baa60e5dec2 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
@@ -147,7 +147,7 @@ index 92d48025..47fe9262 100644
                      }
                      lastTick = curTime;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d6fdc535..58826d3d 100644
+index 33b40ffc..bfddd168 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1753,6 +1753,17 @@ public final class CraftServer implements Server {
@@ -210,5 +210,5 @@ index be2e31de..6d21c326 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.15.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0021-Only-refresh-abilities-if-needed.patch b/Spigot-Server-Patches/0020-Only-refresh-abilities-if-needed.patch
similarity index 91%
rename from Spigot-Server-Patches/0021-Only-refresh-abilities-if-needed.patch
rename to Spigot-Server-Patches/0020-Only-refresh-abilities-if-needed.patch
index c28344e4f5..cbc1fb4f96 100644
--- a/Spigot-Server-Patches/0021-Only-refresh-abilities-if-needed.patch
+++ b/Spigot-Server-Patches/0020-Only-refresh-abilities-if-needed.patch
@@ -1,11 +1,11 @@
-From df2f6f2f9147373fdf3905ae725faae4050e70aa Mon Sep 17 00:00:00 2001
+From bd2bf58607934dcb2249509a5c85337d570067b7 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 fa91ecbef..d911a8a08 100644
+index aec4f8aa..cc0e7b0c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1245,12 +1245,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -24,5 +24,5 @@ index fa91ecbef..d911a8a08 100644
  
      @Override
 -- 
-2.15.0
+2.14.3
 
diff --git a/Spigot-Server-Patches/0022-Add-async-chunk-load-API.patch b/Spigot-Server-Patches/0021-Add-async-chunk-load-API.patch
similarity index 92%
rename from Spigot-Server-Patches/0022-Add-async-chunk-load-API.patch
rename to Spigot-Server-Patches/0021-Add-async-chunk-load-API.patch
index 557f2b62e7..63b0030b8f 100644
--- a/Spigot-Server-Patches/0022-Add-async-chunk-load-API.patch
+++ b/Spigot-Server-Patches/0021-Add-async-chunk-load-API.patch
@@ -1,11 +1,11 @@
-From f647a0ac1262878131e46148d82bd16ec24a0d10 Mon Sep 17 00:00:00 2001
+From 60346178095179c691b4c2e164edd907116e3089 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 ef8165da4..01fc193db 100644
+index ef8165da..01fc193d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -134,6 +134,26 @@ public class CraftWorld implements World {
@@ -36,5 +36,5 @@ index ef8165da4..01fc193db 100644
          return this.world.getChunkProviderServer().getChunkAt(x, z).bukkitChunk;
      }
 -- 
-2.15.0
+2.14.3
 
diff --git a/Spigot-Server-Patches/0023-Entity-Origin-API.patch b/Spigot-Server-Patches/0022-Entity-Origin-API.patch
similarity index 95%
rename from Spigot-Server-Patches/0023-Entity-Origin-API.patch
rename to Spigot-Server-Patches/0022-Entity-Origin-API.patch
index d6848eed59..ed31808d42 100644
--- a/Spigot-Server-Patches/0023-Entity-Origin-API.patch
+++ b/Spigot-Server-Patches/0022-Entity-Origin-API.patch
@@ -1,11 +1,11 @@
-From ee0d7d7e916d947a8fb486318b86b998649687ab Mon Sep 17 00:00:00 2001
+From fd41ee4d876889ccaa0a1e76c921b3f0ceec80af Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 23:45:08 -0600
 Subject: [PATCH] Entity Origin API
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 90be49189..00487dd5f 100644
+index 90be4918..00487dd5 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -149,6 +149,7 @@ public abstract class Entity implements ICommandListener {
@@ -51,7 +51,7 @@ index 90be49189..00487dd5f 100644
          NBTTagList nbttaglist = new NBTTagList();
          double[] adouble1 = adouble;
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index 2ba5d51a5..abdc2dea9 100644
+index 2ba5d51a..abdc2dea 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
 @@ -267,6 +267,14 @@ public class EntityFallingBlock extends Entity {
@@ -70,7 +70,7 @@ index 2ba5d51a5..abdc2dea9 100644
  
      public void a(boolean flag) {
 diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
-index 0d70dd1d2..bb0904f86 100644
+index 0d70dd1d..bb0904f8 100644
 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 @@ -109,6 +109,14 @@ public class EntityTNTPrimed extends Entity {
@@ -89,7 +89,7 @@ index 0d70dd1d2..bb0904f86 100644
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/NBTTagList.java b/src/main/java/net/minecraft/server/NBTTagList.java
-index bc6383669..ca9eb2f3b 100644
+index bc638366..ca9eb2f3 100644
 --- a/src/main/java/net/minecraft/server/NBTTagList.java
 +++ b/src/main/java/net/minecraft/server/NBTTagList.java
 @@ -153,6 +153,7 @@ public class NBTTagList extends NBTBase {
@@ -101,7 +101,7 @@ index bc6383669..ca9eb2f3b 100644
          if (i >= 0 && i < this.list.size()) {
              NBTBase nbtbase = (NBTBase) this.list.get(i);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 26d4bd690..31b765dea 100644
+index 26d4bd69..31b765de 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1071,6 +1071,12 @@ public abstract class World implements IBlockAccess {
@@ -118,7 +118,7 @@ index 26d4bd690..31b765dea 100644
              flag = true;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 9958bf869..0f38abaf8 100644
+index 9958bf86..0f38abaf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -754,4 +754,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -135,5 +135,5 @@ index 9958bf869..0f38abaf8 100644
 +    // Paper end
  }
 -- 
-2.15.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0024-Prevent-tile-entity-and-entity-crashes.patch b/Spigot-Server-Patches/0023-Prevent-tile-entity-and-entity-crashes.patch
similarity index 96%
rename from Spigot-Server-Patches/0024-Prevent-tile-entity-and-entity-crashes.patch
rename to Spigot-Server-Patches/0023-Prevent-tile-entity-and-entity-crashes.patch
index 4c100fad42..13656f41c6 100644
--- a/Spigot-Server-Patches/0024-Prevent-tile-entity-and-entity-crashes.patch
+++ b/Spigot-Server-Patches/0023-Prevent-tile-entity-and-entity-crashes.patch
@@ -1,11 +1,11 @@
-From 80f84d70004416226822704a2c67d06c21967b1d Mon Sep 17 00:00:00 2001
+From 5c582595ec7258d05855fe076e4fc24b1e62aeaf Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 Mar 2016 23:52:34 -0600
 Subject: [PATCH] Prevent tile entity and entity crashes
 
 
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index d2d4ff6fb..65297a761 100644
+index d2d4ff6f..65297a76 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -175,7 +175,12 @@ public abstract class TileEntity {
@@ -23,7 +23,7 @@ index d2d4ff6fb..65297a761 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 31b765dea..fd5f8102a 100644
+index 31b765de..fd5f8102 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1449,10 +1449,12 @@ public abstract class World implements IBlockAccess {
@@ -62,5 +62,5 @@ index 31b765dea..fd5f8102a 100644
                      // Spigot start
                      finally {
 -- 
-2.15.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch b/Spigot-Server-Patches/0024-Configurable-top-of-nether-void-damage.patch
similarity index 93%
rename from Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch
rename to Spigot-Server-Patches/0024-Configurable-top-of-nether-void-damage.patch
index 65b695c3e4..742a5cb07b 100644
--- a/Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch
+++ b/Spigot-Server-Patches/0024-Configurable-top-of-nether-void-damage.patch
@@ -1,14 +1,14 @@
-From 1cbc8e2e11753a3b5ca6dd8f1f66efcf629a4bba Mon Sep 17 00:00:00 2001
+From c65ba7f6ff965da2d8b2beff4fdaf0fbe65f4091 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 23:58:50 -0600
 Subject: [PATCH] Configurable top of nether void damage
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 62e6830aa..e524a464f 100644
+index d3484489..bf7af475 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -137,4 +137,10 @@ public class PaperWorldConfig {
+@@ -129,4 +129,10 @@ public class PaperWorldConfig {
          waterOverLavaFlowSpeed = getInt("water-over-lava-flow-speed", 5);
          log("Water over lava flow speed: " + waterOverLavaFlowSpeed);
      }
@@ -20,7 +20,7 @@ index 62e6830aa..e524a464f 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 00487dd5f..9ee8c40a5 100644
+index 00487dd5..9ee8c40a 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -450,9 +450,15 @@ public abstract class Entity implements ICommandListener {
@@ -67,7 +67,7 @@ index 00487dd5f..9ee8c40a5 100644
          this.die();
      }
 diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
-index 82795ee87..f8da1887d 100644
+index 82795ee8..f8da1887 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 @@ -204,9 +204,15 @@ public abstract class EntityMinecartAbstract extends Entity implements INamableT
diff --git a/Spigot-Server-Patches/0026-Check-online-mode-before-converting-and-renaming-pla.patch b/Spigot-Server-Patches/0025-Check-online-mode-before-converting-and-renaming-pla.patch
similarity index 90%
rename from Spigot-Server-Patches/0026-Check-online-mode-before-converting-and-renaming-pla.patch
rename to Spigot-Server-Patches/0025-Check-online-mode-before-converting-and-renaming-pla.patch
index 8ad77b4d4e..7f84fa768a 100644
--- a/Spigot-Server-Patches/0026-Check-online-mode-before-converting-and-renaming-pla.patch
+++ b/Spigot-Server-Patches/0025-Check-online-mode-before-converting-and-renaming-pla.patch
@@ -1,11 +1,11 @@
-From 46e9f8769e155aa2e047d3f373c816b6880243f3 Mon Sep 17 00:00:00 2001
+From b94394ffcc1baf20e676b78eecf2a1773581f0b2 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 2 Mar 2016 00:03:55 -0600
 Subject: [PATCH] Check online mode before converting and renaming player data
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
-index b69c6cf97..eba1228fd 100644
+index b69c6cf9..eba1228f 100644
 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
 +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
 @@ -167,7 +167,7 @@ public class WorldNBTStorage implements IDataManager, IPlayerFileData {
@@ -18,5 +18,5 @@ index b69c6cf97..eba1228fd 100644
                  file = new File( this.playerDir, UUID.nameUUIDFromBytes( ( "OfflinePlayer:" + entityhuman.getName() ).getBytes( "UTF-8" ) ).toString() + ".dat");
                  if ( file.exists() )
 -- 
-2.13.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0027-Always-tick-falling-blocks.patch b/Spigot-Server-Patches/0026-Always-tick-falling-blocks.patch
similarity index 91%
rename from Spigot-Server-Patches/0027-Always-tick-falling-blocks.patch
rename to Spigot-Server-Patches/0026-Always-tick-falling-blocks.patch
index b0dade80d7..abf142c407 100644
--- a/Spigot-Server-Patches/0027-Always-tick-falling-blocks.patch
+++ b/Spigot-Server-Patches/0026-Always-tick-falling-blocks.patch
@@ -1,11 +1,11 @@
-From b5310cf63d22fdf8714b2bfaea8ce9c66c3d5758 Mon Sep 17 00:00:00 2001
+From f2a09d0c6b52c8298494189dc30eebe1be91443e Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 2 Mar 2016 00:32:25 -0600
 Subject: [PATCH] Always tick falling blocks
 
 
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 5c2fb0058..c411ce886 100644
+index 38be7ed7..3265a6c2 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -13,6 +13,7 @@ import net.minecraft.server.EntityCreature;
@@ -25,5 +25,5 @@ index 5c2fb0058..c411ce886 100644
                  || entity instanceof EntityFireworks )
          {
 -- 
-2.12.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0028-Lighting-Queue.patch b/Spigot-Server-Patches/0027-Lighting-Queue.patch
similarity index 98%
rename from Spigot-Server-Patches/0028-Lighting-Queue.patch
rename to Spigot-Server-Patches/0027-Lighting-Queue.patch
index 0b220ca90e..0b74563424 100644
--- a/Spigot-Server-Patches/0028-Lighting-Queue.patch
+++ b/Spigot-Server-Patches/0027-Lighting-Queue.patch
@@ -1,4 +1,4 @@
-From 1564084393d4718d099082ea434dd8f2b1a0b53a Mon Sep 17 00:00:00 2001
+From 40710ffc3a3e33ad680988e1bace785d72779f99 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
@@ -27,10 +27,10 @@ index e0ad559b..4eebd9fa 100644
      }
  }
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e524a464..fd606ee1 100644
+index bf7af475..94a17304 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -143,4 +143,10 @@ public class PaperWorldConfig {
+@@ -135,4 +135,10 @@ public class PaperWorldConfig {
          netherVoidTopDamage = getBoolean( "nether-ceiling-void-damage", false );
          log("Top of the nether void damage: " + netherVoidTopDamage);
      }
@@ -245,5 +245,5 @@ index fd5f8102..77ed2d24 100644
                  }
  
 -- 
-2.15.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0029-Configurable-end-credits.patch b/Spigot-Server-Patches/0028-Configurable-end-credits.patch
similarity index 91%
rename from Spigot-Server-Patches/0029-Configurable-end-credits.patch
rename to Spigot-Server-Patches/0028-Configurable-end-credits.patch
index 7f4d61eb60..4dd1b4983e 100644
--- a/Spigot-Server-Patches/0029-Configurable-end-credits.patch
+++ b/Spigot-Server-Patches/0028-Configurable-end-credits.patch
@@ -1,14 +1,14 @@
-From e32cd6dae671845a2b59511787b802cadcb60222 Mon Sep 17 00:00:00 2001
+From 0d4cacaffc984e789135355f9b2f7eac2983f7af Mon Sep 17 00:00:00 2001
 From: DoctorDark <doctordark11@gmail.com>
 Date: Wed, 16 Mar 2016 02:21:39 -0500
 Subject: [PATCH] Configurable end credits
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index fd606ee14..c00fa83d5 100644
+index 94a17304..db09711e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -149,4 +149,10 @@ public class PaperWorldConfig {
+@@ -141,4 +141,10 @@ public class PaperWorldConfig {
          queueLightUpdates = getBoolean("queue-light-updates", false);
          log("Lighting Queue enabled: " + queueLightUpdates);
      }
@@ -20,7 +20,7 @@ index fd606ee14..c00fa83d5 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index e2369e7f2..efce9048b 100644
+index 4e71963b..9829cdd8 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -56,7 +56,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -41,5 +41,5 @@ index e2369e7f2..efce9048b 100644
                  this.cq = true;
              }
 -- 
-2.13.0
+2.14.3
 
diff --git a/Spigot-Server-Patches/0030-Fix-lag-from-explosions-processing-dead-entities.patch b/Spigot-Server-Patches/0029-Fix-lag-from-explosions-processing-dead-entities.patch
similarity index 93%
rename from Spigot-Server-Patches/0030-Fix-lag-from-explosions-processing-dead-entities.patch
rename to Spigot-Server-Patches/0029-Fix-lag-from-explosions-processing-dead-entities.patch
index cab915b3af..1e9b5671ac 100644
--- a/Spigot-Server-Patches/0030-Fix-lag-from-explosions-processing-dead-entities.patch
+++ b/Spigot-Server-Patches/0029-Fix-lag-from-explosions-processing-dead-entities.patch
@@ -1,11 +1,11 @@
-From 65e62f2e8061d17c5703124546f56bb1b1b7fb64 Mon Sep 17 00:00:00 2001
+From d0691988443de01bda2253f429d0d19fe988a125 Mon Sep 17 00:00:00 2001
 From: Iceee <andrew@opticgaming.tv>
 Date: Wed, 2 Mar 2016 01:39:52 -0600
 Subject: [PATCH] Fix lag from explosions processing dead entities
 
 
 diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
-index 904bee8b..4e05bcdf 100644
+index 98c2bdcf..a1ebcf85 100644
 --- a/src/main/java/net/minecraft/server/Explosion.java
 +++ b/src/main/java/net/minecraft/server/Explosion.java
 @@ -104,7 +104,14 @@ public class Explosion {
@@ -25,5 +25,5 @@ index 904bee8b..4e05bcdf 100644
  
          for (int l1 = 0; l1 < list.size(); ++l1) {
 -- 
-2.12.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0031-Generator-Settings.patch b/Spigot-Server-Patches/0030-Generator-Settings.patch
similarity index 96%
rename from Spigot-Server-Patches/0031-Generator-Settings.patch
rename to Spigot-Server-Patches/0030-Generator-Settings.patch
index e6ced082bb..743cbdec33 100644
--- a/Spigot-Server-Patches/0031-Generator-Settings.patch
+++ b/Spigot-Server-Patches/0030-Generator-Settings.patch
@@ -1,14 +1,14 @@
-From 73b4d3a44527decb181748068a02c35cf587593d Mon Sep 17 00:00:00 2001
+From d247ea32a5da80867333bba8c86e284be41fa4a1 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 02:17:54 -0600
 Subject: [PATCH] Generator Settings
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index c00fa83d5..3b19b53a8 100644
+index db09711e..80500108 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -155,4 +155,28 @@ public class PaperWorldConfig {
+@@ -147,4 +147,28 @@ public class PaperWorldConfig {
          disableEndCredits = getBoolean("game-mechanics.disable-end-credits", false);
          log("End credits disabled: " + disableEndCredits);
      }
@@ -38,7 +38,7 @@ index c00fa83d5..3b19b53a8 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java
-index 1b7599769..ab6db7468 100644
+index 1b759976..ab6db746 100644
 --- a/src/main/java/net/minecraft/server/BiomeBase.java
 +++ b/src/main/java/net/minecraft/server/BiomeBase.java
 @@ -176,7 +176,7 @@ public abstract class BiomeBase {
@@ -51,7 +51,7 @@ index 1b7599769..ab6db7468 100644
              } else {
                  IBlockData iblockdata2 = chunksnapshot.a(k1, l1, j1);
 diff --git a/src/main/java/net/minecraft/server/BiomeMesa.java b/src/main/java/net/minecraft/server/BiomeMesa.java
-index f2dd96a32..0541403f0 100644
+index f2dd96a3..0541403f 100644
 --- a/src/main/java/net/minecraft/server/BiomeMesa.java
 +++ b/src/main/java/net/minecraft/server/BiomeMesa.java
 @@ -99,7 +99,7 @@ public class BiomeMesa extends BiomeBase {
@@ -64,7 +64,7 @@ index f2dd96a32..0541403f0 100644
              } else if (l1 < 15 || this.I) {
                  IBlockData iblockdata2 = chunksnapshot.a(l, i2, k);
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderFlat.java b/src/main/java/net/minecraft/server/ChunkProviderFlat.java
-index 1452ff657..8b1b79380 100644
+index 1452ff65..8b1b7938 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderFlat.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderFlat.java
 @@ -26,7 +26,7 @@ public class ChunkProviderFlat implements ChunkGenerator {
@@ -110,7 +110,7 @@ index 1452ff657..8b1b79380 100644
          int k = 0;
          boolean flag1 = true;
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderGenerate.java b/src/main/java/net/minecraft/server/ChunkProviderGenerate.java
-index 22a24a39f..ee9e00e64 100644
+index 22a24a39..ee9e00e6 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderGenerate.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderGenerate.java
 @@ -160,32 +160,32 @@ public class ChunkProviderGenerate implements ChunkGenerator {
@@ -221,7 +221,7 @@ index 22a24a39f..ee9e00e64 100644
              }
  
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderHell.java b/src/main/java/net/minecraft/server/ChunkProviderHell.java
-index 9f738749f..12bc10ff0 100644
+index 9f738749..12bc10ff 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderHell.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderHell.java
 @@ -151,7 +151,10 @@ public class ChunkProviderHell implements ChunkGenerator {
@@ -245,7 +245,7 @@ index 9f738749f..12bc10ff0 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java
-index 2580a4cf6..078957aac 100644
+index 66a80a77..34fd7edf 100644
 --- a/src/main/java/net/minecraft/server/StructureGenerator.java
 +++ b/src/main/java/net/minecraft/server/StructureGenerator.java
 @@ -128,6 +128,7 @@ public abstract class StructureGenerator extends WorldGenBase {
@@ -257,5 +257,5 @@ index 2580a4cf6..078957aac 100644
          ObjectIterator objectiterator = this.c.values().iterator();
  
 -- 
-2.13.0
+2.14.3
 
diff --git a/Spigot-Server-Patches/0032-Optimize-explosions.patch b/Spigot-Server-Patches/0031-Optimize-explosions.patch
similarity index 96%
rename from Spigot-Server-Patches/0032-Optimize-explosions.patch
rename to Spigot-Server-Patches/0031-Optimize-explosions.patch
index d0f5affc51..e2d8dd8712 100644
--- a/Spigot-Server-Patches/0032-Optimize-explosions.patch
+++ b/Spigot-Server-Patches/0031-Optimize-explosions.patch
@@ -1,4 +1,4 @@
-From 364b6430061c2056ad9cc389dd712a6b53cb56a0 Mon Sep 17 00:00:00 2001
+From a5de89e41e9dcf763cd0318fbab687fb11f534f7 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
@@ -10,10 +10,10 @@ This patch adds a per-tick cache that is used for storing and retrieving
 an entity's exposure during an explosion.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 3b19b53a8..a7dfd2af7 100644
+index 80500108..20e1e0c2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -179,4 +179,10 @@ public class PaperWorldConfig {
+@@ -171,4 +171,10 @@ public class PaperWorldConfig {
          generateVillage = getBoolean("generator-settings.village", true);
          generateFlatBedrock = getBoolean("generator-settings.flat-bedrock", false);
      }
@@ -25,7 +25,7 @@ index 3b19b53a8..a7dfd2af7 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
-index a1ebcf858..e7f0e84d4 100644
+index a1ebcf85..e7f0e84d 100644
 --- a/src/main/java/net/minecraft/server/Explosion.java
 +++ b/src/main/java/net/minecraft/server/Explosion.java
 @@ -130,7 +130,7 @@ public class Explosion {
@@ -124,7 +124,7 @@ index a1ebcf858..e7f0e84d4 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5b0431c57..a5e3b13cc 100644
+index d63a243f..4e8ce79f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -889,6 +889,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -136,7 +136,7 @@ index 5b0431c57..a5e3b13cc 100644
  
              // this.i[i][this.ticks % 100] = System.nanoTime() - j; // CraftBukkit
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 763f21570..7aeb46d12 100644
+index 77ed2d24..fc7315f7 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -16,6 +16,7 @@ import javax.annotation.Nullable;
@@ -156,5 +156,5 @@ index 763f21570..7aeb46d12 100644
      public CraftWorld getWorld() {
          return this.world;
 -- 
-2.13.3.windows.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0033-Stop-updating-flowing-block-if-material-has-changed.patch b/Spigot-Server-Patches/0032-Stop-updating-flowing-block-if-material-has-changed.patch
similarity index 89%
rename from Spigot-Server-Patches/0033-Stop-updating-flowing-block-if-material-has-changed.patch
rename to Spigot-Server-Patches/0032-Stop-updating-flowing-block-if-material-has-changed.patch
index c26dca3854..8e616e4b08 100644
--- a/Spigot-Server-Patches/0033-Stop-updating-flowing-block-if-material-has-changed.patch
+++ b/Spigot-Server-Patches/0032-Stop-updating-flowing-block-if-material-has-changed.patch
@@ -1,11 +1,11 @@
-From 4286caaef0038d040cac7066e78873f7fe5c44d0 Mon Sep 17 00:00:00 2001
+From d03ae937e89c84d1069229eb94714aa1f2b2e009 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
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java
-index f4ac7bafa..801b9cb7b 100644
+index 62234a7c..3b47253a 100644
 --- a/src/main/java/net/minecraft/server/BlockFlowing.java
 +++ b/src/main/java/net/minecraft/server/BlockFlowing.java
 @@ -90,6 +90,7 @@ public class BlockFlowing extends BlockFluids {
@@ -17,5 +17,5 @@ index f4ac7bafa..801b9cb7b 100644
          IBlockData iblockdata2 = world.getType(blockposition.down());
  
 -- 
-2.12.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0034-Fast-draining.patch b/Spigot-Server-Patches/0033-Fast-draining.patch
similarity index 96%
rename from Spigot-Server-Patches/0034-Fast-draining.patch
rename to Spigot-Server-Patches/0033-Fast-draining.patch
index 534ac2fc71..2ce4bd4329 100644
--- a/Spigot-Server-Patches/0034-Fast-draining.patch
+++ b/Spigot-Server-Patches/0033-Fast-draining.patch
@@ -1,14 +1,14 @@
-From ccf86c26bd1bd5ec98c8410fd7140cf5830b16af Mon Sep 17 00:00:00 2001
+From 292af58c27a5bf3bd7e09cd1f03401a877d70716 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index a7dfd2af7..e093f7dc1 100644
+index 20e1e0c2..3b96b16f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -185,4 +185,11 @@ public class PaperWorldConfig {
+@@ -177,4 +177,11 @@ public class PaperWorldConfig {
          optimizeExplosions = getBoolean("optimize-explosions", false);
          log("Optimize explosions: " + optimizeExplosions);
      }
@@ -21,7 +21,7 @@ index a7dfd2af7..e093f7dc1 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java
-index 801b9cb7b..8e9de3bcb 100644
+index 3b47253a..3aaa19b2 100644
 --- a/src/main/java/net/minecraft/server/BlockFlowing.java
 +++ b/src/main/java/net/minecraft/server/BlockFlowing.java
 @@ -69,7 +69,7 @@ public class BlockFlowing extends BlockFluids {
@@ -109,5 +109,5 @@ index 801b9cb7b..8e9de3bcb 100644
 +    // Paper end
  }
 -- 
-2.12.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0035-Configurable-lava-flow-speed.patch b/Spigot-Server-Patches/0034-Configurable-lava-flow-speed.patch
similarity index 90%
rename from Spigot-Server-Patches/0035-Configurable-lava-flow-speed.patch
rename to Spigot-Server-Patches/0034-Configurable-lava-flow-speed.patch
index bce1782151..6cda9ca5c6 100644
--- a/Spigot-Server-Patches/0035-Configurable-lava-flow-speed.patch
+++ b/Spigot-Server-Patches/0034-Configurable-lava-flow-speed.patch
@@ -1,14 +1,14 @@
-From ec526d2a02bbc74f962bf21806940ad169baed8e Mon Sep 17 00:00:00 2001
+From ec63fe67dffe84268e752bf409cd3b1dfc9f1cb3 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e093f7dc1..a197af84f 100644
+index 3b96b16f..e2d4f4bf 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -192,4 +192,11 @@ public class PaperWorldConfig {
+@@ -184,4 +184,11 @@ public class PaperWorldConfig {
          fastDrainLava = getBoolean("fast-drain.lava", false);
          fastDrainWater = getBoolean("fast-drain.water", false);
      }
@@ -21,7 +21,7 @@ index e093f7dc1..a197af84f 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java
-index 8e9de3bcb..0a2823686 100644
+index 3aaa19b2..739b9aac 100644
 --- a/src/main/java/net/minecraft/server/BlockFlowing.java
 +++ b/src/main/java/net/minecraft/server/BlockFlowing.java
 @@ -272,6 +272,9 @@ public class BlockFlowing extends BlockFluids {
@@ -35,7 +35,7 @@ index 8e9de3bcb..0a2823686 100644
                  world.getType(blockposition.north(1)).getBlock().material == Material.LAVA ||
                          world.getType(blockposition.south(1)).getBlock().material == Material.LAVA ||
 diff --git a/src/main/java/net/minecraft/server/WorldProvider.java b/src/main/java/net/minecraft/server/WorldProvider.java
-index 660f3bcce..a27512c0f 100644
+index f3eb2a79..d0265f96 100644
 --- a/src/main/java/net/minecraft/server/WorldProvider.java
 +++ b/src/main/java/net/minecraft/server/WorldProvider.java
 @@ -114,6 +114,7 @@ public abstract class WorldProvider {
@@ -47,5 +47,5 @@ index 660f3bcce..a27512c0f 100644
          return this.e;
      }
 -- 
-2.12.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0036-Add-player-view-distance-API.patch b/Spigot-Server-Patches/0035-Add-player-view-distance-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0036-Add-player-view-distance-API.patch
rename to Spigot-Server-Patches/0035-Add-player-view-distance-API.patch
index d850b8401e..30986d5272 100644
--- a/Spigot-Server-Patches/0036-Add-player-view-distance-API.patch
+++ b/Spigot-Server-Patches/0035-Add-player-view-distance-API.patch
@@ -1,11 +1,11 @@
-From 499e727e164124868aab6b4af116148f141cbcdf Mon Sep 17 00:00:00 2001
+From 7fc0df5e4ebc2e181f11411824fb7631ebef35a8 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 9829cdd89..5b0675718 100644
+index 9829cdd8..5b067571 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -66,6 +66,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -25,7 +25,7 @@ index 9829cdd89..5b0675718 100644
      // CraftBukkit start
      public String displayName;
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index e4ed2e991..9627a9be0 100644
+index e4ed2e99..9627a9be 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -47,7 +47,7 @@ public class PlayerChunkMap {
@@ -203,7 +203,7 @@ index e4ed2e991..9627a9be0 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 d911a8a08..81f005177 100644
+index cc0e7b0c..7ee4965a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1555,6 +1555,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -224,5 +224,5 @@ index d911a8a08..81f005177 100644
      private final Player.Spigot spigot = new Player.Spigot()
      {
 -- 
-2.15.0
+2.14.3
 
diff --git a/Spigot-Server-Patches/0037-Disable-explosion-knockback.patch b/Spigot-Server-Patches/0036-Disable-explosion-knockback.patch
similarity index 94%
rename from Spigot-Server-Patches/0037-Disable-explosion-knockback.patch
rename to Spigot-Server-Patches/0036-Disable-explosion-knockback.patch
index 01adf3400a..824f4bd4d1 100644
--- a/Spigot-Server-Patches/0037-Disable-explosion-knockback.patch
+++ b/Spigot-Server-Patches/0036-Disable-explosion-knockback.patch
@@ -1,14 +1,14 @@
-From 4222ad3d72e67eaf41b1e57ff7d0ba4c45bd6c80 Mon Sep 17 00:00:00 2001
+From 81aa797bd3b65e8a0b413fa9a273207bec071b5b Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 14:48:03 -0600
 Subject: [PATCH] Disable explosion knockback
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index a197af84f..2217f680c 100644
+index e2d4f4bf..23a78adb 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -199,4 +199,9 @@ public class PaperWorldConfig {
+@@ -191,4 +191,9 @@ public class PaperWorldConfig {
          lavaFlowSpeedNormal = getInt("lava-flow-speed.normal", 30);
          lavaFlowSpeedNether = getInt("lava-flow-speed.nether", 10);
      }
@@ -19,7 +19,7 @@ index a197af84f..2217f680c 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index e8401bba7..5a6b33981 100644
+index e8401bba..5a6b3398 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -906,6 +906,7 @@ public abstract class EntityLiving extends Entity {
@@ -48,7 +48,7 @@ index e8401bba7..5a6b33981 100644
                      if (!this.e(damagesource)) {
                          SoundEffect soundeffect = this.cf();
 diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
-index e7f0e84d4..e148901e5 100644
+index e7f0e84d..e148901e 100644
 --- a/src/main/java/net/minecraft/server/Explosion.java
 +++ b/src/main/java/net/minecraft/server/Explosion.java
 @@ -146,7 +146,7 @@ public class Explosion {
diff --git a/Spigot-Server-Patches/0038-Disable-thunder.patch b/Spigot-Server-Patches/0037-Disable-thunder.patch
similarity index 88%
rename from Spigot-Server-Patches/0038-Disable-thunder.patch
rename to Spigot-Server-Patches/0037-Disable-thunder.patch
index 4566343197..d0fa1b80bd 100644
--- a/Spigot-Server-Patches/0038-Disable-thunder.patch
+++ b/Spigot-Server-Patches/0037-Disable-thunder.patch
@@ -1,14 +1,14 @@
-From 2a74cffa0e22d482770a5e995adbe1ffe4945b9c Mon Sep 17 00:00:00 2001
+From 83f30f8074c950acb3da0d367b88805ee3302dea Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 14:52:43 -0600
 Subject: [PATCH] Disable thunder
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 2217f680c..a40d4887c 100644
+index 23a78adb..675c8c87 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -204,4 +204,9 @@ public class PaperWorldConfig {
+@@ -196,4 +196,9 @@ public class PaperWorldConfig {
      private void disableExplosionKnockback(){
          disableExplosionKnockback = getBoolean("disable-explosion-knockback", false);
      }
@@ -19,7 +19,7 @@ index 2217f680c..a40d4887c 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index ce8fe791d..e52b14792 100644
+index e492913a..95ea3924 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -485,7 +485,8 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -33,5 +33,5 @@ index ce8fe791d..e52b14792 100644
                      l = this.l >> 2;
                      blockposition = this.a(new BlockPosition(j + (l & 15), 0, k + (l >> 8 & 15)));
 -- 
-2.13.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0039-Disable-ice-and-snow.patch b/Spigot-Server-Patches/0038-Disable-ice-and-snow.patch
similarity index 88%
rename from Spigot-Server-Patches/0039-Disable-ice-and-snow.patch
rename to Spigot-Server-Patches/0038-Disable-ice-and-snow.patch
index e26d325414..f9581a997b 100644
--- a/Spigot-Server-Patches/0039-Disable-ice-and-snow.patch
+++ b/Spigot-Server-Patches/0038-Disable-ice-and-snow.patch
@@ -1,14 +1,14 @@
-From 4c057fc2149e1d6c3f6ef31d72acd13092d319f5 Mon Sep 17 00:00:00 2001
+From 74938698c481006668aab13a9b353407011eb511 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 14:57:24 -0600
 Subject: [PATCH] Disable ice and snow
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index a40d4887c..4fea4b359 100644
+index 675c8c87..49d14b8e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -209,4 +209,9 @@ public class PaperWorldConfig {
+@@ -201,4 +201,9 @@ public class PaperWorldConfig {
      private void disableThunder() {
          disableThunder = getBoolean("disable-thunder", false);
      }
@@ -19,7 +19,7 @@ index a40d4887c..4fea4b359 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index e52b14792..bb07b1d66 100644
+index 95ea3924..9ef492f1 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -508,7 +508,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -32,5 +32,5 @@ index e52b14792..bb07b1d66 100644
                      l = this.l >> 2;
                      blockposition = this.p(new BlockPosition(j + (l & 15), 0, k + (l >> 8 & 15)));
 -- 
-2.13.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0040-Configurable-mob-spawner-tick-rate.patch b/Spigot-Server-Patches/0039-Configurable-mob-spawner-tick-rate.patch
similarity index 92%
rename from Spigot-Server-Patches/0040-Configurable-mob-spawner-tick-rate.patch
rename to Spigot-Server-Patches/0039-Configurable-mob-spawner-tick-rate.patch
index 0587195b61..746cb61794 100644
--- a/Spigot-Server-Patches/0040-Configurable-mob-spawner-tick-rate.patch
+++ b/Spigot-Server-Patches/0039-Configurable-mob-spawner-tick-rate.patch
@@ -1,14 +1,14 @@
-From e57d4c1008d43b0b3e1aba3764a8336803b24a00 Mon Sep 17 00:00:00 2001
+From 7a2448f69b80dd8fce3f0e1516f1330ebb1a35a4 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 15:03:53 -0600
 Subject: [PATCH] Configurable mob spawner tick rate
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 4fea4b359..1bb956515 100644
+index 49d14b8e..1fd29332 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -214,4 +214,9 @@ public class PaperWorldConfig {
+@@ -206,4 +206,9 @@ public class PaperWorldConfig {
      private void disableIceAndSnow(){
          disableIceAndSnow = getBoolean("disable-ice-and-snow", false);
      }
@@ -19,7 +19,7 @@ index 4fea4b359..1bb956515 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index e87f90474..0562c6e34 100644
+index e87f9047..0562c6e3 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -19,6 +19,7 @@ public abstract class MobSpawnerAbstract {
@@ -64,5 +64,5 @@ index e87f90474..0562c6e34 100644
                  }
  
 -- 
-2.13.4
+2.14.3
 
diff --git a/Spigot-Server-Patches/0041-Send-absolute-position-the-first-time-an-entity-is-s.patch b/Spigot-Server-Patches/0040-Send-absolute-position-the-first-time-an-entity-is-s.patch
similarity index 97%
rename from Spigot-Server-Patches/0041-Send-absolute-position-the-first-time-an-entity-is-s.patch
rename to Spigot-Server-Patches/0040-Send-absolute-position-the-first-time-an-entity-is-s.patch
index 6ab443fc2d..bc2c32f7bf 100644
--- a/Spigot-Server-Patches/0041-Send-absolute-position-the-first-time-an-entity-is-s.patch
+++ b/Spigot-Server-Patches/0040-Send-absolute-position-the-first-time-an-entity-is-s.patch
@@ -1,11 +1,11 @@
-From e2339144ecaec2b719659708e3567d04d491cdb3 Mon Sep 17 00:00:00 2001
+From 00b4d0840ad4aa83fd9f668f114997cbf00e3105 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Wed, 2 Mar 2016 23:13:07 -0600
 Subject: [PATCH] Send absolute position the first time an entity is seen
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index 1493f9ab3..f542bf491 100644
+index d864c774..4c6eb6ed 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -41,7 +41,12 @@ public class EntityTrackerEntry {
@@ -76,5 +76,5 @@ index 1493f9ab3..f542bf491 100644
  
                      entityplayer.playerConnection.sendPacket(packet);
 -- 
-2.12.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0042-Add-BeaconEffectEvent.patch b/Spigot-Server-Patches/0041-Add-BeaconEffectEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0042-Add-BeaconEffectEvent.patch
rename to Spigot-Server-Patches/0041-Add-BeaconEffectEvent.patch
index f83fb5d602..9d9fa64bd3 100644
--- a/Spigot-Server-Patches/0042-Add-BeaconEffectEvent.patch
+++ b/Spigot-Server-Patches/0041-Add-BeaconEffectEvent.patch
@@ -1,11 +1,11 @@
-From 3308547d075d0d0e431b0273cfba7fcc8d38444b Mon Sep 17 00:00:00 2001
+From f4d8d65c9697b298b90b1eb269ff0e2ab86698ac Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 23:30:53 -0600
 Subject: [PATCH] Add BeaconEffectEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityBeacon.java b/src/main/java/net/minecraft/server/TileEntityBeacon.java
-index 6f2fcd22e..71ecc5493 100644
+index b84a2ce5..a57b1717 100644
 --- a/src/main/java/net/minecraft/server/TileEntityBeacon.java
 +++ b/src/main/java/net/minecraft/server/TileEntityBeacon.java
 @@ -16,6 +16,14 @@ import org.bukkit.entity.HumanEntity;
@@ -69,5 +69,5 @@ index 6f2fcd22e..71ecc5493 100644
          }
  
 -- 
-2.12.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0043-Configurable-container-update-tick-rate.patch b/Spigot-Server-Patches/0042-Configurable-container-update-tick-rate.patch
similarity index 90%
rename from Spigot-Server-Patches/0043-Configurable-container-update-tick-rate.patch
rename to Spigot-Server-Patches/0042-Configurable-container-update-tick-rate.patch
index dcc6de990d..5ada7216cd 100644
--- a/Spigot-Server-Patches/0043-Configurable-container-update-tick-rate.patch
+++ b/Spigot-Server-Patches/0042-Configurable-container-update-tick-rate.patch
@@ -1,14 +1,14 @@
-From a2edd27f9aa96f68765c103e578597576c53c6cd Mon Sep 17 00:00:00 2001
+From c3a3ce641affd7a3f4247db2cf67ffcf17e2cca0 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 23:34:44 -0600
 Subject: [PATCH] Configurable container update tick rate
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 1bb956515..e6aae7317 100644
+index 1fd29332..83f9512f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -219,4 +219,9 @@ public class PaperWorldConfig {
+@@ -211,4 +211,9 @@ public class PaperWorldConfig {
      private void mobSpawnerTickRate() {
          mobSpawnerTickRate = getInt("mob-spawner-tick-rate", 1);
      }
@@ -19,7 +19,7 @@ index 1bb956515..e6aae7317 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 00d2798c2..4dedab257 100644
+index 5b067571..e48121b4 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -75,6 +75,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -45,5 +45,5 @@ index 00d2798c2..4dedab257 100644
              this.closeInventory();
              this.activeContainer = this.defaultContainer;
 -- 
-2.14.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0044-Use-UserCache-for-player-heads.patch b/Spigot-Server-Patches/0043-Use-UserCache-for-player-heads.patch
similarity index 92%
rename from Spigot-Server-Patches/0044-Use-UserCache-for-player-heads.patch
rename to Spigot-Server-Patches/0043-Use-UserCache-for-player-heads.patch
index a20b5fb030..0b78ae1497 100644
--- a/Spigot-Server-Patches/0044-Use-UserCache-for-player-heads.patch
+++ b/Spigot-Server-Patches/0043-Use-UserCache-for-player-heads.patch
@@ -1,11 +1,11 @@
-From 84333515d4922a89743e89d319d7504fb6084905 Mon Sep 17 00:00:00 2001
+From 285a7bcc278a1fb6ac0fffd27d49b13a3927365d Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Wed, 2 Mar 2016 23:42:37 -0600
 Subject: [PATCH] Use UserCache for player heads
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-index 8a58615f8..987cc9a80 100644
+index 8a58615f..987cc9a8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 @@ -6,6 +6,7 @@ import net.minecraft.server.GameProfileSerializer;
@@ -30,5 +30,5 @@ index 8a58615f8..987cc9a80 100644
  
          return true;
 -- 
-2.15.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0045-Disable-spigot-tick-limiters.patch b/Spigot-Server-Patches/0044-Disable-spigot-tick-limiters.patch
similarity index 95%
rename from Spigot-Server-Patches/0045-Disable-spigot-tick-limiters.patch
rename to Spigot-Server-Patches/0044-Disable-spigot-tick-limiters.patch
index f6cbbbc31f..fdf41456c9 100644
--- a/Spigot-Server-Patches/0045-Disable-spigot-tick-limiters.patch
+++ b/Spigot-Server-Patches/0044-Disable-spigot-tick-limiters.patch
@@ -1,11 +1,11 @@
-From b6b6996f477feb25fe5ccbd67064bc4ce83dae6c Mon Sep 17 00:00:00 2001
+From 22338f0f3207a00a9f48c20b9f394d118110981e 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 44801d898..6d200b809 100644
+index fc7315f7..e85ed2e3 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1426,10 +1426,10 @@ public abstract class World implements IBlockAccess {
@@ -35,5 +35,5 @@ index 44801d898..6d200b809 100644
              TileEntity tileentity = (TileEntity) this.tileEntityListTick.get(tileTickPosition);
              // Spigot start
 -- 
-2.15.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0046-Configurable-Chunk-IO-Thread-Base-Count.patch b/Spigot-Server-Patches/0045-Configurable-Chunk-IO-Thread-Base-Count.patch
similarity index 93%
rename from Spigot-Server-Patches/0046-Configurable-Chunk-IO-Thread-Base-Count.patch
rename to Spigot-Server-Patches/0045-Configurable-Chunk-IO-Thread-Base-Count.patch
index 2317edf22e..9b141ee859 100644
--- a/Spigot-Server-Patches/0046-Configurable-Chunk-IO-Thread-Base-Count.patch
+++ b/Spigot-Server-Patches/0045-Configurable-Chunk-IO-Thread-Base-Count.patch
@@ -1,11 +1,11 @@
-From ba2c8def84e686a6ee2afa8a33a624ba1914800c Mon Sep 17 00:00:00 2001
+From b4c98eb4f723e9e65cb7e4dbc88325fd72813d34 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 b5795b6d3..36689db74 100644
+index b5795b6d..36689db7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -199,4 +199,9 @@ public class PaperConfig {
@@ -19,7 +19,7 @@ index b5795b6d3..36689db74 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
-index e4fd9bc60..7b7a3d01b 100644
+index e4fd9bc6..7b7a3d01 100644
 --- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
 @@ -1,5 +1,6 @@
@@ -39,5 +39,5 @@ index e4fd9bc60..7b7a3d01b 100644
  
      private static final AsynchronousExecutor<QueuedChunk, Chunk, Runnable, RuntimeException> instance = new AsynchronousExecutor<QueuedChunk, Chunk, Runnable, RuntimeException>(new ChunkIOProvider(), BASE_THREADS);
 -- 
-2.14.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0047-Add-PlayerInitialSpawnEvent.patch b/Spigot-Server-Patches/0046-Add-PlayerInitialSpawnEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0047-Add-PlayerInitialSpawnEvent.patch
rename to Spigot-Server-Patches/0046-Add-PlayerInitialSpawnEvent.patch
index 9b29289abb..41305e2e30 100644
--- a/Spigot-Server-Patches/0047-Add-PlayerInitialSpawnEvent.patch
+++ b/Spigot-Server-Patches/0046-Add-PlayerInitialSpawnEvent.patch
@@ -1,4 +1,4 @@
-From c676f4ee1c9ca2e5f669de47d11e58e926229404 Mon Sep 17 00:00:00 2001
+From 40abd729cda512166ac068a2593b32a45205cbe8 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 b3356b40f..128f55287 100644
+index 784d6b62..b38ff689 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -110,6 +110,21 @@ public abstract class PlayerList {
@@ -32,5 +32,5 @@ index b3356b40f..128f55287 100644
          entityplayer.playerInteractManager.a((WorldServer) entityplayer.world);
          String s1 = "local";
 -- 
-2.14.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0048-Disable-chest-cat-detection.patch b/Spigot-Server-Patches/0047-Disable-chest-cat-detection.patch
similarity index 88%
rename from Spigot-Server-Patches/0048-Disable-chest-cat-detection.patch
rename to Spigot-Server-Patches/0047-Disable-chest-cat-detection.patch
index 7636e780aa..a09055775f 100644
--- a/Spigot-Server-Patches/0048-Disable-chest-cat-detection.patch
+++ b/Spigot-Server-Patches/0047-Disable-chest-cat-detection.patch
@@ -1,14 +1,14 @@
-From d76321993eecd60cc0a0410ff8b45a0303134b81 Mon Sep 17 00:00:00 2001
+From 5a4192c1b33b2950000032a2f7e40a38e2b933e3 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e6aae7317..6ce62827a 100644
+index 83f9512f..0355b711 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -224,4 +224,9 @@ public class PaperWorldConfig {
+@@ -216,4 +216,9 @@ public class PaperWorldConfig {
      private void containerUpdateTickRate() {
          containerUpdateTickRate = getInt("container-update-tick-rate", 1);
      }
@@ -19,7 +19,7 @@ index e6aae7317..6ce62827a 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockChest.java b/src/main/java/net/minecraft/server/BlockChest.java
-index c75ed8a36..9c4d1c938 100644
+index da2cfe20..bc398ec5 100644
 --- a/src/main/java/net/minecraft/server/BlockChest.java
 +++ b/src/main/java/net/minecraft/server/BlockChest.java
 @@ -399,6 +399,11 @@ public class BlockChest extends BlockTileEntity {
@@ -35,5 +35,5 @@ index c75ed8a36..9c4d1c938 100644
  
          EntityOcelot entityocelot;
 -- 
-2.12.2.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0049-Ensure-commands-are-not-ran-async.patch b/Spigot-Server-Patches/0048-Ensure-commands-are-not-ran-async.patch
similarity index 97%
rename from Spigot-Server-Patches/0049-Ensure-commands-are-not-ran-async.patch
rename to Spigot-Server-Patches/0048-Ensure-commands-are-not-ran-async.patch
index 61959194ab..ff0bef3acd 100644
--- a/Spigot-Server-Patches/0049-Ensure-commands-are-not-ran-async.patch
+++ b/Spigot-Server-Patches/0048-Ensure-commands-are-not-ran-async.patch
@@ -1,4 +1,4 @@
-From c8577b4b0cdf04d387238b817a3d215a20b26ea6 Mon Sep 17 00:00:00 2001
+From 682aec6f3018c0732d241afabcda0b4fbc514d6f 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
@@ -48,7 +48,7 @@ index da25a8be..5348c0cb 100644
          } else if (this.player.getChatFlags() == EntityHuman.EnumChatVisibility.SYSTEM) {
              // Do nothing, this is coming from a plugin
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 58826d3d..b6e7f7e9 100644
+index bfddd168..082957d3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -645,6 +645,29 @@ public final class CraftServer implements Server {
@@ -82,5 +82,5 @@ index 58826d3d..b6e7f7e9 100644
              return true;
          }
 -- 
-2.15.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0050-All-chunks-are-slime-spawn-chunks-toggle.patch b/Spigot-Server-Patches/0049-All-chunks-are-slime-spawn-chunks-toggle.patch
similarity index 90%
rename from Spigot-Server-Patches/0050-All-chunks-are-slime-spawn-chunks-toggle.patch
rename to Spigot-Server-Patches/0049-All-chunks-are-slime-spawn-chunks-toggle.patch
index 5113cea57c..2841a1996b 100644
--- a/Spigot-Server-Patches/0050-All-chunks-are-slime-spawn-chunks-toggle.patch
+++ b/Spigot-Server-Patches/0049-All-chunks-are-slime-spawn-chunks-toggle.patch
@@ -1,14 +1,14 @@
-From 95af696519a3738b8dd148142fecc34108d3ef7b Mon Sep 17 00:00:00 2001
+From aa4e3394125e58d84fb818b4ee05949172582ccf Mon Sep 17 00:00:00 2001
 From: vemacs <d@nkmem.es>
 Date: Thu, 3 Mar 2016 01:19:22 -0600
 Subject: [PATCH] All chunks are slime spawn chunks toggle
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 6ce62827a..ab7e81a0d 100644
+index 0355b711..3176379c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -229,4 +229,9 @@ public class PaperWorldConfig {
+@@ -221,4 +221,9 @@ public class PaperWorldConfig {
      private void disableChestCatDetection() {
          disableChestCatDetection = getBoolean("game-mechanics.disable-chest-cat-detection", false);
      }
@@ -19,7 +19,7 @@ index 6ce62827a..ab7e81a0d 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java
-index 24aac10da..31cf1df5d 100644
+index 272b2265..3d3a9ca0 100644
 --- a/src/main/java/net/minecraft/server/EntitySlime.java
 +++ b/src/main/java/net/minecraft/server/EntitySlime.java
 @@ -251,8 +251,8 @@ public class EntitySlime extends EntityInsentient implements IMonster {
@@ -34,5 +34,5 @@ index 24aac10da..31cf1df5d 100644
                  }
              }
 -- 
-2.13.0
+2.14.3
 
diff --git a/Spigot-Server-Patches/0051-Optimize-Pathfinding.patch b/Spigot-Server-Patches/0050-Optimize-Pathfinding.patch
similarity index 94%
rename from Spigot-Server-Patches/0051-Optimize-Pathfinding.patch
rename to Spigot-Server-Patches/0050-Optimize-Pathfinding.patch
index 8aaf8ca96a..e89120c837 100644
--- a/Spigot-Server-Patches/0051-Optimize-Pathfinding.patch
+++ b/Spigot-Server-Patches/0050-Optimize-Pathfinding.patch
@@ -1,4 +1,4 @@
-From 185916cee82574977ec5fd0b7a038cdcfb3c5317 Mon Sep 17 00:00:00 2001
+From d07a9f35fa53a4f2cd7c20d38e15e74f90347e7b 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
@@ -7,7 +7,7 @@ Prevents pathfinding from spamming failures for things such as
 arrow attacks.
 
 diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
-index 26319d9b7..3e598afd4 100644
+index bfc5769f..cc44d30b 100644
 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java
 +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
 @@ -118,10 +118,26 @@ public abstract class NavigationAbstract {
@@ -47,5 +47,5 @@ index 26319d9b7..3e598afd4 100644
      }
  
 -- 
-2.13.0
+2.14.3
 
diff --git a/Spigot-Server-Patches/0052-Avoid-hopper-searches-if-there-are-no-items.patch b/Spigot-Server-Patches/0051-Avoid-hopper-searches-if-there-are-no-items.patch
similarity index 98%
rename from Spigot-Server-Patches/0052-Avoid-hopper-searches-if-there-are-no-items.patch
rename to Spigot-Server-Patches/0051-Avoid-hopper-searches-if-there-are-no-items.patch
index 2a651094c7..6b8a159b79 100644
--- a/Spigot-Server-Patches/0052-Avoid-hopper-searches-if-there-are-no-items.patch
+++ b/Spigot-Server-Patches/0051-Avoid-hopper-searches-if-there-are-no-items.patch
@@ -1,4 +1,4 @@
-From 629064b222df6125fa3e161bdafa5746ba9b467e Mon Sep 17 00:00:00 2001
+From 87454f7aa992d28fb8dac2b75804360f77293510 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
@@ -95,5 +95,5 @@ index c1f25e8d..2a1c11a0 100644
  
              while (iterator.hasNext()) {
 -- 
-2.15.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0053-Expose-server-CommandMap.patch b/Spigot-Server-Patches/0052-Expose-server-CommandMap.patch
similarity index 84%
rename from Spigot-Server-Patches/0053-Expose-server-CommandMap.patch
rename to Spigot-Server-Patches/0052-Expose-server-CommandMap.patch
index 91c9ee65ce..ce4fa8fafc 100644
--- a/Spigot-Server-Patches/0053-Expose-server-CommandMap.patch
+++ b/Spigot-Server-Patches/0052-Expose-server-CommandMap.patch
@@ -1,11 +1,11 @@
-From 2a7fb1c3f5fbef8a3fe6818aa41ed5d964df233f Mon Sep 17 00:00:00 2001
+From d587d2dde23a2f8567a1cceecd11261c36060b27 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 3 Mar 2016 02:15:57 -0600
 Subject: [PATCH] Expose server CommandMap
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b6e7f7e9..c2d945f1 100644
+index 082957d3..8bec4993 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1564,6 +1564,7 @@ public final class CraftServer implements Server {
@@ -17,5 +17,5 @@ index b6e7f7e9..c2d945f1 100644
          return commandMap;
      }
 -- 
-2.15.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0054-Be-a-bit-more-informative-in-maxHealth-exception.patch b/Spigot-Server-Patches/0053-Be-a-bit-more-informative-in-maxHealth-exception.patch
similarity index 91%
rename from Spigot-Server-Patches/0054-Be-a-bit-more-informative-in-maxHealth-exception.patch
rename to Spigot-Server-Patches/0053-Be-a-bit-more-informative-in-maxHealth-exception.patch
index b236877cb7..190155ec80 100644
--- a/Spigot-Server-Patches/0054-Be-a-bit-more-informative-in-maxHealth-exception.patch
+++ b/Spigot-Server-Patches/0053-Be-a-bit-more-informative-in-maxHealth-exception.patch
@@ -1,11 +1,11 @@
-From 2ab6db5456790e25138316daebc61e8bb9a79067 Mon Sep 17 00:00:00 2001
+From e0cd0d92c3a5385e827cc313cef320ac0594bf41 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 3 Mar 2016 02:18:39 -0600
 Subject: [PATCH] Be a bit more informative in maxHealth exception
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 425919cda..7bf45f7d0 100644
+index 425919cd..7bf45f7d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -94,7 +94,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -21,5 +21,5 @@ index 425919cda..7bf45f7d0 100644
  
          getHandle().setHealth((float) health);
 -- 
-2.15.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0055-Player-Tab-List-and-Title-APIs.patch b/Spigot-Server-Patches/0054-Player-Tab-List-and-Title-APIs.patch
similarity index 97%
rename from Spigot-Server-Patches/0055-Player-Tab-List-and-Title-APIs.patch
rename to Spigot-Server-Patches/0054-Player-Tab-List-and-Title-APIs.patch
index 327f4684e3..ba61e82b5f 100644
--- a/Spigot-Server-Patches/0055-Player-Tab-List-and-Title-APIs.patch
+++ b/Spigot-Server-Patches/0054-Player-Tab-List-and-Title-APIs.patch
@@ -1,11 +1,11 @@
-From b8ef081c643c1d3128c8fd5d1ad6a2fdd1923caa Mon Sep 17 00:00:00 2001
+From 43f8c8c8c507b42c37fb0619d2800d0c310cd5c7 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Thu, 3 Mar 2016 02:32:10 -0600
 Subject: [PATCH] Player Tab List and Title APIs
 
 
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutPlayerListHeaderFooter.java b/src/main/java/net/minecraft/server/PacketPlayOutPlayerListHeaderFooter.java
-index 0663b07ca..f5ef1ba31 100644
+index 0663b07c..f5ef1ba3 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutPlayerListHeaderFooter.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutPlayerListHeaderFooter.java
 @@ -4,6 +4,8 @@ import java.io.IOException;
@@ -40,7 +40,7 @@ index 0663b07ca..f5ef1ba31 100644
  
      public void a(PacketListenerPlayOut packetlistenerplayout) {
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutTitle.java b/src/main/java/net/minecraft/server/PacketPlayOutTitle.java
-index 7bcafa8bb..4f6c1c2e7 100644
+index 7bcafa8b..4f6c1c2e 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutTitle.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutTitle.java
 @@ -12,6 +12,18 @@ public class PacketPlayOutTitle implements Packet<PacketListenerPlayOut> {
@@ -78,7 +78,7 @@ index 7bcafa8bb..4f6c1c2e7 100644
  
          if (this.a == PacketPlayOutTitle.EnumTitleAction.TIMES) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 81f005177..3a30728e8 100644
+index 7ee4965a..58d53b32 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1,5 +1,6 @@
@@ -175,5 +175,5 @@ index 81f005177..3a30728e8 100644
      public String getDisplayName() {
          return getHandle().displayName;
 -- 
-2.15.0
+2.14.3
 
diff --git a/Spigot-Server-Patches/0056-Ensure-inv-drag-is-in-bounds.patch b/Spigot-Server-Patches/0055-Ensure-inv-drag-is-in-bounds.patch
similarity index 89%
rename from Spigot-Server-Patches/0056-Ensure-inv-drag-is-in-bounds.patch
rename to Spigot-Server-Patches/0055-Ensure-inv-drag-is-in-bounds.patch
index c66da70259..ccfb0a812d 100644
--- a/Spigot-Server-Patches/0056-Ensure-inv-drag-is-in-bounds.patch
+++ b/Spigot-Server-Patches/0055-Ensure-inv-drag-is-in-bounds.patch
@@ -1,11 +1,11 @@
-From bf866311f4f6ce12ea4e26e99b36f15ac43664ae Mon Sep 17 00:00:00 2001
+From 5394e873fbcf4dd43535cdaa0d98fcf3ce02114d Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:33:53 -0600
 Subject: [PATCH] Ensure inv drag is in bounds
 
 
 diff --git a/src/main/java/net/minecraft/server/Container.java b/src/main/java/net/minecraft/server/Container.java
-index 7d80b68b2..3a488ce20 100644
+index 7d80b68b..3a488ce2 100644
 --- a/src/main/java/net/minecraft/server/Container.java
 +++ b/src/main/java/net/minecraft/server/Container.java
 @@ -141,7 +141,7 @@ public abstract class Container {
@@ -18,5 +18,5 @@ index 7d80b68b2..3a488ce20 100644
                  itemstack1 = playerinventory.getCarried();
                  if (slot != null && a(slot, itemstack1, true) && slot.isAllowed(itemstack1) && (this.dragType == 2 || itemstack1.getCount() > this.h.size()) && this.b(slot)) {
 -- 
-2.14.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0057-Change-implementation-of-tile-entity-removal-list.patch b/Spigot-Server-Patches/0056-Change-implementation-of-tile-entity-removal-list.patch
similarity index 96%
rename from Spigot-Server-Patches/0057-Change-implementation-of-tile-entity-removal-list.patch
rename to Spigot-Server-Patches/0056-Change-implementation-of-tile-entity-removal-list.patch
index c0ed3d9143..be66275942 100644
--- a/Spigot-Server-Patches/0057-Change-implementation-of-tile-entity-removal-list.patch
+++ b/Spigot-Server-Patches/0056-Change-implementation-of-tile-entity-removal-list.patch
@@ -1,11 +1,11 @@
-From 36a0759426050336602e3495938b275ab59ce6fd Mon Sep 17 00:00:00 2001
+From 91da56f560ed2baf64ec8fb3530b7329b5865325 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 9ee8c40a5..438624dd7 100644
+index 9ee8c40a..438624dd 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -122,7 +122,7 @@ public abstract class Entity implements ICommandListener {
@@ -18,7 +18,7 @@ index 9ee8c40a5..438624dd7 100644
      public int ac; public int getChunkY() { return ac; } // Paper - OBFHELPER
      public int ad; public int getChunkZ() { return ad; } // Paper - OBFHELPER
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 6d200b809..b814d965e 100644
+index e85ed2e3..89197281 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -31,6 +31,11 @@ import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
@@ -78,5 +78,5 @@ index 6d200b809..b814d965e 100644
          this.f.clear();
          this.l();
 -- 
-2.15.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0058-Add-configurable-portal-search-radius.patch b/Spigot-Server-Patches/0057-Add-configurable-portal-search-radius.patch
similarity index 91%
rename from Spigot-Server-Patches/0058-Add-configurable-portal-search-radius.patch
rename to Spigot-Server-Patches/0057-Add-configurable-portal-search-radius.patch
index 330c2f1327..b97fae8568 100644
--- a/Spigot-Server-Patches/0058-Add-configurable-portal-search-radius.patch
+++ b/Spigot-Server-Patches/0057-Add-configurable-portal-search-radius.patch
@@ -1,14 +1,14 @@
-From c7880597e2dfa64fde32529848c07aff78bad349 Mon Sep 17 00:00:00 2001
+From ca0d6ed8d4b207343343badd7336c5040402f89a Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:46:17 -0600
 Subject: [PATCH] Add configurable portal search radius
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index ab7e81a0d..4cc74cd65 100644
+index 3176379c..27fac9ef 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -234,4 +234,9 @@ public class PaperWorldConfig {
+@@ -226,4 +226,9 @@ public class PaperWorldConfig {
      private void allChunksAreSlimeChunks() {
          allChunksAreSlimeChunks = getBoolean("all-chunks-are-slime-chunks", false);
      }
@@ -19,7 +19,7 @@ index ab7e81a0d..4cc74cd65 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java
-index 4455c2c43..fbf7cff24 100644
+index d1c67e39..f4972979 100644
 --- a/src/main/java/net/minecraft/server/PortalTravelAgent.java
 +++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java
 @@ -12,7 +12,7 @@ import org.bukkit.util.Vector;
@@ -41,7 +41,7 @@ index 4455c2c43..fbf7cff24 100644
              return false;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftTravelAgent.java b/src/main/java/org/bukkit/craftbukkit/CraftTravelAgent.java
-index 1d5dce10e..7ca2617a8 100644
+index 1d5dce10..7ca2617a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftTravelAgent.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftTravelAgent.java
 @@ -11,7 +11,7 @@ public class CraftTravelAgent extends PortalTravelAgent implements TravelAgent {
@@ -54,5 +54,5 @@ index 1d5dce10e..7ca2617a8 100644
      private boolean canCreatePortal = true;
  
 -- 
-2.12.2.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0059-Add-velocity-warnings.patch b/Spigot-Server-Patches/0058-Add-velocity-warnings.patch
similarity index 97%
rename from Spigot-Server-Patches/0059-Add-velocity-warnings.patch
rename to Spigot-Server-Patches/0058-Add-velocity-warnings.patch
index 91828847fd..a49ae2c951 100644
--- a/Spigot-Server-Patches/0059-Add-velocity-warnings.patch
+++ b/Spigot-Server-Patches/0058-Add-velocity-warnings.patch
@@ -1,11 +1,11 @@
-From 7f4faf67b72574d46629d226bff8b657c1a06439 Mon Sep 17 00:00:00 2001
+From 5d7034040c0b6785bd57f42da9d93af845990760 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:48:12 -0600
 Subject: [PATCH] Add velocity warnings
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c2d945f1..137601d1 100644
+index 8bec4993..16b8d38a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -173,6 +173,7 @@ public final class CraftServer implements Server {
@@ -91,5 +91,5 @@ index 3ed983cc..6384d50e 100644
                  log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):" );
                  dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().primaryThread.getId(), Integer.MAX_VALUE ), log );
 -- 
-2.15.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0060-Fix-inter-world-teleportation-glitches.patch b/Spigot-Server-Patches/0059-Fix-inter-world-teleportation-glitches.patch
similarity index 92%
rename from Spigot-Server-Patches/0060-Fix-inter-world-teleportation-glitches.patch
rename to Spigot-Server-Patches/0059-Fix-inter-world-teleportation-glitches.patch
index 2e436c89b0..733755acca 100644
--- a/Spigot-Server-Patches/0060-Fix-inter-world-teleportation-glitches.patch
+++ b/Spigot-Server-Patches/0059-Fix-inter-world-teleportation-glitches.patch
@@ -1,4 +1,4 @@
-From 6a7fbc75f38face85e1305be4cc74c608971b302 Mon Sep 17 00:00:00 2001
+From 7195f547ff310de38bd29f53a4103864d43ec67b 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
@@ -11,10 +11,10 @@ Example setup to perform the glitch: http://puu.sh/ng3PC/cf072dcbdb.png
 The wanted destination was on top of the emerald block however the player ended on top of the diamond block. This only is the case if the player is teleporting between worlds.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 4cc74cd65..fa49397ea 100644
+index 27fac9ef..1fb9cff9 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -239,4 +239,9 @@ public class PaperWorldConfig {
+@@ -231,4 +231,9 @@ public class PaperWorldConfig {
      private void portalSearchRadius() {
          portalSearchRadius = getInt("portal-search-radius", 128);
      }
@@ -25,7 +25,7 @@ index 4cc74cd65..fa49397ea 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3a30728e8..aa5165f65 100644
+index 58d53b32..e9044f38 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -623,7 +623,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -39,5 +39,5 @@ index 3a30728e8..aa5165f65 100644
          return true;
      }
 -- 
-2.15.0
+2.14.3
 
diff --git a/Spigot-Server-Patches/0061-Add-exception-reporting-event.patch b/Spigot-Server-Patches/0060-Add-exception-reporting-event.patch
similarity index 99%
rename from Spigot-Server-Patches/0061-Add-exception-reporting-event.patch
rename to Spigot-Server-Patches/0060-Add-exception-reporting-event.patch
index e4843c5469..e4573a0e96 100644
--- a/Spigot-Server-Patches/0061-Add-exception-reporting-event.patch
+++ b/Spigot-Server-Patches/0060-Add-exception-reporting-event.patch
@@ -1,4 +1,4 @@
-From a9e8dac195aef49744961d9c9edaab6cd1de17b3 Mon Sep 17 00:00:00 2001
+From 0674a65232371da02c375661f83d214aa59e4581 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
@@ -373,5 +373,5 @@ index d50bbd2a..bce41128 100644
                  // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
              }
 -- 
-2.15.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0062-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch b/Spigot-Server-Patches/0061-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
similarity index 92%
rename from Spigot-Server-Patches/0062-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
rename to Spigot-Server-Patches/0061-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
index 31cf9f47b7..1e90643fef 100644
--- a/Spigot-Server-Patches/0062-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
+++ b/Spigot-Server-Patches/0061-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
@@ -1,4 +1,4 @@
-From 517b94fca16325f04702e129596f9d9f1fa4a50a Mon Sep 17 00:00:00 2001
+From acf1d6b999ead0cb9dfb022031296a0e803c6fc2 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Tue, 8 Mar 2016 18:28:43 -0800
 Subject: [PATCH] Don't nest if we don't need to when cerealising text
@@ -6,7 +6,7 @@ Subject: [PATCH] Don't nest if we don't need to when cerealising text
 
 
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutChat.java b/src/main/java/net/minecraft/server/PacketPlayOutChat.java
-index 9fc83c4a3..b3b13ba11 100644
+index 67666d35..5d1a4962 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutChat.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutChat.java
 @@ -27,7 +27,14 @@ public class PacketPlayOutChat implements Packet<PacketListenerPlayOut> {
@@ -26,5 +26,5 @@ index 9fc83c4a3..b3b13ba11 100644
              packetdataserializer.a(this.a);
          }
 -- 
-2.12.2.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0063-Disable-Scoreboards-for-non-players-by-default.patch b/Spigot-Server-Patches/0062-Disable-Scoreboards-for-non-players-by-default.patch
similarity index 91%
rename from Spigot-Server-Patches/0063-Disable-Scoreboards-for-non-players-by-default.patch
rename to Spigot-Server-Patches/0062-Disable-Scoreboards-for-non-players-by-default.patch
index 89238af03b..627e357bb1 100644
--- a/Spigot-Server-Patches/0063-Disable-Scoreboards-for-non-players-by-default.patch
+++ b/Spigot-Server-Patches/0062-Disable-Scoreboards-for-non-players-by-default.patch
@@ -1,4 +1,4 @@
-From 31db3d39b5c57788978d813548990b7baeebc5a1 Mon Sep 17 00:00:00 2001
+From b7123bd1a147a200878cc069bc94f6a173b3ceba Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 8 Mar 2016 23:25:45 -0500
 Subject: [PATCH] Disable Scoreboards for non players by default
@@ -11,10 +11,10 @@ So avoid looking up scoreboards and short circuit to the "not on a team"
 logic which is most likely to be true.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index fa49397ea..9987a5c7a 100644
+index 1fb9cff9..f002ef27 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -244,4 +244,9 @@ public class PaperWorldConfig {
+@@ -236,4 +236,9 @@ public class PaperWorldConfig {
      private void disableTeleportationSuffocationCheck() {
          disableTeleportationSuffocationCheck = getBoolean("disable-teleportation-suffocation-check", false);
      }
@@ -25,7 +25,7 @@ index fa49397ea..9987a5c7a 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/CommandScoreboard.java b/src/main/java/net/minecraft/server/CommandScoreboard.java
-index ec9a87239..b08274d93 100644
+index ec9a8723..b08274d9 100644
 --- a/src/main/java/net/minecraft/server/CommandScoreboard.java
 +++ b/src/main/java/net/minecraft/server/CommandScoreboard.java
 @@ -492,6 +492,7 @@ public class CommandScoreboard extends CommandAbstract {
@@ -37,7 +37,7 @@ index ec9a87239..b08274d93 100644
  
                          if (scoreboard.addPlayerToTeam(s2, s)) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 438624dd7..9a1cac844 100644
+index 438624dd..9a1cac84 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2080,6 +2080,7 @@ public abstract class Entity implements ICommandListener {
diff --git a/Spigot-Server-Patches/0064-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-Server-Patches/0063-Add-methods-for-working-with-arrows-stuck-in-living-.patch
similarity index 88%
rename from Spigot-Server-Patches/0064-Add-methods-for-working-with-arrows-stuck-in-living-.patch
rename to Spigot-Server-Patches/0063-Add-methods-for-working-with-arrows-stuck-in-living-.patch
index 527bb39ca8..188df9b944 100644
--- a/Spigot-Server-Patches/0064-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/Spigot-Server-Patches/0063-Add-methods-for-working-with-arrows-stuck-in-living-.patch
@@ -1,11 +1,11 @@
-From 110010cf39dad71b885d93f3b3f056d0b58687a0 Mon Sep 17 00:00:00 2001
+From 1327edcaa7361519198876a7e6659f8109fe97ae Mon Sep 17 00:00:00 2001
 From: mrapple <tony@oc.tc>
 Date: Sun, 25 Nov 2012 13:43:39 -0600
 Subject: [PATCH] Add methods for working with arrows stuck in living entities
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 7bf45f7d0..b9e106031 100644
+index 7bf45f7d..b9e10603 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -494,4 +494,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -26,5 +26,5 @@ index 7bf45f7d0..b9e106031 100644
 +    // Paper end
  }
 -- 
-2.15.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0065-Complete-resource-pack-API.patch b/Spigot-Server-Patches/0064-Complete-resource-pack-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0065-Complete-resource-pack-API.patch
rename to Spigot-Server-Patches/0064-Complete-resource-pack-API.patch
index f5f6b17a8b..eee2d4f492 100644
--- a/Spigot-Server-Patches/0065-Complete-resource-pack-API.patch
+++ b/Spigot-Server-Patches/0064-Complete-resource-pack-API.patch
@@ -1,11 +1,11 @@
-From 38beacf452129cb95545832bc38121498c02b9ee Mon Sep 17 00:00:00 2001
+From ec57432cc4fd42a05473c74a587ae694dc6418f8 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 5348c0cbc..5cc5dbcd7 100644
+index 5348c0cb..5cc5dbcd 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1067,7 +1067,12 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -23,7 +23,7 @@ index 5348c0cbc..5cc5dbcd7 100644
      // CraftBukkit end
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index aa5165f65..219daa59b 100644
+index e9044f38..f62fa8c7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -88,6 +88,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -71,5 +71,5 @@ index aa5165f65..219daa59b 100644
      private final Player.Spigot spigot = new Player.Spigot()
      {
 -- 
-2.15.0
+2.14.3
 
diff --git a/Spigot-Server-Patches/0066-Chunk-save-queue-improvements.patch b/Spigot-Server-Patches/0065-Chunk-save-queue-improvements.patch
similarity index 97%
rename from Spigot-Server-Patches/0066-Chunk-save-queue-improvements.patch
rename to Spigot-Server-Patches/0065-Chunk-save-queue-improvements.patch
index 2891423375..b1a311e78c 100644
--- a/Spigot-Server-Patches/0066-Chunk-save-queue-improvements.patch
+++ b/Spigot-Server-Patches/0065-Chunk-save-queue-improvements.patch
@@ -1,4 +1,4 @@
-From 7b7f601ad0c78736c6699917a5e4627dea796289 Mon Sep 17 00:00:00 2001
+From 7f29042fa8a19c844fee61cfe0271a47e28e204c 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,7 +26,7 @@ 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 36689db74..3898ad8fa 100644
+index 36689db7..3898ad8f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -204,4 +204,10 @@ public class PaperConfig {
@@ -41,7 +41,7 @@ index 36689db74..3898ad8fa 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 682b4230e..772da28aa 100644
+index a401dec6..4c3faa20 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -12,6 +12,7 @@ import java.util.List;
@@ -138,7 +138,7 @@ index 682b4230e..772da28aa 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/FileIOThread.java b/src/main/java/net/minecraft/server/FileIOThread.java
-index 1d6b1874c..9ee4115be 100644
+index 1d6b1874..9ee4115b 100644
 --- a/src/main/java/net/minecraft/server/FileIOThread.java
 +++ b/src/main/java/net/minecraft/server/FileIOThread.java
 @@ -39,11 +39,15 @@ public class FileIOThread implements Runnable {
@@ -162,5 +162,5 @@ index 1d6b1874c..9ee4115be 100644
  
          if (this.b.isEmpty()) {
 -- 
-2.13.4
+2.14.3
 
diff --git a/Spigot-Server-Patches/0067-Chunk-Save-Reattempt.patch b/Spigot-Server-Patches/0066-Chunk-Save-Reattempt.patch
similarity index 94%
rename from Spigot-Server-Patches/0067-Chunk-Save-Reattempt.patch
rename to Spigot-Server-Patches/0066-Chunk-Save-Reattempt.patch
index cb9b078103..5cc0d03615 100644
--- a/Spigot-Server-Patches/0067-Chunk-Save-Reattempt.patch
+++ b/Spigot-Server-Patches/0066-Chunk-Save-Reattempt.patch
@@ -1,4 +1,4 @@
-From ed5ec72d4b67b763f70a69cd395a526a8c483b6a Mon Sep 17 00:00:00 2001
+From 8aa4fd3f27fff342a97065ddfbe6c143ccf91f55 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 772da28aa..6f2c192af 100644
+index 4c3faa20..12bd558a 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -194,11 +194,16 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -28,7 +28,7 @@ index 772da28aa..6f2c192af 100644
                  synchronized (lock) { if (this.b.get(chunkcoordintpair) == chunk.compoundSupplier) { this.b.remove(chunkcoordintpair); } }// Paper - This will not equal if a newer version is still pending
  
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index 6a92b5af8..5bcbd718f 100644
+index 6a92b5af..5bcbd718 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -210,8 +210,7 @@ public class RegionFile {
@@ -42,5 +42,5 @@ index 6a92b5af8..5bcbd718f 100644
  
      }
 -- 
-2.13.4
+2.14.3
 
diff --git a/Spigot-Server-Patches/0068-Default-loading-permissions.yml-before-plugins.patch b/Spigot-Server-Patches/0067-Default-loading-permissions.yml-before-plugins.patch
similarity index 95%
rename from Spigot-Server-Patches/0068-Default-loading-permissions.yml-before-plugins.patch
rename to Spigot-Server-Patches/0067-Default-loading-permissions.yml-before-plugins.patch
index 45ccd75bb4..c8bfbcd065 100644
--- a/Spigot-Server-Patches/0068-Default-loading-permissions.yml-before-plugins.patch
+++ b/Spigot-Server-Patches/0067-Default-loading-permissions.yml-before-plugins.patch
@@ -1,4 +1,4 @@
-From 051d2c48ffa254b918d0e4ef4075acd11247c595 Mon Sep 17 00:00:00 2001
+From 59a7aa4ed75ec50385be412519acc32e79b5923b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 13:17:38 -0400
 Subject: [PATCH] Default loading permissions.yml before plugins
@@ -30,7 +30,7 @@ index 3898ad8f..2f6e169f 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 137601d1..776f165b 100644
+index 16b8d38a..9e50bc49 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -322,6 +322,7 @@ public final class CraftServer implements Server {
@@ -51,5 +51,5 @@ index 137601d1..776f165b 100644
              CraftDefaultPermissions.registerCorePermissions();
              helpMap.initializeCommands();
 -- 
-2.15.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0069-Allow-Reloading-of-Custom-Permissions.patch b/Spigot-Server-Patches/0068-Allow-Reloading-of-Custom-Permissions.patch
similarity index 91%
rename from Spigot-Server-Patches/0069-Allow-Reloading-of-Custom-Permissions.patch
rename to Spigot-Server-Patches/0068-Allow-Reloading-of-Custom-Permissions.patch
index 7617c40046..11fd8b48fc 100644
--- a/Spigot-Server-Patches/0069-Allow-Reloading-of-Custom-Permissions.patch
+++ b/Spigot-Server-Patches/0068-Allow-Reloading-of-Custom-Permissions.patch
@@ -1,4 +1,4 @@
-From e225af03264c4a4d03f205304964d22c755ce47d Mon Sep 17 00:00:00 2001
+From dd903cb350bb0f8ed52213d417523ca1de2527cb Mon Sep 17 00:00:00 2001
 From: William <admin@domnian.com>
 Date: Fri, 18 Mar 2016 03:30:17 -0400
 Subject: [PATCH] Allow Reloading of Custom Permissions
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Custom Permissions
 https://github.com/PaperMC/Paper/issues/49
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 776f165b..5df0fed2 100644
+index 9e50bc49..fd4e0279 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1863,5 +1863,20 @@ public final class CraftServer implements Server {
@@ -31,5 +31,5 @@ index 776f165b..5df0fed2 100644
      // Paper end
  }
 -- 
-2.15.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0070-Remove-Metadata-on-reload.patch b/Spigot-Server-Patches/0069-Remove-Metadata-on-reload.patch
similarity index 91%
rename from Spigot-Server-Patches/0070-Remove-Metadata-on-reload.patch
rename to Spigot-Server-Patches/0069-Remove-Metadata-on-reload.patch
index 71f9bd1604..2410867a42 100644
--- a/Spigot-Server-Patches/0070-Remove-Metadata-on-reload.patch
+++ b/Spigot-Server-Patches/0069-Remove-Metadata-on-reload.patch
@@ -1,4 +1,4 @@
-From 062794319b62f22d10b7085e266d305551b6a82c Mon Sep 17 00:00:00 2001
+From 3c10de727781081009381cdd8eaebac04040ceff Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 13:50:14 -0400
 Subject: [PATCH] Remove Metadata on reload
@@ -7,7 +7,7 @@ Metadata is not meant to persist reload as things break badly with non primitive
 This will remove metadata on reload so it does not crash everything if a plugin uses it.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5df0fed2..728d0ff8 100644
+index fd4e0279..5d15d584 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -743,8 +743,18 @@ public final class CraftServer implements Server {
@@ -30,5 +30,5 @@ index 5df0fed2..728d0ff8 100644
          reloadData();
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
 -- 
-2.15.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0071-Undead-horse-leashing.patch b/Spigot-Server-Patches/0070-Undead-horse-leashing.patch
similarity index 89%
rename from Spigot-Server-Patches/0071-Undead-horse-leashing.patch
rename to Spigot-Server-Patches/0070-Undead-horse-leashing.patch
index b590283e41..bac00c4fc9 100644
--- a/Spigot-Server-Patches/0071-Undead-horse-leashing.patch
+++ b/Spigot-Server-Patches/0070-Undead-horse-leashing.patch
@@ -1,4 +1,4 @@
-From 13fc523d37a56bf1c6e29656573d3c647df3b68a Mon Sep 17 00:00:00 2001
+From 513c54e1769c36f21bdfccde4bfaf9100a935950 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 14:19:19 -0400
 Subject: [PATCH] Undead horse leashing
@@ -6,10 +6,10 @@ Subject: [PATCH] Undead horse leashing
 default false to match vanilla, but option to allow undead horse types to be leashed.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 9987a5c7a..0873febb6 100644
+index f002ef27..47738624 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -249,4 +249,9 @@ public class PaperWorldConfig {
+@@ -241,4 +241,9 @@ public class PaperWorldConfig {
      private void nonPlayerEntitiesOnScoreboards() {
          nonPlayerEntitiesOnScoreboards = getBoolean("allow-non-player-entities-on-scoreboards", false);
      }
@@ -20,7 +20,7 @@ index 9987a5c7a..0873febb6 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
-index 46d1ea217..dcc39236f 100644
+index 46d1ea21..dcc39236 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
 @@ -115,7 +115,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
@@ -33,5 +33,5 @@ index 46d1ea217..dcc39236f 100644
  
      protected void q(float f) {
 -- 
-2.13.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0072-Fix-Furnace-cook-time-bug.patch b/Spigot-Server-Patches/0071-Fix-Furnace-cook-time-bug.patch
similarity index 90%
rename from Spigot-Server-Patches/0072-Fix-Furnace-cook-time-bug.patch
rename to Spigot-Server-Patches/0071-Fix-Furnace-cook-time-bug.patch
index 36f1445198..00d789fdec 100644
--- a/Spigot-Server-Patches/0072-Fix-Furnace-cook-time-bug.patch
+++ b/Spigot-Server-Patches/0071-Fix-Furnace-cook-time-bug.patch
@@ -1,4 +1,4 @@
-From 1f5e3b8cd3c4a90bd433b56172f9b84f11eb65ed Mon Sep 17 00:00:00 2001
+From c36013fd353a1f51ac3e51fae0054caf6d0bb405 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
@@ -9,7 +9,7 @@ cook in the expected amount of time as the cook time was not decremented correct
 This patch ensures that furnaces cook to the correct wall time expectation.
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java
-index 2f1f3edf5..e230d1608 100644
+index 886a73e9..7a142810 100644
 --- a/src/main/java/net/minecraft/server/TileEntityFurnace.java
 +++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java
 @@ -165,7 +165,7 @@ public class TileEntityFurnace extends TileEntityContainer implements ITickable,
@@ -22,5 +22,5 @@ index 2f1f3edf5..e230d1608 100644
                  this.burn();
                  flag1 = true;
 -- 
-2.12.2.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0073-Handle-Item-Meta-Inconsistencies.patch b/Spigot-Server-Patches/0072-Handle-Item-Meta-Inconsistencies.patch
similarity index 98%
rename from Spigot-Server-Patches/0073-Handle-Item-Meta-Inconsistencies.patch
rename to Spigot-Server-Patches/0072-Handle-Item-Meta-Inconsistencies.patch
index b8d6dd2014..7a2b2118e3 100644
--- a/Spigot-Server-Patches/0073-Handle-Item-Meta-Inconsistencies.patch
+++ b/Spigot-Server-Patches/0072-Handle-Item-Meta-Inconsistencies.patch
@@ -1,4 +1,4 @@
-From 00260e9433c13cfcf1dee3927ee3a9e905c4a8dc Mon Sep 17 00:00:00 2001
+From 41148ad75dcb5ba9bfbff7a6bfa03d861f50cf03 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 28 May 2015 23:00:19 -0400
 Subject: [PATCH] Handle Item Meta Inconsistencies
@@ -18,7 +18,7 @@ For consistency, the old API methods now forward to use the
 ItemMeta API equivalents, and should deprecate the old API's.
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 0dcea61d2..a8f7ff98f 100644
+index 0dcea61d..a8f7ff98 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -56,6 +56,22 @@ public final class ItemStack {
@@ -69,7 +69,7 @@ index 0dcea61d2..a8f7ff98f 100644
  
      public boolean hasEnchantments() {
 diff --git a/src/main/java/net/minecraft/server/NBTTagList.java b/src/main/java/net/minecraft/server/NBTTagList.java
-index ca9eb2f3b..576c3b714 100644
+index ca9eb2f3..576c3b71 100644
 --- a/src/main/java/net/minecraft/server/NBTTagList.java
 +++ b/src/main/java/net/minecraft/server/NBTTagList.java
 @@ -14,6 +14,12 @@ public class NBTTagList extends NBTBase {
@@ -86,7 +86,7 @@ index ca9eb2f3b..576c3b714 100644
  
      public NBTTagList() {}
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index fb1dc542d..cdf16e15a 100644
+index fb1dc542..cdf16e15 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -4,6 +4,7 @@ import static org.bukkit.craftbukkit.inventory.CraftMetaItem.ENCHANTMENTS;
@@ -212,7 +212,7 @@ index fb1dc542d..cdf16e15a 100644
  
      static Map<Enchantment, Integer> getEnchantments(net.minecraft.server.ItemStack item) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index c743ae066..0cdc8007a 100644
+index c743ae06..0cdc8007 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -6,13 +6,8 @@ import java.lang.annotation.RetentionPolicy;
@@ -358,5 +358,5 @@ index c743ae066..0cdc8007a 100644
      private final Spigot spigot = new Spigot()
      {
 -- 
-2.15.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0074-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/Spigot-Server-Patches/0073-Configurable-Non-Player-Arrow-Despawn-Rate.patch
similarity index 89%
rename from Spigot-Server-Patches/0074-Configurable-Non-Player-Arrow-Despawn-Rate.patch
rename to Spigot-Server-Patches/0073-Configurable-Non-Player-Arrow-Despawn-Rate.patch
index b631fdd608..c90f78c56b 100644
--- a/Spigot-Server-Patches/0074-Configurable-Non-Player-Arrow-Despawn-Rate.patch
+++ b/Spigot-Server-Patches/0073-Configurable-Non-Player-Arrow-Despawn-Rate.patch
@@ -1,4 +1,4 @@
-From f97a0149fe312629f4b29fce2ac49eacc0456754 Mon Sep 17 00:00:00 2001
+From 8bf1a9974147fc46939b2b86f09f7fe4f79ac427 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 15:12:22 -0400
 Subject: [PATCH] Configurable Non Player Arrow Despawn Rate
@@ -6,10 +6,10 @@ Subject: [PATCH] Configurable Non Player Arrow Despawn Rate
 Can set a much shorter despawn rate for arrows that players can not pick up.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 0873febb6..b37b5901b 100644
+index 47738624..db40db0d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -254,4 +254,13 @@ public class PaperWorldConfig {
+@@ -246,4 +246,13 @@ public class PaperWorldConfig {
      private void allowLeashingUndeadHorse() {
          allowLeashingUndeadHorse = getBoolean("allow-leashing-undead-horse", false);
      }
@@ -24,7 +24,7 @@ index 0873febb6..b37b5901b 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index 65689f26d..8cda47518 100644
+index 3ff8b96f..f55eb654 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
 @@ -157,7 +157,7 @@ public abstract class EntityArrow extends Entity implements IProjectile {
@@ -37,5 +37,5 @@ index 65689f26d..8cda47518 100644
                  }
              }
 -- 
-2.12.2.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0075-Add-World-Util-Methods.patch b/Spigot-Server-Patches/0074-Add-World-Util-Methods.patch
similarity index 98%
rename from Spigot-Server-Patches/0075-Add-World-Util-Methods.patch
rename to Spigot-Server-Patches/0074-Add-World-Util-Methods.patch
index 582ea18fc4..55f7a97511 100644
--- a/Spigot-Server-Patches/0075-Add-World-Util-Methods.patch
+++ b/Spigot-Server-Patches/0074-Add-World-Util-Methods.patch
@@ -1,4 +1,4 @@
-From 722ea2a8bface335c87958b7c9337c9e96000c81 Mon Sep 17 00:00:00 2001
+From 34d43d8cfc58035d0896f070e7aa8471bad4d0a1 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
@@ -119,5 +119,5 @@ index 6be9c181..9339bf83 100644
          // CraftBukkit start - tree generation
          if (captureTreeGeneration) {
 -- 
-2.15.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0076-Optimized-Light-Level-Comparisons.patch b/Spigot-Server-Patches/0075-Optimized-Light-Level-Comparisons.patch
similarity index 96%
rename from Spigot-Server-Patches/0076-Optimized-Light-Level-Comparisons.patch
rename to Spigot-Server-Patches/0075-Optimized-Light-Level-Comparisons.patch
index ba69f156f8..84c49f6ff6 100644
--- a/Spigot-Server-Patches/0076-Optimized-Light-Level-Comparisons.patch
+++ b/Spigot-Server-Patches/0075-Optimized-Light-Level-Comparisons.patch
@@ -1,4 +1,4 @@
-From 11e7e276d572aa7ff71afe417b1dc245564d8801 Mon Sep 17 00:00:00 2001
+From c2a48e1b1cab73dacad11ef4a38c1907bae4c4a8 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
@@ -8,7 +8,7 @@ Use an optimized method to test if a block position meets a desired light level.
 This method benefits from returning as soon as the desired light level matches.
 
 diff --git a/src/main/java/net/minecraft/server/BlockCrops.java b/src/main/java/net/minecraft/server/BlockCrops.java
-index 128096453..fea81de16 100644
+index c0b88580..55ed0c95 100644
 --- a/src/main/java/net/minecraft/server/BlockCrops.java
 +++ b/src/main/java/net/minecraft/server/BlockCrops.java
 @@ -48,7 +48,7 @@ public class BlockCrops extends BlockPlant implements IBlockFragilePlantElement
@@ -21,7 +21,7 @@ index 128096453..fea81de16 100644
  
              if (i < this.g()) {
 diff --git a/src/main/java/net/minecraft/server/BlockGrass.java b/src/main/java/net/minecraft/server/BlockGrass.java
-index d0fa96651..62ec2ad31 100644
+index fe55848b..8fc736d6 100644
 --- a/src/main/java/net/minecraft/server/BlockGrass.java
 +++ b/src/main/java/net/minecraft/server/BlockGrass.java
 @@ -29,7 +29,8 @@ public class BlockGrass extends Block implements IBlockFragilePlantElement {
@@ -65,7 +65,7 @@ index d0fa96651..62ec2ad31 100644
                              // world.setTypeUpdate(blockposition1, Blocks.GRASS.getBlockData());
                              org.bukkit.World bworld = world.getWorld();
 diff --git a/src/main/java/net/minecraft/server/BlockSapling.java b/src/main/java/net/minecraft/server/BlockSapling.java
-index b22949368..cb1e5a2a3 100644
+index 6d0f4c15..3bbb123b 100644
 --- a/src/main/java/net/minecraft/server/BlockSapling.java
 +++ b/src/main/java/net/minecraft/server/BlockSapling.java
 @@ -34,7 +34,7 @@ public class BlockSapling extends BlockPlant implements IBlockFragilePlantElemen
@@ -78,7 +78,7 @@ index b22949368..cb1e5a2a3 100644
                  world.captureTreeGeneration = true;
                  // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/BlockStem.java b/src/main/java/net/minecraft/server/BlockStem.java
-index 7492110fa..8d1630ac0 100644
+index f12987c8..5ae7bd9d 100644
 --- a/src/main/java/net/minecraft/server/BlockStem.java
 +++ b/src/main/java/net/minecraft/server/BlockStem.java
 @@ -48,7 +48,7 @@ public class BlockStem extends BlockPlant implements IBlockFragilePlantElement {
@@ -91,7 +91,7 @@ index 7492110fa..8d1630ac0 100644
  
              if (random.nextInt((int) ((100.0F / (this == Blocks.PUMPKIN_STEM ? world.spigotConfig.pumpkinModifier : world.spigotConfig.melonModifier)) * (25.0F / f)) + 1) == 0) { // Spigot
 diff --git a/src/main/java/net/minecraft/server/EntityMonster.java b/src/main/java/net/minecraft/server/EntityMonster.java
-index 21539ff9b..1585bf3bc 100644
+index 0f55cf51..8782bce5 100644
 --- a/src/main/java/net/minecraft/server/EntityMonster.java
 +++ b/src/main/java/net/minecraft/server/EntityMonster.java
 @@ -118,17 +118,17 @@ public abstract class EntityMonster extends EntityCreature implements IMonster {
@@ -118,7 +118,7 @@ index 21539ff9b..1585bf3bc 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 2b619ab93..372890b5d 100644
+index 277f1414..6111ca0b 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -178,7 +178,7 @@ public class EntityZombie extends EntityMonster {
@@ -131,5 +131,5 @@ index 2b619ab93..372890b5d 100644
                          if (!this.world.isPlayerNearby((double) i1, (double) j1, (double) k1, 7.0D) && this.world.a(entityzombie.getBoundingBox(), (Entity) entityzombie) && this.world.getCubes(entityzombie, entityzombie.getBoundingBox()).isEmpty() && !this.world.containsLiquid(entityzombie.getBoundingBox())) {
                              this.world.addEntity(entityzombie, CreatureSpawnEvent.SpawnReason.REINFORCEMENTS); // CraftBukkit
 -- 
-2.13.0.windows.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0077-Pass-world-to-Village-creation.patch b/Spigot-Server-Patches/0076-Pass-world-to-Village-creation.patch
similarity index 90%
rename from Spigot-Server-Patches/0077-Pass-world-to-Village-creation.patch
rename to Spigot-Server-Patches/0076-Pass-world-to-Village-creation.patch
index 192e3aefce..83971a01c7 100644
--- a/Spigot-Server-Patches/0077-Pass-world-to-Village-creation.patch
+++ b/Spigot-Server-Patches/0076-Pass-world-to-Village-creation.patch
@@ -1,4 +1,4 @@
-From 7cb360d7aec57c15e7ce8b669d28fd9de086ffc3 Mon Sep 17 00:00:00 2001
+From 78ae8cc0f56bec8e4fa7d851fe63fb846d7b3ec7 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Pass world to Village creation
 fixes NPE bug #95
 
 diff --git a/src/main/java/net/minecraft/server/PersistentVillage.java b/src/main/java/net/minecraft/server/PersistentVillage.java
-index a5b79ecad..01f7cee38 100644
+index a5b79eca..01f7cee3 100644
 --- a/src/main/java/net/minecraft/server/PersistentVillage.java
 +++ b/src/main/java/net/minecraft/server/PersistentVillage.java
 @@ -238,7 +238,7 @@ public class PersistentVillage extends PersistentBase {
@@ -19,7 +19,7 @@ index a5b79ecad..01f7cee38 100644
              village.a(nbttagcompound1);
              this.villages.add(village);
 diff --git a/src/main/java/net/minecraft/server/Village.java b/src/main/java/net/minecraft/server/Village.java
-index 2ab381d50..817c836c3 100644
+index fb52785b..2eb33a98 100644
 --- a/src/main/java/net/minecraft/server/Village.java
 +++ b/src/main/java/net/minecraft/server/Village.java
 @@ -24,7 +24,7 @@ public class Village {
@@ -32,5 +32,5 @@ index 2ab381d50..817c836c3 100644
          this.d = BlockPosition.ZERO;
          this.j = Maps.newHashMap();
 -- 
-2.12.2.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0078-Custom-replacement-for-eaten-items.patch b/Spigot-Server-Patches/0077-Custom-replacement-for-eaten-items.patch
similarity index 95%
rename from Spigot-Server-Patches/0078-Custom-replacement-for-eaten-items.patch
rename to Spigot-Server-Patches/0077-Custom-replacement-for-eaten-items.patch
index e308b69737..35f706c4d0 100644
--- a/Spigot-Server-Patches/0078-Custom-replacement-for-eaten-items.patch
+++ b/Spigot-Server-Patches/0077-Custom-replacement-for-eaten-items.patch
@@ -1,11 +1,11 @@
-From 829f8ecf34a2f9572199f5378dcec701cc7bc844 Mon Sep 17 00:00:00 2001
+From 43a8e8c9b03128433633aa173352ee4529a83541 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 21 Jun 2015 15:07:20 -0400
 Subject: [PATCH] Custom replacement for eaten items
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 5a6b33981..4c632bb68 100644
+index 5a6b3398..4c632bb6 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2375,12 +2375,13 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0079-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/Spigot-Server-Patches/0078-handle-NaN-health-absorb-values-and-repair-bad-data.patch
similarity index 94%
rename from Spigot-Server-Patches/0079-handle-NaN-health-absorb-values-and-repair-bad-data.patch
rename to Spigot-Server-Patches/0078-handle-NaN-health-absorb-values-and-repair-bad-data.patch
index 51ba417435..ce42eed648 100644
--- a/Spigot-Server-Patches/0079-handle-NaN-health-absorb-values-and-repair-bad-data.patch
+++ b/Spigot-Server-Patches/0078-handle-NaN-health-absorb-values-and-repair-bad-data.patch
@@ -1,11 +1,11 @@
-From 963710f477c9ccd12871c3fdc6e1da211c98bb36 Mon Sep 17 00:00:00 2001
+From 7fa0e0a09851cee926ea6ee93744b88bf157259f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 27 Sep 2015 01:18:02 -0400
 Subject: [PATCH] handle NaN health/absorb values and repair bad data
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 4c632bb68..296c05480 100644
+index 4c632bb6..296c0548 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -488,7 +488,13 @@ public abstract class EntityLiving extends Entity {
@@ -44,7 +44,7 @@ index 4c632bb68..296c05480 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 219daa59b..7a5866682 100644
+index f62fa8c7..9fe7a18a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1469,6 +1469,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -56,5 +56,5 @@ index 219daa59b..7a5866682 100644
      }
  
 -- 
-2.15.0
+2.14.3
 
diff --git a/Spigot-Server-Patches/0080-Catch-Async-PlayerChunkMap-operations.patch b/Spigot-Server-Patches/0079-Catch-Async-PlayerChunkMap-operations.patch
similarity index 89%
rename from Spigot-Server-Patches/0080-Catch-Async-PlayerChunkMap-operations.patch
rename to Spigot-Server-Patches/0079-Catch-Async-PlayerChunkMap-operations.patch
index 942ceb6a8c..7116792d8b 100644
--- a/Spigot-Server-Patches/0080-Catch-Async-PlayerChunkMap-operations.patch
+++ b/Spigot-Server-Patches/0079-Catch-Async-PlayerChunkMap-operations.patch
@@ -1,11 +1,11 @@
-From d47e6d67d27ac3f30c4c14493a48e9d5f53651d4 Mon Sep 17 00:00:00 2001
+From 42feef1fd45b5b935b0bbb322e3d3e48abc66249 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
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index cfac05750..0a0b5261b 100644
+index 9627a9be..ad1d90b5 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -469,10 +469,12 @@ public class PlayerChunkMap {
@@ -22,5 +22,5 @@ index cfac05750..0a0b5261b 100644
          long i = d(chunkcoordintpair.x, chunkcoordintpair.z);
  
 -- 
-2.12.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0081-Support-offline-mode-in-whitelist-command-as-well.patch b/Spigot-Server-Patches/0080-Support-offline-mode-in-whitelist-command-as-well.patch
similarity index 97%
rename from Spigot-Server-Patches/0081-Support-offline-mode-in-whitelist-command-as-well.patch
rename to Spigot-Server-Patches/0080-Support-offline-mode-in-whitelist-command-as-well.patch
index 2721eb3e98..ff1e3c2bb9 100644
--- a/Spigot-Server-Patches/0081-Support-offline-mode-in-whitelist-command-as-well.patch
+++ b/Spigot-Server-Patches/0080-Support-offline-mode-in-whitelist-command-as-well.patch
@@ -1,11 +1,11 @@
-From 7166a39b822d5bf6d55376dcc7956a693891b0aa Mon Sep 17 00:00:00 2001
+From 9915d4088a02b715b36eda4b090a09fbb55abca3 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
 
 
 diff --git a/src/main/java/net/minecraft/server/CommandWhitelist.java b/src/main/java/net/minecraft/server/CommandWhitelist.java
-index c74d1d2be..0f4237db1 100644
+index c74d1d2b..0f4237db 100644
 --- a/src/main/java/net/minecraft/server/CommandWhitelist.java
 +++ b/src/main/java/net/minecraft/server/CommandWhitelist.java
 @@ -44,24 +44,35 @@ public class CommandWhitelist extends CommandAbstract {
@@ -89,5 +89,5 @@ index c74d1d2be..0f4237db1 100644
 +    // Paper end
  }
 -- 
-2.12.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0082-Waving-banner-workaround.patch b/Spigot-Server-Patches/0081-Waving-banner-workaround.patch
similarity index 93%
rename from Spigot-Server-Patches/0082-Waving-banner-workaround.patch
rename to Spigot-Server-Patches/0081-Waving-banner-workaround.patch
index 713e950814..eebf15d06a 100644
--- a/Spigot-Server-Patches/0082-Waving-banner-workaround.patch
+++ b/Spigot-Server-Patches/0081-Waving-banner-workaround.patch
@@ -1,4 +1,4 @@
-From 76a5db0ee94c7fb95adac70a4b0a1716cf7c87a9 Mon Sep 17 00:00:00 2001
+From 214262264e7899409a2cde18afb5480a9a130b91 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 c5c3f40c..6413f76e 100644
  
      public void a(PacketDataSerializer packetdataserializer) throws IOException {
 -- 
-2.15.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0083-Use-a-Shared-Random-for-Entities.patch b/Spigot-Server-Patches/0082-Use-a-Shared-Random-for-Entities.patch
similarity index 92%
rename from Spigot-Server-Patches/0083-Use-a-Shared-Random-for-Entities.patch
rename to Spigot-Server-Patches/0082-Use-a-Shared-Random-for-Entities.patch
index dbb01f26b8..f18ae7be73 100644
--- a/Spigot-Server-Patches/0083-Use-a-Shared-Random-for-Entities.patch
+++ b/Spigot-Server-Patches/0082-Use-a-Shared-Random-for-Entities.patch
@@ -1,4 +1,4 @@
-From c14cbce13cf440eff56cd38c718423c3fbd38cd5 Mon Sep 17 00:00:00 2001
+From 4e97c2e91c2a77de52a2dcdd5cfe5fd4185d835b 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 9a1cac844..05d764fa2 100644
+index 9a1cac84..05d764fa 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -46,6 +46,7 @@ public abstract class Entity implements ICommandListener {
diff --git a/Spigot-Server-Patches/0084-Don-t-teleport-dead-entities.patch b/Spigot-Server-Patches/0083-Don-t-teleport-dead-entities.patch
similarity index 90%
rename from Spigot-Server-Patches/0084-Don-t-teleport-dead-entities.patch
rename to Spigot-Server-Patches/0083-Don-t-teleport-dead-entities.patch
index 7dcb010b51..c44e644dea 100644
--- a/Spigot-Server-Patches/0084-Don-t-teleport-dead-entities.patch
+++ b/Spigot-Server-Patches/0083-Don-t-teleport-dead-entities.patch
@@ -1,4 +1,4 @@
-From d1970bfea52ebbad7919b325fee197544aed4e13 Mon Sep 17 00:00:00 2001
+From a37aa06bbc370c134338ad5ed72958e0d3c312bd 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
@@ -7,7 +7,7 @@ Had some issue with this in past, and this is the vanilla logic.
 Potentially an old CB change that's no longer needed.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 05d764fa2..a6d472139 100644
+index 05d764fa..a6d47213 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2356,7 +2356,7 @@ public abstract class Entity implements ICommandListener {
diff --git a/Spigot-Server-Patches/0085-Optimize-Chunk-Access.patch b/Spigot-Server-Patches/0084-Optimize-Chunk-Access.patch
similarity index 94%
rename from Spigot-Server-Patches/0085-Optimize-Chunk-Access.patch
rename to Spigot-Server-Patches/0084-Optimize-Chunk-Access.patch
index 0ded9ae1c0..c7fc483514 100644
--- a/Spigot-Server-Patches/0085-Optimize-Chunk-Access.patch
+++ b/Spigot-Server-Patches/0084-Optimize-Chunk-Access.patch
@@ -1,4 +1,4 @@
-From 970bfaa3a4f890a498b229a790fef7cb6780de63 Mon Sep 17 00:00:00 2001
+From 895c7044c86e42baa2d33241050f436c21315ec9 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
@@ -9,7 +9,7 @@ getChunkAt is called for the same chunk multiple times in a row, often from getT
 Optimize this look up by using a Last Access cache.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 9449b645..c81b404b 100644
+index 4e51585a..15814f66 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -27,7 +27,27 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -42,5 +42,5 @@ index 9449b645..c81b404b 100644
  
      public ChunkProviderServer(WorldServer worldserver, IChunkLoader ichunkloader, ChunkGenerator chunkgenerator) {
 -- 
-2.13.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0086-Configurable-spawn-chances-for-skeleton-horses.patch b/Spigot-Server-Patches/0085-Configurable-spawn-chances-for-skeleton-horses.patch
similarity index 89%
rename from Spigot-Server-Patches/0086-Configurable-spawn-chances-for-skeleton-horses.patch
rename to Spigot-Server-Patches/0085-Configurable-spawn-chances-for-skeleton-horses.patch
index 111183306b..a3c33f3303 100644
--- a/Spigot-Server-Patches/0086-Configurable-spawn-chances-for-skeleton-horses.patch
+++ b/Spigot-Server-Patches/0085-Configurable-spawn-chances-for-skeleton-horses.patch
@@ -1,14 +1,14 @@
-From 6e18fbc081ded96ffa9b24ea6dfbcb1a49bfe924 Mon Sep 17 00:00:00 2001
+From 4a32500b8f95a5b791d8cf3b2f354b319544c5a9 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 22 Mar 2016 12:04:28 -0500
 Subject: [PATCH] Configurable spawn chances for skeleton horses
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index b37b5901..adc81072 100644
+index db40db0d..8027700d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -263,4 +263,9 @@ public class PaperWorldConfig {
+@@ -255,4 +255,9 @@ public class PaperWorldConfig {
          }
          log("Non Player Arrow Despawn Rate: " + nonPlayerArrowDespawnRate);
      }
@@ -19,7 +19,7 @@ index b37b5901..adc81072 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index a00837f9..8e4697a0 100644
+index 9ef492f1..72dc2008 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -493,7 +493,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -32,5 +32,5 @@ index a00837f9..8e4697a0 100644
  
                              entityhorseskeleton.p(true);
 -- 
-2.13.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0087-Optimize-isValidLocation-getType-and-getBlockData-fo.patch b/Spigot-Server-Patches/0086-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
similarity index 97%
rename from Spigot-Server-Patches/0087-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
rename to Spigot-Server-Patches/0086-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
index c13f3e9d50..5aaf5e5eea 100644
--- a/Spigot-Server-Patches/0087-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
+++ b/Spigot-Server-Patches/0086-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
@@ -1,4 +1,4 @@
-From 66124bd3037af7b231c57fd9b90226497c4495af Mon Sep 17 00:00:00 2001
+From 83aa50c2c80d1e27071ddc42948717897b3baff5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 02:07:55 -0600
 Subject: [PATCH] Optimize isValidLocation, getType and getBlockData for inling
@@ -12,7 +12,7 @@ Replace all calls to the new place to the unnecessary forward.
 Optimize getType and getBlockData to manually inline and optimize the calls
 
 diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java
-index d55e180d7..679d5504e 100644
+index d55e180d..679d5504 100644
 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java
 @@ -10,6 +10,14 @@ public class BaseBlockPosition implements Comparable<BaseBlockPosition> {
@@ -31,7 +31,7 @@ index d55e180d7..679d5504e 100644
      public BaseBlockPosition(int i, int j, int k) {
          this.a = i;
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 67b476b22..008ed206d 100644
+index 67b476b2..008ed206 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -339,6 +339,16 @@ public class BlockPosition extends BaseBlockPosition {
@@ -52,7 +52,7 @@ index 67b476b22..008ed206d 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 a15befd6a..6bf2f8d2d 100644
+index 84a88056..172d00bd 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -406,11 +406,27 @@ public class Chunk {
@@ -86,7 +86,7 @@ index a15befd6a..6bf2f8d2d 100644
              IBlockData iblockdata = null;
  
 diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java
-index 3d784d0dc..afdc4a779 100644
+index 3d784d0d..afdc4a77 100644
 --- a/src/main/java/net/minecraft/server/ChunkSection.java
 +++ b/src/main/java/net/minecraft/server/ChunkSection.java
 @@ -5,7 +5,7 @@ public class ChunkSection {
@@ -99,7 +99,7 @@ index 3d784d0dc..afdc4a779 100644
      private NibbleArray skyLight;
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 5546f95b9..6b93dcca8 100644
+index 9339bf83..a20c9810 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -277,12 +277,12 @@ public abstract class World implements IBlockAccess {
@@ -256,5 +256,5 @@ index 5546f95b9..6b93dcca8 100644
          } else {
              Chunk chunk = this.chunkProvider.getLoadedChunkAt(blockposition.getX() >> 4, blockposition.getZ() >> 4);
 -- 
-2.15.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0088-Fix-cooked-fish-legacy-import.patch b/Spigot-Server-Patches/0087-Fix-cooked-fish-legacy-import.patch
similarity index 93%
rename from Spigot-Server-Patches/0088-Fix-cooked-fish-legacy-import.patch
rename to Spigot-Server-Patches/0087-Fix-cooked-fish-legacy-import.patch
index c347e5f45f..8770c7009b 100644
--- a/Spigot-Server-Patches/0088-Fix-cooked-fish-legacy-import.patch
+++ b/Spigot-Server-Patches/0087-Fix-cooked-fish-legacy-import.patch
@@ -1,4 +1,4 @@
-From 62ffa640940adcb317f89eea7f5a29462ab9c909 Mon Sep 17 00:00:00 2001
+From 95d1ad0c392010288eab3405f471248e8b91ca93 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 87b82eb3..a7c71f40 100644
          DataConverterMaterialId.a[352] = "minecraft:bone";
          DataConverterMaterialId.a[353] = "minecraft:sugar";
 -- 
-2.13.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0089-Access-items-by-EquipmentSlot.patch b/Spigot-Server-Patches/0088-Access-items-by-EquipmentSlot.patch
similarity index 95%
rename from Spigot-Server-Patches/0089-Access-items-by-EquipmentSlot.patch
rename to Spigot-Server-Patches/0088-Access-items-by-EquipmentSlot.patch
index 42f2a5a813..cd62703e59 100644
--- a/Spigot-Server-Patches/0089-Access-items-by-EquipmentSlot.patch
+++ b/Spigot-Server-Patches/0088-Access-items-by-EquipmentSlot.patch
@@ -1,11 +1,11 @@
-From 1c3f66e29a58bdc85e459e793173d4febc431df3 Mon Sep 17 00:00:00 2001
+From bf706ec07b796e1b09610c8e0231e4631bf11bd5 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 20 Mar 2016 06:45:01 -0400
 Subject: [PATCH] Access items by EquipmentSlot
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
-index 67c54899d..3f58c34e0 100644
+index 67c54899..3f58c34e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
 @@ -267,4 +267,54 @@ public class CraftInventoryPlayer extends CraftInventory implements org.bukkit.i
@@ -64,5 +64,5 @@ index 67c54899d..3f58c34e0 100644
 +    // Paper end
  }
 -- 
-2.13.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0090-Check-async-remove-unused-vars-GH-159.patch b/Spigot-Server-Patches/0089-Check-async-remove-unused-vars-GH-159.patch
similarity index 95%
rename from Spigot-Server-Patches/0090-Check-async-remove-unused-vars-GH-159.patch
rename to Spigot-Server-Patches/0089-Check-async-remove-unused-vars-GH-159.patch
index 605cfc6eb0..0df3984d36 100644
--- a/Spigot-Server-Patches/0090-Check-async-remove-unused-vars-GH-159.patch
+++ b/Spigot-Server-Patches/0089-Check-async-remove-unused-vars-GH-159.patch
@@ -1,4 +1,4 @@
-From 95c8f83b6d05e0a205c94a3f9c0509617ee71061 Mon Sep 17 00:00:00 2001
+From 8f7efee55b677903cf40c93b21b00163a9e8b1e1 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 68a04532..45a83ae9 100644
                      if ((mobcnt = getEntityCount(worldserver, enumcreaturetype.a())) <= limit * i / 256) {
                          BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition();
 -- 
-2.13.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0091-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch b/Spigot-Server-Patches/0090-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
similarity index 94%
rename from Spigot-Server-Patches/0091-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
rename to Spigot-Server-Patches/0090-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
index bc6c784c33..14fa572714 100644
--- a/Spigot-Server-Patches/0091-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
+++ b/Spigot-Server-Patches/0090-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
@@ -1,4 +1,4 @@
-From 64683f371daad0082a825007f7f531cc5c55d029 Mon Sep 17 00:00:00 2001
+From bbb8d54be68328cd031be2cd296ed83e5f3e939c 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
@@ -11,10 +11,10 @@ Defaulting this to false will provide substantial performance improvement
 by saving millions of event calls on redstone heavy servers.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index adc810720..e706efff5 100644
+index 8027700d..923a7200 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -268,4 +268,9 @@ public class PaperWorldConfig {
+@@ -260,4 +260,9 @@ public class PaperWorldConfig {
      private void skeleHorseSpawnChance() {
          skeleHorseSpawnChance = getDouble("skeleton-horse-thunder-spawn-chance", 0.01D); // -1.0D represents a "vanilla" state
      }
@@ -25,7 +25,7 @@ index adc810720..e706efff5 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index e93c45cfc..f079d62e7 100644
+index a20c9810..03f07677 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -582,7 +582,7 @@ public abstract class World implements IBlockAccess {
@@ -38,7 +38,7 @@ index e93c45cfc..f079d62e7 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 72dc20087..f2ddc22dd 100644
+index 72dc2008..f2ddc22d 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -35,6 +35,7 @@ import org.bukkit.event.weather.LightningStrikeEvent;
@@ -67,5 +67,5 @@ index 72dc20087..f2ddc22dd 100644
                          timing.stopTiming(); // Paper
                      } else {
 -- 
-2.14.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0092-Entity-AddTo-RemoveFrom-World-Events.patch b/Spigot-Server-Patches/0091-Entity-AddTo-RemoveFrom-World-Events.patch
similarity index 90%
rename from Spigot-Server-Patches/0092-Entity-AddTo-RemoveFrom-World-Events.patch
rename to Spigot-Server-Patches/0091-Entity-AddTo-RemoveFrom-World-Events.patch
index 0867a7a3da..d3161699b5 100644
--- a/Spigot-Server-Patches/0092-Entity-AddTo-RemoveFrom-World-Events.patch
+++ b/Spigot-Server-Patches/0091-Entity-AddTo-RemoveFrom-World-Events.patch
@@ -1,11 +1,11 @@
-From 0a2a8de008cd59aab6ac5aef1233fc37c3ab76c2 Mon Sep 17 00:00:00 2001
+From c656be4ffec7d9daac8f8278ecf04bb13b568744 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:32:58 -0400
 Subject: [PATCH] Entity AddTo/RemoveFrom World Events
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index d038a3da7..c6c85a5f1 100644
+index 03f07677..97499aeb 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1185,6 +1185,7 @@ public abstract class World implements IBlockAccess {
@@ -25,5 +25,5 @@ index d038a3da7..c6c85a5f1 100644
      }
  
 -- 
-2.15.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0093-Configurable-Chunk-Inhabited-Timer.patch b/Spigot-Server-Patches/0092-Configurable-Chunk-Inhabited-Timer.patch
similarity index 89%
rename from Spigot-Server-Patches/0093-Configurable-Chunk-Inhabited-Timer.patch
rename to Spigot-Server-Patches/0092-Configurable-Chunk-Inhabited-Timer.patch
index ad4836a415..fc10b607e3 100644
--- a/Spigot-Server-Patches/0093-Configurable-Chunk-Inhabited-Timer.patch
+++ b/Spigot-Server-Patches/0092-Configurable-Chunk-Inhabited-Timer.patch
@@ -1,4 +1,4 @@
-From 85af59e5efe9dc63852fd38624fae257d95cdc56 Mon Sep 17 00:00:00 2001
+From d2894c5ff5eefbe0b68d0ccfefc49b5493d5e1ef 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
@@ -9,10 +9,10 @@ aspects of vanilla gameplay to this factor.
 For people who want all chunks to be treated equally, you can disable the timer.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e706efff..2c682ccf 100644
+index 923a7200..aa923406 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -273,4 +273,9 @@ public class PaperWorldConfig {
+@@ -265,4 +265,9 @@ public class PaperWorldConfig {
      private void firePhysicsEventForRedstone() {
          firePhysicsEventForRedstone = getBoolean("fire-physics-event-for-redstone", firePhysicsEventForRedstone);
      }
@@ -36,5 +36,5 @@ index 172d00bd..300a5619 100644
  
      public void c(long i) {
 -- 
-2.15.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0094-EntityPathfindEvent.patch b/Spigot-Server-Patches/0093-EntityPathfindEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0094-EntityPathfindEvent.patch
rename to Spigot-Server-Patches/0093-EntityPathfindEvent.patch
index 1b229a5342..600efe788b 100644
--- a/Spigot-Server-Patches/0094-EntityPathfindEvent.patch
+++ b/Spigot-Server-Patches/0093-EntityPathfindEvent.patch
@@ -1,4 +1,4 @@
-From ad43c73e95af0079283990272e0583063d7dd4ca Mon Sep 17 00:00:00 2001
+From c0bd0c65c216796321650a58bd0fd505ef23406b 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 cc44d30b..3ac6f84d 100644
                  float f = this.i();
  
 -- 
-2.13.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0095-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch b/Spigot-Server-Patches/0094-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
similarity index 97%
rename from Spigot-Server-Patches/0095-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
rename to Spigot-Server-Patches/0094-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
index 1545c8ddf3..a4ee42e292 100644
--- a/Spigot-Server-Patches/0095-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
+++ b/Spigot-Server-Patches/0094-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
@@ -1,4 +1,4 @@
-From fd37edca846d81afb65cd70f00f7b94d3b61bf39 Mon Sep 17 00:00:00 2001
+From 430494f70a3e392c7c90dc61bea75e6aea263c38 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 739b9aac..ff90e08e 100644
                  if (this.material == Material.LAVA) {
                      this.fizz(world, blockposition);
 -- 
-2.13.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0096-Reduce-IO-ops-opening-a-new-region-file.patch b/Spigot-Server-Patches/0095-Reduce-IO-ops-opening-a-new-region-file.patch
similarity index 95%
rename from Spigot-Server-Patches/0096-Reduce-IO-ops-opening-a-new-region-file.patch
rename to Spigot-Server-Patches/0095-Reduce-IO-ops-opening-a-new-region-file.patch
index 590ca32c2c..9656b2dc42 100644
--- a/Spigot-Server-Patches/0096-Reduce-IO-ops-opening-a-new-region-file.patch
+++ b/Spigot-Server-Patches/0095-Reduce-IO-ops-opening-a-new-region-file.patch
@@ -1,4 +1,4 @@
-From 3619fe0c11a4a4d44e4c69b4777030fa69aa52c5 Mon Sep 17 00:00:00 2001
+From 3f1afe5e7b801093fabae4b6a17daeecd27e258c 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 5bcbd718..2bd85e2d 100644
              }
          } catch (IOException ioexception) {
 -- 
-2.13.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0097-Sanitise-RegionFileCache-and-make-configurable.patch b/Spigot-Server-Patches/0096-Sanitise-RegionFileCache-and-make-configurable.patch
similarity index 97%
rename from Spigot-Server-Patches/0097-Sanitise-RegionFileCache-and-make-configurable.patch
rename to Spigot-Server-Patches/0096-Sanitise-RegionFileCache-and-make-configurable.patch
index c1fec2c85d..0ec22d6c6c 100644
--- a/Spigot-Server-Patches/0097-Sanitise-RegionFileCache-and-make-configurable.patch
+++ b/Spigot-Server-Patches/0096-Sanitise-RegionFileCache-and-make-configurable.patch
@@ -1,4 +1,4 @@
-From a774cbcdff02938f6689937656fd836f34fa848e Mon Sep 17 00:00:00 2001
+From 30fa5aba6e6c64938c45d420e8856c3fefdf3e58 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.
@@ -77,5 +77,5 @@ index 5f9e9dde..7e756580 100644
          Iterator iterator = RegionFileCache.a.values().iterator();
  
 -- 
-2.13.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0098-Use-Optimized-Collections.patch b/Spigot-Server-Patches/0097-Use-Optimized-Collections.patch
similarity index 94%
rename from Spigot-Server-Patches/0098-Use-Optimized-Collections.patch
rename to Spigot-Server-Patches/0097-Use-Optimized-Collections.patch
index a316948d1a..e9876746d6 100644
--- a/Spigot-Server-Patches/0098-Use-Optimized-Collections.patch
+++ b/Spigot-Server-Patches/0097-Use-Optimized-Collections.patch
@@ -1,4 +1,4 @@
-From 92c11ac4d9226bc25c8f4b82fbf686c30b8c4660 Mon Sep 17 00:00:00 2001
+From f2a16d213b5259477eb5bdb9790116c5a627b13b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 30 Mar 2016 02:13:24 -0400
 Subject: [PATCH] Use Optimized Collections
@@ -13,7 +13,7 @@ These collections are super fast as seen
 http://java-performance.info/hashmap-overview-jdk-fastutil-goldman-sachs-hppc-koloboke-trove-january-2015/
 
 diff --git a/src/main/java/net/minecraft/server/DataWatcher.java b/src/main/java/net/minecraft/server/DataWatcher.java
-index 1507f97fd..fe8484453 100644
+index 1507f97f..fe848445 100644
 --- a/src/main/java/net/minecraft/server/DataWatcher.java
 +++ b/src/main/java/net/minecraft/server/DataWatcher.java
 @@ -12,6 +12,7 @@ import java.util.Map;
@@ -34,5 +34,5 @@ index 1507f97fd..fe8484453 100644
      private boolean f = true;
      private boolean g;
 -- 
-2.13.0
+2.14.3
 
diff --git a/Spigot-Server-Patches/0099-Do-not-load-chunks-for-light-checks.patch b/Spigot-Server-Patches/0098-Do-not-load-chunks-for-light-checks.patch
similarity index 88%
rename from Spigot-Server-Patches/0099-Do-not-load-chunks-for-light-checks.patch
rename to Spigot-Server-Patches/0098-Do-not-load-chunks-for-light-checks.patch
index ab74664645..4f9c0f61d5 100644
--- a/Spigot-Server-Patches/0099-Do-not-load-chunks-for-light-checks.patch
+++ b/Spigot-Server-Patches/0098-Do-not-load-chunks-for-light-checks.patch
@@ -1,4 +1,4 @@
-From 4bc812256242f853920650f26f7626f2a4a4fc21 Mon Sep 17 00:00:00 2001
+From bbb44b54bb0a777d7b3907688af0cf057396d725 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 31 Mar 2016 19:17:58 -0400
 Subject: [PATCH] Do not load chunks for light checks
@@ -7,7 +7,7 @@ Should only happen for blocks on the edge that uses neighbors light level
 (certain blocks). In that case, there will be 3-4 other neighbors to get a light level from.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 79216be29..7164f224f 100644
+index 97499aeb..279f0a26 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -764,6 +764,7 @@ public abstract class World implements IBlockAccess {
@@ -19,5 +19,5 @@ index 79216be29..7164f224f 100644
                  Chunk chunk = this.getChunkAtWorldCoords(blockposition);
  
 -- 
-2.13.3.windows.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0100-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-Server-Patches/0099-Add-PlayerUseUnknownEntityEvent.patch
similarity index 92%
rename from Spigot-Server-Patches/0100-Add-PlayerUseUnknownEntityEvent.patch
rename to Spigot-Server-Patches/0099-Add-PlayerUseUnknownEntityEvent.patch
index a8f0e9dc9e..61bcbddde2 100644
--- a/Spigot-Server-Patches/0100-Add-PlayerUseUnknownEntityEvent.patch
+++ b/Spigot-Server-Patches/0099-Add-PlayerUseUnknownEntityEvent.patch
@@ -1,11 +1,11 @@
-From 79f3d91dc543274a2178db9afdc35eb51a49da4b Mon Sep 17 00:00:00 2001
+From 53c71782706b642bce798cd5af6b32cea8bd2ecd Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 2 Apr 2016 05:09:16 -0400
 Subject: [PATCH] Add PlayerUseUnknownEntityEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java b/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java
-index c67cb54a3..521f46262 100644
+index c67cb54a..521f4626 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java
 @@ -5,7 +5,7 @@ import javax.annotation.Nullable;
@@ -18,7 +18,7 @@ index c67cb54a3..521f46262 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 5cc5dbcd7..70fb4f6b0 100644
+index 5cc5dbcd..70fb4f6b 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1657,6 +1657,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
diff --git a/Spigot-Server-Patches/0101-Fix-reducedDebugInfo-not-initialized-on-client.patch b/Spigot-Server-Patches/0100-Fix-reducedDebugInfo-not-initialized-on-client.patch
similarity index 91%
rename from Spigot-Server-Patches/0101-Fix-reducedDebugInfo-not-initialized-on-client.patch
rename to Spigot-Server-Patches/0100-Fix-reducedDebugInfo-not-initialized-on-client.patch
index 5ce03c37ca..f13217b543 100644
--- a/Spigot-Server-Patches/0101-Fix-reducedDebugInfo-not-initialized-on-client.patch
+++ b/Spigot-Server-Patches/0100-Fix-reducedDebugInfo-not-initialized-on-client.patch
@@ -1,11 +1,11 @@
-From 421d357eb2ae97cda5e4f7a787df50d64161f834 Mon Sep 17 00:00:00 2001
+From e389317bbc486c5205df6f61bf88c76981a5d0f2 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 2 Apr 2016 20:37:03 -0400
 Subject: [PATCH] Fix reducedDebugInfo not initialized on client
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index b90407d18..4b2865506 100644
+index b38ff689..7bdd5bcf 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -160,6 +160,7 @@ public abstract class PlayerList {
@@ -17,5 +17,5 @@ index b90407d18..4b2865506 100644
          entityplayer.getStatisticManager().c();
          entityplayer.F().a(entityplayer);
 -- 
-2.13.0
+2.14.3
 
diff --git a/Spigot-Server-Patches/0102-Configurable-Grass-Spread-Tick-Rate.patch b/Spigot-Server-Patches/0101-Configurable-Grass-Spread-Tick-Rate.patch
similarity index 91%
rename from Spigot-Server-Patches/0102-Configurable-Grass-Spread-Tick-Rate.patch
rename to Spigot-Server-Patches/0101-Configurable-Grass-Spread-Tick-Rate.patch
index ad91d0bcc7..c9c25c440f 100644
--- a/Spigot-Server-Patches/0102-Configurable-Grass-Spread-Tick-Rate.patch
+++ b/Spigot-Server-Patches/0101-Configurable-Grass-Spread-Tick-Rate.patch
@@ -1,14 +1,14 @@
-From cbb44b27b60dca8248b7097389a2d1c6c2875dcd Mon Sep 17 00:00:00 2001
+From 7745c33d90b8c89977af2aa75adff679f16f222f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 Apr 2016 16:28:17 -0400
 Subject: [PATCH] Configurable Grass Spread Tick Rate
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 2c682ccf..74a49a5f 100644
+index aa923406..afbfbdf8 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -278,4 +278,10 @@ public class PaperWorldConfig {
+@@ -270,4 +270,10 @@ public class PaperWorldConfig {
      private void useInhabitedTime() {
          useInhabitedTime = getBoolean("use-chunk-inhabited-timer", true);
      }
@@ -32,5 +32,5 @@ index 8fc736d6..b656994b 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.13.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0103-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0102-Configurable-Keep-Spawn-Loaded-range-per-world.patch
similarity index 93%
rename from Spigot-Server-Patches/0103-Configurable-Keep-Spawn-Loaded-range-per-world.patch
rename to Spigot-Server-Patches/0102-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index 837ec855bb..c2afedb66a 100644
--- a/Spigot-Server-Patches/0103-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/Spigot-Server-Patches/0102-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -1,4 +1,4 @@
-From 3ab35b757a837b4b28a3418167eae80c64cebd2a Mon Sep 17 00:00:00 2001
+From 7dd194bbef759969b45373918fcf12656d029fa2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 13 Sep 2014 23:14:43 -0400
 Subject: [PATCH] Configurable Keep Spawn Loaded range per world
@@ -6,10 +6,10 @@ Subject: [PATCH] Configurable Keep Spawn Loaded range per world
 This lets you disable it for some worlds and lower it for others.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 74a49a5fb..3a942c763 100644
+index afbfbdf8..8136d223 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -284,4 +284,10 @@ public class PaperWorldConfig {
+@@ -276,4 +276,10 @@ public class PaperWorldConfig {
          grassUpdateRate = Math.max(0, getInt("grass-spread-tick-rate", grassUpdateRate));
          log("Grass Spread Tick Rate: " + grassUpdateRate);
      }
@@ -21,7 +21,7 @@ index 74a49a5fb..3a942c763 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 4e8ce79ff..2300ee10b 100644
+index 4e8ce79f..2300ee10 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -357,8 +357,11 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -39,7 +39,7 @@ index 4e8ce79ff..2300ee10b 100644
  
                      if (i1 - j > 1000L) {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 279f0a261..a0b36b6ba 100644
+index 279f0a26..a0b36b6b 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -3200,8 +3200,9 @@ public abstract class World implements IBlockAccess {
@@ -54,7 +54,7 @@ index 279f0a261..a0b36b6ba 100644
  
      public void a(Packet<?> packet) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5d15d5846..bc048f292 100644
+index 5d15d584..bc048f29 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -961,7 +961,7 @@ public final class CraftServer implements Server {
@@ -67,7 +67,7 @@ index 5d15d5846..bc048f292 100644
              for (int j = -short1; j <= short1; j += 16) {
                  for (int k = -short1; k <= short1; k += 16) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 01fc193db..69dc11e2b 100644
+index 01fc193d..69dc11e2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1283,8 +1283,9 @@ public class CraftWorld implements World {
@@ -83,5 +83,5 @@ index 01fc193db..69dc11e2b 100644
                      loadChunk(chunkCoordX + x, chunkCoordZ + z);
                  } else {
 -- 
-2.15.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0104-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/Spigot-Server-Patches/0103-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
similarity index 87%
rename from Spigot-Server-Patches/0104-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
rename to Spigot-Server-Patches/0103-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
index fa70fe83cd..fecbdbb1c8 100644
--- a/Spigot-Server-Patches/0104-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
+++ b/Spigot-Server-Patches/0103-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
@@ -1,11 +1,11 @@
-From 17d62977b12c1bd7bf5c0ac9bd7f460e7ecfbaa4 Mon Sep 17 00:00:00 2001
+From 904c8ee708739505f983b39cf809a39731b3d7fa Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 Apr 2016 17:48:50 -0400
 Subject: [PATCH] Fix Cancelling BlockPlaceEvent triggering physics
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f235f7483..0ee112756 100644
+index a0b36b6b..f78298a5 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -536,6 +536,7 @@ public abstract class World implements IBlockAccess {
@@ -17,5 +17,5 @@ index f235f7483..0ee112756 100644
          this.a(blockposition.east(), block, blockposition);
          this.a(blockposition.down(), block, blockposition);
 -- 
-2.13.3.windows.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0105-Don-t-spam-reload-spawn-chunks-in-nether-end.patch b/Spigot-Server-Patches/0104-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
similarity index 89%
rename from Spigot-Server-Patches/0105-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
rename to Spigot-Server-Patches/0104-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
index 8866950c56..25b4c81b7f 100644
--- a/Spigot-Server-Patches/0105-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
+++ b/Spigot-Server-Patches/0104-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
@@ -1,11 +1,11 @@
-From a70b4e697f8e255d15bfcf9243ef528173268fba Mon Sep 17 00:00:00 2001
+From 42b757c0c077ef126f1ac1ae6dadecccbc42d033 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
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 06d8e82ad..532096782 100644
+index f78298a5..e2efbf8c 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -3196,6 +3196,7 @@ public abstract class World implements IBlockAccess {
@@ -17,7 +17,7 @@ index 06d8e82ad..532096782 100644
          BlockPosition blockposition = this.getSpawn();
          int k = i * 16 + 8 - blockposition.getX();
 diff --git a/src/main/java/net/minecraft/server/WorldProvider.java b/src/main/java/net/minecraft/server/WorldProvider.java
-index d0265f960..35d8d1a6e 100644
+index d0265f96..35d8d1a6 100644
 --- a/src/main/java/net/minecraft/server/WorldProvider.java
 +++ b/src/main/java/net/minecraft/server/WorldProvider.java
 @@ -138,6 +138,6 @@ public abstract class WorldProvider {
@@ -29,5 +29,5 @@ index d0265f960..35d8d1a6e 100644
      }
  }
 -- 
-2.15.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0106-Remove-Debug-checks-from-DataBits.patch b/Spigot-Server-Patches/0105-Remove-Debug-checks-from-DataBits.patch
similarity index 95%
rename from Spigot-Server-Patches/0106-Remove-Debug-checks-from-DataBits.patch
rename to Spigot-Server-Patches/0105-Remove-Debug-checks-from-DataBits.patch
index c1e15f35d4..947b95f10c 100644
--- a/Spigot-Server-Patches/0106-Remove-Debug-checks-from-DataBits.patch
+++ b/Spigot-Server-Patches/0105-Remove-Debug-checks-from-DataBits.patch
@@ -1,4 +1,4 @@
-From d0114b304c138b711dea367a58c06e2b41065b87 Mon Sep 17 00:00:00 2001
+From 205a256bba1c494d95d6e42674eb8c2502b57480 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 f3a6799a..fa0fd8a9 100644
          int k = j / 64;
          int l = ((i + 1) * this.b - 1) / 64;
 -- 
-2.13.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0107-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/Spigot-Server-Patches/0106-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
similarity index 92%
rename from Spigot-Server-Patches/0107-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
rename to Spigot-Server-Patches/0106-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
index 45e648549a..1131d23501 100644
--- a/Spigot-Server-Patches/0107-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+++ b/Spigot-Server-Patches/0106-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
@@ -1,14 +1,14 @@
-From 8d9dbd8a595e6f850385054bf6b0c78a067a5b9b Mon Sep 17 00:00:00 2001
+From 48a023bccd8c393382d6b2985dae6a004ce8a6bf Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 6 Apr 2016 01:04:23 -0500
 Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 3a942c763..3bd29650c 100644
+index 8136d223..c159871c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -290,4 +290,9 @@ public class PaperWorldConfig {
+@@ -282,4 +282,9 @@ public class PaperWorldConfig {
          keepLoadedRange = (short) (getInt("keep-spawn-loaded-range", Math.min(spigotConfig.viewDistance, 8)) * 16);
          log( "Keep Spawn Loaded Range: " + (keepLoadedRange/16));
      }
@@ -19,7 +19,7 @@ index 3a942c763..3bd29650c 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index a6d472139..1d31bcde8 100644
+index a6d47213..1d31bcde 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2079,6 +2079,7 @@ public abstract class Entity implements ICommandListener {
@@ -31,7 +31,7 @@ index a6d472139..1d31bcde8 100644
      public ScoreboardTeamBase aY() {
          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 70fb4f6b0..187e59a08 100644
+index 70fb4f6b..187e59a0 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1390,7 +1390,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
diff --git a/Spigot-Server-Patches/0108-Workaround-for-setting-passengers-on-players.patch b/Spigot-Server-Patches/0107-Workaround-for-setting-passengers-on-players.patch
similarity index 91%
rename from Spigot-Server-Patches/0108-Workaround-for-setting-passengers-on-players.patch
rename to Spigot-Server-Patches/0107-Workaround-for-setting-passengers-on-players.patch
index 3c402b4a45..e96051f7e9 100644
--- a/Spigot-Server-Patches/0108-Workaround-for-setting-passengers-on-players.patch
+++ b/Spigot-Server-Patches/0107-Workaround-for-setting-passengers-on-players.patch
@@ -1,4 +1,4 @@
-From c9be2323773b315e94239f237592a8f5673f3021 Mon Sep 17 00:00:00 2001
+From a79ebbc5500aebc11efea2a8aee03c745c21fc43 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Workaround for setting passengers on players
 SPIGOT-1915 & GH-114
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7a5866682..5dae65eeb 100644
+index 9fe7a18a..f55c4366 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -633,6 +633,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -28,5 +28,5 @@ index 7a5866682..5dae65eeb 100644
      public void setSneaking(boolean sneak) {
          getHandle().setSneaking(sneak);
 -- 
-2.15.0
+2.14.3
 
diff --git a/Spigot-Server-Patches/0109-Remove-unused-World-Tile-Entity-List.patch b/Spigot-Server-Patches/0108-Remove-unused-World-Tile-Entity-List.patch
similarity index 97%
rename from Spigot-Server-Patches/0109-Remove-unused-World-Tile-Entity-List.patch
rename to Spigot-Server-Patches/0108-Remove-unused-World-Tile-Entity-List.patch
index 4bcf9b995c..6b588f19ee 100644
--- a/Spigot-Server-Patches/0109-Remove-unused-World-Tile-Entity-List.patch
+++ b/Spigot-Server-Patches/0108-Remove-unused-World-Tile-Entity-List.patch
@@ -1,4 +1,4 @@
-From b1691470ba918f9cc7690d548fc30a7f448bab6b Mon Sep 17 00:00:00 2001
+From e98113a1c6d8e408e06181acc9930e5dab2851fa Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 00:25:28 -0400
 Subject: [PATCH] Remove unused World Tile Entity List
@@ -6,7 +6,7 @@ Subject: [PATCH] Remove unused World Tile Entity List
 Massive hit to performance and it is completely unnecessary.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 532096782..2b2105e4e 100644
+index e2efbf8c..aae2d578 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -69,7 +69,7 @@ public abstract class World implements IBlockAccess {
@@ -67,5 +67,5 @@ index 532096782..2b2105e4e 100644
              }
  
 -- 
-2.15.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0110-Don-t-tick-Skulls-unused-code.patch b/Spigot-Server-Patches/0109-Don-t-tick-Skulls-unused-code.patch
similarity index 87%
rename from Spigot-Server-Patches/0110-Don-t-tick-Skulls-unused-code.patch
rename to Spigot-Server-Patches/0109-Don-t-tick-Skulls-unused-code.patch
index dcd1124af6..b4c8a14b9f 100644
--- a/Spigot-Server-Patches/0110-Don-t-tick-Skulls-unused-code.patch
+++ b/Spigot-Server-Patches/0109-Don-t-tick-Skulls-unused-code.patch
@@ -1,11 +1,11 @@
-From a53c246441ef3bdecad65ca57c5e1258a4a03f2e Mon Sep 17 00:00:00 2001
+From 66c73c93aedcd3516e703a66d561702b3e3be592 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 00:30:10 -0400
 Subject: [PATCH] Don't tick Skulls - unused code
 
 
 diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java
-index 1e3c687d6..ba02a17e0 100644
+index 1e3c687d..ba02a17e 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySkull.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySkull.java
 @@ -24,7 +24,7 @@ import com.mojang.authlib.ProfileLookupCallback;
@@ -18,5 +18,5 @@ index 1e3c687d6..ba02a17e0 100644
      private int a;
      public int rotation;
 -- 
-2.15.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0111-Configurable-Player-Collision.patch b/Spigot-Server-Patches/0110-Configurable-Player-Collision.patch
similarity index 94%
rename from Spigot-Server-Patches/0111-Configurable-Player-Collision.patch
rename to Spigot-Server-Patches/0110-Configurable-Player-Collision.patch
index a52fdf85d4..d4681a9e61 100644
--- a/Spigot-Server-Patches/0111-Configurable-Player-Collision.patch
+++ b/Spigot-Server-Patches/0110-Configurable-Player-Collision.patch
@@ -1,11 +1,11 @@
-From 38d63d20c31041a8f75ba8e44614c3435c8c9713 Mon Sep 17 00:00:00 2001
+From cebc409ba3e41ef32d5f2c2a5a6537473c0c7c57 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 ec4643384..430b5d0cd 100644
+index ec464338..430b5d0c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -220,4 +220,9 @@ public class PaperConfig {
@@ -19,7 +19,7 @@ index ec4643384..430b5d0cd 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/CommandScoreboard.java b/src/main/java/net/minecraft/server/CommandScoreboard.java
-index b08274d93..0607e55d3 100644
+index b08274d9..0607e55d 100644
 --- a/src/main/java/net/minecraft/server/CommandScoreboard.java
 +++ b/src/main/java/net/minecraft/server/CommandScoreboard.java
 @@ -183,6 +183,13 @@ public class CommandScoreboard extends CommandAbstract {
@@ -37,7 +37,7 @@ index b08274d93..0607e55d3 100644
                      }
                  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 57f508e42..f5d284ca3 100644
+index 2300ee10..b6c4d98f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -332,6 +332,20 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -62,7 +62,7 @@ index 57f508e42..f5d284ca3 100644
  
      protected void l() {
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java b/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java
-index 549d4e89d..df11764e0 100644
+index 549d4e89..df11764e 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java
 @@ -96,7 +96,7 @@ public class PacketPlayOutScoreboardTeam implements Packet<PacketListenerPlayOut
@@ -75,7 +75,7 @@ index 549d4e89d..df11764e0 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index e6ed52b4a..30ca137e6 100644
+index 7bdd5bcf..f38e8197 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -74,6 +74,7 @@ public abstract class PlayerList {
@@ -99,7 +99,7 @@ index e6ed52b4a..30ca137e6 100644
          // CraftBukkit - Moved from above, added world
          PlayerList.f.info(entityplayer.getName() + "[" + s1 + "] logged in with entity id " + entityplayer.getId() + " at ([" + entityplayer.world.worldData.getName() + "]" + entityplayer.locX + ", " + entityplayer.locY + ", " + entityplayer.locZ + ")");
      }
-@@ -419,6 +426,16 @@ public abstract class PlayerList {
+@@ -421,6 +428,16 @@ public abstract class PlayerList {
          entityplayer.playerTick();// SPIGOT-924
          // CraftBukkit end
  
@@ -116,7 +116,7 @@ index e6ed52b4a..30ca137e6 100644
          this.savePlayerFile(entityplayer);
          if (entityplayer.isPassenger()) {
              Entity entity = entityplayer.getVehicle();
-@@ -1343,7 +1360,13 @@ public abstract class PlayerList {
+@@ -1345,7 +1362,13 @@ public abstract class PlayerList {
              player.playerConnection.disconnect(this.server.server.getShutdownMessage()); // CraftBukkit - add custom shutdown message
          }
          // CraftBukkit end
@@ -132,5 +132,5 @@ index e6ed52b4a..30ca137e6 100644
  
      // CraftBukkit start
 -- 
-2.13.3.windows.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0112-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/Spigot-Server-Patches/0111-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
similarity index 96%
rename from Spigot-Server-Patches/0112-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
rename to Spigot-Server-Patches/0111-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
index fbf2ea8dda..3c2c553335 100644
--- a/Spigot-Server-Patches/0112-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
+++ b/Spigot-Server-Patches/0111-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
@@ -1,4 +1,4 @@
-From a4c7d99e23f13c25691da6be73059ac6cf1fc4f6 Mon Sep 17 00:00:00 2001
+From 081f293feece1336335e05b0d634e09b05cdc753 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Add handshake event to allow plugins to handle client
 
 
 diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
-index 99a63422..1cf64c5b 100644
+index c3c9c3c1..309ab18d 100644
 --- a/src/main/java/net/minecraft/server/HandshakeListener.java
 +++ b/src/main/java/net/minecraft/server/HandshakeListener.java
 @@ -72,8 +72,33 @@ public class HandshakeListener implements PacketHandshakingInListener {
@@ -45,5 +45,5 @@ index 99a63422..1cf64c5b 100644
                      if ( split.length == 3 || split.length == 4 ) {
                          packethandshakinginsetprotocol.hostname = split[0];
 -- 
-2.13.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0113-Water-mobs-should-only-spawn-in-the-water.patch b/Spigot-Server-Patches/0112-Water-mobs-should-only-spawn-in-the-water.patch
similarity index 93%
rename from Spigot-Server-Patches/0113-Water-mobs-should-only-spawn-in-the-water.patch
rename to Spigot-Server-Patches/0112-Water-mobs-should-only-spawn-in-the-water.patch
index eb6fd95788..1415872c4b 100644
--- a/Spigot-Server-Patches/0113-Water-mobs-should-only-spawn-in-the-water.patch
+++ b/Spigot-Server-Patches/0112-Water-mobs-should-only-spawn-in-the-water.patch
@@ -1,4 +1,4 @@
-From 3cf07185c3f1562535db0a99a767853e69f62b0f Mon Sep 17 00:00:00 2001
+From 54ad0664727a5d06f10a13f8e3469203caf2b370 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 f430bdee..0597edad 100644
  
      public boolean canSpawn() {
 -- 
-2.13.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0114-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch b/Spigot-Server-Patches/0113-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
similarity index 97%
rename from Spigot-Server-Patches/0114-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
rename to Spigot-Server-Patches/0113-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
index e536ce6ebb..b7c4e521e7 100644
--- a/Spigot-Server-Patches/0114-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
+++ b/Spigot-Server-Patches/0113-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
@@ -1,4 +1,4 @@
-From 36f81b84e0a48db88becd763857034391bce22d9 Mon Sep 17 00:00:00 2001
+From f47639cb7c51dfa19cfd33bc6fa1346071430a1b 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
@@ -56,5 +56,5 @@ index 45a83ae9..2cd06382 100644
                          Iterator iterator1 = this.b.iterator();
  
 -- 
-2.15.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0115-Configurable-RCON-IP-address.patch b/Spigot-Server-Patches/0114-Configurable-RCON-IP-address.patch
similarity index 92%
rename from Spigot-Server-Patches/0115-Configurable-RCON-IP-address.patch
rename to Spigot-Server-Patches/0114-Configurable-RCON-IP-address.patch
index 4d7b53692a..8df965aa88 100644
--- a/Spigot-Server-Patches/0115-Configurable-RCON-IP-address.patch
+++ b/Spigot-Server-Patches/0114-Configurable-RCON-IP-address.patch
@@ -1,4 +1,4 @@
-From 1bc0e22984a355265408ca75f98e9cf825b83713 Mon Sep 17 00:00:00 2001
+From d306385653a27fdd7ab3ec0a02daab1ed7c3423f 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 a6a0d5a2..efcafe77 100644
          if (0 == this.h) {
              this.h = this.i + 10;
 -- 
-2.13.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0116-Prevent-Fire-from-loading-chunks.patch b/Spigot-Server-Patches/0115-Prevent-Fire-from-loading-chunks.patch
similarity index 96%
rename from Spigot-Server-Patches/0116-Prevent-Fire-from-loading-chunks.patch
rename to Spigot-Server-Patches/0115-Prevent-Fire-from-loading-chunks.patch
index 0ccdc2d1d6..54cbf3fa39 100644
--- a/Spigot-Server-Patches/0116-Prevent-Fire-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0115-Prevent-Fire-from-loading-chunks.patch
@@ -1,4 +1,4 @@
-From cdeef2924460c8256fdbeaddad748cbc2561a3bf Mon Sep 17 00:00:00 2001
+From 79ca517dfc368927a111b63fcfdc81c5a4d03814 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
@@ -43,5 +43,5 @@ index a3a5c853..6832a19a 100644
              }
  
 -- 
-2.13.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0117-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0116-Implement-PlayerLocaleChangeEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0117-Implement-PlayerLocaleChangeEvent.patch
rename to Spigot-Server-Patches/0116-Implement-PlayerLocaleChangeEvent.patch
index cdb8ab446a..e6fade7598 100644
--- a/Spigot-Server-Patches/0117-Implement-PlayerLocaleChangeEvent.patch
+++ b/Spigot-Server-Patches/0116-Implement-PlayerLocaleChangeEvent.patch
@@ -1,11 +1,11 @@
-From 31c05ff06dee6777c80552d785a5d4ba3bc3e80c Mon Sep 17 00:00:00 2001
+From d6d6309f4a0f4aac6b9c1ff38037be0337c86967 Mon Sep 17 00:00:00 2001
 From: Isaac Moore <rmsy@me.com>
 Date: Tue, 19 Apr 2016 14:09:31 -0500
 Subject: [PATCH] Implement PlayerLocaleChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index e48121b4a..24d3b29a5 100644
+index e48121b4..24d3b29a 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -31,7 +31,7 @@ import org.bukkit.inventory.MainHand;
@@ -45,7 +45,7 @@ index e48121b4a..24d3b29a5 100644
          this.cm = packetplayinsettings.d();
          this.getDataWatcher().set(EntityPlayer.br, Byte.valueOf((byte) packetplayinsettings.e()));
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 5dae65eeb..2fb268c97 100644
+index f55c4366..ef873c17 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1639,8 +1639,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -71,5 +71,5 @@ index 5dae65eeb..2fb268c97 100644
  
          @Override
 -- 
-2.15.0
+2.14.3
 
diff --git a/Spigot-Server-Patches/0118-EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-Server-Patches/0117-EntityRegainHealthEvent-isFastRegen-API.patch
similarity index 94%
rename from Spigot-Server-Patches/0118-EntityRegainHealthEvent-isFastRegen-API.patch
rename to Spigot-Server-Patches/0117-EntityRegainHealthEvent-isFastRegen-API.patch
index 76fa3ca956..2c2263eadc 100644
--- a/Spigot-Server-Patches/0118-EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/Spigot-Server-Patches/0117-EntityRegainHealthEvent-isFastRegen-API.patch
@@ -1,4 +1,4 @@
-From 96e62684c8419c93831025be82f13947d404a4e9 Mon Sep 17 00:00:00 2001
+From 734417b2c0f433c584b575829b66deafd32663eb Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 22 Apr 2016 01:43:11 -0500
 Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
@@ -6,7 +6,7 @@ Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
 Don't even get me started
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 296c05480..a09d8964f 100644
+index 296c0548..a09d8964 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -773,10 +773,16 @@ public abstract class EntityLiving extends Entity {
@@ -28,7 +28,7 @@ index 296c05480..a09d8964f 100644
  
              if (!event.isCancelled()) {
 diff --git a/src/main/java/net/minecraft/server/FoodMetaData.java b/src/main/java/net/minecraft/server/FoodMetaData.java
-index d42db9b45..c715138ee 100644
+index d42db9b4..c715138e 100644
 --- a/src/main/java/net/minecraft/server/FoodMetaData.java
 +++ b/src/main/java/net/minecraft/server/FoodMetaData.java
 @@ -65,7 +65,7 @@ public class FoodMetaData {
diff --git a/Spigot-Server-Patches/0119-Add-ability-to-configure-frosted_ice-properties.patch b/Spigot-Server-Patches/0118-Add-ability-to-configure-frosted_ice-properties.patch
similarity index 93%
rename from Spigot-Server-Patches/0119-Add-ability-to-configure-frosted_ice-properties.patch
rename to Spigot-Server-Patches/0118-Add-ability-to-configure-frosted_ice-properties.patch
index 98ea8babb9..1d44843b6e 100644
--- a/Spigot-Server-Patches/0119-Add-ability-to-configure-frosted_ice-properties.patch
+++ b/Spigot-Server-Patches/0118-Add-ability-to-configure-frosted_ice-properties.patch
@@ -1,14 +1,14 @@
-From 81c280034cb4c822a30e4f4e95882524e509847c Mon Sep 17 00:00:00 2001
+From b4949242f77cb24711526907f00e0936a353036c Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 21 Apr 2016 23:51:55 -0700
 Subject: [PATCH] Add ability to configure frosted_ice properties
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 3bd29650..5cc55b79 100644
+index c159871c..609a068c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -295,4 +295,14 @@ public class PaperWorldConfig {
+@@ -287,4 +287,14 @@ public class PaperWorldConfig {
      private void useVanillaScoreboardColoring() {
          useVanillaScoreboardColoring = getBoolean("use-vanilla-world-scoreboard-name-coloring", false);
      }
@@ -44,5 +44,5 @@ index 950863fb..a8dbbf20 100644
  
      }
 -- 
-2.13.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0120-Vehicle-Event-Cancellation-Changes.patch b/Spigot-Server-Patches/0119-Vehicle-Event-Cancellation-Changes.patch
similarity index 95%
rename from Spigot-Server-Patches/0120-Vehicle-Event-Cancellation-Changes.patch
rename to Spigot-Server-Patches/0119-Vehicle-Event-Cancellation-Changes.patch
index 9de7667caa..5476775a67 100644
--- a/Spigot-Server-Patches/0120-Vehicle-Event-Cancellation-Changes.patch
+++ b/Spigot-Server-Patches/0119-Vehicle-Event-Cancellation-Changes.patch
@@ -1,11 +1,11 @@
-From c658b95b741b8d95897cc9a261e22eeddb450ace Mon Sep 17 00:00:00 2001
+From 278380b38137c83f9bc3f02bfbef2d8a8b858f98 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/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 1d31bcde8..06857c483 100644
+index 1d31bcde..06857c48 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -70,7 +70,7 @@ public abstract class Entity implements ICommandListener {
diff --git a/Spigot-Server-Patches/0121-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch b/Spigot-Server-Patches/0120-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
similarity index 97%
rename from Spigot-Server-Patches/0121-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
rename to Spigot-Server-Patches/0120-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
index ba7ba42e55..63b441d732 100644
--- a/Spigot-Server-Patches/0121-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
+++ b/Spigot-Server-Patches/0120-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
@@ -1,4 +1,4 @@
-From 4f885c379793b042358c95ffb93714f92750e137 Mon Sep 17 00:00:00 2001
+From 362cd74f957ff26045449b2192a05407332e2999 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 b6834d2d..dae71170 100644
      public boolean interact(World world, BlockPosition blockposition, IBlockData iblockdata, EntityHuman entityhuman, EnumHand enumhand, EnumDirection enumdirection, float f, float f1, float f2) {
          if (world.isClientSide) {
 -- 
-2.13.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0122-Improve-Minecraft-Hopper-Performance.patch b/Spigot-Server-Patches/0121-Improve-Minecraft-Hopper-Performance.patch
similarity index 96%
rename from Spigot-Server-Patches/0122-Improve-Minecraft-Hopper-Performance.patch
rename to Spigot-Server-Patches/0121-Improve-Minecraft-Hopper-Performance.patch
index 6ad23be05f..f4e76f3c2a 100644
--- a/Spigot-Server-Patches/0122-Improve-Minecraft-Hopper-Performance.patch
+++ b/Spigot-Server-Patches/0121-Improve-Minecraft-Hopper-Performance.patch
@@ -1,4 +1,4 @@
-From a6ec3f7537baf37975755f6cfa9668e12bf1d00a Mon Sep 17 00:00:00 2001
+From 3543fc728e16feb241d8244c4f4ba953c182fd65 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
@@ -8,7 +8,7 @@ Also reset cooldown each hopper tick that a hopper is full.
 Also don't constantly clone ItemStacks without merit
 
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 39be107f..6e23d325 100644
+index 65297a76..393c9089 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -33,6 +33,7 @@ public abstract class TileEntity {
@@ -28,7 +28,7 @@ index 39be107f..6e23d325 100644
  
              this.g = iblockdata.getBlock().toLegacyData(iblockdata);
 diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
-index e38411f3..f9981298 100644
+index 98551351..53584b25 100644
 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java
 +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
 @@ -220,11 +220,13 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
@@ -86,5 +86,5 @@ index e38411f3..f9981298 100644
          return this.f > 0;
      }
 -- 
-2.13.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0123-remove-null-possibility-for-getServer-singleton.patch b/Spigot-Server-Patches/0122-remove-null-possibility-for-getServer-singleton.patch
similarity index 94%
rename from Spigot-Server-Patches/0123-remove-null-possibility-for-getServer-singleton.patch
rename to Spigot-Server-Patches/0122-remove-null-possibility-for-getServer-singleton.patch
index beed321d5f..f340972c8e 100644
--- a/Spigot-Server-Patches/0123-remove-null-possibility-for-getServer-singleton.patch
+++ b/Spigot-Server-Patches/0122-remove-null-possibility-for-getServer-singleton.patch
@@ -1,4 +1,4 @@
-From ddf26e44e9968aadbbfbaabbf0e0dbc9ea2196d7 Mon Sep 17 00:00:00 2001
+From 01df906a57e1cfd688312b4b0802e6e48ea17b42 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 28 Apr 2016 00:57:27 -0400
 Subject: [PATCH] remove null possibility for getServer singleton
@@ -6,7 +6,7 @@ Subject: [PATCH] remove null possibility for getServer singleton
 to stop IDE complaining about potential NPE
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f5d284ca3..948a04491 100644
+index b6c4d98f..45d3dbde 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -53,6 +53,7 @@ import co.aikar.timings.MinecraftTimings; // Paper
@@ -35,5 +35,5 @@ index f5d284ca3..948a04491 100644
      // CraftBukkit end
  }
 -- 
-2.13.3.windows.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0124-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/Spigot-Server-Patches/0123-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
similarity index 96%
rename from Spigot-Server-Patches/0124-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
rename to Spigot-Server-Patches/0123-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index 7ba2ee5de9..366d06b906 100644
--- a/Spigot-Server-Patches/0124-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/Spigot-Server-Patches/0123-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
@@ -1,4 +1,4 @@
-From 1ac1d17af48c1cc06c0240ce6bec19736689c003 Mon Sep 17 00:00:00 2001
+From 6e0ae25024ea3e186640f499bb8ffb2371f0646b 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
@@ -13,7 +13,7 @@ custom renderers are in use, defaulting to the much simpler Vanilla system.
 Additionally, numerous issues to player position tracking on maps has been fixed.
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 467c5bf1a..0f1d99636 100644
+index 467c5bf1..0f1d9963 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -548,6 +548,12 @@ public abstract class EntityHuman extends EntityLiving {
@@ -30,7 +30,7 @@ index 467c5bf1a..0f1d99636 100644
              ItemStack itemstack1 = this.a(entityitem);
  
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index 4c6eb6ed1..759dacba7 100644
+index 4c6eb6ed..759dacba 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -90,11 +90,11 @@ public class EntityTrackerEntry {
@@ -48,7 +48,7 @@ index 4c6eb6ed1..759dacba7 100644
                  Iterator iterator = this.trackedPlayers.iterator(); // CraftBukkit
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 2b2105e4e..565b1d7e5 100644
+index aae2d578..bce3fca8 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1223,6 +1223,7 @@ public abstract class World implements IBlockAccess {
@@ -60,7 +60,7 @@ index 2b2105e4e..565b1d7e5 100644
                          }
                      }
 diff --git a/src/main/java/net/minecraft/server/WorldMap.java b/src/main/java/net/minecraft/server/WorldMap.java
-index 1096b5c1f..59173605e 100644
+index 1096b5c1..59173605 100644
 --- a/src/main/java/net/minecraft/server/WorldMap.java
 +++ b/src/main/java/net/minecraft/server/WorldMap.java
 @@ -28,6 +28,7 @@ public class WorldMap extends PersistentBase {
@@ -132,7 +132,7 @@ index 1096b5c1f..59173605e 100644
              for ( org.bukkit.map.MapCursor cursor : render.cursors) {
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/map/RenderData.java b/src/main/java/org/bukkit/craftbukkit/map/RenderData.java
-index 256a13178..5768cd512 100644
+index 256a1317..5768cd51 100644
 --- a/src/main/java/org/bukkit/craftbukkit/map/RenderData.java
 +++ b/src/main/java/org/bukkit/craftbukkit/map/RenderData.java
 @@ -5,7 +5,7 @@ import org.bukkit.map.MapCursor;
@@ -145,5 +145,5 @@ index 256a13178..5768cd512 100644
  
      public RenderData() {
 -- 
-2.15.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0125-LootTable-API-Replenishable-Lootables-Feature.patch b/Spigot-Server-Patches/0124-LootTable-API-Replenishable-Lootables-Feature.patch
similarity index 98%
rename from Spigot-Server-Patches/0125-LootTable-API-Replenishable-Lootables-Feature.patch
rename to Spigot-Server-Patches/0124-LootTable-API-Replenishable-Lootables-Feature.patch
index 73257e6563..efa7972473 100644
--- a/Spigot-Server-Patches/0125-LootTable-API-Replenishable-Lootables-Feature.patch
+++ b/Spigot-Server-Patches/0124-LootTable-API-Replenishable-Lootables-Feature.patch
@@ -1,4 +1,4 @@
-From 21e11d3533310ed87cce7b06c7cfa73e8dbedd78 Mon Sep 17 00:00:00 2001
+From 91ffc1cc7f5b705776f785367c2f2e9db8e7742b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 1 May 2016 21:19:14 -0400
 Subject: [PATCH] LootTable API & Replenishable Lootables Feature
@@ -11,10 +11,10 @@ This feature is good for long term worlds so that newer players
 do not suffer with "Every chest has been looted"
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 5cc55b794..fbe769eb3 100644
+index 609a068c..7ee8d4e7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -305,4 +305,26 @@ public class PaperWorldConfig {
+@@ -297,4 +297,26 @@ public class PaperWorldConfig {
          this.frostedIceDelayMax = this.getInt("frosted-ice.delay.max", this.frostedIceDelayMax);
          log("Frosted Ice: " + (this.frostedIceEnabled ? "enabled" : "disabled") + " / delay: min=" + this.frostedIceDelayMin + ", max=" + this.frostedIceDelayMax);
      }
@@ -43,7 +43,7 @@ index 5cc55b794..fbe769eb3 100644
  }
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/CraftLootable.java b/src/main/java/com/destroystokyo/paper/loottable/CraftLootable.java
 new file mode 100644
-index 000000000..36c36d158
+index 00000000..36c36d15
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/CraftLootable.java
 @@ -0,0 +1,12 @@
@@ -61,7 +61,7 @@ index 000000000..36c36d158
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/CraftLootableBlockInventory.java b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableBlockInventory.java
 new file mode 100644
-index 000000000..20d236c45
+index 00000000..20d236c4
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableBlockInventory.java
 @@ -0,0 +1,33 @@
@@ -100,7 +100,7 @@ index 000000000..20d236c45
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/CraftLootableEntityInventory.java b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableEntityInventory.java
 new file mode 100644
-index 000000000..1150dee01
+index 00000000..1150dee0
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableEntityInventory.java
 @@ -0,0 +1,31 @@
@@ -137,7 +137,7 @@ index 000000000..1150dee01
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/CraftLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableInventory.java
 new file mode 100644
-index 000000000..668097620
+index 00000000..66809762
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableInventory.java
 @@ -0,0 +1,88 @@
@@ -231,7 +231,7 @@ index 000000000..668097620
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/CraftLootableInventoryData.java b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableInventoryData.java
 new file mode 100644
-index 000000000..01c2713d3
+index 00000000..01c2713d
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableInventoryData.java
 @@ -0,0 +1,182 @@
@@ -418,7 +418,7 @@ index 000000000..01c2713d3
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/EntityMinecartContainer.java b/src/main/java/net/minecraft/server/EntityMinecartContainer.java
-index ce5010989..1a2de4b77 100644
+index d6afa4aa..50d7d34b 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartContainer.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartContainer.java
 @@ -6,17 +6,21 @@ import javax.annotation.Nullable;
@@ -541,7 +541,7 @@ index ce5010989..1a2de4b77 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/TileEntityLootable.java b/src/main/java/net/minecraft/server/TileEntityLootable.java
-index a97ad2037..618521304 100644
+index a97ad203..61852130 100644
 --- a/src/main/java/net/minecraft/server/TileEntityLootable.java
 +++ b/src/main/java/net/minecraft/server/TileEntityLootable.java
 @@ -1,44 +1,50 @@
@@ -658,7 +658,7 @@ index a97ad2037..618521304 100644
 +
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
-index cf94c0626..52c982893 100644
+index 8328ed00..266f87d7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 @@ -60,7 +60,7 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
@@ -671,7 +671,7 @@ index cf94c0626..52c982893 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
-index 85f3bb272..733c04ef7 100644
+index 85f3bb27..733c04ef 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
 @@ -1,5 +1,6 @@
@@ -691,7 +691,7 @@ index 85f3bb272..733c04ef7 100644
      public CraftChest(final Block block) {
          super(block, TileEntityChest.class);
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java b/src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java
-index 1dc8bfecd..bfcf9b6c4 100644
+index 1dc8bfec..bfcf9b6c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java
 @@ -1,5 +1,6 @@
@@ -711,7 +711,7 @@ index 1dc8bfecd..bfcf9b6c4 100644
      public CraftDispenser(final Block block) {
          super(block, TileEntityDispenser.class);
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java b/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java
-index 6566554ab..df156d0d9 100644
+index 6566554a..df156d0d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java
 @@ -1,5 +1,6 @@
@@ -731,7 +731,7 @@ index 6566554ab..df156d0d9 100644
      public CraftHopper(final Block block) {
          super(block, TileEntityHopper.class);
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java b/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java
-index c029a1244..c26f0b5af 100644
+index c029a124..c26f0b5a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java
 @@ -1,5 +1,6 @@
@@ -751,7 +751,7 @@ index c029a1244..c26f0b5af 100644
      public CraftShulkerBox(final Block block) {
          super(block, TileEntityShulkerBox.class);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java
-index 69435c457..4291edf25 100644
+index 69435c45..4291edf2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java
 @@ -1,5 +1,6 @@
@@ -771,7 +771,7 @@ index 69435c457..4291edf25 100644
  
      public CraftMinecartChest(CraftServer server, EntityMinecartChest entity) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java
-index e9963e21c..acb4dee04 100644
+index e9963e21..acb4dee0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java
 @@ -1,5 +1,6 @@
@@ -791,5 +791,5 @@ index e9963e21c..acb4dee04 100644
  
      CraftMinecartHopper(CraftServer server, EntityMinecartHopper entity) {
 -- 
-2.13.4
+2.14.3
 
diff --git a/Spigot-Server-Patches/0126-Do-not-load-chunks-for-pathfinding.patch b/Spigot-Server-Patches/0125-Do-not-load-chunks-for-pathfinding.patch
similarity index 90%
rename from Spigot-Server-Patches/0126-Do-not-load-chunks-for-pathfinding.patch
rename to Spigot-Server-Patches/0125-Do-not-load-chunks-for-pathfinding.patch
index 541f9ca3eb..c35fbb5408 100644
--- a/Spigot-Server-Patches/0126-Do-not-load-chunks-for-pathfinding.patch
+++ b/Spigot-Server-Patches/0125-Do-not-load-chunks-for-pathfinding.patch
@@ -1,4 +1,4 @@
-From 23033ac2cbb0e46cc926b9a0c8ebd63034b98af3 Mon Sep 17 00:00:00 2001
+From 1ff76b3906c4b5289dce01052f2d14aa766328bf 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 08b986fd..786d1dd2 100644
          }
  
 -- 
-2.13.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0127-Entity-Tracking-Improvements.patch b/Spigot-Server-Patches/0126-Entity-Tracking-Improvements.patch
similarity index 97%
rename from Spigot-Server-Patches/0127-Entity-Tracking-Improvements.patch
rename to Spigot-Server-Patches/0126-Entity-Tracking-Improvements.patch
index 9eea18300b..408896a548 100644
--- a/Spigot-Server-Patches/0127-Entity-Tracking-Improvements.patch
+++ b/Spigot-Server-Patches/0126-Entity-Tracking-Improvements.patch
@@ -1,4 +1,4 @@
-From 8d4e95d1cc023bd93936fbb7c63f4692528e8e95 Mon Sep 17 00:00:00 2001
+From 91fac793cbda420b078bd9c54874cca33086c3fb 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 b10f670a..7fb23be6 100644
+index 06857c48..ef096ef6 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -53,6 +53,7 @@ public abstract class Entity implements ICommandListener {
@@ -99,5 +99,5 @@ index 759dacba..efc4c79a 100644
  
      }
 -- 
-2.13.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0128-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/Spigot-Server-Patches/0127-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
similarity index 95%
rename from Spigot-Server-Patches/0128-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
rename to Spigot-Server-Patches/0127-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
index a3cc80a38d..ad87bfaf65 100644
--- a/Spigot-Server-Patches/0128-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
+++ b/Spigot-Server-Patches/0127-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
@@ -1,4 +1,4 @@
-From 6ef4eca7291384f8ea1a0f41e308b1a0e5e94054 Mon Sep 17 00:00:00 2001
+From f4915e4676b3b5cfba3b91c26d9d484f293b1fe5 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
@@ -31,5 +31,5 @@ index c9c01fad..89c8d045 100644
  
              nbttagcompound.setString("Name", scoreboardteam.getName());
 -- 
-2.13.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0129-Do-not-mark-chunks-as-active-for-neighbor-updates.patch b/Spigot-Server-Patches/0128-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
similarity index 97%
rename from Spigot-Server-Patches/0129-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
rename to Spigot-Server-Patches/0128-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
index 2a5d87eacb..072023fc21 100644
--- a/Spigot-Server-Patches/0129-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
+++ b/Spigot-Server-Patches/0128-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
@@ -1,4 +1,4 @@
-From 73859b56033285cbe25838550eea43ef5b6112ea Mon Sep 17 00:00:00 2001
+From 0cf99c270c5b53a3d3a31efaab59b4aa6dbd42b8 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 ecc76a88..f1bcdef5 100644
              if (chunk4 != null) {
                  chunk4.a(chunkgenerator);
 -- 
-2.15.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0130-Fix-Chunk-Unload-Queue-Issues.patch b/Spigot-Server-Patches/0129-Fix-Chunk-Unload-Queue-Issues.patch
similarity index 92%
rename from Spigot-Server-Patches/0130-Fix-Chunk-Unload-Queue-Issues.patch
rename to Spigot-Server-Patches/0129-Fix-Chunk-Unload-Queue-Issues.patch
index 1c2e40557c..9e80cc2bb6 100644
--- a/Spigot-Server-Patches/0130-Fix-Chunk-Unload-Queue-Issues.patch
+++ b/Spigot-Server-Patches/0129-Fix-Chunk-Unload-Queue-Issues.patch
@@ -1,4 +1,4 @@
-From aa51466f2b3c2193b3965f62eadafb4e9a1a504b Mon Sep 17 00:00:00 2001
+From 15a4ee90217c0cb16b07296f8facbe028cb2c415 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 d662a5a2..0845d1ff 100644
+index f1bcdef5..a847aa07 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 {
@@ -22,7 +22,7 @@ index d662a5a2..0845d1ff 100644
  
      // Paper start
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 4d0cb971..a512a411 100644
+index 15814f66..c7af8da6 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -299,6 +299,7 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -34,5 +34,5 @@ index 4d0cb971..a512a411 100644
                              continue;
                          }
 -- 
-2.13.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0131-System-property-for-disabling-watchdoge.patch b/Spigot-Server-Patches/0130-System-property-for-disabling-watchdoge.patch
similarity index 92%
rename from Spigot-Server-Patches/0131-System-property-for-disabling-watchdoge.patch
rename to Spigot-Server-Patches/0130-System-property-for-disabling-watchdoge.patch
index 2149ce3d46..3e23013e3a 100644
--- a/Spigot-Server-Patches/0131-System-property-for-disabling-watchdoge.patch
+++ b/Spigot-Server-Patches/0130-System-property-for-disabling-watchdoge.patch
@@ -1,4 +1,4 @@
-From a99fafc083b11398452959f1f93471ad1cb329b3 Mon Sep 17 00:00:00 2001
+From 36276f65b32064cd04b801f0f4a51ae1946b3db0 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 6384d50e..cb1fcf0f 100644
                  Logger log = Bukkit.getServer().getLogger();
                  log.log( Level.SEVERE, "The server has stopped responding!" );
 -- 
-2.13.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0132-Optimize-EAR.patch b/Spigot-Server-Patches/0131-Optimize-EAR.patch
similarity index 96%
rename from Spigot-Server-Patches/0132-Optimize-EAR.patch
rename to Spigot-Server-Patches/0131-Optimize-EAR.patch
index fc7d174cbd..7bbc79b9c4 100644
--- a/Spigot-Server-Patches/0132-Optimize-EAR.patch
+++ b/Spigot-Server-Patches/0131-Optimize-EAR.patch
@@ -1,4 +1,4 @@
-From 8771771022c2627d2756b4bd571a88f1b3d2781d Mon Sep 17 00:00:00 2001
+From e24bed49fcd2628e2ed3ab1598aadc34f876b7a0 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 3265a6c2..47865c02 100644
                  }
              }
 -- 
-2.13.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0133-Optimize-UserCache-Thread-Safe.patch b/Spigot-Server-Patches/0132-Optimize-UserCache-Thread-Safe.patch
similarity index 96%
rename from Spigot-Server-Patches/0133-Optimize-UserCache-Thread-Safe.patch
rename to Spigot-Server-Patches/0132-Optimize-UserCache-Thread-Safe.patch
index e13f75c9cc..1d8f55158c 100644
--- a/Spigot-Server-Patches/0133-Optimize-UserCache-Thread-Safe.patch
+++ b/Spigot-Server-Patches/0132-Optimize-UserCache-Thread-Safe.patch
@@ -1,4 +1,4 @@
-From 6c71a3974c2ab7d7adbbd06a63923019bdd64254 Mon Sep 17 00:00:00 2001
+From b2d6f011c1e3f4c42b42a9fe36258ce99d534da6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 16 May 2016 20:47:41 -0400
 Subject: [PATCH] Optimize UserCache / Thread Safe
@@ -10,7 +10,7 @@ Additionally, move Saving of the User cache to be done async, incase
 the user never changed the default setting for Spigot's save on stop only.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 948a04491..9e43646eb 100644
+index 45d3dbde..ab793307 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -528,7 +528,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -23,7 +23,7 @@ index 948a04491..9e43646eb 100644
          // Spigot end
      }
 diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java
-index 487fc11f1..924dc63a4 100644
+index 487fc11f..924dc63a 100644
 --- a/src/main/java/net/minecraft/server/UserCache.java
 +++ b/src/main/java/net/minecraft/server/UserCache.java
 @@ -109,7 +109,7 @@ public class UserCache {
@@ -96,5 +96,5 @@ index 487fc11f1..924dc63a4 100644
      }
  
 -- 
-2.13.3.windows.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0134-Avoid-blocking-on-Network-Manager-creation.patch b/Spigot-Server-Patches/0133-Avoid-blocking-on-Network-Manager-creation.patch
similarity index 96%
rename from Spigot-Server-Patches/0134-Avoid-blocking-on-Network-Manager-creation.patch
rename to Spigot-Server-Patches/0133-Avoid-blocking-on-Network-Manager-creation.patch
index 6f63bb6813..589af10d26 100644
--- a/Spigot-Server-Patches/0134-Avoid-blocking-on-Network-Manager-creation.patch
+++ b/Spigot-Server-Patches/0133-Avoid-blocking-on-Network-Manager-creation.patch
@@ -1,4 +1,4 @@
-From f01c96105b693ab0badfd8a57529919bfb0ed6f0 Mon Sep 17 00:00:00 2001
+From adcbfe820185e2f44f33c9f4054c34b82841a23d 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Avoid blocking on Network Manager creation
 Per Paper issue 294
 
 diff --git a/src/main/java/net/minecraft/server/ServerConnection.java b/src/main/java/net/minecraft/server/ServerConnection.java
-index 567edb300..4a629aaa1 100644
+index 567edb30..4a629aaa 100644
 --- a/src/main/java/net/minecraft/server/ServerConnection.java
 +++ b/src/main/java/net/minecraft/server/ServerConnection.java
 @@ -60,6 +60,15 @@ public class ServerConnection {
@@ -43,5 +43,5 @@ index 567edb300..4a629aaa1 100644
              if ( org.spigotmc.SpigotConfig.playerShuffle > 0 && MinecraftServer.currentTick % org.spigotmc.SpigotConfig.playerShuffle == 0 )
              {
 -- 
-2.14.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0135-Optional-TNT-doesn-t-move-in-water.patch b/Spigot-Server-Patches/0134-Optional-TNT-doesn-t-move-in-water.patch
similarity index 95%
rename from Spigot-Server-Patches/0135-Optional-TNT-doesn-t-move-in-water.patch
rename to Spigot-Server-Patches/0134-Optional-TNT-doesn-t-move-in-water.patch
index 7330858a94..d3274f3927 100644
--- a/Spigot-Server-Patches/0135-Optional-TNT-doesn-t-move-in-water.patch
+++ b/Spigot-Server-Patches/0134-Optional-TNT-doesn-t-move-in-water.patch
@@ -1,11 +1,11 @@
-From c2625c5993c914f71a2ca5b58e02a0185d493b41 Mon Sep 17 00:00:00 2001
+From 8ac9f4faafc625ac84d32b2e2b097fbdc524b9bf Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 22 May 2016 20:20:55 -0500
 Subject: [PATCH] Optional TNT doesn't move in water
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index fbe769eb3..d2a542354 100644
+index 7ee8d4e7..c42fa157 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -2,7 +2,6 @@ package com.destroystokyo.paper;
@@ -16,7 +16,7 @@ index fbe769eb3..d2a542354 100644
  import org.bukkit.configuration.file.YamlConfiguration;
  import org.spigotmc.SpigotWorldConfig;
  
-@@ -327,4 +326,14 @@ public class PaperWorldConfig {
+@@ -319,4 +318,14 @@ public class PaperWorldConfig {
              );
          }
      }
@@ -32,7 +32,7 @@ index fbe769eb3..d2a542354 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index ef096ef65..d46fb1d76 100644
+index ef096ef6..d46fb1d7 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1114,6 +1114,11 @@ public abstract class Entity implements ICommandListener {
@@ -60,7 +60,7 @@ index ef096ef65..d46fb1d76 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
-index bb0904f86..50811852a 100644
+index bb0904f8..50811852 100644
 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 @@ -147,4 +147,49 @@ public class EntityTNTPrimed extends Entity {
diff --git a/Spigot-Server-Patches/0136-Faster-redstone-torch-rapid-clock-removal.patch b/Spigot-Server-Patches/0135-Faster-redstone-torch-rapid-clock-removal.patch
similarity index 95%
rename from Spigot-Server-Patches/0136-Faster-redstone-torch-rapid-clock-removal.patch
rename to Spigot-Server-Patches/0135-Faster-redstone-torch-rapid-clock-removal.patch
index 0dd74f14a0..cb84829637 100644
--- a/Spigot-Server-Patches/0136-Faster-redstone-torch-rapid-clock-removal.patch
+++ b/Spigot-Server-Patches/0135-Faster-redstone-torch-rapid-clock-removal.patch
@@ -1,4 +1,4 @@
-From 3fff1239f8954425956686806b66ab1a516c151f Mon Sep 17 00:00:00 2001
+From 3d6cb4ebf342f11117a6c6952be569b6f6a610d5 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 5b0028a7..429f26ed 100644
          public RedstoneUpdateInfo(BlockPosition blockposition, long i) {
              this.a = blockposition;
 -- 
-2.13.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0137-Ensure-Chunks-never-ever-load-async.patch b/Spigot-Server-Patches/0136-Ensure-Chunks-never-ever-load-async.patch
similarity index 95%
rename from Spigot-Server-Patches/0137-Ensure-Chunks-never-ever-load-async.patch
rename to Spigot-Server-Patches/0136-Ensure-Chunks-never-ever-load-async.patch
index eeb8c170bf..dd9da19c82 100644
--- a/Spigot-Server-Patches/0137-Ensure-Chunks-never-ever-load-async.patch
+++ b/Spigot-Server-Patches/0136-Ensure-Chunks-never-ever-load-async.patch
@@ -1,4 +1,4 @@
-From 9730d2878ba52d008ec23a7a90d9f29d7e5c3c58 Mon Sep 17 00:00:00 2001
+From 84a754633b0040c0d9b09a895bb3c38232097025 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Ensure Chunks never ever load async
 Safely pushes the operation to main thread, then back to the posting thread
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
-index 7b7a3d01b..9aaca21a7 100644
+index 7b7a3d01..9aaca21a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
 @@ -4,6 +4,7 @@ import com.destroystokyo.paper.PaperConfig;
@@ -27,7 +27,7 @@ index 7b7a3d01b..9aaca21a7 100644
  
      public static void queueChunkLoad(World world, ChunkRegionLoader loader, ChunkProviderServer provider, int x, int z, Runnable runnable) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
-index b5efb9c3f..ef9529add 100644
+index b5efb9c3..ef9529ad 100644
 --- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
 +++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
 @@ -35,8 +35,8 @@ class ChunkIOProvider implements AsynchronousExecutor.CallBackProvider<QueuedChu
@@ -42,5 +42,5 @@ index b5efb9c3f..ef9529add 100644
              return;
          }
 -- 
-2.13.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0138-Add-server-name-parameter.patch b/Spigot-Server-Patches/0137-Add-server-name-parameter.patch
similarity index 88%
rename from Spigot-Server-Patches/0138-Add-server-name-parameter.patch
rename to Spigot-Server-Patches/0137-Add-server-name-parameter.patch
index a5abcd2b09..a882c36106 100644
--- a/Spigot-Server-Patches/0138-Add-server-name-parameter.patch
+++ b/Spigot-Server-Patches/0137-Add-server-name-parameter.patch
@@ -1,11 +1,11 @@
-From cbe1668e2f6d06c0428bc08525ce396440c143c6 Mon Sep 17 00:00:00 2001
+From 14d6c91a4b0dcb2106e3d71bdd28bbe90edb7827 Mon Sep 17 00:00:00 2001
 From: Martin Panzer <postremus1996@googlemail.com>
 Date: Sat, 28 May 2016 16:54:03 +0200
 Subject: [PATCH] Add server-name parameter
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 35123d58..634cde14 100644
+index e3667e55..ec9508e9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -134,6 +134,14 @@ public class Main {
@@ -24,5 +24,5 @@ index 35123d58..634cde14 100644
          };
  
 -- 
-2.13.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0139-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch b/Spigot-Server-Patches/0138-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
similarity index 97%
rename from Spigot-Server-Patches/0139-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
rename to Spigot-Server-Patches/0138-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
index 537f9a6a82..8535db6002 100644
--- a/Spigot-Server-Patches/0139-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
+++ b/Spigot-Server-Patches/0138-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
@@ -1,4 +1,4 @@
-From ed6f009ff0326d223d19dc9f12714cad352ba17b Mon Sep 17 00:00:00 2001
+From 7dfd7e6301c85ac9f0ee88d4796f7e00fb60f34b 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 97cf75b9..96785260 100644
                      double deltaZ = this.locZ - player.locZ;
                      double distanceSquared = deltaX * deltaX + deltaZ * deltaZ;
 -- 
-2.13.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0140-Fix-FallingBlocks-being-stuck-on-fences.patch b/Spigot-Server-Patches/0139-Fix-FallingBlocks-being-stuck-on-fences.patch
similarity index 95%
rename from Spigot-Server-Patches/0140-Fix-FallingBlocks-being-stuck-on-fences.patch
rename to Spigot-Server-Patches/0139-Fix-FallingBlocks-being-stuck-on-fences.patch
index 31c6a6f805..f40ed58acc 100644
--- a/Spigot-Server-Patches/0140-Fix-FallingBlocks-being-stuck-on-fences.patch
+++ b/Spigot-Server-Patches/0139-Fix-FallingBlocks-being-stuck-on-fences.patch
@@ -1,4 +1,4 @@
-From 1938ff2b5f43d68ca8fe67b1f69bb0ed77776b3b Mon Sep 17 00:00:00 2001
+From 3ffe2b85f7cd6afd294437f630ab816db04eacde 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
@@ -11,10 +11,10 @@ We now first check, if if we are already on the ground.
 if not, we check if the falling block is inside of the hitbox of the block at y - 1.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index d2a54235..c74071eb 100644
+index c42fa157..670d3d9a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -336,4 +336,9 @@ public class PaperWorldConfig {
+@@ -328,4 +328,9 @@ public class PaperWorldConfig {
          preventTntFromMovingInWater = getBoolean("prevent-tnt-from-moving-in-water", false);
          log("Prevent TNT from moving in water: " + preventTntFromMovingInWater);
      }
@@ -42,7 +42,7 @@ index 67439575..1086e311 100644
  
      public void a_(World world, BlockPosition blockposition) {}
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index f4bb2e65..328ee251 100644
+index abdc2dea..59acc908 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
 @@ -3,6 +3,7 @@ package net.minecraft.server;
@@ -101,5 +101,5 @@ index f4bb2e65..328ee251 100644
          Block block = this.block.getBlock();
  
 -- 
-2.13.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0141-Make-entities-look-for-hoppers.patch b/Spigot-Server-Patches/0140-Make-entities-look-for-hoppers.patch
similarity index 97%
rename from Spigot-Server-Patches/0141-Make-entities-look-for-hoppers.patch
rename to Spigot-Server-Patches/0140-Make-entities-look-for-hoppers.patch
index 674bd3777b..1f3bdf68d2 100644
--- a/Spigot-Server-Patches/0141-Make-entities-look-for-hoppers.patch
+++ b/Spigot-Server-Patches/0140-Make-entities-look-for-hoppers.patch
@@ -1,4 +1,4 @@
-From 3d2fbd9d26c5403f5749630576610bd23219168b Mon Sep 17 00:00:00 2001
+From 35c62e6a07254ca062b54d3b76bbb0aa24093c09 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
@@ -14,7 +14,7 @@ This patch may causes a decrease in the performance of dropped items, which is w
 
 diff --git a/src/main/java/com/destroystokyo/paper/HopperPusher.java b/src/main/java/com/destroystokyo/paper/HopperPusher.java
 new file mode 100644
-index 000000000..aef7c2be9
+index 00000000..aef7c2be
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/HopperPusher.java
 @@ -0,0 +1,59 @@
@@ -78,10 +78,10 @@ index 000000000..aef7c2be9
 +    double getZ();
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index c74071eb1..d5d6e7fcd 100644
+index 670d3d9a..71cdb811 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -341,4 +341,9 @@ public class PaperWorldConfig {
+@@ -333,4 +333,9 @@ public class PaperWorldConfig {
      private void altFallingBlockOnGround() {
          altFallingBlockOnGround = getBoolean("use-alternate-fallingblock-onGround-detection", false);
      }
@@ -92,7 +92,7 @@ index c74071eb1..d5d6e7fcd 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java
-index 1eb9c2da8..c88b76a79 100644
+index 1eb9c2da..c88b76a7 100644
 --- a/src/main/java/net/minecraft/server/AxisAlignedBB.java
 +++ b/src/main/java/net/minecraft/server/AxisAlignedBB.java
 @@ -235,6 +235,7 @@ public class AxisAlignedBB {
@@ -104,7 +104,7 @@ index 1eb9c2da8..c88b76a79 100644
          return this.a(axisalignedbb.a, axisalignedbb.b, axisalignedbb.c, axisalignedbb.d, axisalignedbb.e, axisalignedbb.f);
      }
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 008ed206d..b3c1f550c 100644
+index 008ed206..b3c1f550 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -250,6 +250,7 @@ public class BlockPosition extends BaseBlockPosition {
@@ -132,7 +132,7 @@ index 008ed206d..b3c1f550c 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 73507cda8..a55bc1610 100644
+index d46fb1d7..9ab89287 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -80,6 +80,19 @@ public abstract class Entity implements ICommandListener {
@@ -156,7 +156,7 @@ index 73507cda8..a55bc1610 100644
      public double motY;
      public double motZ;
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index 4d3aef96b..6593fc633 100644
+index 4d3aef96..6593fc63 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -8,8 +8,15 @@ import org.apache.logging.log4j.Logger;
@@ -193,7 +193,7 @@ index 4d3aef96b..6593fc633 100644
          int elapsedTicks = MinecraftServer.currentTick - this.lastTick;
          if (this.pickupDelay != 32767) this.pickupDelay -= elapsedTicks;
 diff --git a/src/main/java/net/minecraft/server/EntityMinecartContainer.java b/src/main/java/net/minecraft/server/EntityMinecartContainer.java
-index 1a2de4b77..41863b08d 100644
+index 50d7d34b..15f392d2 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartContainer.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartContainer.java
 @@ -7,6 +7,7 @@ import javax.annotation.Nullable;
@@ -232,7 +232,7 @@ index 1a2de4b77..41863b08d 100644
      private NonNullList<ItemStack> items;
      private boolean b;
 diff --git a/src/main/java/net/minecraft/server/IHopper.java b/src/main/java/net/minecraft/server/IHopper.java
-index 804215a1c..e830d8390 100644
+index 804215a1..e830d839 100644
 --- a/src/main/java/net/minecraft/server/IHopper.java
 +++ b/src/main/java/net/minecraft/server/IHopper.java
 @@ -4,9 +4,9 @@ public interface IHopper extends IInventory {
@@ -249,7 +249,7 @@ index 804215a1c..e830d8390 100644
 +    double G(); default double getZ() { return G(); } // Paper - OBFHELPER
  }
 diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
-index f99812989..d22261646 100644
+index 53584b25..8ad08131 100644
 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java
 +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
 @@ -126,6 +126,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
@@ -378,5 +378,5 @@ index f99812989..d22261646 100644
  
              if (!list.isEmpty()) {
 -- 
-2.13.3
+2.14.3
 
diff --git a/Spigot-Server-Patches/0142-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/0141-Delay-Chunk-Unloads-based-on-Player-Movement.patch
similarity index 94%
rename from Spigot-Server-Patches/0142-Delay-Chunk-Unloads-based-on-Player-Movement.patch
rename to Spigot-Server-Patches/0141-Delay-Chunk-Unloads-based-on-Player-Movement.patch
index 21017de0b8..a2d4776d13 100644
--- a/Spigot-Server-Patches/0142-Delay-Chunk-Unloads-based-on-Player-Movement.patch
+++ b/Spigot-Server-Patches/0141-Delay-Chunk-Unloads-based-on-Player-Movement.patch
@@ -1,4 +1,4 @@
-From 4fb7473b93210a52d08f546a4fcfcc3d819f7c6b Mon Sep 17 00:00:00 2001
+From 9c680ac16d5b69f0b627984e5d65cf39effea1d3 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
@@ -17,10 +17,10 @@ This allows servers with smaller worlds who do less long distance exploring to s
 wasting cpu cycles on saving/unloading/reloading chunks repeatedly.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index d5d6e7fcd..ef60c15bd 100644
+index 71cdb811..70642451 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -346,4 +346,13 @@ public class PaperWorldConfig {
+@@ -338,4 +338,13 @@ public class PaperWorldConfig {
      private void isHopperPushBased() {
          isHopperPushBased = getBoolean("hopper.push-based", false);
      }
@@ -35,7 +35,7 @@ index d5d6e7fcd..ef60c15bd 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 2ef70d324..44f54cbd1 100644
+index a847aa07..8ec26b97 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -30,6 +30,7 @@ public class Chunk {
@@ -47,7 +47,7 @@ index 2ef70d324..44f54cbd1 100644
      public final int locZ;
      private boolean m;
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index c7af8da61..0adfcaa8b 100644
+index c7af8da6..0adfcaa8 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -315,6 +315,19 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -71,7 +71,7 @@ index c7af8da61..0adfcaa8b 100644
              this.chunkLoader.b();
          }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index 3d30e1831..48a008e0a 100644
+index 3d30e183..48a008e0 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -32,8 +32,16 @@ public class PlayerChunk {
@@ -108,7 +108,7 @@ index 3d30e1831..48a008e0a 100644
              // CraftBukkit end
  
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 0a0b5261b..14ea89c91 100644
+index ad1d90b5..0b10f168 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -487,7 +487,13 @@ public class PlayerChunkMap {
@@ -127,7 +127,7 @@ index 0a0b5261b..14ea89c91 100644
  
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 69dc11e2b..284dc6391 100644
+index 69dc11e2..284dc639 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1576,7 +1576,7 @@ public class CraftWorld implements World {
@@ -140,5 +140,5 @@ index 69dc11e2b..284dc6391 100644
              }
  
 -- 
-2.15.0
+2.14.3
 
diff --git a/Spigot-Server-Patches/0143-Toggleable-Elytra-Wall-Damage.patch b/Spigot-Server-Patches/0142-Toggleable-Elytra-Wall-Damage.patch
similarity index 90%
rename from Spigot-Server-Patches/0143-Toggleable-Elytra-Wall-Damage.patch
rename to Spigot-Server-Patches/0142-Toggleable-Elytra-Wall-Damage.patch
index 903d391da1..ccda7b1469 100644
--- a/Spigot-Server-Patches/0143-Toggleable-Elytra-Wall-Damage.patch
+++ b/Spigot-Server-Patches/0142-Toggleable-Elytra-Wall-Damage.patch
@@ -1,4 +1,4 @@
-From 3ffa66e7e06aefe0e78de8e9016c593a69a99e40 Mon Sep 17 00:00:00 2001
+From a527a33b86db5515a407228bf1424a81547dfd35 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
@@ -7,10 +7,10 @@ Instead of calculating the damage taken from hitting a wall, you can
 disable it in the config.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index ef60c15bd..cec9ea74c 100644
+index 70642451..64e31dd2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -355,4 +355,9 @@ public class PaperWorldConfig {
+@@ -347,4 +347,9 @@ public class PaperWorldConfig {
              delayChunkUnloadsBy *= 1000;
          }
      }
@@ -21,7 +21,7 @@ index ef60c15bd..cec9ea74c 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index a09d8964f..20aac1f38 100644
+index a09d8964..20aac1f3 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1737,6 +1737,7 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0144-Fix-Double-World-Add-issues.patch b/Spigot-Server-Patches/0143-Fix-Double-World-Add-issues.patch
similarity index 92%
rename from Spigot-Server-Patches/0144-Fix-Double-World-Add-issues.patch
rename to Spigot-Server-Patches/0143-Fix-Double-World-Add-issues.patch
index 7f1ca9898b..8fa23a7755 100644
--- a/Spigot-Server-Patches/0144-Fix-Double-World-Add-issues.patch
+++ b/Spigot-Server-Patches/0143-Fix-Double-World-Add-issues.patch
@@ -1,4 +1,4 @@
-From 3c13e279f2a7d98057c446d5ae6bc08968e786d9 Mon Sep 17 00:00:00 2001
+From 74ed2a678f478fc695ac8e94f4c474c355eaaa6b 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
@@ -8,7 +8,7 @@ Vanilla will double add Spider Jockeys to the world, so ignore already added.
 Also add debug if something else tries to, and abort before world gets bad state
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 12bd558a7..8747d9a45 100644
+index 12bd558a..8747d9a4 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -546,7 +546,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -21,7 +21,7 @@ index 12bd558a7..8747d9a45 100644
              Iterator iterator = entity.bF().iterator();
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 565b1d7e5..3cacf2c6d 100644
+index bce3fca8..bafa37f6 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1103,6 +1103,7 @@ public abstract class World implements IBlockAccess {
@@ -33,5 +33,5 @@ index 565b1d7e5..3cacf2c6d 100644
          org.bukkit.event.Cancellable event = null;
          if (entity instanceof EntityLiving && !(entity instanceof EntityPlayer)) {
 -- 
-2.15.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0145-Fix-Old-Sign-Conversion.patch b/Spigot-Server-Patches/0144-Fix-Old-Sign-Conversion.patch
similarity index 95%
rename from Spigot-Server-Patches/0145-Fix-Old-Sign-Conversion.patch
rename to Spigot-Server-Patches/0144-Fix-Old-Sign-Conversion.patch
index e3abed8407..4bda335d8f 100644
--- a/Spigot-Server-Patches/0145-Fix-Old-Sign-Conversion.patch
+++ b/Spigot-Server-Patches/0144-Fix-Old-Sign-Conversion.patch
@@ -1,4 +1,4 @@
-From 6b7828f88b881660faf3dcf8ddadf580af5ceb1f Mon Sep 17 00:00:00 2001
+From 35d6721b68c1c5c2dafcfb575dc1cd4d4045764b 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
@@ -9,7 +9,7 @@ Subject: [PATCH] Fix Old Sign Conversion
    This causes Igloos and such to render broken signs. We fix this by ignoring sign conversion for Defined Structures
 
 diff --git a/src/main/java/net/minecraft/server/DefinedStructure.java b/src/main/java/net/minecraft/server/DefinedStructure.java
-index cd6588de4..182936f2b 100644
+index 9f314204..23da9467 100644
 --- a/src/main/java/net/minecraft/server/DefinedStructure.java
 +++ b/src/main/java/net/minecraft/server/DefinedStructure.java
 @@ -203,9 +203,11 @@ public class DefinedStructure {
@@ -34,7 +34,7 @@ index cd6588de4..182936f2b 100644
  
          public Iterator<IBlockData> iterator() {
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 393c9089d..237f7e6fe 100644
+index 393c9089..237f7e6f 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -11,6 +11,7 @@ import org.bukkit.inventory.InventoryHolder; // CraftBukkit
@@ -46,7 +46,7 @@ index 393c9089d..237f7e6fe 100644
      private static final RegistryMaterials<MinecraftKey, Class<? extends TileEntity>> f = new RegistryMaterials();
      protected World world;
 diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
-index 77a7b4458..54b719d91 100644
+index 77a7b445..54b719d9 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySign.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySign.java
 @@ -77,13 +77,14 @@ public class TileEntitySign extends TileEntity {
@@ -67,5 +67,5 @@ index 77a7b4458..54b719d91 100644
                  try {
                      this.lines[i] = ChatComponentUtils.filterForDisplay(icommandlistener, ichatbasecomponent, (Entity) null);
 -- 
-2.13.3.windows.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0146-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/Spigot-Server-Patches/0145-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
similarity index 92%
rename from Spigot-Server-Patches/0146-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
rename to Spigot-Server-Patches/0145-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
index 1b6e26f525..d4cede7ff7 100644
--- a/Spigot-Server-Patches/0146-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
+++ b/Spigot-Server-Patches/0145-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
@@ -1,4 +1,4 @@
-From 40ce440f25b5c8908af901dbeb3215c0a2695e80 Mon Sep 17 00:00:00 2001
+From f1c9af7136e370f3adaa51bdce24eff92da4f049 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 924dc63a..07d39d46 100644
              GameProfile gameprofile = new GameProfile(uuid, s);
  
 -- 
-2.13.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0147-More-informative-vehicle-moved-wrongly-message.patch b/Spigot-Server-Patches/0146-More-informative-vehicle-moved-wrongly-message.patch
similarity index 90%
rename from Spigot-Server-Patches/0147-More-informative-vehicle-moved-wrongly-message.patch
rename to Spigot-Server-Patches/0146-More-informative-vehicle-moved-wrongly-message.patch
index c729d0cd6f..055e6f4c6d 100644
--- a/Spigot-Server-Patches/0147-More-informative-vehicle-moved-wrongly-message.patch
+++ b/Spigot-Server-Patches/0146-More-informative-vehicle-moved-wrongly-message.patch
@@ -1,11 +1,11 @@
-From 6be1bbe127eda2d0bb7510d1e3d36aa55f9b50ac Mon Sep 17 00:00:00 2001
+From d5289fd7076ab2d8a87722594dde384751f5fe2a 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 506eab20d..d6c9bfc5d 100644
+index 187e59a0..98cb8440 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -357,7 +357,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -18,5 +18,5 @@ index 506eab20d..d6c9bfc5d 100644
  
                  entity.setLocation(d3, d4, d5, f, f1);
 -- 
-2.14.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0148-Re-track-players-that-dismount-from-other-players.patch b/Spigot-Server-Patches/0147-Re-track-players-that-dismount-from-other-players.patch
similarity index 90%
rename from Spigot-Server-Patches/0148-Re-track-players-that-dismount-from-other-players.patch
rename to Spigot-Server-Patches/0147-Re-track-players-that-dismount-from-other-players.patch
index 31b7286100..25ba3371b5 100644
--- a/Spigot-Server-Patches/0148-Re-track-players-that-dismount-from-other-players.patch
+++ b/Spigot-Server-Patches/0147-Re-track-players-that-dismount-from-other-players.patch
@@ -1,11 +1,11 @@
-From d6880664519de0333d1d1147343c0c795b642b89 Mon Sep 17 00:00:00 2001
+From 56c9efa484e336792fdb17028e088ea99acfa54f Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 31 Jul 2016 16:33:03 -0500
 Subject: [PATCH] Re-track players that dismount from other players
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 1bc2ed0e..8fe324cf 100644
+index 24d3b29a..b937b6d0 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -715,6 +715,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -23,5 +23,5 @@ index 1bc2ed0e..8fe324cf 100644
      }
  
 -- 
-2.13.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0149-Add-setting-for-proxy-online-mode-status.patch b/Spigot-Server-Patches/0148-Add-setting-for-proxy-online-mode-status.patch
similarity index 95%
rename from Spigot-Server-Patches/0149-Add-setting-for-proxy-online-mode-status.patch
rename to Spigot-Server-Patches/0148-Add-setting-for-proxy-online-mode-status.patch
index d042de3cb4..8846621251 100644
--- a/Spigot-Server-Patches/0149-Add-setting-for-proxy-online-mode-status.patch
+++ b/Spigot-Server-Patches/0148-Add-setting-for-proxy-online-mode-status.patch
@@ -1,4 +1,4 @@
-From 7ca6855113de395c6e609d690ea6a4d57ce7a74d Mon Sep 17 00:00:00 2001
+From be25757edf3268e570523a3fcc59626ffbd31553 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
@@ -33,7 +33,7 @@ index b943a9b2..8f3b93dc 100644
          } else {
              String[] astring1 = astring;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c1588879..54f0a1d6 100644
+index bc048f29..c8cb4f22 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1335,7 +1335,8 @@ public final class CraftServer implements Server {
@@ -47,5 +47,5 @@ index c1588879..54f0a1d6 100644
                  profile = console.getUserCache().getProfile( name );
              }
 -- 
-2.15.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0150-Optimise-BlockStateEnum-hashCode-and-equals.patch b/Spigot-Server-Patches/0149-Optimise-BlockStateEnum-hashCode-and-equals.patch
similarity index 75%
rename from Spigot-Server-Patches/0150-Optimise-BlockStateEnum-hashCode-and-equals.patch
rename to Spigot-Server-Patches/0149-Optimise-BlockStateEnum-hashCode-and-equals.patch
index 223ac0a297..e336442de4 100644
--- a/Spigot-Server-Patches/0150-Optimise-BlockStateEnum-hashCode-and-equals.patch
+++ b/Spigot-Server-Patches/0149-Optimise-BlockStateEnum-hashCode-and-equals.patch
@@ -1,11 +1,11 @@
-From 32ea6795e3fb76b3f806010ef01b593c210392a5 Mon Sep 17 00:00:00 2001
+From dbb88dfd57e4f65f1a4948a41858dcbbf4a79e67 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
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockStateEnum.java b/src/main/java/net/minecraft/server/BlockStateEnum.java
-index 288c52c55..66c459d83 100644
+index 21ac1e06..a241d7d8 100644
 --- a/src/main/java/net/minecraft/server/BlockStateEnum.java
 +++ b/src/main/java/net/minecraft/server/BlockStateEnum.java
 @@ -16,6 +16,11 @@ public class BlockStateEnum<T extends Enum<T> & INamable> extends BlockState<T>
@@ -28,7 +28,7 @@ index 288c52c55..66c459d83 100644
      }
  
      public Collection<T> c() {
-@@ -46,24 +52,14 @@ public class BlockStateEnum<T extends Enum<T> & INamable> extends BlockState<T>
+@@ -46,32 +52,15 @@ public class BlockStateEnum<T extends Enum<T> & INamable> extends BlockState<T>
          return ((INamable) t0).getName();
      }
  
@@ -46,17 +46,25 @@ index 288c52c55..66c459d83 100644
 +       return this == object;
      }
  
-+    @Override // Paper - override hashCode as BlockStateEnum is a singleton
+-    // Spigot start
+-    private int hashCode;
++    @Override // Paper - override equals as BlockStateEnum is a singleton
      public int hashCode() {
--        int i = super.hashCode();
+-        int hash = hashCode;
+-        if (hash == 0) {
+-            int i = super.hashCode();
 -
--        i = 31 * i + this.a.hashCode();
--        i = 31 * i + this.b.hashCode();
--        return i;
+-            i = 31 * i + this.a.hashCode();
+-            i = 31 * i + this.b.hashCode();
+-            hashCode = hash = i;
+-        }
+-        return hash;
 +        return hashCode;
      }
+-    // Spigot end
  
      public static <T extends Enum<T> & INamable> BlockStateEnum<T> of(String s, Class<T> oclass) {
+         return a(s, oclass, Predicates.alwaysTrue());
 -- 
-2.14.1.windows.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0151-Disable-ticking-of-snow-blocks.patch b/Spigot-Server-Patches/0150-Disable-ticking-of-snow-blocks.patch
similarity index 93%
rename from Spigot-Server-Patches/0151-Disable-ticking-of-snow-blocks.patch
rename to Spigot-Server-Patches/0150-Disable-ticking-of-snow-blocks.patch
index 5cac630ec7..1800e3728c 100644
--- a/Spigot-Server-Patches/0151-Disable-ticking-of-snow-blocks.patch
+++ b/Spigot-Server-Patches/0150-Disable-ticking-of-snow-blocks.patch
@@ -1,4 +1,4 @@
-From c81ebe9bcf5a825cf06cda258bd88d1200f3cf6a Mon Sep 17 00:00:00 2001
+From adb19085efa7237cde7e6f5ddf7baee09eada051 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 8123d729..b6765e5b 100644
 +    //Paper end
  }
 -- 
-2.13.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0152-Fix-AIOOBE-in-inventory-handling.patch b/Spigot-Server-Patches/0151-Fix-AIOOBE-in-inventory-handling.patch
similarity index 91%
rename from Spigot-Server-Patches/0152-Fix-AIOOBE-in-inventory-handling.patch
rename to Spigot-Server-Patches/0151-Fix-AIOOBE-in-inventory-handling.patch
index 743ce33ebd..fcec0b487a 100644
--- a/Spigot-Server-Patches/0152-Fix-AIOOBE-in-inventory-handling.patch
+++ b/Spigot-Server-Patches/0151-Fix-AIOOBE-in-inventory-handling.patch
@@ -1,11 +1,11 @@
-From 95af615122ca9c50035f194d03a16fe5b6626026 Mon Sep 17 00:00:00 2001
+From 19cf5ca05896d79209fcbfbf4209e217f9b0e487 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 98cb84409..5e0e5a3c1 100644
+index 98cb8440..5e0e5a3c 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1849,7 +1849,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
diff --git a/Spigot-Server-Patches/0153-Configurable-packet-in-spam-threshold.patch b/Spigot-Server-Patches/0152-Configurable-packet-in-spam-threshold.patch
similarity index 94%
rename from Spigot-Server-Patches/0153-Configurable-packet-in-spam-threshold.patch
rename to Spigot-Server-Patches/0152-Configurable-packet-in-spam-threshold.patch
index efc5be576a..8526ded021 100644
--- a/Spigot-Server-Patches/0153-Configurable-packet-in-spam-threshold.patch
+++ b/Spigot-Server-Patches/0152-Configurable-packet-in-spam-threshold.patch
@@ -1,11 +1,11 @@
-From 6b1ddcf495ce0b8306cad6961f61af5ceb29dc16 Mon Sep 17 00:00:00 2001
+From 4118bdbaaeb341e74ebe8c972f6d0d3bb783c745 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 11 Sep 2016 14:30:57 -0500
 Subject: [PATCH] Configurable packet in spam threshold
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index cf06f8ac3..2001175bf 100644
+index cf06f8ac..2001175b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -235,4 +235,13 @@ public class PaperConfig {
@@ -23,7 +23,7 @@ index cf06f8ac3..2001175bf 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index b8601ae87..6edbe5cde 100644
+index 5e0e5a3c..1cdb5bb9 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -909,13 +909,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -44,5 +44,5 @@ index b8601ae87..6edbe5cde 100644
              limitedPackets = 0;
              return true;
 -- 
-2.14.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0154-Configurable-flying-kick-messages.patch b/Spigot-Server-Patches/0153-Configurable-flying-kick-messages.patch
similarity index 94%
rename from Spigot-Server-Patches/0154-Configurable-flying-kick-messages.patch
rename to Spigot-Server-Patches/0153-Configurable-flying-kick-messages.patch
index b44602d139..408a0baaf9 100644
--- a/Spigot-Server-Patches/0154-Configurable-flying-kick-messages.patch
+++ b/Spigot-Server-Patches/0153-Configurable-flying-kick-messages.patch
@@ -1,11 +1,11 @@
-From 64a235f2f37f896fa9ef46af0791fc7bac72f131 Mon Sep 17 00:00:00 2001
+From 2f6341c6ad8ff12ea10fd82203cc4b390887fd24 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Tue, 20 Sep 2016 00:58:01 +0000
 Subject: [PATCH] Configurable flying kick messages
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 2001175bf..621c585e7 100644
+index 2001175b..621c585e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -244,4 +244,11 @@ public class PaperConfig {
@@ -21,7 +21,7 @@ index 2001175bf..621c585e7 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 076f1e608..5855d2961 100644
+index 1cdb5bb9..0191a9af 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -144,7 +144,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -43,5 +43,5 @@ index 076f1e608..5855d2961 100644
                  }
              } else {
 -- 
-2.13.3.windows.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0155-Auto-Save-Improvements.patch b/Spigot-Server-Patches/0154-Auto-Save-Improvements.patch
similarity index 97%
rename from Spigot-Server-Patches/0155-Auto-Save-Improvements.patch
rename to Spigot-Server-Patches/0154-Auto-Save-Improvements.patch
index 3d827e615d..3323a8b342 100644
--- a/Spigot-Server-Patches/0155-Auto-Save-Improvements.patch
+++ b/Spigot-Server-Patches/0154-Auto-Save-Improvements.patch
@@ -1,4 +1,4 @@
-From e4a5cc333ba15d9aecec76562062dfa20617fa61 Mon Sep 17 00:00:00 2001
+From 76ed4797cf898e49367bdfa5a9f9e92218b569f7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 19 Sep 2016 23:16:39 -0400
 Subject: [PATCH] Auto Save Improvements
@@ -26,7 +26,7 @@ index 621c585e..da0984a3 100644
 +    }
  }
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index cec9ea74..39f8a0a2 100644
+index 64e31dd2..a5986593 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -2,6 +2,7 @@ package com.destroystokyo.paper;
@@ -37,7 +37,7 @@ index cec9ea74..39f8a0a2 100644
  import org.bukkit.configuration.file.YamlConfiguration;
  import org.spigotmc.SpigotWorldConfig;
  
-@@ -360,4 +361,19 @@ public class PaperWorldConfig {
+@@ -352,4 +353,19 @@ public class PaperWorldConfig {
      private void elytraHitWallDamage() {
          elytraHitWallDamage = getBoolean("elytra-hit-wall-damage", true);
      }
@@ -155,7 +155,7 @@ index ab793307..5c09c6ff 100644
          this.methodProfiler.a("tallying");
          // Spigot start
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 30ca137e..953e5f90 100644
+index f38e8197..7a9b7912 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -343,6 +343,7 @@ public abstract class PlayerList {
@@ -166,7 +166,7 @@ index 30ca137e..953e5f90 100644
          this.playerFileData.save(entityplayer);
          ServerStatisticManager serverstatisticmanager = (ServerStatisticManager) entityplayer.getStatisticManager(); // CraftBukkit
  
-@@ -1236,13 +1237,23 @@ public abstract class PlayerList {
+@@ -1238,13 +1239,23 @@ public abstract class PlayerList {
  
      }
  
@@ -215,5 +215,5 @@ index f2ddc22d..8493dcce 100644
              timings.worldSaveChunks.startTiming(); // Paper
              chunkproviderserver.a(flag);
 -- 
-2.15.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0156-Chunk-registration-fixes.patch b/Spigot-Server-Patches/0155-Chunk-registration-fixes.patch
similarity index 89%
rename from Spigot-Server-Patches/0156-Chunk-registration-fixes.patch
rename to Spigot-Server-Patches/0155-Chunk-registration-fixes.patch
index 4bf1824828..819a430bb0 100644
--- a/Spigot-Server-Patches/0156-Chunk-registration-fixes.patch
+++ b/Spigot-Server-Patches/0155-Chunk-registration-fixes.patch
@@ -1,4 +1,4 @@
-From 2588f86cae4141fca5ac102cf7f220694b6db36b Mon Sep 17 00:00:00 2001
+From 8d70244eeb9149f698589ba03f8e0054bad5177f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Sep 2016 22:54:28 -0400
 Subject: [PATCH] Chunk registration fixes
@@ -8,7 +8,7 @@ World checks and the Chunk Add logic are inconsistent on how Y > 256, < 0, is tr
 Keep them consistent
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 3cacf2c6d..1117a0835 100644
+index bafa37f6..d5e338eb 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1764,7 +1764,7 @@ public abstract class World implements IBlockAccess {
@@ -21,5 +21,5 @@ index 3cacf2c6d..1117a0835 100644
  
          if (!entity.aa || entity.ab != i || entity.ac != j || entity.ad != k) {
 -- 
-2.15.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0157-Remove-FishingHook-reference-on-Craft-Entity-removal.patch b/Spigot-Server-Patches/0156-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
similarity index 88%
rename from Spigot-Server-Patches/0157-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
rename to Spigot-Server-Patches/0156-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
index a2ba9317a7..20ec6a8cc3 100644
--- a/Spigot-Server-Patches/0157-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
+++ b/Spigot-Server-Patches/0156-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
@@ -1,11 +1,11 @@
-From f73aa9ef72915f3d3da7ce8f83e1ca498c1942c7 Mon Sep 17 00:00:00 2001
+From c473ab9ce441e759aeb2f0a3ff51471b397b800a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 16 Jun 2016 00:17:23 -0400
 Subject: [PATCH] Remove FishingHook reference on Craft Entity removal
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java
-index d555597dc..f5419dea4 100644
+index d555597d..f5419dea 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java
 @@ -62,4 +62,14 @@ public class CraftFish extends AbstractProjectile implements Fish {
@@ -24,5 +24,5 @@ index d555597dc..f5419dea4 100644
 +    // Paper end
  }
 -- 
-2.15.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0158-Auto-fix-bad-Y-levels-on-player-login.patch b/Spigot-Server-Patches/0157-Auto-fix-bad-Y-levels-on-player-login.patch
similarity index 89%
rename from Spigot-Server-Patches/0158-Auto-fix-bad-Y-levels-on-player-login.patch
rename to Spigot-Server-Patches/0157-Auto-fix-bad-Y-levels-on-player-login.patch
index c94be5cc44..4981ceb787 100644
--- a/Spigot-Server-Patches/0158-Auto-fix-bad-Y-levels-on-player-login.patch
+++ b/Spigot-Server-Patches/0157-Auto-fix-bad-Y-levels-on-player-login.patch
@@ -1,4 +1,4 @@
-From def76da12cea24195155abec42a043d58e996df6 Mon Sep 17 00:00:00 2001
+From 66b8a2dadd2f607d504a81db0487888174f25344 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Sep 2016 23:48:39 -0400
 Subject: [PATCH] Auto fix bad Y levels on player login
@@ -6,7 +6,7 @@ Subject: [PATCH] Auto fix bad Y levels on player login
 Bring down to a saner Y level if super high, as this can cause the server to crash
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 4cfd8961..8fb569be 100644
+index ef081a57..45618017 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -131,6 +131,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -18,5 +18,5 @@ index 4cfd8961..8fb569be 100644
              if (this.C_().getForceGamemode()) {
                  this.playerInteractManager.setGameMode(this.C_().getGamemode());
 -- 
-2.13.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0159-Raise-string-limit-for-packet-serialization.patch b/Spigot-Server-Patches/0158-Raise-string-limit-for-packet-serialization.patch
similarity index 93%
rename from Spigot-Server-Patches/0159-Raise-string-limit-for-packet-serialization.patch
rename to Spigot-Server-Patches/0158-Raise-string-limit-for-packet-serialization.patch
index 91510b4807..51c9f6c10f 100644
--- a/Spigot-Server-Patches/0159-Raise-string-limit-for-packet-serialization.patch
+++ b/Spigot-Server-Patches/0158-Raise-string-limit-for-packet-serialization.patch
@@ -1,4 +1,4 @@
-From 547a778aa20c6ec538350891551b174ff6c88973 Mon Sep 17 00:00:00 2001
+From 643e02228eb710e215fb00406b8bda665520218b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Sep 2016 23:54:20 -0400
 Subject: [PATCH] Raise string limit for packet serialization
@@ -23,5 +23,5 @@ index a8fc7e43..c1273e98 100644
              this.d(abyte.length);
              this.writeBytes(abyte);
 -- 
-2.13.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0160-Disable-Vanilla-Chunk-GC.patch b/Spigot-Server-Patches/0159-Disable-Vanilla-Chunk-GC.patch
similarity index 91%
rename from Spigot-Server-Patches/0160-Disable-Vanilla-Chunk-GC.patch
rename to Spigot-Server-Patches/0159-Disable-Vanilla-Chunk-GC.patch
index e63d309079..e10fc19f45 100644
--- a/Spigot-Server-Patches/0160-Disable-Vanilla-Chunk-GC.patch
+++ b/Spigot-Server-Patches/0159-Disable-Vanilla-Chunk-GC.patch
@@ -1,4 +1,4 @@
-From 78a415270295a2936f3e8bce626fed2e286fa8ab Mon Sep 17 00:00:00 2001
+From f2bc8ba70b4286933f8f56ebda7ae46fa4ce88ac Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 26 Sep 2016 01:51:30 -0400
 Subject: [PATCH] Disable Vanilla Chunk GC
@@ -6,7 +6,7 @@ Subject: [PATCH] Disable Vanilla Chunk GC
 Bukkit has its own system for this.
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 87a95857..bde48b69 100644
+index 8493dcce..2ac5caaa 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1067,7 +1067,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -29,5 +29,5 @@ index 87a95857..bde48b69 100644
          }
      }
 -- 
-2.13.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0161-Option-to-remove-corrupt-tile-entities.patch b/Spigot-Server-Patches/0160-Option-to-remove-corrupt-tile-entities.patch
similarity index 91%
rename from Spigot-Server-Patches/0161-Option-to-remove-corrupt-tile-entities.patch
rename to Spigot-Server-Patches/0160-Option-to-remove-corrupt-tile-entities.patch
index 857294de4b..d0873018f4 100644
--- a/Spigot-Server-Patches/0161-Option-to-remove-corrupt-tile-entities.patch
+++ b/Spigot-Server-Patches/0160-Option-to-remove-corrupt-tile-entities.patch
@@ -1,14 +1,14 @@
-From 0935daa9352d7d6e412b3033ad61566161dae70d Mon Sep 17 00:00:00 2001
+From e4b2b476129fc1d759efd425fe31524e9a95a9a7 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 5 Oct 2016 16:27:36 -0500
 Subject: [PATCH] Option to remove corrupt tile entities
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 39f8a0a2..efae01b1 100644
+index a5986593..0ac2ad70 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -376,4 +376,9 @@ public class PaperWorldConfig {
+@@ -368,4 +368,9 @@ public class PaperWorldConfig {
      private void maxAutoSaveChunksPerTick() {
          maxAutoSaveChunksPerTick = getInt("max-auto-save-chunks-per-tick", 24);
      }
@@ -41,5 +41,5 @@ index 87730aec..1d056031 100644
          if (this.j) {
              TileEntity tileentity = (TileEntity) this.tileEntities.remove(blockposition);
 -- 
-2.15.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0162-Add-EntityZapEvent.patch b/Spigot-Server-Patches/0161-Add-EntityZapEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0162-Add-EntityZapEvent.patch
rename to Spigot-Server-Patches/0161-Add-EntityZapEvent.patch
index 08551926db..bc581eb262 100644
--- a/Spigot-Server-Patches/0162-Add-EntityZapEvent.patch
+++ b/Spigot-Server-Patches/0161-Add-EntityZapEvent.patch
@@ -1,11 +1,11 @@
-From da1a1de8534fd41d16d2d51c03249b6c306f3ca4 Mon Sep 17 00:00:00 2001
+From 1cd159c4fdf6a238af6c9f14cfe07b68df2f9a37 Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Sun, 16 Oct 2016 23:19:30 -0700
 Subject: [PATCH] Add EntityZapEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java
-index 94d011721..fcf99e668 100644
+index 94d01172..fcf99e66 100644
 --- a/src/main/java/net/minecraft/server/EntityPig.java
 +++ b/src/main/java/net/minecraft/server/EntityPig.java
 @@ -158,6 +158,12 @@ public class EntityPig extends EntityAnimal {
@@ -22,7 +22,7 @@ index 94d011721..fcf99e668 100644
              if (CraftEventFactory.callPigZapEvent(this, entitylightning, entitypigzombie).isCancelled()) {
                  return;
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 70b12c5cd..ae68f07ab 100644
+index fe137ed0..09b466fc 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -622,6 +622,12 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
@@ -48,7 +48,7 @@ index 70b12c5cd..ae68f07ab 100644
          }
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index bc84dd30f..ba7e5d181 100644
+index bc84dd30..ba7e5d18 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -684,6 +684,14 @@ public class CraftEventFactory {
@@ -67,5 +67,5 @@ index bc84dd30f..ba7e5d181 100644
          HorseJumpEvent event = new HorseJumpEvent((AbstractHorse) horse.getBukkitEntity(), power);
          horse.getBukkitEntity().getServer().getPluginManager().callEvent(event);
 -- 
-2.15.0
+2.14.3
 
diff --git a/Spigot-Server-Patches/0163-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/Spigot-Server-Patches/0162-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
similarity index 94%
rename from Spigot-Server-Patches/0163-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
rename to Spigot-Server-Patches/0162-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
index d350afe3f3..c8765710c4 100644
--- a/Spigot-Server-Patches/0163-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
+++ b/Spigot-Server-Patches/0162-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
@@ -1,4 +1,4 @@
-From d0208ddeb0656fc10f3a833b77b3d2b495d304b7 Mon Sep 17 00:00:00 2001
+From acf2e4ec489ec38f2542c71cbe2d404a8ca35013 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Nov 2016 20:28:12 -0400
 Subject: [PATCH] Don't load Chunks from Hoppers and other things
@@ -13,7 +13,7 @@ This of course is undesirable, so just return the loaded side as "primary"
 and treat it as a single chest if the other sides are unloaded
 
 diff --git a/src/main/java/net/minecraft/server/BlockChest.java b/src/main/java/net/minecraft/server/BlockChest.java
-index bc398ec52..90267a1fb 100644
+index bc398ec5..90267a1f 100644
 --- a/src/main/java/net/minecraft/server/BlockChest.java
 +++ b/src/main/java/net/minecraft/server/BlockChest.java
 @@ -339,7 +339,13 @@ public class BlockChest extends BlockTileEntity {
@@ -32,5 +32,5 @@ index bc398ec52..90267a1fb 100644
                      if (block == this) {
                          if (this.e(world, blockposition1)) {
 -- 
-2.13.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0164-Prevent-Auto-Save-if-Save-Queue-is-full.patch b/Spigot-Server-Patches/0163-Prevent-Auto-Save-if-Save-Queue-is-full.patch
similarity index 93%
rename from Spigot-Server-Patches/0164-Prevent-Auto-Save-if-Save-Queue-is-full.patch
rename to Spigot-Server-Patches/0163-Prevent-Auto-Save-if-Save-Queue-is-full.patch
index 7082403da5..430f99e759 100644
--- a/Spigot-Server-Patches/0164-Prevent-Auto-Save-if-Save-Queue-is-full.patch
+++ b/Spigot-Server-Patches/0163-Prevent-Auto-Save-if-Save-Queue-is-full.patch
@@ -1,4 +1,4 @@
-From 6b0389b527082a300a774c980ad6c19cb1a4d86a Mon Sep 17 00:00:00 2001
+From 89fa5284102d862b2f1a2a7310883f7ac2a6510f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Nov 2016 21:52:22 -0400
 Subject: [PATCH] Prevent Auto Save if Save Queue is full
@@ -7,10 +7,10 @@ If the save queue already has 50 (configurable) of chunks pending,
 then avoid processing auto save (which would add more)
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index efae01b1d..70b498c7b 100644
+index 0ac2ad70..e87c9863 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -377,6 +377,11 @@ public class PaperWorldConfig {
+@@ -369,6 +369,11 @@ public class PaperWorldConfig {
          maxAutoSaveChunksPerTick = getInt("max-auto-save-chunks-per-tick", 24);
      }
  
@@ -23,7 +23,7 @@ index efae01b1d..70b498c7b 100644
      private void removeCorruptTEs() {
          removeCorruptTEs = getBoolean("remove-corrupt-tile-entities", false);
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 08bc8c928..25f1d40db 100644
+index 9e8f67ff..2b87329f 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -254,6 +254,14 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -51,7 +51,7 @@ index 08bc8c928..25f1d40db 100644
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index f5366ebf0..023dddcb8 100644
+index 8747d9a4..77943821 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -39,6 +39,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -64,5 +64,5 @@ index f5366ebf0..023dddcb8 100644
      @Nullable
      public Chunk a(World world, int i, int j) throws IOException {
 -- 
-2.13.4
+2.14.3
 
diff --git a/Spigot-Server-Patches/0165-Chunk-Save-Stats-Debug-Option.patch b/Spigot-Server-Patches/0164-Chunk-Save-Stats-Debug-Option.patch
similarity index 96%
rename from Spigot-Server-Patches/0165-Chunk-Save-Stats-Debug-Option.patch
rename to Spigot-Server-Patches/0164-Chunk-Save-Stats-Debug-Option.patch
index 6d4ae273d0..69f8359512 100644
--- a/Spigot-Server-Patches/0165-Chunk-Save-Stats-Debug-Option.patch
+++ b/Spigot-Server-Patches/0164-Chunk-Save-Stats-Debug-Option.patch
@@ -1,4 +1,4 @@
-From 76f07679ab0bcdc7d4801978a2e8e82ed4d7a3eb Mon Sep 17 00:00:00 2001
+From 6b99030922c71c02dfb42ab65b1084131ff36811 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 4 Nov 2016 02:12:10 -0400
 Subject: [PATCH] Chunk Save Stats Debug Option
@@ -8,7 +8,7 @@ Adds a command line flag to enable stats on how chunk saves are processing.
 Stats on current queue, how many was processed and how many were queued.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 25f1d40db..09c0c3719 100644
+index 2b87329f..73554a51 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -28,6 +28,11 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -55,7 +55,7 @@ index 25f1d40db..09c0c3719 100644
              return false;
          }
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 023dddcb8..aaf1a2095 100644
+index 77943821..14f88e91 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -39,7 +39,13 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -90,5 +90,5 @@ index 023dddcb8..aaf1a2095 100644
              boolean flag;
  
 -- 
-2.13.4
+2.14.3
 
diff --git a/Spigot-Server-Patches/0166-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch b/Spigot-Server-Patches/0165-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
similarity index 93%
rename from Spigot-Server-Patches/0166-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
rename to Spigot-Server-Patches/0165-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
index 5999a1e5b5..004ed39387 100644
--- a/Spigot-Server-Patches/0166-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
+++ b/Spigot-Server-Patches/0165-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
@@ -1,11 +1,11 @@
-From ffaa3a076e512e3337083f21a68de448e3241d49 Mon Sep 17 00:00:00 2001
+From 947bb9a35b9d0c4a1c117f41e87ce85d2079f42c Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 12 Nov 2016 23:25:22 -0600
 Subject: [PATCH] Filter bad data from ArmorStand and SpawnEgg items
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 70b498c7..a80d8b2a 100644
+index e87c9863..ed7ddbb2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -3,6 +3,7 @@ package com.destroystokyo.paper;
@@ -16,7 +16,7 @@ index 70b498c7..a80d8b2a 100644
  import org.bukkit.configuration.file.YamlConfiguration;
  import org.spigotmc.SpigotWorldConfig;
  
-@@ -386,4 +387,12 @@ public class PaperWorldConfig {
+@@ -378,4 +379,12 @@ public class PaperWorldConfig {
      private void removeCorruptTEs() {
          removeCorruptTEs = getBoolean("remove-corrupt-tile-entities", false);
      }
@@ -30,7 +30,7 @@ index 70b498c7..a80d8b2a 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index 328ee251..c8a692aa 100644
+index 59acc908..d0b67d8f 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
 @@ -271,6 +271,14 @@ public class EntityFallingBlock extends Entity {
@@ -49,7 +49,7 @@ index 328ee251..c8a692aa 100644
          Block block = this.block.getBlock();
  
 diff --git a/src/main/java/net/minecraft/server/ItemMonsterEgg.java b/src/main/java/net/minecraft/server/ItemMonsterEgg.java
-index 20070ec9..643bc41c 100644
+index b24f7d8b..5a08f6b4 100644
 --- a/src/main/java/net/minecraft/server/ItemMonsterEgg.java
 +++ b/src/main/java/net/minecraft/server/ItemMonsterEgg.java
 @@ -102,7 +102,14 @@ public class ItemMonsterEgg extends Item {
@@ -69,5 +69,5 @@ index 20070ec9..643bc41c 100644
                  entity.f(nbttagcompound1);
              }
 -- 
-2.13.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0167-Cache-user-authenticator-threads.patch b/Spigot-Server-Patches/0166-Cache-user-authenticator-threads.patch
similarity index 97%
rename from Spigot-Server-Patches/0167-Cache-user-authenticator-threads.patch
rename to Spigot-Server-Patches/0166-Cache-user-authenticator-threads.patch
index e023d9ee3b..762f1ab835 100644
--- a/Spigot-Server-Patches/0167-Cache-user-authenticator-threads.patch
+++ b/Spigot-Server-Patches/0166-Cache-user-authenticator-threads.patch
@@ -1,4 +1,4 @@
-From 377782f93665fbd92b356483583f20a3c95d5ebb Mon Sep 17 00:00:00 2001
+From 63e0e40aaa8d0f6e8dcb38c59f0f131e6fce000f Mon Sep 17 00:00:00 2001
 From: vemacs <d@nkmem.es>
 Date: Wed, 23 Nov 2016 08:31:45 -0500
 Subject: [PATCH] Cache user authenticator threads
@@ -63,5 +63,5 @@ index 57f72856..2158fcd3 100644
      }
  
 -- 
-2.13.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0168-Optimize-Network-Queue.patch b/Spigot-Server-Patches/0167-Optimize-Network-Queue.patch
similarity index 89%
rename from Spigot-Server-Patches/0168-Optimize-Network-Queue.patch
rename to Spigot-Server-Patches/0167-Optimize-Network-Queue.patch
index 07a7a3bb81..c31c5de09c 100644
--- a/Spigot-Server-Patches/0168-Optimize-Network-Queue.patch
+++ b/Spigot-Server-Patches/0167-Optimize-Network-Queue.patch
@@ -1,11 +1,11 @@
-From fce3d36c12fc004e027c4eee7d5de6e034bb9032 Mon Sep 17 00:00:00 2001
+From e8f3da1c987c8422e3d63a617c3a40f6c2e64cc7 Mon Sep 17 00:00:00 2001
 From: vemacs <d@nkmem.es>
 Date: Wed, 23 Nov 2016 12:54:56 -0500
 Subject: [PATCH] Optimize Network Queue
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 86eac80a1..005e3449f 100644
+index 5c09c6ff..13c6b5cc 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -104,7 +104,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -18,5 +18,5 @@ index 86eac80a1..005e3449f 100644
      private long ab = aw();
  
 -- 
-2.13.3.windows.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0169-Optimise-removeQueue.patch b/Spigot-Server-Patches/0168-Optimise-removeQueue.patch
similarity index 96%
rename from Spigot-Server-Patches/0169-Optimise-removeQueue.patch
rename to Spigot-Server-Patches/0168-Optimise-removeQueue.patch
index a6b40d27c6..c6c961bcc0 100644
--- a/Spigot-Server-Patches/0169-Optimise-removeQueue.patch
+++ b/Spigot-Server-Patches/0168-Optimise-removeQueue.patch
@@ -1,11 +1,11 @@
-From 7afee50d20f36a17db863aef658144e885105110 Mon Sep 17 00:00:00 2001
+From 80c96b91db8d9cc576f313b08dadb9286f8d6210 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Fri, 25 Nov 2016 13:22:40 +0000
 Subject: [PATCH] Optimise removeQueue
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index e8b78b51a..53147c6e2 100644
+index 45618017..87967b68 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -3,8 +3,10 @@ package net.minecraft.server;
@@ -61,5 +61,5 @@ index e8b78b51a..53147c6e2 100644
          this.cv = entityplayer.cv;
          this.setShoulderEntityLeft(entityplayer.getShoulderEntityLeft());
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0170-Allow-Reloading-of-Command-Aliases.patch b/Spigot-Server-Patches/0169-Allow-Reloading-of-Command-Aliases.patch
similarity index 92%
rename from Spigot-Server-Patches/0170-Allow-Reloading-of-Command-Aliases.patch
rename to Spigot-Server-Patches/0169-Allow-Reloading-of-Command-Aliases.patch
index f7121aa4aa..53be9c0cf8 100644
--- a/Spigot-Server-Patches/0170-Allow-Reloading-of-Command-Aliases.patch
+++ b/Spigot-Server-Patches/0169-Allow-Reloading-of-Command-Aliases.patch
@@ -1,4 +1,4 @@
-From 776269eb4581d0b6632f73ab19a32cb5e826f59d Mon Sep 17 00:00:00 2001
+From 0a192c02fbda74327438f6eeb90a8fd75a7768a1 Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Mon, 28 Nov 2016 10:21:52 -0500
 Subject: [PATCH] Allow Reloading of Command Aliases
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Command Aliases
 Reload the aliases stored in commands.yml
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 54f0a1d6..f4eef421 100644
+index c8cb4f22..701c9067 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1889,5 +1889,24 @@ public final class CraftServer implements Server {
@@ -35,5 +35,5 @@ index 54f0a1d6..f4eef421 100644
      // Paper end
  }
 -- 
-2.15.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0171-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-Server-Patches/0170-Add-source-to-PlayerExpChangeEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0171-Add-source-to-PlayerExpChangeEvent.patch
rename to Spigot-Server-Patches/0170-Add-source-to-PlayerExpChangeEvent.patch
index 76b4162c7a..e0f9fd6960 100644
--- a/Spigot-Server-Patches/0171-Add-source-to-PlayerExpChangeEvent.patch
+++ b/Spigot-Server-Patches/0170-Add-source-to-PlayerExpChangeEvent.patch
@@ -1,11 +1,11 @@
-From 1a2f8fc03d482c57b6a4d9ca1c83de647a15d472 Mon Sep 17 00:00:00 2001
+From d98b0708ee4ce659c39c41e8280b1afe41be7a05 Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Thu, 8 Sep 2016 08:48:33 -0700
 Subject: [PATCH] Add source to PlayerExpChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index eae706368..bf5f1f0e8 100644
+index eae70636..bf5f1f0e 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -178,7 +178,7 @@ public class EntityExperienceOrb extends Entity {
@@ -18,7 +18,7 @@ index eae706368..bf5f1f0e8 100644
  
                  this.die();
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index ba7e5d181..87b4e9189 100644
+index ba7e5d18..87b4e918 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -46,6 +46,7 @@ import org.bukkit.entity.Player;
@@ -48,5 +48,5 @@ index ba7e5d181..87b4e9189 100644
          Block block = world.getWorld().getBlockAt(x, y, z);
          CraftBlockState state = (CraftBlockState) block.getState();
 -- 
-2.15.0
+2.14.3
 
diff --git a/Spigot-Server-Patches/0172-Optimize-World.isLoaded-BlockPosition-Z.patch b/Spigot-Server-Patches/0171-Optimize-World.isLoaded-BlockPosition-Z.patch
similarity index 88%
rename from Spigot-Server-Patches/0172-Optimize-World.isLoaded-BlockPosition-Z.patch
rename to Spigot-Server-Patches/0171-Optimize-World.isLoaded-BlockPosition-Z.patch
index 7ec6a43ef5..e625ee2dbd 100644
--- a/Spigot-Server-Patches/0172-Optimize-World.isLoaded-BlockPosition-Z.patch
+++ b/Spigot-Server-Patches/0171-Optimize-World.isLoaded-BlockPosition-Z.patch
@@ -1,4 +1,4 @@
-From 828a1726d978ac9d0588a4228e4b9de9c2c15dca Mon Sep 17 00:00:00 2001
+From fe57ba535053dc75510c673d9c9f4f92a28ac242 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 2 Dec 2016 00:11:43 -0500
 Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z
 Reduce method invocations for World.isLoaded(BlockPosition)Z
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index a2b5926a1..445936c7b 100644
+index d5e338eb..ea6f4652 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -290,7 +290,7 @@ public abstract class World implements IBlockAccess {
@@ -19,5 +19,5 @@ index a2b5926a1..445936c7b 100644
  
      public boolean a(BlockPosition blockposition, boolean flag) {
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0173-Speedup-BlockPos-by-fixing-inlining.patch b/Spigot-Server-Patches/0172-Speedup-BlockPos-by-fixing-inlining.patch
similarity index 98%
rename from Spigot-Server-Patches/0173-Speedup-BlockPos-by-fixing-inlining.patch
rename to Spigot-Server-Patches/0172-Speedup-BlockPos-by-fixing-inlining.patch
index 2a9b1b0e93..ce7ca8b0ca 100644
--- a/Spigot-Server-Patches/0173-Speedup-BlockPos-by-fixing-inlining.patch
+++ b/Spigot-Server-Patches/0172-Speedup-BlockPos-by-fixing-inlining.patch
@@ -1,4 +1,4 @@
-From d66ad0e6ed1fa7d6cd87caee8b0591020c96d362 Mon Sep 17 00:00:00 2001
+From 54b614a4cfb7b37f74ddd27b7f06921b01a09331 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Wed, 30 Nov 2016 20:56:58 -0600
 Subject: [PATCH] Speedup BlockPos by fixing inlining
@@ -21,7 +21,7 @@ This is based upon conclusions drawn from inspecting the assenmbly generated byt
 They had 'callq' (invoke) instead of 'mov' (get from memory) instructions.
 
 diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java
-index 679d5504e..8e737718e 100644
+index 679d5504..8e737718 100644
 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java
 @@ -7,11 +7,12 @@ import javax.annotation.concurrent.Immutable;
@@ -66,7 +66,7 @@ index 679d5504e..8e737718e 100644
      public BaseBlockPosition d(BaseBlockPosition baseblockposition) {
          return new BaseBlockPosition(this.getY() * baseblockposition.getZ() - this.getZ() * baseblockposition.getY(), this.getZ() * baseblockposition.getX() - this.getX() * baseblockposition.getZ(), this.getX() * baseblockposition.getY() - this.getY() * baseblockposition.getX());
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index b3c1f550c..6a0b3a62d 100644
+index b3c1f550..6a0b3a62 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -211,19 +211,21 @@ public class BlockPosition extends BaseBlockPosition {
@@ -177,5 +177,5 @@ index b3c1f550c..6a0b3a62d 100644
  
          public BlockPosition h() {
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0174-Don-t-let-fishinghooks-use-portals.patch b/Spigot-Server-Patches/0173-Don-t-let-fishinghooks-use-portals.patch
similarity index 90%
rename from Spigot-Server-Patches/0174-Don-t-let-fishinghooks-use-portals.patch
rename to Spigot-Server-Patches/0173-Don-t-let-fishinghooks-use-portals.patch
index 125e045ee4..619c39b4d4 100644
--- a/Spigot-Server-Patches/0174-Don-t-let-fishinghooks-use-portals.patch
+++ b/Spigot-Server-Patches/0173-Don-t-let-fishinghooks-use-portals.patch
@@ -1,11 +1,11 @@
-From c6d1d4e466c703108bebad80f9715753077ead19 Mon Sep 17 00:00:00 2001
+From 98bf219d91eea39921088353ed6588f970719c9c Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 16 Dec 2016 16:03:19 -0600
 Subject: [PATCH] Don't let fishinghooks use portals
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index ffd4d836b..a042c37c7 100644
+index 9ab89287..42da707a 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -144,7 +144,7 @@ public abstract class Entity implements ICommandListener {
@@ -18,7 +18,7 @@ index ffd4d836b..a042c37c7 100644
      public int dimension;
      protected BlockPosition an;
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 339d1f1b1..7f011aef8 100644
+index 339d1f1b..7f011aef 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
 @@ -185,6 +185,12 @@ public class EntityFishingHook extends Entity {
@@ -35,5 +35,5 @@ index 339d1f1b1..7f011aef8 100644
      }
  
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0175-Add-ProjectileCollideEvent.patch b/Spigot-Server-Patches/0174-Add-ProjectileCollideEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0175-Add-ProjectileCollideEvent.patch
rename to Spigot-Server-Patches/0174-Add-ProjectileCollideEvent.patch
index 79bd038df6..b8d211e706 100644
--- a/Spigot-Server-Patches/0175-Add-ProjectileCollideEvent.patch
+++ b/Spigot-Server-Patches/0174-Add-ProjectileCollideEvent.patch
@@ -1,11 +1,11 @@
-From 39c3eb108b425ab36b87bf4102bc8c5836913003 Mon Sep 17 00:00:00 2001
+From 0d1121cecae2c4cabda856bc7ad134a9bc6ad6f9 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Fri, 16 Dec 2016 21:25:39 -0600
 Subject: [PATCH] Add ProjectileCollideEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index f55eb654b..1338f37f3 100644
+index f55eb654..1338f37f 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
 @@ -190,6 +190,15 @@ public abstract class EntityArrow extends Entity implements IProjectile {
@@ -25,7 +25,7 @@ index f55eb654b..1338f37f3 100644
                  this.a(movingobjectposition);
              }
 diff --git a/src/main/java/net/minecraft/server/EntityFireball.java b/src/main/java/net/minecraft/server/EntityFireball.java
-index 365e070f8..657b3b5ac 100644
+index 365e070f..657b3b5a 100644
 --- a/src/main/java/net/minecraft/server/EntityFireball.java
 +++ b/src/main/java/net/minecraft/server/EntityFireball.java
 @@ -70,6 +70,15 @@ public abstract class EntityFireball extends Entity {
@@ -45,7 +45,7 @@ index 365e070f8..657b3b5ac 100644
                  this.a(movingobjectposition);
  
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 7f011aef8..6ac89d1e3 100644
+index 7f011aef..6ac89d1e 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
 @@ -240,6 +240,16 @@ public class EntityFishingHook extends Entity {
@@ -66,7 +66,7 @@ index 7f011aef8..6ac89d1e3 100644
              vec3d1 = new Vec3D(movingobjectposition.pos.x, movingobjectposition.pos.y, movingobjectposition.pos.z);
          }
 diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
-index cfcaf3832..01c7fcc8b 100644
+index cfcaf383..01c7fcc8 100644
 --- a/src/main/java/net/minecraft/server/EntityProjectile.java
 +++ b/src/main/java/net/minecraft/server/EntityProjectile.java
 @@ -160,6 +160,15 @@ public abstract class EntityProjectile extends Entity implements IProjectile {
@@ -86,7 +86,7 @@ index cfcaf3832..01c7fcc8b 100644
              if (movingobjectposition.type == MovingObjectPosition.EnumMovingObjectType.BLOCK && this.world.getType(movingobjectposition.a()).getBlock() == Blocks.PORTAL) {
                  this.e(movingobjectposition.a());
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 87b4e9189..06a277b3b 100644
+index 87b4e918..06a277b3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -805,6 +805,16 @@ public class CraftEventFactory {
@@ -107,5 +107,5 @@ index 87b4e9189..06a277b3b 100644
          Projectile bukkitEntity = (Projectile) entity.getBukkitEntity();
          ProjectileLaunchEvent event = new ProjectileLaunchEvent(bukkitEntity);
 -- 
-2.15.0
+2.14.3
 
diff --git a/Spigot-Server-Patches/0176-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0175-Vanished-players-don-t-have-rights.patch
similarity index 96%
rename from Spigot-Server-Patches/0176-Vanished-players-don-t-have-rights.patch
rename to Spigot-Server-Patches/0175-Vanished-players-don-t-have-rights.patch
index 7d173fea8b..70f992fd17 100644
--- a/Spigot-Server-Patches/0176-Vanished-players-don-t-have-rights.patch
+++ b/Spigot-Server-Patches/0175-Vanished-players-don-t-have-rights.patch
@@ -1,11 +1,11 @@
-From c18f1b2c567988de0b4a9d7903e68a4b071a9370 Mon Sep 17 00:00:00 2001
+From 22a87a95ab05fa67217c5022a4c83fc3ee11ba79 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 16 Dec 2016 22:10:35 -0600
 Subject: [PATCH] Vanished players don't have rights
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 42da707ae..9080006e5 100644
+index 42da707a..9080006e 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -68,7 +68,7 @@ public abstract class Entity implements ICommandListener {
@@ -18,7 +18,7 @@ index 42da707ae..9080006e5 100644
      protected int j;
      private Entity au;public void setVehicle(Entity entity) { this.au = entity; } // Paper // OBFHELPER
 diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java
-index 60149c1ca..a5730d1c7 100644
+index 60149c1c..a5730d1c 100644
 --- a/src/main/java/net/minecraft/server/ItemBlock.java
 +++ b/src/main/java/net/minecraft/server/ItemBlock.java
 @@ -20,7 +20,7 @@ public class ItemBlock extends Item {
@@ -31,7 +31,7 @@ index 60149c1ca..a5730d1c7 100644
              IBlockData iblockdata1 = this.a.getPlacedState(world, blockposition, enumdirection, f, f1, f2, i, entityhuman);
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index adfc1adfa..0a7e70284 100644
+index ea6f4652..01dba285 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1799,6 +1799,33 @@ public abstract class World implements IBlockAccess {
@@ -78,7 +78,7 @@ index adfc1adfa..0a7e70284 100644
          this.getServer().getPluginManager().callEvent(event);
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 06a277b3b..5f816e44f 100644
+index 06a277b3..5f816e44 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -810,6 +810,13 @@ public class CraftEventFactory {
@@ -96,5 +96,5 @@ index 06a277b3b..5f816e44f 100644
          return event;
      }
 -- 
-2.15.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0177-Prevent-Pathfinding-out-of-World-Border.patch b/Spigot-Server-Patches/0176-Prevent-Pathfinding-out-of-World-Border.patch
similarity index 93%
rename from Spigot-Server-Patches/0177-Prevent-Pathfinding-out-of-World-Border.patch
rename to Spigot-Server-Patches/0176-Prevent-Pathfinding-out-of-World-Border.patch
index 2a97f9b77a..67e34b080e 100644
--- a/Spigot-Server-Patches/0177-Prevent-Pathfinding-out-of-World-Border.patch
+++ b/Spigot-Server-Patches/0176-Prevent-Pathfinding-out-of-World-Border.patch
@@ -1,4 +1,4 @@
-From cbabd72bb30424273efa4f0e1208c71a18867ca3 Mon Sep 17 00:00:00 2001
+From 4b890966c02c8780d1b2a2d93dce4a2cd3479735 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 19 Dec 2016 23:07:42 -0500
 Subject: [PATCH] Prevent Pathfinding out of World Border
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent Pathfinding out of World Border
 This prevents Entities from trying to run outside of the World Border
 
 diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
-index 3ac6f84d3..935b2e81e 100644
+index 3ac6f84d..935b2e81 100644
 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java
 +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
 @@ -69,6 +69,7 @@ public abstract class NavigationAbstract {
@@ -26,7 +26,7 @@ index 3ac6f84d3..935b2e81e 100644
              if (this.c != null && !this.c.b() && blockposition.equals(this.q)) {
                  return this.c;
 diff --git a/src/main/java/net/minecraft/server/WorldBorder.java b/src/main/java/net/minecraft/server/WorldBorder.java
-index 9038d52eb..632eb1c9d 100644
+index 9038d52e..632eb1c9 100644
 --- a/src/main/java/net/minecraft/server/WorldBorder.java
 +++ b/src/main/java/net/minecraft/server/WorldBorder.java
 @@ -29,7 +29,7 @@ public class WorldBorder {
@@ -39,5 +39,5 @@ index 9038d52eb..632eb1c9d 100644
      }
  
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0178-Bound-Treasure-Maps-to-World-Border.patch b/Spigot-Server-Patches/0177-Bound-Treasure-Maps-to-World-Border.patch
similarity index 94%
rename from Spigot-Server-Patches/0178-Bound-Treasure-Maps-to-World-Border.patch
rename to Spigot-Server-Patches/0177-Bound-Treasure-Maps-to-World-Border.patch
index f82c176408..aa252b9b40 100644
--- a/Spigot-Server-Patches/0178-Bound-Treasure-Maps-to-World-Border.patch
+++ b/Spigot-Server-Patches/0177-Bound-Treasure-Maps-to-World-Border.patch
@@ -1,4 +1,4 @@
-From dc1d7a66413d919af3fcbdb4825553e27ef47087 Mon Sep 17 00:00:00 2001
+From 600763d8d29ff09f84ea917a7921e6f6f9a9e4f1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 20 Dec 2016 15:15:11 -0500
 Subject: [PATCH] Bound Treasure Maps to World Border
@@ -11,7 +11,7 @@ that is outside happens to be closer, but unreachable, yet another reachable
 one is in border that would of been missed.
 
 diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java
-index 078957aac..7b635d3fa 100644
+index 34fd7edf..e8263baa 100644
 --- a/src/main/java/net/minecraft/server/StructureGenerator.java
 +++ b/src/main/java/net/minecraft/server/StructureGenerator.java
 @@ -236,6 +236,9 @@ public abstract class StructureGenerator extends WorldGenBase {
@@ -25,7 +25,7 @@ index 078957aac..7b635d3fa 100644
                              if (!flag1 || !world.b(l2, i3)) {
                                  return new BlockPosition((l2 << 4) + 8, 64, (i3 << 4) + 8);
 diff --git a/src/main/java/net/minecraft/server/WorldBorder.java b/src/main/java/net/minecraft/server/WorldBorder.java
-index 632eb1c9d..1bb172bbf 100644
+index 632eb1c9..1bb172bb 100644
 --- a/src/main/java/net/minecraft/server/WorldBorder.java
 +++ b/src/main/java/net/minecraft/server/WorldBorder.java
 @@ -33,6 +33,18 @@ public class WorldBorder {
@@ -48,5 +48,5 @@ index 632eb1c9d..1bb172bbf 100644
          return (double) chunkcoordintpair.e() > this.b() && (double) chunkcoordintpair.c() < this.d() && (double) chunkcoordintpair.f() > this.c() && (double) chunkcoordintpair.d() < this.e();
      }
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0179-Configurable-Cartographer-Treasure-Maps.patch b/Spigot-Server-Patches/0178-Configurable-Cartographer-Treasure-Maps.patch
similarity index 92%
rename from Spigot-Server-Patches/0179-Configurable-Cartographer-Treasure-Maps.patch
rename to Spigot-Server-Patches/0178-Configurable-Cartographer-Treasure-Maps.patch
index cee7f7ca89..435cecdba5 100644
--- a/Spigot-Server-Patches/0179-Configurable-Cartographer-Treasure-Maps.patch
+++ b/Spigot-Server-Patches/0178-Configurable-Cartographer-Treasure-Maps.patch
@@ -1,4 +1,4 @@
-From 14b4bae069a80e2ed8da1d85cc671ba19aede3ef Mon Sep 17 00:00:00 2001
+From 50444acff6f8adf702cd9f2934d23333fa101b47 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 20 Dec 2016 15:26:27 -0500
 Subject: [PATCH] Configurable Cartographer Treasure Maps
@@ -9,10 +9,10 @@ Also allow turning off treasure maps all together as they can eat up Map ID's
 which are limited in quantity.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index a80d8b2ac..32ca0a40e 100644
+index ed7ddbb2..bbb5c942 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -395,4 +395,14 @@ public class PaperWorldConfig {
+@@ -387,4 +387,14 @@ public class PaperWorldConfig {
              Bukkit.getLogger().warning("Spawn Egg and Armor Stand NBT filtering disabled, this is a potential security risk");
          }
      }
@@ -28,7 +28,7 @@ index a80d8b2ac..32ca0a40e 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index ae68f07ab..8ba150a45 100644
+index 09b466fc..df009e19 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -767,7 +767,8 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
diff --git a/Spigot-Server-Patches/0180-Optimize-ItemStack.isEmpty.patch b/Spigot-Server-Patches/0179-Optimize-ItemStack.isEmpty.patch
similarity index 92%
rename from Spigot-Server-Patches/0180-Optimize-ItemStack.isEmpty.patch
rename to Spigot-Server-Patches/0179-Optimize-ItemStack.isEmpty.patch
index 2dd5931322..793a80557c 100644
--- a/Spigot-Server-Patches/0180-Optimize-ItemStack.isEmpty.patch
+++ b/Spigot-Server-Patches/0179-Optimize-ItemStack.isEmpty.patch
@@ -1,4 +1,4 @@
-From 2c8061d8d05a237415c7d1f968a3d4b254121f3a Mon Sep 17 00:00:00 2001
+From c949ff1e8360b6c7a27a4e31ed5e9c78a9b71b5d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Dec 2016 03:48:29 -0500
 Subject: [PATCH] Optimize ItemStack.isEmpty()
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize ItemStack.isEmpty()
 Remove hashMap lookup every check, simplify code to remove ternary
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index a8f7ff98f..9465f4c16 100644
+index a8f7ff98..9465f4c1 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -143,9 +143,15 @@ public final class ItemStack {
@@ -27,5 +27,5 @@ index a8f7ff98f..9465f4c16 100644
      public static void a(DataConverterManager dataconvertermanager) {
          dataconvertermanager.a(DataConverterTypes.ITEM_INSTANCE, (DataInspector) (new DataInspectorBlockEntity()));
 -- 
-2.15.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0181-Add-API-methods-to-control-if-armour-stands-can-move.patch b/Spigot-Server-Patches/0180-Add-API-methods-to-control-if-armour-stands-can-move.patch
similarity index 92%
rename from Spigot-Server-Patches/0181-Add-API-methods-to-control-if-armour-stands-can-move.patch
rename to Spigot-Server-Patches/0180-Add-API-methods-to-control-if-armour-stands-can-move.patch
index f34a9aaa14..3c5fa90455 100644
--- a/Spigot-Server-Patches/0181-Add-API-methods-to-control-if-armour-stands-can-move.patch
+++ b/Spigot-Server-Patches/0180-Add-API-methods-to-control-if-armour-stands-can-move.patch
@@ -1,11 +1,11 @@
-From 584380c58236f4645fe51b24a4dde72986121136 Mon Sep 17 00:00:00 2001
+From a22a6f63c5aa6505bb32a18524b5d05c3c0806f9 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 21 Dec 2016 11:47:25 -0600
 Subject: [PATCH] Add API methods to control if armour stands can move
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index c9054fc91..ee3d37a71 100644
+index c9054fc9..ee3d37a7 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -50,6 +50,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -31,7 +31,7 @@ index c9054fc91..ee3d37a71 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-index 2b66a08ad..8a06cb165 100644
+index 2b66a08a..8a06cb16 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 @@ -211,4 +211,14 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
diff --git a/Spigot-Server-Patches/0182-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/0181-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
similarity index 87%
rename from Spigot-Server-Patches/0182-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
rename to Spigot-Server-Patches/0181-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
index 7d6d51a2a6..1769d17e7b 100644
--- a/Spigot-Server-Patches/0182-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/Spigot-Server-Patches/0181-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
@@ -1,14 +1,14 @@
-From f33e7ac1c7ba3da738e7c02131aa9ec3909acf8a Mon Sep 17 00:00:00 2001
+From 9d1c16da817c5725432aa84a8986ffd3d9997ed0 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 21 Dec 2016 11:52:04 -0600
 Subject: [PATCH] Option to prevent armor stands from doing entity lookups
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 32ca0a40e..70af657f5 100644
+index bbb5c942..d3f612b6 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -405,4 +405,9 @@ public class PaperWorldConfig {
+@@ -397,4 +397,9 @@ public class PaperWorldConfig {
              log("Treasure Maps will return already discovered locations");
          }
      }
@@ -19,7 +19,7 @@ index 32ca0a40e..70af657f5 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 0a7e70284..90031af4d 100644
+index 01dba285..b0139fff 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1335,6 +1335,7 @@ public abstract class World implements IBlockAccess {
@@ -31,5 +31,5 @@ index 0a7e70284..90031af4d 100644
  
              for (int i = 0; i < list.size(); ++i) {
 -- 
-2.15.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0183-Add-option-to-remove-invalid-statistics.patch b/Spigot-Server-Patches/0182-Add-option-to-remove-invalid-statistics.patch
similarity index 94%
rename from Spigot-Server-Patches/0183-Add-option-to-remove-invalid-statistics.patch
rename to Spigot-Server-Patches/0182-Add-option-to-remove-invalid-statistics.patch
index cacf098cbd..cbe76c3fb3 100644
--- a/Spigot-Server-Patches/0183-Add-option-to-remove-invalid-statistics.patch
+++ b/Spigot-Server-Patches/0182-Add-option-to-remove-invalid-statistics.patch
@@ -1,11 +1,11 @@
-From b65841d8a709abafd2d9718ab97832770ab49ac2 Mon Sep 17 00:00:00 2001
+From f73ecd606fdff1643f5b1c3f855bbf78e01de1bd Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 20 Dec 2016 23:09:21 -0600
 Subject: [PATCH] Add option to remove invalid statistics
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index da0984a35..28917f63d 100644
+index da0984a3..28917f63 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -256,4 +256,13 @@ public class PaperConfig {
@@ -23,7 +23,7 @@ index da0984a35..28917f63d 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/ServerStatisticManager.java b/src/main/java/net/minecraft/server/ServerStatisticManager.java
-index 14af226f3..e3d2c0ff7 100644
+index 14af226f..e3d2c0ff 100644
 --- a/src/main/java/net/minecraft/server/ServerStatisticManager.java
 +++ b/src/main/java/net/minecraft/server/ServerStatisticManager.java
 @@ -86,6 +86,7 @@ public class ServerStatisticManager extends StatisticManager {
@@ -53,5 +53,5 @@ index 14af226f3..e3d2c0ff7 100644
          }
      }
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0184-IllegalPacketEvent.patch b/Spigot-Server-Patches/0183-IllegalPacketEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0184-IllegalPacketEvent.patch
rename to Spigot-Server-Patches/0183-IllegalPacketEvent.patch
index 991d0bee4b..879325ffa5 100644
--- a/Spigot-Server-Patches/0184-IllegalPacketEvent.patch
+++ b/Spigot-Server-Patches/0183-IllegalPacketEvent.patch
@@ -1,4 +1,4 @@
-From 3588a36647d6eebbdd3f2e6ea692d0007215d250 Mon Sep 17 00:00:00 2001
+From d9be020b4fa9f7b242d2fcadb0e0954231a3ef27 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 23 Jun 2016 23:33:57 -0400
 Subject: [PATCH] IllegalPacketEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] IllegalPacketEvent
 Fired for invalid data from players that represents hacking attempts
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 0191a9af2..45a50602b 100644
+index 0191a9af..45a50602 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -56,6 +56,7 @@ import org.bukkit.inventory.CraftingInventory;
diff --git a/Spigot-Server-Patches/0185-Properly-fix-item-duplication-bug.patch b/Spigot-Server-Patches/0184-Properly-fix-item-duplication-bug.patch
similarity index 91%
rename from Spigot-Server-Patches/0185-Properly-fix-item-duplication-bug.patch
rename to Spigot-Server-Patches/0184-Properly-fix-item-duplication-bug.patch
index 5ebd8c1b5f..3e45ba1c87 100644
--- a/Spigot-Server-Patches/0185-Properly-fix-item-duplication-bug.patch
+++ b/Spigot-Server-Patches/0184-Properly-fix-item-duplication-bug.patch
@@ -1,4 +1,4 @@
-From d96fca7123fdc2ea33a1e91893c12457104ae42e Mon Sep 17 00:00:00 2001
+From f5f39b61dde31a496ce503231a0f8491a802d3e3 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Tue, 27 Dec 2016 01:57:57 +0000
 Subject: [PATCH] Properly fix item duplication bug
@@ -6,7 +6,7 @@ Subject: [PATCH] Properly fix item duplication bug
 Credit to prplz for figuring out the real issue
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 53147c6e2..5fbb99b7e 100644
+index 87967b68..0b71c4b9 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1491,7 +1491,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -19,7 +19,7 @@ index 53147c6e2..5fbb99b7e 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 45a50602b..33ae76415 100644
+index 45a50602..33ae7641 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2632,6 +2632,6 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
diff --git a/Spigot-Server-Patches/0186-String-based-Action-Bar-API.patch b/Spigot-Server-Patches/0185-String-based-Action-Bar-API.patch
similarity index 95%
rename from Spigot-Server-Patches/0186-String-based-Action-Bar-API.patch
rename to Spigot-Server-Patches/0185-String-based-Action-Bar-API.patch
index 29494a5b25..2f584b5dee 100644
--- a/Spigot-Server-Patches/0186-String-based-Action-Bar-API.patch
+++ b/Spigot-Server-Patches/0185-String-based-Action-Bar-API.patch
@@ -1,11 +1,11 @@
-From ba9c71ced4565a513307c6d2a4035ceb6f291065 Mon Sep 17 00:00:00 2001
+From 83e3feb7b9c8a8e51732e592149a8e48fa926ed9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 27 Dec 2016 15:02:42 -0500
 Subject: [PATCH] String based Action Bar API
 
 
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index 1159eea1a..38359517c 100644
+index 1159eea1..38359517 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -1,10 +1,13 @@
@@ -62,7 +62,7 @@ index 1159eea1a..38359517c 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 2fb268c97..89f61026a 100644
+index ef873c17..b17f2c06 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -178,6 +178,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -85,5 +85,5 @@ index 2fb268c97..89f61026a 100644
      public void setPlayerListHeaderFooter(BaseComponent[] header, BaseComponent[] footer) {
          PacketPlayOutPlayerListHeaderFooter packet = new PacketPlayOutPlayerListHeaderFooter();
 -- 
-2.15.0
+2.14.3
 
diff --git a/Spigot-Server-Patches/0187-Activation-Range-Improvements.patch b/Spigot-Server-Patches/0186-Activation-Range-Improvements.patch
similarity index 98%
rename from Spigot-Server-Patches/0187-Activation-Range-Improvements.patch
rename to Spigot-Server-Patches/0186-Activation-Range-Improvements.patch
index ba73cf1390..93a4bfa24d 100644
--- a/Spigot-Server-Patches/0187-Activation-Range-Improvements.patch
+++ b/Spigot-Server-Patches/0186-Activation-Range-Improvements.patch
@@ -1,4 +1,4 @@
-From 3271414d04333646dc6cb277c20b6db84ee420f6 Mon Sep 17 00:00:00 2001
+From 9d4bd24aa567257e1d244b160eb2d22b58b941ee Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 27 Dec 2016 22:38:06 -0500
 Subject: [PATCH] Activation Range Improvements
@@ -141,5 +141,5 @@ index 47865c02..b0856461 100644
              {
                  EntityAnimal animal = (EntityAnimal) entity;
 -- 
-2.15.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0188-Firework-API-s.patch b/Spigot-Server-Patches/0187-Firework-API-s.patch
similarity index 96%
rename from Spigot-Server-Patches/0188-Firework-API-s.patch
rename to Spigot-Server-Patches/0187-Firework-API-s.patch
index 44206cbc60..bea2814429 100644
--- a/Spigot-Server-Patches/0188-Firework-API-s.patch
+++ b/Spigot-Server-Patches/0187-Firework-API-s.patch
@@ -1,11 +1,11 @@
-From 7638c8a37799c5840c91bad10444e8227b3f7fba Mon Sep 17 00:00:00 2001
+From bb8a4bf4041a14a6dbf40a17522d591badfd14f7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 28 Dec 2016 01:18:33 -0500
 Subject: [PATCH] Firework API's
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityFireworks.java b/src/main/java/net/minecraft/server/EntityFireworks.java
-index 48cdef5db..bd0ec95f2 100644
+index 48cdef5d..bd0ec95f 100644
 --- a/src/main/java/net/minecraft/server/EntityFireworks.java
 +++ b/src/main/java/net/minecraft/server/EntityFireworks.java
 @@ -2,6 +2,8 @@ package net.minecraft.server;
@@ -53,7 +53,7 @@ index 48cdef5db..bd0ec95f2 100644
  
      public boolean bd() {
 diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java
-index b0bb4aa23..44a997215 100644
+index b0bb4aa2..44a99721 100644
 --- a/src/main/java/net/minecraft/server/ItemFireworks.java
 +++ b/src/main/java/net/minecraft/server/ItemFireworks.java
 @@ -9,6 +9,7 @@ public class ItemFireworks extends Item {
@@ -73,7 +73,7 @@ index b0bb4aa23..44a997215 100644
                  if (!entityhuman.abilities.canInstantlyBuild) {
                      itemstack.subtract(1);
 diff --git a/src/main/java/net/minecraft/server/NBTTagCompound.java b/src/main/java/net/minecraft/server/NBTTagCompound.java
-index e15c23367..82c2537b3 100644
+index e15c2336..82c2537b 100644
 --- a/src/main/java/net/minecraft/server/NBTTagCompound.java
 +++ b/src/main/java/net/minecraft/server/NBTTagCompound.java
 @@ -106,7 +106,7 @@ public class NBTTagCompound extends NBTBase {
@@ -86,7 +86,7 @@ index e15c23367..82c2537b3 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
-index 99746b3c2..d4fbe31d6 100644
+index 99746b3c..d4fbe31d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
 @@ -1,6 +1,7 @@
@@ -129,5 +129,5 @@ index 99746b3c2..d4fbe31d6 100644
 +    // Paper end
  }
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0189-PlayerTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0188-PlayerTeleportEndGatewayEvent.patch
similarity index 92%
rename from Spigot-Server-Patches/0189-PlayerTeleportEndGatewayEvent.patch
rename to Spigot-Server-Patches/0188-PlayerTeleportEndGatewayEvent.patch
index 6f012a488b..959a150f4d 100644
--- a/Spigot-Server-Patches/0189-PlayerTeleportEndGatewayEvent.patch
+++ b/Spigot-Server-Patches/0188-PlayerTeleportEndGatewayEvent.patch
@@ -1,4 +1,4 @@
-From 8af94befc901f7231aff3ae231dc24edc1efb011 Mon Sep 17 00:00:00 2001
+From a9fa0eda22003f141a7901b9269c8ecff933506b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 31 Dec 2016 21:44:50 -0500
 Subject: [PATCH] PlayerTeleportEndGatewayEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] PlayerTeleportEndGatewayEvent
 Allows you to access the Gateway being used in a teleport event
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityEndGateway.java b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
-index cfce9274a..ecbc48b0c 100644
+index cfce9274..ecbc48b0 100644
 --- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 +++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 @@ -124,7 +124,7 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick
@@ -19,5 +19,5 @@ index cfce9274a..ecbc48b0c 100644
                      if (teleEvent.isCancelled()) {
                          return;
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0190-ShulkerBox-Dupe-Prevention.patch b/Spigot-Server-Patches/0189-ShulkerBox-Dupe-Prevention.patch
similarity index 90%
rename from Spigot-Server-Patches/0190-ShulkerBox-Dupe-Prevention.patch
rename to Spigot-Server-Patches/0189-ShulkerBox-Dupe-Prevention.patch
index 98b9c45a9f..aed888b793 100644
--- a/Spigot-Server-Patches/0190-ShulkerBox-Dupe-Prevention.patch
+++ b/Spigot-Server-Patches/0189-ShulkerBox-Dupe-Prevention.patch
@@ -1,4 +1,4 @@
-From 26307196e5e2bd90c47e5bfaf53207645394b84d Mon Sep 17 00:00:00 2001
+From dc2491bfd145f897f66dc549f2b0d231765d255a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 2 Jan 2017 16:32:56 -0500
 Subject: [PATCH] ShulkerBox Dupe Prevention
@@ -7,7 +7,7 @@ This ensures that Shulker Boxes can never drop their contents twice, and
 that the inventory is cleared incase it some how also got saved to the world.
 
 diff --git a/src/main/java/net/minecraft/server/BlockShulkerBox.java b/src/main/java/net/minecraft/server/BlockShulkerBox.java
-index 8811eb3e3..74e2e448f 100644
+index 8811eb3e..74e2e448 100644
 --- a/src/main/java/net/minecraft/server/BlockShulkerBox.java
 +++ b/src/main/java/net/minecraft/server/BlockShulkerBox.java
 @@ -112,6 +112,7 @@ public class BlockShulkerBox extends BlockTileEntity {
@@ -19,5 +19,5 @@ index 8811eb3e3..74e2e448f 100644
  
              world.updateAdjacentComparators(blockposition, iblockdata.getBlock());
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0191-Provide-E-TE-Chunk-count-stat-methods.patch b/Spigot-Server-Patches/0190-Provide-E-TE-Chunk-count-stat-methods.patch
similarity index 93%
rename from Spigot-Server-Patches/0191-Provide-E-TE-Chunk-count-stat-methods.patch
rename to Spigot-Server-Patches/0190-Provide-E-TE-Chunk-count-stat-methods.patch
index 2d802e7f3b..2c8a969788 100644
--- a/Spigot-Server-Patches/0191-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/Spigot-Server-Patches/0190-Provide-E-TE-Chunk-count-stat-methods.patch
@@ -1,4 +1,4 @@
-From 966cd0280c47f9e6e0c4c587f0938e44002840e1 Mon Sep 17 00:00:00 2001
+From b48d1808b7f6a7d21e7aeac6c950d1c314248b5c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 Jan 2017 15:24:46 -0500
 Subject: [PATCH] Provide E/TE/Chunk count stat methods
@@ -7,7 +7,7 @@ Provides counts without the ineffeciency of using .getEntities().size()
 which creates copy of the collections.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 67cb2230b..00dd2976d 100644
+index 284dc639..2e78cd8c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -78,6 +78,29 @@ public class CraftWorld implements World {
@@ -41,5 +41,5 @@ index 67cb2230b..00dd2976d 100644
  
      public CraftWorld(WorldServer world, ChunkGenerator gen, Environment env) {
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0192-Enforce-Sync-Player-Saves.patch b/Spigot-Server-Patches/0191-Enforce-Sync-Player-Saves.patch
similarity index 80%
rename from Spigot-Server-Patches/0192-Enforce-Sync-Player-Saves.patch
rename to Spigot-Server-Patches/0191-Enforce-Sync-Player-Saves.patch
index 0e0eba4f3b..534943ee24 100644
--- a/Spigot-Server-Patches/0192-Enforce-Sync-Player-Saves.patch
+++ b/Spigot-Server-Patches/0191-Enforce-Sync-Player-Saves.patch
@@ -1,4 +1,4 @@
-From 28c6896e630016522ca9be45820241542d22d62d Mon Sep 17 00:00:00 2001
+From 035affcdff7fd16b82818254cd2d47ead646bfa6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 Jan 2017 15:41:58 -0500
 Subject: [PATCH] Enforce Sync Player Saves
@@ -7,10 +7,10 @@ Saving players async is extremely dangerous. This will force it to main
 the same way we handle async chunk loads.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 953e5f901..acec81a92 100644
+index 7a9b7912..7378b4ec 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -1243,6 +1243,7 @@ public abstract class PlayerList {
+@@ -1245,6 +1245,7 @@ public abstract class PlayerList {
      }
  
      public void savePlayers(Integer interval) {
@@ -18,7 +18,7 @@ index 953e5f901..acec81a92 100644
          long now = MinecraftServer.currentTick;
          MinecraftTimings.savePlayers.startTiming(); // Paper
          for (int i = 0; i < this.players.size(); ++i) {
-@@ -1252,6 +1253,7 @@ public abstract class PlayerList {
+@@ -1254,6 +1255,7 @@ public abstract class PlayerList {
              }
          }
          MinecraftTimings.savePlayers.stopTiming(); // Paper
@@ -27,5 +27,5 @@ index 953e5f901..acec81a92 100644
      // Paper end
  
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0193-Enforce-Sync-Chunk-Unloads.patch b/Spigot-Server-Patches/0192-Enforce-Sync-Chunk-Unloads.patch
similarity index 92%
rename from Spigot-Server-Patches/0193-Enforce-Sync-Chunk-Unloads.patch
rename to Spigot-Server-Patches/0192-Enforce-Sync-Chunk-Unloads.patch
index e3b90d69df..394c06e9ed 100644
--- a/Spigot-Server-Patches/0193-Enforce-Sync-Chunk-Unloads.patch
+++ b/Spigot-Server-Patches/0192-Enforce-Sync-Chunk-Unloads.patch
@@ -1,4 +1,4 @@
-From e32694bb0eb4b6de4e7872f9a1377d4dadbccadb Mon Sep 17 00:00:00 2001
+From 7fbafd99142430a403f45b0d6c71cda5b6925806 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 Jan 2017 16:06:44 -0500
 Subject: [PATCH] Enforce Sync Chunk Unloads
@@ -7,7 +7,7 @@ Unloading Chunks async is extremely dangerous. This will force it to main
 the same way we handle async chunk loads.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 2e78cd8cf..4ffe0d208 100644
+index 2e78cd8c..4ffe0d20 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -245,6 +245,7 @@ public class CraftWorld implements World {
@@ -27,5 +27,5 @@ index 2e78cd8cf..4ffe0d208 100644
  
      public boolean regenerateChunk(int x, int z) {
 -- 
-2.15.0
+2.14.3
 
diff --git a/Spigot-Server-Patches/0194-Don-t-allow-entities-to-ride-themselves-572.patch b/Spigot-Server-Patches/0193-Don-t-allow-entities-to-ride-themselves-572.patch
similarity index 88%
rename from Spigot-Server-Patches/0194-Don-t-allow-entities-to-ride-themselves-572.patch
rename to Spigot-Server-Patches/0193-Don-t-allow-entities-to-ride-themselves-572.patch
index a2e46ca555..87d5353d9e 100644
--- a/Spigot-Server-Patches/0194-Don-t-allow-entities-to-ride-themselves-572.patch
+++ b/Spigot-Server-Patches/0193-Don-t-allow-entities-to-ride-themselves-572.patch
@@ -1,11 +1,11 @@
-From e0cbd06aea1632f171a4cecbf548f1b6c70070ac Mon Sep 17 00:00:00 2001
+From 124cae47c946fa9087ef435e5f3f81df34f91e83 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Sun, 8 Jan 2017 04:31:36 +0000
 Subject: [PATCH] Don't allow entities to ride themselves - #572
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 9080006e5..a6ffe144f 100644
+index 9080006e..a6ffe144 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1938,6 +1938,7 @@ public abstract class Entity implements ICommandListener {
diff --git a/Spigot-Server-Patches/0195-Fix-block-break-desync.patch b/Spigot-Server-Patches/0194-Fix-block-break-desync.patch
similarity index 88%
rename from Spigot-Server-Patches/0195-Fix-block-break-desync.patch
rename to Spigot-Server-Patches/0194-Fix-block-break-desync.patch
index b3e693a6c0..3f4c53a722 100644
--- a/Spigot-Server-Patches/0195-Fix-block-break-desync.patch
+++ b/Spigot-Server-Patches/0194-Fix-block-break-desync.patch
@@ -1,11 +1,11 @@
-From e681f1f46bb0f4af52cc431044b8c804f4b0d0b8 Mon Sep 17 00:00:00 2001
+From 536dc88005cafea353beceacc93b5f75bff9006c Mon Sep 17 00:00:00 2001
 From: Michael Himing <mhiming@gmail.com>
 Date: Sun, 8 Jan 2017 18:50:35 +1100
 Subject: [PATCH] Fix block break desync
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index bcc6c9707..751989f5a 100644
+index 33ae7641..2367ff1f 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -868,6 +868,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -17,5 +17,5 @@ index bcc6c9707..751989f5a 100644
              } else if (blockposition.getY() >= this.minecraftServer.getMaxBuildHeight()) {
                  return;
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0196-Assign-the-World-in-WorldGenStronghold.patch b/Spigot-Server-Patches/0195-Assign-the-World-in-WorldGenStronghold.patch
similarity index 87%
rename from Spigot-Server-Patches/0196-Assign-the-World-in-WorldGenStronghold.patch
rename to Spigot-Server-Patches/0195-Assign-the-World-in-WorldGenStronghold.patch
index 5931a0678f..d7a836582b 100644
--- a/Spigot-Server-Patches/0196-Assign-the-World-in-WorldGenStronghold.patch
+++ b/Spigot-Server-Patches/0195-Assign-the-World-in-WorldGenStronghold.patch
@@ -1,11 +1,11 @@
-From 45c79ce60fe2ee66ce42a53b6ec1a24bd014fdbb Mon Sep 17 00:00:00 2001
+From a9eb218059ea10dd846b06145a95c1c787535320 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 14 Jan 2017 01:22:07 -0600
 Subject: [PATCH] Assign the World in WorldGenStronghold
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldGenStronghold.java b/src/main/java/net/minecraft/server/WorldGenStronghold.java
-index c93754704..a3b958e01 100644
+index c9375470..a3b958e0 100644
 --- a/src/main/java/net/minecraft/server/WorldGenStronghold.java
 +++ b/src/main/java/net/minecraft/server/WorldGenStronghold.java
 @@ -56,6 +56,7 @@ public class WorldGenStronghold extends StructureGenerator {
@@ -17,5 +17,5 @@ index c93754704..a3b958e01 100644
              this.c();
              this.b = true;
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0197-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/Spigot-Server-Patches/0196-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
similarity index 96%
rename from Spigot-Server-Patches/0197-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
rename to Spigot-Server-Patches/0196-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index 6f8b92e653..cd29953cc0 100644
--- a/Spigot-Server-Patches/0197-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/Spigot-Server-Patches/0196-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@@ -1,4 +1,4 @@
-From 22395ee1302937bb4ab261d2f8f830e796fa21bb Mon Sep 17 00:00:00 2001
+From 1ad06605737c7f9b6df135d1117417f334335b30 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 16:31:46 -0500
 Subject: [PATCH] ExperienceOrbs API for Reason/Source/Triggering player
@@ -8,7 +8,7 @@ Adds lots of information about why this orb exists.
 Replaces isFromBottle() with logic that persists entity reloads too.
 
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index 352310960..3e2f52647 100644
+index 35231096..3e2f5264 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -388,13 +388,13 @@ public class Block {
@@ -28,7 +28,7 @@ index 352310960..3e2f52647 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index a8cc6b61a..c925de971 100644
+index a8cc6b61..c925de97 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -618,7 +618,7 @@ public class EntityEnderDragon extends EntityInsentient implements IComplex, IMo
@@ -41,7 +41,7 @@ index a8cc6b61a..c925de971 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index bf5f1f0e8..d567ad4a5 100644
+index bf5f1f0e..d567ad4a 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -15,9 +15,54 @@ public class EntityExperienceOrb extends Entity {
@@ -116,7 +116,7 @@ index bf5f1f0e8..d567ad4a5 100644
  
      public void d(EntityHuman entityhuman) {
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 6ac89d1e3..177d8582f 100644
+index 6ac89d1e..177d8582 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
 @@ -458,7 +458,7 @@ public class EntityFishingHook extends Entity {
@@ -129,7 +129,7 @@ index 6ac89d1e3..177d8582f 100644
                      // CraftBukkit end
                      Item item = itemstack.getItem();
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 650e549b1..73643bc7c 100644
+index 650e549b..73643bc7 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -347,7 +347,8 @@ public abstract class EntityLiving extends Entity {
@@ -143,7 +143,7 @@ index 650e549b1..73643bc7c 100644
              this.expToDrop = 0;
              // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
-index 0255986fd..e14f614f5 100644
+index 0255986f..e14f614f 100644
 --- a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
 +++ b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
 @@ -40,7 +40,7 @@ public class EntityThrownExpBottle extends EntityProjectile {
@@ -156,7 +156,7 @@ index 0255986fd..e14f614f5 100644
  
              this.die();
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 8ba150a45..c1f072c42 100644
+index df009e19..9944e0f9 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -421,7 +421,7 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
@@ -169,7 +169,7 @@ index 8ba150a45..c1f072c42 100644
  
          if (this.tradingPlayer instanceof EntityPlayer) {
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalBreed.java b/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
-index 059671b54..444792ea0 100644
+index 059671b5..444792ea 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
 @@ -122,7 +122,7 @@ public class PathfinderGoalBreed extends PathfinderGoal {
@@ -182,7 +182,7 @@ index 059671b54..444792ea0 100644
                  // CraftBukkit end
              }
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index a1689c065..a49b5c81a 100644
+index a1689c06..a49b5c81 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -383,7 +383,7 @@ public class PlayerInteractManager {
@@ -195,7 +195,7 @@ index a1689c065..a49b5c81a 100644
                  // CraftBukkit end
  
 diff --git a/src/main/java/net/minecraft/server/SlotFurnaceResult.java b/src/main/java/net/minecraft/server/SlotFurnaceResult.java
-index 1dcf967a1..ed394f7a5 100644
+index 1dcf967a..ed394f7a 100644
 --- a/src/main/java/net/minecraft/server/SlotFurnaceResult.java
 +++ b/src/main/java/net/minecraft/server/SlotFurnaceResult.java
 @@ -7,7 +7,7 @@ import org.bukkit.event.inventory.FurnaceExtractEvent;
@@ -217,7 +217,7 @@ index 1dcf967a1..ed394f7a5 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 4ffe0d208..568a50ec4 100644
+index 4ffe0d20..568a50ec 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1218,7 +1218,7 @@ public class CraftWorld implements World {
@@ -230,7 +230,7 @@ index 4ffe0d208..568a50ec4 100644
              // not sure what this can do
              if (LightningStrike.class.isAssignableFrom(clazz)) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
-index 3a09cab3d..3302af0e4 100644
+index 3a09cab3..3302af0e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
 @@ -18,6 +18,18 @@ public class CraftExperienceOrb extends CraftEntity implements ExperienceOrb {
@@ -253,5 +253,5 @@ index 3a09cab3d..3302af0e4 100644
      public EntityExperienceOrb getHandle() {
          return (EntityExperienceOrb) entity;
 -- 
-2.15.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0198-Remove-the-Vanilla-Method-Profiler.patch b/Spigot-Server-Patches/0197-Remove-the-Vanilla-Method-Profiler.patch
similarity index 96%
rename from Spigot-Server-Patches/0198-Remove-the-Vanilla-Method-Profiler.patch
rename to Spigot-Server-Patches/0197-Remove-the-Vanilla-Method-Profiler.patch
index b8bb90915e..674402a38f 100644
--- a/Spigot-Server-Patches/0198-Remove-the-Vanilla-Method-Profiler.patch
+++ b/Spigot-Server-Patches/0197-Remove-the-Vanilla-Method-Profiler.patch
@@ -1,4 +1,4 @@
-From 81ef5b2b4cecb9b4bbfe5bd8fa2fe473dfc9ab65 Mon Sep 17 00:00:00 2001
+From 207fc512f3df471ca49195bbf5b92bcb58620864 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Jan 2017 08:00:33 +0100
 Subject: [PATCH] Remove the Vanilla Method Profiler
@@ -11,7 +11,7 @@ added, so we do not want any risk of performance degredation.
 Paper has a proper Timings system that makes the Vanilla Method profiler obsolete and inferior.
 
 diff --git a/src/main/java/net/minecraft/server/CommandDebug.java b/src/main/java/net/minecraft/server/CommandDebug.java
-index 89708da96..7586168db 100644
+index 89708da9..7586168d 100644
 --- a/src/main/java/net/minecraft/server/CommandDebug.java
 +++ b/src/main/java/net/minecraft/server/CommandDebug.java
 @@ -35,12 +35,11 @@ public class CommandDebug extends CommandAbstract {
@@ -40,7 +40,7 @@ index 89708da96..7586168db 100644
  
      public List<String> tabComplete(MinecraftServer minecraftserver, ICommandListener icommandlistener, String[] astring, @Nullable BlockPosition blockposition) {
 diff --git a/src/main/java/net/minecraft/server/MethodProfiler.java b/src/main/java/net/minecraft/server/MethodProfiler.java
-index 480e2ca97..a76d50723 100644
+index 480e2ca9..a76d5072 100644
 --- a/src/main/java/net/minecraft/server/MethodProfiler.java
 +++ b/src/main/java/net/minecraft/server/MethodProfiler.java
 @@ -11,7 +11,31 @@ import java.util.function.Supplier;
@@ -84,5 +84,5 @@ index 480e2ca97..a76d50723 100644
      public static final class ProfilerInfo implements Comparable<MethodProfiler.ProfilerInfo> {
  
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0199-Cap-Entity-Collisions.patch b/Spigot-Server-Patches/0198-Cap-Entity-Collisions.patch
similarity index 91%
rename from Spigot-Server-Patches/0199-Cap-Entity-Collisions.patch
rename to Spigot-Server-Patches/0198-Cap-Entity-Collisions.patch
index 796dfaf8e4..8e1f06024a 100644
--- a/Spigot-Server-Patches/0199-Cap-Entity-Collisions.patch
+++ b/Spigot-Server-Patches/0198-Cap-Entity-Collisions.patch
@@ -1,4 +1,4 @@
-From 2c7cb867022d2cee6dbe4b5596ad8127db5341d8 Mon Sep 17 00:00:00 2001
+From 9cf7a8b264a7718e6d9d4f02a4328f795478bc49 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 22 Jan 2017 18:07:56 -0500
 Subject: [PATCH] Cap Entity Collisions
@@ -12,10 +12,10 @@ just as it does in Vanilla, but entity pushing logic will be capped.
 You can set this to 0 to disable collisions.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 70af657f5..af953dda4 100644
+index d3f612b6..3b0234ae 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -410,4 +410,10 @@ public class PaperWorldConfig {
+@@ -402,4 +402,10 @@ public class PaperWorldConfig {
      private void armorStandEntityLookups() {
          armorStandEntityLookups = getBoolean("armor-stands-do-collision-entity-lookups", true);
      }
@@ -27,7 +27,7 @@ index 70af657f5..af953dda4 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index a6ffe144f..f08f4ae56 100644
+index a6ffe144..f08f4ae5 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -170,6 +170,7 @@ public abstract class Entity implements ICommandListener {
@@ -39,7 +39,7 @@ index a6ffe144f..f08f4ae56 100644
      // Spigot end
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 73643bc7c..28eb13306 100644
+index 73643bc7..28eb1330 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2189,8 +2189,11 @@ public abstract class EntityLiving extends Entity {
@@ -56,5 +56,5 @@ index 73643bc7c..28eb13306 100644
                  this.C(entity);
              }
 -- 
-2.15.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0200-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch b/Spigot-Server-Patches/0199-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch
similarity index 92%
rename from Spigot-Server-Patches/0200-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch
rename to Spigot-Server-Patches/0199-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch
index 7d80457890..223655558a 100644
--- a/Spigot-Server-Patches/0200-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch
+++ b/Spigot-Server-Patches/0199-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch
@@ -1,11 +1,11 @@
-From 30fb8444934c9efb139a23e54c57dd0d05d5bf36 Mon Sep 17 00:00:00 2001
+From 0e04c6d432f05738934e33880354276003def83b Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 23 Jan 2017 15:10:25 -0600
 Subject: [PATCH] Do not allow a zero max height in BiomeJungle
 
 
 diff --git a/src/main/java/net/minecraft/server/BiomeJungle.java b/src/main/java/net/minecraft/server/BiomeJungle.java
-index 8f67cb36c..8dc0b6238 100644
+index 8f67cb36..8dc0b623 100644
 --- a/src/main/java/net/minecraft/server/BiomeJungle.java
 +++ b/src/main/java/net/minecraft/server/BiomeJungle.java
 @@ -40,7 +40,11 @@ public class BiomeJungle extends BiomeBase {
@@ -22,7 +22,7 @@ index 8f67cb36c..8dc0b6238 100644
          (new WorldGenMelon()).generate(world, random, blockposition.a(i, k, j));
          WorldGenVines worldgenvines = new WorldGenVines();
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 6a0b3a62d..38a7af58c 100644
+index 6a0b3a62..38a7af58 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -42,6 +42,7 @@ public class BlockPosition extends BaseBlockPosition {
@@ -34,5 +34,5 @@ index 6a0b3a62d..38a7af58c 100644
          return d0 == 0.0D && d1 == 0.0D && d2 == 0.0D ? this : new BlockPosition((double) this.getX() + d0, (double) this.getY() + d1, (double) this.getZ() + d2);
      }
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0201-Remove-CraftScheduler-Async-Task-Debugger.patch b/Spigot-Server-Patches/0200-Remove-CraftScheduler-Async-Task-Debugger.patch
similarity index 96%
rename from Spigot-Server-Patches/0201-Remove-CraftScheduler-Async-Task-Debugger.patch
rename to Spigot-Server-Patches/0200-Remove-CraftScheduler-Async-Task-Debugger.patch
index 2956c14a93..88fca6d8c0 100644
--- a/Spigot-Server-Patches/0201-Remove-CraftScheduler-Async-Task-Debugger.patch
+++ b/Spigot-Server-Patches/0200-Remove-CraftScheduler-Async-Task-Debugger.patch
@@ -1,4 +1,4 @@
-From 5c2cdd99564a0e4894ca0b76e97c09307c683567 Mon Sep 17 00:00:00 2001
+From 3a79a923a1937cc284af48b1010251ce8c93e9fd Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 5 Feb 2017 00:04:04 -0500
 Subject: [PATCH] Remove CraftScheduler Async Task Debugger
@@ -9,7 +9,7 @@ One report of a suspected memory leak with the system.
 This adds additional overhead to asynchronous task dispatching
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index bce411288..e47f4cca2 100644
+index bce41128..e47f4cca 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -80,8 +80,8 @@ public class CraftScheduler implements BukkitScheduler {
@@ -58,5 +58,5 @@ index bce411288..e47f4cca2 100644
  
      @Deprecated
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0202-Shame-on-you-Mojang.patch b/Spigot-Server-Patches/0201-Shame-on-you-Mojang.patch
similarity index 95%
rename from Spigot-Server-Patches/0202-Shame-on-you-Mojang.patch
rename to Spigot-Server-Patches/0201-Shame-on-you-Mojang.patch
index e0a3d1cab2..0b91faf5fa 100644
--- a/Spigot-Server-Patches/0202-Shame-on-you-Mojang.patch
+++ b/Spigot-Server-Patches/0201-Shame-on-you-Mojang.patch
@@ -1,4 +1,4 @@
-From 8d0e4a252d430491007507e7c2dfe885d2d8024a Mon Sep 17 00:00:00 2001
+From b4782f13b5bc888bbd9756eb3177e9c4dfc669a9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 5 Feb 2017 19:17:28 -0500
 Subject: [PATCH] Shame on you Mojang
@@ -12,7 +12,7 @@ This then triggers async chunk loads!
 What in the hell were you thinking?
 
 diff --git a/src/main/java/net/minecraft/server/BlockBeacon.java b/src/main/java/net/minecraft/server/BlockBeacon.java
-index f07ac0186..21075974d 100644
+index f07ac018..21075974 100644
 --- a/src/main/java/net/minecraft/server/BlockBeacon.java
 +++ b/src/main/java/net/minecraft/server/BlockBeacon.java
 @@ -62,8 +62,8 @@ public class BlockBeacon extends BlockTileEntity {
@@ -55,5 +55,5 @@ index f07ac0186..21075974d 100644
      }
  }
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0203-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch b/Spigot-Server-Patches/0202-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
similarity index 91%
rename from Spigot-Server-Patches/0203-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
rename to Spigot-Server-Patches/0202-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
index 0cdc688cd6..7939f2c99f 100644
--- a/Spigot-Server-Patches/0203-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
+++ b/Spigot-Server-Patches/0202-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
@@ -1,11 +1,11 @@
-From c210b1334ffc2e6972558b906a3ae7ef194dc5a4 Mon Sep 17 00:00:00 2001
+From f8511475325fc02f96c23b4881178d92d46f3edf Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 7 Feb 2017 16:55:35 -0600
 Subject: [PATCH] Make targetSize more aggressive in the chunk unload queue
 
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 73554a518..2558ba8c3 100644
+index 73554a51..2558ba8c 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -325,7 +325,7 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -18,5 +18,5 @@ index 73554a518..2558ba8c3 100644
  
                  Iterator iterator = this.unloadQueue.iterator();
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0204-Do-not-let-armorstands-drown.patch b/Spigot-Server-Patches/0203-Do-not-let-armorstands-drown.patch
similarity index 93%
rename from Spigot-Server-Patches/0204-Do-not-let-armorstands-drown.patch
rename to Spigot-Server-Patches/0203-Do-not-let-armorstands-drown.patch
index e693c21648..f458b0a3c7 100644
--- a/Spigot-Server-Patches/0204-Do-not-let-armorstands-drown.patch
+++ b/Spigot-Server-Patches/0203-Do-not-let-armorstands-drown.patch
@@ -1,11 +1,11 @@
-From aedc767de58a551751ed17db6b5f7cb304013f7a Mon Sep 17 00:00:00 2001
+From b6ae0784d4a076ccf62b8acef83e06b9e26c5032 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 18 Feb 2017 19:29:58 -0600
 Subject: [PATCH] Do not let armorstands drown
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index ee3d37a71..df0d66ad0 100644
+index ee3d37a7..df0d66ad 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -779,5 +779,10 @@ public class EntityArmorStand extends EntityLiving {
@@ -20,7 +20,7 @@ index ee3d37a71..df0d66ad0 100644
      // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 341108472..135a9c0e2 100644
+index 28eb1330..839008ad 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -195,6 +195,7 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0205-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch b/Spigot-Server-Patches/0204-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch
similarity index 90%
rename from Spigot-Server-Patches/0205-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch
rename to Spigot-Server-Patches/0204-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch
index 4b78e545fa..d5e1c78ceb 100644
--- a/Spigot-Server-Patches/0205-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch
+++ b/Spigot-Server-Patches/0204-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch
@@ -1,4 +1,4 @@
-From 3b83740b6ac7de77a90e25cc3d9eb986266f250f Mon Sep 17 00:00:00 2001
+From a7d08f6d229771a964acc992fe496836026f5ec8 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Sun, 9 Apr 2017 23:50:15 -0700
 Subject: [PATCH] Fix NFE when attempting to read EMPTY ItemStack
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix NFE when attempting to read EMPTY ItemStack
 Thanks @gabizou
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 9465f4c16..52cb34abd 100644
+index 9465f4c1..52cb34ab 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -119,7 +119,7 @@ public final class ItemStack {
@@ -19,5 +19,5 @@ index 9465f4c16..52cb34abd 100644
          // CraftBukkit start - Route through setData for filtering
          // this.damage = Math.max(0, nbttagcompound.getShort("Damage"));
 -- 
-2.15.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0206-Properly-handle-async-calls-to-restart-the-server.patch b/Spigot-Server-Patches/0205-Properly-handle-async-calls-to-restart-the-server.patch
similarity index 97%
rename from Spigot-Server-Patches/0206-Properly-handle-async-calls-to-restart-the-server.patch
rename to Spigot-Server-Patches/0205-Properly-handle-async-calls-to-restart-the-server.patch
index 38ee55247d..816aa5d472 100644
--- a/Spigot-Server-Patches/0206-Properly-handle-async-calls-to-restart-the-server.patch
+++ b/Spigot-Server-Patches/0205-Properly-handle-async-calls-to-restart-the-server.patch
@@ -1,4 +1,4 @@
-From c2307fa2a3c4d95037b7f4aba680079842fb6913 Mon Sep 17 00:00:00 2001
+From 8dfa6fc384c76a62a24acb7df931f6f93f9bb64c Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 12 May 2017 23:34:11 -0500
 Subject: [PATCH] Properly handle async calls to restart the server
@@ -30,7 +30,7 @@ will have plugins and worlds saving to the disk has a high potential to result
 in corruption/dataloss.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 13c6b5ccd..908a5d273 100644
+index 13c6b5cc..908a5d27 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -71,6 +71,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -78,10 +78,10 @@ index 13c6b5ccd..908a5d273 100644
          return this.serverThread;
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index acec81a92..b8a0b67a9 100644
+index 7378b4ec..c67e152d 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -1367,10 +1367,15 @@ public abstract class PlayerList {
+@@ -1369,10 +1369,15 @@ public abstract class PlayerList {
          entityplayer.playerInteractManager.b(world.getWorldData().getGameType());
      }
  
@@ -98,7 +98,7 @@ index acec81a92..b8a0b67a9 100644
          }
          // CraftBukkit end
          // Paper start - Remove collideRule team if it exists
-@@ -1381,6 +1386,7 @@ public abstract class PlayerList {
+@@ -1383,6 +1388,7 @@ public abstract class PlayerList {
          }
          // Paper end
      }
@@ -107,7 +107,7 @@ index acec81a92..b8a0b67a9 100644
      // CraftBukkit start
      public void sendMessage(IChatBaseComponent[] iChatBaseComponents) {
 diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java
-index 49768734d..d51636c8e 100644
+index 49768734..d51636c8 100644
 --- a/src/main/java/org/spigotmc/RestartCommand.java
 +++ b/src/main/java/org/spigotmc/RestartCommand.java
 @@ -45,88 +45,123 @@ public class RestartCommand extends Command
@@ -306,5 +306,5 @@ index 49768734d..d51636c8e 100644
      }
  }
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0207-Add-system-property-to-disable-book-size-limits.patch b/Spigot-Server-Patches/0206-Add-system-property-to-disable-book-size-limits.patch
similarity index 96%
rename from Spigot-Server-Patches/0207-Add-system-property-to-disable-book-size-limits.patch
rename to Spigot-Server-Patches/0206-Add-system-property-to-disable-book-size-limits.patch
index 14539759e3..701c1eefa9 100644
--- a/Spigot-Server-Patches/0207-Add-system-property-to-disable-book-size-limits.patch
+++ b/Spigot-Server-Patches/0206-Add-system-property-to-disable-book-size-limits.patch
@@ -1,4 +1,4 @@
-From dbfc2520f87a5c123b606d7612ef803f733a1682 Mon Sep 17 00:00:00 2001
+From d995b454625c7ed52ca0468fc759431baf3a865c Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 13 May 2017 20:11:21 -0500
 Subject: [PATCH] Add system property to disable book size limits
@@ -11,7 +11,7 @@ to make books with as much data as they want. Do not use this without
 limiting incoming data from packets in some other way.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
-index 6fab8cd17..d8684eed4 100644
+index 6fab8cd1..d8684eed 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
 @@ -40,6 +40,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
@@ -57,5 +57,5 @@ index 6fab8cd17..d8684eed4 100644
              }
  
 -- 
-2.15.0
+2.14.3
 
diff --git a/Spigot-Server-Patches/0208-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/Spigot-Server-Patches/0207-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
similarity index 92%
rename from Spigot-Server-Patches/0208-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
rename to Spigot-Server-Patches/0207-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
index e3c5ea78eb..0336ac770f 100644
--- a/Spigot-Server-Patches/0208-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/Spigot-Server-Patches/0207-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
@@ -1,4 +1,4 @@
-From a3afde5dc2846398d8f989e3ba7796b39ba2d8fe Mon Sep 17 00:00:00 2001
+From 11ce646a06ba992c2f1eaa013b8011d8b7ce94d4 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 16 May 2017 21:29:08 -0500
 Subject: [PATCH] Add option to make parrots stay on shoulders despite movement
@@ -11,10 +11,10 @@ I suspect Mojang may switch to this behavior before full release.
 To be converted into a Paper-API event at some point in the future?
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index af953dda4..1ce3aaa8c 100644
+index 3b0234ae..9a4d3f85 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -416,4 +416,10 @@ public class PaperWorldConfig {
+@@ -408,4 +408,10 @@ public class PaperWorldConfig {
          maxCollisionsPerEntity = getInt( "max-entity-collisions", this.spigotConfig.getInt("max-entity-collisions", 8) );
          log( "Max Entity Collisions: " + maxCollisionsPerEntity );
      }
@@ -26,7 +26,7 @@ index af953dda4..1ce3aaa8c 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 3cc13bdc4..a8f5117bc 100644
+index 0f1d9963..9cda8a17 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -399,7 +399,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -39,7 +39,7 @@ index 3cc13bdc4..a8f5117bc 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 2367ff1f0..9c8828ebd 100644
+index 2367ff1f..9c8828eb 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1514,6 +1514,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
diff --git a/Spigot-Server-Patches/0209-Add-configuration-option-to-prevent-player-names-fro.patch b/Spigot-Server-Patches/0208-Add-configuration-option-to-prevent-player-names-fro.patch
similarity index 92%
rename from Spigot-Server-Patches/0209-Add-configuration-option-to-prevent-player-names-fro.patch
rename to Spigot-Server-Patches/0208-Add-configuration-option-to-prevent-player-names-fro.patch
index 7b3580f1dc..c5a17c102a 100644
--- a/Spigot-Server-Patches/0209-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/Spigot-Server-Patches/0208-Add-configuration-option-to-prevent-player-names-fro.patch
@@ -1,4 +1,4 @@
-From fc05fffe922c4643ad950615cdbc248bc50de923 Mon Sep 17 00:00:00 2001
+From 35e35258ca58ff40ddbf60dad977f02fbc1c5836 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Fri, 9 Jun 2017 07:24:34 -0700
 Subject: [PATCH] Add configuration option to prevent player names from being
@@ -20,7 +20,7 @@ index 28917f63..f4b23703 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f4eef421..aea0f480 100644
+index 701c9067..50341ae6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1908,5 +1908,10 @@ public final class CraftServer implements Server {
@@ -35,5 +35,5 @@ index f4eef421..aea0f480 100644
      // Paper end
  }
 -- 
-2.15.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0210-Use-TerminalConsoleAppender-for-console-improvements.patch b/Spigot-Server-Patches/0209-Use-TerminalConsoleAppender-for-console-improvements.patch
similarity index 99%
rename from Spigot-Server-Patches/0210-Use-TerminalConsoleAppender-for-console-improvements.patch
rename to Spigot-Server-Patches/0209-Use-TerminalConsoleAppender-for-console-improvements.patch
index 2b66dfb080..6ce58ec9d3 100644
--- a/Spigot-Server-Patches/0210-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/Spigot-Server-Patches/0209-Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -1,4 +1,4 @@
-From 567b683a512799016d633249967e0c763dacfc34 Mon Sep 17 00:00:00 2001
+From 44b99b76f79bf4ae023cad46b0a213577a77deca Mon Sep 17 00:00:00 2001
 From: Minecrell <dev@minecrell.net>
 Date: Fri, 9 Jun 2017 19:03:43 +0200
 Subject: [PATCH] Use TerminalConsoleAppender for console improvements
@@ -20,7 +20,7 @@ Other changes:
     configuration
 
 diff --git a/pom.xml b/pom.xml
-index f0adc3de..6fbee2a2 100644
+index 3e1b412b..42f2a99a 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -53,12 +53,6 @@
@@ -290,7 +290,7 @@ index 908a5d27..e8bddc17 100644
  
      public boolean a(int i, String s) {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index b8a0b67a..ebca377e 100644
+index c67e152d..21973468 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -78,8 +78,7 @@ public abstract class PlayerList {
@@ -304,7 +304,7 @@ index b8a0b67a..ebca377e 100644
  
          this.k = new GameProfileBanList(PlayerList.a);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index aea0f480..3a6e8d87 100644
+index 50341ae6..fa831dc8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -128,7 +128,6 @@ import io.netty.buffer.ByteBuf;
@@ -633,5 +633,5 @@ index 5cee8f00..08b6bb7f 100644
              <AppenderRef ref="TerminalConsole" level="info"/>
          </Root>
 -- 
-2.15.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0211-provide-a-configurable-option-to-disable-creeper-lin.patch b/Spigot-Server-Patches/0210-provide-a-configurable-option-to-disable-creeper-lin.patch
similarity index 89%
rename from Spigot-Server-Patches/0211-provide-a-configurable-option-to-disable-creeper-lin.patch
rename to Spigot-Server-Patches/0210-provide-a-configurable-option-to-disable-creeper-lin.patch
index 91448d3f01..e4b6af989f 100644
--- a/Spigot-Server-Patches/0211-provide-a-configurable-option-to-disable-creeper-lin.patch
+++ b/Spigot-Server-Patches/0210-provide-a-configurable-option-to-disable-creeper-lin.patch
@@ -1,4 +1,4 @@
-From 5912a185958696e4222a37ad45e05a3b147f2f08 Mon Sep 17 00:00:00 2001
+From 9ece1e7c063c766937e420d9b9bd48cb1228b68c Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 11 Jun 2017 21:01:18 +0100
 Subject: [PATCH] provide a configurable option to disable creeper lingering
@@ -6,10 +6,10 @@ Subject: [PATCH] provide a configurable option to disable creeper lingering
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 1ce3aaa8c..54d081fd2 100644
+index 9a4d3f85..ca1dce68 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -422,4 +422,10 @@ public class PaperWorldConfig {
+@@ -414,4 +414,10 @@ public class PaperWorldConfig {
          parrotsHangOnBetter = getBoolean("parrots-are-unaffected-by-player-movement", false);
          log("Parrots are unaffected by player movement: " + parrotsHangOnBetter);
      }
@@ -21,7 +21,7 @@ index 1ce3aaa8c..54d081fd2 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
-index 01e9ddc3d..b9580c65c 100644
+index c872607f..8098d4d9 100644
 --- a/src/main/java/net/minecraft/server/EntityCreeper.java
 +++ b/src/main/java/net/minecraft/server/EntityCreeper.java
 @@ -222,7 +222,7 @@ public class EntityCreeper extends EntityMonster {
@@ -34,5 +34,5 @@ index 01e9ddc3d..b9580c65c 100644
  
              entityareaeffectcloud.setSource(this); // CraftBukkit
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0212-Item-canEntityPickup.patch b/Spigot-Server-Patches/0211-Item-canEntityPickup.patch
similarity index 92%
rename from Spigot-Server-Patches/0212-Item-canEntityPickup.patch
rename to Spigot-Server-Patches/0211-Item-canEntityPickup.patch
index d10b1c76d6..7efe4db0e4 100644
--- a/Spigot-Server-Patches/0212-Item-canEntityPickup.patch
+++ b/Spigot-Server-Patches/0211-Item-canEntityPickup.patch
@@ -1,11 +1,11 @@
-From 3a72b4686dad77f25cc5390c94fc4610f571aad0 Mon Sep 17 00:00:00 2001
+From 77dad6b547631f9f9d517ef2ef5f32010dbaa4c6 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 5 May 2017 03:57:17 -0500
 Subject: [PATCH] Item#canEntityPickup
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 5ea9f3097..89e878365 100644
+index 5ea9f309..89e87836 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -514,6 +514,12 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -22,7 +22,7 @@ index 5ea9f3097..89e878365 100644
                      this.a(entityitem);
                  }
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index 6593fc633..99dbb1393 100644
+index 6593fc63..99dbb139 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -22,6 +22,7 @@ public class EntityItem extends Entity implements HopperPusher {
@@ -34,7 +34,7 @@ index 6593fc633..99dbb1393 100644
      private String g;
      private String h;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-index a17a537d6..1df17f09b 100644
+index a17a537d..1df17f09 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 @@ -37,6 +37,16 @@ public class CraftItem extends CraftEntity implements Item {
@@ -55,5 +55,5 @@ index a17a537d6..1df17f09b 100644
      public String toString() {
          return "CraftItem";
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0213-PlayerPickupItemEvent-setFlyAtPlayer.patch b/Spigot-Server-Patches/0212-PlayerPickupItemEvent-setFlyAtPlayer.patch
similarity index 95%
rename from Spigot-Server-Patches/0213-PlayerPickupItemEvent-setFlyAtPlayer.patch
rename to Spigot-Server-Patches/0212-PlayerPickupItemEvent-setFlyAtPlayer.patch
index 04c89d9669..8bde280236 100644
--- a/Spigot-Server-Patches/0213-PlayerPickupItemEvent-setFlyAtPlayer.patch
+++ b/Spigot-Server-Patches/0212-PlayerPickupItemEvent-setFlyAtPlayer.patch
@@ -1,11 +1,11 @@
-From a110b0d8c776f31fcb06e03269cb7cf5cb2b89b5 Mon Sep 17 00:00:00 2001
+From 10af08536a0e2608485ac574bdb218e28afa388a Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 May 2017 06:26:09 -0500
 Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index 99dbb1393..ae4910b4b 100644
+index 99dbb139..ae4910b4 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -332,6 +332,7 @@ public class EntityItem extends Entity implements HopperPusher {
@@ -44,5 +44,5 @@ index 99dbb1393..ae4910b4b 100644
                      this.die();
                      itemstack.setCount(i);
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0214-PlayerAttemptPickupItemEvent.patch b/Spigot-Server-Patches/0213-PlayerAttemptPickupItemEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0214-PlayerAttemptPickupItemEvent.patch
rename to Spigot-Server-Patches/0213-PlayerAttemptPickupItemEvent.patch
index 58ee0ebc26..78c4428b6d 100644
--- a/Spigot-Server-Patches/0214-PlayerAttemptPickupItemEvent.patch
+++ b/Spigot-Server-Patches/0213-PlayerAttemptPickupItemEvent.patch
@@ -1,4 +1,4 @@
-From 4a764d1d7cef5474fa407bb5c069e18b13d9f085 Mon Sep 17 00:00:00 2001
+From 72f3e8ddfdc74bd4ad75e00bd849a540ec6e2041 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 11 Jun 2017 16:30:30 -0500
 Subject: [PATCH] PlayerAttemptPickupItemEvent
@@ -40,5 +40,5 @@ index ae4910b4..0b7fc327 100644
                  itemstack.setCount(canHold);
                  // Call legacy event
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0215-Add-UnknownCommandEvent.patch b/Spigot-Server-Patches/0214-Add-UnknownCommandEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0215-Add-UnknownCommandEvent.patch
rename to Spigot-Server-Patches/0214-Add-UnknownCommandEvent.patch
index 5bf2b18e84..c636a806cd 100644
--- a/Spigot-Server-Patches/0215-Add-UnknownCommandEvent.patch
+++ b/Spigot-Server-Patches/0214-Add-UnknownCommandEvent.patch
@@ -1,11 +1,11 @@
-From bd173235efd360b6c6be2fcc273e8cf6e0265d5b Mon Sep 17 00:00:00 2001
+From e6e958afb06dc28ebe7b314e5e3c7ff83aa76419 Mon Sep 17 00:00:00 2001
 From: Sweepyoface <github@sweepy.pw>
 Date: Sat, 17 Jun 2017 18:48:21 -0400
 Subject: [PATCH] Add UnknownCommandEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3a6e8d87..3f683238 100644
+index fa831dc8..8d0a9e8c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -78,6 +78,7 @@ import org.bukkit.craftbukkit.util.Versioning;
@@ -32,5 +32,5 @@ index 3a6e8d87..3f683238 100644
          // Spigot end
  
 -- 
-2.15.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0216-Shoulder-Entities-Release-API.patch b/Spigot-Server-Patches/0215-Shoulder-Entities-Release-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0216-Shoulder-Entities-Release-API.patch
rename to Spigot-Server-Patches/0215-Shoulder-Entities-Release-API.patch
index 8e79ff3356..bcc64bb4c1 100644
--- a/Spigot-Server-Patches/0216-Shoulder-Entities-Release-API.patch
+++ b/Spigot-Server-Patches/0215-Shoulder-Entities-Release-API.patch
@@ -1,11 +1,11 @@
-From d820d3d50ee4146153086b1026780632e078a60b Mon Sep 17 00:00:00 2001
+From aca19eb6976d67b8baf4909f79d3450959b2094e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 17 Jun 2017 15:18:30 -0400
 Subject: [PATCH] Shoulder Entities Release API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 9cda8a177..deb0f4a9c 100644
+index 9cda8a17..deb0f4a9 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1721,21 +1721,48 @@ public abstract class EntityHuman extends EntityLiving {
@@ -62,7 +62,7 @@ index 9cda8a177..deb0f4a9c 100644
      public abstract boolean isSpectator();
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index c6f219a4f..ee925cae1 100644
+index a54548f0..a0128426 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -444,6 +444,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -99,5 +99,5 @@ index c6f219a4f..ee925cae1 100644
      public org.bukkit.entity.Entity getShoulderEntityLeft() {
          if (!getHandle().getShoulderEntityLeft().isEmpty()) {
 -- 
-2.15.0
+2.14.3
 
diff --git a/Spigot-Server-Patches/0217-Profile-Lookup-Events.patch b/Spigot-Server-Patches/0216-Profile-Lookup-Events.patch
similarity index 93%
rename from Spigot-Server-Patches/0217-Profile-Lookup-Events.patch
rename to Spigot-Server-Patches/0216-Profile-Lookup-Events.patch
index ac0ac01b37..4d6f340407 100644
--- a/Spigot-Server-Patches/0217-Profile-Lookup-Events.patch
+++ b/Spigot-Server-Patches/0216-Profile-Lookup-Events.patch
@@ -1,4 +1,4 @@
-From 56b9c394da0c9082dc598ea18fa2b9edf59e5e96 Mon Sep 17 00:00:00 2001
+From ae1bf6b77b7aff7800cba5fbec83a127419447d8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 17 Jun 2017 17:00:32 -0400
 Subject: [PATCH] Profile Lookup Events
@@ -7,7 +7,7 @@ Adds a Pre Lookup Event and a Post Lookup Event so that plugins may prefill in p
 profiles that had to be looked up.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e8bddc171..0e255861d 100644
+index e8bddc17..0e255861 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1021,6 +1021,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -19,5 +19,5 @@ index e8bddc171..0e255861d 100644
              final DedicatedServer dedicatedserver = new DedicatedServer(options, DataConverterRegistry.a(), yggdrasilauthenticationservice, minecraftsessionservice, gameprofilerepository, usercache);
  
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0218-Block-player-logins-during-server-shutdown.patch b/Spigot-Server-Patches/0217-Block-player-logins-during-server-shutdown.patch
similarity index 90%
rename from Spigot-Server-Patches/0218-Block-player-logins-during-server-shutdown.patch
rename to Spigot-Server-Patches/0217-Block-player-logins-during-server-shutdown.patch
index 0807e7e6c5..bf18ecd3d2 100644
--- a/Spigot-Server-Patches/0218-Block-player-logins-during-server-shutdown.patch
+++ b/Spigot-Server-Patches/0217-Block-player-logins-during-server-shutdown.patch
@@ -1,11 +1,11 @@
-From 8d44a70aa504dc035b022cef4c4866ae7c04a687 Mon Sep 17 00:00:00 2001
+From fd044412cd145d64581dddfbd1adbf99259b9126 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 2 Jul 2017 21:35:56 -0500
 Subject: [PATCH] Block player logins during server shutdown
 
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 2158fcd32..c5434e6ba 100644
+index 2158fcd3..c5434e6b 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -53,6 +53,12 @@ public class LoginListener implements PacketLoginInListener, ITickable {
@@ -22,5 +22,5 @@ index 2158fcd32..c5434e6ba 100644
              this.b();
          } else if (this.g == LoginListener.EnumProtocolState.DELAY_ACCEPT) {
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0219-Entity-fromMobSpawner.patch b/Spigot-Server-Patches/0218-Entity-fromMobSpawner.patch
similarity index 95%
rename from Spigot-Server-Patches/0219-Entity-fromMobSpawner.patch
rename to Spigot-Server-Patches/0218-Entity-fromMobSpawner.patch
index a3311a55d8..f04cfe97fc 100644
--- a/Spigot-Server-Patches/0219-Entity-fromMobSpawner.patch
+++ b/Spigot-Server-Patches/0218-Entity-fromMobSpawner.patch
@@ -1,11 +1,11 @@
-From d63fbf4c1dd23ae430d83aa428fab25e008fc2f1 Mon Sep 17 00:00:00 2001
+From 07d9869dee1b26d16661f6ca11214a16b0954ef5 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 18 Jun 2017 18:17:05 -0500
 Subject: [PATCH] Entity#fromMobSpawner()
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index f08f4ae56..1f3aabd01 100644
+index f08f4ae5..1f3aabd0 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -170,6 +170,7 @@ public abstract class Entity implements ICommandListener {
@@ -37,7 +37,7 @@ index f08f4ae56..1f3aabd01 100644
  
          } catch (Throwable throwable) {
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index 0562c6e34..06b064a78 100644
+index 0562c6e3..06b064a7 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -107,6 +107,7 @@ public abstract class MobSpawnerAbstract {
@@ -49,7 +49,7 @@ index 0562c6e34..06b064a78 100644
                          if ( entity.world.spigotConfig.nerfSpawnerMobs )
                          {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 3ce4fbdbd..58a8f5a78 100644
+index 8628cd5a..6f06584f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -793,5 +793,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/Spigot-Server-Patches/0220-Fix-Anvil-Level-sync-to-client.patch b/Spigot-Server-Patches/0219-Fix-Anvil-Level-sync-to-client.patch
similarity index 93%
rename from Spigot-Server-Patches/0220-Fix-Anvil-Level-sync-to-client.patch
rename to Spigot-Server-Patches/0219-Fix-Anvil-Level-sync-to-client.patch
index 33891acd9c..121bc0d1a4 100644
--- a/Spigot-Server-Patches/0220-Fix-Anvil-Level-sync-to-client.patch
+++ b/Spigot-Server-Patches/0219-Fix-Anvil-Level-sync-to-client.patch
@@ -1,4 +1,4 @@
-From d8d1ff170050ae54c4aebf6eef44034f36344a47 Mon Sep 17 00:00:00 2001
+From 3f187c2e2ae21a7984e1e3d87f2015a2ba0503b5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 11 Jul 2017 23:17:57 -0400
 Subject: [PATCH] Fix Anvil Level sync to client
@@ -10,7 +10,7 @@ Was done incorrectly and is now causing level desyncs to client.
 Always send current level to the client, and instead make setWindowProperty set the level.
 
 diff --git a/src/main/java/net/minecraft/server/ContainerAnvil.java b/src/main/java/net/minecraft/server/ContainerAnvil.java
-index 175753c5a..16ec67569 100644
+index 175753c5..16ec6756 100644
 --- a/src/main/java/net/minecraft/server/ContainerAnvil.java
 +++ b/src/main/java/net/minecraft/server/ContainerAnvil.java
 @@ -376,9 +376,9 @@ public class ContainerAnvil extends Container {
@@ -26,7 +26,7 @@ index 175753c5a..16ec67569 100644
  
          this.lastLevelCost = this.levelCost;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 89f61026a..00bf55f4b 100644
+index b17f2c06..5c2bacc7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1337,6 +1337,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -42,5 +42,5 @@ index 89f61026a..00bf55f4b 100644
          return true;
      }
 -- 
-2.15.0
+2.14.3
 
diff --git a/Spigot-Server-Patches/0221-Add-missing-coverages-for-getTileEntity-in-order-to-.patch b/Spigot-Server-Patches/0220-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
similarity index 90%
rename from Spigot-Server-Patches/0221-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
rename to Spigot-Server-Patches/0220-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
index 58dd851987..8a036209cc 100644
--- a/Spigot-Server-Patches/0221-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
+++ b/Spigot-Server-Patches/0220-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
@@ -1,4 +1,4 @@
-From bda3776e61c8f1859ad361f2a7a89d75c7971bff Mon Sep 17 00:00:00 2001
+From 96d42683dd9accbc3584cb21897adc46d703bfbb Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 22 Jul 2017 15:22:59 +0100
 Subject: [PATCH] Add missing coverages for getTileEntity in order to attempt
@@ -6,7 +6,7 @@ Subject: [PATCH] Add missing coverages for getTileEntity in order to attempt
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 2ac5caaa4..c03be509f 100644
+index 2ac5caaa..c03be509 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -235,6 +235,13 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -24,5 +24,5 @@ index 2ac5caaa4..c03be509f 100644
          return result;
      }
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0222-Allow-Changing-of-Player-Sample-in-ServerListPingEve.patch b/Spigot-Server-Patches/0221-Allow-Changing-of-Player-Sample-in-ServerListPingEve.patch
similarity index 96%
rename from Spigot-Server-Patches/0222-Allow-Changing-of-Player-Sample-in-ServerListPingEve.patch
rename to Spigot-Server-Patches/0221-Allow-Changing-of-Player-Sample-in-ServerListPingEve.patch
index eb93f8c9d6..b5f83aa174 100644
--- a/Spigot-Server-Patches/0222-Allow-Changing-of-Player-Sample-in-ServerListPingEve.patch
+++ b/Spigot-Server-Patches/0221-Allow-Changing-of-Player-Sample-in-ServerListPingEve.patch
@@ -1,11 +1,11 @@
-From 732782932a72f308e7271c035eaaf4a03ecdf9ce Mon Sep 17 00:00:00 2001
+From 2cad5316cd2c9730c862529b7f99ae749e52827e Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Fri, 5 May 2017 18:59:22 -0400
 Subject: [PATCH] Allow Changing of Player Sample in ServerListPingEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/PacketStatusListener.java b/src/main/java/net/minecraft/server/PacketStatusListener.java
-index 313bb0007..45d6984f7 100644
+index 313bb000..45d6984f 100644
 --- a/src/main/java/net/minecraft/server/PacketStatusListener.java
 +++ b/src/main/java/net/minecraft/server/PacketStatusListener.java
 @@ -5,6 +5,7 @@ import com.mojang.authlib.GameProfile;
@@ -64,5 +64,5 @@ index 313bb0007..45d6984f7 100644
              playerSample.a(profiles.toArray(new GameProfile[profiles.size()]));
  
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0223-Improve-the-Saddle-API-for-Horses.patch b/Spigot-Server-Patches/0222-Improve-the-Saddle-API-for-Horses.patch
similarity index 94%
rename from Spigot-Server-Patches/0223-Improve-the-Saddle-API-for-Horses.patch
rename to Spigot-Server-Patches/0222-Improve-the-Saddle-API-for-Horses.patch
index e6164cbf02..c7724913ad 100644
--- a/Spigot-Server-Patches/0223-Improve-the-Saddle-API-for-Horses.patch
+++ b/Spigot-Server-Patches/0222-Improve-the-Saddle-API-for-Horses.patch
@@ -1,4 +1,4 @@
-From c4086c2d68e3524a7ab63dc946740925ac58ca3c Mon Sep 17 00:00:00 2001
+From 80b5772cc61e3c128c19ebe9a75a123d28147c8d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 10 Dec 2016 16:24:06 -0500
 Subject: [PATCH] Improve the Saddle API for Horses
@@ -7,7 +7,7 @@ Not all horses with Saddles have armor. This lets us break up the horses with sa
 and access their saddle state separately from an interface shared with Armor.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
-index 62c7d44c7..64d75459a 100644
+index 62c7d44c..64d75459 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
 @@ -6,6 +6,7 @@ import net.minecraft.server.EntityHorseAbstract;
@@ -27,7 +27,7 @@ index 62c7d44c7..64d75459a 100644
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java
-index 5adbd7437..2f6852404 100644
+index 5adbd743..2f685240 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java
 @@ -4,24 +4,16 @@ import net.minecraft.server.IInventory;
@@ -58,7 +58,7 @@ index 5adbd7437..2f6852404 100644
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java
 new file mode 100644
-index 000000000..615010c40
+index 00000000..615010c4
 --- /dev/null
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java
 @@ -0,0 +1,20 @@
@@ -83,5 +83,5 @@ index 000000000..615010c40
 +    }
 +}
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0224-Implement-ensureServerConversions-API.patch b/Spigot-Server-Patches/0223-Implement-ensureServerConversions-API.patch
similarity index 90%
rename from Spigot-Server-Patches/0224-Implement-ensureServerConversions-API.patch
rename to Spigot-Server-Patches/0223-Implement-ensureServerConversions-API.patch
index 0a79d84f43..4802927396 100644
--- a/Spigot-Server-Patches/0224-Implement-ensureServerConversions-API.patch
+++ b/Spigot-Server-Patches/0223-Implement-ensureServerConversions-API.patch
@@ -1,4 +1,4 @@
-From 7e748e9639b070df6acfe66f76e2b72dab3a4baf Mon Sep 17 00:00:00 2001
+From e12cc521c629a1d8a05a229794658dd2962c8c64 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 May 2016 22:43:12 -0400
 Subject: [PATCH] Implement ensureServerConversions API
@@ -7,7 +7,7 @@ This will take a Bukkit ItemStack and run it through any conversions a server pr
 to ensure it meets latest minecraft expectations.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index 49ebad22e..eb6987338 100644
+index 49ebad22..eb698733 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 @@ -194,4 +194,11 @@ public final class CraftItemFactory implements ItemFactory {
@@ -23,5 +23,5 @@ index 49ebad22e..eb6987338 100644
 +    // Paper end
  }
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0225-Implement-getI18NDisplayName.patch b/Spigot-Server-Patches/0224-Implement-getI18NDisplayName.patch
similarity index 92%
rename from Spigot-Server-Patches/0225-Implement-getI18NDisplayName.patch
rename to Spigot-Server-Patches/0224-Implement-getI18NDisplayName.patch
index 457c2284c2..683979e2d5 100644
--- a/Spigot-Server-Patches/0225-Implement-getI18NDisplayName.patch
+++ b/Spigot-Server-Patches/0224-Implement-getI18NDisplayName.patch
@@ -1,4 +1,4 @@
-From 1039d73509176ddbdf74e2a946c27b175680fb9d Mon Sep 17 00:00:00 2001
+From 98e88b7247d092b1fcba762c008965d0268a8df5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 May 2016 23:59:38 -0400
 Subject: [PATCH] Implement getI18NDisplayName
@@ -8,7 +8,7 @@ Currently the server only supports the English language. To override this,
 You must replace the language file embedded in the server jar.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index eb6987338..c2f26577c 100644
+index eb698733..c2f26577 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 @@ -200,5 +200,18 @@ public final class CraftItemFactory implements ItemFactory {
@@ -31,5 +31,5 @@ index eb6987338..c2f26577c 100644
      // Paper end
  }
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0226-GH-806-Respect-saving-disabled-before-unloading-all-.patch b/Spigot-Server-Patches/0225-GH-806-Respect-saving-disabled-before-unloading-all-.patch
similarity index 90%
rename from Spigot-Server-Patches/0226-GH-806-Respect-saving-disabled-before-unloading-all-.patch
rename to Spigot-Server-Patches/0225-GH-806-Respect-saving-disabled-before-unloading-all-.patch
index ae817f5432..22334ec7ae 100644
--- a/Spigot-Server-Patches/0226-GH-806-Respect-saving-disabled-before-unloading-all-.patch
+++ b/Spigot-Server-Patches/0225-GH-806-Respect-saving-disabled-before-unloading-all-.patch
@@ -1,4 +1,4 @@
-From f1b3a04ee35000049ad11a2c3cb107914f7582dd Mon Sep 17 00:00:00 2001
+From ec50fe635952450e4432cb04e3c197a68b9a370f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 27 Jul 2017 00:06:43 -0400
 Subject: [PATCH] GH-806: Respect saving disabled before unloading all chunks
@@ -9,7 +9,7 @@ This behavior causes a save to occur even though saving was supposed to be turne
 It's triggered when Hell/End worlds are empty of players.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 14ea89c91..08e0cdf6d 100644
+index 0b10f168..4af55732 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -220,7 +220,7 @@ public class PlayerChunkMap {
@@ -22,5 +22,5 @@ index 14ea89c91..08e0cdf6d 100644
              }
              } // Paper timing
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0227-ProfileWhitelistVerifyEvent.patch b/Spigot-Server-Patches/0226-ProfileWhitelistVerifyEvent.patch
similarity index 92%
rename from Spigot-Server-Patches/0227-ProfileWhitelistVerifyEvent.patch
rename to Spigot-Server-Patches/0226-ProfileWhitelistVerifyEvent.patch
index f209e0580f..17c93199de 100644
--- a/Spigot-Server-Patches/0227-ProfileWhitelistVerifyEvent.patch
+++ b/Spigot-Server-Patches/0226-ProfileWhitelistVerifyEvent.patch
@@ -1,14 +1,14 @@
-From c78055b6f2994460aed039ab17c23a53df4ba435 Mon Sep 17 00:00:00 2001
+From cc8d081f195f2c1ed76ffe8d833c41d5509a1c3a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 3 Jul 2017 18:11:10 -0500
 Subject: [PATCH] ProfileWhitelistVerifyEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index ebca377e5..c201e9cec 100644
+index 21973468..00b8887b 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -536,9 +536,9 @@ public abstract class PlayerList {
+@@ -538,9 +538,9 @@ public abstract class PlayerList {
  
              // return s;
              if (!gameprofilebanentry.hasExpired()) event.disallow(PlayerLoginEvent.Result.KICK_BANNED, s); // Spigot
@@ -20,7 +20,7 @@ index ebca377e5..c201e9cec 100644
          } else if (getIPBans().isBanned(socketaddress) && !getIPBans().get(socketaddress).hasExpired()) {
              IpBanEntry ipbanentry = this.l.get(socketaddress);
  
-@@ -1200,9 +1200,25 @@ public abstract class PlayerList {
+@@ -1202,9 +1202,25 @@ public abstract class PlayerList {
  
      }
  
@@ -48,5 +48,5 @@ index ebca377e5..c201e9cec 100644
      public boolean isOp(GameProfile gameprofile) {
          return this.operators.d(gameprofile) || this.server.R() && this.server.worlds.get(0).getWorldData().u() && this.server.Q().equalsIgnoreCase(gameprofile.getName()) || this.u; // CraftBukkit
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0228-Fix-this-stupid-bullshit.patch b/Spigot-Server-Patches/0227-Fix-this-stupid-bullshit.patch
similarity index 93%
rename from Spigot-Server-Patches/0228-Fix-this-stupid-bullshit.patch
rename to Spigot-Server-Patches/0227-Fix-this-stupid-bullshit.patch
index 3937e4f1f6..d2836693cc 100644
--- a/Spigot-Server-Patches/0228-Fix-this-stupid-bullshit.patch
+++ b/Spigot-Server-Patches/0227-Fix-this-stupid-bullshit.patch
@@ -1,4 +1,4 @@
-From f8e0a762773502754c1994b44909beccbfd1b4db Mon Sep 17 00:00:00 2001
+From 359bb97f40f4839d44d820d1cd261f92af1f9b3a Mon Sep 17 00:00:00 2001
 From: DemonWav <demonwav@gmail.com>
 Date: Sun, 6 Aug 2017 17:17:53 -0500
 Subject: [PATCH] Fix this stupid bullshit
@@ -9,7 +9,7 @@ modified in order to prevent merge conflicts when Spigot changes/disables the wa
 and to provide some level of hint without being disruptive.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index d3d848f8c..21628e196 100644
+index d3d848f8..21628e19 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -209,10 +209,12 @@ public class Main {
@@ -29,5 +29,5 @@ index d3d848f8c..21628e196 100644
                  }
  
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0229-Ocelot-despawns-should-honor-nametags-and-leash.patch b/Spigot-Server-Patches/0228-Ocelot-despawns-should-honor-nametags-and-leash.patch
similarity index 88%
rename from Spigot-Server-Patches/0229-Ocelot-despawns-should-honor-nametags-and-leash.patch
rename to Spigot-Server-Patches/0228-Ocelot-despawns-should-honor-nametags-and-leash.patch
index a453447f3d..6f95de036f 100644
--- a/Spigot-Server-Patches/0229-Ocelot-despawns-should-honor-nametags-and-leash.patch
+++ b/Spigot-Server-Patches/0228-Ocelot-despawns-should-honor-nametags-and-leash.patch
@@ -1,11 +1,11 @@
-From 7b1d1554b8d650b899c7a7ce9b9034644b611858 Mon Sep 17 00:00:00 2001
+From c87e1e895f548c24e80196c4ea01bd90d3ea503a Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 31 Jul 2017 01:54:40 -0500
 Subject: [PATCH] Ocelot despawns should honor nametags and leash
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java
-index 5a76821ea..858bbef5b 100644
+index 5a76821e..858bbef5 100644
 --- a/src/main/java/net/minecraft/server/EntityOcelot.java
 +++ b/src/main/java/net/minecraft/server/EntityOcelot.java
 @@ -58,7 +58,7 @@ public class EntityOcelot extends EntityTameableAnimal {
@@ -18,5 +18,5 @@ index 5a76821ea..858bbef5b 100644
  
      protected void initAttributes() {
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0230-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/Spigot-Server-Patches/0229-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
similarity index 91%
rename from Spigot-Server-Patches/0230-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
rename to Spigot-Server-Patches/0229-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
index e9ba0c934c..61200c36f3 100644
--- a/Spigot-Server-Patches/0230-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
+++ b/Spigot-Server-Patches/0229-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
@@ -1,11 +1,11 @@
-From 886463be7f9b8db11b507becc9620e75dbc520d4 Mon Sep 17 00:00:00 2001
+From 80ea019ce112d14db92860c75e74ddfd853c5e81 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 31 Jul 2017 01:45:19 -0500
 Subject: [PATCH] Reset spawner timer when spawner event is cancelled
 
 
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index 06b064a78..c29df55fa 100644
+index 06b064a7..c29df55f 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -113,6 +113,9 @@ public abstract class MobSpawnerAbstract {
@@ -28,5 +28,5 @@ index 06b064a78..c29df55fa 100644
                  }
  
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0231-MC-94186-Fix-dragon-egg-falling-in-lazy-chunks.patch b/Spigot-Server-Patches/0230-MC-94186-Fix-dragon-egg-falling-in-lazy-chunks.patch
similarity index 89%
rename from Spigot-Server-Patches/0231-MC-94186-Fix-dragon-egg-falling-in-lazy-chunks.patch
rename to Spigot-Server-Patches/0230-MC-94186-Fix-dragon-egg-falling-in-lazy-chunks.patch
index f2b3083108..d5230902a5 100644
--- a/Spigot-Server-Patches/0231-MC-94186-Fix-dragon-egg-falling-in-lazy-chunks.patch
+++ b/Spigot-Server-Patches/0230-MC-94186-Fix-dragon-egg-falling-in-lazy-chunks.patch
@@ -1,4 +1,4 @@
-From 7d55175c4ac7f56aaf7118b64270dc86b7b75ba3 Mon Sep 17 00:00:00 2001
+From a6f9dba98ea7fb8efa3d0acd5b7a2833c76260e5 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Fri, 11 Aug 2017 03:29:26 +0200
 Subject: [PATCH] MC-94186 Fix dragon egg falling in lazy chunks
@@ -8,7 +8,7 @@ Fixes falling dragon eggs in lazy chunks fall to the block below the last empty
 See also https://bugs.mojang.com/browse/MC-94186
 
 diff --git a/src/main/java/net/minecraft/server/BlockDragonEgg.java b/src/main/java/net/minecraft/server/BlockDragonEgg.java
-index ce186f825..291342c90 100644
+index ce186f82..291342c9 100644
 --- a/src/main/java/net/minecraft/server/BlockDragonEgg.java
 +++ b/src/main/java/net/minecraft/server/BlockDragonEgg.java
 @@ -44,7 +44,7 @@ public class BlockDragonEgg extends Block {
@@ -21,5 +21,5 @@ index ce186f825..291342c90 100644
              }
  
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0232-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/Spigot-Server-Patches/0231-Fix-MC-117075-TE-Unload-Lag-Spike.patch
similarity index 91%
rename from Spigot-Server-Patches/0232-Fix-MC-117075-TE-Unload-Lag-Spike.patch
rename to Spigot-Server-Patches/0231-Fix-MC-117075-TE-Unload-Lag-Spike.patch
index 05bd0836c3..7a5e6b37c3 100644
--- a/Spigot-Server-Patches/0232-Fix-MC-117075-TE-Unload-Lag-Spike.patch
+++ b/Spigot-Server-Patches/0231-Fix-MC-117075-TE-Unload-Lag-Spike.patch
@@ -1,11 +1,11 @@
-From 7452027038fb266d6b1331362adadf196cdc3d9d Mon Sep 17 00:00:00 2001
+From d4fd8c2c3305c2dbd19b8a9cd8f701497e9dfce4 Mon Sep 17 00:00:00 2001
 From: mezz <tehgeek@gmail.com>
 Date: Wed, 9 Aug 2017 17:51:22 -0500
 Subject: [PATCH] Fix MC-117075: TE Unload Lag Spike
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 90031af4d..67873b57b 100644
+index b0139fff..00513d02 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1572,7 +1572,11 @@ public abstract class World implements IBlockAccess {
@@ -22,5 +22,5 @@ index 90031af4d..67873b57b 100644
              this.tileEntityListUnload.clear();
          }
 -- 
-2.15.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0233-Allow-specifying-a-custom-authentication-servers-dow.patch b/Spigot-Server-Patches/0232-Allow-specifying-a-custom-authentication-servers-dow.patch
similarity index 94%
rename from Spigot-Server-Patches/0233-Allow-specifying-a-custom-authentication-servers-dow.patch
rename to Spigot-Server-Patches/0232-Allow-specifying-a-custom-authentication-servers-dow.patch
index f0f19006f1..54cd820dff 100644
--- a/Spigot-Server-Patches/0233-Allow-specifying-a-custom-authentication-servers-dow.patch
+++ b/Spigot-Server-Patches/0232-Allow-specifying-a-custom-authentication-servers-dow.patch
@@ -1,4 +1,4 @@
-From e6cb0d297e7d941474c2bcc879adedbd5f5786ee Mon Sep 17 00:00:00 2001
+From 4e4a640186a7fab650d7adc335162ac608e12451 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 17 Aug 2017 16:08:20 -0700
 Subject: [PATCH] Allow specifying a custom "authentication servers down" kick
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow specifying a custom "authentication servers down" kick
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index f4b237034..f5cb9799b 100644
+index f4b23703..f5cb9799 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -1,5 +1,6 @@
@@ -27,7 +27,7 @@ index f4b237034..f5cb9799b 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index c5434e6ba..75df92836 100644
+index c5434e6b..75df9283 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -250,6 +250,10 @@ public class LoginListener implements PacketLoginInListener, ITickable {
@@ -42,5 +42,5 @@ index c5434e6ba..75df92836 100644
                              LoginListener.c.error("Couldn\'t verify username because servers are unavailable");
                          }
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0234-LivingEntity-setKiller.patch b/Spigot-Server-Patches/0233-LivingEntity-setKiller.patch
similarity index 91%
rename from Spigot-Server-Patches/0234-LivingEntity-setKiller.patch
rename to Spigot-Server-Patches/0233-LivingEntity-setKiller.patch
index 3b676e4aa9..2d611cfaf7 100644
--- a/Spigot-Server-Patches/0234-LivingEntity-setKiller.patch
+++ b/Spigot-Server-Patches/0233-LivingEntity-setKiller.patch
@@ -1,11 +1,11 @@
-From 1cc39050af4f335e22706ecf30557a95afcb69eb Mon Sep 17 00:00:00 2001
+From e197c8b6e39155f3ac30cdea8cc80b4ab77a516d Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 31 Jul 2017 01:49:48 -0500
 Subject: [PATCH] LivingEntity#setKiller
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index b9e106031..413bab0c9 100644
+index b9e10603..413bab0c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -252,6 +252,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -26,5 +26,5 @@ index b9e106031..413bab0c9 100644
          return addPotionEffect(effect, false);
      }
 -- 
-2.15.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0235-Avoid-NPE-during-CraftBlockEntityState-load.patch b/Spigot-Server-Patches/0234-Avoid-NPE-during-CraftBlockEntityState-load.patch
similarity index 92%
rename from Spigot-Server-Patches/0235-Avoid-NPE-during-CraftBlockEntityState-load.patch
rename to Spigot-Server-Patches/0234-Avoid-NPE-during-CraftBlockEntityState-load.patch
index f0f2b33bc3..1f66b3a895 100644
--- a/Spigot-Server-Patches/0235-Avoid-NPE-during-CraftBlockEntityState-load.patch
+++ b/Spigot-Server-Patches/0234-Avoid-NPE-during-CraftBlockEntityState-load.patch
@@ -1,11 +1,11 @@
-From 4172ca19330956828839f51a3fb94d2e7c8ddcef Mon Sep 17 00:00:00 2001
+From 393357be31b0748391a60219438ae3da64cac021 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Mon, 18 Sep 2017 13:38:40 -0700
 Subject: [PATCH] Avoid NPE during CraftBlockEntityState load
 
 
 diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
-index 54b719d91..3f2c5b2d5 100644
+index 54b719d9..3f2c5b2d 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySign.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySign.java
 @@ -60,7 +60,7 @@ public class TileEntitySign extends TileEntity {
@@ -18,7 +18,7 @@ index 54b719d91..3f2c5b2d5 100644
          };
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
-index 266f87d7f..22dcaea72 100644
+index 266f87d7..22dcaea7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 @@ -24,6 +24,7 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
@@ -38,5 +38,5 @@ index 266f87d7f..22dcaea72 100644
      }
  
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0236-Anti-Xray.patch b/Spigot-Server-Patches/0235-Anti-Xray.patch
similarity index 99%
rename from Spigot-Server-Patches/0236-Anti-Xray.patch
rename to Spigot-Server-Patches/0235-Anti-Xray.patch
index fdc12da8bc..69feec4e1a 100644
--- a/Spigot-Server-Patches/0236-Anti-Xray.patch
+++ b/Spigot-Server-Patches/0235-Anti-Xray.patch
@@ -1,11 +1,11 @@
-From 7414470453c5c5cf82c7d966a4ffa2ceabe7d5e2 Mon Sep 17 00:00:00 2001
+From c404918d7567fa0dd5a29af990886365d0d20742 Mon Sep 17 00:00:00 2001
 From: stonar96 <minecraft.stonar96@gmail.com>
 Date: Thu, 21 Sep 2017 00:38:47 +0200
 Subject: [PATCH] Anti-Xray
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 54d081fd..14f652d4 100644
+index ca1dce68..37b26827 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -1,7 +1,10 @@
@@ -19,7 +19,7 @@ index 54d081fd..14f652d4 100644
  import net.minecraft.server.MinecraftServer;
  import org.bukkit.Bukkit;
  import org.bukkit.configuration.file.YamlConfiguration;
-@@ -428,4 +431,25 @@ public class PaperWorldConfig {
+@@ -420,4 +423,25 @@ public class PaperWorldConfig {
          disableCreeperLingeringEffect = getBoolean("disable-creeper-lingering-effect", false);
          log("Creeper lingering effect: " + disableCreeperLingeringEffect);
      }
@@ -1579,5 +1579,5 @@ index 9942f0c7..2da6edc6 100644
                          }
                      }
 -- 
-2.15.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0237-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch b/Spigot-Server-Patches/0236-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
similarity index 93%
rename from Spigot-Server-Patches/0237-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
rename to Spigot-Server-Patches/0236-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
index 2bd90ba334..e979c7145d 100644
--- a/Spigot-Server-Patches/0237-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
+++ b/Spigot-Server-Patches/0236-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
@@ -1,4 +1,4 @@
-From d2bbc4038ff2bd80039f56629ce97eeeee860ece Mon Sep 17 00:00:00 2001
+From aebb8067ec31525beb2d173d9f2fa99a156ab4a6 Mon Sep 17 00:00:00 2001
 From: Minecrell <dev@minecrell.net>
 Date: Mon, 18 Sep 2017 12:00:03 +0200
 Subject: [PATCH] Use Log4j IOStreams to redirect System.out/err to logger
@@ -12,7 +12,7 @@ results in a separate line, even though it should not result in
 a line break. Log4j's implementation handles it correctly.
 
 diff --git a/pom.xml b/pom.xml
-index 98972114d..aff997468 100644
+index 42f2a99a..9ce02242 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -97,6 +97,13 @@
@@ -30,7 +30,7 @@ index 98972114d..aff997468 100644
          <dependency>
              <groupId>junit</groupId>
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index b3f1aa999..854455711 100644
+index b3f1aa99..85445571 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -129,8 +129,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -47,5 +47,5 @@ index b3f1aa999..854455711 100644
  
          thread.setDaemon(true);
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0238-Handle-plugin-prefixes-using-Log4J-configuration.patch b/Spigot-Server-Patches/0237-Handle-plugin-prefixes-using-Log4J-configuration.patch
similarity index 95%
rename from Spigot-Server-Patches/0238-Handle-plugin-prefixes-using-Log4J-configuration.patch
rename to Spigot-Server-Patches/0237-Handle-plugin-prefixes-using-Log4J-configuration.patch
index 41957f6f36..8640f10a47 100644
--- a/Spigot-Server-Patches/0238-Handle-plugin-prefixes-using-Log4J-configuration.patch
+++ b/Spigot-Server-Patches/0237-Handle-plugin-prefixes-using-Log4J-configuration.patch
@@ -1,4 +1,4 @@
-From 73313a0ccd12adf501c9b1334743a6af965079db Mon Sep 17 00:00:00 2001
+From 0b6358f3a5862386306ec264fe07ceff558cee6d Mon Sep 17 00:00:00 2001
 From: Minecrell <dev@minecrell.net>
 Date: Thu, 21 Sep 2017 16:14:55 +0200
 Subject: [PATCH] Handle plugin prefixes using Log4J configuration
@@ -15,7 +15,7 @@ This may cause additional prefixes to be disabled for plugins bypassing
 the plugin logger.
 
 diff --git a/pom.xml b/pom.xml
-index aff997468..dfb006aa0 100644
+index 9ce02242..16baff46 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -94,7 +94,7 @@
@@ -28,7 +28,7 @@ index aff997468..dfb006aa0 100644
  
          <!-- Paper - Add additional Log4J dependencies -->
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 9ce3e1365..cc1f3ac96 100644
+index 9ce3e136..cc1f3ac9 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -282,7 +282,7 @@ public class SpigotConfig
@@ -41,7 +41,7 @@ index 9ce3e1365..cc1f3ac96 100644
  
      public static int playerShuffle;
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 08b6bb7f9..9f8334376 100644
+index 08b6bb7f..9f833437 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
 @@ -2,10 +2,22 @@
@@ -70,5 +70,5 @@ index 08b6bb7f9..9f8334376 100644
                  <TimeBasedTriggeringPolicy />
                  <OnStartupTriggeringPolicy />
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0239-Include-Log4J2-SLF4J-implementation.patch b/Spigot-Server-Patches/0238-Include-Log4J2-SLF4J-implementation.patch
similarity index 86%
rename from Spigot-Server-Patches/0239-Include-Log4J2-SLF4J-implementation.patch
rename to Spigot-Server-Patches/0238-Include-Log4J2-SLF4J-implementation.patch
index d17b679e0f..c02c0ac1c2 100644
--- a/Spigot-Server-Patches/0239-Include-Log4J2-SLF4J-implementation.patch
+++ b/Spigot-Server-Patches/0238-Include-Log4J2-SLF4J-implementation.patch
@@ -1,11 +1,11 @@
-From 3eed4ccb095324b5502a8c4872320f2161dc505e Mon Sep 17 00:00:00 2001
+From c0a65cbcad0baebd96d69f1278788e75e60ddc12 Mon Sep 17 00:00:00 2001
 From: Minecrell <dev@minecrell.net>
 Date: Thu, 21 Sep 2017 16:33:35 +0200
 Subject: [PATCH] Include Log4J2 SLF4J implementation
 
 
 diff --git a/pom.xml b/pom.xml
-index dfb006aa0..07e780b6f 100644
+index 16baff46..0296c13d 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -98,6 +98,12 @@
@@ -22,5 +22,5 @@ index dfb006aa0..07e780b6f 100644
              <groupId>org.apache.logging.log4j</groupId>
              <artifactId>log4j-iostreams</artifactId>
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0240-Disable-logger-prefix-for-various-plugins-bypassing-.patch b/Spigot-Server-Patches/0239-Disable-logger-prefix-for-various-plugins-bypassing-.patch
similarity index 95%
rename from Spigot-Server-Patches/0240-Disable-logger-prefix-for-various-plugins-bypassing-.patch
rename to Spigot-Server-Patches/0239-Disable-logger-prefix-for-various-plugins-bypassing-.patch
index ee6c8d10cc..a7dfe03cad 100644
--- a/Spigot-Server-Patches/0240-Disable-logger-prefix-for-various-plugins-bypassing-.patch
+++ b/Spigot-Server-Patches/0239-Disable-logger-prefix-for-various-plugins-bypassing-.patch
@@ -1,4 +1,4 @@
-From 0c978c95e05286d0a6ec7de0bdc886189e5688cb Mon Sep 17 00:00:00 2001
+From 10655989e0019030d03071b1cfa0c044bde782ef Mon Sep 17 00:00:00 2001
 From: Minecrell <dev@minecrell.net>
 Date: Sat, 23 Sep 2017 21:07:20 +0200
 Subject: [PATCH] Disable logger prefix for various plugins bypassing the
@@ -11,7 +11,7 @@ log. Disable the logger prefix for these plugins so the messages
 show up correctly.
 
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 9f8334376..6711e6dff 100644
+index 9f833437..6711e6df 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
 @@ -5,7 +5,8 @@
@@ -35,5 +35,5 @@ index 9f8334376..6711e6dff 100644
                  </LoggerNamePatternSelector>
              </PatternLayout>
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0241-Add-PlayerJumpEvent.patch b/Spigot-Server-Patches/0240-Add-PlayerJumpEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0241-Add-PlayerJumpEvent.patch
rename to Spigot-Server-Patches/0240-Add-PlayerJumpEvent.patch
index 240f4b61bf..825a1b7e08 100644
--- a/Spigot-Server-Patches/0241-Add-PlayerJumpEvent.patch
+++ b/Spigot-Server-Patches/0240-Add-PlayerJumpEvent.patch
@@ -1,11 +1,11 @@
-From 3f16c3b440955cf38b7d054a68f1d51afa1b9559 Mon Sep 17 00:00:00 2001
+From 35f54d42ec2538dd1caf18e5946a17114a385dca Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 28 Sep 2017 17:21:44 -0400
 Subject: [PATCH] Add PlayerJumpEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index e9f48ecad..00fe92fa8 100644
+index deb0f4a9..579996d1 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1399,6 +1399,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -17,7 +17,7 @@ index e9f48ecad..00fe92fa8 100644
          super.cu();
          this.b(StatisticList.w);
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index e529ea60b..36af72387 100644
+index 9c8828eb..cc58a4a9 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -57,6 +57,7 @@ import org.bukkit.inventory.EquipmentSlot;
@@ -65,5 +65,5 @@ index e529ea60b..36af72387 100644
  
                              this.player.move(EnumMoveType.PLAYER, d7, d8, d9);
 -- 
-2.14.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0242-handle-PacketPlayInKeepAlive-async.patch b/Spigot-Server-Patches/0241-handle-PacketPlayInKeepAlive-async.patch
similarity index 95%
rename from Spigot-Server-Patches/0242-handle-PacketPlayInKeepAlive-async.patch
rename to Spigot-Server-Patches/0241-handle-PacketPlayInKeepAlive-async.patch
index b732676b88..5e6e21a552 100644
--- a/Spigot-Server-Patches/0242-handle-PacketPlayInKeepAlive-async.patch
+++ b/Spigot-Server-Patches/0241-handle-PacketPlayInKeepAlive-async.patch
@@ -1,4 +1,4 @@
-From 77b65abbc5253aa92805413c310b3069b381589c Mon Sep 17 00:00:00 2001
+From 563bdc4c1166fc9fb05d51a82119b6f260859ef5 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Thu, 5 Oct 2017 01:54:07 +0100
 Subject: [PATCH] handle PacketPlayInKeepAlive async
@@ -15,7 +15,7 @@ also adding some additional logging in order to help work out what is causing
 random disconnections for clients.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index cc58a4a93..a92bf8967 100644
+index cc58a4a9..a92bf896 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2230,14 +2230,20 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
diff --git a/Spigot-Server-Patches/0243-Expose-client-protocol-version-and-virtual-host.patch b/Spigot-Server-Patches/0242-Expose-client-protocol-version-and-virtual-host.patch
similarity index 95%
rename from Spigot-Server-Patches/0243-Expose-client-protocol-version-and-virtual-host.patch
rename to Spigot-Server-Patches/0242-Expose-client-protocol-version-and-virtual-host.patch
index 8a19716630..1439a71b35 100644
--- a/Spigot-Server-Patches/0243-Expose-client-protocol-version-and-virtual-host.patch
+++ b/Spigot-Server-Patches/0242-Expose-client-protocol-version-and-virtual-host.patch
@@ -1,4 +1,4 @@
-From 018be33ecc0265cd220f7eee9f80977a91f0dfe3 Mon Sep 17 00:00:00 2001
+From 4af0a18551ba9f1b07af520837d356be39d82671 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Tue, 10 Oct 2017 18:45:20 +0200
 Subject: [PATCH] Expose client protocol version and virtual host
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose client protocol version and virtual host
 
 diff --git a/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java b/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java
 new file mode 100644
-index 000000000..5caca6439
+index 00000000..5caca643
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java
 @@ -0,0 +1,50 @@
@@ -61,7 +61,7 @@ index 000000000..5caca6439
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
-index 309ab18df..c583ab7d9 100644
+index 309ab18d..c583ab7d 100644
 --- a/src/main/java/net/minecraft/server/HandshakeListener.java
 +++ b/src/main/java/net/minecraft/server/HandshakeListener.java
 @@ -15,6 +15,7 @@ public class HandshakeListener implements PacketHandshakingInListener {
@@ -84,7 +84,7 @@ index 309ab18df..c583ab7d9 100644
  
      public void a(IChatBaseComponent ichatbasecomponent) {}
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 2eddb68d7..b93a26e8f 100644
+index 2eddb68d..b93a26e8 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -75,6 +75,10 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -99,7 +99,7 @@ index 2eddb68d7..b93a26e8f 100644
      public NetworkManager(EnumProtocolDirection enumprotocoldirection) {
          this.h = enumprotocoldirection;
 diff --git a/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
-index aececa39d..1d4ba3b3d 100644
+index aececa39..1d4ba3b3 100644
 --- a/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
 +++ b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
 @@ -33,6 +33,7 @@ public class PacketHandshakingInSetProtocol implements Packet<PacketHandshakingI
@@ -111,7 +111,7 @@ index aececa39d..1d4ba3b3d 100644
          return this.a;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 00bf55f4b..eeab46333 100644
+index 5c2bacc7..e5e3f7e8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -136,6 +136,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -136,5 +136,5 @@ index 00bf55f4b..eeab46333 100644
      public double getEyeHeight() {
          return getEyeHeight(false);
 -- 
-2.15.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0244-revert-serverside-behavior-of-keepalives.patch b/Spigot-Server-Patches/0243-revert-serverside-behavior-of-keepalives.patch
similarity index 97%
rename from Spigot-Server-Patches/0244-revert-serverside-behavior-of-keepalives.patch
rename to Spigot-Server-Patches/0243-revert-serverside-behavior-of-keepalives.patch
index b1eed4295f..bb97188f73 100644
--- a/Spigot-Server-Patches/0244-revert-serverside-behavior-of-keepalives.patch
+++ b/Spigot-Server-Patches/0243-revert-serverside-behavior-of-keepalives.patch
@@ -1,4 +1,4 @@
-From 4857743f854572e63bd512528de0c968091a2ced Mon Sep 17 00:00:00 2001
+From b2ace419d82e64b1e3fcfc8810aeb1bdb044c219 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 15 Oct 2017 00:29:07 +0100
 Subject: [PATCH] revert serverside behavior of keepalives
@@ -17,7 +17,7 @@ from networking or during connections flood of chunk packets on slower clients,
  at the cost of dead connections being kept open for longer.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index a92bf8967..d0ab87d0f 100644
+index a92bf896..d0ab87d0 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -100,6 +100,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -65,5 +65,5 @@ index a92bf8967..d0ab87d0f 100644
          this.minecraftServer.methodProfiler.b();
          // CraftBukkit start
 -- 
-2.15.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0245-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch b/Spigot-Server-Patches/0244-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
similarity index 92%
rename from Spigot-Server-Patches/0245-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
rename to Spigot-Server-Patches/0244-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
index 22f5d7e166..14d6b55af4 100644
--- a/Spigot-Server-Patches/0245-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
+++ b/Spigot-Server-Patches/0244-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
@@ -1,4 +1,4 @@
-From e6a019e74db5ec209cd364852d223346187edb6c Mon Sep 17 00:00:00 2001
+From b4407358ba6030a47aa6c3b223c63a87055791a5 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Fri, 20 Oct 2017 04:33:45 +0200
 Subject: [PATCH] Replace HashSet with fastutil's ObjectOpenHashSet in
@@ -13,7 +13,7 @@ ObjectOpenHashSet never uses compareTo(), so the inconsistencies of NextTickList
 Fixes https://github.com/PaperMC/Paper/issues/588
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/HashTreeSet.java b/src/main/java/org/bukkit/craftbukkit/util/HashTreeSet.java
-index 80a5c29f3..cd864c404 100644
+index 80a5c29f..cd864c40 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/HashTreeSet.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/HashTreeSet.java
 @@ -8,7 +8,7 @@ import java.util.TreeSet;
@@ -26,5 +26,5 @@ index 80a5c29f3..cd864c404 100644
  
      public HashTreeSet() {
 -- 
-2.15.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0246-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/Spigot-Server-Patches/0245-Send-attack-SoundEffects-only-to-players-who-can-see.patch
similarity index 97%
rename from Spigot-Server-Patches/0246-Send-attack-SoundEffects-only-to-players-who-can-see.patch
rename to Spigot-Server-Patches/0245-Send-attack-SoundEffects-only-to-players-who-can-see.patch
index c582e6847c..52d9518ac0 100644
--- a/Spigot-Server-Patches/0246-Send-attack-SoundEffects-only-to-players-who-can-see.patch
+++ b/Spigot-Server-Patches/0245-Send-attack-SoundEffects-only-to-players-who-can-see.patch
@@ -1,4 +1,4 @@
-From c466a781bb64fb94c37aa33bfeaebc2c55147c0c Mon Sep 17 00:00:00 2001
+From 3a514f95ceda5af3d0729ad62d4493236139ea1a Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 31 Oct 2017 03:26:18 +0100
 Subject: [PATCH] Send attack SoundEffects only to players who can see the
@@ -6,7 +6,7 @@ Subject: [PATCH] Send attack SoundEffects only to players who can see the
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 579996d1e..347237055 100644
+index 579996d1..34723705 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -939,6 +939,15 @@ public abstract class EntityHuman extends EntityLiving {
@@ -72,7 +72,7 @@ index 579996d1e..347237055 100644
                              entity.extinguish();
                          }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index a706f510d..8d28d7e19 100644
+index 592e5b3b..d45cbf2f 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1061,6 +1061,12 @@ public abstract class World implements IBlockAccess {
@@ -89,5 +89,5 @@ index a706f510d..8d28d7e19 100644
          for (int i = 0; i < this.u.size(); ++i) {
              ((IWorldAccess) this.u.get(i)).a(entityhuman, soundeffect, soundcategory, d0, d1, d2, f, f1);
 -- 
-2.15.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0247-Option-for-maximum-exp-value-when-merging-orbs.patch b/Spigot-Server-Patches/0246-Option-for-maximum-exp-value-when-merging-orbs.patch
similarity index 93%
rename from Spigot-Server-Patches/0247-Option-for-maximum-exp-value-when-merging-orbs.patch
rename to Spigot-Server-Patches/0246-Option-for-maximum-exp-value-when-merging-orbs.patch
index 891a441075..62dde9222f 100644
--- a/Spigot-Server-Patches/0247-Option-for-maximum-exp-value-when-merging-orbs.patch
+++ b/Spigot-Server-Patches/0246-Option-for-maximum-exp-value-when-merging-orbs.patch
@@ -1,14 +1,14 @@
-From 286794e0f29870df173aa440b08270dc86a6a513 Mon Sep 17 00:00:00 2001
+From 84780f5c4befa622eacdc09a799255ad3a6969d1 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 10 Nov 2017 23:03:12 -0500
 Subject: [PATCH] Option for maximum exp value when merging orbs
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 14f652d48..47d352285 100644
+index 37b26827..fe6710f6 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -452,4 +452,10 @@ public class PaperWorldConfig {
+@@ -444,4 +444,10 @@ public class PaperWorldConfig {
          replacementBlocks = getList("anti-xray.replacement-blocks", Arrays.asList((Object) "stone", "planks"));
          log("Anti-Xray: " + (antiXray ? "enabled" : "disabled") + " / Engine Mode: " + engineMode.getDescription() + " / Chunk Edge Mode: " + chunkEdgeMode.getDescription() + " / Up to " + ((maxChunkSectionIndex + 1) * 16) + " blocks");
      }
@@ -20,7 +20,7 @@ index 14f652d48..47d352285 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 8d28d7e19..ad55631cf 100644
+index d45cbf2f..0193364d 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1143,16 +1143,30 @@ public abstract class World implements IBlockAccess {
@@ -56,5 +56,5 @@ index 8d28d7e19..ad55631cf 100644
          } // Spigot end
  
 -- 
-2.15.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0248-Add-PlayerArmorChangeEvent.patch b/Spigot-Server-Patches/0247-Add-PlayerArmorChangeEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0248-Add-PlayerArmorChangeEvent.patch
rename to Spigot-Server-Patches/0247-Add-PlayerArmorChangeEvent.patch
index 09935bbbf4..9bc686a157 100644
--- a/Spigot-Server-Patches/0248-Add-PlayerArmorChangeEvent.patch
+++ b/Spigot-Server-Patches/0247-Add-PlayerArmorChangeEvent.patch
@@ -1,11 +1,11 @@
-From 3d707126e0a97c112a78fafa6ff6f7e223c6ad51 Mon Sep 17 00:00:00 2001
+From 81fa95c749fe7820daa8066ad0a081d70d93c2c3 Mon Sep 17 00:00:00 2001
 From: pkt77 <parkerkt77@gmail.com>
 Date: Fri, 10 Nov 2017 23:46:34 -0500
 Subject: [PATCH] Add PlayerArmorChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 839008ad7..c0abea96e 100644
+index 839008ad..c0abea96 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1,5 +1,6 @@
@@ -30,7 +30,7 @@ index 839008ad7..c0abea96e 100644
                      if (!itemstack.isEmpty()) {
                          this.getAttributeMap().a(itemstack.a(enumitemslot));
 diff --git a/src/main/java/net/minecraft/server/EnumItemSlot.java b/src/main/java/net/minecraft/server/EnumItemSlot.java
-index cdf3a3ba4..be5d0bf89 100644
+index cdf3a3ba..be5d0bf8 100644
 --- a/src/main/java/net/minecraft/server/EnumItemSlot.java
 +++ b/src/main/java/net/minecraft/server/EnumItemSlot.java
 @@ -16,6 +16,7 @@ public enum EnumItemSlot {
@@ -42,5 +42,5 @@ index cdf3a3ba4..be5d0bf89 100644
          return this.g;
      }
 -- 
-2.15.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0249-Improve-Structures-Checking.patch b/Spigot-Server-Patches/0248-Improve-Structures-Checking.patch
similarity index 97%
rename from Spigot-Server-Patches/0249-Improve-Structures-Checking.patch
rename to Spigot-Server-Patches/0248-Improve-Structures-Checking.patch
index 37936664e2..2679440e20 100644
--- a/Spigot-Server-Patches/0249-Improve-Structures-Checking.patch
+++ b/Spigot-Server-Patches/0248-Improve-Structures-Checking.patch
@@ -1,4 +1,4 @@
-From c9d649159395d4d366f0a5191c4e89b7108df605 Mon Sep 17 00:00:00 2001
+From f1c8d3cb4121c5db1a4eb26c86552855a2f593ea Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 11 Nov 2017 17:57:39 -0500
 Subject: [PATCH] Improve Structures Checking
@@ -14,7 +14,7 @@ that has been around for a whilewith lots of structures due to ineffeciencies
 in how MC stores structures (even unloaded chunks has structured data loaded)
 
 diff --git a/src/main/java/net/minecraft/server/StructureBoundingBox.java b/src/main/java/net/minecraft/server/StructureBoundingBox.java
-index db419cd99..d9329bd42 100644
+index db419cd9..d9329bd4 100644
 --- a/src/main/java/net/minecraft/server/StructureBoundingBox.java
 +++ b/src/main/java/net/minecraft/server/StructureBoundingBox.java
 @@ -4,12 +4,14 @@ import com.google.common.base.MoreObjects;
@@ -47,7 +47,7 @@ index db419cd99..d9329bd42 100644
          return baseblockposition.getX() >= this.a && baseblockposition.getX() <= this.d && baseblockposition.getZ() >= this.c && baseblockposition.getZ() <= this.f && baseblockposition.getY() >= this.b && baseblockposition.getY() <= this.e;
      }
 diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java
-index e8263baa4..f4dfba8f3 100644
+index e8263baa..f4dfba8f 100644
 --- a/src/main/java/net/minecraft/server/StructureGenerator.java
 +++ b/src/main/java/net/minecraft/server/StructureGenerator.java
 @@ -6,6 +6,7 @@ import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
@@ -157,7 +157,7 @@ index e8263baa4..f4dfba8f3 100644
          this.a.a(structurestart.a(i, j), i, j);
          this.a.c();
 diff --git a/src/main/java/net/minecraft/server/StructurePiece.java b/src/main/java/net/minecraft/server/StructurePiece.java
-index 93903bc67..fcc13f811 100644
+index 93903bc6..fcc13f81 100644
 --- a/src/main/java/net/minecraft/server/StructurePiece.java
 +++ b/src/main/java/net/minecraft/server/StructurePiece.java
 @@ -53,6 +53,7 @@ public abstract class StructurePiece {
@@ -169,7 +169,7 @@ index 93903bc67..fcc13f811 100644
          return this.l;
      }
 diff --git a/src/main/java/net/minecraft/server/StructureStart.java b/src/main/java/net/minecraft/server/StructureStart.java
-index b6abc74e0..f9bb953d0 100644
+index b6abc74e..f9bb953d 100644
 --- a/src/main/java/net/minecraft/server/StructureStart.java
 +++ b/src/main/java/net/minecraft/server/StructureStart.java
 @@ -19,10 +19,12 @@ public abstract class StructureStart {
@@ -195,5 +195,5 @@ index b6abc74e0..f9bb953d0 100644
      }
  
 -- 
-2.15.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0250-Prevent-logins-from-being-processed-when-the-player-.patch b/Spigot-Server-Patches/0249-Prevent-logins-from-being-processed-when-the-player-.patch
similarity index 90%
rename from Spigot-Server-Patches/0250-Prevent-logins-from-being-processed-when-the-player-.patch
rename to Spigot-Server-Patches/0249-Prevent-logins-from-being-processed-when-the-player-.patch
index c0ebd886fa..09d7eae242 100644
--- a/Spigot-Server-Patches/0250-Prevent-logins-from-being-processed-when-the-player-.patch
+++ b/Spigot-Server-Patches/0249-Prevent-logins-from-being-processed-when-the-player-.patch
@@ -1,4 +1,4 @@
-From 84a34b3a750a6d79f040b84fe77cf771c5f2e309 Mon Sep 17 00:00:00 2001
+From b7973c27c49bc075c50f065c8e0aeca571c376f8 Mon Sep 17 00:00:00 2001
 From: killme <killme-git@ibts.me>
 Date: Sun, 12 Nov 2017 19:40:01 +0100
 Subject: [PATCH] Prevent logins from being processed when the player has
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent logins from being processed when the player has
 
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 75df92836..eaac25dc3 100644
+index 75df9283..eaac25dc 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -60,7 +60,11 @@ public class LoginListener implements PacketLoginInListener, ITickable {
@@ -23,5 +23,5 @@ index 75df92836..eaac25dc3 100644
              EntityPlayer entityplayer = this.server.getPlayerList().a(this.i.getId());
  
 -- 
-2.15.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0251-use-CB-BlockState-implementations-for-captured-block.patch b/Spigot-Server-Patches/0250-use-CB-BlockState-implementations-for-captured-block.patch
similarity index 94%
rename from Spigot-Server-Patches/0251-use-CB-BlockState-implementations-for-captured-block.patch
rename to Spigot-Server-Patches/0250-use-CB-BlockState-implementations-for-captured-block.patch
index 61d93b3361..45b0ee8a48 100644
--- a/Spigot-Server-Patches/0251-use-CB-BlockState-implementations-for-captured-block.patch
+++ b/Spigot-Server-Patches/0250-use-CB-BlockState-implementations-for-captured-block.patch
@@ -1,4 +1,4 @@
-From fea7bc7f32f83560dc3a5494a236b95e07f72ed5 Mon Sep 17 00:00:00 2001
+From f46d01aa332ae3b6e94ea7c436f3b598a0d01ee3 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Thu, 16 Nov 2017 12:12:41 +0000
 Subject: [PATCH] use CB BlockState implementations for captured blocks
@@ -18,7 +18,7 @@ the blockstate that will be valid for restoration, as opposed to dropping
 information on restoration when the event is cancelled.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index ad55631cf..eb8a1c43c 100644
+index 0193364d..e4502551 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -393,7 +393,8 @@ public abstract class World implements IBlockAccess {
@@ -32,5 +32,5 @@ index ad55631cf..eb8a1c43c 100644
              }
              // CraftBukkit end
 -- 
-2.15.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0252-API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-Server-Patches/0251-API-to-get-a-BlockState-without-a-snapshot.patch
similarity index 95%
rename from Spigot-Server-Patches/0252-API-to-get-a-BlockState-without-a-snapshot.patch
rename to Spigot-Server-Patches/0251-API-to-get-a-BlockState-without-a-snapshot.patch
index 2280231f32..30e12a1a27 100644
--- a/Spigot-Server-Patches/0252-API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/Spigot-Server-Patches/0251-API-to-get-a-BlockState-without-a-snapshot.patch
@@ -1,4 +1,4 @@
-From 142def44e39cbda0769d919228faa92376b3add2 Mon Sep 17 00:00:00 2001
+From 001556ca19ffe8b95cb83b6844f24cd0cb6d14e0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 6 Nov 2017 21:08:22 -0500
 Subject: [PATCH] API to get a BlockState without a snapshot
@@ -9,7 +9,7 @@ on the real tile entity.
 This is useful for where performance is needed
 
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 237f7e6fe..fe2df18df 100644
+index 237f7e6f..fe2df18d 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -266,7 +266,12 @@ public abstract class TileEntity {
@@ -35,7 +35,7 @@ index 237f7e6fe..fe2df18df 100644
          return null;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index ba1cdc18f..bea02c493 100644
+index 46670c34..a9d3f12b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -260,7 +260,22 @@ public class CraftBlock implements Block {
@@ -62,7 +62,7 @@ index ba1cdc18f..bea02c493 100644
  
          switch (material) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
-index 22dcaea72..3b5a90c39 100644
+index 22dcaea7..3b5a90c3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 @@ -22,17 +22,34 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
@@ -101,5 +101,5 @@ index 22dcaea72..3b5a90c39 100644
          // copy tile entity data:
          this.snapshot = this.createSnapshot(tileEntity);
 -- 
-2.15.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0253-Do-not-use-a-snapshot-for-hoppers.patch b/Spigot-Server-Patches/0252-Do-not-use-a-snapshot-for-hoppers.patch
similarity index 97%
rename from Spigot-Server-Patches/0253-Do-not-use-a-snapshot-for-hoppers.patch
rename to Spigot-Server-Patches/0252-Do-not-use-a-snapshot-for-hoppers.patch
index f16b97adcc..c538286d3e 100644
--- a/Spigot-Server-Patches/0253-Do-not-use-a-snapshot-for-hoppers.patch
+++ b/Spigot-Server-Patches/0252-Do-not-use-a-snapshot-for-hoppers.patch
@@ -1,4 +1,4 @@
-From 9d7d7c604f70abfe98b0f08b04305ddcb28b415f Mon Sep 17 00:00:00 2001
+From 96f6f3cd478e51a675aa42bcc039910be2663148 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 25 Nov 2017 17:02:33 +0000
 Subject: [PATCH] Do not use a snapshot for hoppers
@@ -18,7 +18,7 @@ ontop, I managed to log 380 cases per second where a snapshot would have been
 taken in cases where the snapshot is redundant.
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
-index 8ad081316..ebbe5d326 100644
+index 8ad08131..ebbe5d32 100644
 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java
 +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
 @@ -219,11 +219,15 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
@@ -63,5 +63,5 @@ index 8ad081316..ebbe5d326 100644
              if (event.isCancelled()) {
                  iinventory.setItem(i, itemstack1);
 -- 
-2.15.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0254-AsyncTabCompleteEvent.patch b/Spigot-Server-Patches/0253-AsyncTabCompleteEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0254-AsyncTabCompleteEvent.patch
rename to Spigot-Server-Patches/0253-AsyncTabCompleteEvent.patch
index e917a61466..63bb0394b9 100644
--- a/Spigot-Server-Patches/0254-AsyncTabCompleteEvent.patch
+++ b/Spigot-Server-Patches/0253-AsyncTabCompleteEvent.patch
@@ -1,4 +1,4 @@
-From c130ed826310705324a7d49797b0cba6fe989176 Mon Sep 17 00:00:00 2001
+From 92a5ed8c7c26a51185389ce24cb21f11333d0238 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 26 Nov 2017 13:19:58 -0500
 Subject: [PATCH] AsyncTabCompleteEvent
@@ -80,7 +80,7 @@ index d0ab87d0..ca054afc 100644
  
      public void a(PacketPlayInSettings packetplayinsettings) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3f683238..00ea72b0 100644
+index 8d0a9e8c..97c32208 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1639,8 +1639,8 @@ public final class CraftServer implements Server {
@@ -139,5 +139,5 @@ index 1e3aae3b..95d13c14 100644
          Waitable<List<String>> waitable = new Waitable<List<String>>() {
              @Override
 -- 
-2.15.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0255-Avoid-NPE-in-PathfinderGoalTempt.patch b/Spigot-Server-Patches/0254-Avoid-NPE-in-PathfinderGoalTempt.patch
similarity index 88%
rename from Spigot-Server-Patches/0255-Avoid-NPE-in-PathfinderGoalTempt.patch
rename to Spigot-Server-Patches/0254-Avoid-NPE-in-PathfinderGoalTempt.patch
index 6dc14cc708..68bc987f09 100644
--- a/Spigot-Server-Patches/0255-Avoid-NPE-in-PathfinderGoalTempt.patch
+++ b/Spigot-Server-Patches/0254-Avoid-NPE-in-PathfinderGoalTempt.patch
@@ -1,11 +1,11 @@
-From 80c9f067330c184f3d1c61ae86a06f6418fe5383 Mon Sep 17 00:00:00 2001
+From f012ee2f9f2fae1549c1113bddbc7bd7365667e9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 29 Nov 2017 22:18:54 -0500
 Subject: [PATCH] Avoid NPE in PathfinderGoalTempt
 
 
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalTempt.java b/src/main/java/net/minecraft/server/PathfinderGoalTempt.java
-index 188825d19..8004f3a3f 100644
+index 188825d1..8004f3a3 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalTempt.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalTempt.java
 @@ -54,7 +54,7 @@ public class PathfinderGoalTempt extends PathfinderGoal {
@@ -18,5 +18,5 @@ index 188825d19..8004f3a3f 100644
          }
      }
 -- 
-2.15.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0256-Don-t-blindly-send-unlit-chunks-when-lighting-update.patch b/Spigot-Server-Patches/0255-Don-t-blindly-send-unlit-chunks-when-lighting-update.patch
similarity index 96%
rename from Spigot-Server-Patches/0256-Don-t-blindly-send-unlit-chunks-when-lighting-update.patch
rename to Spigot-Server-Patches/0255-Don-t-blindly-send-unlit-chunks-when-lighting-update.patch
index 8f27ee3d9c..71c8f467b4 100644
--- a/Spigot-Server-Patches/0256-Don-t-blindly-send-unlit-chunks-when-lighting-update.patch
+++ b/Spigot-Server-Patches/0255-Don-t-blindly-send-unlit-chunks-when-lighting-update.patch
@@ -1,4 +1,4 @@
-From 2153af4f9929cba896d12b8c3561f75ca8f7ea5d Mon Sep 17 00:00:00 2001
+From 892c8655eafdd3adc96aaa568873a300bda0d9a1 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Mon, 18 Dec 2017 07:26:56 +0000
 Subject: [PATCH] Don't blindly send unlit chunks when lighting updates are
@@ -44,5 +44,5 @@ index d1066d82..001fca42 100644
      }
  
 -- 
-2.15.1.windows.2
+2.14.3
 
diff --git a/Spigot-Server-Patches/0257-PlayerPickupExperienceEvent.patch b/Spigot-Server-Patches/0256-PlayerPickupExperienceEvent.patch
similarity index 91%
rename from Spigot-Server-Patches/0257-PlayerPickupExperienceEvent.patch
rename to Spigot-Server-Patches/0256-PlayerPickupExperienceEvent.patch
index 2c9c66e808..3932cf3760 100644
--- a/Spigot-Server-Patches/0257-PlayerPickupExperienceEvent.patch
+++ b/Spigot-Server-Patches/0256-PlayerPickupExperienceEvent.patch
@@ -1,4 +1,4 @@
-From 3c0f08275341119adc37284eaea3f9585f30438c Mon Sep 17 00:00:00 2001
+From 3d6c7721613230236ba6725edf894b786d282748 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 22:02:53 -0500
 Subject: [PATCH] PlayerPickupExperienceEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] PlayerPickupExperienceEvent
 Allows plugins to cancel a player picking up an experience orb
 
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index d567ad4a5..ff5cc74ba 100644
+index d567ad4a..ff5cc74b 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -206,7 +206,7 @@ public class EntityExperienceOrb extends Entity {
@@ -19,5 +19,5 @@ index d567ad4a5..ff5cc74ba 100644
                  entityhuman.receive(this, 1);
                  ItemStack itemstack = EnchantmentManager.b(Enchantments.C, (EntityLiving) entityhuman);
 -- 
-2.15.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0258-ExperienceOrbMergeEvent.patch b/Spigot-Server-Patches/0257-ExperienceOrbMergeEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0258-ExperienceOrbMergeEvent.patch
rename to Spigot-Server-Patches/0257-ExperienceOrbMergeEvent.patch
index bcfb123a29..19bf4ad557 100644
--- a/Spigot-Server-Patches/0258-ExperienceOrbMergeEvent.patch
+++ b/Spigot-Server-Patches/0257-ExperienceOrbMergeEvent.patch
@@ -1,4 +1,4 @@
-From 4756610ec863cc75f8e66891aaf6f0f2257afb23 Mon Sep 17 00:00:00 2001
+From 90be3474fa66dfd953259517ebc0a80f2262b58f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 22:57:26 -0500
 Subject: [PATCH] ExperienceOrbMergeEvent
@@ -8,7 +8,7 @@ Plugins can cancel this if they want to ensure experience orbs do not lose impor
 metadata such as spawn reason, or conditionally move data from source to target.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index eb8a1c43c..ad927cbd5 100644
+index e4502551..9f5388ed 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1153,7 +1153,7 @@ public abstract class World implements IBlockAccess {
@@ -21,5 +21,5 @@ index eb8a1c43c..ad927cbd5 100644
                              // Paper start
                              if (!mergeUnconditionally && xp.value > maxValue) {
 -- 
-2.15.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0259-Ability-to-apply-mending-to-XP-API.patch b/Spigot-Server-Patches/0258-Ability-to-apply-mending-to-XP-API.patch
similarity index 95%
rename from Spigot-Server-Patches/0259-Ability-to-apply-mending-to-XP-API.patch
rename to Spigot-Server-Patches/0258-Ability-to-apply-mending-to-XP-API.patch
index ff0b8c72c3..2d4628f1c8 100644
--- a/Spigot-Server-Patches/0259-Ability-to-apply-mending-to-XP-API.patch
+++ b/Spigot-Server-Patches/0258-Ability-to-apply-mending-to-XP-API.patch
@@ -1,4 +1,4 @@
-From 04cc6a7c33b2a92ed37b41641f39efaf5f91a464 Mon Sep 17 00:00:00 2001
+From 6ca1432bf1363cb8ea126bafd36452e9e0e895c9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 20 Dec 2017 17:36:49 -0500
 Subject: [PATCH] Ability to apply mending to XP API
@@ -10,7 +10,7 @@ of giving the player experience points.
 Both an API To standalone mend, and apply mending logic to .giveExp has been added.
 
 diff --git a/src/main/java/net/minecraft/server/EnchantmentManager.java b/src/main/java/net/minecraft/server/EnchantmentManager.java
-index 98300d0a2..f714dc326 100644
+index 98300d0a..f714dc32 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentManager.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentManager.java
 @@ -226,6 +226,7 @@ public class EnchantmentManager {
@@ -22,7 +22,7 @@ index 98300d0a2..f714dc326 100644
          List list = enchantment.a(entityliving);
  
 diff --git a/src/main/java/net/minecraft/server/Enchantments.java b/src/main/java/net/minecraft/server/Enchantments.java
-index 35e87eb1c..74a6a4f60 100644
+index 35e87eb1..74a6a4f6 100644
 --- a/src/main/java/net/minecraft/server/Enchantments.java
 +++ b/src/main/java/net/minecraft/server/Enchantments.java
 @@ -32,7 +32,7 @@ public class Enchantments {
@@ -35,7 +35,7 @@ index 35e87eb1c..74a6a4f60 100644
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index ff5cc74ba..1c59fd966 100644
+index ff5cc74b..1c59fd96 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -234,10 +234,12 @@ public class EntityExperienceOrb extends Entity {
@@ -52,7 +52,7 @@ index ff5cc74ba..1c59fd966 100644
          return i * 2;
      }
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 52cb34abd..45c8e4b1e 100644
+index 52cb34ab..45c8e4b1 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -28,7 +28,7 @@ public final class ItemStack {
@@ -78,7 +78,7 @@ index 52cb34abd..45c8e4b1e 100644
          return this.damage;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index eeab46333..5ed998a17 100644
+index e5e3f7e8..2c65bb48 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -932,8 +932,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -123,5 +123,5 @@ index eeab46333..5ed998a17 100644
      }
  
 -- 
-2.15.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0260-Configurable-Chunks-Sends-per-Tick-setting.patch b/Spigot-Server-Patches/0259-Configurable-Chunks-Sends-per-Tick-setting.patch
similarity index 89%
rename from Spigot-Server-Patches/0260-Configurable-Chunks-Sends-per-Tick-setting.patch
rename to Spigot-Server-Patches/0259-Configurable-Chunks-Sends-per-Tick-setting.patch
index 123e87508c..41e5188227 100644
--- a/Spigot-Server-Patches/0260-Configurable-Chunks-Sends-per-Tick-setting.patch
+++ b/Spigot-Server-Patches/0259-Configurable-Chunks-Sends-per-Tick-setting.patch
@@ -1,4 +1,4 @@
-From 2c55e0419fd86daf3bd17a4e20c8ee528dfde170 Mon Sep 17 00:00:00 2001
+From 6abc4c0b28596a1eab7def2496b30971cc1dd83c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 1 Jan 2018 15:41:59 -0500
 Subject: [PATCH] Configurable Chunks Sends per Tick setting
@@ -8,10 +8,10 @@ Vanilla already had this limited, make it configurable.
 Limit how much exploration lags the server
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 47d352285..e40ef515e 100644
+index fe6710f6..acf32d51 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -458,4 +458,13 @@ public class PaperWorldConfig {
+@@ -450,4 +450,13 @@ public class PaperWorldConfig {
          expMergeMaxValue = getInt("experience-merge-max-value", -1);
          log("Experience Merge Max Value: " + expMergeMaxValue);
      }
@@ -26,7 +26,7 @@ index 47d352285..e40ef515e 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 4af557321..6ee9f6cfb 100644
+index 4af55732..6ee9f6cf 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -198,7 +198,7 @@ public class PlayerChunkMap {
@@ -39,5 +39,5 @@ index 4af557321..6ee9f6cfb 100644
              Iterator iterator2 = this.g.iterator();
  
 -- 
-2.15.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0261-Configurable-Max-Chunk-Gens-per-Tick.patch b/Spigot-Server-Patches/0260-Configurable-Max-Chunk-Gens-per-Tick.patch
similarity index 94%
rename from Spigot-Server-Patches/0261-Configurable-Max-Chunk-Gens-per-Tick.patch
rename to Spigot-Server-Patches/0260-Configurable-Max-Chunk-Gens-per-Tick.patch
index 303187f6f3..0942c5788a 100644
--- a/Spigot-Server-Patches/0261-Configurable-Max-Chunk-Gens-per-Tick.patch
+++ b/Spigot-Server-Patches/0260-Configurable-Max-Chunk-Gens-per-Tick.patch
@@ -1,4 +1,4 @@
-From db999c30b736d5e5f3317e9b5bd84007a99e1a75 Mon Sep 17 00:00:00 2001
+From bb0edf578480de52c2e73890125be7724ef3088e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 1 Jan 2018 16:10:24 -0500
 Subject: [PATCH] Configurable Max Chunk Gens per Tick
@@ -13,10 +13,10 @@ This should result in no noticeable speed reduction in generation for servers no
 lagging, and let larger servers reduce this value according to their own desires.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e40ef515e..3d2cf635b 100644
+index acf32d51..964bf2d2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -467,4 +467,16 @@ public class PaperWorldConfig {
+@@ -459,4 +459,16 @@ public class PaperWorldConfig {
          }
          log("Max Chunk Sends Per Tick: " + maxChunkSendsPerTick);
      }
@@ -34,7 +34,7 @@ index e40ef515e..3d2cf635b 100644
 +
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index 045adbd3d..20e734bc8 100644
+index 045adbd3..20e734bc 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -27,6 +27,7 @@ public class PlayerChunk {
@@ -54,7 +54,7 @@ index 045adbd3d..20e734bc8 100644
          // CraftBukkit end
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 6ee9f6cfb..99652ae3e 100644
+index 6ee9f6cf..99652ae3 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -166,6 +166,7 @@ public class PlayerChunkMap {
@@ -78,7 +78,7 @@ index 6ee9f6cfb..99652ae3e 100644
                      if (playerchunk1.a(flag)) {
                          iterator1.remove();
 diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
-index 9aaca21a7..f50d55c8e 100644
+index 9aaca21a..f50d55c8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
 @@ -35,4 +35,10 @@ public class ChunkIOExecutor {
@@ -93,7 +93,7 @@ index 9aaca21a7..f50d55c8e 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/AsynchronousExecutor.java b/src/main/java/org/bukkit/craftbukkit/util/AsynchronousExecutor.java
-index 193c3621c..cf1258c55 100644
+index 193c3621..cf1258c5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/AsynchronousExecutor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/AsynchronousExecutor.java
 @@ -351,4 +351,10 @@ public final class AsynchronousExecutor<P, T, C, E extends Throwable> {
@@ -108,5 +108,5 @@ index 193c3621c..cf1258c55 100644
 +    // Paper end
  }
 -- 
-2.15.1
+2.14.3
 
diff --git a/work/Bukkit b/work/Bukkit
index 5043fb1d0e..a45afbadf5 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 5043fb1d0ed8a125302719ca31cadd2bb1c5fdb2
+Subproject commit a45afbadf578d9f3e4e8e82b5379ac4e1f98fed6
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 4119224efe..bd308430b5 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 4119224efe1d9d6ea5906014c49059b3c7cea965
+Subproject commit bd308430b5e8fe0499e2c45d6f38f224f6e4e2da
diff --git a/work/Spigot b/work/Spigot
index 109b080674..786281702d 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 109b080674813aa448e58f1f0106f121ec500614
+Subproject commit 786281702d9b4645df49d10f9d4a7a89755eca53