From b742f7a89288f506926b5deb279b25c6cdddd38f Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Mon, 18 Aug 2014 10:43:17 -0500
Subject: [PATCH] Update from upstream SpigotMC Upstream merge (we must go
 deeper) SpigotMC/Spigot@1e7bc383c3886d6c7b66654a0fe582921a08e4e7

---
 Bukkit                                        |  2 +-
 ...-slow-tab-complete-for-some-commands.patch | 15 +----
 CraftBukkit                                   |  2 +-
 ...portation-of-Vehicles-and-Passengers.patch | 38 -------------
 ...emove-OS-X-Special-Chars-from-Signs.patch} |  0
 ...fuscator.patch => 0060-Orebfuscator.patch} |  0
 ....patch => 0061-Optimize-DataWatcher.patch} |  0
 ...ire-PreLogin-Events-in-Offline-Mode.patch} |  0
 ...rt.patch => 0063-BungeeCord-Support.patch} |  0
 ...isabling-Zombie-Villager-Aggression.patch} |  0
 ...onfigurable-Amount-of-Netty-Threads.patch} |  0
 ...ch => 0066-Prevent-Mineshaft-Saving.patch} |  0
 ...-Log-Cause-of-Unexpected-Exceptions.patch} |  0
 ...icle-API.patch => 0068-Particle-API.patch} |  0
 ...> 0069-Fix-Biome-Decoration-Crashes.patch} |  0
 ... => 0070-Save-ticks-lived-to-nbttag.patch} |  0
 ...tch => 0071-More-Efficient-GetCubes.patch} |  0
 ...-Option-to-Nerf-Mobs-from-Spawner-s.patch} |  0
 ...Warn-if-PermGen-may-be-insufficient.patch} |  0
 ...le-Connected-Check-on-setScoreboard.patch} |  0
 ....patch => 0075-Add-Late-Bind-Option.patch} |  0
 ...ow-statistics-to-be-disabled-forced.patch} |  0
 ....patch => 0077-Fix-anvil-collisions.patch} |  0
 ...0078-Fix-ItemStack-Unbreakable-Code.patch} |  0
 ...ry-and-Debug-Crash-Reports-Crashing.patch} |  0
 ... => 0080-Replace-AutoSave-Mechanism.patch} |  0
 ...k-data-values-that-crash-the-client.patch} |  0
 ...anilla-s-direction-tag-on-fireballs.patch} |  0
 ...h => 0083-Support-non-prefixed-URLs.patch} |  0
 ...ng-on-corrupted-map-data-NBT-arrays.patch} |  0
 ...-ZombiePigmen-spawning-in-portal-bl.patch} |  0
 ... => 0086-Highly-Optimized-Tick-Loop.patch} |  0
 ...inks.patch => 0087-Add-Spigot-Links.patch} |  0
 ... 0088-Configurable-Ping-Sample-Size.patch} |  0
 ...=> 0089-Add-Optional-Tick-Shuffling.patch} |  0
 ...Allow-Configuring-Chunks-per-Packet.patch} |  0
 ...Implement-Locale-Getter-for-Players.patch} |  0
 ...patch => 0092-Cap-Entity-Collisions.patch} |  0
 ...ne-meal-not-having-the-correct-data.patch} |  0
 ...atch => 0094-Spam-Filter-Exclusions.patch} |  0
 ...ion-to-Silence-CommandBlock-Console.patch} |  0
 ...support-for-fetching-hidden-players.patch} |  0
 ...llow-Disabling-Creative-Item-Filter.patch} |  0
 ...h => 0098-Cap-Channel-Registrations.patch} |  0
 ...mands-to-be-the-main-version-of-a-c.patch} |  0
 ...the-isDisconnected-method-by-bukkit.patch} |  0
 ...Implement-Silenceable-Lightning-API.patch} |  0
 ...missibleBase-for-all-Command-Blocks.patch} |  0
 ...Prevent-hoppers-from-loading-chunks.patch} |  0
 ...ist.patch => 0104-Guard-Entity-List.patch} |  0
 ...ificationException-while-being-idle.patch} |  0
 ...ncellable-WitherSkull-potion-effect.patch} |  0
 ...iptive-kick-reasons-instead-of-Nope.patch} |  0
 ...y-prefixed-commands-or-commands-tha.patch} |  0
 ...names-to-prevent-client-disconnects.patch} |  0
 ...> 0110-Enable-Improved-Ping-Sending.patch} |  0
 ...ragon-death-and-wither-spawn-sounds.patch} |  0
 ...-client-crashes-server-lists-and-Mo.patch} |  0
 ...tch => 0113-Old-New-Version-Support.patch} |  0
 ...=> 0114-Treat-Bungee-as-Online-Mode.patch} |  0
 ...x-several-occurances-of-missed-diff.patch} |  0
 ...arning.patch => 0116-Update-Warning.patch} |  0
 ...atch => 0117-Add-Conversion-Message.patch} |  0
 ...ent-not-properly-cancelling.-Fixes-B.patch | 57 -------------------
 ...el-fishing-event.-Fixes-BUKKIT-5396.patch} |  0
 ...19-Print-Stack-on-InternalException.patch} |  0
 ...ffline-Player-Data-Once-if-Required.patch} |  0
 ...se-for-Non-Existent-Offline-Players.patch} |  0
 ...Check-for-blank-OfflinePlayer-Names.patch} |  0
 ...ng.patch => 0123-Fix-Player-Banning.patch} |  0
 ....patch => 0124-Fix-ban-expire-dates.patch} |  0
 ...atch => 0125-Correct-Ban-Expiration.patch} |  0
 ...> 0126-Convert-Horses-owner-to-UUID.patch} |  0
 ...team-API-to-allow-arbitrary-strings.patch} |  0
 ... => 0128-Add-Score.isScoreSet-Z-API.patch} |  0
 ...h => 0129-Log-null-TileEntity-Owner.patch} |  0
 ...al-case-invalid-usernames-for-UUIDs.patch} |  0
 ...=> 0131-Convert-player-skulls-async.patch} |  0
 ...sDefError-crash-and-notify-on-crash.patch} |  0
 ....patch => 0133-Check-Skull-canPlace.patch} |  0
 ...4-Don-t-let-trees-replace-any-block.patch} |  0
 ...n-that-could-kill-connections-befor.patch} |  0
 ... => 0136-Configurable-UserCache-cap.patch} |  0
 ...-Implement-PlayerSpawnLocationEvent.patch} |  0
 ... => 0138-Cap-Objective-Score-Length.patch} |  0
 ...ion-input-on-the-main-thread.-Fixes.patch} |  0
 ...ble-save-on-stop-only-for-UserCache.patch} |  0
 ...1-Prevent-Unbounded-IntCache-Growth.patch} |  0
 ...ns-not-moving-invulnerable-entities.patch} |  0
 ...-Add-damager-to-the-unhandled-error.patch} |  0
 ...44-Cross-World-Entity-Teleportation.patch} |  4 +-
 ...block-placement-interaction-packets.patch} |  0
 ...atch => 0146-Better-item-validation.patch} |  0
 ... => 0147-Further-Seed-Customisation.patch} |  0
 ...> 0148-Disable-ResourceLeakDetector.patch} |  0
 ...-Information-to-session.lock-Errors.patch} |  0
 ...ng.patch => 0150-Safer-JSON-Loading.patch} |  0
 ... => 0151-Fix-Slow-Loading-Libraries.patch} |  0
 ...h => 0152-Add-CommandLine-EULA-Flag.patch} |  0
 ...isnamed-function-from-1.7.10-update.patch} |  0
 ...g-table-wiping-meta-when-placing-st.patch} |  0
 ...-ocelots-when-plugins-spawn-ocelots.patch} |  0
 ...revent-a-crash-involving-attributes.patch} |  0
 ...anning.patch => 0157-Fix-IP-banning.patch} |  0
 ...ke-moved-wrongly-limit-configurable.patch} |  0
 ...=> 0159-Fix-Null-Tile-Entity-Worlds.patch} |  0
 ...oved-too-quickly-limit-configurable.patch} |  0
 ... => 0161-Alternative-Hopper-Ticking.patch} |  0
 ...Apply-NBTReadLimiter-to-more-things.patch} |  0
 ...tch => 0163-Allow-Attribute-Capping.patch} |  0
 ...-a-global-cache-for-any-request-on-.patch} |  0
 ...fetch-an-online-UUID-in-online-mode.patch} |  0
 ...modifiers-which-cause-the-attribute.patch} |  0
 ...ed-diff-from-Minecraft-1.3.1-update.patch} |  0
 ..._AIR-detection-when-not-in-creative.patch} |  0
 ...h => 0169-Plug-WorldMap-Memory-Leak.patch} |  0
 ... 0170-Force-Close-Inventory-On-Move.patch} |  0
 ...=> 0171-Fix-Corrupted-Trapped-Chest.patch} |  0
 ...h => 0172-Remove-uneeded-validation.patch} |  0
 ...ch => 0173-Add-Hunger-Config-Values.patch} |  0
 ...> 0174-Make-debug-logging-togglable.patch} |  0
 ...leport-passenger-vehicle-with-player.patch | 14 +----
 122 files changed, 7 insertions(+), 125 deletions(-)
 delete mode 100644 CraftBukkit-Patches/0059-Allow-Teleportation-of-Vehicles-and-Passengers.patch
 rename CraftBukkit-Patches/{0060-Remove-OS-X-Special-Chars-from-Signs.patch => 0059-Remove-OS-X-Special-Chars-from-Signs.patch} (100%)
 rename CraftBukkit-Patches/{0061-Orebfuscator.patch => 0060-Orebfuscator.patch} (100%)
 rename CraftBukkit-Patches/{0062-Optimize-DataWatcher.patch => 0061-Optimize-DataWatcher.patch} (100%)
 rename CraftBukkit-Patches/{0063-Fire-PreLogin-Events-in-Offline-Mode.patch => 0062-Fire-PreLogin-Events-in-Offline-Mode.patch} (100%)
 rename CraftBukkit-Patches/{0064-BungeeCord-Support.patch => 0063-BungeeCord-Support.patch} (100%)
 rename CraftBukkit-Patches/{0065-Allow-Disabling-Zombie-Villager-Aggression.patch => 0064-Allow-Disabling-Zombie-Villager-Aggression.patch} (100%)
 rename CraftBukkit-Patches/{0066-Configurable-Amount-of-Netty-Threads.patch => 0065-Configurable-Amount-of-Netty-Threads.patch} (100%)
 rename CraftBukkit-Patches/{0067-Prevent-Mineshaft-Saving.patch => 0066-Prevent-Mineshaft-Saving.patch} (100%)
 rename CraftBukkit-Patches/{0068-Log-Cause-of-Unexpected-Exceptions.patch => 0067-Log-Cause-of-Unexpected-Exceptions.patch} (100%)
 rename CraftBukkit-Patches/{0069-Particle-API.patch => 0068-Particle-API.patch} (100%)
 rename CraftBukkit-Patches/{0070-Fix-Biome-Decoration-Crashes.patch => 0069-Fix-Biome-Decoration-Crashes.patch} (100%)
 rename CraftBukkit-Patches/{0071-Save-ticks-lived-to-nbttag.patch => 0070-Save-ticks-lived-to-nbttag.patch} (100%)
 rename CraftBukkit-Patches/{0072-More-Efficient-GetCubes.patch => 0071-More-Efficient-GetCubes.patch} (100%)
 rename CraftBukkit-Patches/{0073-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch => 0072-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch} (100%)
 rename CraftBukkit-Patches/{0074-Warn-if-PermGen-may-be-insufficient.patch => 0073-Warn-if-PermGen-may-be-insufficient.patch} (100%)
 rename CraftBukkit-Patches/{0075-Disable-Connected-Check-on-setScoreboard.patch => 0074-Disable-Connected-Check-on-setScoreboard.patch} (100%)
 rename CraftBukkit-Patches/{0076-Add-Late-Bind-Option.patch => 0075-Add-Late-Bind-Option.patch} (100%)
 rename CraftBukkit-Patches/{0077-Allow-statistics-to-be-disabled-forced.patch => 0076-Allow-statistics-to-be-disabled-forced.patch} (100%)
 rename CraftBukkit-Patches/{0078-Fix-anvil-collisions.patch => 0077-Fix-anvil-collisions.patch} (100%)
 rename CraftBukkit-Patches/{0079-Fix-ItemStack-Unbreakable-Code.patch => 0078-Fix-ItemStack-Unbreakable-Code.patch} (100%)
 rename CraftBukkit-Patches/{0080-Try-and-Debug-Crash-Reports-Crashing.patch => 0079-Try-and-Debug-Crash-Reports-Crashing.patch} (100%)
 rename CraftBukkit-Patches/{0081-Replace-AutoSave-Mechanism.patch => 0080-Replace-AutoSave-Mechanism.patch} (100%)
 rename CraftBukkit-Patches/{0082-Block-data-values-that-crash-the-client.patch => 0081-Block-data-values-that-crash-the-client.patch} (100%)
 rename CraftBukkit-Patches/{0083-Support-vanilla-s-direction-tag-on-fireballs.patch => 0082-Support-vanilla-s-direction-tag-on-fireballs.patch} (100%)
 rename CraftBukkit-Patches/{0084-Support-non-prefixed-URLs.patch => 0083-Support-non-prefixed-URLs.patch} (100%)
 rename CraftBukkit-Patches/{0085-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch => 0084-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch} (100%)
 rename CraftBukkit-Patches/{0086-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch => 0085-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch} (100%)
 rename CraftBukkit-Patches/{0087-Highly-Optimized-Tick-Loop.patch => 0086-Highly-Optimized-Tick-Loop.patch} (100%)
 rename CraftBukkit-Patches/{0088-Add-Spigot-Links.patch => 0087-Add-Spigot-Links.patch} (100%)
 rename CraftBukkit-Patches/{0089-Configurable-Ping-Sample-Size.patch => 0088-Configurable-Ping-Sample-Size.patch} (100%)
 rename CraftBukkit-Patches/{0090-Add-Optional-Tick-Shuffling.patch => 0089-Add-Optional-Tick-Shuffling.patch} (100%)
 rename CraftBukkit-Patches/{0091-Allow-Configuring-Chunks-per-Packet.patch => 0090-Allow-Configuring-Chunks-per-Packet.patch} (100%)
 rename CraftBukkit-Patches/{0092-Implement-Locale-Getter-for-Players.patch => 0091-Implement-Locale-Getter-for-Players.patch} (100%)
 rename CraftBukkit-Patches/{0093-Cap-Entity-Collisions.patch => 0092-Cap-Entity-Collisions.patch} (100%)
 rename CraftBukkit-Patches/{0094-Fix-dispensing-bone-meal-not-having-the-correct-data.patch => 0093-Fix-dispensing-bone-meal-not-having-the-correct-data.patch} (100%)
 rename CraftBukkit-Patches/{0095-Spam-Filter-Exclusions.patch => 0094-Spam-Filter-Exclusions.patch} (100%)
 rename CraftBukkit-Patches/{0096-Add-Option-to-Silence-CommandBlock-Console.patch => 0095-Add-Option-to-Silence-CommandBlock-Console.patch} (100%)
 rename CraftBukkit-Patches/{0097-Add-support-for-fetching-hidden-players.patch => 0096-Add-support-for-fetching-hidden-players.patch} (100%)
 rename CraftBukkit-Patches/{0098-Allow-Disabling-Creative-Item-Filter.patch => 0097-Allow-Disabling-Creative-Item-Filter.patch} (100%)
 rename CraftBukkit-Patches/{0099-Cap-Channel-Registrations.patch => 0098-Cap-Channel-Registrations.patch} (100%)
 rename CraftBukkit-Patches/{0100-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch => 0099-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch} (100%)
 rename CraftBukkit-Patches/{0101-Unfinalize-the-isDisconnected-method-by-bukkit.patch => 0100-Unfinalize-the-isDisconnected-method-by-bukkit.patch} (100%)
 rename CraftBukkit-Patches/{0102-Implement-Silenceable-Lightning-API.patch => 0101-Implement-Silenceable-Lightning-API.patch} (100%)
 rename CraftBukkit-Patches/{0103-Use-one-PermissibleBase-for-all-Command-Blocks.patch => 0102-Use-one-PermissibleBase-for-all-Command-Blocks.patch} (100%)
 rename CraftBukkit-Patches/{0104-Prevent-hoppers-from-loading-chunks.patch => 0103-Prevent-hoppers-from-loading-chunks.patch} (100%)
 rename CraftBukkit-Patches/{0105-Guard-Entity-List.patch => 0104-Guard-Entity-List.patch} (100%)
 rename CraftBukkit-Patches/{0106-Fix-ConcurrentModificationException-while-being-idle.patch => 0105-Fix-ConcurrentModificationException-while-being-idle.patch} (100%)
 rename CraftBukkit-Patches/{0107-Cancellable-WitherSkull-potion-effect.patch => 0106-Cancellable-WitherSkull-potion-effect.patch} (100%)
 rename CraftBukkit-Patches/{0108-Descriptive-kick-reasons-instead-of-Nope.patch => 0107-Descriptive-kick-reasons-instead-of-Nope.patch} (100%)
 rename CraftBukkit-Patches/{0109-Check-for-manually-prefixed-commands-or-commands-tha.patch => 0108-Check-for-manually-prefixed-commands-or-commands-tha.patch} (100%)
 rename CraftBukkit-Patches/{0110-Cap-window-names-to-prevent-client-disconnects.patch => 0109-Cap-window-names-to-prevent-client-disconnects.patch} (100%)
 rename CraftBukkit-Patches/{0111-Enable-Improved-Ping-Sending.patch => 0110-Enable-Improved-Ping-Sending.patch} (100%)
 rename CraftBukkit-Patches/{0112-Configurable-dragon-death-and-wither-spawn-sounds.patch => 0111-Configurable-dragon-death-and-wither-spawn-sounds.patch} (100%)
 rename CraftBukkit-Patches/{0113-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch => 0112-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch} (100%)
 rename CraftBukkit-Patches/{0114-Old-New-Version-Support.patch => 0113-Old-New-Version-Support.patch} (100%)
 rename CraftBukkit-Patches/{0115-Treat-Bungee-as-Online-Mode.patch => 0114-Treat-Bungee-as-Online-Mode.patch} (100%)
 rename CraftBukkit-Patches/{0116-Fix-several-occurances-of-missed-diff.patch => 0115-Fix-several-occurances-of-missed-diff.patch} (100%)
 rename CraftBukkit-Patches/{0118-Update-Warning.patch => 0116-Update-Warning.patch} (100%)
 rename CraftBukkit-Patches/{0119-Add-Conversion-Message.patch => 0117-Add-Conversion-Message.patch} (100%)
 delete mode 100644 CraftBukkit-Patches/0117-Fix-PlayerFishEvent-not-properly-cancelling.-Fixes-B.patch
 rename CraftBukkit-Patches/{0120-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch => 0118-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch} (100%)
 rename CraftBukkit-Patches/{0121-Print-Stack-on-InternalException.patch => 0119-Print-Stack-on-InternalException.patch} (100%)
 rename CraftBukkit-Patches/{0122-Use-Offline-Player-Data-Once-if-Required.patch => 0120-Use-Offline-Player-Data-Once-if-Required.patch} (100%)
 rename CraftBukkit-Patches/{0123-Use-Provided-Case-for-Non-Existent-Offline-Players.patch => 0121-Use-Provided-Case-for-Non-Existent-Offline-Players.patch} (100%)
 rename CraftBukkit-Patches/{0124-Check-for-blank-OfflinePlayer-Names.patch => 0122-Check-for-blank-OfflinePlayer-Names.patch} (100%)
 rename CraftBukkit-Patches/{0125-Fix-Player-Banning.patch => 0123-Fix-Player-Banning.patch} (100%)
 rename CraftBukkit-Patches/{0126-Fix-ban-expire-dates.patch => 0124-Fix-ban-expire-dates.patch} (100%)
 rename CraftBukkit-Patches/{0127-Correct-Ban-Expiration.patch => 0125-Correct-Ban-Expiration.patch} (100%)
 rename CraftBukkit-Patches/{0128-Convert-Horses-owner-to-UUID.patch => 0126-Convert-Horses-owner-to-UUID.patch} (100%)
 rename CraftBukkit-Patches/{0129-Expand-team-API-to-allow-arbitrary-strings.patch => 0127-Expand-team-API-to-allow-arbitrary-strings.patch} (100%)
 rename CraftBukkit-Patches/{0130-Add-Score.isScoreSet-Z-API.patch => 0128-Add-Score.isScoreSet-Z-API.patch} (100%)
 rename CraftBukkit-Patches/{0131-Log-null-TileEntity-Owner.patch => 0129-Log-null-TileEntity-Owner.patch} (100%)
 rename CraftBukkit-Patches/{0132-Don-t-special-case-invalid-usernames-for-UUIDs.patch => 0130-Don-t-special-case-invalid-usernames-for-UUIDs.patch} (100%)
 rename CraftBukkit-Patches/{0133-Convert-player-skulls-async.patch => 0131-Convert-player-skulls-async.patch} (100%)
 rename CraftBukkit-Patches/{0134-Prevent-NoClassDefError-crash-and-notify-on-crash.patch => 0132-Prevent-NoClassDefError-crash-and-notify-on-crash.patch} (100%)
 rename CraftBukkit-Patches/{0135-Check-Skull-canPlace.patch => 0133-Check-Skull-canPlace.patch} (100%)
 rename CraftBukkit-Patches/{0136-Don-t-let-trees-replace-any-block.patch => 0134-Don-t-let-trees-replace-any-block.patch} (100%)
 rename CraftBukkit-Patches/{0137-Fix-race-condition-that-could-kill-connections-befor.patch => 0135-Fix-race-condition-that-could-kill-connections-befor.patch} (100%)
 rename CraftBukkit-Patches/{0138-Configurable-UserCache-cap.patch => 0136-Configurable-UserCache-cap.patch} (100%)
 rename CraftBukkit-Patches/{0139-Implement-PlayerSpawnLocationEvent.patch => 0137-Implement-PlayerSpawnLocationEvent.patch} (100%)
 rename CraftBukkit-Patches/{0140-Cap-Objective-Score-Length.patch => 0138-Cap-Objective-Score-Length.patch} (100%)
 rename CraftBukkit-Patches/{0141-Process-conversation-input-on-the-main-thread.-Fixes.patch => 0139-Process-conversation-input-on-the-main-thread.-Fixes.patch} (100%)
 rename CraftBukkit-Patches/{0142-Configurable-save-on-stop-only-for-UserCache.patch => 0140-Configurable-save-on-stop-only-for-UserCache.patch} (100%)
 rename CraftBukkit-Patches/{0143-Prevent-Unbounded-IntCache-Growth.patch => 0141-Prevent-Unbounded-IntCache-Growth.patch} (100%)
 rename CraftBukkit-Patches/{0144-Fix-explosions-not-moving-invulnerable-entities.patch => 0142-Fix-explosions-not-moving-invulnerable-entities.patch} (100%)
 rename CraftBukkit-Patches/{0145-Add-damager-to-the-unhandled-error.patch => 0143-Add-damager-to-the-unhandled-error.patch} (100%)
 rename CraftBukkit-Patches/{0146-Cross-World-Entity-Teleportation.patch => 0144-Cross-World-Entity-Teleportation.patch} (91%)
 rename CraftBukkit-Patches/{0147-Limit-block-placement-interaction-packets.patch => 0145-Limit-block-placement-interaction-packets.patch} (100%)
 rename CraftBukkit-Patches/{0148-Better-item-validation.patch => 0146-Better-item-validation.patch} (100%)
 rename CraftBukkit-Patches/{0149-Further-Seed-Customisation.patch => 0147-Further-Seed-Customisation.patch} (100%)
 rename CraftBukkit-Patches/{0150-Disable-ResourceLeakDetector.patch => 0148-Disable-ResourceLeakDetector.patch} (100%)
 rename CraftBukkit-Patches/{0151-Add-More-Information-to-session.lock-Errors.patch => 0149-Add-More-Information-to-session.lock-Errors.patch} (100%)
 rename CraftBukkit-Patches/{0152-Safer-JSON-Loading.patch => 0150-Safer-JSON-Loading.patch} (100%)
 rename CraftBukkit-Patches/{0153-Fix-Slow-Loading-Libraries.patch => 0151-Fix-Slow-Loading-Libraries.patch} (100%)
 rename CraftBukkit-Patches/{0154-Add-CommandLine-EULA-Flag.patch => 0152-Add-CommandLine-EULA-Flag.patch} (100%)
 rename CraftBukkit-Patches/{0155-Fix-misnamed-function-from-1.7.10-update.patch => 0153-Fix-misnamed-function-from-1.7.10-update.patch} (100%)
 rename CraftBukkit-Patches/{0156-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch => 0154-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch} (100%)
 rename CraftBukkit-Patches/{0157-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch => 0155-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch} (100%)
 rename CraftBukkit-Patches/{0158-Prevent-a-crash-involving-attributes.patch => 0156-Prevent-a-crash-involving-attributes.patch} (100%)
 rename CraftBukkit-Patches/{0159-Fix-IP-banning.patch => 0157-Fix-IP-banning.patch} (100%)
 rename CraftBukkit-Patches/{0160-Make-moved-wrongly-limit-configurable.patch => 0158-Make-moved-wrongly-limit-configurable.patch} (100%)
 rename CraftBukkit-Patches/{0161-Fix-Null-Tile-Entity-Worlds.patch => 0159-Fix-Null-Tile-Entity-Worlds.patch} (100%)
 rename CraftBukkit-Patches/{0162-Make-moved-too-quickly-limit-configurable.patch => 0160-Make-moved-too-quickly-limit-configurable.patch} (100%)
 rename CraftBukkit-Patches/{0163-Alternative-Hopper-Ticking.patch => 0161-Alternative-Hopper-Ticking.patch} (100%)
 rename CraftBukkit-Patches/{0164-Apply-NBTReadLimiter-to-more-things.patch => 0162-Apply-NBTReadLimiter-to-more-things.patch} (100%)
 rename CraftBukkit-Patches/{0165-Allow-Attribute-Capping.patch => 0163-Allow-Attribute-Capping.patch} (100%)
 rename CraftBukkit-Patches/{0166-Add-an-option-for-a-global-cache-for-any-request-on-.patch => 0164-Add-an-option-for-a-global-cache-for-any-request-on-.patch} (100%)
 rename CraftBukkit-Patches/{0167-Only-fetch-an-online-UUID-in-online-mode.patch => 0165-Only-fetch-an-online-UUID-in-online-mode.patch} (100%)
 rename CraftBukkit-Patches/{0168-Filter-attribute-modifiers-which-cause-the-attribute.patch => 0166-Filter-attribute-modifiers-which-cause-the-attribute.patch} (100%)
 rename CraftBukkit-Patches/{0169-Fix-missed-diff-from-Minecraft-1.3.1-update.patch => 0167-Fix-missed-diff-from-Minecraft-1.3.1-update.patch} (100%)
 rename CraftBukkit-Patches/{0170-Fix-LEFT_CLICK_AIR-detection-when-not-in-creative.patch => 0168-Fix-LEFT_CLICK_AIR-detection-when-not-in-creative.patch} (100%)
 rename CraftBukkit-Patches/{0171-Plug-WorldMap-Memory-Leak.patch => 0169-Plug-WorldMap-Memory-Leak.patch} (100%)
 rename CraftBukkit-Patches/{0172-Force-Close-Inventory-On-Move.patch => 0170-Force-Close-Inventory-On-Move.patch} (100%)
 rename CraftBukkit-Patches/{0173-Fix-Corrupted-Trapped-Chest.patch => 0171-Fix-Corrupted-Trapped-Chest.patch} (100%)
 rename CraftBukkit-Patches/{0174-Remove-uneeded-validation.patch => 0172-Remove-uneeded-validation.patch} (100%)
 rename CraftBukkit-Patches/{0175-Add-Hunger-Config-Values.patch => 0173-Add-Hunger-Config-Values.patch} (100%)
 rename CraftBukkit-Patches/{0176-Make-debug-logging-togglable.patch => 0174-Make-debug-logging-togglable.patch} (100%)

diff --git a/Bukkit b/Bukkit
index 8d5b4c1e9a..f210234e59 160000
--- a/Bukkit
+++ b/Bukkit
@@ -1 +1 @@
-Subproject commit 8d5b4c1e9acc499377da0d807e7ca2245d5c3bdf
+Subproject commit f210234e59275330f83b994e199c76f6abd41ee7
diff --git a/Bukkit-Patches/0028-Fix-slow-tab-complete-for-some-commands.patch b/Bukkit-Patches/0028-Fix-slow-tab-complete-for-some-commands.patch
index 7bd5b7ff23..e54f313697 100644
--- a/Bukkit-Patches/0028-Fix-slow-tab-complete-for-some-commands.patch
+++ b/Bukkit-Patches/0028-Fix-slow-tab-complete-for-some-commands.patch
@@ -5,19 +5,6 @@ Subject: [PATCH] Fix slow tab complete for some commands.
 
 Use online players instead of offline players, which is very slow.
 
-diff --git a/src/main/java/org/bukkit/command/defaults/DeopCommand.java b/src/main/java/org/bukkit/command/defaults/DeopCommand.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/org/bukkit/command/defaults/DeopCommand.java
-+++ b/src/main/java/org/bukkit/command/defaults/DeopCommand.java
-@@ -0,0 +0,0 @@ public class DeopCommand extends VanillaCommand {
- 
-         if (args.length == 1) {
-             List<String> completions = new ArrayList<String>();
--            for (OfflinePlayer player : Bukkit.getOfflinePlayers()) {
-+            for (OfflinePlayer player : Bukkit.getOnlinePlayers()) { // Spigot - offline players is slow
-                 String playerName = player.getName();
-                 if (player.isOp() && StringUtil.startsWithIgnoreCase(playerName, args[0])) {
-                     completions.add(playerName);
 diff --git a/src/main/java/org/bukkit/command/defaults/WhitelistCommand.java b/src/main/java/org/bukkit/command/defaults/WhitelistCommand.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/command/defaults/WhitelistCommand.java
@@ -27,7 +14,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              if (args[0].equalsIgnoreCase("add")) {
                  List<String> completions = new ArrayList<String>();
 -                for (OfflinePlayer player : Bukkit.getOfflinePlayers()) {
-+                for (OfflinePlayer player : Bukkit.getOnlinePlayers()) { // Spigot - offline players is slow
++                for (OfflinePlayer player : Bukkit.getOnlinePlayers()) { // Spigot - well maybe sometimes you haven't turned the whitelist on just yet.
                      String name = player.getName();
                      if (StringUtil.startsWithIgnoreCase(name, args[1]) && !player.isWhitelisted()) {
                          completions.add(name);
diff --git a/CraftBukkit b/CraftBukkit
index 0b2ed13a5d..07d4558b48 160000
--- a/CraftBukkit
+++ b/CraftBukkit
@@ -1 +1 @@
-Subproject commit 0b2ed13a5d24fd9620f8b03c1bf888e3eccd715e
+Subproject commit 07d4558b48d0717cb7f9e07015c76599b9fe9697
diff --git a/CraftBukkit-Patches/0059-Allow-Teleportation-of-Vehicles-and-Passengers.patch b/CraftBukkit-Patches/0059-Allow-Teleportation-of-Vehicles-and-Passengers.patch
deleted file mode 100644
index cdf89386fc..0000000000
--- a/CraftBukkit-Patches/0059-Allow-Teleportation-of-Vehicles-and-Passengers.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: ItsHarry <info@itsjerryandharry.com>
-Date: Thu, 5 Dec 2013 21:58:11 +0100
-Subject: [PATCH] Allow Teleportation of Vehicles and Passengers
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-             return false;
-         }
- 
--        if (entity.vehicle != null || entity.passenger != null) {
--            return false;
--        }
-+        // Spigot Start
-+        // if (entity.vehicle != null || entity.passenger != null) {
-+        // return false;
-+        // }
-+        // Spigot End
- 
-         // From = Players current Location
-         Location from = this.getLocation();
-@@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-         if (event.isCancelled()) {
-             return false;
-         }
-+        
-+        // Spigot Start
-+        eject();
-+        leaveVehicle();
-+        // Spigot End
- 
-         // Update the From Location
-         from = event.getFrom();
---
\ No newline at end of file
diff --git a/CraftBukkit-Patches/0060-Remove-OS-X-Special-Chars-from-Signs.patch b/CraftBukkit-Patches/0059-Remove-OS-X-Special-Chars-from-Signs.patch
similarity index 100%
rename from CraftBukkit-Patches/0060-Remove-OS-X-Special-Chars-from-Signs.patch
rename to CraftBukkit-Patches/0059-Remove-OS-X-Special-Chars-from-Signs.patch
diff --git a/CraftBukkit-Patches/0061-Orebfuscator.patch b/CraftBukkit-Patches/0060-Orebfuscator.patch
similarity index 100%
rename from CraftBukkit-Patches/0061-Orebfuscator.patch
rename to CraftBukkit-Patches/0060-Orebfuscator.patch
diff --git a/CraftBukkit-Patches/0062-Optimize-DataWatcher.patch b/CraftBukkit-Patches/0061-Optimize-DataWatcher.patch
similarity index 100%
rename from CraftBukkit-Patches/0062-Optimize-DataWatcher.patch
rename to CraftBukkit-Patches/0061-Optimize-DataWatcher.patch
diff --git a/CraftBukkit-Patches/0063-Fire-PreLogin-Events-in-Offline-Mode.patch b/CraftBukkit-Patches/0062-Fire-PreLogin-Events-in-Offline-Mode.patch
similarity index 100%
rename from CraftBukkit-Patches/0063-Fire-PreLogin-Events-in-Offline-Mode.patch
rename to CraftBukkit-Patches/0062-Fire-PreLogin-Events-in-Offline-Mode.patch
diff --git a/CraftBukkit-Patches/0064-BungeeCord-Support.patch b/CraftBukkit-Patches/0063-BungeeCord-Support.patch
similarity index 100%
rename from CraftBukkit-Patches/0064-BungeeCord-Support.patch
rename to CraftBukkit-Patches/0063-BungeeCord-Support.patch
diff --git a/CraftBukkit-Patches/0065-Allow-Disabling-Zombie-Villager-Aggression.patch b/CraftBukkit-Patches/0064-Allow-Disabling-Zombie-Villager-Aggression.patch
similarity index 100%
rename from CraftBukkit-Patches/0065-Allow-Disabling-Zombie-Villager-Aggression.patch
rename to CraftBukkit-Patches/0064-Allow-Disabling-Zombie-Villager-Aggression.patch
diff --git a/CraftBukkit-Patches/0066-Configurable-Amount-of-Netty-Threads.patch b/CraftBukkit-Patches/0065-Configurable-Amount-of-Netty-Threads.patch
similarity index 100%
rename from CraftBukkit-Patches/0066-Configurable-Amount-of-Netty-Threads.patch
rename to CraftBukkit-Patches/0065-Configurable-Amount-of-Netty-Threads.patch
diff --git a/CraftBukkit-Patches/0067-Prevent-Mineshaft-Saving.patch b/CraftBukkit-Patches/0066-Prevent-Mineshaft-Saving.patch
similarity index 100%
rename from CraftBukkit-Patches/0067-Prevent-Mineshaft-Saving.patch
rename to CraftBukkit-Patches/0066-Prevent-Mineshaft-Saving.patch
diff --git a/CraftBukkit-Patches/0068-Log-Cause-of-Unexpected-Exceptions.patch b/CraftBukkit-Patches/0067-Log-Cause-of-Unexpected-Exceptions.patch
similarity index 100%
rename from CraftBukkit-Patches/0068-Log-Cause-of-Unexpected-Exceptions.patch
rename to CraftBukkit-Patches/0067-Log-Cause-of-Unexpected-Exceptions.patch
diff --git a/CraftBukkit-Patches/0069-Particle-API.patch b/CraftBukkit-Patches/0068-Particle-API.patch
similarity index 100%
rename from CraftBukkit-Patches/0069-Particle-API.patch
rename to CraftBukkit-Patches/0068-Particle-API.patch
diff --git a/CraftBukkit-Patches/0070-Fix-Biome-Decoration-Crashes.patch b/CraftBukkit-Patches/0069-Fix-Biome-Decoration-Crashes.patch
similarity index 100%
rename from CraftBukkit-Patches/0070-Fix-Biome-Decoration-Crashes.patch
rename to CraftBukkit-Patches/0069-Fix-Biome-Decoration-Crashes.patch
diff --git a/CraftBukkit-Patches/0071-Save-ticks-lived-to-nbttag.patch b/CraftBukkit-Patches/0070-Save-ticks-lived-to-nbttag.patch
similarity index 100%
rename from CraftBukkit-Patches/0071-Save-ticks-lived-to-nbttag.patch
rename to CraftBukkit-Patches/0070-Save-ticks-lived-to-nbttag.patch
diff --git a/CraftBukkit-Patches/0072-More-Efficient-GetCubes.patch b/CraftBukkit-Patches/0071-More-Efficient-GetCubes.patch
similarity index 100%
rename from CraftBukkit-Patches/0072-More-Efficient-GetCubes.patch
rename to CraftBukkit-Patches/0071-More-Efficient-GetCubes.patch
diff --git a/CraftBukkit-Patches/0073-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch b/CraftBukkit-Patches/0072-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch
similarity index 100%
rename from CraftBukkit-Patches/0073-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch
rename to CraftBukkit-Patches/0072-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch
diff --git a/CraftBukkit-Patches/0074-Warn-if-PermGen-may-be-insufficient.patch b/CraftBukkit-Patches/0073-Warn-if-PermGen-may-be-insufficient.patch
similarity index 100%
rename from CraftBukkit-Patches/0074-Warn-if-PermGen-may-be-insufficient.patch
rename to CraftBukkit-Patches/0073-Warn-if-PermGen-may-be-insufficient.patch
diff --git a/CraftBukkit-Patches/0075-Disable-Connected-Check-on-setScoreboard.patch b/CraftBukkit-Patches/0074-Disable-Connected-Check-on-setScoreboard.patch
similarity index 100%
rename from CraftBukkit-Patches/0075-Disable-Connected-Check-on-setScoreboard.patch
rename to CraftBukkit-Patches/0074-Disable-Connected-Check-on-setScoreboard.patch
diff --git a/CraftBukkit-Patches/0076-Add-Late-Bind-Option.patch b/CraftBukkit-Patches/0075-Add-Late-Bind-Option.patch
similarity index 100%
rename from CraftBukkit-Patches/0076-Add-Late-Bind-Option.patch
rename to CraftBukkit-Patches/0075-Add-Late-Bind-Option.patch
diff --git a/CraftBukkit-Patches/0077-Allow-statistics-to-be-disabled-forced.patch b/CraftBukkit-Patches/0076-Allow-statistics-to-be-disabled-forced.patch
similarity index 100%
rename from CraftBukkit-Patches/0077-Allow-statistics-to-be-disabled-forced.patch
rename to CraftBukkit-Patches/0076-Allow-statistics-to-be-disabled-forced.patch
diff --git a/CraftBukkit-Patches/0078-Fix-anvil-collisions.patch b/CraftBukkit-Patches/0077-Fix-anvil-collisions.patch
similarity index 100%
rename from CraftBukkit-Patches/0078-Fix-anvil-collisions.patch
rename to CraftBukkit-Patches/0077-Fix-anvil-collisions.patch
diff --git a/CraftBukkit-Patches/0079-Fix-ItemStack-Unbreakable-Code.patch b/CraftBukkit-Patches/0078-Fix-ItemStack-Unbreakable-Code.patch
similarity index 100%
rename from CraftBukkit-Patches/0079-Fix-ItemStack-Unbreakable-Code.patch
rename to CraftBukkit-Patches/0078-Fix-ItemStack-Unbreakable-Code.patch
diff --git a/CraftBukkit-Patches/0080-Try-and-Debug-Crash-Reports-Crashing.patch b/CraftBukkit-Patches/0079-Try-and-Debug-Crash-Reports-Crashing.patch
similarity index 100%
rename from CraftBukkit-Patches/0080-Try-and-Debug-Crash-Reports-Crashing.patch
rename to CraftBukkit-Patches/0079-Try-and-Debug-Crash-Reports-Crashing.patch
diff --git a/CraftBukkit-Patches/0081-Replace-AutoSave-Mechanism.patch b/CraftBukkit-Patches/0080-Replace-AutoSave-Mechanism.patch
similarity index 100%
rename from CraftBukkit-Patches/0081-Replace-AutoSave-Mechanism.patch
rename to CraftBukkit-Patches/0080-Replace-AutoSave-Mechanism.patch
diff --git a/CraftBukkit-Patches/0082-Block-data-values-that-crash-the-client.patch b/CraftBukkit-Patches/0081-Block-data-values-that-crash-the-client.patch
similarity index 100%
rename from CraftBukkit-Patches/0082-Block-data-values-that-crash-the-client.patch
rename to CraftBukkit-Patches/0081-Block-data-values-that-crash-the-client.patch
diff --git a/CraftBukkit-Patches/0083-Support-vanilla-s-direction-tag-on-fireballs.patch b/CraftBukkit-Patches/0082-Support-vanilla-s-direction-tag-on-fireballs.patch
similarity index 100%
rename from CraftBukkit-Patches/0083-Support-vanilla-s-direction-tag-on-fireballs.patch
rename to CraftBukkit-Patches/0082-Support-vanilla-s-direction-tag-on-fireballs.patch
diff --git a/CraftBukkit-Patches/0084-Support-non-prefixed-URLs.patch b/CraftBukkit-Patches/0083-Support-non-prefixed-URLs.patch
similarity index 100%
rename from CraftBukkit-Patches/0084-Support-non-prefixed-URLs.patch
rename to CraftBukkit-Patches/0083-Support-non-prefixed-URLs.patch
diff --git a/CraftBukkit-Patches/0085-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch b/CraftBukkit-Patches/0084-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch
similarity index 100%
rename from CraftBukkit-Patches/0085-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch
rename to CraftBukkit-Patches/0084-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch
diff --git a/CraftBukkit-Patches/0086-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch b/CraftBukkit-Patches/0085-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch
similarity index 100%
rename from CraftBukkit-Patches/0086-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch
rename to CraftBukkit-Patches/0085-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch
diff --git a/CraftBukkit-Patches/0087-Highly-Optimized-Tick-Loop.patch b/CraftBukkit-Patches/0086-Highly-Optimized-Tick-Loop.patch
similarity index 100%
rename from CraftBukkit-Patches/0087-Highly-Optimized-Tick-Loop.patch
rename to CraftBukkit-Patches/0086-Highly-Optimized-Tick-Loop.patch
diff --git a/CraftBukkit-Patches/0088-Add-Spigot-Links.patch b/CraftBukkit-Patches/0087-Add-Spigot-Links.patch
similarity index 100%
rename from CraftBukkit-Patches/0088-Add-Spigot-Links.patch
rename to CraftBukkit-Patches/0087-Add-Spigot-Links.patch
diff --git a/CraftBukkit-Patches/0089-Configurable-Ping-Sample-Size.patch b/CraftBukkit-Patches/0088-Configurable-Ping-Sample-Size.patch
similarity index 100%
rename from CraftBukkit-Patches/0089-Configurable-Ping-Sample-Size.patch
rename to CraftBukkit-Patches/0088-Configurable-Ping-Sample-Size.patch
diff --git a/CraftBukkit-Patches/0090-Add-Optional-Tick-Shuffling.patch b/CraftBukkit-Patches/0089-Add-Optional-Tick-Shuffling.patch
similarity index 100%
rename from CraftBukkit-Patches/0090-Add-Optional-Tick-Shuffling.patch
rename to CraftBukkit-Patches/0089-Add-Optional-Tick-Shuffling.patch
diff --git a/CraftBukkit-Patches/0091-Allow-Configuring-Chunks-per-Packet.patch b/CraftBukkit-Patches/0090-Allow-Configuring-Chunks-per-Packet.patch
similarity index 100%
rename from CraftBukkit-Patches/0091-Allow-Configuring-Chunks-per-Packet.patch
rename to CraftBukkit-Patches/0090-Allow-Configuring-Chunks-per-Packet.patch
diff --git a/CraftBukkit-Patches/0092-Implement-Locale-Getter-for-Players.patch b/CraftBukkit-Patches/0091-Implement-Locale-Getter-for-Players.patch
similarity index 100%
rename from CraftBukkit-Patches/0092-Implement-Locale-Getter-for-Players.patch
rename to CraftBukkit-Patches/0091-Implement-Locale-Getter-for-Players.patch
diff --git a/CraftBukkit-Patches/0093-Cap-Entity-Collisions.patch b/CraftBukkit-Patches/0092-Cap-Entity-Collisions.patch
similarity index 100%
rename from CraftBukkit-Patches/0093-Cap-Entity-Collisions.patch
rename to CraftBukkit-Patches/0092-Cap-Entity-Collisions.patch
diff --git a/CraftBukkit-Patches/0094-Fix-dispensing-bone-meal-not-having-the-correct-data.patch b/CraftBukkit-Patches/0093-Fix-dispensing-bone-meal-not-having-the-correct-data.patch
similarity index 100%
rename from CraftBukkit-Patches/0094-Fix-dispensing-bone-meal-not-having-the-correct-data.patch
rename to CraftBukkit-Patches/0093-Fix-dispensing-bone-meal-not-having-the-correct-data.patch
diff --git a/CraftBukkit-Patches/0095-Spam-Filter-Exclusions.patch b/CraftBukkit-Patches/0094-Spam-Filter-Exclusions.patch
similarity index 100%
rename from CraftBukkit-Patches/0095-Spam-Filter-Exclusions.patch
rename to CraftBukkit-Patches/0094-Spam-Filter-Exclusions.patch
diff --git a/CraftBukkit-Patches/0096-Add-Option-to-Silence-CommandBlock-Console.patch b/CraftBukkit-Patches/0095-Add-Option-to-Silence-CommandBlock-Console.patch
similarity index 100%
rename from CraftBukkit-Patches/0096-Add-Option-to-Silence-CommandBlock-Console.patch
rename to CraftBukkit-Patches/0095-Add-Option-to-Silence-CommandBlock-Console.patch
diff --git a/CraftBukkit-Patches/0097-Add-support-for-fetching-hidden-players.patch b/CraftBukkit-Patches/0096-Add-support-for-fetching-hidden-players.patch
similarity index 100%
rename from CraftBukkit-Patches/0097-Add-support-for-fetching-hidden-players.patch
rename to CraftBukkit-Patches/0096-Add-support-for-fetching-hidden-players.patch
diff --git a/CraftBukkit-Patches/0098-Allow-Disabling-Creative-Item-Filter.patch b/CraftBukkit-Patches/0097-Allow-Disabling-Creative-Item-Filter.patch
similarity index 100%
rename from CraftBukkit-Patches/0098-Allow-Disabling-Creative-Item-Filter.patch
rename to CraftBukkit-Patches/0097-Allow-Disabling-Creative-Item-Filter.patch
diff --git a/CraftBukkit-Patches/0099-Cap-Channel-Registrations.patch b/CraftBukkit-Patches/0098-Cap-Channel-Registrations.patch
similarity index 100%
rename from CraftBukkit-Patches/0099-Cap-Channel-Registrations.patch
rename to CraftBukkit-Patches/0098-Cap-Channel-Registrations.patch
diff --git a/CraftBukkit-Patches/0100-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch b/CraftBukkit-Patches/0099-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch
similarity index 100%
rename from CraftBukkit-Patches/0100-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch
rename to CraftBukkit-Patches/0099-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch
diff --git a/CraftBukkit-Patches/0101-Unfinalize-the-isDisconnected-method-by-bukkit.patch b/CraftBukkit-Patches/0100-Unfinalize-the-isDisconnected-method-by-bukkit.patch
similarity index 100%
rename from CraftBukkit-Patches/0101-Unfinalize-the-isDisconnected-method-by-bukkit.patch
rename to CraftBukkit-Patches/0100-Unfinalize-the-isDisconnected-method-by-bukkit.patch
diff --git a/CraftBukkit-Patches/0102-Implement-Silenceable-Lightning-API.patch b/CraftBukkit-Patches/0101-Implement-Silenceable-Lightning-API.patch
similarity index 100%
rename from CraftBukkit-Patches/0102-Implement-Silenceable-Lightning-API.patch
rename to CraftBukkit-Patches/0101-Implement-Silenceable-Lightning-API.patch
diff --git a/CraftBukkit-Patches/0103-Use-one-PermissibleBase-for-all-Command-Blocks.patch b/CraftBukkit-Patches/0102-Use-one-PermissibleBase-for-all-Command-Blocks.patch
similarity index 100%
rename from CraftBukkit-Patches/0103-Use-one-PermissibleBase-for-all-Command-Blocks.patch
rename to CraftBukkit-Patches/0102-Use-one-PermissibleBase-for-all-Command-Blocks.patch
diff --git a/CraftBukkit-Patches/0104-Prevent-hoppers-from-loading-chunks.patch b/CraftBukkit-Patches/0103-Prevent-hoppers-from-loading-chunks.patch
similarity index 100%
rename from CraftBukkit-Patches/0104-Prevent-hoppers-from-loading-chunks.patch
rename to CraftBukkit-Patches/0103-Prevent-hoppers-from-loading-chunks.patch
diff --git a/CraftBukkit-Patches/0105-Guard-Entity-List.patch b/CraftBukkit-Patches/0104-Guard-Entity-List.patch
similarity index 100%
rename from CraftBukkit-Patches/0105-Guard-Entity-List.patch
rename to CraftBukkit-Patches/0104-Guard-Entity-List.patch
diff --git a/CraftBukkit-Patches/0106-Fix-ConcurrentModificationException-while-being-idle.patch b/CraftBukkit-Patches/0105-Fix-ConcurrentModificationException-while-being-idle.patch
similarity index 100%
rename from CraftBukkit-Patches/0106-Fix-ConcurrentModificationException-while-being-idle.patch
rename to CraftBukkit-Patches/0105-Fix-ConcurrentModificationException-while-being-idle.patch
diff --git a/CraftBukkit-Patches/0107-Cancellable-WitherSkull-potion-effect.patch b/CraftBukkit-Patches/0106-Cancellable-WitherSkull-potion-effect.patch
similarity index 100%
rename from CraftBukkit-Patches/0107-Cancellable-WitherSkull-potion-effect.patch
rename to CraftBukkit-Patches/0106-Cancellable-WitherSkull-potion-effect.patch
diff --git a/CraftBukkit-Patches/0108-Descriptive-kick-reasons-instead-of-Nope.patch b/CraftBukkit-Patches/0107-Descriptive-kick-reasons-instead-of-Nope.patch
similarity index 100%
rename from CraftBukkit-Patches/0108-Descriptive-kick-reasons-instead-of-Nope.patch
rename to CraftBukkit-Patches/0107-Descriptive-kick-reasons-instead-of-Nope.patch
diff --git a/CraftBukkit-Patches/0109-Check-for-manually-prefixed-commands-or-commands-tha.patch b/CraftBukkit-Patches/0108-Check-for-manually-prefixed-commands-or-commands-tha.patch
similarity index 100%
rename from CraftBukkit-Patches/0109-Check-for-manually-prefixed-commands-or-commands-tha.patch
rename to CraftBukkit-Patches/0108-Check-for-manually-prefixed-commands-or-commands-tha.patch
diff --git a/CraftBukkit-Patches/0110-Cap-window-names-to-prevent-client-disconnects.patch b/CraftBukkit-Patches/0109-Cap-window-names-to-prevent-client-disconnects.patch
similarity index 100%
rename from CraftBukkit-Patches/0110-Cap-window-names-to-prevent-client-disconnects.patch
rename to CraftBukkit-Patches/0109-Cap-window-names-to-prevent-client-disconnects.patch
diff --git a/CraftBukkit-Patches/0111-Enable-Improved-Ping-Sending.patch b/CraftBukkit-Patches/0110-Enable-Improved-Ping-Sending.patch
similarity index 100%
rename from CraftBukkit-Patches/0111-Enable-Improved-Ping-Sending.patch
rename to CraftBukkit-Patches/0110-Enable-Improved-Ping-Sending.patch
diff --git a/CraftBukkit-Patches/0112-Configurable-dragon-death-and-wither-spawn-sounds.patch b/CraftBukkit-Patches/0111-Configurable-dragon-death-and-wither-spawn-sounds.patch
similarity index 100%
rename from CraftBukkit-Patches/0112-Configurable-dragon-death-and-wither-spawn-sounds.patch
rename to CraftBukkit-Patches/0111-Configurable-dragon-death-and-wither-spawn-sounds.patch
diff --git a/CraftBukkit-Patches/0113-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch b/CraftBukkit-Patches/0112-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch
similarity index 100%
rename from CraftBukkit-Patches/0113-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch
rename to CraftBukkit-Patches/0112-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch
diff --git a/CraftBukkit-Patches/0114-Old-New-Version-Support.patch b/CraftBukkit-Patches/0113-Old-New-Version-Support.patch
similarity index 100%
rename from CraftBukkit-Patches/0114-Old-New-Version-Support.patch
rename to CraftBukkit-Patches/0113-Old-New-Version-Support.patch
diff --git a/CraftBukkit-Patches/0115-Treat-Bungee-as-Online-Mode.patch b/CraftBukkit-Patches/0114-Treat-Bungee-as-Online-Mode.patch
similarity index 100%
rename from CraftBukkit-Patches/0115-Treat-Bungee-as-Online-Mode.patch
rename to CraftBukkit-Patches/0114-Treat-Bungee-as-Online-Mode.patch
diff --git a/CraftBukkit-Patches/0116-Fix-several-occurances-of-missed-diff.patch b/CraftBukkit-Patches/0115-Fix-several-occurances-of-missed-diff.patch
similarity index 100%
rename from CraftBukkit-Patches/0116-Fix-several-occurances-of-missed-diff.patch
rename to CraftBukkit-Patches/0115-Fix-several-occurances-of-missed-diff.patch
diff --git a/CraftBukkit-Patches/0118-Update-Warning.patch b/CraftBukkit-Patches/0116-Update-Warning.patch
similarity index 100%
rename from CraftBukkit-Patches/0118-Update-Warning.patch
rename to CraftBukkit-Patches/0116-Update-Warning.patch
diff --git a/CraftBukkit-Patches/0119-Add-Conversion-Message.patch b/CraftBukkit-Patches/0117-Add-Conversion-Message.patch
similarity index 100%
rename from CraftBukkit-Patches/0119-Add-Conversion-Message.patch
rename to CraftBukkit-Patches/0117-Add-Conversion-Message.patch
diff --git a/CraftBukkit-Patches/0117-Fix-PlayerFishEvent-not-properly-cancelling.-Fixes-B.patch b/CraftBukkit-Patches/0117-Fix-PlayerFishEvent-not-properly-cancelling.-Fixes-B.patch
deleted file mode 100644
index c0b3194e51..0000000000
--- a/CraftBukkit-Patches/0117-Fix-PlayerFishEvent-not-properly-cancelling.-Fixes-B.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: myiume <cursed_kidd@yahoo.com>
-Date: Wed, 19 Feb 2014 15:40:37 +0200
-Subject: [PATCH] Fix PlayerFishEvent not properly cancelling. Fixes
- BUKKIT-5245,BUKKIT-5396
-
-PlayerFishEvent event states are not properly being cancelled,
-the FishingHookEntity being deleted when the event is cancelled,
-thus making the event happen. The event states of CAUGHT_ENTITY,
-CAUGHT_FISH, FAILED_ATTEMPT, IN_GROUND must keep the
-EntityFishingHook alive in order to cancel the event.
-Removed the entity despawn lines when event is cancelled
-and added a cancelled action for FAILED_ATTEMPT state.
-
-diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EntityFishingHook.java
-+++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
-@@ -0,0 +0,0 @@ public class EntityFishingHook extends Entity {
-                 this.world.getServer().getPluginManager().callEvent(playerFishEvent);
- 
-                 if (playerFishEvent.isCancelled()) {
--                    this.die();
--                    this.owner.hookedFish = null;
-                     return 0;
-                 }
-                 // CraftBukkit end
-@@ -0,0 +0,0 @@ public class EntityFishingHook extends Entity {
-                 this.world.getServer().getPluginManager().callEvent(playerFishEvent);
- 
-                 if (playerFishEvent.isCancelled()) {
--                    this.die();
--                    this.owner.hookedFish = null;
-                     return 0;
-                 }
-                 // CraftBukkit end
-@@ -0,0 +0,0 @@ public class EntityFishingHook extends Entity {
-                 this.world.getServer().getPluginManager().callEvent(playerFishEvent);
- 
-                 if (playerFishEvent.isCancelled()) {
--                    this.die();
--                    this.owner.hookedFish = null;
-                     return 0;
-                 }
-                 // CraftBukkit end
-@@ -0,0 +0,0 @@ public class EntityFishingHook extends Entity {
-             if (b0 == 0) {
-                 PlayerFishEvent playerFishEvent = new PlayerFishEvent((Player) this.owner.getBukkitEntity(), null, (Fish) this.getBukkitEntity(), PlayerFishEvent.State.FAILED_ATTEMPT);
-                 this.world.getServer().getPluginManager().callEvent(playerFishEvent);
-+                
-+                if (playerFishEvent.isCancelled()) {
-+                    return 0;
-+                }
-             }
-             // CraftBukkit end
- 
---
\ No newline at end of file
diff --git a/CraftBukkit-Patches/0120-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch b/CraftBukkit-Patches/0118-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch
similarity index 100%
rename from CraftBukkit-Patches/0120-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch
rename to CraftBukkit-Patches/0118-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch
diff --git a/CraftBukkit-Patches/0121-Print-Stack-on-InternalException.patch b/CraftBukkit-Patches/0119-Print-Stack-on-InternalException.patch
similarity index 100%
rename from CraftBukkit-Patches/0121-Print-Stack-on-InternalException.patch
rename to CraftBukkit-Patches/0119-Print-Stack-on-InternalException.patch
diff --git a/CraftBukkit-Patches/0122-Use-Offline-Player-Data-Once-if-Required.patch b/CraftBukkit-Patches/0120-Use-Offline-Player-Data-Once-if-Required.patch
similarity index 100%
rename from CraftBukkit-Patches/0122-Use-Offline-Player-Data-Once-if-Required.patch
rename to CraftBukkit-Patches/0120-Use-Offline-Player-Data-Once-if-Required.patch
diff --git a/CraftBukkit-Patches/0123-Use-Provided-Case-for-Non-Existent-Offline-Players.patch b/CraftBukkit-Patches/0121-Use-Provided-Case-for-Non-Existent-Offline-Players.patch
similarity index 100%
rename from CraftBukkit-Patches/0123-Use-Provided-Case-for-Non-Existent-Offline-Players.patch
rename to CraftBukkit-Patches/0121-Use-Provided-Case-for-Non-Existent-Offline-Players.patch
diff --git a/CraftBukkit-Patches/0124-Check-for-blank-OfflinePlayer-Names.patch b/CraftBukkit-Patches/0122-Check-for-blank-OfflinePlayer-Names.patch
similarity index 100%
rename from CraftBukkit-Patches/0124-Check-for-blank-OfflinePlayer-Names.patch
rename to CraftBukkit-Patches/0122-Check-for-blank-OfflinePlayer-Names.patch
diff --git a/CraftBukkit-Patches/0125-Fix-Player-Banning.patch b/CraftBukkit-Patches/0123-Fix-Player-Banning.patch
similarity index 100%
rename from CraftBukkit-Patches/0125-Fix-Player-Banning.patch
rename to CraftBukkit-Patches/0123-Fix-Player-Banning.patch
diff --git a/CraftBukkit-Patches/0126-Fix-ban-expire-dates.patch b/CraftBukkit-Patches/0124-Fix-ban-expire-dates.patch
similarity index 100%
rename from CraftBukkit-Patches/0126-Fix-ban-expire-dates.patch
rename to CraftBukkit-Patches/0124-Fix-ban-expire-dates.patch
diff --git a/CraftBukkit-Patches/0127-Correct-Ban-Expiration.patch b/CraftBukkit-Patches/0125-Correct-Ban-Expiration.patch
similarity index 100%
rename from CraftBukkit-Patches/0127-Correct-Ban-Expiration.patch
rename to CraftBukkit-Patches/0125-Correct-Ban-Expiration.patch
diff --git a/CraftBukkit-Patches/0128-Convert-Horses-owner-to-UUID.patch b/CraftBukkit-Patches/0126-Convert-Horses-owner-to-UUID.patch
similarity index 100%
rename from CraftBukkit-Patches/0128-Convert-Horses-owner-to-UUID.patch
rename to CraftBukkit-Patches/0126-Convert-Horses-owner-to-UUID.patch
diff --git a/CraftBukkit-Patches/0129-Expand-team-API-to-allow-arbitrary-strings.patch b/CraftBukkit-Patches/0127-Expand-team-API-to-allow-arbitrary-strings.patch
similarity index 100%
rename from CraftBukkit-Patches/0129-Expand-team-API-to-allow-arbitrary-strings.patch
rename to CraftBukkit-Patches/0127-Expand-team-API-to-allow-arbitrary-strings.patch
diff --git a/CraftBukkit-Patches/0130-Add-Score.isScoreSet-Z-API.patch b/CraftBukkit-Patches/0128-Add-Score.isScoreSet-Z-API.patch
similarity index 100%
rename from CraftBukkit-Patches/0130-Add-Score.isScoreSet-Z-API.patch
rename to CraftBukkit-Patches/0128-Add-Score.isScoreSet-Z-API.patch
diff --git a/CraftBukkit-Patches/0131-Log-null-TileEntity-Owner.patch b/CraftBukkit-Patches/0129-Log-null-TileEntity-Owner.patch
similarity index 100%
rename from CraftBukkit-Patches/0131-Log-null-TileEntity-Owner.patch
rename to CraftBukkit-Patches/0129-Log-null-TileEntity-Owner.patch
diff --git a/CraftBukkit-Patches/0132-Don-t-special-case-invalid-usernames-for-UUIDs.patch b/CraftBukkit-Patches/0130-Don-t-special-case-invalid-usernames-for-UUIDs.patch
similarity index 100%
rename from CraftBukkit-Patches/0132-Don-t-special-case-invalid-usernames-for-UUIDs.patch
rename to CraftBukkit-Patches/0130-Don-t-special-case-invalid-usernames-for-UUIDs.patch
diff --git a/CraftBukkit-Patches/0133-Convert-player-skulls-async.patch b/CraftBukkit-Patches/0131-Convert-player-skulls-async.patch
similarity index 100%
rename from CraftBukkit-Patches/0133-Convert-player-skulls-async.patch
rename to CraftBukkit-Patches/0131-Convert-player-skulls-async.patch
diff --git a/CraftBukkit-Patches/0134-Prevent-NoClassDefError-crash-and-notify-on-crash.patch b/CraftBukkit-Patches/0132-Prevent-NoClassDefError-crash-and-notify-on-crash.patch
similarity index 100%
rename from CraftBukkit-Patches/0134-Prevent-NoClassDefError-crash-and-notify-on-crash.patch
rename to CraftBukkit-Patches/0132-Prevent-NoClassDefError-crash-and-notify-on-crash.patch
diff --git a/CraftBukkit-Patches/0135-Check-Skull-canPlace.patch b/CraftBukkit-Patches/0133-Check-Skull-canPlace.patch
similarity index 100%
rename from CraftBukkit-Patches/0135-Check-Skull-canPlace.patch
rename to CraftBukkit-Patches/0133-Check-Skull-canPlace.patch
diff --git a/CraftBukkit-Patches/0136-Don-t-let-trees-replace-any-block.patch b/CraftBukkit-Patches/0134-Don-t-let-trees-replace-any-block.patch
similarity index 100%
rename from CraftBukkit-Patches/0136-Don-t-let-trees-replace-any-block.patch
rename to CraftBukkit-Patches/0134-Don-t-let-trees-replace-any-block.patch
diff --git a/CraftBukkit-Patches/0137-Fix-race-condition-that-could-kill-connections-befor.patch b/CraftBukkit-Patches/0135-Fix-race-condition-that-could-kill-connections-befor.patch
similarity index 100%
rename from CraftBukkit-Patches/0137-Fix-race-condition-that-could-kill-connections-befor.patch
rename to CraftBukkit-Patches/0135-Fix-race-condition-that-could-kill-connections-befor.patch
diff --git a/CraftBukkit-Patches/0138-Configurable-UserCache-cap.patch b/CraftBukkit-Patches/0136-Configurable-UserCache-cap.patch
similarity index 100%
rename from CraftBukkit-Patches/0138-Configurable-UserCache-cap.patch
rename to CraftBukkit-Patches/0136-Configurable-UserCache-cap.patch
diff --git a/CraftBukkit-Patches/0139-Implement-PlayerSpawnLocationEvent.patch b/CraftBukkit-Patches/0137-Implement-PlayerSpawnLocationEvent.patch
similarity index 100%
rename from CraftBukkit-Patches/0139-Implement-PlayerSpawnLocationEvent.patch
rename to CraftBukkit-Patches/0137-Implement-PlayerSpawnLocationEvent.patch
diff --git a/CraftBukkit-Patches/0140-Cap-Objective-Score-Length.patch b/CraftBukkit-Patches/0138-Cap-Objective-Score-Length.patch
similarity index 100%
rename from CraftBukkit-Patches/0140-Cap-Objective-Score-Length.patch
rename to CraftBukkit-Patches/0138-Cap-Objective-Score-Length.patch
diff --git a/CraftBukkit-Patches/0141-Process-conversation-input-on-the-main-thread.-Fixes.patch b/CraftBukkit-Patches/0139-Process-conversation-input-on-the-main-thread.-Fixes.patch
similarity index 100%
rename from CraftBukkit-Patches/0141-Process-conversation-input-on-the-main-thread.-Fixes.patch
rename to CraftBukkit-Patches/0139-Process-conversation-input-on-the-main-thread.-Fixes.patch
diff --git a/CraftBukkit-Patches/0142-Configurable-save-on-stop-only-for-UserCache.patch b/CraftBukkit-Patches/0140-Configurable-save-on-stop-only-for-UserCache.patch
similarity index 100%
rename from CraftBukkit-Patches/0142-Configurable-save-on-stop-only-for-UserCache.patch
rename to CraftBukkit-Patches/0140-Configurable-save-on-stop-only-for-UserCache.patch
diff --git a/CraftBukkit-Patches/0143-Prevent-Unbounded-IntCache-Growth.patch b/CraftBukkit-Patches/0141-Prevent-Unbounded-IntCache-Growth.patch
similarity index 100%
rename from CraftBukkit-Patches/0143-Prevent-Unbounded-IntCache-Growth.patch
rename to CraftBukkit-Patches/0141-Prevent-Unbounded-IntCache-Growth.patch
diff --git a/CraftBukkit-Patches/0144-Fix-explosions-not-moving-invulnerable-entities.patch b/CraftBukkit-Patches/0142-Fix-explosions-not-moving-invulnerable-entities.patch
similarity index 100%
rename from CraftBukkit-Patches/0144-Fix-explosions-not-moving-invulnerable-entities.patch
rename to CraftBukkit-Patches/0142-Fix-explosions-not-moving-invulnerable-entities.patch
diff --git a/CraftBukkit-Patches/0145-Add-damager-to-the-unhandled-error.patch b/CraftBukkit-Patches/0143-Add-damager-to-the-unhandled-error.patch
similarity index 100%
rename from CraftBukkit-Patches/0145-Add-damager-to-the-unhandled-error.patch
rename to CraftBukkit-Patches/0143-Add-damager-to-the-unhandled-error.patch
diff --git a/CraftBukkit-Patches/0146-Cross-World-Entity-Teleportation.patch b/CraftBukkit-Patches/0144-Cross-World-Entity-Teleportation.patch
similarity index 91%
rename from CraftBukkit-Patches/0146-Cross-World-Entity-Teleportation.patch
rename to CraftBukkit-Patches/0144-Cross-World-Entity-Teleportation.patch
index c7a3bb3a9a..160b8cf578 100644
--- a/CraftBukkit-Patches/0146-Cross-World-Entity-Teleportation.patch
+++ b/CraftBukkit-Patches/0144-Cross-World-Entity-Teleportation.patch
@@ -10,8 +10,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -0,0 +0,0 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
-             return false;
-         }
+         // If this entity is riding another entity, we must dismount before teleporting.
+         entity.mount(null);
  
 -        entity.world = ((CraftWorld) location.getWorld()).getHandle();
 +        // Spigot start
diff --git a/CraftBukkit-Patches/0147-Limit-block-placement-interaction-packets.patch b/CraftBukkit-Patches/0145-Limit-block-placement-interaction-packets.patch
similarity index 100%
rename from CraftBukkit-Patches/0147-Limit-block-placement-interaction-packets.patch
rename to CraftBukkit-Patches/0145-Limit-block-placement-interaction-packets.patch
diff --git a/CraftBukkit-Patches/0148-Better-item-validation.patch b/CraftBukkit-Patches/0146-Better-item-validation.patch
similarity index 100%
rename from CraftBukkit-Patches/0148-Better-item-validation.patch
rename to CraftBukkit-Patches/0146-Better-item-validation.patch
diff --git a/CraftBukkit-Patches/0149-Further-Seed-Customisation.patch b/CraftBukkit-Patches/0147-Further-Seed-Customisation.patch
similarity index 100%
rename from CraftBukkit-Patches/0149-Further-Seed-Customisation.patch
rename to CraftBukkit-Patches/0147-Further-Seed-Customisation.patch
diff --git a/CraftBukkit-Patches/0150-Disable-ResourceLeakDetector.patch b/CraftBukkit-Patches/0148-Disable-ResourceLeakDetector.patch
similarity index 100%
rename from CraftBukkit-Patches/0150-Disable-ResourceLeakDetector.patch
rename to CraftBukkit-Patches/0148-Disable-ResourceLeakDetector.patch
diff --git a/CraftBukkit-Patches/0151-Add-More-Information-to-session.lock-Errors.patch b/CraftBukkit-Patches/0149-Add-More-Information-to-session.lock-Errors.patch
similarity index 100%
rename from CraftBukkit-Patches/0151-Add-More-Information-to-session.lock-Errors.patch
rename to CraftBukkit-Patches/0149-Add-More-Information-to-session.lock-Errors.patch
diff --git a/CraftBukkit-Patches/0152-Safer-JSON-Loading.patch b/CraftBukkit-Patches/0150-Safer-JSON-Loading.patch
similarity index 100%
rename from CraftBukkit-Patches/0152-Safer-JSON-Loading.patch
rename to CraftBukkit-Patches/0150-Safer-JSON-Loading.patch
diff --git a/CraftBukkit-Patches/0153-Fix-Slow-Loading-Libraries.patch b/CraftBukkit-Patches/0151-Fix-Slow-Loading-Libraries.patch
similarity index 100%
rename from CraftBukkit-Patches/0153-Fix-Slow-Loading-Libraries.patch
rename to CraftBukkit-Patches/0151-Fix-Slow-Loading-Libraries.patch
diff --git a/CraftBukkit-Patches/0154-Add-CommandLine-EULA-Flag.patch b/CraftBukkit-Patches/0152-Add-CommandLine-EULA-Flag.patch
similarity index 100%
rename from CraftBukkit-Patches/0154-Add-CommandLine-EULA-Flag.patch
rename to CraftBukkit-Patches/0152-Add-CommandLine-EULA-Flag.patch
diff --git a/CraftBukkit-Patches/0155-Fix-misnamed-function-from-1.7.10-update.patch b/CraftBukkit-Patches/0153-Fix-misnamed-function-from-1.7.10-update.patch
similarity index 100%
rename from CraftBukkit-Patches/0155-Fix-misnamed-function-from-1.7.10-update.patch
rename to CraftBukkit-Patches/0153-Fix-misnamed-function-from-1.7.10-update.patch
diff --git a/CraftBukkit-Patches/0156-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch b/CraftBukkit-Patches/0154-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch
similarity index 100%
rename from CraftBukkit-Patches/0156-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch
rename to CraftBukkit-Patches/0154-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch
diff --git a/CraftBukkit-Patches/0157-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch b/CraftBukkit-Patches/0155-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch
similarity index 100%
rename from CraftBukkit-Patches/0157-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch
rename to CraftBukkit-Patches/0155-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch
diff --git a/CraftBukkit-Patches/0158-Prevent-a-crash-involving-attributes.patch b/CraftBukkit-Patches/0156-Prevent-a-crash-involving-attributes.patch
similarity index 100%
rename from CraftBukkit-Patches/0158-Prevent-a-crash-involving-attributes.patch
rename to CraftBukkit-Patches/0156-Prevent-a-crash-involving-attributes.patch
diff --git a/CraftBukkit-Patches/0159-Fix-IP-banning.patch b/CraftBukkit-Patches/0157-Fix-IP-banning.patch
similarity index 100%
rename from CraftBukkit-Patches/0159-Fix-IP-banning.patch
rename to CraftBukkit-Patches/0157-Fix-IP-banning.patch
diff --git a/CraftBukkit-Patches/0160-Make-moved-wrongly-limit-configurable.patch b/CraftBukkit-Patches/0158-Make-moved-wrongly-limit-configurable.patch
similarity index 100%
rename from CraftBukkit-Patches/0160-Make-moved-wrongly-limit-configurable.patch
rename to CraftBukkit-Patches/0158-Make-moved-wrongly-limit-configurable.patch
diff --git a/CraftBukkit-Patches/0161-Fix-Null-Tile-Entity-Worlds.patch b/CraftBukkit-Patches/0159-Fix-Null-Tile-Entity-Worlds.patch
similarity index 100%
rename from CraftBukkit-Patches/0161-Fix-Null-Tile-Entity-Worlds.patch
rename to CraftBukkit-Patches/0159-Fix-Null-Tile-Entity-Worlds.patch
diff --git a/CraftBukkit-Patches/0162-Make-moved-too-quickly-limit-configurable.patch b/CraftBukkit-Patches/0160-Make-moved-too-quickly-limit-configurable.patch
similarity index 100%
rename from CraftBukkit-Patches/0162-Make-moved-too-quickly-limit-configurable.patch
rename to CraftBukkit-Patches/0160-Make-moved-too-quickly-limit-configurable.patch
diff --git a/CraftBukkit-Patches/0163-Alternative-Hopper-Ticking.patch b/CraftBukkit-Patches/0161-Alternative-Hopper-Ticking.patch
similarity index 100%
rename from CraftBukkit-Patches/0163-Alternative-Hopper-Ticking.patch
rename to CraftBukkit-Patches/0161-Alternative-Hopper-Ticking.patch
diff --git a/CraftBukkit-Patches/0164-Apply-NBTReadLimiter-to-more-things.patch b/CraftBukkit-Patches/0162-Apply-NBTReadLimiter-to-more-things.patch
similarity index 100%
rename from CraftBukkit-Patches/0164-Apply-NBTReadLimiter-to-more-things.patch
rename to CraftBukkit-Patches/0162-Apply-NBTReadLimiter-to-more-things.patch
diff --git a/CraftBukkit-Patches/0165-Allow-Attribute-Capping.patch b/CraftBukkit-Patches/0163-Allow-Attribute-Capping.patch
similarity index 100%
rename from CraftBukkit-Patches/0165-Allow-Attribute-Capping.patch
rename to CraftBukkit-Patches/0163-Allow-Attribute-Capping.patch
diff --git a/CraftBukkit-Patches/0166-Add-an-option-for-a-global-cache-for-any-request-on-.patch b/CraftBukkit-Patches/0164-Add-an-option-for-a-global-cache-for-any-request-on-.patch
similarity index 100%
rename from CraftBukkit-Patches/0166-Add-an-option-for-a-global-cache-for-any-request-on-.patch
rename to CraftBukkit-Patches/0164-Add-an-option-for-a-global-cache-for-any-request-on-.patch
diff --git a/CraftBukkit-Patches/0167-Only-fetch-an-online-UUID-in-online-mode.patch b/CraftBukkit-Patches/0165-Only-fetch-an-online-UUID-in-online-mode.patch
similarity index 100%
rename from CraftBukkit-Patches/0167-Only-fetch-an-online-UUID-in-online-mode.patch
rename to CraftBukkit-Patches/0165-Only-fetch-an-online-UUID-in-online-mode.patch
diff --git a/CraftBukkit-Patches/0168-Filter-attribute-modifiers-which-cause-the-attribute.patch b/CraftBukkit-Patches/0166-Filter-attribute-modifiers-which-cause-the-attribute.patch
similarity index 100%
rename from CraftBukkit-Patches/0168-Filter-attribute-modifiers-which-cause-the-attribute.patch
rename to CraftBukkit-Patches/0166-Filter-attribute-modifiers-which-cause-the-attribute.patch
diff --git a/CraftBukkit-Patches/0169-Fix-missed-diff-from-Minecraft-1.3.1-update.patch b/CraftBukkit-Patches/0167-Fix-missed-diff-from-Minecraft-1.3.1-update.patch
similarity index 100%
rename from CraftBukkit-Patches/0169-Fix-missed-diff-from-Minecraft-1.3.1-update.patch
rename to CraftBukkit-Patches/0167-Fix-missed-diff-from-Minecraft-1.3.1-update.patch
diff --git a/CraftBukkit-Patches/0170-Fix-LEFT_CLICK_AIR-detection-when-not-in-creative.patch b/CraftBukkit-Patches/0168-Fix-LEFT_CLICK_AIR-detection-when-not-in-creative.patch
similarity index 100%
rename from CraftBukkit-Patches/0170-Fix-LEFT_CLICK_AIR-detection-when-not-in-creative.patch
rename to CraftBukkit-Patches/0168-Fix-LEFT_CLICK_AIR-detection-when-not-in-creative.patch
diff --git a/CraftBukkit-Patches/0171-Plug-WorldMap-Memory-Leak.patch b/CraftBukkit-Patches/0169-Plug-WorldMap-Memory-Leak.patch
similarity index 100%
rename from CraftBukkit-Patches/0171-Plug-WorldMap-Memory-Leak.patch
rename to CraftBukkit-Patches/0169-Plug-WorldMap-Memory-Leak.patch
diff --git a/CraftBukkit-Patches/0172-Force-Close-Inventory-On-Move.patch b/CraftBukkit-Patches/0170-Force-Close-Inventory-On-Move.patch
similarity index 100%
rename from CraftBukkit-Patches/0172-Force-Close-Inventory-On-Move.patch
rename to CraftBukkit-Patches/0170-Force-Close-Inventory-On-Move.patch
diff --git a/CraftBukkit-Patches/0173-Fix-Corrupted-Trapped-Chest.patch b/CraftBukkit-Patches/0171-Fix-Corrupted-Trapped-Chest.patch
similarity index 100%
rename from CraftBukkit-Patches/0173-Fix-Corrupted-Trapped-Chest.patch
rename to CraftBukkit-Patches/0171-Fix-Corrupted-Trapped-Chest.patch
diff --git a/CraftBukkit-Patches/0174-Remove-uneeded-validation.patch b/CraftBukkit-Patches/0172-Remove-uneeded-validation.patch
similarity index 100%
rename from CraftBukkit-Patches/0174-Remove-uneeded-validation.patch
rename to CraftBukkit-Patches/0172-Remove-uneeded-validation.patch
diff --git a/CraftBukkit-Patches/0175-Add-Hunger-Config-Values.patch b/CraftBukkit-Patches/0173-Add-Hunger-Config-Values.patch
similarity index 100%
rename from CraftBukkit-Patches/0175-Add-Hunger-Config-Values.patch
rename to CraftBukkit-Patches/0173-Add-Hunger-Config-Values.patch
diff --git a/CraftBukkit-Patches/0176-Make-debug-logging-togglable.patch b/CraftBukkit-Patches/0174-Make-debug-logging-togglable.patch
similarity index 100%
rename from CraftBukkit-Patches/0176-Make-debug-logging-togglable.patch
rename to CraftBukkit-Patches/0174-Make-debug-logging-togglable.patch
diff --git a/Spigot-Server-Patches/Teleport-passenger-vehicle-with-player.patch b/Spigot-Server-Patches/Teleport-passenger-vehicle-with-player.patch
index 1f57ece98d..2cddb14905 100644
--- a/Spigot-Server-Patches/Teleport-passenger-vehicle-with-player.patch
+++ b/Spigot-Server-Patches/Teleport-passenger-vehicle-with-player.patch
@@ -47,18 +47,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-         if (event.isCancelled()) {
-             return false;
-         }
--        
-+
-+        // PaperSpigot start
-         // Spigot Start
--        eject();
--        leaveVehicle();
-+        //eject();
-+        //leaveVehicle();
-         // Spigot End
+         // If this player is riding another entity, we must dismount before teleporting.
+         entity.mount(null);
  
 +        // PaperSpigot start
 +        Entity vehicle = entity.vehicle;