From e46e6c46a1075f916a3b8fbc0ff19f708cc0b3a3 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 22 Jun 2014 19:25:10 +1000
Subject: [PATCH] Upstream merge, lots of conflicts

---
 Bukkit                                        |  2 +-
 ...cation-on-some-player-lookup-methods.patch | 20 ++++--
 CraftBukkit                                   |  2 +-
 .../0005-Spigot-Configuration.patch           |  6 +-
 .../0006-Better-Chunk-Tick-Selection.patch    | 18 ++---
 .../0009-Merge-tweaks-and-configuration.patch |  6 +-
 .../0011-Async-Operation-Catching.patch       | 14 ++--
 .../0014-Improved-Timings-System.patch        | 48 +++++++-------
 ...b-Spawning-Relative-to-View-Distance.patch | 12 ++--
 .../0016-Handle-Null-Tile-Entities.patch      | 12 ++--
 .../0017-Entity-Activation-Range.patch        | 14 ++--
 ...Disabling-of-Random-Lighting-Updates.patch | 10 +--
 .../0037-Properly-Close-Inventories.patch     |  8 +--
 .../0042-Entity-ticking-chunk-caching.patch   | 66 -------------------
 ... 0042-Plug-World-Unload-Memory-Leak.patch} |  2 +-
 ....patch => 0043-Player-Collision-API.patch} |  2 +-
 ...y-Disable-Snooper-When-Not-Required.patch} |  2 +-
 ...d-Getter-for-Entity-Invulnerability.patch} |  2 +-
 ...ch => 0046-Cap-Minimum-Player-Speed.patch} |  4 +-
 ...and-Health-for-PlayerConsumeItemEve.patch} |  2 +-
 ...BlockEvent-for-Fire-Arrows-hitting-.patch} |  2 +-
 ...Disabling-of-1.6.3-Structure-Saving.patch} |  2 +-
 ...ate.patch => 0050-Item-Despawn-Rate.patch} |  2 +-
 ...051-Don-t-Special-Case-X-Move-Value.patch} |  4 +-
 ...patch => 0052-Implement-respawn-API.patch} |  4 +-
 ...-BrewingStands-Removing-NBT-Potions.patch} |  2 +-
 ...te.patch => 0054-Arrow-Despawn-Rate.patch} |  2 +-
 ...h => 0055-Fix-packed-ice-generation.patch} |  2 +-
 ...hread.patch => 0056-Watchdog-Thread.patch} |  2 +-
 ...ch => 0057-Clear-Flower-Pot-on-Drop.patch} |  2 +-
 ...chunks-not-being-sent-to-the-client.patch} |  6 +-
 ...patch => 0059-Fix-Broken-Async-Chat.patch} |  2 +-
 ...ortation-of-Vehicles-and-Passengers.patch} |  4 +-
 ...emove-OS-X-Special-Chars-from-Signs.patch} |  4 +-
 ...fuscator.patch => 0062-Orebfuscator.patch} |  8 +--
 ....patch => 0063-Optimize-DataWatcher.patch} |  2 +-
 ...ire-PreLogin-Events-in-Offline-Mode.patch} |  2 +-
 ...rt.patch => 0065-BungeeCord-Support.patch} |  4 +-
 ...isabling-Zombie-Villager-Aggression.patch} |  4 +-
 ...onfigurable-Amount-of-Netty-Threads.patch} |  2 +-
 ...ch => 0068-Prevent-Mineshaft-Saving.patch} |  2 +-
 ...-Log-Cause-of-Unexpected-Exceptions.patch} |  2 +-
 ...icle-API.patch => 0070-Particle-API.patch} |  4 +-
 ...> 0071-Fix-Biome-Decoration-Crashes.patch} |  2 +-
 ... => 0072-Save-ticks-lived-to-nbttag.patch} |  4 +-
 ...tch => 0073-More-Efficient-GetCubes.patch} |  6 +-
 ...-Option-to-Nerf-Mobs-from-Spawner-s.patch} |  2 +-
 ...Warn-if-PermGen-may-be-insufficient.patch} |  2 +-
 ...le-Connected-Check-on-setScoreboard.patch} |  4 +-
 ....patch => 0077-Add-Late-Bind-Option.patch} |  2 +-
 ...ow-statistics-to-be-disabled-forced.patch} |  2 +-
 ....patch => 0079-Fix-anvil-collisions.patch} |  2 +-
 ...0080-Fix-ItemStack-Unbreakable-Code.patch} |  2 +-
 ...ry-and-Debug-Crash-Reports-Crashing.patch} |  2 +-
 ... => 0082-Replace-AutoSave-Mechanism.patch} |  2 +-
 ...k-data-values-that-crash-the-client.patch} | 12 ++--
 ...anilla-s-direction-tag-on-fireballs.patch} |  2 +-
 ...h => 0085-Support-non-prefixed-URLs.patch} |  2 +-
 ...ng-on-corrupted-map-data-NBT-arrays.patch} |  2 +-
 ...-ZombiePigmen-spawning-in-portal-bl.patch} |  2 +-
 ... => 0088-Highly-Optimized-Tick-Loop.patch} |  4 +-
 ...inks.patch => 0089-Add-Spigot-Links.patch} |  2 +-
 ... 0090-Configurable-Ping-Sample-Size.patch} |  4 +-
 ...=> 0091-Add-Optional-Tick-Shuffling.patch} |  4 +-
 ...Allow-Configuring-Chunks-per-Packet.patch} |  2 +-
 ...Implement-Locale-Getter-for-Players.patch} |  4 +-
 ...patch => 0094-Cap-Entity-Collisions.patch} |  2 +-
 ...ne-meal-not-having-the-correct-data.patch} |  2 +-
 ...atch => 0096-Spam-Filter-Exclusions.patch} |  6 +-
 ...ion-to-Silence-CommandBlock-Console.patch} |  4 +-
 ...support-for-fetching-hidden-players.patch} |  4 +-
 ...llow-Disabling-Creative-Item-Filter.patch} |  6 +-
 ...h => 0100-Cap-Channel-Registrations.patch} |  4 +-
 ...mands-to-be-the-main-version-of-a-c.patch} |  2 +-
 ...the-isDisconnected-method-by-bukkit.patch} |  4 +-
 ...Implement-Silenceable-Lightning-API.patch} |  2 +-
 ...missibleBase-for-all-Command-Blocks.patch} |  2 +-
 ...Prevent-hoppers-from-loading-chunks.patch} |  2 +-
 ...ist.patch => 0106-Guard-Entity-List.patch} |  8 +--
 ...ificationException-while-being-idle.patch} |  6 +-
 ...ncellable-WitherSkull-potion-effect.patch} |  2 +-
 ...iptive-kick-reasons-instead-of-Nope.patch} |  6 +-
 ...y-prefixed-commands-or-commands-tha.patch} |  2 +-
 ...names-to-prevent-client-disconnects.patch} |  2 +-
 ...> 0112-Enable-Improved-Ping-Sending.patch} |  2 +-
 ...ragon-death-and-wither-spawn-sounds.patch} |  4 +-
 ...-client-crashes-server-lists-and-Mo.patch} |  2 +-
 ...-getting-ticked-after-being-queued-f.patch | 38 -----------
 ...tch => 0115-Old-New-Version-Support.patch} |  2 +-
 ...=> 0116-Treat-Bungee-as-Online-Mode.patch} |  2 +-
 ...x-several-occurances-of-missed-diff.patch} |  4 +-
 ...nt-not-properly-cancelling.-Fixes-B.patch} |  2 +-
 ...arning.patch => 0119-Update-Warning.patch} |  2 +-
 ...atch => 0120-Add-Conversion-Message.patch} |  2 +-
 ...el-fishing-event.-Fixes-BUKKIT-5396.patch} |  2 +-
 ...22-Print-Stack-on-InternalException.patch} |  2 +-
 ...ffline-Player-Data-Once-if-Required.patch} |  2 +-
 ...se-for-Non-Existent-Offline-Players.patch} |  2 +-
 ...Check-for-blank-OfflinePlayer-Names.patch} |  2 +-
 ...ng.patch => 0126-Fix-Player-Banning.patch} |  2 +-
 ....patch => 0127-Fix-ban-expire-dates.patch} |  2 +-
 ...atch => 0128-Correct-Ban-Expiration.patch} |  2 +-
 ...> 0129-Convert-Horses-owner-to-UUID.patch} |  2 +-
 ...team-API-to-allow-arbitrary-strings.patch} |  2 +-
 ... => 0131-Add-Score.isScoreSet-Z-API.patch} |  2 +-
 ...h => 0132-Log-null-TileEntity-Owner.patch} |  2 +-
 ...al-case-invalid-usernames-for-UUIDs.patch} |  2 +-
 ...=> 0134-Convert-player-skulls-async.patch} |  2 +-
 ...sDefError-crash-and-notify-on-crash.patch} |  6 +-
 ....patch => 0136-Check-Skull-canPlace.patch} |  2 +-
 ...7-Don-t-let-trees-replace-any-block.patch} |  2 +-
 ...n-that-could-kill-connections-befor.patch} |  2 +-
 ... => 0139-Configurable-UserCache-cap.patch} |  4 +-
 ...-Implement-PlayerSpawnLocationEvent.patch} |  2 +-
 ... => 0141-Cap-Objective-Score-Length.patch} |  2 +-
 ...Check-the-right-banlist-for-ip-bans.patch} |  2 +-
 ...ion-input-on-the-main-thread.-Fixes.patch} |  4 +-
 ...ble-save-on-stop-only-for-UserCache.patch} |  4 +-
 ...5-Prevent-Unbounded-IntCache-Growth.patch} |  4 +-
 .../0146-Alternative-Hopper-Ticking.patch     | 19 +++---
 120 files changed, 252 insertions(+), 349 deletions(-)
 delete mode 100644 CraftBukkit-Patches/0042-Entity-ticking-chunk-caching.patch
 rename CraftBukkit-Patches/{0043-Plug-World-Unload-Memory-Leak.patch => 0042-Plug-World-Unload-Memory-Leak.patch} (92%)
 rename CraftBukkit-Patches/{0044-Player-Collision-API.patch => 0043-Player-Collision-API.patch} (98%)
 rename CraftBukkit-Patches/{0045-Fully-Disable-Snooper-When-Not-Required.patch => 0044-Fully-Disable-Snooper-When-Not-Required.patch} (93%)
 rename CraftBukkit-Patches/{0046-Add-Getter-for-Entity-Invulnerability.patch => 0045-Add-Getter-for-Entity-Invulnerability.patch} (92%)
 rename CraftBukkit-Patches/{0047-Cap-Minimum-Player-Speed.patch => 0046-Cap-Minimum-Player-Speed.patch} (92%)
 rename CraftBukkit-Patches/{0048-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch => 0047-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch} (94%)
 rename CraftBukkit-Patches/{0049-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch => 0048-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch} (96%)
 rename CraftBukkit-Patches/{0050-Allow-Disabling-of-1.6.3-Structure-Saving.patch => 0049-Allow-Disabling-of-1.6.3-Structure-Saving.patch} (97%)
 rename CraftBukkit-Patches/{0051-Item-Despawn-Rate.patch => 0050-Item-Despawn-Rate.patch} (96%)
 rename CraftBukkit-Patches/{0052-Don-t-Special-Case-X-Move-Value.patch => 0051-Don-t-Special-Case-X-Move-Value.patch} (95%)
 rename CraftBukkit-Patches/{0053-Implement-respawn-API.patch => 0052-Implement-respawn-API.patch} (90%)
 rename CraftBukkit-Patches/{0054-Fix-BrewingStands-Removing-NBT-Potions.patch => 0053-Fix-BrewingStands-Removing-NBT-Potions.patch} (95%)
 rename CraftBukkit-Patches/{0055-Arrow-Despawn-Rate.patch => 0054-Arrow-Despawn-Rate.patch} (95%)
 rename CraftBukkit-Patches/{0056-Fix-packed-ice-generation.patch => 0055-Fix-packed-ice-generation.patch} (97%)
 rename CraftBukkit-Patches/{0057-Watchdog-Thread.patch => 0056-Watchdog-Thread.patch} (99%)
 rename CraftBukkit-Patches/{0058-Clear-Flower-Pot-on-Drop.patch => 0057-Clear-Flower-Pot-on-Drop.patch} (92%)
 rename CraftBukkit-Patches/{0059-Fix-some-chunks-not-being-sent-to-the-client.patch => 0058-Fix-some-chunks-not-being-sent-to-the-client.patch} (89%)
 rename CraftBukkit-Patches/{0060-Fix-Broken-Async-Chat.patch => 0059-Fix-Broken-Async-Chat.patch} (95%)
 rename CraftBukkit-Patches/{0061-Allow-Teleportation-of-Vehicles-and-Passengers.patch => 0060-Allow-Teleportation-of-Vehicles-and-Passengers.patch} (93%)
 rename CraftBukkit-Patches/{0062-Remove-OS-X-Special-Chars-from-Signs.patch => 0061-Remove-OS-X-Special-Chars-from-Signs.patch} (89%)
 rename CraftBukkit-Patches/{0063-Orebfuscator.patch => 0062-Orebfuscator.patch} (98%)
 rename CraftBukkit-Patches/{0064-Optimize-DataWatcher.patch => 0063-Optimize-DataWatcher.patch} (98%)
 rename CraftBukkit-Patches/{0065-Fire-PreLogin-Events-in-Offline-Mode.patch => 0064-Fire-PreLogin-Events-in-Offline-Mode.patch} (99%)
 rename CraftBukkit-Patches/{0066-BungeeCord-Support.patch => 0065-BungeeCord-Support.patch} (99%)
 rename CraftBukkit-Patches/{0067-Allow-Disabling-Zombie-Villager-Aggression.patch => 0066-Allow-Disabling-Zombie-Villager-Aggression.patch} (96%)
 rename CraftBukkit-Patches/{0068-Configurable-Amount-of-Netty-Threads.patch => 0067-Configurable-Amount-of-Netty-Threads.patch} (97%)
 rename CraftBukkit-Patches/{0069-Prevent-Mineshaft-Saving.patch => 0068-Prevent-Mineshaft-Saving.patch} (93%)
 rename CraftBukkit-Patches/{0070-Log-Cause-of-Unexpected-Exceptions.patch => 0069-Log-Cause-of-Unexpected-Exceptions.patch} (93%)
 rename CraftBukkit-Patches/{0071-Particle-API.patch => 0070-Particle-API.patch} (98%)
 rename CraftBukkit-Patches/{0072-Fix-Biome-Decoration-Crashes.patch => 0071-Fix-Biome-Decoration-Crashes.patch} (98%)
 rename CraftBukkit-Patches/{0073-Save-ticks-lived-to-nbttag.patch => 0072-Save-ticks-lived-to-nbttag.patch} (93%)
 rename CraftBukkit-Patches/{0074-More-Efficient-GetCubes.patch => 0073-More-Efficient-GetCubes.patch} (94%)
 rename CraftBukkit-Patches/{0075-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch => 0074-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch} (98%)
 rename CraftBukkit-Patches/{0076-Warn-if-PermGen-may-be-insufficient.patch => 0075-Warn-if-PermGen-may-be-insufficient.patch} (96%)
 rename CraftBukkit-Patches/{0077-Disable-Connected-Check-on-setScoreboard.patch => 0076-Disable-Connected-Check-on-setScoreboard.patch} (91%)
 rename CraftBukkit-Patches/{0078-Add-Late-Bind-Option.patch => 0077-Add-Late-Bind-Option.patch} (97%)
 rename CraftBukkit-Patches/{0079-Allow-statistics-to-be-disabled-forced.patch => 0078-Allow-statistics-to-be-disabled-forced.patch} (98%)
 rename CraftBukkit-Patches/{0080-Fix-anvil-collisions.patch => 0079-Fix-anvil-collisions.patch} (92%)
 rename CraftBukkit-Patches/{0081-Fix-ItemStack-Unbreakable-Code.patch => 0080-Fix-ItemStack-Unbreakable-Code.patch} (93%)
 rename CraftBukkit-Patches/{0082-Try-and-Debug-Crash-Reports-Crashing.patch => 0081-Try-and-Debug-Crash-Reports-Crashing.patch} (96%)
 rename CraftBukkit-Patches/{0083-Replace-AutoSave-Mechanism.patch => 0082-Replace-AutoSave-Mechanism.patch} (96%)
 rename CraftBukkit-Patches/{0084-Block-data-values-that-crash-the-client.patch => 0083-Block-data-values-that-crash-the-client.patch} (88%)
 rename CraftBukkit-Patches/{0085-Support-vanilla-s-direction-tag-on-fireballs.patch => 0084-Support-vanilla-s-direction-tag-on-fireballs.patch} (96%)
 rename CraftBukkit-Patches/{0086-Support-non-prefixed-URLs.patch => 0085-Support-non-prefixed-URLs.patch} (97%)
 rename CraftBukkit-Patches/{0087-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch => 0086-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch} (95%)
 rename CraftBukkit-Patches/{0088-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch => 0087-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch} (96%)
 rename CraftBukkit-Patches/{0089-Highly-Optimized-Tick-Loop.patch => 0088-Highly-Optimized-Tick-Loop.patch} (98%)
 rename CraftBukkit-Patches/{0090-Add-Spigot-Links.patch => 0089-Add-Spigot-Links.patch} (98%)
 rename CraftBukkit-Patches/{0091-Configurable-Ping-Sample-Size.patch => 0090-Configurable-Ping-Sample-Size.patch} (95%)
 rename CraftBukkit-Patches/{0092-Add-Optional-Tick-Shuffling.patch => 0091-Add-Optional-Tick-Shuffling.patch} (94%)
 rename CraftBukkit-Patches/{0093-Allow-Configuring-Chunks-per-Packet.patch => 0092-Allow-Configuring-Chunks-per-Packet.patch} (96%)
 rename CraftBukkit-Patches/{0094-Implement-Locale-Getter-for-Players.patch => 0093-Implement-Locale-Getter-for-Players.patch} (94%)
 rename CraftBukkit-Patches/{0095-Cap-Entity-Collisions.patch => 0094-Cap-Entity-Collisions.patch} (97%)
 rename CraftBukkit-Patches/{0096-Fix-dispensing-bone-meal-not-having-the-correct-data.patch => 0095-Fix-dispensing-bone-meal-not-having-the-correct-data.patch} (94%)
 rename CraftBukkit-Patches/{0097-Spam-Filter-Exclusions.patch => 0096-Spam-Filter-Exclusions.patch} (94%)
 rename CraftBukkit-Patches/{0098-Add-Option-to-Silence-CommandBlock-Console.patch => 0097-Add-Option-to-Silence-CommandBlock-Console.patch} (93%)
 rename CraftBukkit-Patches/{0099-Add-support-for-fetching-hidden-players.patch => 0098-Add-support-for-fetching-hidden-players.patch} (91%)
 rename CraftBukkit-Patches/{0100-Allow-Disabling-Creative-Item-Filter.patch => 0099-Allow-Disabling-Creative-Item-Filter.patch} (93%)
 rename CraftBukkit-Patches/{0101-Cap-Channel-Registrations.patch => 0100-Cap-Channel-Registrations.patch} (89%)
 rename CraftBukkit-Patches/{0102-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch => 0101-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch} (99%)
 rename CraftBukkit-Patches/{0103-Unfinalize-the-isDisconnected-method-by-bukkit.patch => 0102-Unfinalize-the-isDisconnected-method-by-bukkit.patch} (90%)
 rename CraftBukkit-Patches/{0104-Implement-Silenceable-Lightning-API.patch => 0103-Implement-Silenceable-Lightning-API.patch} (98%)
 rename CraftBukkit-Patches/{0105-Use-one-PermissibleBase-for-all-Command-Blocks.patch => 0104-Use-one-PermissibleBase-for-all-Command-Blocks.patch} (94%)
 rename CraftBukkit-Patches/{0106-Prevent-hoppers-from-loading-chunks.patch => 0105-Prevent-hoppers-from-loading-chunks.patch} (93%)
 rename CraftBukkit-Patches/{0107-Guard-Entity-List.patch => 0106-Guard-Entity-List.patch} (92%)
 rename CraftBukkit-Patches/{0108-Fix-ConcurrentModificationException-while-being-idle.patch => 0107-Fix-ConcurrentModificationException-while-being-idle.patch} (91%)
 rename CraftBukkit-Patches/{0109-Cancellable-WitherSkull-potion-effect.patch => 0108-Cancellable-WitherSkull-potion-effect.patch} (96%)
 rename CraftBukkit-Patches/{0110-Descriptive-kick-reasons-instead-of-Nope.patch => 0109-Descriptive-kick-reasons-instead-of-Nope.patch} (95%)
 rename CraftBukkit-Patches/{0111-Check-for-manually-prefixed-commands-or-commands-tha.patch => 0110-Check-for-manually-prefixed-commands-or-commands-tha.patch} (95%)
 rename CraftBukkit-Patches/{0112-Cap-window-names-to-prevent-client-disconnects.patch => 0111-Cap-window-names-to-prevent-client-disconnects.patch} (93%)
 rename CraftBukkit-Patches/{0113-Enable-Improved-Ping-Sending.patch => 0112-Enable-Improved-Ping-Sending.patch} (97%)
 rename CraftBukkit-Patches/{0114-Configurable-dragon-death-and-wither-spawn-sounds.patch => 0113-Configurable-dragon-death-and-wither-spawn-sounds.patch} (97%)
 rename CraftBukkit-Patches/{0116-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch => 0114-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch} (92%)
 delete mode 100644 CraftBukkit-Patches/0115-Fix-TileEntities-getting-ticked-after-being-queued-f.patch
 rename CraftBukkit-Patches/{0117-Old-New-Version-Support.patch => 0115-Old-New-Version-Support.patch} (99%)
 rename CraftBukkit-Patches/{0118-Treat-Bungee-as-Online-Mode.patch => 0116-Treat-Bungee-as-Online-Mode.patch} (94%)
 rename CraftBukkit-Patches/{0119-Fix-several-occurances-of-missed-diff.patch => 0117-Fix-several-occurances-of-missed-diff.patch} (97%)
 rename CraftBukkit-Patches/{0120-Fix-PlayerFishEvent-not-properly-cancelling.-Fixes-B.patch => 0118-Fix-PlayerFishEvent-not-properly-cancelling.-Fixes-B.patch} (97%)
 rename CraftBukkit-Patches/{0121-Update-Warning.patch => 0119-Update-Warning.patch} (97%)
 rename CraftBukkit-Patches/{0122-Add-Conversion-Message.patch => 0120-Add-Conversion-Message.patch} (91%)
 rename CraftBukkit-Patches/{0123-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch => 0121-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch} (94%)
 rename CraftBukkit-Patches/{0124-Print-Stack-on-InternalException.patch => 0122-Print-Stack-on-InternalException.patch} (91%)
 rename CraftBukkit-Patches/{0125-Use-Offline-Player-Data-Once-if-Required.patch => 0123-Use-Offline-Player-Data-Once-if-Required.patch} (96%)
 rename CraftBukkit-Patches/{0126-Use-Provided-Case-for-Non-Existent-Offline-Players.patch => 0124-Use-Provided-Case-for-Non-Existent-Offline-Players.patch} (92%)
 rename CraftBukkit-Patches/{0127-Check-for-blank-OfflinePlayer-Names.patch => 0125-Check-for-blank-OfflinePlayer-Names.patch} (93%)
 rename CraftBukkit-Patches/{0128-Fix-Player-Banning.patch => 0126-Fix-Player-Banning.patch} (96%)
 rename CraftBukkit-Patches/{0129-Fix-ban-expire-dates.patch => 0127-Fix-ban-expire-dates.patch} (92%)
 rename CraftBukkit-Patches/{0130-Correct-Ban-Expiration.patch => 0128-Correct-Ban-Expiration.patch} (93%)
 rename CraftBukkit-Patches/{0131-Convert-Horses-owner-to-UUID.patch => 0129-Convert-Horses-owner-to-UUID.patch} (94%)
 rename CraftBukkit-Patches/{0132-Expand-team-API-to-allow-arbitrary-strings.patch => 0130-Expand-team-API-to-allow-arbitrary-strings.patch} (98%)
 rename CraftBukkit-Patches/{0133-Add-Score.isScoreSet-Z-API.patch => 0131-Add-Score.isScoreSet-Z-API.patch} (96%)
 rename CraftBukkit-Patches/{0134-Log-null-TileEntity-Owner.patch => 0132-Log-null-TileEntity-Owner.patch} (94%)
 rename CraftBukkit-Patches/{0135-Don-t-special-case-invalid-usernames-for-UUIDs.patch => 0133-Don-t-special-case-invalid-usernames-for-UUIDs.patch} (96%)
 rename CraftBukkit-Patches/{0136-Convert-player-skulls-async.patch => 0134-Convert-player-skulls-async.patch} (98%)
 rename CraftBukkit-Patches/{0137-Prevent-NoClassDefError-crash-and-notify-on-crash.patch => 0135-Prevent-NoClassDefError-crash-and-notify-on-crash.patch} (94%)
 rename CraftBukkit-Patches/{0138-Check-Skull-canPlace.patch => 0136-Check-Skull-canPlace.patch} (92%)
 rename CraftBukkit-Patches/{0139-Don-t-let-trees-replace-any-block.patch => 0137-Don-t-let-trees-replace-any-block.patch} (95%)
 rename CraftBukkit-Patches/{0140-Fix-race-condition-that-could-kill-connections-befor.patch => 0138-Fix-race-condition-that-could-kill-connections-befor.patch} (97%)
 rename CraftBukkit-Patches/{0141-Configurable-UserCache-cap.patch => 0139-Configurable-UserCache-cap.patch} (93%)
 rename CraftBukkit-Patches/{0142-Implement-PlayerSpawnLocationEvent.patch => 0140-Implement-PlayerSpawnLocationEvent.patch} (96%)
 rename CraftBukkit-Patches/{0143-Cap-Objective-Score-Length.patch => 0141-Cap-Objective-Score-Length.patch} (94%)
 rename CraftBukkit-Patches/{0144-Check-the-right-banlist-for-ip-bans.patch => 0142-Check-the-right-banlist-for-ip-bans.patch} (94%)
 rename CraftBukkit-Patches/{0145-Process-conversation-input-on-the-main-thread.-Fixes.patch => 0143-Process-conversation-input-on-the-main-thread.-Fixes.patch} (94%)
 rename CraftBukkit-Patches/{0147-Configurable-save-on-stop-only-for-UserCache.patch => 0144-Configurable-save-on-stop-only-for-UserCache.patch} (95%)
 rename CraftBukkit-Patches/{0148-Prevent-Unbounded-IntCache-Growth.patch => 0145-Prevent-Unbounded-IntCache-Growth.patch} (96%)

diff --git a/Bukkit b/Bukkit
index fc7109d..028525f 160000
--- a/Bukkit
+++ b/Bukkit
@@ -1 +1 @@
-Subproject commit fc7109d4d1a867162961f07b711e1d6157ecd3e2
+Subproject commit 028525f8fcb975f8191e3a232b2ed1697e859a09
diff --git a/Bukkit-Patches/0025-Remove-deprecation-on-some-player-lookup-methods.patch b/Bukkit-Patches/0025-Remove-deprecation-on-some-player-lookup-methods.patch
index d259af7..1bf7397 100644
--- a/Bukkit-Patches/0025-Remove-deprecation-on-some-player-lookup-methods.patch
+++ b/Bukkit-Patches/0025-Remove-deprecation-on-some-player-lookup-methods.patch
@@ -1,4 +1,4 @@
-From 41d28d22d8a37fe2c9f24c0decf7cf34d863ac26 Mon Sep 17 00:00:00 2001
+From 6f3e1435bb97f1388c4a9c1b98077c9a9f673137 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 30 Mar 2014 15:58:22 +1100
 Subject: [PATCH] Remove deprecation on some player lookup methods
@@ -6,10 +6,10 @@ Subject: [PATCH] Remove deprecation on some player lookup methods
 Most of these methods still have plenty of use given that only one player with each name can exist at a time. Deprecating these methods renders even basic functionality such as /msg <name> impossible without causing compiler warnings. We will maintain this API and it should be considered safe and appropriate for most use cases.
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 6b9c9f3..7d8736e 100644
+index dafea2e..8b0005e 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -182,7 +182,6 @@ public final class Bukkit {
+@@ -183,7 +183,6 @@ public final class Bukkit {
      /**
       * @see Server#getPlayer(String name)
       */
@@ -17,7 +17,7 @@ index 6b9c9f3..7d8736e 100644
      public static Player getPlayer(String name) {
          return server.getPlayer(name);
      }
-@@ -190,7 +189,6 @@ public final class Bukkit {
+@@ -191,7 +190,6 @@ public final class Bukkit {
      /**
       * @see Server#matchPlayer(String name)
       */
@@ -25,8 +25,16 @@ index 6b9c9f3..7d8736e 100644
      public static List<Player> matchPlayer(String name) {
          return server.matchPlayer(name);
      }
+@@ -433,7 +431,6 @@ public final class Bukkit {
+     /**
+      * @see Server#getPlayerExact(String name)
+      */
+-    @Deprecated
+     public static Player getPlayerExact(String name) {
+         return server.getPlayerExact(name);
+     }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 22dc74a..6b21ea1 100644
+index 3c4d541..fbc8b87 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -268,23 +268,17 @@ public interface Server extends PluginMessageRecipient {
@@ -67,5 +75,5 @@ index 22dc74a..6b21ea1 100644
  
      /**
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit b/CraftBukkit
index a6e0bfd..07d07b0 160000
--- a/CraftBukkit
+++ b/CraftBukkit
@@ -1 +1 @@
-Subproject commit a6e0bfd1982470a64afae7bd2d265b3302f053ac
+Subproject commit 07d07b09f4aeb0147092ff5f892ce4b4e3bed3a9
diff --git a/CraftBukkit-Patches/0005-Spigot-Configuration.patch b/CraftBukkit-Patches/0005-Spigot-Configuration.patch
index e52d666..a51bca8 100644
--- a/CraftBukkit-Patches/0005-Spigot-Configuration.patch
+++ b/CraftBukkit-Patches/0005-Spigot-Configuration.patch
@@ -1,4 +1,4 @@
-From 113ad2d77cebbed4a6dbbcb7cec0e476f494b17b Mon Sep 17 00:00:00 2001
+From 45a5a5488e6357d94cc9f197e876d8d1a86f81bb Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 7 Jul 2013 09:32:53 +1000
 Subject: [PATCH] Spigot Configuration
@@ -34,7 +34,7 @@ index f1caa38..00f9b89 100644
          if (!this.getOnlineMode()) {
              i.warn("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!");
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index bbf61a3..fab5025 100644
+index eb5da2a..c6ba026 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -106,6 +106,7 @@ public abstract class World implements IBlockAccess {
@@ -45,7 +45,7 @@ index bbf61a3..fab5025 100644
  
      public CraftWorld getWorld() {
          return this.world;
-@@ -117,6 +118,7 @@ public abstract class World implements IBlockAccess {
+@@ -121,6 +122,7 @@ public abstract class World implements IBlockAccess {
  
      // Changed signature - added gen and env
      public World(IDataManager idatamanager, String s, WorldSettings worldsettings, WorldProvider worldprovider, MethodProfiler methodprofiler, ChunkGenerator gen, org.bukkit.World.Environment env) {
diff --git a/CraftBukkit-Patches/0006-Better-Chunk-Tick-Selection.patch b/CraftBukkit-Patches/0006-Better-Chunk-Tick-Selection.patch
index 372e77c..7516839 100644
--- a/CraftBukkit-Patches/0006-Better-Chunk-Tick-Selection.patch
+++ b/CraftBukkit-Patches/0006-Better-Chunk-Tick-Selection.patch
@@ -1,11 +1,11 @@
-From 4973ff00be3ca5a6c77b3e8b2877efd627c72df3 Mon Sep 17 00:00:00 2001
+From 622e47b08274e5a09f6a7e0bcf98300fb438062f Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 11 Jun 2013 12:56:02 +1000
 Subject: [PATCH] Better Chunk Tick Selection
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index fab5025..870bddc 100644
+index c6ba026..02600a7 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -62,7 +62,7 @@ public abstract class World implements IBlockAccess {
@@ -48,7 +48,7 @@ index fab5025..870bddc 100644
      public BiomeBase getBiome(int i, int j) {
          if (this.isLoaded(i, 0, j)) {
              Chunk chunk = this.getChunkAtWorldCoords(i, j);
-@@ -124,6 +148,11 @@ public abstract class World implements IBlockAccess {
+@@ -128,6 +152,11 @@ public abstract class World implements IBlockAccess {
          this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
          this.ticksPerMonsterSpawns = this.getServer().getTicksPerMonsterSpawns(); // CraftBukkit
          // CraftBukkit end
@@ -60,7 +60,7 @@ index fab5025..870bddc 100644
  
          this.K = this.random.nextInt(12000);
          this.allowMonsters = true;
-@@ -1990,24 +2019,44 @@ public abstract class World implements IBlockAccess {
+@@ -1986,17 +2015,44 @@ public abstract class World implements IBlockAccess {
          int k;
          int l;
  
@@ -87,18 +87,12 @@ index fab5025..870bddc 100644
  
 -            for (int i1 = -l; i1 <= l; ++i1) {
 -                for (int j1 = -l; j1 <= l; ++j1) {
--                    // CraftBukkit start - Don't tick chunks queued for unload
--                    ChunkProviderServer chunkProviderServer = ((WorldServer) entityhuman.world).chunkProviderServer;
--                    if (chunkProviderServer.unloadQueue.contains(i1 + j, j1 + k)) {
--                        continue;
--                    }
--                    // CraftBukkit end
+-                    this.chunkTickList.add(org.bukkit.craftbukkit.util.LongHash.toLong(i1 + j, j1 + k)); // CraftBukkit
 +            // Spigot start - Always update the chunk the player is on
 +            long key = chunkToKey( j, k );
 +            int existingPlayers = Math.max( 0, chunkTickList.get( key ) ); // filter out -1
 +            chunkTickList.put(key, (short) (existingPlayers + 1));
- 
--                    this.chunkTickList.add(org.bukkit.craftbukkit.util.LongHash.toLong(i1 + j, j1 + k)); // CraftBukkit
++
 +            // Check and see if we update the chunks surrounding the player this tick
 +            for ( int chunk = 0; chunk < chunksPerPlayer; chunk++ )
 +            {
diff --git a/CraftBukkit-Patches/0009-Merge-tweaks-and-configuration.patch b/CraftBukkit-Patches/0009-Merge-tweaks-and-configuration.patch
index dc897bc..099257b 100644
--- a/CraftBukkit-Patches/0009-Merge-tweaks-and-configuration.patch
+++ b/CraftBukkit-Patches/0009-Merge-tweaks-and-configuration.patch
@@ -1,4 +1,4 @@
-From 786430e30804b7dee65a70750df4e95e1b35f546 Mon Sep 17 00:00:00 2001
+From 2f9ed9fae66cee9278ba2ce8fc6a93a578e99243 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Mar 2013 09:46:33 +1100
 Subject: [PATCH] Merge tweaks and configuration
@@ -41,10 +41,10 @@ index 8343ac9..95beb11 100644
              }
          } else {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 93b7a72..61610f6 100644
+index 02600a7..7c18d86 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1007,6 +1007,23 @@ public abstract class World implements IBlockAccess {
+@@ -1010,6 +1010,23 @@ public abstract class World implements IBlockAccess {
              // Not all projectiles extend EntityProjectile, so check for Bukkit interface instead
              event = CraftEventFactory.callProjectileLaunchEvent(entity);
          }
diff --git a/CraftBukkit-Patches/0011-Async-Operation-Catching.patch b/CraftBukkit-Patches/0011-Async-Operation-Catching.patch
index 13888e4..8bd2af9 100644
--- a/CraftBukkit-Patches/0011-Async-Operation-Catching.patch
+++ b/CraftBukkit-Patches/0011-Async-Operation-Catching.patch
@@ -1,4 +1,4 @@
-From 34d6b850d27725d6934a91a92645e7de92370b58 Mon Sep 17 00:00:00 2001
+From 8fec23d1020ed297e0c44f477a6466bdd89222b3 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 25 Mar 2014 16:10:01 +1100
 Subject: [PATCH] Async Operation Catching
@@ -66,10 +66,10 @@ index c148c4d..a2b54a4 100644
              this.trackedPlayers.remove(entityplayer);
              entityplayer.d(this.tracker);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 61610f6..1031066 100644
+index 7c18d86..1fea307 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -976,6 +976,7 @@ public abstract class World implements IBlockAccess {
+@@ -979,6 +979,7 @@ public abstract class World implements IBlockAccess {
      }
  
      public boolean addEntity(Entity entity, SpawnReason spawnReason) { // Changed signature, added SpawnReason
@@ -77,7 +77,7 @@ index 61610f6..1031066 100644
          if (entity == null) return false;
          // CraftBukkit end
  
-@@ -1082,6 +1083,7 @@ public abstract class World implements IBlockAccess {
+@@ -1085,6 +1086,7 @@ public abstract class World implements IBlockAccess {
      }
  
      public void removeEntity(Entity entity) {
@@ -85,7 +85,7 @@ index 61610f6..1031066 100644
          entity.die();
          if (entity instanceof EntityHuman) {
              this.players.remove(entity);
-@@ -2466,6 +2468,7 @@ public abstract class World implements IBlockAccess {
+@@ -2465,6 +2467,7 @@ public abstract class World implements IBlockAccess {
      }
  
      public void a(List list) {
@@ -94,7 +94,7 @@ index 61610f6..1031066 100644
          // this.entityList.addAll(list);
          Entity entity = null;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index c7c6a6f..452f6f3 100644
+index fc3aece..81913ac 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -162,6 +162,7 @@ public class CraftWorld implements World {
@@ -122,7 +122,7 @@ index c7c6a6f..452f6f3 100644
          if (generate) {
              // Use the default variant of loadChunk when generate == true.
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index dea26e0..fd1c137 100644
+index f700f0b..4d2374d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -238,6 +238,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/CraftBukkit-Patches/0014-Improved-Timings-System.patch b/CraftBukkit-Patches/0014-Improved-Timings-System.patch
index bb34ae3..d72cb82 100644
--- a/CraftBukkit-Patches/0014-Improved-Timings-System.patch
+++ b/CraftBukkit-Patches/0014-Improved-Timings-System.patch
@@ -1,4 +1,4 @@
-From 1a8db6be08fe4fb0d33d2f448b4ad333324ba75b Mon Sep 17 00:00:00 2001
+From 240e3a0afa47aa7e53f6f647c000dc5c627d5d95 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 10 Jan 2013 00:18:11 -0500
 Subject: [PATCH] Improved Timings System
@@ -6,10 +6,10 @@ Subject: [PATCH] Improved Timings System
 Tracks nearly every point of minecraft internals and plugin events to give a good quick overview on what is causing TPS loss.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 1b22934..b669d05 100644
+index 8cc2efd..64ae190 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-@@ -133,6 +133,7 @@ public class ChunkProviderServer implements IChunkProvider {
+@@ -137,6 +137,7 @@ public class ChunkProviderServer implements IChunkProvider {
          boolean newChunk = false;
  
          if (chunk == null) {
@@ -17,7 +17,7 @@ index 1b22934..b669d05 100644
              chunk = this.loadChunk(i, j);
              if (chunk == null) {
                  if (this.chunkProvider == null) {
-@@ -168,6 +169,7 @@ public class ChunkProviderServer implements IChunkProvider {
+@@ -187,6 +188,7 @@ public class ChunkProviderServer implements IChunkProvider {
              }
              // CraftBukkit end
              chunk.a(this, this, i, j);
@@ -26,7 +26,7 @@ index 1b22934..b669d05 100644
  
          return chunk;
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 1d0dee0..d817369 100644
+index 04f5bc6..0999562 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -15,6 +15,7 @@ import org.bukkit.entity.Hanging;
@@ -139,7 +139,7 @@ index 17b15f6..21cf068 100644
  
      public boolean getAllowNether() {
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 89ef6fa..253a448 100644
+index ec45c30..92284eb 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -940,6 +940,7 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -191,7 +191,7 @@ index 2a3d647..78e17d7 100644
      private static Map i = new HashMap();
      private static Map j = new HashMap();
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 1031066..6946e31 100644
+index 1fea307..40a3fcf 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -16,6 +16,7 @@ import org.bukkit.Bukkit;
@@ -211,7 +211,7 @@ index 1031066..6946e31 100644
      public CraftWorld getWorld() {
          return this.world;
      }
-@@ -211,6 +214,7 @@ public abstract class World implements IBlockAccess {
+@@ -215,6 +218,7 @@ public abstract class World implements IBlockAccess {
          this.a();
  
          this.getServer().addWorld(this.world); // CraftBukkit
@@ -219,7 +219,7 @@ index 1031066..6946e31 100644
      }
  
      protected abstract IChunkProvider j();
-@@ -1314,6 +1318,7 @@ public abstract class World implements IBlockAccess {
+@@ -1312,6 +1316,7 @@ public abstract class World implements IBlockAccess {
          this.f.clear();
          this.methodProfiler.c("regular");
  
@@ -227,7 +227,7 @@ index 1031066..6946e31 100644
          // CraftBukkit start - Use field for loop variable
          for (this.tickPosition = 0; this.tickPosition < this.entityList.size(); ++this.tickPosition) {
              entity = (Entity) this.entityList.get(this.tickPosition);
-@@ -1337,7 +1342,9 @@ public abstract class World implements IBlockAccess {
+@@ -1327,7 +1332,9 @@ public abstract class World implements IBlockAccess {
              this.methodProfiler.a("tick");
              if (!entity.dead) {
                  try {
@@ -237,7 +237,7 @@ index 1031066..6946e31 100644
                  } catch (Throwable throwable1) {
                      crashreport = CrashReport.a(throwable1, "Ticking entity");
                      crashreportsystemdetails = crashreport.a("Entity being ticked");
-@@ -1362,7 +1369,9 @@ public abstract class World implements IBlockAccess {
+@@ -1352,7 +1359,9 @@ public abstract class World implements IBlockAccess {
              this.methodProfiler.b();
          }
  
@@ -245,9 +245,9 @@ index 1031066..6946e31 100644
          this.methodProfiler.c("blockEntities");
 +        timings.tileEntityTick.startTiming(); // Spigot
          this.M = true;
-         Iterator iterator = this.tileEntityList.iterator();
- 
-@@ -1377,8 +1386,11 @@ public abstract class World implements IBlockAccess {
+         // CraftBukkit start - From below, clean up tile entities before ticking them
+         if (!this.b.isEmpty()) {
+@@ -1368,8 +1377,11 @@ public abstract class World implements IBlockAccess {
  
              if (!tileentity.r() && tileentity.o() && this.isLoaded(tileentity.x, tileentity.y, tileentity.z)) {
                  try {
@@ -259,16 +259,16 @@ index 1031066..6946e31 100644
                      crashreport = CrashReport.a(throwable2, "Ticking block entity");
                      crashreportsystemdetails = crashreport.a("Block entity being ticked");
                      tileentity.a(crashreportsystemdetails);
-@@ -1398,6 +1410,8 @@ public abstract class World implements IBlockAccess {
+@@ -1389,6 +1401,8 @@ public abstract class World implements IBlockAccess {
              }
          }
  
 +        timings.tileEntityTick.stopTiming(); // Spigot
 +        timings.tileEntityPending.startTiming(); // Spigot
          this.M = false;
+         /* CraftBukkit start - Moved up
          if (!this.b.isEmpty()) {
-             this.tileEntityList.removeAll(this.b);
-@@ -1436,6 +1450,7 @@ public abstract class World implements IBlockAccess {
+@@ -1429,6 +1443,7 @@ public abstract class World implements IBlockAccess {
              this.a.clear();
          }
  
@@ -276,15 +276,15 @@ index 1031066..6946e31 100644
          this.methodProfiler.b();
          this.methodProfiler.b();
      }
-@@ -1458,6 +1473,7 @@ public abstract class World implements IBlockAccess {
-         byte b0 = 32;
- 
-         if (!flag || this.b(i - b0, 0, j - b0, i + b0, 0, j + b0)) {
+@@ -1453,6 +1468,7 @@ public abstract class World implements IBlockAccess {
+         // CraftBukkit start - Use neighbor cache instead of looking up
+         Chunk startingChunk = this.getChunkIfLoaded(i >> 4, j >> 4);
+         if (!flag || (startingChunk != null && startingChunk.areNeighborsLoaded(2)) /* this.b(i - b0, 0, j - b0, i + b0, 0, j + b0) */) {
 +            entity.tickTimer.startTiming(); // Spigot
+             // CraftBukkit end
              entity.S = entity.locX;
              entity.T = entity.locY;
-             entity.U = entity.locZ;
-@@ -1519,6 +1535,7 @@ public abstract class World implements IBlockAccess {
+@@ -1515,6 +1531,7 @@ public abstract class World implements IBlockAccess {
                      entity.passenger = null;
                  }
              }
@@ -293,7 +293,7 @@ index 1031066..6946e31 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 3d938d8..2dc3a13 100644
+index e74f777..8cbfa30 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -185,10 +185,13 @@ public class WorldServer extends World {
diff --git a/CraftBukkit-Patches/0015-Fix-Mob-Spawning-Relative-to-View-Distance.patch b/CraftBukkit-Patches/0015-Fix-Mob-Spawning-Relative-to-View-Distance.patch
index 5a66d8d..01444e1 100644
--- a/CraftBukkit-Patches/0015-Fix-Mob-Spawning-Relative-to-View-Distance.patch
+++ b/CraftBukkit-Patches/0015-Fix-Mob-Spawning-Relative-to-View-Distance.patch
@@ -1,11 +1,11 @@
-From e71213a20ac3894089923747de1bf84f672beb31 Mon Sep 17 00:00:00 2001
+From ad6096243ee953cfd0208b1d9aaef93122d95a12 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 17:29:54 +1000
 Subject: [PATCH] Fix Mob Spawning Relative to View Distance
 
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index ade0c35..1ac9804 100644
+index d770e4e..39767d0 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -40,6 +40,7 @@ public class Chunk {
@@ -14,9 +14,9 @@ index ade0c35..1ac9804 100644
      private int x;
 +    protected net.minecraft.util.gnu.trove.map.hash.TObjectIntHashMap<Class> entityCount = new net.minecraft.util.gnu.trove.map.hash.TObjectIntHashMap<Class>(); // Spigot
  
-     public Chunk(World world, int i, int j) {
-         this.sections = new ChunkSection[16];
-@@ -607,6 +608,22 @@ public class Chunk {
+     // CraftBukkit start - Neighbor loaded cache for chunk lighting and entity ticking
+     private int neighbors = 0x1 << 12;
+@@ -635,6 +636,22 @@ public class Chunk {
          entity.ai = k;
          entity.aj = this.locZ;
          this.entitySlices[k].add(entity);
@@ -39,7 +39,7 @@ index ade0c35..1ac9804 100644
      }
  
      public void b(Entity entity) {
-@@ -623,6 +640,22 @@ public class Chunk {
+@@ -651,6 +668,22 @@ public class Chunk {
          }
  
          this.entitySlices[i].remove(entity);
diff --git a/CraftBukkit-Patches/0016-Handle-Null-Tile-Entities.patch b/CraftBukkit-Patches/0016-Handle-Null-Tile-Entities.patch
index f6b7960..c6daafc 100644
--- a/CraftBukkit-Patches/0016-Handle-Null-Tile-Entities.patch
+++ b/CraftBukkit-Patches/0016-Handle-Null-Tile-Entities.patch
@@ -1,14 +1,14 @@
-From d1136b68975bc071ece95a4691de2aac820264e7 Mon Sep 17 00:00:00 2001
+From 12c06cd7b3eb049c7e2a170566a9f72c96f29d17 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 3 Feb 2013 09:20:19 +1100
 Subject: [PATCH] Handle Null Tile Entities
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 6946e31..e0daffb 100644
+index 40a3fcf..3e93cfd 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1377,6 +1377,13 @@ public abstract class World implements IBlockAccess {
+@@ -1374,6 +1374,13 @@ public abstract class World implements IBlockAccess {
  
          while (iterator.hasNext()) {
              TileEntity tileentity = (TileEntity) iterator.next();
@@ -19,9 +19,9 @@ index 6946e31..e0daffb 100644
 +                continue;
 +            }
 +            // Spigot end
-             // CraftBukkit start - Don't tick entities in chunks queued for unload
-             ChunkProviderServer chunkProviderServer = ((WorldServer) this).chunkProviderServer;
-             if (chunkProviderServer.unloadQueue.contains(tileentity.x >> 4, tileentity.z >> 4)) {
+ 
+             if (!tileentity.r() && tileentity.o() && this.isLoaded(tileentity.x, tileentity.y, tileentity.z)) {
+                 try {
 -- 
 1.9.1
 
diff --git a/CraftBukkit-Patches/0017-Entity-Activation-Range.patch b/CraftBukkit-Patches/0017-Entity-Activation-Range.patch
index 518a0fc..1cc72b1 100644
--- a/CraftBukkit-Patches/0017-Entity-Activation-Range.patch
+++ b/CraftBukkit-Patches/0017-Entity-Activation-Range.patch
@@ -1,4 +1,4 @@
-From a49d646e20683324316f385e6fd2d3614f425a48 Mon Sep 17 00:00:00 2001
+From a972387b658808e5a9bdfaf911454fd39dda1300 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 Feb 2013 05:10:21 -0500
 Subject: [PATCH] Entity Activation Range
@@ -155,10 +155,10 @@ index b3bf43a..a180c89 100644
      public EntityLiving(World world) {
          super(world);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index e0daffb..1a2a640 100644
+index 3e93cfd..0cb803e 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1318,6 +1318,7 @@ public abstract class World implements IBlockAccess {
+@@ -1316,6 +1316,7 @@ public abstract class World implements IBlockAccess {
          this.f.clear();
          this.methodProfiler.c("regular");
  
@@ -166,19 +166,21 @@ index e0daffb..1a2a640 100644
          timings.entityTick.startTiming(); // Spigot
          // CraftBukkit start - Use field for loop variable
          for (this.tickPosition = 0; this.tickPosition < this.entityList.size(); ++this.tickPosition) {
-@@ -1479,7 +1480,11 @@ public abstract class World implements IBlockAccess {
+@@ -1472,9 +1473,11 @@ public abstract class World implements IBlockAccess {
          int j = MathHelper.floor(entity.locZ);
          byte b0 = 32;
  
--        if (!flag || this.b(i - b0, 0, j - b0, i + b0, 0, j + b0)) {
+-        // CraftBukkit start - Use neighbor cache instead of looking up
+-        Chunk startingChunk = this.getChunkIfLoaded(i >> 4, j >> 4);
+-        if (!flag || (startingChunk != null && startingChunk.areNeighborsLoaded(2)) /* this.b(i - b0, 0, j - b0, i + b0, 0, j + b0) */) {
 +        // Spigot start
 +        if (!org.spigotmc.ActivationRange.checkIfActive(entity)) {
 +            entity.ticksLived++;
 +            entity.inactiveTick();
 +        } else {
              entity.tickTimer.startTiming(); // Spigot
+             // CraftBukkit end
              entity.S = entity.locX;
-             entity.T = entity.locY;
 diff --git a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
 index 8340c13..541dfe4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
diff --git a/CraftBukkit-Patches/0036-Allow-Disabling-of-Random-Lighting-Updates.patch b/CraftBukkit-Patches/0036-Allow-Disabling-of-Random-Lighting-Updates.patch
index 43fd54f..6baf47c 100644
--- a/CraftBukkit-Patches/0036-Allow-Disabling-of-Random-Lighting-Updates.patch
+++ b/CraftBukkit-Patches/0036-Allow-Disabling-of-Random-Lighting-Updates.patch
@@ -1,14 +1,14 @@
-From bb365c0a557eccb818ffb7a4d018144a654e9b15 Mon Sep 17 00:00:00 2001
+From 7d365125cbb0941da8dbc0894c426f4bad3cae07 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 22 Jun 2013 16:12:02 +1000
 Subject: [PATCH] Allow Disabling of Random Lighting Updates
 
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 0eabadf..a638dba 100644
+index 39767d0..5ef6865 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
-@@ -901,7 +901,7 @@ public class Chunk {
+@@ -929,7 +929,7 @@ public class Chunk {
          }
  
          this.m = true;
@@ -18,10 +18,10 @@ index 0eabadf..a638dba 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 1a2a640..ec4ce72 100644
+index 0cb803e..dcbf520 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -2113,7 +2113,7 @@ public abstract class World implements IBlockAccess {
+@@ -2107,7 +2107,7 @@ public abstract class World implements IBlockAccess {
          }
  
          this.methodProfiler.a("playerCheckLight");
diff --git a/CraftBukkit-Patches/0037-Properly-Close-Inventories.patch b/CraftBukkit-Patches/0037-Properly-Close-Inventories.patch
index c890499..d9d2563 100644
--- a/CraftBukkit-Patches/0037-Properly-Close-Inventories.patch
+++ b/CraftBukkit-Patches/0037-Properly-Close-Inventories.patch
@@ -1,4 +1,4 @@
-From f6c37960464a932e6125c8bd19c8288743eb42ea Mon Sep 17 00:00:00 2001
+From d35c0a27272e11eb32a8202860148c501ee2956f Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 27 Jun 2013 17:26:09 +1000
 Subject: [PATCH] Properly Close Inventories
@@ -6,10 +6,10 @@ Subject: [PATCH] Properly Close Inventories
 Properly close inventories when unloading and switching worlds.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index a638dba..d0c00db 100644
+index 5ef6865..d74586e 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
-@@ -755,6 +755,15 @@ public class Chunk {
+@@ -783,6 +783,15 @@ public class Chunk {
  
          while (iterator.hasNext()) {
              TileEntity tileentity = (TileEntity) iterator.next();
@@ -25,7 +25,7 @@ index a638dba..d0c00db 100644
  
              this.world.a(tileentity);
          }
-@@ -764,6 +773,15 @@ public class Chunk {
+@@ -792,6 +801,15 @@ public class Chunk {
              java.util.Iterator<Object> iter = this.entitySlices[i].iterator();
              while (iter.hasNext()) {
                  Entity entity = (Entity) iter.next();
diff --git a/CraftBukkit-Patches/0042-Entity-ticking-chunk-caching.patch b/CraftBukkit-Patches/0042-Entity-ticking-chunk-caching.patch
deleted file mode 100644
index ff94d0d..0000000
--- a/CraftBukkit-Patches/0042-Entity-ticking-chunk-caching.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 8b366c63f86ae90d9629fdd258d972ec64db1ff8 Mon Sep 17 00:00:00 2001
-From: Ammar Askar <ammar@ammaraskar.com>
-Date: Tue, 16 Jul 2013 03:32:32 +0500
-Subject: [PATCH] Entity ticking chunk caching
-
-Cache known loaded chunks so we avoid making a potentially expensive contains call for every single entity in exchange for some simple arithmetic. Best case scenario, this cuts down contains call to once per chunk, worst case it adds on some simple arithmetic operations
-
-diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index ec4ce72..6da7de6 100644
---- a/src/main/java/net/minecraft/server/World.java
-+++ b/src/main/java/net/minecraft/server/World.java
-@@ -1263,6 +1263,7 @@ public abstract class World implements IBlockAccess {
-         CrashReport crashreport;
-         CrashReportSystemDetails crashreportsystemdetails;
- 
-+        long lastChunk = Long.MIN_VALUE; // Spigot - cache chunk x, z cords for unload queue
-         for (i = 0; i < this.i.size(); ++i) {
-             entity = (Entity) this.i.get(i);
-             // CraftBukkit start - Fixed an NPE, don't process entities in chunks queued for unload
-@@ -1271,10 +1272,15 @@ public abstract class World implements IBlockAccess {
-             }
- 
-             ChunkProviderServer chunkProviderServer = ((WorldServer) this).chunkProviderServer;
--            if (chunkProviderServer.unloadQueue.contains(MathHelper.floor(entity.locX) >> 4, MathHelper.floor(entity.locZ) >> 4)) {
--                continue;
-+            // Spigot start - check last chunk to see if this loaded (fast cache)
-+            long chunk = org.bukkit.craftbukkit.util.LongHash.toLong(MathHelper.floor(entity.locX) >> 4, MathHelper.floor(entity.locZ) >> 4);
-+            if (lastChunk != chunk) {
-+                if (chunkProviderServer.unloadQueue.contains(chunk)) { // Spigot end
-+                    continue;
-+                }
-             }
-             // CraftBukkit end
-+            lastChunk = chunk; // Spigot
- 
-             try {
-                 ++entity.ticksLived;
-@@ -1295,6 +1301,7 @@ public abstract class World implements IBlockAccess {
-                 this.i.remove(i--);
-             }
-         }
-+        lastChunk = Long.MIN_VALUE; // Spigot
- 
-         this.methodProfiler.c("remove");
-         this.entityList.removeAll(this.f);
-@@ -1326,10 +1333,15 @@ public abstract class World implements IBlockAccess {
- 
-             // Don't tick entities in chunks queued for unload
-             ChunkProviderServer chunkProviderServer = ((WorldServer) this).chunkProviderServer;
--            if (chunkProviderServer.unloadQueue.contains(MathHelper.floor(entity.locX) >> 4, MathHelper.floor(entity.locZ) >> 4)) {
--                continue;
-+            // Spigot start - check last chunk to see if this loaded (fast cache)
-+            long chunk = org.bukkit.craftbukkit.util.LongHash.toLong(MathHelper.floor(entity.locX) >> 4, MathHelper.floor(entity.locZ) >> 4);
-+            if (lastChunk != chunk) {
-+                if (chunkProviderServer.unloadQueue.contains(chunk)) { // Spigot end
-+                    continue;
-+                }
-             }
-             // CraftBukkit end
-+            lastChunk = Long.MIN_VALUE; // Spigot
- 
-             if (entity.vehicle != null) {
-                 if (!entity.vehicle.dead && entity.vehicle.passenger == entity) {
--- 
-1.9.1
-
diff --git a/CraftBukkit-Patches/0043-Plug-World-Unload-Memory-Leak.patch b/CraftBukkit-Patches/0042-Plug-World-Unload-Memory-Leak.patch
similarity index 92%
rename from CraftBukkit-Patches/0043-Plug-World-Unload-Memory-Leak.patch
rename to CraftBukkit-Patches/0042-Plug-World-Unload-Memory-Leak.patch
index b4ae1fb..8519ff5 100644
--- a/CraftBukkit-Patches/0043-Plug-World-Unload-Memory-Leak.patch
+++ b/CraftBukkit-Patches/0042-Plug-World-Unload-Memory-Leak.patch
@@ -1,4 +1,4 @@
-From 6332634076b09d18af7ee9fc6deeffd1de566f58 Mon Sep 17 00:00:00 2001
+From 71ca2b1633955973b3a1d8fd74fda0f79fbe9826 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 3 Aug 2013 19:02:59 +1000
 Subject: [PATCH] Plug World Unload Memory Leak
diff --git a/CraftBukkit-Patches/0044-Player-Collision-API.patch b/CraftBukkit-Patches/0043-Player-Collision-API.patch
similarity index 98%
rename from CraftBukkit-Patches/0044-Player-Collision-API.patch
rename to CraftBukkit-Patches/0043-Player-Collision-API.patch
index 9ba2cac..9b22a6e 100644
--- a/CraftBukkit-Patches/0044-Player-Collision-API.patch
+++ b/CraftBukkit-Patches/0043-Player-Collision-API.patch
@@ -1,4 +1,4 @@
-From 6713b663f35b540ee53fd16621309304ea933189 Mon Sep 17 00:00:00 2001
+From 87d34d87e622b96a4369337e20b7fc5135a5c4db Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 3 Aug 2013 19:27:07 +1000
 Subject: [PATCH] Player Collision API
diff --git a/CraftBukkit-Patches/0045-Fully-Disable-Snooper-When-Not-Required.patch b/CraftBukkit-Patches/0044-Fully-Disable-Snooper-When-Not-Required.patch
similarity index 93%
rename from CraftBukkit-Patches/0045-Fully-Disable-Snooper-When-Not-Required.patch
rename to CraftBukkit-Patches/0044-Fully-Disable-Snooper-When-Not-Required.patch
index 32e98dd..cc38a0c 100644
--- a/CraftBukkit-Patches/0045-Fully-Disable-Snooper-When-Not-Required.patch
+++ b/CraftBukkit-Patches/0044-Fully-Disable-Snooper-When-Not-Required.patch
@@ -1,4 +1,4 @@
-From 180007c871b7fa8a181cadabed4bbc09a26cd747 Mon Sep 17 00:00:00 2001
+From c26ed0885fe7d9a9a567a91574c8d77aa8ab9068 Mon Sep 17 00:00:00 2001
 From: agentk20 <agentkid20@gmail.com>
 Date: Sat, 3 Aug 2013 19:28:48 +1000
 Subject: [PATCH] Fully Disable Snooper When Not Required
diff --git a/CraftBukkit-Patches/0046-Add-Getter-for-Entity-Invulnerability.patch b/CraftBukkit-Patches/0045-Add-Getter-for-Entity-Invulnerability.patch
similarity index 92%
rename from CraftBukkit-Patches/0046-Add-Getter-for-Entity-Invulnerability.patch
rename to CraftBukkit-Patches/0045-Add-Getter-for-Entity-Invulnerability.patch
index 77169de..3424a5b 100644
--- a/CraftBukkit-Patches/0046-Add-Getter-for-Entity-Invulnerability.patch
+++ b/CraftBukkit-Patches/0045-Add-Getter-for-Entity-Invulnerability.patch
@@ -1,4 +1,4 @@
-From 957a9bcb2fa0c3b06c2cb98c82ca67ff66bff4a2 Mon Sep 17 00:00:00 2001
+From 324a21ec3861a69a7dd3837fb0f4c1b813f00b34 Mon Sep 17 00:00:00 2001
 From: DerFlash <bte@freenet.de>
 Date: Sat, 3 Aug 2013 19:53:48 +1000
 Subject: [PATCH] Add Getter for Entity Invulnerability
diff --git a/CraftBukkit-Patches/0047-Cap-Minimum-Player-Speed.patch b/CraftBukkit-Patches/0046-Cap-Minimum-Player-Speed.patch
similarity index 92%
rename from CraftBukkit-Patches/0047-Cap-Minimum-Player-Speed.patch
rename to CraftBukkit-Patches/0046-Cap-Minimum-Player-Speed.patch
index 3d7a8aa..e31d565 100644
--- a/CraftBukkit-Patches/0047-Cap-Minimum-Player-Speed.patch
+++ b/CraftBukkit-Patches/0046-Cap-Minimum-Player-Speed.patch
@@ -1,11 +1,11 @@
-From b8af49b4889a987e67cffffef28abb55fe9bb5b8 Mon Sep 17 00:00:00 2001
+From dcee57c4729f137fa10d740b99cfe99c2d46ddbf Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Mon, 5 Aug 2013 20:17:20 +1000
 Subject: [PATCH] Cap Minimum Player Speed
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 059438d..207ab87 100644
+index a5002d8..fd64fcd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1162,7 +1162,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/CraftBukkit-Patches/0048-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch b/CraftBukkit-Patches/0047-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch
similarity index 94%
rename from CraftBukkit-Patches/0048-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch
rename to CraftBukkit-Patches/0047-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch
index 9eb84f2..f1f5414 100644
--- a/CraftBukkit-Patches/0048-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch
+++ b/CraftBukkit-Patches/0047-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch
@@ -1,4 +1,4 @@
-From 7eb7f425e6d81bd6b1bc30b4d9fbf4d1e87815ff Mon Sep 17 00:00:00 2001
+From 2732a7fe07b2bad4ca22938a4e99b26bc2f74665 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 14 Sep 2013 10:16:38 +1000
 Subject: [PATCH] Update Inventory and Health for PlayerConsumeItemEvent
diff --git a/CraftBukkit-Patches/0049-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch b/CraftBukkit-Patches/0048-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch
similarity index 96%
rename from CraftBukkit-Patches/0049-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch
rename to CraftBukkit-Patches/0048-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch
index e20eb75..b202a1e 100644
--- a/CraftBukkit-Patches/0049-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch
+++ b/CraftBukkit-Patches/0048-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch
@@ -1,4 +1,4 @@
-From a635de6cac4afd3ac997246944eb991f8abf543e Mon Sep 17 00:00:00 2001
+From eadf3b254418dadd61660c01c83a9970b6637ff7 Mon Sep 17 00:00:00 2001
 From: BlackHole <black-hole@live.com>
 Date: Tue, 16 Jul 2013 22:34:50 +0200
 Subject: [PATCH] Call EntityChangeBlockEvent for Fire Arrows hitting TNT
diff --git a/CraftBukkit-Patches/0050-Allow-Disabling-of-1.6.3-Structure-Saving.patch b/CraftBukkit-Patches/0049-Allow-Disabling-of-1.6.3-Structure-Saving.patch
similarity index 97%
rename from CraftBukkit-Patches/0050-Allow-Disabling-of-1.6.3-Structure-Saving.patch
rename to CraftBukkit-Patches/0049-Allow-Disabling-of-1.6.3-Structure-Saving.patch
index b7ad597..a7bf4e7 100644
--- a/CraftBukkit-Patches/0050-Allow-Disabling-of-1.6.3-Structure-Saving.patch
+++ b/CraftBukkit-Patches/0049-Allow-Disabling-of-1.6.3-Structure-Saving.patch
@@ -1,4 +1,4 @@
-From 39c62a4e08bff0439f9a6d8a95c6f21a86523151 Mon Sep 17 00:00:00 2001
+From 9dcf96ddd617afe5aa500b21e38280ee90a58e22 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 21 Sep 2013 12:33:09 +1000
 Subject: [PATCH] Allow Disabling of 1.6.3 Structure Saving
diff --git a/CraftBukkit-Patches/0051-Item-Despawn-Rate.patch b/CraftBukkit-Patches/0050-Item-Despawn-Rate.patch
similarity index 96%
rename from CraftBukkit-Patches/0051-Item-Despawn-Rate.patch
rename to CraftBukkit-Patches/0050-Item-Despawn-Rate.patch
index dde2874..2b52358 100644
--- a/CraftBukkit-Patches/0051-Item-Despawn-Rate.patch
+++ b/CraftBukkit-Patches/0050-Item-Despawn-Rate.patch
@@ -1,4 +1,4 @@
-From 1c45911173c468093a799eb5ed20080a9d10b2cb Mon Sep 17 00:00:00 2001
+From 5d9bc356a50009e0cb33eaaad4473133e5747660 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 22 Sep 2013 19:10:53 +1000
 Subject: [PATCH] Item Despawn Rate
diff --git a/CraftBukkit-Patches/0052-Don-t-Special-Case-X-Move-Value.patch b/CraftBukkit-Patches/0051-Don-t-Special-Case-X-Move-Value.patch
similarity index 95%
rename from CraftBukkit-Patches/0052-Don-t-Special-Case-X-Move-Value.patch
rename to CraftBukkit-Patches/0051-Don-t-Special-Case-X-Move-Value.patch
index 6ff22fa..a4b8a70 100644
--- a/CraftBukkit-Patches/0052-Don-t-Special-Case-X-Move-Value.patch
+++ b/CraftBukkit-Patches/0051-Don-t-Special-Case-X-Move-Value.patch
@@ -1,11 +1,11 @@
-From 1f05592622009732f3d63f6b61ed03185e8aa895 Mon Sep 17 00:00:00 2001
+From 955229fac012049a2960f52747893a238fa9e11e Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 6 Oct 2013 17:36:28 +1100
 Subject: [PATCH] Don't Special Case X Move Value
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 07658df..d90d332 100644
+index 8bf1afd..99ce73e 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -106,6 +106,7 @@ public class PlayerConnection implements PacketPlayInListener {
diff --git a/CraftBukkit-Patches/0053-Implement-respawn-API.patch b/CraftBukkit-Patches/0052-Implement-respawn-API.patch
similarity index 90%
rename from CraftBukkit-Patches/0053-Implement-respawn-API.patch
rename to CraftBukkit-Patches/0052-Implement-respawn-API.patch
index 78a8462..a855d97 100644
--- a/CraftBukkit-Patches/0053-Implement-respawn-API.patch
+++ b/CraftBukkit-Patches/0052-Implement-respawn-API.patch
@@ -1,11 +1,11 @@
-From 87430759742330ab89539a453b5d1a77afaa46b7 Mon Sep 17 00:00:00 2001
+From 7ed63c7e4413fb7651ff02e9c6dd98e41df54b44 Mon Sep 17 00:00:00 2001
 From: ninja- <xninja@openmailbox.org>
 Date: Tue, 8 Oct 2013 14:34:49 +0200
 Subject: [PATCH] Implement respawn API.
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 207ab87..a63db3b 100644
+index fd64fcd..5142f71 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1303,6 +1303,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/CraftBukkit-Patches/0054-Fix-BrewingStands-Removing-NBT-Potions.patch b/CraftBukkit-Patches/0053-Fix-BrewingStands-Removing-NBT-Potions.patch
similarity index 95%
rename from CraftBukkit-Patches/0054-Fix-BrewingStands-Removing-NBT-Potions.patch
rename to CraftBukkit-Patches/0053-Fix-BrewingStands-Removing-NBT-Potions.patch
index c6fb9d9..26a8f91 100644
--- a/CraftBukkit-Patches/0054-Fix-BrewingStands-Removing-NBT-Potions.patch
+++ b/CraftBukkit-Patches/0053-Fix-BrewingStands-Removing-NBT-Potions.patch
@@ -1,4 +1,4 @@
-From 5e1c8021be395a605c3d504b0d66af3eb5852add Mon Sep 17 00:00:00 2001
+From ba03f5b43e813c037b5c9ef26affb404c2c5bd6d Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Wed, 9 Oct 2013 18:20:05 +1100
 Subject: [PATCH] Fix BrewingStands Removing NBT / Potions
diff --git a/CraftBukkit-Patches/0055-Arrow-Despawn-Rate.patch b/CraftBukkit-Patches/0054-Arrow-Despawn-Rate.patch
similarity index 95%
rename from CraftBukkit-Patches/0055-Arrow-Despawn-Rate.patch
rename to CraftBukkit-Patches/0054-Arrow-Despawn-Rate.patch
index 1433053..5137cbd 100644
--- a/CraftBukkit-Patches/0055-Arrow-Despawn-Rate.patch
+++ b/CraftBukkit-Patches/0054-Arrow-Despawn-Rate.patch
@@ -1,4 +1,4 @@
-From edcaaf414c0734f22334becb94a8d82b7fb66e2a Mon Sep 17 00:00:00 2001
+From 86e5aaa7611adc75078d9a7e7c939d1d08cf5207 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Mon, 14 Oct 2013 19:20:10 +1100
 Subject: [PATCH] Arrow Despawn Rate
diff --git a/CraftBukkit-Patches/0056-Fix-packed-ice-generation.patch b/CraftBukkit-Patches/0055-Fix-packed-ice-generation.patch
similarity index 97%
rename from CraftBukkit-Patches/0056-Fix-packed-ice-generation.patch
rename to CraftBukkit-Patches/0055-Fix-packed-ice-generation.patch
index c723072..592cf54 100644
--- a/CraftBukkit-Patches/0056-Fix-packed-ice-generation.patch
+++ b/CraftBukkit-Patches/0055-Fix-packed-ice-generation.patch
@@ -1,4 +1,4 @@
-From d25f0c8532d6d79b0166abbc9aac5ecf7f1a911f Mon Sep 17 00:00:00 2001
+From 848300ae6ec63841bb95388db51ad6aaac03a095 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 1 Dec 2013 17:52:14 +1100
 Subject: [PATCH] Fix packed ice generation
diff --git a/CraftBukkit-Patches/0057-Watchdog-Thread.patch b/CraftBukkit-Patches/0056-Watchdog-Thread.patch
similarity index 99%
rename from CraftBukkit-Patches/0057-Watchdog-Thread.patch
rename to CraftBukkit-Patches/0056-Watchdog-Thread.patch
index ca62736..86d3e93 100644
--- a/CraftBukkit-Patches/0057-Watchdog-Thread.patch
+++ b/CraftBukkit-Patches/0056-Watchdog-Thread.patch
@@ -1,4 +1,4 @@
-From c839e6555ebfc524efef5b69ec68d1bc61f18087 Mon Sep 17 00:00:00 2001
+From 59d64d815676dfe80e9002afb00792dae5e6c677 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Feb 2013 12:33:20 +1100
 Subject: [PATCH] Watchdog Thread.
diff --git a/CraftBukkit-Patches/0058-Clear-Flower-Pot-on-Drop.patch b/CraftBukkit-Patches/0057-Clear-Flower-Pot-on-Drop.patch
similarity index 92%
rename from CraftBukkit-Patches/0058-Clear-Flower-Pot-on-Drop.patch
rename to CraftBukkit-Patches/0057-Clear-Flower-Pot-on-Drop.patch
index 0c67046..ff60ea6 100644
--- a/CraftBukkit-Patches/0058-Clear-Flower-Pot-on-Drop.patch
+++ b/CraftBukkit-Patches/0057-Clear-Flower-Pot-on-Drop.patch
@@ -1,4 +1,4 @@
-From e04497eb7fff37623d568f75cafa5881028f9da4 Mon Sep 17 00:00:00 2001
+From 228dfc549a66b9b3e971cf3a88527e93567e078a Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 3 Dec 2013 11:07:48 +1100
 Subject: [PATCH] Clear Flower Pot on Drop
diff --git a/CraftBukkit-Patches/0059-Fix-some-chunks-not-being-sent-to-the-client.patch b/CraftBukkit-Patches/0058-Fix-some-chunks-not-being-sent-to-the-client.patch
similarity index 89%
rename from CraftBukkit-Patches/0059-Fix-some-chunks-not-being-sent-to-the-client.patch
rename to CraftBukkit-Patches/0058-Fix-some-chunks-not-being-sent-to-the-client.patch
index bb22265..c6eef26 100644
--- a/CraftBukkit-Patches/0059-Fix-some-chunks-not-being-sent-to-the-client.patch
+++ b/CraftBukkit-Patches/0058-Fix-some-chunks-not-being-sent-to-the-client.patch
@@ -1,14 +1,14 @@
-From 5121ec7814ce666e9acb92aaf65013265054396a Mon Sep 17 00:00:00 2001
+From 6e808e5174020875a3c1a70123844c0fd0358b44 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Mon, 2 Dec 2013 23:42:09 +0000
 Subject: [PATCH] Fix some chunks not being sent to the client
 
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index d0c00db..874a089 100644
+index d74586e..a48785b 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
-@@ -925,7 +925,15 @@ public class Chunk {
+@@ -953,7 +953,15 @@ public class Chunk {
      }
  
      public boolean k() {
diff --git a/CraftBukkit-Patches/0060-Fix-Broken-Async-Chat.patch b/CraftBukkit-Patches/0059-Fix-Broken-Async-Chat.patch
similarity index 95%
rename from CraftBukkit-Patches/0060-Fix-Broken-Async-Chat.patch
rename to CraftBukkit-Patches/0059-Fix-Broken-Async-Chat.patch
index a463be8..3408786 100644
--- a/CraftBukkit-Patches/0060-Fix-Broken-Async-Chat.patch
+++ b/CraftBukkit-Patches/0059-Fix-Broken-Async-Chat.patch
@@ -1,4 +1,4 @@
-From 974ada4dd1a0edf87f0880811249d3db38a2fa30 Mon Sep 17 00:00:00 2001
+From 59e7429c3cc3e420533c554666dc7d490e6b6439 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 5 Dec 2013 13:55:53 +1100
 Subject: [PATCH] Fix Broken Async Chat
diff --git a/CraftBukkit-Patches/0061-Allow-Teleportation-of-Vehicles-and-Passengers.patch b/CraftBukkit-Patches/0060-Allow-Teleportation-of-Vehicles-and-Passengers.patch
similarity index 93%
rename from CraftBukkit-Patches/0061-Allow-Teleportation-of-Vehicles-and-Passengers.patch
rename to CraftBukkit-Patches/0060-Allow-Teleportation-of-Vehicles-and-Passengers.patch
index f1da9f2..f3a168b 100644
--- a/CraftBukkit-Patches/0061-Allow-Teleportation-of-Vehicles-and-Passengers.patch
+++ b/CraftBukkit-Patches/0060-Allow-Teleportation-of-Vehicles-and-Passengers.patch
@@ -1,11 +1,11 @@
-From a55476375d2ede32ed8c70f6d84e769710e91770 Mon Sep 17 00:00:00 2001
+From 2f2e091205757111702bd087de1e26032403a6d2 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 a63db3b..317e14f 100644
+index 5142f71..7d16bab 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -459,9 +459,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/CraftBukkit-Patches/0062-Remove-OS-X-Special-Chars-from-Signs.patch b/CraftBukkit-Patches/0061-Remove-OS-X-Special-Chars-from-Signs.patch
similarity index 89%
rename from CraftBukkit-Patches/0062-Remove-OS-X-Special-Chars-from-Signs.patch
rename to CraftBukkit-Patches/0061-Remove-OS-X-Special-Chars-from-Signs.patch
index e1bff8d..a185a07 100644
--- a/CraftBukkit-Patches/0062-Remove-OS-X-Special-Chars-from-Signs.patch
+++ b/CraftBukkit-Patches/0061-Remove-OS-X-Special-Chars-from-Signs.patch
@@ -1,11 +1,11 @@
-From 2ec58d554f8e20a7adc0d178d4d320be8bcb2381 Mon Sep 17 00:00:00 2001
+From 5a3944c0a289434760d2e5448640423518e6810b Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 8 Dec 2013 16:52:42 +1100
 Subject: [PATCH] Remove OS X Special Chars from Signs
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index aba5cad..22cb0a3 100644
+index 99ce73e..c7e40fe 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1582,6 +1582,7 @@ public class PlayerConnection implements PacketPlayInListener {
diff --git a/CraftBukkit-Patches/0063-Orebfuscator.patch b/CraftBukkit-Patches/0062-Orebfuscator.patch
similarity index 98%
rename from CraftBukkit-Patches/0063-Orebfuscator.patch
rename to CraftBukkit-Patches/0062-Orebfuscator.patch
index 6f80ea8..8915383 100644
--- a/CraftBukkit-Patches/0063-Orebfuscator.patch
+++ b/CraftBukkit-Patches/0062-Orebfuscator.patch
@@ -1,4 +1,4 @@
-From 9e11fada287c50bda72a5b4a38b871d6ab5a9de9 Mon Sep 17 00:00:00 2001
+From 625906f2c19b34c027c32c7bba15a8355f9bc6b5 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 16 May 2013 18:51:05 +1000
 Subject: [PATCH] Orebfuscator
@@ -115,10 +115,10 @@ index 2db45ad..97fe53c 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index abfa88b..3dfa0ec 100644
+index dcbf520..8e633de 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -233,9 +233,16 @@ public abstract class World implements IBlockAccess {
+@@ -237,9 +237,16 @@ public abstract class World implements IBlockAccess {
          return this.getType(i, k, j);
      }
  
@@ -137,7 +137,7 @@ index abfa88b..3dfa0ec 100644
              Iterator<BlockState> it = capturedBlockStates.iterator();
              while (it.hasNext()) {
                  BlockState previous = it.next();
-@@ -548,6 +555,7 @@ public abstract class World implements IBlockAccess {
+@@ -551,6 +558,7 @@ public abstract class World implements IBlockAccess {
          this.e(i, j + 1, k, block);
          this.e(i, j, k - 1, block);
          this.e(i, j, k + 1, block);
diff --git a/CraftBukkit-Patches/0064-Optimize-DataWatcher.patch b/CraftBukkit-Patches/0063-Optimize-DataWatcher.patch
similarity index 98%
rename from CraftBukkit-Patches/0064-Optimize-DataWatcher.patch
rename to CraftBukkit-Patches/0063-Optimize-DataWatcher.patch
index 7d6937c..dd089ef 100644
--- a/CraftBukkit-Patches/0064-Optimize-DataWatcher.patch
+++ b/CraftBukkit-Patches/0063-Optimize-DataWatcher.patch
@@ -1,4 +1,4 @@
-From 3cdcdf3689a73973e3cb39db068e568b1eb82832 Mon Sep 17 00:00:00 2001
+From d09d15c7443b4e3d7922fcb9435f390f0a2e191e Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 13 Dec 2013 11:45:47 +1100
 Subject: [PATCH] Optimize DataWatcher
diff --git a/CraftBukkit-Patches/0065-Fire-PreLogin-Events-in-Offline-Mode.patch b/CraftBukkit-Patches/0064-Fire-PreLogin-Events-in-Offline-Mode.patch
similarity index 99%
rename from CraftBukkit-Patches/0065-Fire-PreLogin-Events-in-Offline-Mode.patch
rename to CraftBukkit-Patches/0064-Fire-PreLogin-Events-in-Offline-Mode.patch
index 50f20cc..0d2621a 100644
--- a/CraftBukkit-Patches/0065-Fire-PreLogin-Events-in-Offline-Mode.patch
+++ b/CraftBukkit-Patches/0064-Fire-PreLogin-Events-in-Offline-Mode.patch
@@ -1,4 +1,4 @@
-From ae5b7c2d6526c34a23893b0da0ce43e4caf68f80 Mon Sep 17 00:00:00 2001
+From 7936c99592bc205e2288842c5dfe09d19efd6e5a Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 18 Dec 2013 13:32:10 +1100
 Subject: [PATCH] Fire PreLogin Events in Offline Mode
diff --git a/CraftBukkit-Patches/0066-BungeeCord-Support.patch b/CraftBukkit-Patches/0065-BungeeCord-Support.patch
similarity index 99%
rename from CraftBukkit-Patches/0066-BungeeCord-Support.patch
rename to CraftBukkit-Patches/0065-BungeeCord-Support.patch
index 4269e24..b50f147 100644
--- a/CraftBukkit-Patches/0066-BungeeCord-Support.patch
+++ b/CraftBukkit-Patches/0065-BungeeCord-Support.patch
@@ -1,4 +1,4 @@
-From edbcf8d6f20fe171f6ec76291e33c7192110b59b Mon Sep 17 00:00:00 2001
+From 56e3bbd8f04384743c0661bfd79b8e45e2a5b515 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 1 Dec 2013 18:18:41 +1100
 Subject: [PATCH] BungeeCord Support
@@ -175,7 +175,7 @@ index 73d92fd..4c13657 100644
  
      public int getTicksPerAnimalSpawns() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 317e14f..dd80ab7 100644
+index 7d16bab..c0a0b43 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1299,6 +1299,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/CraftBukkit-Patches/0067-Allow-Disabling-Zombie-Villager-Aggression.patch b/CraftBukkit-Patches/0066-Allow-Disabling-Zombie-Villager-Aggression.patch
similarity index 96%
rename from CraftBukkit-Patches/0067-Allow-Disabling-Zombie-Villager-Aggression.patch
rename to CraftBukkit-Patches/0066-Allow-Disabling-Zombie-Villager-Aggression.patch
index 04cf4cb..a360803 100644
--- a/CraftBukkit-Patches/0067-Allow-Disabling-Zombie-Villager-Aggression.patch
+++ b/CraftBukkit-Patches/0066-Allow-Disabling-Zombie-Villager-Aggression.patch
@@ -1,4 +1,4 @@
-From 683a618dad27ca90a3a10c1c955858db09326aeb Mon Sep 17 00:00:00 2001
+From ea516adcd661272180621a8542318ea7c50bfed4 Mon Sep 17 00:00:00 2001
 From: Dylan Xaldin <Puremin0rez515@gmail.com>
 Date: Thu, 12 Dec 2013 18:05:03 -0600
 Subject: [PATCH] Allow Disabling Zombie Villager Aggression
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow Disabling Zombie Villager Aggression
 Ability to configure if Zombies will be aggressive towards Villagers.
 
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index ecb4abe..1eaac63 100644
+index 89fc4c5..6cb5b14 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -30,7 +30,7 @@ public class EntityZombie extends EntityMonster {
diff --git a/CraftBukkit-Patches/0068-Configurable-Amount-of-Netty-Threads.patch b/CraftBukkit-Patches/0067-Configurable-Amount-of-Netty-Threads.patch
similarity index 97%
rename from CraftBukkit-Patches/0068-Configurable-Amount-of-Netty-Threads.patch
rename to CraftBukkit-Patches/0067-Configurable-Amount-of-Netty-Threads.patch
index 716e64f..2e56372 100644
--- a/CraftBukkit-Patches/0068-Configurable-Amount-of-Netty-Threads.patch
+++ b/CraftBukkit-Patches/0067-Configurable-Amount-of-Netty-Threads.patch
@@ -1,4 +1,4 @@
-From c2933cd397bee0d3f35cd0067caace8d9bc0121a Mon Sep 17 00:00:00 2001
+From f4baec301dc61e04e4b99f97c73ae17d63e4746e Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 13 Dec 2013 11:58:58 +1100
 Subject: [PATCH] Configurable Amount of Netty Threads
diff --git a/CraftBukkit-Patches/0069-Prevent-Mineshaft-Saving.patch b/CraftBukkit-Patches/0068-Prevent-Mineshaft-Saving.patch
similarity index 93%
rename from CraftBukkit-Patches/0069-Prevent-Mineshaft-Saving.patch
rename to CraftBukkit-Patches/0068-Prevent-Mineshaft-Saving.patch
index 5f68140..4ba2f71 100644
--- a/CraftBukkit-Patches/0069-Prevent-Mineshaft-Saving.patch
+++ b/CraftBukkit-Patches/0068-Prevent-Mineshaft-Saving.patch
@@ -1,4 +1,4 @@
-From b0a23b8b4f4255059c9de756f4b104e9c1b94ea1 Mon Sep 17 00:00:00 2001
+From ac4b3f0f638006d240d371699446e54376373115 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 13 Dec 2013 15:21:02 +1100
 Subject: [PATCH] Prevent Mineshaft Saving
diff --git a/CraftBukkit-Patches/0070-Log-Cause-of-Unexpected-Exceptions.patch b/CraftBukkit-Patches/0069-Log-Cause-of-Unexpected-Exceptions.patch
similarity index 93%
rename from CraftBukkit-Patches/0070-Log-Cause-of-Unexpected-Exceptions.patch
rename to CraftBukkit-Patches/0069-Log-Cause-of-Unexpected-Exceptions.patch
index 353e631..3de7be4 100644
--- a/CraftBukkit-Patches/0070-Log-Cause-of-Unexpected-Exceptions.patch
+++ b/CraftBukkit-Patches/0069-Log-Cause-of-Unexpected-Exceptions.patch
@@ -1,4 +1,4 @@
-From f5276f2f5fdec5c58cf8696f342919351deefa28 Mon Sep 17 00:00:00 2001
+From 6e97f8d49789ce149c7d59f96237cd430f0a077d Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 18 Dec 2013 13:39:14 +1100
 Subject: [PATCH] Log Cause of Unexpected Exceptions
diff --git a/CraftBukkit-Patches/0071-Particle-API.patch b/CraftBukkit-Patches/0070-Particle-API.patch
similarity index 98%
rename from CraftBukkit-Patches/0071-Particle-API.patch
rename to CraftBukkit-Patches/0070-Particle-API.patch
index ae8b6d4..a45b412 100644
--- a/CraftBukkit-Patches/0071-Particle-API.patch
+++ b/CraftBukkit-Patches/0070-Particle-API.patch
@@ -1,4 +1,4 @@
-From c2fcfa5b972d14089d629654b57408def309f9f2 Mon Sep 17 00:00:00 2001
+From 8e9e71c2621166d9fe8a9620bc8054e4e084522b Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Fri, 20 Dec 2013 21:36:06 +0000
 Subject: [PATCH] Particle API
@@ -117,7 +117,7 @@ index 81913ac..1317254 100644
  
      public Spigot spigot()
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index dd80ab7..4d4516f 100644
+index c0a0b43..82bd22f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1325,6 +1325,49 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/CraftBukkit-Patches/0072-Fix-Biome-Decoration-Crashes.patch b/CraftBukkit-Patches/0071-Fix-Biome-Decoration-Crashes.patch
similarity index 98%
rename from CraftBukkit-Patches/0072-Fix-Biome-Decoration-Crashes.patch
rename to CraftBukkit-Patches/0071-Fix-Biome-Decoration-Crashes.patch
index a96bc56..6281b67 100644
--- a/CraftBukkit-Patches/0072-Fix-Biome-Decoration-Crashes.patch
+++ b/CraftBukkit-Patches/0071-Fix-Biome-Decoration-Crashes.patch
@@ -1,4 +1,4 @@
-From c60fd58c9b3b98dd532f549e698f700fe5d5104e Mon Sep 17 00:00:00 2001
+From a3c067ce8221e3a2f792a951ee7a83bed151d702 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 5 Jan 2014 09:35:01 +1100
 Subject: [PATCH] Fix Biome Decoration Crashes
diff --git a/CraftBukkit-Patches/0073-Save-ticks-lived-to-nbttag.patch b/CraftBukkit-Patches/0072-Save-ticks-lived-to-nbttag.patch
similarity index 93%
rename from CraftBukkit-Patches/0073-Save-ticks-lived-to-nbttag.patch
rename to CraftBukkit-Patches/0072-Save-ticks-lived-to-nbttag.patch
index e37cc58..96596e6 100644
--- a/CraftBukkit-Patches/0073-Save-ticks-lived-to-nbttag.patch
+++ b/CraftBukkit-Patches/0072-Save-ticks-lived-to-nbttag.patch
@@ -1,11 +1,11 @@
-From 6a28d40d8fb999253b775d2bda9868db9652e555 Mon Sep 17 00:00:00 2001
+From 19d109674e896c40fd689fb4824f1391ffecf676 Mon Sep 17 00:00:00 2001
 From: DerFlash <bte@freenet.de>
 Date: Tue, 9 Jul 2013 00:11:12 +0200
 Subject: [PATCH] Save ticks lived to nbttag
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 327daae..998fd36 100644
+index 2a192e1..409b0ad 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1134,6 +1134,7 @@ public abstract class Entity {
diff --git a/CraftBukkit-Patches/0074-More-Efficient-GetCubes.patch b/CraftBukkit-Patches/0073-More-Efficient-GetCubes.patch
similarity index 94%
rename from CraftBukkit-Patches/0074-More-Efficient-GetCubes.patch
rename to CraftBukkit-Patches/0073-More-Efficient-GetCubes.patch
index b24b684..3faf888 100644
--- a/CraftBukkit-Patches/0074-More-Efficient-GetCubes.patch
+++ b/CraftBukkit-Patches/0073-More-Efficient-GetCubes.patch
@@ -1,14 +1,14 @@
-From 2f1bc09349a0486fae4d22457b9251248222d915 Mon Sep 17 00:00:00 2001
+From f2ee4450d7b2cd0111afea54aa22a8b703f47dbd Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 11 Jun 2013 12:17:37 +1000
 Subject: [PATCH] More Efficient GetCubes
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 84fe64c..e557b4f 100644
+index 8e633de..c3f9a0e 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1135,23 +1135,42 @@ public abstract class World implements IBlockAccess {
+@@ -1138,23 +1138,42 @@ public abstract class World implements IBlockAccess {
          int i1 = MathHelper.floor(axisalignedbb.c);
          int j1 = MathHelper.floor(axisalignedbb.f + 1.0D);
  
diff --git a/CraftBukkit-Patches/0075-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch b/CraftBukkit-Patches/0074-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch
similarity index 98%
rename from CraftBukkit-Patches/0075-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch
rename to CraftBukkit-Patches/0074-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch
index 6bb8d53..92329fa 100644
--- a/CraftBukkit-Patches/0075-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch
+++ b/CraftBukkit-Patches/0074-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch
@@ -1,4 +1,4 @@
-From ceb76cbb4b35e120e201acf9b304176fa2d3a74f Mon Sep 17 00:00:00 2001
+From efa76735fa9be4b7e68a4d41eebfe4d161f8c0e9 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 2 Feb 2014 16:55:46 +0000
 Subject: [PATCH] Add Option to Nerf Mobs from Spawner's
diff --git a/CraftBukkit-Patches/0076-Warn-if-PermGen-may-be-insufficient.patch b/CraftBukkit-Patches/0075-Warn-if-PermGen-may-be-insufficient.patch
similarity index 96%
rename from CraftBukkit-Patches/0076-Warn-if-PermGen-may-be-insufficient.patch
rename to CraftBukkit-Patches/0075-Warn-if-PermGen-may-be-insufficient.patch
index 36706b6..b0786eb 100644
--- a/CraftBukkit-Patches/0076-Warn-if-PermGen-may-be-insufficient.patch
+++ b/CraftBukkit-Patches/0075-Warn-if-PermGen-may-be-insufficient.patch
@@ -1,4 +1,4 @@
-From da196639f65ce4d523caef44dbb560ae6a74d9a0 Mon Sep 17 00:00:00 2001
+From 9216a5725b4a0dae4ea006a6c39fa1d7276a7b8d Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 23 Dec 2013 14:07:41 +1100
 Subject: [PATCH] Warn if PermGen may be insufficient
diff --git a/CraftBukkit-Patches/0077-Disable-Connected-Check-on-setScoreboard.patch b/CraftBukkit-Patches/0076-Disable-Connected-Check-on-setScoreboard.patch
similarity index 91%
rename from CraftBukkit-Patches/0077-Disable-Connected-Check-on-setScoreboard.patch
rename to CraftBukkit-Patches/0076-Disable-Connected-Check-on-setScoreboard.patch
index 921a7f4..b931a6e 100644
--- a/CraftBukkit-Patches/0077-Disable-Connected-Check-on-setScoreboard.patch
+++ b/CraftBukkit-Patches/0076-Disable-Connected-Check-on-setScoreboard.patch
@@ -1,11 +1,11 @@
-From d8306d27ef753a672a0311b751ee53e96ebbd090 Mon Sep 17 00:00:00 2001
+From 95232a545704431d1f98365587f57c2b51f0cd2b Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 23 Dec 2013 15:57:57 +1100
 Subject: [PATCH] Disable Connected Check on setScoreboard
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 4d4516f..10e8d03 100644
+index 82bd22f..1c4f3ae 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1225,7 +1225,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/CraftBukkit-Patches/0078-Add-Late-Bind-Option.patch b/CraftBukkit-Patches/0077-Add-Late-Bind-Option.patch
similarity index 97%
rename from CraftBukkit-Patches/0078-Add-Late-Bind-Option.patch
rename to CraftBukkit-Patches/0077-Add-Late-Bind-Option.patch
index 980a980..979cd1b 100644
--- a/CraftBukkit-Patches/0078-Add-Late-Bind-Option.patch
+++ b/CraftBukkit-Patches/0077-Add-Late-Bind-Option.patch
@@ -1,4 +1,4 @@
-From b8703401078ff70ff96eff3d9f79c1eb254272ca Mon Sep 17 00:00:00 2001
+From db4568e8f946f05fc66c392bad2eb73fcf3b4ac9 Mon Sep 17 00:00:00 2001
 From: slide23 <me@slide.ws>
 Date: Fri, 20 Dec 2013 20:15:33 -0600
 Subject: [PATCH] Add Late Bind Option
diff --git a/CraftBukkit-Patches/0079-Allow-statistics-to-be-disabled-forced.patch b/CraftBukkit-Patches/0078-Allow-statistics-to-be-disabled-forced.patch
similarity index 98%
rename from CraftBukkit-Patches/0079-Allow-statistics-to-be-disabled-forced.patch
rename to CraftBukkit-Patches/0078-Allow-statistics-to-be-disabled-forced.patch
index c909261..41afea6 100644
--- a/CraftBukkit-Patches/0079-Allow-statistics-to-be-disabled-forced.patch
+++ b/CraftBukkit-Patches/0078-Allow-statistics-to-be-disabled-forced.patch
@@ -1,4 +1,4 @@
-From ac7a5cda836e537f9e65b102669c14c3125042cd Mon Sep 17 00:00:00 2001
+From 6b76abdc04afb2dfa202afb6d098345854daa655 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Tue, 7 Jan 2014 15:56:26 +0000
 Subject: [PATCH] Allow statistics to be disabled/forced
diff --git a/CraftBukkit-Patches/0080-Fix-anvil-collisions.patch b/CraftBukkit-Patches/0079-Fix-anvil-collisions.patch
similarity index 92%
rename from CraftBukkit-Patches/0080-Fix-anvil-collisions.patch
rename to CraftBukkit-Patches/0079-Fix-anvil-collisions.patch
index 4a8ed5c..2573b2f 100644
--- a/CraftBukkit-Patches/0080-Fix-anvil-collisions.patch
+++ b/CraftBukkit-Patches/0079-Fix-anvil-collisions.patch
@@ -1,4 +1,4 @@
-From 151a7a8ee2cd7d04da98472223bd9264df5d6067 Mon Sep 17 00:00:00 2001
+From 6239bc0c14d31525868b0177a39f6e477e77ce5f Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Thu, 9 Jan 2014 14:19:12 +0000
 Subject: [PATCH] Fix anvil collisions
diff --git a/CraftBukkit-Patches/0081-Fix-ItemStack-Unbreakable-Code.patch b/CraftBukkit-Patches/0080-Fix-ItemStack-Unbreakable-Code.patch
similarity index 93%
rename from CraftBukkit-Patches/0081-Fix-ItemStack-Unbreakable-Code.patch
rename to CraftBukkit-Patches/0080-Fix-ItemStack-Unbreakable-Code.patch
index 173cad2..8763a43 100644
--- a/CraftBukkit-Patches/0081-Fix-ItemStack-Unbreakable-Code.patch
+++ b/CraftBukkit-Patches/0080-Fix-ItemStack-Unbreakable-Code.patch
@@ -1,4 +1,4 @@
-From 5048ab570df46e50d433d0de6d88c1cc29977ed6 Mon Sep 17 00:00:00 2001
+From 40440da2ba0d082414ed54c3b997ca883321d06f Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 10 Jan 2014 15:15:50 +1100
 Subject: [PATCH] Fix ItemStack Unbreakable Code
diff --git a/CraftBukkit-Patches/0082-Try-and-Debug-Crash-Reports-Crashing.patch b/CraftBukkit-Patches/0081-Try-and-Debug-Crash-Reports-Crashing.patch
similarity index 96%
rename from CraftBukkit-Patches/0082-Try-and-Debug-Crash-Reports-Crashing.patch
rename to CraftBukkit-Patches/0081-Try-and-Debug-Crash-Reports-Crashing.patch
index d9b3f71..1b95968 100644
--- a/CraftBukkit-Patches/0082-Try-and-Debug-Crash-Reports-Crashing.patch
+++ b/CraftBukkit-Patches/0081-Try-and-Debug-Crash-Reports-Crashing.patch
@@ -1,4 +1,4 @@
-From 36e78a435944de02330b78498e615855658554ab Mon Sep 17 00:00:00 2001
+From e609c52476180bf75ce68b804dfb5823f951d434 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 12 Jan 2014 20:56:41 +1100
 Subject: [PATCH] Try and Debug Crash Reports Crashing
diff --git a/CraftBukkit-Patches/0083-Replace-AutoSave-Mechanism.patch b/CraftBukkit-Patches/0082-Replace-AutoSave-Mechanism.patch
similarity index 96%
rename from CraftBukkit-Patches/0083-Replace-AutoSave-Mechanism.patch
rename to CraftBukkit-Patches/0082-Replace-AutoSave-Mechanism.patch
index e328ff9..686ee9a 100644
--- a/CraftBukkit-Patches/0083-Replace-AutoSave-Mechanism.patch
+++ b/CraftBukkit-Patches/0082-Replace-AutoSave-Mechanism.patch
@@ -1,4 +1,4 @@
-From 43f8ffc1e273f54966c4e611a44aedb4293a5a56 Mon Sep 17 00:00:00 2001
+From d7df43f39d323646ec0c9239f6b2cd7bb5a74358 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 12 Jan 2014 21:07:18 +1100
 Subject: [PATCH] Replace AutoSave Mechanism
diff --git a/CraftBukkit-Patches/0084-Block-data-values-that-crash-the-client.patch b/CraftBukkit-Patches/0083-Block-data-values-that-crash-the-client.patch
similarity index 88%
rename from CraftBukkit-Patches/0084-Block-data-values-that-crash-the-client.patch
rename to CraftBukkit-Patches/0083-Block-data-values-that-crash-the-client.patch
index 20778c7..69cef3c 100644
--- a/CraftBukkit-Patches/0084-Block-data-values-that-crash-the-client.patch
+++ b/CraftBukkit-Patches/0083-Block-data-values-that-crash-the-client.patch
@@ -1,14 +1,14 @@
-From d2464ff0ee510c4d7eae1439b190f8438583a285 Mon Sep 17 00:00:00 2001
+From 7f5496745687ea5ada5c14e4fee015c2dd5f99f8 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Wed, 15 Jan 2014 21:52:47 +0000
 Subject: [PATCH] Block data values that crash the client
 
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 874a089..088ee42 100644
+index a48785b..45ae199 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
-@@ -115,7 +115,7 @@ public class Chunk {
+@@ -143,7 +143,7 @@ public class Chunk {
                          }
  
                          this.sections[l1].setTypeId(l, j1 & 15, i1, block);
@@ -17,7 +17,7 @@ index 874a089..088ee42 100644
                      }
                  }
              }
-@@ -398,6 +398,17 @@ public class Chunk {
+@@ -426,6 +426,17 @@ public class Chunk {
          }
      }
  
@@ -35,7 +35,7 @@ index 874a089..088ee42 100644
      public boolean a(int i, int j, int k, Block block, int l) {
          int i1 = k << 4 | i;
  
-@@ -452,7 +463,7 @@ public class Chunk {
+@@ -480,7 +491,7 @@ public class Chunk {
              if (chunksection.getTypeId(i, j & 15, k) != block) {
                  return false;
              } else {
@@ -44,7 +44,7 @@ index 874a089..088ee42 100644
                  if (flag) {
                      this.initLighting();
                  } else {
-@@ -517,8 +528,9 @@ public class Chunk {
+@@ -545,8 +556,9 @@ public class Chunk {
                  return false;
              } else {
                  this.n = true;
diff --git a/CraftBukkit-Patches/0085-Support-vanilla-s-direction-tag-on-fireballs.patch b/CraftBukkit-Patches/0084-Support-vanilla-s-direction-tag-on-fireballs.patch
similarity index 96%
rename from CraftBukkit-Patches/0085-Support-vanilla-s-direction-tag-on-fireballs.patch
rename to CraftBukkit-Patches/0084-Support-vanilla-s-direction-tag-on-fireballs.patch
index 9c98927..fc4cc3e 100644
--- a/CraftBukkit-Patches/0085-Support-vanilla-s-direction-tag-on-fireballs.patch
+++ b/CraftBukkit-Patches/0084-Support-vanilla-s-direction-tag-on-fireballs.patch
@@ -1,4 +1,4 @@
-From 6fae3f8da576d7edbd0b60c9e79a525788189590 Mon Sep 17 00:00:00 2001
+From 0d236aa3492d95ceec4e72ca307281db61889dcc Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Sat, 18 Jan 2014 14:27:03 +0000
 Subject: [PATCH] Support vanilla's direction tag on fireballs
diff --git a/CraftBukkit-Patches/0086-Support-non-prefixed-URLs.patch b/CraftBukkit-Patches/0085-Support-non-prefixed-URLs.patch
similarity index 97%
rename from CraftBukkit-Patches/0086-Support-non-prefixed-URLs.patch
rename to CraftBukkit-Patches/0085-Support-non-prefixed-URLs.patch
index 78b2faa..f0f37ec 100644
--- a/CraftBukkit-Patches/0086-Support-non-prefixed-URLs.patch
+++ b/CraftBukkit-Patches/0085-Support-non-prefixed-URLs.patch
@@ -1,4 +1,4 @@
-From 9be24c650e154b8e97d91c4f1fa380d34a4726b1 Mon Sep 17 00:00:00 2001
+From 429d1d3f87125cf15ce437df60deb0656f6df8cc Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Sat, 18 Jan 2014 19:32:42 +0000
 Subject: [PATCH] Support non-prefixed URLs
diff --git a/CraftBukkit-Patches/0087-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch b/CraftBukkit-Patches/0086-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch
similarity index 95%
rename from CraftBukkit-Patches/0087-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch
rename to CraftBukkit-Patches/0086-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch
index b099f1a..eb31ccf 100644
--- a/CraftBukkit-Patches/0087-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch
+++ b/CraftBukkit-Patches/0086-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch
@@ -1,4 +1,4 @@
-From 01ebe2c7096ad492f3c6d0e58b3b872755cbfe9b Mon Sep 17 00:00:00 2001
+From 65c8be01221ff4eb29dd4d8f076b5972d45895aa Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 20 Jan 2014 13:44:07 +1100
 Subject: [PATCH] Catch stalling on corrupted map data / NBT arrays.
diff --git a/CraftBukkit-Patches/0088-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch b/CraftBukkit-Patches/0087-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch
similarity index 96%
rename from CraftBukkit-Patches/0088-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch
rename to CraftBukkit-Patches/0087-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch
index 532bbd7..3efb6a7 100644
--- a/CraftBukkit-Patches/0088-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch
+++ b/CraftBukkit-Patches/0087-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch
@@ -1,4 +1,4 @@
-From 919de398e8b96920768fd594d155ad9097f18620 Mon Sep 17 00:00:00 2001
+From d1643f9ddfa9acf0c1c49ab96ad38b14cd99d5a3 Mon Sep 17 00:00:00 2001
 From: Dmck2b <dmck2b+github@gmail.com>
 Date: Mon, 20 Jan 2014 20:18:23 +0000
 Subject: [PATCH] Allow toggling of ZombiePigmen spawning in portal blocks
diff --git a/CraftBukkit-Patches/0089-Highly-Optimized-Tick-Loop.patch b/CraftBukkit-Patches/0088-Highly-Optimized-Tick-Loop.patch
similarity index 98%
rename from CraftBukkit-Patches/0089-Highly-Optimized-Tick-Loop.patch
rename to CraftBukkit-Patches/0088-Highly-Optimized-Tick-Loop.patch
index 910216a..bf3bca4 100644
--- a/CraftBukkit-Patches/0089-Highly-Optimized-Tick-Loop.patch
+++ b/CraftBukkit-Patches/0088-Highly-Optimized-Tick-Loop.patch
@@ -1,4 +1,4 @@
-From 8e6c2a43319001a39199a60b3435577ff1c4cc33 Mon Sep 17 00:00:00 2001
+From 3d88fb24d59996ce30731f18ffcd6a517ab17ef7 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 25 Jan 2014 14:08:35 +1100
 Subject: [PATCH] Highly Optimized Tick Loop
@@ -96,7 +96,7 @@ index b52c101..b905ceb 100644
                  this.a((CrashReport) null);
              }
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 54d9117..2baed09 100644
+index ca87886..fe732bc 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -244,4 +244,9 @@ public class SpigotConfig
diff --git a/CraftBukkit-Patches/0090-Add-Spigot-Links.patch b/CraftBukkit-Patches/0089-Add-Spigot-Links.patch
similarity index 98%
rename from CraftBukkit-Patches/0090-Add-Spigot-Links.patch
rename to CraftBukkit-Patches/0089-Add-Spigot-Links.patch
index 8251c09..94c491c 100644
--- a/CraftBukkit-Patches/0090-Add-Spigot-Links.patch
+++ b/CraftBukkit-Patches/0089-Add-Spigot-Links.patch
@@ -1,4 +1,4 @@
-From e0e673c3dbff7904186f713e0b1ef54568b6abb1 Mon Sep 17 00:00:00 2001
+From a993c1630584c3638515fb07b10a8729b1263a43 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Thu, 23 Jan 2014 13:17:35 +1100
 Subject: [PATCH] Add Spigot Links
diff --git a/CraftBukkit-Patches/0091-Configurable-Ping-Sample-Size.patch b/CraftBukkit-Patches/0090-Configurable-Ping-Sample-Size.patch
similarity index 95%
rename from CraftBukkit-Patches/0091-Configurable-Ping-Sample-Size.patch
rename to CraftBukkit-Patches/0090-Configurable-Ping-Sample-Size.patch
index 8e70b20..7cf8c39 100644
--- a/CraftBukkit-Patches/0091-Configurable-Ping-Sample-Size.patch
+++ b/CraftBukkit-Patches/0090-Configurable-Ping-Sample-Size.patch
@@ -1,4 +1,4 @@
-From 1b97446f513fa4abd73ab946e1939da69564f9fa Mon Sep 17 00:00:00 2001
+From 0dda67eacedbfa2f1a14b70abae4673511d84bcb Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 26 Jan 2014 21:48:34 +1100
 Subject: [PATCH] Configurable Ping Sample Size
@@ -23,7 +23,7 @@ index cd06305..6423aec 100644
  
          ServerPing ping = new ServerPing();
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 2baed09..8eac742 100644
+index fe732bc..9b0cc28 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -249,4 +249,11 @@ public class SpigotConfig
diff --git a/CraftBukkit-Patches/0092-Add-Optional-Tick-Shuffling.patch b/CraftBukkit-Patches/0091-Add-Optional-Tick-Shuffling.patch
similarity index 94%
rename from CraftBukkit-Patches/0092-Add-Optional-Tick-Shuffling.patch
rename to CraftBukkit-Patches/0091-Add-Optional-Tick-Shuffling.patch
index f5ba6f4..f2ff82c 100644
--- a/CraftBukkit-Patches/0092-Add-Optional-Tick-Shuffling.patch
+++ b/CraftBukkit-Patches/0091-Add-Optional-Tick-Shuffling.patch
@@ -1,4 +1,4 @@
-From 6d560adb68f5723c9b27e540640525e1dfb19133 Mon Sep 17 00:00:00 2001
+From 3605bd7b9a1297d8eb04480cd7e6e5bae19b1b4c Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 27 Jan 2014 08:39:26 +1100
 Subject: [PATCH] Add Optional Tick Shuffling
@@ -24,7 +24,7 @@ index c2194af..1d7b814 100644
  
              while (iterator.hasNext()) {
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 8eac742..e26b964 100644
+index 9b0cc28..b081c05 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -256,4 +256,10 @@ public class SpigotConfig
diff --git a/CraftBukkit-Patches/0093-Allow-Configuring-Chunks-per-Packet.patch b/CraftBukkit-Patches/0092-Allow-Configuring-Chunks-per-Packet.patch
similarity index 96%
rename from CraftBukkit-Patches/0093-Allow-Configuring-Chunks-per-Packet.patch
rename to CraftBukkit-Patches/0092-Allow-Configuring-Chunks-per-Packet.patch
index 74ce5c6..e02153d 100644
--- a/CraftBukkit-Patches/0093-Allow-Configuring-Chunks-per-Packet.patch
+++ b/CraftBukkit-Patches/0092-Allow-Configuring-Chunks-per-Packet.patch
@@ -1,4 +1,4 @@
-From 1474f1e108ece78d16615117203e8da18ae924d4 Mon Sep 17 00:00:00 2001
+From c19ff6a3caf87d4ae6bbf569e064585cba05ccf9 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 28 Jan 2014 20:35:35 +1100
 Subject: [PATCH] Allow Configuring Chunks per Packet
diff --git a/CraftBukkit-Patches/0094-Implement-Locale-Getter-for-Players.patch b/CraftBukkit-Patches/0093-Implement-Locale-Getter-for-Players.patch
similarity index 94%
rename from CraftBukkit-Patches/0094-Implement-Locale-Getter-for-Players.patch
rename to CraftBukkit-Patches/0093-Implement-Locale-Getter-for-Players.patch
index 3f9c1df..1a0557a 100644
--- a/CraftBukkit-Patches/0094-Implement-Locale-Getter-for-Players.patch
+++ b/CraftBukkit-Patches/0093-Implement-Locale-Getter-for-Players.patch
@@ -1,4 +1,4 @@
-From f046afa0f552b6b76fc5edeaca35ac64353c308d Mon Sep 17 00:00:00 2001
+From 27f1d7073768c94ee338ded2bbfba80a22a056cf Mon Sep 17 00:00:00 2001
 From: Smove <jan@lavasurvival.net>
 Date: Sat, 1 Feb 2014 18:12:16 +1100
 Subject: [PATCH] Implement Locale Getter for Players
@@ -18,7 +18,7 @@ index d5a5426..d376beb 100644
      public final MinecraftServer server;
      public final PlayerInteractManager playerInteractManager;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 10e8d03..a447add 100644
+index 1c4f3ae..0a64b74 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1368,6 +1368,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/CraftBukkit-Patches/0095-Cap-Entity-Collisions.patch b/CraftBukkit-Patches/0094-Cap-Entity-Collisions.patch
similarity index 97%
rename from CraftBukkit-Patches/0095-Cap-Entity-Collisions.patch
rename to CraftBukkit-Patches/0094-Cap-Entity-Collisions.patch
index 228d687..e163d40 100644
--- a/CraftBukkit-Patches/0095-Cap-Entity-Collisions.patch
+++ b/CraftBukkit-Patches/0094-Cap-Entity-Collisions.patch
@@ -1,4 +1,4 @@
-From 36860f6c094b72ec31c6a712ffcb00da1ef46451 Mon Sep 17 00:00:00 2001
+From f9444375dacbc45de265f56eef7fe55dd3456f41 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 31 Jan 2014 11:18:34 -0500
 Subject: [PATCH] Cap Entity Collisions
diff --git a/CraftBukkit-Patches/0096-Fix-dispensing-bone-meal-not-having-the-correct-data.patch b/CraftBukkit-Patches/0095-Fix-dispensing-bone-meal-not-having-the-correct-data.patch
similarity index 94%
rename from CraftBukkit-Patches/0096-Fix-dispensing-bone-meal-not-having-the-correct-data.patch
rename to CraftBukkit-Patches/0095-Fix-dispensing-bone-meal-not-having-the-correct-data.patch
index 2efd2ff..bf26b5f 100644
--- a/CraftBukkit-Patches/0096-Fix-dispensing-bone-meal-not-having-the-correct-data.patch
+++ b/CraftBukkit-Patches/0095-Fix-dispensing-bone-meal-not-having-the-correct-data.patch
@@ -1,4 +1,4 @@
-From add93632d60b3a3556f0e6336e301cc765c4bc7a Mon Sep 17 00:00:00 2001
+From b79c57a01659c5e04b1e28256f273588279ed26c Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Thu, 6 Feb 2014 21:59:20 +0000
 Subject: [PATCH] Fix dispensing bone meal not having the correct data value
diff --git a/CraftBukkit-Patches/0097-Spam-Filter-Exclusions.patch b/CraftBukkit-Patches/0096-Spam-Filter-Exclusions.patch
similarity index 94%
rename from CraftBukkit-Patches/0097-Spam-Filter-Exclusions.patch
rename to CraftBukkit-Patches/0096-Spam-Filter-Exclusions.patch
index 8214517..63eebae 100644
--- a/CraftBukkit-Patches/0097-Spam-Filter-Exclusions.patch
+++ b/CraftBukkit-Patches/0096-Spam-Filter-Exclusions.patch
@@ -1,11 +1,11 @@
-From 8cf7fcadc3da94902569c3f69087d0aba38039dd Mon Sep 17 00:00:00 2001
+From ad6e5f18ed1792f0460b6dd0a5c0ca76d601b1f2 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 8 Feb 2014 08:13:40 +0000
 Subject: [PATCH] Spam Filter Exclusions
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 7264dc5..59e98a6 100644
+index c7e40fe..fab0ee8 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -849,9 +849,19 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -30,7 +30,7 @@ index 7264dc5..59e98a6 100644
                      Waitable waitable = new Waitable() {
                          @Override
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index e26b964..5d65983 100644
+index b081c05..8fb3a82 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -6,6 +6,7 @@ import java.io.IOException;
diff --git a/CraftBukkit-Patches/0098-Add-Option-to-Silence-CommandBlock-Console.patch b/CraftBukkit-Patches/0097-Add-Option-to-Silence-CommandBlock-Console.patch
similarity index 93%
rename from CraftBukkit-Patches/0098-Add-Option-to-Silence-CommandBlock-Console.patch
rename to CraftBukkit-Patches/0097-Add-Option-to-Silence-CommandBlock-Console.patch
index 84de3c9..3dd367c 100644
--- a/CraftBukkit-Patches/0098-Add-Option-to-Silence-CommandBlock-Console.patch
+++ b/CraftBukkit-Patches/0097-Add-Option-to-Silence-CommandBlock-Console.patch
@@ -1,4 +1,4 @@
-From afa33ab6dec0316401df456f1076e5e771e74767 Mon Sep 17 00:00:00 2001
+From 8aa1c723981f397768a3f13cbf6aa5a341798bb7 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 9 Feb 2014 14:39:01 +1100
 Subject: [PATCH] Add Option to Silence CommandBlock Console
@@ -18,7 +18,7 @@ index 2676e9e..caced26 100644
          }
  
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 5d65983..d749f16 100644
+index 8fb3a82..8599688 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -272,4 +272,10 @@ public class SpigotConfig
diff --git a/CraftBukkit-Patches/0099-Add-support-for-fetching-hidden-players.patch b/CraftBukkit-Patches/0098-Add-support-for-fetching-hidden-players.patch
similarity index 91%
rename from CraftBukkit-Patches/0099-Add-support-for-fetching-hidden-players.patch
rename to CraftBukkit-Patches/0098-Add-support-for-fetching-hidden-players.patch
index b25c6be..dbd47b7 100644
--- a/CraftBukkit-Patches/0099-Add-support-for-fetching-hidden-players.patch
+++ b/CraftBukkit-Patches/0098-Add-support-for-fetching-hidden-players.patch
@@ -1,11 +1,11 @@
-From 4313d8729d3b334841c344ff81bda7c3d8674081 Mon Sep 17 00:00:00 2001
+From a7c77c95d55f41abdb0093ec79702e0da0584bf4 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Sun, 9 Feb 2014 14:03:03 -0500
 Subject: [PATCH] Add support for fetching hidden players
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a447add..3c4b42f 100644
+index 0a64b74..73e1423 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1374,6 +1374,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/CraftBukkit-Patches/0100-Allow-Disabling-Creative-Item-Filter.patch b/CraftBukkit-Patches/0099-Allow-Disabling-Creative-Item-Filter.patch
similarity index 93%
rename from CraftBukkit-Patches/0100-Allow-Disabling-Creative-Item-Filter.patch
rename to CraftBukkit-Patches/0099-Allow-Disabling-Creative-Item-Filter.patch
index dac6038..22bd3fa 100644
--- a/CraftBukkit-Patches/0100-Allow-Disabling-Creative-Item-Filter.patch
+++ b/CraftBukkit-Patches/0099-Allow-Disabling-Creative-Item-Filter.patch
@@ -1,11 +1,11 @@
-From 91ce61222909a0543ab6f2e13f15705e615f41de Mon Sep 17 00:00:00 2001
+From a83c1167ddabed22da7a378984646fa8fdf89d52 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 12 Feb 2014 18:18:01 +1100
 Subject: [PATCH] Allow Disabling Creative Item Filter
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index f778871..aac1449 100644
+index fab0ee8..0e46f3b 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1497,7 +1497,7 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -18,7 +18,7 @@ index f778871..aac1449 100644
  
              // CraftBukkit start - Call click event
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index d749f16..0d0c7b0 100644
+index 8599688..95e9f72 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -278,4 +278,10 @@ public class SpigotConfig
diff --git a/CraftBukkit-Patches/0101-Cap-Channel-Registrations.patch b/CraftBukkit-Patches/0100-Cap-Channel-Registrations.patch
similarity index 89%
rename from CraftBukkit-Patches/0101-Cap-Channel-Registrations.patch
rename to CraftBukkit-Patches/0100-Cap-Channel-Registrations.patch
index 1f9f6cf..e2cedbb 100644
--- a/CraftBukkit-Patches/0101-Cap-Channel-Registrations.patch
+++ b/CraftBukkit-Patches/0100-Cap-Channel-Registrations.patch
@@ -1,11 +1,11 @@
-From 7ba6792c3311566dbf20bd424739c09add59c1fe Mon Sep 17 00:00:00 2001
+From 5784ed33b2e9c9a5b05f72d3f31bd2e23073c90f Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 12 Feb 2014 20:02:58 +1100
 Subject: [PATCH] Cap Channel Registrations
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3c4b42f..41e785c 100644
+index 73e1423..a88aec4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1056,6 +1056,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/CraftBukkit-Patches/0102-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch b/CraftBukkit-Patches/0101-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch
similarity index 99%
rename from CraftBukkit-Patches/0102-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch
rename to CraftBukkit-Patches/0101-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch
index ad220fe..9b1b8ed 100644
--- a/CraftBukkit-Patches/0102-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch
+++ b/CraftBukkit-Patches/0101-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch
@@ -1,4 +1,4 @@
-From 79629b915ac0ca95348c8666cdcde4443b0f7104 Mon Sep 17 00:00:00 2001
+From 4d2c8e898c3b74a6561c51aefdfb570f23db4cc1 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Wed, 12 Feb 2014 20:44:14 +0000
 Subject: [PATCH] Allow vanilla commands to be the main version of a command
diff --git a/CraftBukkit-Patches/0103-Unfinalize-the-isDisconnected-method-by-bukkit.patch b/CraftBukkit-Patches/0102-Unfinalize-the-isDisconnected-method-by-bukkit.patch
similarity index 90%
rename from CraftBukkit-Patches/0103-Unfinalize-the-isDisconnected-method-by-bukkit.patch
rename to CraftBukkit-Patches/0102-Unfinalize-the-isDisconnected-method-by-bukkit.patch
index 3e39e24..72d961a 100644
--- a/CraftBukkit-Patches/0103-Unfinalize-the-isDisconnected-method-by-bukkit.patch
+++ b/CraftBukkit-Patches/0102-Unfinalize-the-isDisconnected-method-by-bukkit.patch
@@ -1,4 +1,4 @@
-From 9eea6333eb760d6e38a536ffabc0cc91ddf36ca9 Mon Sep 17 00:00:00 2001
+From 3b139e85ed73a132cdabd154374e843de01a1c15 Mon Sep 17 00:00:00 2001
 From: hcherndon <hcherndon@gmail.com>
 Date: Sat, 15 Feb 2014 01:51:20 -0600
 Subject: [PATCH] Unfinalize the isDisconnected() method by bukkit.
@@ -6,7 +6,7 @@ Subject: [PATCH] Unfinalize the isDisconnected() method by bukkit.
 This would literally mean the world to me. You have no idea how much this method being final is fucking me over right now. (Working with NPC's and what not.)
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index aac1449..e88118f 100644
+index 0e46f3b..999cb64 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1883,7 +1883,7 @@ public class PlayerConnection implements PacketPlayInListener {
diff --git a/CraftBukkit-Patches/0104-Implement-Silenceable-Lightning-API.patch b/CraftBukkit-Patches/0103-Implement-Silenceable-Lightning-API.patch
similarity index 98%
rename from CraftBukkit-Patches/0104-Implement-Silenceable-Lightning-API.patch
rename to CraftBukkit-Patches/0103-Implement-Silenceable-Lightning-API.patch
index 9ed66c5..5e4951b 100644
--- a/CraftBukkit-Patches/0104-Implement-Silenceable-Lightning-API.patch
+++ b/CraftBukkit-Patches/0103-Implement-Silenceable-Lightning-API.patch
@@ -1,4 +1,4 @@
-From ab9d03a7e3cf7aa9922ce671434c106a12635755 Mon Sep 17 00:00:00 2001
+From d8fd5aa4cac6fa5c98fd46d95c64bb2daf5d23b3 Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Sun, 23 Feb 2014 16:16:59 -0400
 Subject: [PATCH] Implement Silenceable Lightning API
diff --git a/CraftBukkit-Patches/0105-Use-one-PermissibleBase-for-all-Command-Blocks.patch b/CraftBukkit-Patches/0104-Use-one-PermissibleBase-for-all-Command-Blocks.patch
similarity index 94%
rename from CraftBukkit-Patches/0105-Use-one-PermissibleBase-for-all-Command-Blocks.patch
rename to CraftBukkit-Patches/0104-Use-one-PermissibleBase-for-all-Command-Blocks.patch
index 2099cca..9187d67 100644
--- a/CraftBukkit-Patches/0105-Use-one-PermissibleBase-for-all-Command-Blocks.patch
+++ b/CraftBukkit-Patches/0104-Use-one-PermissibleBase-for-all-Command-Blocks.patch
@@ -1,4 +1,4 @@
-From 799336a6fdbd9687f7c279aaf12e216841a5ff27 Mon Sep 17 00:00:00 2001
+From e72efb7aebb4993bdba19ae25a25462fb7fbda62 Mon Sep 17 00:00:00 2001
 From: FrozenBrain <carstenbamsti@googlemail.com>
 Date: Sun, 2 Mar 2014 21:13:46 +0100
 Subject: [PATCH] Use one PermissibleBase for all Command Blocks
diff --git a/CraftBukkit-Patches/0106-Prevent-hoppers-from-loading-chunks.patch b/CraftBukkit-Patches/0105-Prevent-hoppers-from-loading-chunks.patch
similarity index 93%
rename from CraftBukkit-Patches/0106-Prevent-hoppers-from-loading-chunks.patch
rename to CraftBukkit-Patches/0105-Prevent-hoppers-from-loading-chunks.patch
index 54d348c..9ad65e5 100644
--- a/CraftBukkit-Patches/0106-Prevent-hoppers-from-loading-chunks.patch
+++ b/CraftBukkit-Patches/0105-Prevent-hoppers-from-loading-chunks.patch
@@ -1,4 +1,4 @@
-From 747b675639b7fbf0f17edf9f00c0d96e1ca5ff1a Mon Sep 17 00:00:00 2001
+From 7afa8817c8280404791b8f3c917bec9929f52daf Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Wed, 5 Mar 2014 20:27:27 +0000
 Subject: [PATCH] Prevent hoppers from loading chunks
diff --git a/CraftBukkit-Patches/0107-Guard-Entity-List.patch b/CraftBukkit-Patches/0106-Guard-Entity-List.patch
similarity index 92%
rename from CraftBukkit-Patches/0107-Guard-Entity-List.patch
rename to CraftBukkit-Patches/0106-Guard-Entity-List.patch
index 369fc4f..b36c74a 100644
--- a/CraftBukkit-Patches/0107-Guard-Entity-List.patch
+++ b/CraftBukkit-Patches/0106-Guard-Entity-List.patch
@@ -1,11 +1,11 @@
-From 129b22a1e1c40e55fede0417d3bef984844b4c3f Mon Sep 17 00:00:00 2001
+From 608e3ed2394c8618e8c10ba93e561c6ab2906f38 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 10 Mar 2014 09:03:28 +1100
 Subject: [PATCH] Guard Entity List
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 1d8caf9..3ad24a3 100644
+index c3f9a0e..37bfdda 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -31,7 +31,32 @@ import org.bukkit.event.weather.ThunderChangeEvent;
@@ -50,7 +50,7 @@ index 1d8caf9..3ad24a3 100644
      protected final net.minecraft.util.gnu.trove.map.hash.TLongShortHashMap chunkTickList;
      protected float growthOdds = 100;
      protected float modifiedOdds = 100;
-@@ -1354,6 +1380,7 @@ public abstract class World implements IBlockAccess {
+@@ -1345,6 +1371,7 @@ public abstract class World implements IBlockAccess {
  
          org.spigotmc.ActivationRange.activateEntities(this); // Spigot
          timings.entityTick.startTiming(); // Spigot
@@ -58,7 +58,7 @@ index 1d8caf9..3ad24a3 100644
          // CraftBukkit start - Use field for loop variable
          for (this.tickPosition = 0; this.tickPosition < this.entityList.size(); ++this.tickPosition) {
              entity = (Entity) this.entityList.get(this.tickPosition);
-@@ -1402,12 +1429,15 @@ public abstract class World implements IBlockAccess {
+@@ -1380,12 +1407,15 @@ public abstract class World implements IBlockAccess {
                      this.getChunkAt(j, k).b(entity);
                  }
  
diff --git a/CraftBukkit-Patches/0108-Fix-ConcurrentModificationException-while-being-idle.patch b/CraftBukkit-Patches/0107-Fix-ConcurrentModificationException-while-being-idle.patch
similarity index 91%
rename from CraftBukkit-Patches/0108-Fix-ConcurrentModificationException-while-being-idle.patch
rename to CraftBukkit-Patches/0107-Fix-ConcurrentModificationException-while-being-idle.patch
index 7549449..ff44624 100644
--- a/CraftBukkit-Patches/0108-Fix-ConcurrentModificationException-while-being-idle.patch
+++ b/CraftBukkit-Patches/0107-Fix-ConcurrentModificationException-while-being-idle.patch
@@ -1,4 +1,4 @@
-From d42c7e1721e42d557b5763058c70678442f287b3 Mon Sep 17 00:00:00 2001
+From c7d61cf19a9c01acb16f099621debd576552b315 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Tue, 14 Jan 2014 20:11:25 +0000
 Subject: [PATCH] Fix ConcurrentModificationException while being idle kicked
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix ConcurrentModificationException while being idle kicked
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 091b04d..caf3244 100644
+index 37bfdda..d1390fc 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1127,23 +1127,24 @@ public abstract class World implements IBlockAccess {
+@@ -1130,23 +1130,24 @@ public abstract class World implements IBlockAccess {
              this.players.remove(entity);
              this.everyoneSleeping();
          }
diff --git a/CraftBukkit-Patches/0109-Cancellable-WitherSkull-potion-effect.patch b/CraftBukkit-Patches/0108-Cancellable-WitherSkull-potion-effect.patch
similarity index 96%
rename from CraftBukkit-Patches/0109-Cancellable-WitherSkull-potion-effect.patch
rename to CraftBukkit-Patches/0108-Cancellable-WitherSkull-potion-effect.patch
index fc13f90..013322a 100644
--- a/CraftBukkit-Patches/0109-Cancellable-WitherSkull-potion-effect.patch
+++ b/CraftBukkit-Patches/0108-Cancellable-WitherSkull-potion-effect.patch
@@ -1,4 +1,4 @@
-From 4caf32f5cb86d99be688374c6f7f23c51c5b87e7 Mon Sep 17 00:00:00 2001
+From c4bafc2cb6c40ea532799189d1802c0df16bea10 Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Tue, 25 Feb 2014 15:15:26 -0400
 Subject: [PATCH] Cancellable WitherSkull potion effect
diff --git a/CraftBukkit-Patches/0110-Descriptive-kick-reasons-instead-of-Nope.patch b/CraftBukkit-Patches/0109-Descriptive-kick-reasons-instead-of-Nope.patch
similarity index 95%
rename from CraftBukkit-Patches/0110-Descriptive-kick-reasons-instead-of-Nope.patch
rename to CraftBukkit-Patches/0109-Descriptive-kick-reasons-instead-of-Nope.patch
index 4106f51..8f575cc 100644
--- a/CraftBukkit-Patches/0110-Descriptive-kick-reasons-instead-of-Nope.patch
+++ b/CraftBukkit-Patches/0109-Descriptive-kick-reasons-instead-of-Nope.patch
@@ -1,11 +1,11 @@
-From 5e20b001874e3bd4ec3b4d0c709e8382257d9178 Mon Sep 17 00:00:00 2001
+From 24f3c8df08c01148aa41f8152c610f8414fa315d Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Sat, 15 Mar 2014 01:30:05 -0400
 Subject: [PATCH] Descriptive kick reasons instead of Nope!
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index c542460..961927b 100644
+index 7f80895..5ac54e3 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -220,7 +220,7 @@ public abstract class Entity {
@@ -27,7 +27,7 @@ index c542460..961927b 100644
              f1 = 0;
          }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index dad69ac..2f6449e 100644
+index 999cb64..c4c7b7b 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -184,7 +184,7 @@ public class PlayerConnection implements PacketPlayInListener {
diff --git a/CraftBukkit-Patches/0111-Check-for-manually-prefixed-commands-or-commands-tha.patch b/CraftBukkit-Patches/0110-Check-for-manually-prefixed-commands-or-commands-tha.patch
similarity index 95%
rename from CraftBukkit-Patches/0111-Check-for-manually-prefixed-commands-or-commands-tha.patch
rename to CraftBukkit-Patches/0110-Check-for-manually-prefixed-commands-or-commands-tha.patch
index 134e84b..355c821 100644
--- a/CraftBukkit-Patches/0111-Check-for-manually-prefixed-commands-or-commands-tha.patch
+++ b/CraftBukkit-Patches/0110-Check-for-manually-prefixed-commands-or-commands-tha.patch
@@ -1,4 +1,4 @@
-From 699d1bd9c9c22b923c57d7e25875ddd32d3d922f Mon Sep 17 00:00:00 2001
+From 24065afbbbbbb6b8c9d4ac0987195174828add8f Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Sun, 23 Mar 2014 01:12:10 +0000
 Subject: [PATCH] Check for manually prefixed commands or commands that don't
diff --git a/CraftBukkit-Patches/0112-Cap-window-names-to-prevent-client-disconnects.patch b/CraftBukkit-Patches/0111-Cap-window-names-to-prevent-client-disconnects.patch
similarity index 93%
rename from CraftBukkit-Patches/0112-Cap-window-names-to-prevent-client-disconnects.patch
rename to CraftBukkit-Patches/0111-Cap-window-names-to-prevent-client-disconnects.patch
index 18de698..2a13e99 100644
--- a/CraftBukkit-Patches/0112-Cap-window-names-to-prevent-client-disconnects.patch
+++ b/CraftBukkit-Patches/0111-Cap-window-names-to-prevent-client-disconnects.patch
@@ -1,4 +1,4 @@
-From 7fc41814a8f9d95b7afd30d387dbdbc438a11c8f Mon Sep 17 00:00:00 2001
+From 8e8956443a18f97c462db55df0d3fffad9734a3e Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Sun, 23 Mar 2014 10:53:48 +0000
 Subject: [PATCH] Cap window names to prevent client disconnects
diff --git a/CraftBukkit-Patches/0113-Enable-Improved-Ping-Sending.patch b/CraftBukkit-Patches/0112-Enable-Improved-Ping-Sending.patch
similarity index 97%
rename from CraftBukkit-Patches/0113-Enable-Improved-Ping-Sending.patch
rename to CraftBukkit-Patches/0112-Enable-Improved-Ping-Sending.patch
index 3123ed3..25f03f8 100644
--- a/CraftBukkit-Patches/0113-Enable-Improved-Ping-Sending.patch
+++ b/CraftBukkit-Patches/0112-Enable-Improved-Ping-Sending.patch
@@ -1,4 +1,4 @@
-From e5d733c9605e34ad079ea1223241f187b5546833 Mon Sep 17 00:00:00 2001
+From 185eb9d55d60f7805350b60dedd2128b90686380 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 24 Feb 2013 20:45:20 +1100
 Subject: [PATCH] Enable Improved Ping Sending
diff --git a/CraftBukkit-Patches/0114-Configurable-dragon-death-and-wither-spawn-sounds.patch b/CraftBukkit-Patches/0113-Configurable-dragon-death-and-wither-spawn-sounds.patch
similarity index 97%
rename from CraftBukkit-Patches/0114-Configurable-dragon-death-and-wither-spawn-sounds.patch
rename to CraftBukkit-Patches/0113-Configurable-dragon-death-and-wither-spawn-sounds.patch
index 2b67b37..3cf3ad9 100644
--- a/CraftBukkit-Patches/0114-Configurable-dragon-death-and-wither-spawn-sounds.patch
+++ b/CraftBukkit-Patches/0113-Configurable-dragon-death-and-wither-spawn-sounds.patch
@@ -1,4 +1,4 @@
-From 853b83fe25a31dd0c9a702b32aa8487dbe00fa47 Mon Sep 17 00:00:00 2001
+From 15b8b8a5a98f77bb8e0704d419019882daa06b9a Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Sat, 29 Mar 2014 13:44:25 -0400
 Subject: [PATCH] Configurable dragon death and wither spawn sounds
@@ -25,7 +25,7 @@ index dbf30cb..64b0992 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java
-index 352f739..2c7d9f6 100644
+index 906428d..0fd0016 100644
 --- a/src/main/java/net/minecraft/server/EntityWither.java
 +++ b/src/main/java/net/minecraft/server/EntityWither.java
 @@ -173,7 +173,14 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
diff --git a/CraftBukkit-Patches/0116-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch b/CraftBukkit-Patches/0114-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch
similarity index 92%
rename from CraftBukkit-Patches/0116-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch
rename to CraftBukkit-Patches/0114-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch
index 04f195a..e4651cc 100644
--- a/CraftBukkit-Patches/0116-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch
+++ b/CraftBukkit-Patches/0114-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch
@@ -1,4 +1,4 @@
-From d49531ce73bdaa0dce7c687d4ee4908ca274e58a Mon Sep 17 00:00:00 2001
+From 7fbb6008b507fa6ead4a652bf6d8ac9eae76f3cf Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Fri, 11 Apr 2014 11:16:34 +0100
 Subject: [PATCH] Display 'Spigot' in client crashes, server lists and Mojang
diff --git a/CraftBukkit-Patches/0115-Fix-TileEntities-getting-ticked-after-being-queued-f.patch b/CraftBukkit-Patches/0115-Fix-TileEntities-getting-ticked-after-being-queued-f.patch
deleted file mode 100644
index e7ddf69..0000000
--- a/CraftBukkit-Patches/0115-Fix-TileEntities-getting-ticked-after-being-queued-f.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 2d9138dc3f2c4ca53182bcd514bdb54b9f0eaa67 Mon Sep 17 00:00:00 2001
-From: FrozenBrain <carstenbamsti@googlemail.com>
-Date: Sun, 23 Mar 2014 01:49:13 +0100
-Subject: [PATCH] Fix TileEntities getting ticked after being queued for
- removal
-
-
-diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index caf3244..64ac7ee 100644
---- a/src/main/java/net/minecraft/server/World.java
-+++ b/src/main/java/net/minecraft/server/World.java
-@@ -1443,6 +1443,12 @@ public abstract class World implements IBlockAccess {
-         timings.entityTick.stopTiming(); // Spigot
-         this.methodProfiler.c("blockEntities");
-         timings.tileEntityTick.startTiming(); // Spigot
-+        // Spigot start - brought up from below
-+        if (!this.b.isEmpty()) {
-+            this.tileEntityList.removeAll(this.b);
-+            this.b.clear();
-+        }
-+        // Spigot End
-         this.M = true;
-         Iterator iterator = this.tileEntityList.iterator();
- 
-@@ -1491,10 +1497,6 @@ public abstract class World implements IBlockAccess {
-         timings.tileEntityTick.stopTiming(); // Spigot
-         timings.tileEntityPending.startTiming(); // Spigot
-         this.M = false;
--        if (!this.b.isEmpty()) {
--            this.tileEntityList.removeAll(this.b);
--            this.b.clear();
--        }
- 
-         this.methodProfiler.c("pendingBlockEntities");
-         if (!this.a.isEmpty()) {
--- 
-1.9.1
-
diff --git a/CraftBukkit-Patches/0117-Old-New-Version-Support.patch b/CraftBukkit-Patches/0115-Old-New-Version-Support.patch
similarity index 99%
rename from CraftBukkit-Patches/0117-Old-New-Version-Support.patch
rename to CraftBukkit-Patches/0115-Old-New-Version-Support.patch
index 4abb1d5..51095d8 100644
--- a/CraftBukkit-Patches/0117-Old-New-Version-Support.patch
+++ b/CraftBukkit-Patches/0115-Old-New-Version-Support.patch
@@ -1,4 +1,4 @@
-From 931e0c81803ef91fe863b7f809e209418adb6286 Mon Sep 17 00:00:00 2001
+From ef001a3dfd152d00888dcbb692738f3660806b9e Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 12 Apr 2014 15:11:15 +1000
 Subject: [PATCH] Old / New Version Support.
diff --git a/CraftBukkit-Patches/0118-Treat-Bungee-as-Online-Mode.patch b/CraftBukkit-Patches/0116-Treat-Bungee-as-Online-Mode.patch
similarity index 94%
rename from CraftBukkit-Patches/0118-Treat-Bungee-as-Online-Mode.patch
rename to CraftBukkit-Patches/0116-Treat-Bungee-as-Online-Mode.patch
index ee16229..5d821b3 100644
--- a/CraftBukkit-Patches/0118-Treat-Bungee-as-Online-Mode.patch
+++ b/CraftBukkit-Patches/0116-Treat-Bungee-as-Online-Mode.patch
@@ -1,4 +1,4 @@
-From a2d842a297f1a3fb9e14121f6a140c0e00ea28c7 Mon Sep 17 00:00:00 2001
+From 892ba8ecedfb269f8b43acf9db22cb1f8ce47c14 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 12 Apr 2014 21:23:58 +1000
 Subject: [PATCH] Treat Bungee as Online Mode
diff --git a/CraftBukkit-Patches/0119-Fix-several-occurances-of-missed-diff.patch b/CraftBukkit-Patches/0117-Fix-several-occurances-of-missed-diff.patch
similarity index 97%
rename from CraftBukkit-Patches/0119-Fix-several-occurances-of-missed-diff.patch
rename to CraftBukkit-Patches/0117-Fix-several-occurances-of-missed-diff.patch
index e6179d8..a285337 100644
--- a/CraftBukkit-Patches/0119-Fix-several-occurances-of-missed-diff.patch
+++ b/CraftBukkit-Patches/0117-Fix-several-occurances-of-missed-diff.patch
@@ -1,4 +1,4 @@
-From 335fcf9c78363c270df947932490c1f5bddd224b Mon Sep 17 00:00:00 2001
+From 40b63391e52749efa26b34850c436c9b674f5a8a Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 12 Apr 2014 17:49:14 +1000
 Subject: [PATCH] Fix several occurances of missed diff.
@@ -44,7 +44,7 @@ index 0f1bcc7..5eb893f 100644
  
      public void setItemStack(ItemStack itemstack) {
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index b1098bb..805d24f 100644
+index c4c7b7b..d7dff1e 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1736,7 +1736,7 @@ public class PlayerConnection implements PacketPlayInListener {
diff --git a/CraftBukkit-Patches/0120-Fix-PlayerFishEvent-not-properly-cancelling.-Fixes-B.patch b/CraftBukkit-Patches/0118-Fix-PlayerFishEvent-not-properly-cancelling.-Fixes-B.patch
similarity index 97%
rename from CraftBukkit-Patches/0120-Fix-PlayerFishEvent-not-properly-cancelling.-Fixes-B.patch
rename to CraftBukkit-Patches/0118-Fix-PlayerFishEvent-not-properly-cancelling.-Fixes-B.patch
index bab9c78..d0bd7b0 100644
--- a/CraftBukkit-Patches/0120-Fix-PlayerFishEvent-not-properly-cancelling.-Fixes-B.patch
+++ b/CraftBukkit-Patches/0118-Fix-PlayerFishEvent-not-properly-cancelling.-Fixes-B.patch
@@ -1,4 +1,4 @@
-From 9d3b6ecfb30781d5dc72ae6c3b3f53afe8edc0b4 Mon Sep 17 00:00:00 2001
+From 1246287b37f9ff3c090c1f0929e888ec10632fee 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
diff --git a/CraftBukkit-Patches/0121-Update-Warning.patch b/CraftBukkit-Patches/0119-Update-Warning.patch
similarity index 97%
rename from CraftBukkit-Patches/0121-Update-Warning.patch
rename to CraftBukkit-Patches/0119-Update-Warning.patch
index ab5b1bf..4f35fa4 100644
--- a/CraftBukkit-Patches/0121-Update-Warning.patch
+++ b/CraftBukkit-Patches/0119-Update-Warning.patch
@@ -1,4 +1,4 @@
-From e64ddd03c83d1d9ed8e9609990095c6290f1213f Mon Sep 17 00:00:00 2001
+From 10edd2dbde1ca511b58cee4af642b02e3491e557 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 12 Apr 2014 21:37:12 +1000
 Subject: [PATCH] Update Warning
diff --git a/CraftBukkit-Patches/0122-Add-Conversion-Message.patch b/CraftBukkit-Patches/0120-Add-Conversion-Message.patch
similarity index 91%
rename from CraftBukkit-Patches/0122-Add-Conversion-Message.patch
rename to CraftBukkit-Patches/0120-Add-Conversion-Message.patch
index a1b7681..acb1088 100644
--- a/CraftBukkit-Patches/0122-Add-Conversion-Message.patch
+++ b/CraftBukkit-Patches/0120-Add-Conversion-Message.patch
@@ -1,4 +1,4 @@
-From bfbd35e8061cc853f1deba161c1e039defb66204 Mon Sep 17 00:00:00 2001
+From 81daaf978cc7660e89e09dc7df84f20187adab17 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 12 Apr 2014 23:30:44 +1000
 Subject: [PATCH] Add Conversion Message
diff --git a/CraftBukkit-Patches/0123-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch b/CraftBukkit-Patches/0121-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch
similarity index 94%
rename from CraftBukkit-Patches/0123-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch
rename to CraftBukkit-Patches/0121-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch
index dfeb1ab..bbaef1d 100644
--- a/CraftBukkit-Patches/0123-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch
+++ b/CraftBukkit-Patches/0121-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch
@@ -1,4 +1,4 @@
-From 0eba175851493d73e028b910763a76490b877b27 Mon Sep 17 00:00:00 2001
+From 725b43bbdfb7bd5660ea1b03601505fee59af37b Mon Sep 17 00:00:00 2001
 From: "gjmcferrin@gmail.com" <gjmcferrin@gmail.com>
 Date: Mon, 10 Feb 2014 10:05:11 -0500
 Subject: [PATCH] Properly cancel fishing event. Fixes BUKKIT-5396
diff --git a/CraftBukkit-Patches/0124-Print-Stack-on-InternalException.patch b/CraftBukkit-Patches/0122-Print-Stack-on-InternalException.patch
similarity index 91%
rename from CraftBukkit-Patches/0124-Print-Stack-on-InternalException.patch
rename to CraftBukkit-Patches/0122-Print-Stack-on-InternalException.patch
index 7ada903..e32030a 100644
--- a/CraftBukkit-Patches/0124-Print-Stack-on-InternalException.patch
+++ b/CraftBukkit-Patches/0122-Print-Stack-on-InternalException.patch
@@ -1,4 +1,4 @@
-From ba26e310193b36995609d15512990322d7c65ab7 Mon Sep 17 00:00:00 2001
+From 0503d3956ebb35516d1fb3aefeb0a91c52c9f6e7 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 13 Apr 2014 09:00:59 +1000
 Subject: [PATCH] Print Stack on InternalException
diff --git a/CraftBukkit-Patches/0125-Use-Offline-Player-Data-Once-if-Required.patch b/CraftBukkit-Patches/0123-Use-Offline-Player-Data-Once-if-Required.patch
similarity index 96%
rename from CraftBukkit-Patches/0125-Use-Offline-Player-Data-Once-if-Required.patch
rename to CraftBukkit-Patches/0123-Use-Offline-Player-Data-Once-if-Required.patch
index 3670e7b..f737700 100644
--- a/CraftBukkit-Patches/0125-Use-Offline-Player-Data-Once-if-Required.patch
+++ b/CraftBukkit-Patches/0123-Use-Offline-Player-Data-Once-if-Required.patch
@@ -1,4 +1,4 @@
-From 16452034e5dafd7f383355f3c10fd76de560ba87 Mon Sep 17 00:00:00 2001
+From c046aa2d62656be7460f6b9eab43c0ff3cce4092 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 13 Apr 2014 14:41:23 +1000
 Subject: [PATCH] Use Offline Player Data Once if Required.
diff --git a/CraftBukkit-Patches/0126-Use-Provided-Case-for-Non-Existent-Offline-Players.patch b/CraftBukkit-Patches/0124-Use-Provided-Case-for-Non-Existent-Offline-Players.patch
similarity index 92%
rename from CraftBukkit-Patches/0126-Use-Provided-Case-for-Non-Existent-Offline-Players.patch
rename to CraftBukkit-Patches/0124-Use-Provided-Case-for-Non-Existent-Offline-Players.patch
index 31e1d05..8fed6a1 100644
--- a/CraftBukkit-Patches/0126-Use-Provided-Case-for-Non-Existent-Offline-Players.patch
+++ b/CraftBukkit-Patches/0124-Use-Provided-Case-for-Non-Existent-Offline-Players.patch
@@ -1,4 +1,4 @@
-From 4a3230d12fb9213af05af3a8ce910b9983a72889 Mon Sep 17 00:00:00 2001
+From 6e2e4b565cb01d76c7c594d7a18b5074dbd3332c Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 14 Apr 2014 09:46:20 +1000
 Subject: [PATCH] Use Provided Case for Non Existent Offline Players
diff --git a/CraftBukkit-Patches/0127-Check-for-blank-OfflinePlayer-Names.patch b/CraftBukkit-Patches/0125-Check-for-blank-OfflinePlayer-Names.patch
similarity index 93%
rename from CraftBukkit-Patches/0127-Check-for-blank-OfflinePlayer-Names.patch
rename to CraftBukkit-Patches/0125-Check-for-blank-OfflinePlayer-Names.patch
index 8010ec1..7e6aded 100644
--- a/CraftBukkit-Patches/0127-Check-for-blank-OfflinePlayer-Names.patch
+++ b/CraftBukkit-Patches/0125-Check-for-blank-OfflinePlayer-Names.patch
@@ -1,4 +1,4 @@
-From 5b5dc34416b0f6b5d43a9a280023bfb8811c8f58 Mon Sep 17 00:00:00 2001
+From 20a93c40548f66651543fd2630f9f4cfe8df5476 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 14 Apr 2014 17:21:24 +1000
 Subject: [PATCH] Check for blank OfflinePlayer Names
diff --git a/CraftBukkit-Patches/0128-Fix-Player-Banning.patch b/CraftBukkit-Patches/0126-Fix-Player-Banning.patch
similarity index 96%
rename from CraftBukkit-Patches/0128-Fix-Player-Banning.patch
rename to CraftBukkit-Patches/0126-Fix-Player-Banning.patch
index 045fcb1..b9487d4 100644
--- a/CraftBukkit-Patches/0128-Fix-Player-Banning.patch
+++ b/CraftBukkit-Patches/0126-Fix-Player-Banning.patch
@@ -1,4 +1,4 @@
-From c75f7db7cb7f4c075eaa98d94408d4b9758b7f84 Mon Sep 17 00:00:00 2001
+From 0ca2d2019ccc3eaa07e896c7db44e7b1e578de14 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 15 Apr 2014 10:32:48 +1000
 Subject: [PATCH] Fix Player Banning
diff --git a/CraftBukkit-Patches/0129-Fix-ban-expire-dates.patch b/CraftBukkit-Patches/0127-Fix-ban-expire-dates.patch
similarity index 92%
rename from CraftBukkit-Patches/0129-Fix-ban-expire-dates.patch
rename to CraftBukkit-Patches/0127-Fix-ban-expire-dates.patch
index add12d6..57d6f52 100644
--- a/CraftBukkit-Patches/0129-Fix-ban-expire-dates.patch
+++ b/CraftBukkit-Patches/0127-Fix-ban-expire-dates.patch
@@ -1,4 +1,4 @@
-From c48761b57184d799e1466fe71ca77790f3e6cf3b Mon Sep 17 00:00:00 2001
+From 473fcc795695a8f1346923ef02b8e9b23bbd1133 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 16 Apr 2014 10:09:56 +1000
 Subject: [PATCH] Fix ban expire dates.
diff --git a/CraftBukkit-Patches/0130-Correct-Ban-Expiration.patch b/CraftBukkit-Patches/0128-Correct-Ban-Expiration.patch
similarity index 93%
rename from CraftBukkit-Patches/0130-Correct-Ban-Expiration.patch
rename to CraftBukkit-Patches/0128-Correct-Ban-Expiration.patch
index 650dd41..e4ff403 100644
--- a/CraftBukkit-Patches/0130-Correct-Ban-Expiration.patch
+++ b/CraftBukkit-Patches/0128-Correct-Ban-Expiration.patch
@@ -1,4 +1,4 @@
-From 688556a2c5b4b06f031eb8beed6fec1ea29ea32f Mon Sep 17 00:00:00 2001
+From d096f2134631db4cd4fcc65800736d86f5df5adf Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 16 Apr 2014 11:14:38 +1000
 Subject: [PATCH] Correct Ban Expiration
diff --git a/CraftBukkit-Patches/0131-Convert-Horses-owner-to-UUID.patch b/CraftBukkit-Patches/0129-Convert-Horses-owner-to-UUID.patch
similarity index 94%
rename from CraftBukkit-Patches/0131-Convert-Horses-owner-to-UUID.patch
rename to CraftBukkit-Patches/0129-Convert-Horses-owner-to-UUID.patch
index a77983a..6af0829 100644
--- a/CraftBukkit-Patches/0131-Convert-Horses-owner-to-UUID.patch
+++ b/CraftBukkit-Patches/0129-Convert-Horses-owner-to-UUID.patch
@@ -1,4 +1,4 @@
-From 2edcc188acc78287943dc579ce423f2e546ce559 Mon Sep 17 00:00:00 2001
+From 9cb9051ba2b73b56c68fc6d45b8e53d772713fa5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 16 Apr 2014 01:40:30 -0400
 Subject: [PATCH] Convert Horses owner to UUID
diff --git a/CraftBukkit-Patches/0132-Expand-team-API-to-allow-arbitrary-strings.patch b/CraftBukkit-Patches/0130-Expand-team-API-to-allow-arbitrary-strings.patch
similarity index 98%
rename from CraftBukkit-Patches/0132-Expand-team-API-to-allow-arbitrary-strings.patch
rename to CraftBukkit-Patches/0130-Expand-team-API-to-allow-arbitrary-strings.patch
index f782522..a5f12b1 100644
--- a/CraftBukkit-Patches/0132-Expand-team-API-to-allow-arbitrary-strings.patch
+++ b/CraftBukkit-Patches/0130-Expand-team-API-to-allow-arbitrary-strings.patch
@@ -1,4 +1,4 @@
-From eb571f2f2b6881b77d95492a77f3b73eae5a57e4 Mon Sep 17 00:00:00 2001
+From 073bf5baa97b516085241f96d6c3e4ae67d64a36 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Thu, 17 Apr 2014 19:22:22 +1000
 Subject: [PATCH] Expand team API to allow arbitrary strings.
diff --git a/CraftBukkit-Patches/0133-Add-Score.isScoreSet-Z-API.patch b/CraftBukkit-Patches/0131-Add-Score.isScoreSet-Z-API.patch
similarity index 96%
rename from CraftBukkit-Patches/0133-Add-Score.isScoreSet-Z-API.patch
rename to CraftBukkit-Patches/0131-Add-Score.isScoreSet-Z-API.patch
index 62962e7..5e76985 100644
--- a/CraftBukkit-Patches/0133-Add-Score.isScoreSet-Z-API.patch
+++ b/CraftBukkit-Patches/0131-Add-Score.isScoreSet-Z-API.patch
@@ -1,4 +1,4 @@
-From aadd0aa5e87fe8e1d6d130c47bae53a207634721 Mon Sep 17 00:00:00 2001
+From d16db3773d3d36c120f90515d325648d1786e6dc Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Thu, 17 Apr 2014 19:35:53 +1000
 Subject: [PATCH] Add Score.isScoreSet()Z API.
diff --git a/CraftBukkit-Patches/0134-Log-null-TileEntity-Owner.patch b/CraftBukkit-Patches/0132-Log-null-TileEntity-Owner.patch
similarity index 94%
rename from CraftBukkit-Patches/0134-Log-null-TileEntity-Owner.patch
rename to CraftBukkit-Patches/0132-Log-null-TileEntity-Owner.patch
index ae78ede..b3efebe 100644
--- a/CraftBukkit-Patches/0134-Log-null-TileEntity-Owner.patch
+++ b/CraftBukkit-Patches/0132-Log-null-TileEntity-Owner.patch
@@ -1,4 +1,4 @@
-From 56dd3bfecff92f6da808807057d11c33bc63b4d3 Mon Sep 17 00:00:00 2001
+From f27439a5bedeb06c756dc6bf1786aca45aa802fc Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 20 Apr 2014 11:16:54 +1000
 Subject: [PATCH] Log null TileEntity Owner
diff --git a/CraftBukkit-Patches/0135-Don-t-special-case-invalid-usernames-for-UUIDs.patch b/CraftBukkit-Patches/0133-Don-t-special-case-invalid-usernames-for-UUIDs.patch
similarity index 96%
rename from CraftBukkit-Patches/0135-Don-t-special-case-invalid-usernames-for-UUIDs.patch
rename to CraftBukkit-Patches/0133-Don-t-special-case-invalid-usernames-for-UUIDs.patch
index a74c410..8793883 100644
--- a/CraftBukkit-Patches/0135-Don-t-special-case-invalid-usernames-for-UUIDs.patch
+++ b/CraftBukkit-Patches/0133-Don-t-special-case-invalid-usernames-for-UUIDs.patch
@@ -1,4 +1,4 @@
-From cb7d74c21d70f489a2a9031d63ab929370ae98d0 Mon Sep 17 00:00:00 2001
+From a0b3ba34cd91a6f361b14c4ae9adcf8327902283 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 20 Apr 2014 18:58:00 +1000
 Subject: [PATCH] Don't special case 'invalid' usernames for UUIDs.
diff --git a/CraftBukkit-Patches/0136-Convert-player-skulls-async.patch b/CraftBukkit-Patches/0134-Convert-player-skulls-async.patch
similarity index 98%
rename from CraftBukkit-Patches/0136-Convert-player-skulls-async.patch
rename to CraftBukkit-Patches/0134-Convert-player-skulls-async.patch
index 28cbb99..3dd2b9a 100644
--- a/CraftBukkit-Patches/0136-Convert-player-skulls-async.patch
+++ b/CraftBukkit-Patches/0134-Convert-player-skulls-async.patch
@@ -1,4 +1,4 @@
-From 943d0348729b7ec03ab4fb9f52566267a4805d14 Mon Sep 17 00:00:00 2001
+From 4ea2fda60f12c175ca011f0cb14fbcbeaafebddf Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Sun, 20 Apr 2014 13:18:55 +0100
 Subject: [PATCH] Convert player skulls async
diff --git a/CraftBukkit-Patches/0137-Prevent-NoClassDefError-crash-and-notify-on-crash.patch b/CraftBukkit-Patches/0135-Prevent-NoClassDefError-crash-and-notify-on-crash.patch
similarity index 94%
rename from CraftBukkit-Patches/0137-Prevent-NoClassDefError-crash-and-notify-on-crash.patch
rename to CraftBukkit-Patches/0135-Prevent-NoClassDefError-crash-and-notify-on-crash.patch
index aebe2ee..a5e22c3 100644
--- a/CraftBukkit-Patches/0137-Prevent-NoClassDefError-crash-and-notify-on-crash.patch
+++ b/CraftBukkit-Patches/0135-Prevent-NoClassDefError-crash-and-notify-on-crash.patch
@@ -1,11 +1,11 @@
-From 874cf032c7bff55b2320913d064aa4713a861b40 Mon Sep 17 00:00:00 2001
+From 1ba26ea13f3a8ee262e742acfbc4efb17f9f7826 Mon Sep 17 00:00:00 2001
 From: David <dmck2b@gmail.com>
 Date: Mon, 21 Apr 2014 12:43:08 +0100
 Subject: [PATCH] Prevent NoClassDefError crash and notify on crash
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 64ac7ee..a879ae3 100644
+index d1390fc..f429a88 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -111,6 +111,8 @@ public abstract class World implements IBlockAccess {
@@ -17,7 +17,7 @@ index 64ac7ee..a879ae3 100644
  
      public static long chunkToKey(int x, int z)
      {
-@@ -628,6 +630,9 @@ public abstract class World implements IBlockAccess {
+@@ -631,6 +633,9 @@ public abstract class World implements IBlockAccess {
                  // CraftBukkit end
  
                  block1.doPhysics(this, i, j, k, block);
diff --git a/CraftBukkit-Patches/0138-Check-Skull-canPlace.patch b/CraftBukkit-Patches/0136-Check-Skull-canPlace.patch
similarity index 92%
rename from CraftBukkit-Patches/0138-Check-Skull-canPlace.patch
rename to CraftBukkit-Patches/0136-Check-Skull-canPlace.patch
index 4641f33..96d6956 100644
--- a/CraftBukkit-Patches/0138-Check-Skull-canPlace.patch
+++ b/CraftBukkit-Patches/0136-Check-Skull-canPlace.patch
@@ -1,4 +1,4 @@
-From b835696485dcca66dc6e9be1d76078067a2f7ffd Mon Sep 17 00:00:00 2001
+From 147ce13012f41896e47a8f693e2029d48d0f088e Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 15 Apr 2014 10:48:35 +1000
 Subject: [PATCH] Check Skull canPlace
diff --git a/CraftBukkit-Patches/0139-Don-t-let-trees-replace-any-block.patch b/CraftBukkit-Patches/0137-Don-t-let-trees-replace-any-block.patch
similarity index 95%
rename from CraftBukkit-Patches/0139-Don-t-let-trees-replace-any-block.patch
rename to CraftBukkit-Patches/0137-Don-t-let-trees-replace-any-block.patch
index 1dac20b..cdff26c 100644
--- a/CraftBukkit-Patches/0139-Don-t-let-trees-replace-any-block.patch
+++ b/CraftBukkit-Patches/0137-Don-t-let-trees-replace-any-block.patch
@@ -1,4 +1,4 @@
-From b19714fdfdca0f8cb4db05bf7ad94114fe414410 Mon Sep 17 00:00:00 2001
+From 78b4967cb13b8f992a095cfc647280f2842ac204 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Mon, 20 Jan 2014 20:42:28 +0000
 Subject: [PATCH] Don't let trees replace any block.
diff --git a/CraftBukkit-Patches/0140-Fix-race-condition-that-could-kill-connections-befor.patch b/CraftBukkit-Patches/0138-Fix-race-condition-that-could-kill-connections-befor.patch
similarity index 97%
rename from CraftBukkit-Patches/0140-Fix-race-condition-that-could-kill-connections-befor.patch
rename to CraftBukkit-Patches/0138-Fix-race-condition-that-could-kill-connections-befor.patch
index 36f1030..380f0e5 100644
--- a/CraftBukkit-Patches/0140-Fix-race-condition-that-could-kill-connections-befor.patch
+++ b/CraftBukkit-Patches/0138-Fix-race-condition-that-could-kill-connections-befor.patch
@@ -1,4 +1,4 @@
-From 04ed5e79aeca80f333d0e77ed7d515823bbfbb49 Mon Sep 17 00:00:00 2001
+From 2c205e33f6e7ebc06c434c3a9a328c9463cf80cb Mon Sep 17 00:00:00 2001
 From: Jonas Konrad <me@yawk.at>
 Date: Fri, 25 Apr 2014 23:46:46 +0200
 Subject: [PATCH] Fix race condition that could kill connections before they
diff --git a/CraftBukkit-Patches/0141-Configurable-UserCache-cap.patch b/CraftBukkit-Patches/0139-Configurable-UserCache-cap.patch
similarity index 93%
rename from CraftBukkit-Patches/0141-Configurable-UserCache-cap.patch
rename to CraftBukkit-Patches/0139-Configurable-UserCache-cap.patch
index 612a5d5..ac578e8 100644
--- a/CraftBukkit-Patches/0141-Configurable-UserCache-cap.patch
+++ b/CraftBukkit-Patches/0139-Configurable-UserCache-cap.patch
@@ -1,4 +1,4 @@
-From 16e041fdc87d319ec4d4546ceef8a0dbf6f0689e Mon Sep 17 00:00:00 2001
+From c850f78f39abb5228f1ed5d26567c35b5531635c Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Fri, 25 Apr 2014 18:17:30 -0400
 Subject: [PATCH] Configurable UserCache cap
@@ -18,7 +18,7 @@ index bcccaa9..ee8b6d6 100644
  
          try {
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 4703768..1d35846 100644
+index b40801e..ab302c2 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -298,4 +298,10 @@ public class SpigotConfig
diff --git a/CraftBukkit-Patches/0142-Implement-PlayerSpawnLocationEvent.patch b/CraftBukkit-Patches/0140-Implement-PlayerSpawnLocationEvent.patch
similarity index 96%
rename from CraftBukkit-Patches/0142-Implement-PlayerSpawnLocationEvent.patch
rename to CraftBukkit-Patches/0140-Implement-PlayerSpawnLocationEvent.patch
index 401e6f8..eccb1e2 100644
--- a/CraftBukkit-Patches/0142-Implement-PlayerSpawnLocationEvent.patch
+++ b/CraftBukkit-Patches/0140-Implement-PlayerSpawnLocationEvent.patch
@@ -1,4 +1,4 @@
-From 3997f4f83249d089f5a97aea09af25170e6b3433 Mon Sep 17 00:00:00 2001
+From b723a60eb349ee6fcefd781628e2b6220b573927 Mon Sep 17 00:00:00 2001
 From: ninja <xninja@openmailbox.org>
 Date: Tue, 8 Apr 2014 14:05:19 +0200
 Subject: [PATCH] Implement PlayerSpawnLocationEvent.
diff --git a/CraftBukkit-Patches/0143-Cap-Objective-Score-Length.patch b/CraftBukkit-Patches/0141-Cap-Objective-Score-Length.patch
similarity index 94%
rename from CraftBukkit-Patches/0143-Cap-Objective-Score-Length.patch
rename to CraftBukkit-Patches/0141-Cap-Objective-Score-Length.patch
index d156f06..60165d6 100644
--- a/CraftBukkit-Patches/0143-Cap-Objective-Score-Length.patch
+++ b/CraftBukkit-Patches/0141-Cap-Objective-Score-Length.patch
@@ -1,4 +1,4 @@
-From 305cd6fa0f2fb9a2286251694183544f1454d0ee Mon Sep 17 00:00:00 2001
+From fe0c334771b25b6f591beaf4bbb9905a6a34a26f Mon Sep 17 00:00:00 2001
 From: hauno <imhauno@gmail.com>
 Date: Tue, 6 May 2014 18:01:37 -0700
 Subject: [PATCH] Cap Objective Score Length
diff --git a/CraftBukkit-Patches/0144-Check-the-right-banlist-for-ip-bans.patch b/CraftBukkit-Patches/0142-Check-the-right-banlist-for-ip-bans.patch
similarity index 94%
rename from CraftBukkit-Patches/0144-Check-the-right-banlist-for-ip-bans.patch
rename to CraftBukkit-Patches/0142-Check-the-right-banlist-for-ip-bans.patch
index 89f55eb..255d86c 100644
--- a/CraftBukkit-Patches/0144-Check-the-right-banlist-for-ip-bans.patch
+++ b/CraftBukkit-Patches/0142-Check-the-right-banlist-for-ip-bans.patch
@@ -1,4 +1,4 @@
-From 424548c7c1f6846f867874f3fecc3d706bf5b9b2 Mon Sep 17 00:00:00 2001
+From 8ce5616f0b1024160381483dc6ce0ed898d5154f Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Wed, 7 May 2014 23:33:46 +0100
 Subject: [PATCH] Check the right banlist for ip bans
diff --git a/CraftBukkit-Patches/0145-Process-conversation-input-on-the-main-thread.-Fixes.patch b/CraftBukkit-Patches/0143-Process-conversation-input-on-the-main-thread.-Fixes.patch
similarity index 94%
rename from CraftBukkit-Patches/0145-Process-conversation-input-on-the-main-thread.-Fixes.patch
rename to CraftBukkit-Patches/0143-Process-conversation-input-on-the-main-thread.-Fixes.patch
index f0f0871..fc545b0 100644
--- a/CraftBukkit-Patches/0145-Process-conversation-input-on-the-main-thread.-Fixes.patch
+++ b/CraftBukkit-Patches/0143-Process-conversation-input-on-the-main-thread.-Fixes.patch
@@ -1,4 +1,4 @@
-From 1b5f25c89db42d48a6140d1a2e17e11c53ca71a7 Mon Sep 17 00:00:00 2001
+From 8ca523f991cd751d079cad96e0222564263c1f6b Mon Sep 17 00:00:00 2001
 From: riking <rikingcoding@gmail.com>
 Date: Wed, 14 May 2014 13:46:48 -0700
 Subject: [PATCH] Process conversation input on the main thread. Fixes
@@ -6,7 +6,7 @@ Subject: [PATCH] Process conversation input on the main thread. Fixes
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 58ae547..d8d7a70 100644
+index d7dff1e..c6fbf44 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -834,7 +834,25 @@ public class PlayerConnection implements PacketPlayInListener {
diff --git a/CraftBukkit-Patches/0147-Configurable-save-on-stop-only-for-UserCache.patch b/CraftBukkit-Patches/0144-Configurable-save-on-stop-only-for-UserCache.patch
similarity index 95%
rename from CraftBukkit-Patches/0147-Configurable-save-on-stop-only-for-UserCache.patch
rename to CraftBukkit-Patches/0144-Configurable-save-on-stop-only-for-UserCache.patch
index 65c3bd3..7ef3e27 100644
--- a/CraftBukkit-Patches/0147-Configurable-save-on-stop-only-for-UserCache.patch
+++ b/CraftBukkit-Patches/0144-Configurable-save-on-stop-only-for-UserCache.patch
@@ -1,4 +1,4 @@
-From b2169efce706955229fb6f7971522df6a1b311f1 Mon Sep 17 00:00:00 2001
+From 9e52f572e9a90e688c6698d8683c700265f652c5 Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Fri, 23 May 2014 18:05:10 -0400
 Subject: [PATCH] Configurable save-on-stop-only for UserCache
@@ -36,7 +36,7 @@ index ee8b6d6..cc178c6 100644
      }
  
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 1d35846..b00f635 100644
+index ab302c2..ae95a9e 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -304,4 +304,10 @@ public class SpigotConfig
diff --git a/CraftBukkit-Patches/0148-Prevent-Unbounded-IntCache-Growth.patch b/CraftBukkit-Patches/0145-Prevent-Unbounded-IntCache-Growth.patch
similarity index 96%
rename from CraftBukkit-Patches/0148-Prevent-Unbounded-IntCache-Growth.patch
rename to CraftBukkit-Patches/0145-Prevent-Unbounded-IntCache-Growth.patch
index 50aaa9e..37e2654 100644
--- a/CraftBukkit-Patches/0148-Prevent-Unbounded-IntCache-Growth.patch
+++ b/CraftBukkit-Patches/0145-Prevent-Unbounded-IntCache-Growth.patch
@@ -1,4 +1,4 @@
-From bcb5d85cb761fa898b684ad953bf253632d7d4be Mon Sep 17 00:00:00 2001
+From 5b85c7c38dbeff2976327f574bfe41ba17f350a8 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 20 Jun 2014 19:40:00 +1000
 Subject: [PATCH] Prevent Unbounded IntCache Growth
@@ -43,7 +43,7 @@ index 9858720..47e06df 100644
          }
      }
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index b00f635..5818cab 100644
+index ae95a9e..7c9b298 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -310,4 +310,10 @@ public class SpigotConfig
diff --git a/CraftBukkit-Patches/0146-Alternative-Hopper-Ticking.patch b/CraftBukkit-Patches/0146-Alternative-Hopper-Ticking.patch
index f6000f0..293da9f 100644
--- a/CraftBukkit-Patches/0146-Alternative-Hopper-Ticking.patch
+++ b/CraftBukkit-Patches/0146-Alternative-Hopper-Ticking.patch
@@ -1,4 +1,4 @@
-From ee57713dd00e22d5629a29410922ed293163e3fe Mon Sep 17 00:00:00 2001
+From 8209d8a46a505c4a154187e24327aaddfef4bc86 Mon Sep 17 00:00:00 2001
 From: "Evan A. Haskell" <eah2119@gmail.com>
 Date: Sat, 19 Apr 2014 16:58:26 -0400
 Subject: [PATCH] Alternative Hopper Ticking
@@ -45,10 +45,10 @@ index 9e64702..e1e626b 100644
 +    // Spigot end
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 2c95832..b5014b0 100644
+index 45ae199..2e8c1e5 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
-@@ -722,6 +722,11 @@ public class Chunk {
+@@ -750,6 +750,11 @@ public class Chunk {
  
              tileentity.t();
              this.tileEntities.put(chunkposition, tileentity);
@@ -369,7 +369,7 @@ index b620394..c7b3495 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index a879ae3..a2fa854 100644
+index f429a88..cb6efc0 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -113,6 +113,7 @@ public abstract class World implements IBlockAccess {
@@ -423,7 +423,7 @@ index a879ae3..a2fa854 100644
      // Spigot end
  
      public BiomeBase getBiome(int i, int j) {
-@@ -404,6 +441,14 @@ public abstract class World implements IBlockAccess {
+@@ -407,6 +444,14 @@ public abstract class World implements IBlockAccess {
                      this.notifyAndUpdatePhysics(i, j, k, chunk, block1, block, i1);
                  // CraftBukkit end
                  }
@@ -438,10 +438,13 @@ index a879ae3..a2fa854 100644
  
                  return flag;
              }
-@@ -1455,6 +1500,7 @@ public abstract class World implements IBlockAccess {
+@@ -1432,8 +1477,9 @@ public abstract class World implements IBlockAccess {
+             this.tileEntityList.removeAll(this.b);
+             this.b.clear();
          }
-         // Spigot End
-         this.M = true;
+-        // CraftBukkit end
++        // Spigot End
+ 
 +        this.initializeHoppers(); // Spigot - Initializes hoppers which have been added recently.
          Iterator iterator = this.tileEntityList.iterator();