From 50a70a29e42a609c07484371d2f0bbea327ef207 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 19 Apr 2014 09:15:23 +1000
Subject: [PATCH] More upstream merge

---
 CraftBukkit                                   |   2 +-
 .../0005-Spigot-Configuration.patch           |  20 +--
 .../0006-Better-Chunk-Tick-Selection.patch    |  10 +-
 .../0009-Merge-tweaks-and-configuration.patch |   8 +-
 .../0011-Async-Operation-Catching.patch       |  16 +--
 ...tch => 0014-Improved-Timings-System.patch} |  32 ++---
 ...0014-Sync-Free-Chunk-Reference-Cache.patch |  42 -------
 ...-Spawning-Relative-to-View-Distance.patch} |   4 +-
 ...h => 0016-Handle-Null-Tile-Entities.patch} |   8 +-
 ...tch => 0017-Entity-Activation-Range.patch} |   8 +-
 ...{0019-Metrics.patch => 0018-Metrics.patch} |   4 +-
 ...patch => 0019-PlayerItemDamageEvent.patch} |   4 +-
 ...ch => 0020-Faster-UUID-for-entities.patch} |   2 +-
 ...ch => 0021-Prevent-NPE-in-CraftSign.patch} |   4 +-
 ...atch => 0022-Entity-Tracking-Ranges.patch} |   4 +-
 ... => 0023-Limit-Custom-Map-Rendering.patch} |   4 +-
 ...ch => 0024-Thread-Naming-and-Tweaks.patch} |   4 +-
 ...h => 0025-Close-Unloaded-Save-Files.patch} |   6 +-
 ...ption.patch => 0026-Remove-o-Option.patch} |   4 +-
 ...patch => 0027-Recipe-Deconstruction.patch} |   4 +-
 ...I.patch => 0028-Implement-Arrow-API.patch} |   4 +-
 ...owns.patch => 0029-Hopper-Cooldowns.patch} |   6 +-
 ...patch => 0030-Prevent-Shutdown-Hang.patch} |   6 +-
 ...=> 0031-Implement-SpawnerSpawnEvent.patch} |   6 +-
 ...tch => 0032-Firework-Meta-Crash-Fix.patch} |   4 +-
 ...-Allow-Disabling-of-Command-Logging.patch} |   8 +-
 ...ow-Disabling-of-Command-TabComplete.patch} |   4 +-
 ...patch => 0035-Configurable-Messages.patch} |   4 +-
 ...isabling-of-Random-Lighting-Updates.patch} |   8 +-
 ... => 0037-Properly-Close-Inventories.patch} |   6 +-
 ...0038-Disallow-Interaction-With-Self.patch} |   8 +-
 ...ory.getItem-use-both-containers.-Fix.patch |  57 ---------
 ...tch => 0039-Lower-Chunk-Compression.patch} |   4 +-
 ...40-Entity-Mount-and-Dismount-Events.patch} |   2 +-
 ...ent-Ghost-Players-Caused-by-Plugins.patch} |   4 +-
 ...> 0042-Entity-ticking-chunk-caching.patch} |  14 +--
 ... 0043-Plug-World-Unload-Memory-Leak.patch} |   4 +-
 ....patch => 0044-Player-Collision-API.patch} |  10 +-
 ...y-Disable-Snooper-When-Not-Required.patch} |   6 +-
 ...d-Getter-for-Entity-Invulnerability.patch} |   4 +-
 ...ch => 0047-Cap-Minimum-Player-Speed.patch} |   6 +-
 ...and-Health-for-PlayerConsumeItemEve.patch} |   6 +-
 ...BlockEvent-for-Fire-Arrows-hitting-.patch} |   4 +-
 ...Disabling-of-1.6.3-Structure-Saving.patch} |   4 +-
 ...ate.patch => 0051-Item-Despawn-Rate.patch} |   4 +-
 ...052-Don-t-Special-Case-X-Move-Value.patch} |   6 +-
 ...patch => 0053-Implement-respawn-API.patch} |   6 +-
 ...-BrewingStands-Removing-NBT-Potions.patch} |   4 +-
 ...te.patch => 0055-Arrow-Despawn-Rate.patch} |   4 +-
 ...h => 0056-Fix-packed-ice-generation.patch} |   4 +-
 ...hread.patch => 0057-Watchdog-Thread.patch} |   6 +-
 ...ch => 0058-Clear-Flower-Pot-on-Drop.patch} |   4 +-
 ...chunks-not-being-sent-to-the-client.patch} |   4 +-
 ...patch => 0060-Fix-Broken-Async-Chat.patch} |   4 +-
 ...ortation-of-Vehicles-and-Passengers.patch} |   6 +-
 ...emove-OS-X-Special-Chars-from-Signs.patch} |   8 +-
 ...fuscator.patch => 0063-Orebfuscator.patch} |   8 +-
 ....patch => 0064-Optimize-DataWatcher.patch} |   4 +-
 ...ire-PreLogin-Events-in-Offline-Mode.patch} |   4 +-
 ...rt.patch => 0066-BungeeCord-Support.patch} |   6 +-
 ...isabling-Zombie-Villager-Aggression.patch} |   2 +-
 ...onfigurable-Amount-of-Netty-Threads.patch} |   6 +-
 ...ch => 0069-Prevent-Mineshaft-Saving.patch} |   4 +-
 ...-Log-Cause-of-Unexpected-Exceptions.patch} |   6 +-
 ...icle-API.patch => 0071-Particle-API.patch} |   2 +-
 ...> 0072-Fix-Biome-Decoration-Crashes.patch} |   4 +-
 ... => 0073-Save-ticks-lived-to-nbttag.patch} |   2 +-
 ...tch => 0074-More-Efficient-GetCubes.patch} |   8 +-
 ...-Option-to-Nerf-Mobs-from-Spawner-s.patch} |   2 +-
 ...Warn-if-PermGen-may-be-insufficient.patch} |   4 +-
 ...le-Connected-Check-on-setScoreboard.patch} |   6 +-
 ....patch => 0078-Add-Late-Bind-Option.patch} |   6 +-
 ...ow-statistics-to-be-disabled-forced.patch} |   4 +-
 ....patch => 0080-Fix-anvil-collisions.patch} |   4 +-
 ...0081-Fix-ItemStack-Unbreakable-Code.patch} |   4 +-
 ...hest-Animation-when-Cancelling-Event.patch | 117 ------------------
 ...ry-and-Debug-Crash-Reports-Crashing.patch} |   6 +-
 ...-Hand-when-BlockPlaceEvent-Cancelled.patch |  35 ------
 ... => 0083-Replace-AutoSave-Mechanism.patch} |   6 +-
 ...k-data-values-that-crash-the-client.patch} |   4 +-
 ...anilla-s-direction-tag-on-fireballs.patch} |   4 +-
 ...h => 0086-Support-non-prefixed-URLs.patch} |   2 +-
 ...ng-on-corrupted-map-data-NBT-arrays.patch} |   4 +-
 ...-ZombiePigmen-spawning-in-portal-bl.patch} |   4 +-
 ...rees-replace-any-block-when-growing.patch} |   4 +-
 ... => 0090-Highly-Optimized-Tick-Loop.patch} |   4 +-
 ...inks.patch => 0091-Add-Spigot-Links.patch} |   4 +-
 ... 0092-Configurable-Ping-Sample-Size.patch} |   4 +-
 ...=> 0093-Add-Optional-Tick-Shuffling.patch} |   4 +-
 ...Allow-Configuring-Chunks-per-Packet.patch} |   6 +-
 ...Implement-Locale-Getter-for-Players.patch} |   8 +-
 ...patch => 0096-Cap-Entity-Collisions.patch} |   2 +-
 ...ne-meal-not-having-the-correct-data.patch} |   4 +-
 ...atch => 0098-Spam-Filter-Exclusions.patch} |   6 +-
 ...ion-to-Silence-CommandBlock-Console.patch} |   4 +-
 ...support-for-fetching-hidden-players.patch} |   6 +-
 ...llow-Disabling-Creative-Item-Filter.patch} |   6 +-
 ...h => 0102-Cap-Channel-Registrations.patch} |   6 +-
 ...mands-to-be-the-main-version-of-a-c.patch} |   6 +-
 ...the-isDisconnected-method-by-bukkit.patch} |   6 +-
 ...Implement-Silenceable-Lightning-API.patch} |   2 +-
 ...paces-on-when-reading-a-chat-packet.patch} |   6 +-
 ...missibleBase-for-all-Command-Blocks.patch} |   4 +-
 ...Prevent-hoppers-from-loading-chunks.patch} |   6 +-
 ...ist.patch => 0109-Guard-Entity-List.patch} |  10 +-
 ...ificationException-while-being-idle.patch} |   8 +-
 ...ncellable-WitherSkull-potion-effect.patch} |   4 +-
 ...iptive-kick-reasons-instead-of-Nope.patch} |   4 +-
 ...y-prefixed-commands-or-commands-tha.patch} |   4 +-
 ...names-to-prevent-client-disconnects.patch} |   4 +-
 ...> 0115-Enable-Improved-Ping-Sending.patch} |   6 +-
 ...ragon-death-and-wither-spawn-sounds.patch} |   2 +-
 ...nchanting-tables-to-enchant-any-item.patch |  34 -----
 ...getting-ticked-after-being-queued-f.patch} |  10 +-
 ...-client-crashes-server-lists-and-Mo.patch} |   6 +-
 ...-lastChunkAccessed-if-it-is-unloaded.patch |  60 ---------
 ...tch => 0119-Old-New-Version-Support.patch} |   4 +-
 ...=> 0120-Treat-Bungee-as-Online-Mode.patch} |   6 +-
 ...x-several-occurances-of-missed-diff.patch} |   8 +-
 ...nt-not-properly-cancelling.-Fixes-B.patch} |   4 +-
 ...arning.patch => 0123-Update-Warning.patch} |   4 +-
 ...atch => 0124-Add-Conversion-Message.patch} |   6 +-
 ...el-fishing-event.-Fixes-BUKKIT-5396.patch} |   4 +-
 ...26-Print-Stack-on-InternalException.patch} |   4 +-
 ...ffline-Player-Data-Once-if-Required.patch} |   4 +-
 ...se-for-Non-Existent-Offline-Players.patch} |   4 +-
 ...Check-for-blank-OfflinePlayer-Names.patch} |   6 +-
 ...ng.patch => 0130-Fix-Player-Banning.patch} |   4 +-
 ....patch => 0131-Check-Skull-canPlace.patch} |   4 +-
 ....patch => 0132-Fix-ban-expire-dates.patch} |   4 +-
 ...atch => 0133-Correct-Ban-Expiration.patch} |   4 +-
 ...> 0134-Convert-Horses-owner-to-UUID.patch} |   2 +-
 ...team-API-to-allow-arbitrary-strings.patch} |   4 +-
 ...from-a-ConversationTracker-exception.patch |  40 ------
 ... => 0136-Add-Score.isScoreSet-Z-API.patch} |   4 +-
 ...37-Add-quiet-option-to-hasKeyOfType.patch} |   4 +-
 136 files changed, 348 insertions(+), 733 deletions(-)
 rename CraftBukkit-Patches/{0015-Improved-Timings-System.patch => 0014-Improved-Timings-System.patch} (96%)
 delete mode 100644 CraftBukkit-Patches/0014-Sync-Free-Chunk-Reference-Cache.patch
 rename CraftBukkit-Patches/{0016-Fix-Mob-Spawning-Relative-to-View-Distance.patch => 0015-Fix-Mob-Spawning-Relative-to-View-Distance.patch} (99%)
 rename CraftBukkit-Patches/{0017-Handle-Null-Tile-Entities.patch => 0016-Handle-Null-Tile-Entities.patch} (86%)
 rename CraftBukkit-Patches/{0018-Entity-Activation-Range.patch => 0017-Entity-Activation-Range.patch} (98%)
 rename CraftBukkit-Patches/{0019-Metrics.patch => 0018-Metrics.patch} (99%)
 rename CraftBukkit-Patches/{0020-PlayerItemDamageEvent.patch => 0019-PlayerItemDamageEvent.patch} (96%)
 rename CraftBukkit-Patches/{0021-Faster-UUID-for-entities.patch => 0020-Faster-UUID-for-entities.patch} (94%)
 rename CraftBukkit-Patches/{0022-Prevent-NPE-in-CraftSign.patch => 0021-Prevent-NPE-in-CraftSign.patch} (95%)
 rename CraftBukkit-Patches/{0023-Entity-Tracking-Ranges.patch => 0022-Entity-Tracking-Ranges.patch} (98%)
 rename CraftBukkit-Patches/{0024-Limit-Custom-Map-Rendering.patch => 0023-Limit-Custom-Map-Rendering.patch} (98%)
 rename CraftBukkit-Patches/{0025-Thread-Naming-and-Tweaks.patch => 0024-Thread-Naming-and-Tweaks.patch} (94%)
 rename CraftBukkit-Patches/{0026-Close-Unloaded-Save-Files.patch => 0025-Close-Unloaded-Save-Files.patch} (96%)
 rename CraftBukkit-Patches/{0027-Remove-o-Option.patch => 0026-Remove-o-Option.patch} (91%)
 rename CraftBukkit-Patches/{0028-Recipe-Deconstruction.patch => 0027-Recipe-Deconstruction.patch} (97%)
 rename CraftBukkit-Patches/{0029-Implement-Arrow-API.patch => 0028-Implement-Arrow-API.patch} (92%)
 rename CraftBukkit-Patches/{0030-Hopper-Cooldowns.patch => 0029-Hopper-Cooldowns.patch} (97%)
 rename CraftBukkit-Patches/{0031-Prevent-Shutdown-Hang.patch => 0030-Prevent-Shutdown-Hang.patch} (92%)
 rename CraftBukkit-Patches/{0032-Implement-SpawnerSpawnEvent.patch => 0031-Implement-SpawnerSpawnEvent.patch} (97%)
 rename CraftBukkit-Patches/{0033-Firework-Meta-Crash-Fix.patch => 0032-Firework-Meta-Crash-Fix.patch} (93%)
 rename CraftBukkit-Patches/{0034-Allow-Disabling-of-Command-Logging.patch => 0033-Allow-Disabling-of-Command-Logging.patch} (90%)
 rename CraftBukkit-Patches/{0035-Allow-Disabling-of-Command-TabComplete.patch => 0034-Allow-Disabling-of-Command-TabComplete.patch} (95%)
 rename CraftBukkit-Patches/{0036-Configurable-Messages.patch => 0035-Configurable-Messages.patch} (98%)
 rename CraftBukkit-Patches/{0037-Allow-Disabling-of-Random-Lighting-Updates.patch => 0036-Allow-Disabling-of-Random-Lighting-Updates.patch} (92%)
 rename CraftBukkit-Patches/{0039-Properly-Close-Inventories.patch => 0037-Properly-Close-Inventories.patch} (96%)
 rename CraftBukkit-Patches/{0040-Disallow-Interaction-With-Self.patch => 0038-Disallow-Interaction-With-Self.patch} (83%)
 delete mode 100644 CraftBukkit-Patches/0038-Make-AnvilInventory.getItem-use-both-containers.-Fix.patch
 rename CraftBukkit-Patches/{0041-Lower-Chunk-Compression.patch => 0039-Lower-Chunk-Compression.patch} (95%)
 rename CraftBukkit-Patches/{0042-Entity-Mount-and-Dismount-Events.patch => 0040-Entity-Mount-and-Dismount-Events.patch} (97%)
 rename CraftBukkit-Patches/{0043-Prevent-Ghost-Players-Caused-by-Plugins.patch => 0041-Prevent-Ghost-Players-Caused-by-Plugins.patch} (92%)
 rename CraftBukkit-Patches/{0044-Entity-ticking-chunk-caching.patch => 0042-Entity-ticking-chunk-caching.patch} (89%)
 rename CraftBukkit-Patches/{0045-Plug-World-Unload-Memory-Leak.patch => 0043-Plug-World-Unload-Memory-Leak.patch} (91%)
 rename CraftBukkit-Patches/{0046-Player-Collision-API.patch => 0044-Player-Collision-API.patch} (95%)
 rename CraftBukkit-Patches/{0047-Fully-Disable-Snooper-When-Not-Required.patch => 0045-Fully-Disable-Snooper-When-Not-Required.patch} (90%)
 rename CraftBukkit-Patches/{0048-Add-Getter-for-Entity-Invulnerability.patch => 0046-Add-Getter-for-Entity-Invulnerability.patch} (91%)
 rename CraftBukkit-Patches/{0049-Cap-Minimum-Player-Speed.patch => 0047-Cap-Minimum-Player-Speed.patch} (91%)
 rename CraftBukkit-Patches/{0050-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch => 0048-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch} (91%)
 rename CraftBukkit-Patches/{0051-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch => 0049-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch} (95%)
 rename CraftBukkit-Patches/{0052-Allow-Disabling-of-1.6.3-Structure-Saving.patch => 0050-Allow-Disabling-of-1.6.3-Structure-Saving.patch} (96%)
 rename CraftBukkit-Patches/{0053-Item-Despawn-Rate.patch => 0051-Item-Despawn-Rate.patch} (95%)
 rename CraftBukkit-Patches/{0054-Don-t-Special-Case-X-Move-Value.patch => 0052-Don-t-Special-Case-X-Move-Value.patch} (95%)
 rename CraftBukkit-Patches/{0055-Implement-respawn-API.patch => 0053-Implement-respawn-API.patch} (90%)
 rename CraftBukkit-Patches/{0056-Fix-BrewingStands-Removing-NBT-Potions.patch => 0054-Fix-BrewingStands-Removing-NBT-Potions.patch} (94%)
 rename CraftBukkit-Patches/{0057-Arrow-Despawn-Rate.patch => 0055-Arrow-Despawn-Rate.patch} (95%)
 rename CraftBukkit-Patches/{0058-Fix-packed-ice-generation.patch => 0056-Fix-packed-ice-generation.patch} (96%)
 rename CraftBukkit-Patches/{0059-Watchdog-Thread.patch => 0057-Watchdog-Thread.patch} (99%)
 rename CraftBukkit-Patches/{0060-Clear-Flower-Pot-on-Drop.patch => 0058-Clear-Flower-Pot-on-Drop.patch} (91%)
 rename CraftBukkit-Patches/{0061-Fix-some-chunks-not-being-sent-to-the-client.patch => 0059-Fix-some-chunks-not-being-sent-to-the-client.patch} (94%)
 rename CraftBukkit-Patches/{0062-Fix-Broken-Async-Chat.patch => 0060-Fix-Broken-Async-Chat.patch} (94%)
 rename CraftBukkit-Patches/{0063-Allow-Teleportation-of-Vehicles-and-Passengers.patch => 0061-Allow-Teleportation-of-Vehicles-and-Passengers.patch} (92%)
 rename CraftBukkit-Patches/{0064-Remove-OS-X-Special-Chars-from-Signs.patch => 0062-Remove-OS-X-Special-Chars-from-Signs.patch} (82%)
 rename CraftBukkit-Patches/{0065-Orebfuscator.patch => 0063-Orebfuscator.patch} (99%)
 rename CraftBukkit-Patches/{0066-Optimize-DataWatcher.patch => 0064-Optimize-DataWatcher.patch} (98%)
 rename CraftBukkit-Patches/{0067-Fire-PreLogin-Events-in-Offline-Mode.patch => 0065-Fire-PreLogin-Events-in-Offline-Mode.patch} (99%)
 rename CraftBukkit-Patches/{0068-BungeeCord-Support.patch => 0066-BungeeCord-Support.patch} (98%)
 rename CraftBukkit-Patches/{0069-Allow-Disabling-Zombie-Villager-Aggression.patch => 0067-Allow-Disabling-Zombie-Villager-Aggression.patch} (97%)
 rename CraftBukkit-Patches/{0070-Configurable-Amount-of-Netty-Threads.patch => 0068-Configurable-Amount-of-Netty-Threads.patch} (96%)
 rename CraftBukkit-Patches/{0071-Prevent-Mineshaft-Saving.patch => 0069-Prevent-Mineshaft-Saving.patch} (92%)
 rename CraftBukkit-Patches/{0072-Log-Cause-of-Unexpected-Exceptions.patch => 0070-Log-Cause-of-Unexpected-Exceptions.patch} (90%)
 rename CraftBukkit-Patches/{0073-Particle-API.patch => 0071-Particle-API.patch} (99%)
 rename CraftBukkit-Patches/{0074-Fix-Biome-Decoration-Crashes.patch => 0072-Fix-Biome-Decoration-Crashes.patch} (98%)
 rename CraftBukkit-Patches/{0075-Save-ticks-lived-to-nbttag.patch => 0073-Save-ticks-lived-to-nbttag.patch} (95%)
 rename CraftBukkit-Patches/{0076-More-Efficient-GetCubes.patch => 0074-More-Efficient-GetCubes.patch} (94%)
 rename CraftBukkit-Patches/{0077-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch => 0075-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch} (98%)
 rename CraftBukkit-Patches/{0078-Warn-if-PermGen-may-be-insufficient.patch => 0076-Warn-if-PermGen-may-be-insufficient.patch} (96%)
 rename CraftBukkit-Patches/{0079-Disable-Connected-Check-on-setScoreboard.patch => 0077-Disable-Connected-Check-on-setScoreboard.patch} (90%)
 rename CraftBukkit-Patches/{0080-Add-Late-Bind-Option.patch => 0078-Add-Late-Bind-Option.patch} (96%)
 rename CraftBukkit-Patches/{0083-Allow-statistics-to-be-disabled-forced.patch => 0079-Allow-statistics-to-be-disabled-forced.patch} (98%)
 rename CraftBukkit-Patches/{0084-Fix-anvil-collisions.patch => 0080-Fix-anvil-collisions.patch} (91%)
 rename CraftBukkit-Patches/{0085-Fix-ItemStack-Unbreakable-Code.patch => 0081-Fix-ItemStack-Unbreakable-Code.patch} (92%)
 delete mode 100644 CraftBukkit-Patches/0081-Update-Chest-Animation-when-Cancelling-Event.patch
 rename CraftBukkit-Patches/{0086-Try-and-Debug-Crash-Reports-Crashing.patch => 0082-Try-and-Debug-Crash-Reports-Crashing.patch} (94%)
 delete mode 100644 CraftBukkit-Patches/0082-Update-Client-s-Hand-when-BlockPlaceEvent-Cancelled.patch
 rename CraftBukkit-Patches/{0087-Replace-AutoSave-Mechanism.patch => 0083-Replace-AutoSave-Mechanism.patch} (94%)
 rename CraftBukkit-Patches/{0088-Block-data-values-that-crash-the-client.patch => 0084-Block-data-values-that-crash-the-client.patch} (96%)
 rename CraftBukkit-Patches/{0089-Support-vanilla-s-direction-tag-on-fireballs.patch => 0085-Support-vanilla-s-direction-tag-on-fireballs.patch} (95%)
 rename CraftBukkit-Patches/{0090-Support-non-prefixed-URLs.patch => 0086-Support-non-prefixed-URLs.patch} (97%)
 rename CraftBukkit-Patches/{0091-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch => 0087-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch} (95%)
 rename CraftBukkit-Patches/{0092-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch => 0088-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch} (96%)
 rename CraftBukkit-Patches/{0093-Don-t-let-trees-replace-any-block-when-growing.patch => 0089-Don-t-let-trees-replace-any-block-when-growing.patch} (94%)
 rename CraftBukkit-Patches/{0094-Highly-Optimized-Tick-Loop.patch => 0090-Highly-Optimized-Tick-Loop.patch} (98%)
 rename CraftBukkit-Patches/{0095-Add-Spigot-Links.patch => 0091-Add-Spigot-Links.patch} (97%)
 rename CraftBukkit-Patches/{0096-Configurable-Ping-Sample-Size.patch => 0092-Configurable-Ping-Sample-Size.patch} (96%)
 rename CraftBukkit-Patches/{0097-Add-Optional-Tick-Shuffling.patch => 0093-Add-Optional-Tick-Shuffling.patch} (96%)
 rename CraftBukkit-Patches/{0098-Allow-Configuring-Chunks-per-Packet.patch => 0094-Allow-Configuring-Chunks-per-Packet.patch} (93%)
 rename CraftBukkit-Patches/{0099-Implement-Locale-Getter-for-Players.patch => 0095-Implement-Locale-Getter-for-Players.patch} (91%)
 rename CraftBukkit-Patches/{0100-Cap-Entity-Collisions.patch => 0096-Cap-Entity-Collisions.patch} (97%)
 rename CraftBukkit-Patches/{0101-Fix-dispensing-bone-meal-not-having-the-correct-data.patch => 0097-Fix-dispensing-bone-meal-not-having-the-correct-data.patch} (93%)
 rename CraftBukkit-Patches/{0102-Spam-Filter-Exclusions.patch => 0098-Spam-Filter-Exclusions.patch} (95%)
 rename CraftBukkit-Patches/{0103-Add-Option-to-Silence-CommandBlock-Console.patch => 0099-Add-Option-to-Silence-CommandBlock-Console.patch} (94%)
 rename CraftBukkit-Patches/{0104-Add-support-for-fetching-hidden-players.patch => 0100-Add-support-for-fetching-hidden-players.patch} (90%)
 rename CraftBukkit-Patches/{0105-Allow-Disabling-Creative-Item-Filter.patch => 0101-Allow-Disabling-Creative-Item-Filter.patch} (94%)
 rename CraftBukkit-Patches/{0106-Cap-Channel-Registrations.patch => 0102-Cap-Channel-Registrations.patch} (88%)
 rename CraftBukkit-Patches/{0107-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch => 0103-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch} (99%)
 rename CraftBukkit-Patches/{0108-Unfinalize-the-isDisconnected-method-by-bukkit.patch => 0104-Unfinalize-the-isDisconnected-method-by-bukkit.patch} (90%)
 rename CraftBukkit-Patches/{0109-Implement-Silenceable-Lightning-API.patch => 0105-Implement-Silenceable-Lightning-API.patch} (98%)
 rename CraftBukkit-Patches/{0110-Normalize-spaces-on-when-reading-a-chat-packet.patch => 0106-Normalize-spaces-on-when-reading-a-chat-packet.patch} (94%)
 rename CraftBukkit-Patches/{0111-Use-one-PermissibleBase-for-all-Command-Blocks.patch => 0107-Use-one-PermissibleBase-for-all-Command-Blocks.patch} (94%)
 rename CraftBukkit-Patches/{0112-Prevent-hoppers-from-loading-chunks.patch => 0108-Prevent-hoppers-from-loading-chunks.patch} (88%)
 rename CraftBukkit-Patches/{0113-Guard-Entity-List.patch => 0109-Guard-Entity-List.patch} (91%)
 rename CraftBukkit-Patches/{0114-Fix-ConcurrentModificationException-while-being-idle.patch => 0110-Fix-ConcurrentModificationException-while-being-idle.patch} (91%)
 rename CraftBukkit-Patches/{0115-Cancellable-WitherSkull-potion-effect.patch => 0111-Cancellable-WitherSkull-potion-effect.patch} (96%)
 rename CraftBukkit-Patches/{0116-Descriptive-kick-reasons-instead-of-Nope.patch => 0112-Descriptive-kick-reasons-instead-of-Nope.patch} (96%)
 rename CraftBukkit-Patches/{0119-Check-for-manually-prefixed-commands-or-commands-tha.patch => 0113-Check-for-manually-prefixed-commands-or-commands-tha.patch} (94%)
 rename CraftBukkit-Patches/{0120-Cap-window-names-to-prevent-client-disconnects.patch => 0114-Cap-window-names-to-prevent-client-disconnects.patch} (92%)
 rename CraftBukkit-Patches/{0121-Enable-Improved-Ping-Sending.patch => 0115-Enable-Improved-Ping-Sending.patch} (95%)
 rename CraftBukkit-Patches/{0122-Configurable-dragon-death-and-wither-spawn-sounds.patch => 0116-Configurable-dragon-death-and-wither-spawn-sounds.patch} (98%)
 delete mode 100644 CraftBukkit-Patches/0117-Allow-enchanting-tables-to-enchant-any-item.patch
 rename CraftBukkit-Patches/{0123-Fix-TileEntities-getting-ticked-after-being-queued-f.patch => 0117-Fix-TileEntities-getting-ticked-after-being-queued-f.patch} (84%)
 rename CraftBukkit-Patches/{0124-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch => 0118-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch} (88%)
 delete mode 100644 CraftBukkit-Patches/0118-Remove-the-lastChunkAccessed-if-it-is-unloaded.patch
 rename CraftBukkit-Patches/{0125-Old-New-Version-Support.patch => 0119-Old-New-Version-Support.patch} (99%)
 rename CraftBukkit-Patches/{0126-Treat-Bungee-as-Online-Mode.patch => 0120-Treat-Bungee-as-Online-Mode.patch} (91%)
 rename CraftBukkit-Patches/{0127-Fix-several-occurances-of-missed-diff.patch => 0121-Fix-several-occurances-of-missed-diff.patch} (96%)
 rename CraftBukkit-Patches/{0128-Fix-PlayerFishEvent-not-properly-cancelling.-Fixes-B.patch => 0122-Fix-PlayerFishEvent-not-properly-cancelling.-Fixes-B.patch} (97%)
 rename CraftBukkit-Patches/{0129-Update-Warning.patch => 0123-Update-Warning.patch} (97%)
 rename CraftBukkit-Patches/{0130-Add-Conversion-Message.patch => 0124-Add-Conversion-Message.patch} (87%)
 rename CraftBukkit-Patches/{0131-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch => 0125-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch} (94%)
 rename CraftBukkit-Patches/{0132-Print-Stack-on-InternalException.patch => 0126-Print-Stack-on-InternalException.patch} (89%)
 rename CraftBukkit-Patches/{0133-Use-Offline-Player-Data-Once-if-Required.patch => 0127-Use-Offline-Player-Data-Once-if-Required.patch} (96%)
 rename CraftBukkit-Patches/{0134-Use-Provided-Case-for-Non-Existent-Offline-Players.patch => 0128-Use-Provided-Case-for-Non-Existent-Offline-Players.patch} (91%)
 rename CraftBukkit-Patches/{0136-Check-for-blank-OfflinePlayer-Names.patch => 0129-Check-for-blank-OfflinePlayer-Names.patch} (89%)
 rename CraftBukkit-Patches/{0137-Fix-Player-Banning.patch => 0130-Fix-Player-Banning.patch} (96%)
 rename CraftBukkit-Patches/{0138-Check-Skull-canPlace.patch => 0131-Check-Skull-canPlace.patch} (93%)
 rename CraftBukkit-Patches/{0139-Fix-ban-expire-dates.patch => 0132-Fix-ban-expire-dates.patch} (90%)
 rename CraftBukkit-Patches/{0140-Correct-Ban-Expiration.patch => 0133-Correct-Ban-Expiration.patch} (91%)
 rename CraftBukkit-Patches/{0141-Convert-Horses-owner-to-UUID.patch => 0134-Convert-Horses-owner-to-UUID.patch} (94%)
 rename CraftBukkit-Patches/{0142-Expand-team-API-to-allow-arbitrary-strings.patch => 0135-Expand-team-API-to-allow-arbitrary-strings.patch} (97%)
 delete mode 100644 CraftBukkit-Patches/0135-Prevent-crash-from-a-ConversationTracker-exception.patch
 rename CraftBukkit-Patches/{0143-Add-Score.isScoreSet-Z-API.patch => 0136-Add-Score.isScoreSet-Z-API.patch} (95%)
 rename CraftBukkit-Patches/{0144-Add-quiet-option-to-hasKeyOfType.patch => 0137-Add-quiet-option-to-hasKeyOfType.patch} (93%)

diff --git a/CraftBukkit b/CraftBukkit
index 2b6a9ce3a9..3779cffb24 160000
--- a/CraftBukkit
+++ b/CraftBukkit
@@ -1 +1 @@
-Subproject commit 2b6a9ce3a9d3cce265ed7a6bf8c01c807a34f1a2
+Subproject commit 3779cffb24256c4f3370646bb8a44da3fa3affae
diff --git a/CraftBukkit-Patches/0005-Spigot-Configuration.patch b/CraftBukkit-Patches/0005-Spigot-Configuration.patch
index 1428cba5de..19138e21c2 100644
--- a/CraftBukkit-Patches/0005-Spigot-Configuration.patch
+++ b/CraftBukkit-Patches/0005-Spigot-Configuration.patch
@@ -1,11 +1,11 @@
-From 45e658422839146811ddc9140d511f785b4c67c8 Mon Sep 17 00:00:00 2001
+From 6628f676976dcfee3abcc10ce6bcc2fc30bb7bf0 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
 
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 9cef53f..74e28cc 100644
+index f1caa38..00f9b89 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -109,6 +109,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -34,18 +34,18 @@ index 9cef53f..74e28cc 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 0f97f78..13c0500 100644
+index e6bb1d5..4567ee2 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -107,6 +107,7 @@ public abstract class World implements IBlockAccess {
-     int lastXAccessed = Integer.MIN_VALUE;
-     int lastZAccessed = Integer.MIN_VALUE;
-     final Object chunkLock = new Object();
+@@ -103,6 +103,7 @@ public abstract class World implements IBlockAccess {
+     public boolean pvpMode;
+     public boolean keepSpawnInMemory = true;
+     public ChunkGenerator generator;
 +    public final org.spigotmc.SpigotWorldConfig spigotConfig; // Spigot
  
      public CraftWorld getWorld() {
          return this.world;
-@@ -118,6 +119,7 @@ public abstract class World implements IBlockAccess {
+@@ -114,6 +115,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) {
@@ -54,7 +54,7 @@ index 0f97f78..13c0500 100644
          this.world = new CraftWorld((WorldServer) this, gen, env);
          this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f3d9979..9f40d68 100644
+index 59010eb..bb1bddf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -316,8 +316,10 @@ public final class CraftServer implements Server {
@@ -297,5 +297,5 @@ index 0000000..961ddb4
 +    }
 +}
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0006-Better-Chunk-Tick-Selection.patch b/CraftBukkit-Patches/0006-Better-Chunk-Tick-Selection.patch
index 1cb79ce8e1..8d9e299d8e 100644
--- a/CraftBukkit-Patches/0006-Better-Chunk-Tick-Selection.patch
+++ b/CraftBukkit-Patches/0006-Better-Chunk-Tick-Selection.patch
@@ -1,11 +1,11 @@
-From 3b97fb4eaaef41db86499223495c75bdab2536c9 Mon Sep 17 00:00:00 2001
+From 644d19dee7e8c63e7dce45426b0365e00633d1e9 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 13c0500..9d275b3 100644
+index 4567ee2..234ea35 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -61,7 +61,7 @@ public abstract class World implements IBlockAccess {
@@ -48,7 +48,7 @@ index 13c0500..9d275b3 100644
      public BiomeBase getBiome(int i, int j) {
          if (this.isLoaded(i, 0, j)) {
              Chunk chunk = this.getChunkAtWorldCoords(i, j);
-@@ -125,6 +149,11 @@ public abstract class World implements IBlockAccess {
+@@ -121,6 +145,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 13c0500..9d275b3 100644
  
          this.K = this.random.nextInt(12000);
          this.allowMonsters = true;
-@@ -1915,24 +1944,44 @@ public abstract class World implements IBlockAccess {
+@@ -1900,24 +1929,44 @@ public abstract class World implements IBlockAccess {
          int k;
          int l;
  
@@ -185,5 +185,5 @@ index 961ddb4..90a227f 100644
 +    }
  }
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0009-Merge-tweaks-and-configuration.patch b/CraftBukkit-Patches/0009-Merge-tweaks-and-configuration.patch
index 514ecfe713..f42472db08 100644
--- a/CraftBukkit-Patches/0009-Merge-tweaks-and-configuration.patch
+++ b/CraftBukkit-Patches/0009-Merge-tweaks-and-configuration.patch
@@ -1,4 +1,4 @@
-From cb54f74739ff0a97474b244cf05a7d59cfc2b0d0 Mon Sep 17 00:00:00 2001
+From c5a0b8b2d97cc9d0dce80bdfabb8e99be69a68fd 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 9d275b3..edf229b 100644
+index 234ea35..b7aed63 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -932,6 +932,23 @@ public abstract class World implements IBlockAccess {
+@@ -917,6 +917,23 @@ public abstract class World implements IBlockAccess {
              // Not all projectiles extend EntityProjectile, so check for Bukkit interface instead
              event = CraftEventFactory.callProjectileLaunchEvent(entity);
          }
@@ -92,5 +92,5 @@ index 7e79ba5..1545a61 100644
 +    }
  }
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0011-Async-Operation-Catching.patch b/CraftBukkit-Patches/0011-Async-Operation-Catching.patch
index e0f07a5b53..584fc71e4e 100644
--- a/CraftBukkit-Patches/0011-Async-Operation-Catching.patch
+++ b/CraftBukkit-Patches/0011-Async-Operation-Catching.patch
@@ -1,4 +1,4 @@
-From dbc3fd4cf4f7f6b1b81f6cd416844b93802e1de1 Mon Sep 17 00:00:00 2001
+From 728c17c2a96cb836ffe6a3449454cb8d4173753b 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 edf229b..146285f 100644
+index b7aed63..1ec7267 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -901,6 +901,7 @@ public abstract class World implements IBlockAccess {
+@@ -886,6 +886,7 @@ public abstract class World implements IBlockAccess {
      }
  
      public boolean addEntity(Entity entity, SpawnReason spawnReason) { // Changed signature, added SpawnReason
@@ -77,7 +77,7 @@ index edf229b..146285f 100644
          if (entity == null) return false;
          // CraftBukkit end
  
-@@ -1007,6 +1008,7 @@ public abstract class World implements IBlockAccess {
+@@ -992,6 +993,7 @@ public abstract class World implements IBlockAccess {
      }
  
      public void removeEntity(Entity entity) {
@@ -85,7 +85,7 @@ index edf229b..146285f 100644
          entity.die();
          if (entity instanceof EntityHuman) {
              this.players.remove(entity);
-@@ -2391,6 +2393,7 @@ public abstract class World implements IBlockAccess {
+@@ -2376,6 +2378,7 @@ public abstract class World implements IBlockAccess {
      }
  
      public void a(List list) {
@@ -94,7 +94,7 @@ index edf229b..146285f 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 d9fbd00..bfa8c23 100644
+index a97e330..1f26312 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -159,6 +159,7 @@ public class CraftWorld implements World {
@@ -122,7 +122,7 @@ index d9fbd00..bfa8c23 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 716cf70..d6bfa0d 100644
+index dea26e0..fd1c137 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 {
@@ -169,5 +169,5 @@ index 0000000..4b3aa85
 +    }
 +}
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0015-Improved-Timings-System.patch b/CraftBukkit-Patches/0014-Improved-Timings-System.patch
similarity index 96%
rename from CraftBukkit-Patches/0015-Improved-Timings-System.patch
rename to CraftBukkit-Patches/0014-Improved-Timings-System.patch
index f447f2cbf4..1bd17eda4b 100644
--- a/CraftBukkit-Patches/0015-Improved-Timings-System.patch
+++ b/CraftBukkit-Patches/0014-Improved-Timings-System.patch
@@ -1,4 +1,4 @@
-From 4d0dee30d2d4d05d385ba1c8742948f79b5a3895 Mon Sep 17 00:00:00 2001
+From e7d290ae1d04ca8c5b9e6868c4d01dc953e0d7d9 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
@@ -139,10 +139,10 @@ 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 9fa307e..ab9dc66 100644
+index 75a5cbe..5cde08f 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -938,6 +938,7 @@ public class PlayerConnection implements PacketPlayInListener {
+@@ -940,6 +940,7 @@ public class PlayerConnection implements PacketPlayInListener {
      // CraftBukkit end
  
      private void handleCommand(String s) {
@@ -150,7 +150,7 @@ index 9fa307e..ab9dc66 100644
          // CraftBukkit start - whole method
          CraftPlayer player = this.getPlayer();
  
-@@ -945,19 +946,23 @@ public class PlayerConnection implements PacketPlayInListener {
+@@ -947,19 +948,23 @@ public class PlayerConnection implements PacketPlayInListener {
          this.server.getPluginManager().callEvent(event);
  
          if (event.isCancelled()) {
@@ -192,7 +192,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 5ea860f..7ead630 100644
+index 1ec7267..5d593eb 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -15,6 +15,7 @@ import java.util.concurrent.Callable;
@@ -203,8 +203,8 @@ index 5ea860f..7ead630 100644
  import org.bukkit.generator.ChunkGenerator;
  import org.bukkit.craftbukkit.CraftServer;
  import org.bukkit.craftbukkit.CraftWorld;
-@@ -133,6 +134,8 @@ public abstract class World implements IBlockAccess {
-     final Object chunkLock = new Object();
+@@ -129,6 +130,8 @@ public abstract class World implements IBlockAccess {
+     public ChunkGenerator generator;
      public final org.spigotmc.SpigotWorldConfig spigotConfig; // Spigot
  
 +    public final SpigotTimings.WorldTimingsHandler timings; // Spigot
@@ -212,7 +212,7 @@ index 5ea860f..7ead630 100644
      public CraftWorld getWorld() {
          return this.world;
      }
-@@ -212,6 +215,7 @@ public abstract class World implements IBlockAccess {
+@@ -208,6 +211,7 @@ public abstract class World implements IBlockAccess {
          this.a();
  
          this.getServer().addWorld(this.world); // CraftBukkit
@@ -220,7 +220,7 @@ index 5ea860f..7ead630 100644
      }
  
      protected abstract IChunkProvider j();
-@@ -1237,6 +1241,7 @@ public abstract class World implements IBlockAccess {
+@@ -1224,6 +1228,7 @@ public abstract class World implements IBlockAccess {
          this.f.clear();
          this.methodProfiler.c("regular");
  
@@ -228,7 +228,7 @@ index 5ea860f..7ead630 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);
-@@ -1260,7 +1265,9 @@ public abstract class World implements IBlockAccess {
+@@ -1247,7 +1252,9 @@ public abstract class World implements IBlockAccess {
              this.methodProfiler.a("tick");
              if (!entity.dead) {
                  try {
@@ -238,7 +238,7 @@ index 5ea860f..7ead630 100644
                  } catch (Throwable throwable1) {
                      crashreport = CrashReport.a(throwable1, "Ticking entity");
                      crashreportsystemdetails = crashreport.a("Entity being ticked");
-@@ -1285,7 +1292,9 @@ public abstract class World implements IBlockAccess {
+@@ -1272,7 +1279,9 @@ public abstract class World implements IBlockAccess {
              this.methodProfiler.b();
          }
  
@@ -248,7 +248,7 @@ index 5ea860f..7ead630 100644
          this.M = true;
          Iterator iterator = this.tileEntityList.iterator();
  
-@@ -1300,8 +1309,11 @@ public abstract class World implements IBlockAccess {
+@@ -1287,8 +1296,11 @@ public abstract class World implements IBlockAccess {
  
              if (!tileentity.r() && tileentity.o() && this.isLoaded(tileentity.x, tileentity.y, tileentity.z)) {
                  try {
@@ -260,7 +260,7 @@ index 5ea860f..7ead630 100644
                      crashreport = CrashReport.a(throwable2, "Ticking block entity");
                      crashreportsystemdetails = crashreport.a("Block entity being ticked");
                      tileentity.a(crashreportsystemdetails);
-@@ -1321,6 +1333,8 @@ public abstract class World implements IBlockAccess {
+@@ -1308,6 +1320,8 @@ public abstract class World implements IBlockAccess {
              }
          }
  
@@ -269,7 +269,7 @@ index 5ea860f..7ead630 100644
          this.M = false;
          if (!this.b.isEmpty()) {
              this.tileEntityList.removeAll(this.b);
-@@ -1359,6 +1373,7 @@ public abstract class World implements IBlockAccess {
+@@ -1346,6 +1360,7 @@ public abstract class World implements IBlockAccess {
              this.a.clear();
          }
  
@@ -277,7 +277,7 @@ index 5ea860f..7ead630 100644
          this.methodProfiler.b();
          this.methodProfiler.b();
      }
-@@ -1381,6 +1396,7 @@ public abstract class World implements IBlockAccess {
+@@ -1368,6 +1383,7 @@ public abstract class World implements IBlockAccess {
          byte b0 = 32;
  
          if (!flag || this.b(i - b0, 0, j - b0, i + b0, 0, j + b0)) {
@@ -285,7 +285,7 @@ index 5ea860f..7ead630 100644
              entity.S = entity.locX;
              entity.T = entity.locY;
              entity.U = entity.locZ;
-@@ -1442,6 +1458,7 @@ public abstract class World implements IBlockAccess {
+@@ -1429,6 +1445,7 @@ public abstract class World implements IBlockAccess {
                      entity.passenger = null;
                  }
              }
diff --git a/CraftBukkit-Patches/0014-Sync-Free-Chunk-Reference-Cache.patch b/CraftBukkit-Patches/0014-Sync-Free-Chunk-Reference-Cache.patch
deleted file mode 100644
index bf478fa64d..0000000000
--- a/CraftBukkit-Patches/0014-Sync-Free-Chunk-Reference-Cache.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From e95aac5349ba7dac025251bc1c0c006dbfbfd010 Mon Sep 17 00:00:00 2001
-From: Mike Primm <mike@primmhome.com>
-Date: Wed, 16 Jan 2013 15:27:22 -0600
-Subject: [PATCH] Sync Free Chunk Reference Cache
-
-
-diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 146285f..5ea860f 100644
---- a/src/main/java/net/minecraft/server/World.java
-+++ b/src/main/java/net/minecraft/server/World.java
-@@ -292,20 +292,18 @@ public abstract class World implements IBlockAccess {
-         return this.getChunkAt(i >> 4, j >> 4);
-     }
- 
-+    // Spigot start
-     public Chunk getChunkAt(int i, int j) {
--        // CraftBukkit start
--        Chunk result = null;
--        synchronized (this.chunkLock) {
--            if (this.lastChunkAccessed == null || this.lastXAccessed != i || this.lastZAccessed != j) {
--                this.lastChunkAccessed = this.chunkProvider.getOrCreateChunk(i, j);
--                this.lastXAccessed = i;
--                this.lastZAccessed = j;
--            }
--            result = this.lastChunkAccessed;
-+        //synchronized (this.chunkLock) {
-+        Chunk result = this.lastChunkAccessed; // Exploit fact that read is atomic 
-+        if (result == null || result.locX != i || result.locZ != j) {
-+            result = this.chunkProvider.getOrCreateChunk(i, j);
-+            this.lastChunkAccessed = result; // Exploit fact that write is atomic
-         }
-+        //}
-         return result;
--        // CraftBukkit end
-     }
-+    // Spigot end
- 
-     public boolean setTypeAndData(int i, int j, int k, Block block, int l, int i1) {
-         if (i >= -30000000 && k >= -30000000 && i < 30000000 && k < 30000000) {
--- 
-1.8.3.2
-
diff --git a/CraftBukkit-Patches/0016-Fix-Mob-Spawning-Relative-to-View-Distance.patch b/CraftBukkit-Patches/0015-Fix-Mob-Spawning-Relative-to-View-Distance.patch
similarity index 99%
rename from CraftBukkit-Patches/0016-Fix-Mob-Spawning-Relative-to-View-Distance.patch
rename to CraftBukkit-Patches/0015-Fix-Mob-Spawning-Relative-to-View-Distance.patch
index f6cca4a8fe..95c61f9b18 100644
--- a/CraftBukkit-Patches/0016-Fix-Mob-Spawning-Relative-to-View-Distance.patch
+++ b/CraftBukkit-Patches/0015-Fix-Mob-Spawning-Relative-to-View-Distance.patch
@@ -1,4 +1,4 @@
-From fa7ec75f87672542655a9d1a836d3090700ef8e1 Mon Sep 17 00:00:00 2001
+From 2dc506017149739aad757a34429cf94162128195 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
@@ -151,5 +151,5 @@ index 6cc3a91..46249d7 100644
 +    }
  }
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0017-Handle-Null-Tile-Entities.patch b/CraftBukkit-Patches/0016-Handle-Null-Tile-Entities.patch
similarity index 86%
rename from CraftBukkit-Patches/0017-Handle-Null-Tile-Entities.patch
rename to CraftBukkit-Patches/0016-Handle-Null-Tile-Entities.patch
index f25e45647c..47b94f352d 100644
--- a/CraftBukkit-Patches/0017-Handle-Null-Tile-Entities.patch
+++ b/CraftBukkit-Patches/0016-Handle-Null-Tile-Entities.patch
@@ -1,14 +1,14 @@
-From 400a4b262b161b4882e44a9f1833dd1b46ec30fb Mon Sep 17 00:00:00 2001
+From 48a3d1610d2a0c0bcec6e3c6ed550feb355b90de 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 7ead630..d9f987c 100644
+index 5d593eb..5246abd 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1300,6 +1300,13 @@ public abstract class World implements IBlockAccess {
+@@ -1287,6 +1287,13 @@ public abstract class World implements IBlockAccess {
  
          while (iterator.hasNext()) {
              TileEntity tileentity = (TileEntity) iterator.next();
@@ -23,5 +23,5 @@ index 7ead630..d9f987c 100644
              ChunkProviderServer chunkProviderServer = ((WorldServer) this).chunkProviderServer;
              if (chunkProviderServer.unloadQueue.contains(tileentity.x >> 4, tileentity.z >> 4)) {
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0018-Entity-Activation-Range.patch b/CraftBukkit-Patches/0017-Entity-Activation-Range.patch
similarity index 98%
rename from CraftBukkit-Patches/0018-Entity-Activation-Range.patch
rename to CraftBukkit-Patches/0017-Entity-Activation-Range.patch
index 416155ad48..26156c165b 100644
--- a/CraftBukkit-Patches/0018-Entity-Activation-Range.patch
+++ b/CraftBukkit-Patches/0017-Entity-Activation-Range.patch
@@ -1,4 +1,4 @@
-From c55d89f24822cee98493ecca99c8cf7c9a1b06f9 Mon Sep 17 00:00:00 2001
+From d640bc886bb0e8d0a9f820d151af56120e09be57 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 f90e2a3..6c77253 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 d9f987c..7d9d325 100644
+index 5246abd..508c059 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1241,6 +1241,7 @@ public abstract class World implements IBlockAccess {
+@@ -1228,6 +1228,7 @@ public abstract class World implements IBlockAccess {
          this.f.clear();
          this.methodProfiler.c("regular");
  
@@ -166,7 +166,7 @@ index d9f987c..7d9d325 100644
          timings.entityTick.startTiming(); // Spigot
          // CraftBukkit start - Use field for loop variable
          for (this.tickPosition = 0; this.tickPosition < this.entityList.size(); ++this.tickPosition) {
-@@ -1402,7 +1403,11 @@ public abstract class World implements IBlockAccess {
+@@ -1389,7 +1390,11 @@ public abstract class World implements IBlockAccess {
          int j = MathHelper.floor(entity.locZ);
          byte b0 = 32;
  
diff --git a/CraftBukkit-Patches/0019-Metrics.patch b/CraftBukkit-Patches/0018-Metrics.patch
similarity index 99%
rename from CraftBukkit-Patches/0019-Metrics.patch
rename to CraftBukkit-Patches/0018-Metrics.patch
index ff6bfe7a37..09a3f2ef18 100644
--- a/CraftBukkit-Patches/0019-Metrics.patch
+++ b/CraftBukkit-Patches/0018-Metrics.patch
@@ -1,4 +1,4 @@
-From 51a57c20021e2f9da57a803d86ad1ebcafb43096 Mon Sep 17 00:00:00 2001
+From 64fa9cb277665dcf02463a4ad93472e5a5f10cb8 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Feb 2013 08:58:35 +1100
 Subject: [PATCH] Metrics
@@ -688,5 +688,5 @@ index fd5997d..98fcb47 100644
  
      static void readConfig(Class<?> clazz, Object instance)
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0020-PlayerItemDamageEvent.patch b/CraftBukkit-Patches/0019-PlayerItemDamageEvent.patch
similarity index 96%
rename from CraftBukkit-Patches/0020-PlayerItemDamageEvent.patch
rename to CraftBukkit-Patches/0019-PlayerItemDamageEvent.patch
index 701069de1a..661cbdb3e7 100644
--- a/CraftBukkit-Patches/0020-PlayerItemDamageEvent.patch
+++ b/CraftBukkit-Patches/0019-PlayerItemDamageEvent.patch
@@ -1,4 +1,4 @@
-From 28f16d33624ed388f82d6d959e6c1371cdb2160a Mon Sep 17 00:00:00 2001
+From e215ab2e0adac57fc67baa5b4b4fbce4ceb1591b Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Mon, 4 Mar 2013 18:45:52 +1100
 Subject: [PATCH] PlayerItemDamageEvent
@@ -50,5 +50,5 @@ index 791467b..cc18816 100644
                      --this.count;
                      if (entityliving instanceof EntityHuman) {
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0021-Faster-UUID-for-entities.patch b/CraftBukkit-Patches/0020-Faster-UUID-for-entities.patch
similarity index 94%
rename from CraftBukkit-Patches/0021-Faster-UUID-for-entities.patch
rename to CraftBukkit-Patches/0020-Faster-UUID-for-entities.patch
index b4b193e2de..714489b173 100644
--- a/CraftBukkit-Patches/0021-Faster-UUID-for-entities.patch
+++ b/CraftBukkit-Patches/0020-Faster-UUID-for-entities.patch
@@ -1,4 +1,4 @@
-From 5bc4b1498c02b4ad26a6ed80e46793426221011f Mon Sep 17 00:00:00 2001
+From 057734283eef7808469dd78e94ea86d4177b8c82 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 17 Mar 2013 19:02:50 +1100
 Subject: [PATCH] Faster UUID for entities
diff --git a/CraftBukkit-Patches/0022-Prevent-NPE-in-CraftSign.patch b/CraftBukkit-Patches/0021-Prevent-NPE-in-CraftSign.patch
similarity index 95%
rename from CraftBukkit-Patches/0022-Prevent-NPE-in-CraftSign.patch
rename to CraftBukkit-Patches/0021-Prevent-NPE-in-CraftSign.patch
index 949f55faf9..660a773ed6 100644
--- a/CraftBukkit-Patches/0022-Prevent-NPE-in-CraftSign.patch
+++ b/CraftBukkit-Patches/0021-Prevent-NPE-in-CraftSign.patch
@@ -1,4 +1,4 @@
-From 497af5fb267959f215b8ac57de702065a48ae931 Mon Sep 17 00:00:00 2001
+From f2da21e80183a5a42d4043949909cb82663ba5cd Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Mon, 18 Mar 2013 20:01:44 +1100
 Subject: [PATCH] Prevent NPE in CraftSign
@@ -32,5 +32,5 @@ index 77717d5..1533dd4 100644
              sign.update();
          }
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0023-Entity-Tracking-Ranges.patch b/CraftBukkit-Patches/0022-Entity-Tracking-Ranges.patch
similarity index 98%
rename from CraftBukkit-Patches/0023-Entity-Tracking-Ranges.patch
rename to CraftBukkit-Patches/0022-Entity-Tracking-Ranges.patch
index 5941949344..21b8111b8b 100644
--- a/CraftBukkit-Patches/0023-Entity-Tracking-Ranges.patch
+++ b/CraftBukkit-Patches/0022-Entity-Tracking-Ranges.patch
@@ -1,4 +1,4 @@
-From 64e6d307ac64707605a61489c5d103511e18de64 Mon Sep 17 00:00:00 2001
+From 2d698107a735cb7fdfce121d5518a1c8d3761447 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 20 Feb 2013 11:58:47 -0500
 Subject: [PATCH] Entity Tracking Ranges
@@ -105,5 +105,5 @@ index 0000000..4bf4d2a
 +    }
 +}
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0024-Limit-Custom-Map-Rendering.patch b/CraftBukkit-Patches/0023-Limit-Custom-Map-Rendering.patch
similarity index 98%
rename from CraftBukkit-Patches/0024-Limit-Custom-Map-Rendering.patch
rename to CraftBukkit-Patches/0023-Limit-Custom-Map-Rendering.patch
index 0ef274376b..2492018062 100644
--- a/CraftBukkit-Patches/0024-Limit-Custom-Map-Rendering.patch
+++ b/CraftBukkit-Patches/0023-Limit-Custom-Map-Rendering.patch
@@ -1,4 +1,4 @@
-From 1a2892ea46bdb45810e99c2e858a8f335d45be2f Mon Sep 17 00:00:00 2001
+From 55030705cb3ebfa20d6d1f6891eee6b1758a1ca3 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Mar 2013 19:08:41 +1100
 Subject: [PATCH] Limit Custom Map Rendering
@@ -70,5 +70,5 @@ index 1a150d9..c9f0027 100644
      protected final WorldMap worldMap;
  
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0025-Thread-Naming-and-Tweaks.patch b/CraftBukkit-Patches/0024-Thread-Naming-and-Tweaks.patch
similarity index 94%
rename from CraftBukkit-Patches/0025-Thread-Naming-and-Tweaks.patch
rename to CraftBukkit-Patches/0024-Thread-Naming-and-Tweaks.patch
index f57c7002c9..e7483e4e44 100644
--- a/CraftBukkit-Patches/0025-Thread-Naming-and-Tweaks.patch
+++ b/CraftBukkit-Patches/0024-Thread-Naming-and-Tweaks.patch
@@ -1,4 +1,4 @@
-From e9def1247d73b078f8d84f3009b7a2d0ad5d59b7 Mon Sep 17 00:00:00 2001
+From 7b20e3085dc0b346f9ffb9f625465e53562ffb70 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 23 Apr 2013 11:50:27 +1000
 Subject: [PATCH] Thread Naming and Tweaks
@@ -19,5 +19,5 @@ index 84dcfcc..a30f217 100644
      private CraftAsyncDebugger debugTail = debugHead;
      private static final int RECENT_TICKS;
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0026-Close-Unloaded-Save-Files.patch b/CraftBukkit-Patches/0025-Close-Unloaded-Save-Files.patch
similarity index 96%
rename from CraftBukkit-Patches/0026-Close-Unloaded-Save-Files.patch
rename to CraftBukkit-Patches/0025-Close-Unloaded-Save-Files.patch
index 5e0e8d23a2..3ec6174b85 100644
--- a/CraftBukkit-Patches/0026-Close-Unloaded-Save-Files.patch
+++ b/CraftBukkit-Patches/0025-Close-Unloaded-Save-Files.patch
@@ -1,4 +1,4 @@
-From bfb997415d03a4394c2594a4cc8e9111e963752b Mon Sep 17 00:00:00 2001
+From cce115d0487bfddbe96b7a5341ece92fc4465ab8 Mon Sep 17 00:00:00 2001
 From: Antony Riley <antony@cyberiantiger.org>
 Date: Wed, 27 Mar 2013 01:41:54 +0200
 Subject: [PATCH] Close Unloaded Save Files
@@ -18,7 +18,7 @@ index 900ed68..829f4a3 100644
      public static synchronized RegionFile a(File file1, int i, int j) {
          File file2 = new File(file1, "region");
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9f40d68..875f25f 100644
+index bb1bddf..f66f764 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -86,6 +86,8 @@ import net.minecraft.server.MinecraftServer;
@@ -62,5 +62,5 @@ index 9f40d68..875f25f 100644
      }
  
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0027-Remove-o-Option.patch b/CraftBukkit-Patches/0026-Remove-o-Option.patch
similarity index 91%
rename from CraftBukkit-Patches/0027-Remove-o-Option.patch
rename to CraftBukkit-Patches/0026-Remove-o-Option.patch
index 05ac00006a..f387cc7559 100644
--- a/CraftBukkit-Patches/0027-Remove-o-Option.patch
+++ b/CraftBukkit-Patches/0026-Remove-o-Option.patch
@@ -1,4 +1,4 @@
-From 149cdfe128beb0df0d9055d33a40d3b7da5e179c Mon Sep 17 00:00:00 2001
+From 85469a82bd3aa027e89d9b03d6731193eeb238f7 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 19 May 2013 18:29:48 +1000
 Subject: [PATCH] Remove -o Option
@@ -19,5 +19,5 @@ index bb535c2..93968bd 100644
          }
  
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0028-Recipe-Deconstruction.patch b/CraftBukkit-Patches/0027-Recipe-Deconstruction.patch
similarity index 97%
rename from CraftBukkit-Patches/0028-Recipe-Deconstruction.patch
rename to CraftBukkit-Patches/0027-Recipe-Deconstruction.patch
index d343a6f3d0..e63858af13 100644
--- a/CraftBukkit-Patches/0028-Recipe-Deconstruction.patch
+++ b/CraftBukkit-Patches/0027-Recipe-Deconstruction.patch
@@ -1,4 +1,4 @@
-From f39835e2ec7023218ad9d8227c02045e1a3015fb Mon Sep 17 00:00:00 2001
+From 064f79546c3d9ed48f2535918baddf905fe22540 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 1 Jun 2013 16:34:38 +1000
 Subject: [PATCH] Recipe Deconstruction
@@ -67,5 +67,5 @@ index 0fab83c..21181fb 100644
 +    // Spigot end
  }
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0029-Implement-Arrow-API.patch b/CraftBukkit-Patches/0028-Implement-Arrow-API.patch
similarity index 92%
rename from CraftBukkit-Patches/0029-Implement-Arrow-API.patch
rename to CraftBukkit-Patches/0028-Implement-Arrow-API.patch
index 7739884393..6aaafaded3 100644
--- a/CraftBukkit-Patches/0029-Implement-Arrow-API.patch
+++ b/CraftBukkit-Patches/0028-Implement-Arrow-API.patch
@@ -1,4 +1,4 @@
-From 0a51dd1733e0a307cf26bafd596a70e981004f79 Mon Sep 17 00:00:00 2001
+From 37cf2bb33b714e62f1221b6494352bff100c1627 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 15:16:05 +1000
 Subject: [PATCH] Implement Arrow API
@@ -27,5 +27,5 @@ index 09e7223..8c8a173 100644
  
      public Arrow.Spigot spigot()
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0030-Hopper-Cooldowns.patch b/CraftBukkit-Patches/0029-Hopper-Cooldowns.patch
similarity index 97%
rename from CraftBukkit-Patches/0030-Hopper-Cooldowns.patch
rename to CraftBukkit-Patches/0029-Hopper-Cooldowns.patch
index 704fd82dae..dee5c63d0f 100644
--- a/CraftBukkit-Patches/0030-Hopper-Cooldowns.patch
+++ b/CraftBukkit-Patches/0029-Hopper-Cooldowns.patch
@@ -1,11 +1,11 @@
-From 4c545da88ebd04a32e7cbb0be787afcf2ac083ef Mon Sep 17 00:00:00 2001
+From c77ca033afa24023df24c824228bacfca7141f7e Mon Sep 17 00:00:00 2001
 From: erocs <github@erocs.org>
 Date: Sun, 8 Sep 2013 12:06:15 -0700
 Subject: [PATCH] Hopper Cooldowns
 
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
-index 3f1a910..d7a3178 100644
+index 48a882a..baa158b 100644
 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java
 +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
 @@ -189,12 +189,18 @@ public class TileEntityHopper extends TileEntity implements IHopper {
@@ -81,5 +81,5 @@ index 6421bf2..827e6f9 100644
 +    }
  }
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0031-Prevent-Shutdown-Hang.patch b/CraftBukkit-Patches/0030-Prevent-Shutdown-Hang.patch
similarity index 92%
rename from CraftBukkit-Patches/0031-Prevent-Shutdown-Hang.patch
rename to CraftBukkit-Patches/0030-Prevent-Shutdown-Hang.patch
index 7f00088fab..3870a03f49 100644
--- a/CraftBukkit-Patches/0031-Prevent-Shutdown-Hang.patch
+++ b/CraftBukkit-Patches/0030-Prevent-Shutdown-Hang.patch
@@ -1,4 +1,4 @@
-From 596282d41a999f6c08fa984d44bcf12c2937c213 Mon Sep 17 00:00:00 2001
+From 296a8b176d18def1f52aec81873d7c68083d39fe Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 11 Jun 2013 11:54:32 +1000
 Subject: [PATCH] Prevent Shutdown Hang
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent Shutdown Hang
 Prevents server hanging if players disconnect during the shutdown sequence.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 7c01595..4977ea1 100644
+index 1dbce5c..2a15271 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1152,8 +1152,15 @@ public abstract class PlayerList {
@@ -28,5 +28,5 @@ index 7c01595..4977ea1 100644
      }
  
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0032-Implement-SpawnerSpawnEvent.patch b/CraftBukkit-Patches/0031-Implement-SpawnerSpawnEvent.patch
similarity index 97%
rename from CraftBukkit-Patches/0032-Implement-SpawnerSpawnEvent.patch
rename to CraftBukkit-Patches/0031-Implement-SpawnerSpawnEvent.patch
index 22857823e9..23ec0efd24 100644
--- a/CraftBukkit-Patches/0032-Implement-SpawnerSpawnEvent.patch
+++ b/CraftBukkit-Patches/0031-Implement-SpawnerSpawnEvent.patch
@@ -1,4 +1,4 @@
-From 45421c501fe3ac16483fde71a8143794b8e147e2 Mon Sep 17 00:00:00 2001
+From 6283d084b9bd9e85048c6c422bff8533cdc6c44f Mon Sep 17 00:00:00 2001
 From: Andy Shulman <andy.shulman@hotmail.com>
 Date: Mon, 15 Apr 2013 20:06:37 -0500
 Subject: [PATCH] Implement SpawnerSpawnEvent.
@@ -63,7 +63,7 @@ index 06f9b1f..b97ac4b 100644
  
          return entity;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 4cc25f2..e1e8361 100644
+index 30f31d1..22e2879 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -36,6 +36,7 @@ import org.bukkit.Statistic.Type;
@@ -98,5 +98,5 @@ index 4cc25f2..e1e8361 100644
       */
      public static PlayerBucketEmptyEvent callPlayerBucketEmptyEvent(EntityHuman who, int clickedX, int clickedY, int clickedZ, int clickedFace, ItemStack itemInHand) {
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0033-Firework-Meta-Crash-Fix.patch b/CraftBukkit-Patches/0032-Firework-Meta-Crash-Fix.patch
similarity index 93%
rename from CraftBukkit-Patches/0033-Firework-Meta-Crash-Fix.patch
rename to CraftBukkit-Patches/0032-Firework-Meta-Crash-Fix.patch
index 61b9e25c7c..01249398d1 100644
--- a/CraftBukkit-Patches/0033-Firework-Meta-Crash-Fix.patch
+++ b/CraftBukkit-Patches/0032-Firework-Meta-Crash-Fix.patch
@@ -1,4 +1,4 @@
-From 6a08b304c2ce4f533360478508980e91c3747b1e Mon Sep 17 00:00:00 2001
+From c13065ba778749814980d29d17c6804df9d6d368 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 15 Jun 2013 21:34:48 +1000
 Subject: [PATCH] Firework Meta Crash Fix
@@ -27,5 +27,5 @@ index 0f7da6b..5a409ae 100644
      }
  
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0034-Allow-Disabling-of-Command-Logging.patch b/CraftBukkit-Patches/0033-Allow-Disabling-of-Command-Logging.patch
similarity index 90%
rename from CraftBukkit-Patches/0034-Allow-Disabling-of-Command-Logging.patch
rename to CraftBukkit-Patches/0033-Allow-Disabling-of-Command-Logging.patch
index b6317282af..66c270c57b 100644
--- a/CraftBukkit-Patches/0034-Allow-Disabling-of-Command-Logging.patch
+++ b/CraftBukkit-Patches/0033-Allow-Disabling-of-Command-Logging.patch
@@ -1,14 +1,14 @@
-From 42581137b2b8313804bd958c5166e9add3dff9fe Mon Sep 17 00:00:00 2001
+From 43b719a4545c2790eae1ac8b636f1d1042445fcc Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 18:01:29 +1000
 Subject: [PATCH] Allow Disabling of Command Logging
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index f34fd03..7826074 100644
+index 5cde08f..4d7f5ad 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -951,7 +951,12 @@ public class PlayerConnection implements PacketPlayInListener {
+@@ -953,7 +953,12 @@ public class PlayerConnection implements PacketPlayInListener {
          }
  
          try {
@@ -38,5 +38,5 @@ index 98fcb47..afd6b56 100644
 +    }
  }
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0035-Allow-Disabling-of-Command-TabComplete.patch b/CraftBukkit-Patches/0034-Allow-Disabling-of-Command-TabComplete.patch
similarity index 95%
rename from CraftBukkit-Patches/0035-Allow-Disabling-of-Command-TabComplete.patch
rename to CraftBukkit-Patches/0034-Allow-Disabling-of-Command-TabComplete.patch
index 47d0d625ea..d3dcb7cd56 100644
--- a/CraftBukkit-Patches/0035-Allow-Disabling-of-Command-TabComplete.patch
+++ b/CraftBukkit-Patches/0034-Allow-Disabling-of-Command-TabComplete.patch
@@ -1,4 +1,4 @@
-From aa2ab38ef8d7f09799c720331bc3d0daf0495848 Mon Sep 17 00:00:00 2001
+From 2b8d8eaeba2e003f64678371bfd50d10cdef2634 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 18:05:54 +1000
 Subject: [PATCH] Allow Disabling of Command TabComplete
@@ -49,5 +49,5 @@ index afd6b56..20634f1 100644
 +    }
  }
 -- 
-1.8.5.2.msysgit.0
+1.9.1
 
diff --git a/CraftBukkit-Patches/0036-Configurable-Messages.patch b/CraftBukkit-Patches/0035-Configurable-Messages.patch
similarity index 98%
rename from CraftBukkit-Patches/0036-Configurable-Messages.patch
rename to CraftBukkit-Patches/0035-Configurable-Messages.patch
index 80a884e43e..457574555d 100644
--- a/CraftBukkit-Patches/0036-Configurable-Messages.patch
+++ b/CraftBukkit-Patches/0035-Configurable-Messages.patch
@@ -1,4 +1,4 @@
-From 016f8aa9bddc612afe059039bca58912be065b64 Mon Sep 17 00:00:00 2001
+From c036ffdf17e499b702947010eaeaeaa0e1b8f2f9 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 19:21:58 +1000
 Subject: [PATCH] Configurable Messages
@@ -103,5 +103,5 @@ index 20634f1..efcd193 100644
 +    }
  }
 -- 
-1.8.5.2.msysgit.0
+1.9.1
 
diff --git a/CraftBukkit-Patches/0037-Allow-Disabling-of-Random-Lighting-Updates.patch b/CraftBukkit-Patches/0036-Allow-Disabling-of-Random-Lighting-Updates.patch
similarity index 92%
rename from CraftBukkit-Patches/0037-Allow-Disabling-of-Random-Lighting-Updates.patch
rename to CraftBukkit-Patches/0036-Allow-Disabling-of-Random-Lighting-Updates.patch
index a1f4161c42..b547bab16c 100644
--- a/CraftBukkit-Patches/0037-Allow-Disabling-of-Random-Lighting-Updates.patch
+++ b/CraftBukkit-Patches/0036-Allow-Disabling-of-Random-Lighting-Updates.patch
@@ -1,4 +1,4 @@
-From a90c3b1287735f4a5b27480ef39d28fa1733ccb2 Mon Sep 17 00:00:00 2001
+From 3cafcf93720a49cb8ef7e81c7061f2b2aace758f 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
@@ -18,10 +18,10 @@ index 0110120..96974b4 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 7d9d325..96b5bc7 100644
+index 508c059..932686f 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -2036,7 +2036,7 @@ public abstract class World implements IBlockAccess {
+@@ -2023,7 +2023,7 @@ public abstract class World implements IBlockAccess {
          }
  
          this.methodProfiler.a("playerCheckLight");
@@ -47,5 +47,5 @@ index 827e6f9..adebd03 100644
 +    }
  }
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0039-Properly-Close-Inventories.patch b/CraftBukkit-Patches/0037-Properly-Close-Inventories.patch
similarity index 96%
rename from CraftBukkit-Patches/0039-Properly-Close-Inventories.patch
rename to CraftBukkit-Patches/0037-Properly-Close-Inventories.patch
index 5afafb43ae..b678e290cb 100644
--- a/CraftBukkit-Patches/0039-Properly-Close-Inventories.patch
+++ b/CraftBukkit-Patches/0037-Properly-Close-Inventories.patch
@@ -1,4 +1,4 @@
-From 051f0b21d9cdee96e11e7db6bb2577ef59bc69a9 Mon Sep 17 00:00:00 2001
+From fb9bbf03b51a2dd8d11d94ffb61ae53668b7d3d7 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
@@ -42,7 +42,7 @@ index 96974b4..3fc83e5 100644
                  // Do not pass along players, as doing so can get them stuck outside of time.
                  // (which for example disables inventory icon updates and prevents block breaking)
 diff --git a/src/main/java/net/minecraft/server/EntityMinecartContainer.java b/src/main/java/net/minecraft/server/EntityMinecartContainer.java
-index 9f3f196..439cf2e 100644
+index b599eeb..2065e5a 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartContainer.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartContainer.java
 @@ -149,6 +149,12 @@ public abstract class EntityMinecartContainer extends EntityMinecartAbstract imp
@@ -59,5 +59,5 @@ index 9f3f196..439cf2e 100644
          super.b(i);
      }
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0040-Disallow-Interaction-With-Self.patch b/CraftBukkit-Patches/0038-Disallow-Interaction-With-Self.patch
similarity index 83%
rename from CraftBukkit-Patches/0040-Disallow-Interaction-With-Self.patch
rename to CraftBukkit-Patches/0038-Disallow-Interaction-With-Self.patch
index a04e217e99..1029d4cf18 100644
--- a/CraftBukkit-Patches/0040-Disallow-Interaction-With-Self.patch
+++ b/CraftBukkit-Patches/0038-Disallow-Interaction-With-Self.patch
@@ -1,14 +1,14 @@
-From b2830d7802cb73473523fea60775ba9dc70bfd4b Mon Sep 17 00:00:00 2001
+From 2897b0b82547e474f84cd331f3485ee9c509881f Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 28 Jun 2013 19:52:54 +1000
 Subject: [PATCH] Disallow Interaction With Self
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 7826074..917a587 100644
+index 4d7f5ad..07658df 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1058,6 +1058,13 @@ public class PlayerConnection implements PacketPlayInListener {
+@@ -1060,6 +1060,13 @@ public class PlayerConnection implements PacketPlayInListener {
          if (this.player.dead) return; // CraftBukkit
          WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension);
          Entity entity = packetplayinuseentity.a((World) worldserver);
@@ -23,5 +23,5 @@ index 7826074..917a587 100644
          this.player.v();
          if (entity != null) {
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0038-Make-AnvilInventory.getItem-use-both-containers.-Fix.patch b/CraftBukkit-Patches/0038-Make-AnvilInventory.getItem-use-both-containers.-Fix.patch
deleted file mode 100644
index 62387536a4..0000000000
--- a/CraftBukkit-Patches/0038-Make-AnvilInventory.getItem-use-both-containers.-Fix.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 2051efdcbc0f117371f6d034dfbf36096ef9b4df Mon Sep 17 00:00:00 2001
-From: Andre LeBlanc <andre@norcode.com>
-Date: Sat, 6 Apr 2013 12:00:31 -0400
-Subject: [PATCH] Make AnvilInventory.getItem() use both containers. Fixes
- BUKKIT-2788
-
-The AnvilInventory reports its size as the sum of the ingredient and
-result inventories, but when trying to access the slots, only the ingredient
-inventory is used, leading to an ArrayIndexOutOfBounds exception.
-
-This change overrides getItem(I) and setItem(I) to use both inventories,
-with the slot number adjusted based on their size.
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java
-index a91d81a..46a1d38 100644
---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java
-@@ -1,7 +1,9 @@
- package org.bukkit.craftbukkit.inventory;
- 
- import net.minecraft.server.IInventory;
-+
- import org.bukkit.inventory.AnvilInventory;
-+import org.bukkit.inventory.ItemStack;
- 
- public class CraftInventoryAnvil extends CraftInventory implements AnvilInventory {
-     private final IInventory resultInventory;
-@@ -20,6 +22,26 @@ public class CraftInventoryAnvil extends CraftInventory implements AnvilInventor
-     }
- 
-     @Override
-+    public ItemStack getItem(int slot) {
-+        if (slot < getIngredientsInventory().getSize()) {
-+            net.minecraft.server.ItemStack item = getIngredientsInventory().getItem(slot);
-+            return item == null ? null : CraftItemStack.asCraftMirror(item);
-+        } else {
-+            net.minecraft.server.ItemStack item = getResultInventory().getItem(slot - getIngredientsInventory().getSize());
-+            return item == null ? null : CraftItemStack.asCraftMirror(item);
-+        }
-+    }
-+
-+    @Override
-+    public void setItem(int index, ItemStack item) {
-+        if (index < getIngredientsInventory().getSize()) {
-+            getIngredientsInventory().setItem(index, (item == null ? null : CraftItemStack.asNMSCopy(item)));
-+        } else {
-+            getResultInventory().setItem((index - getIngredientsInventory().getSize()), (item == null ? null : CraftItemStack.asNMSCopy(item)));
-+        }
-+    }
-+
-+    @Override
-     public int getSize() {
-         return getResultInventory().getSize() + getIngredientsInventory().getSize();
-     }
--- 
-1.8.3.2
-
diff --git a/CraftBukkit-Patches/0041-Lower-Chunk-Compression.patch b/CraftBukkit-Patches/0039-Lower-Chunk-Compression.patch
similarity index 95%
rename from CraftBukkit-Patches/0041-Lower-Chunk-Compression.patch
rename to CraftBukkit-Patches/0039-Lower-Chunk-Compression.patch
index 656362a168..f1acf77dde 100644
--- a/CraftBukkit-Patches/0041-Lower-Chunk-Compression.patch
+++ b/CraftBukkit-Patches/0039-Lower-Chunk-Compression.patch
@@ -1,4 +1,4 @@
-From a5924094af40aee70d68f5e69922abc147411028 Mon Sep 17 00:00:00 2001
+From d6302f62b973c46d0f259f951e2dd9c9785de896 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 2 Jul 2013 09:07:54 +1000
 Subject: [PATCH] Lower Chunk Compression
@@ -32,5 +32,5 @@ index 3eac231..bf3a139 100644
      };
      // CraftBukkit end
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0042-Entity-Mount-and-Dismount-Events.patch b/CraftBukkit-Patches/0040-Entity-Mount-and-Dismount-Events.patch
similarity index 97%
rename from CraftBukkit-Patches/0042-Entity-Mount-and-Dismount-Events.patch
rename to CraftBukkit-Patches/0040-Entity-Mount-and-Dismount-Events.patch
index c30fb0c93c..72df9c49d0 100644
--- a/CraftBukkit-Patches/0042-Entity-Mount-and-Dismount-Events.patch
+++ b/CraftBukkit-Patches/0040-Entity-Mount-and-Dismount-Events.patch
@@ -1,4 +1,4 @@
-From ae439b64018d26625c4698357ea2ea8a3bd81cc2 Mon Sep 17 00:00:00 2001
+From c5b92b3fdedecb5f1d46470d621f15e38c49608e Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 2 Jul 2013 20:32:49 +1000
 Subject: [PATCH] Entity Mount and Dismount Events
diff --git a/CraftBukkit-Patches/0043-Prevent-Ghost-Players-Caused-by-Plugins.patch b/CraftBukkit-Patches/0041-Prevent-Ghost-Players-Caused-by-Plugins.patch
similarity index 92%
rename from CraftBukkit-Patches/0043-Prevent-Ghost-Players-Caused-by-Plugins.patch
rename to CraftBukkit-Patches/0041-Prevent-Ghost-Players-Caused-by-Plugins.patch
index dcffaef4b2..d985361c1c 100644
--- a/CraftBukkit-Patches/0043-Prevent-Ghost-Players-Caused-by-Plugins.patch
+++ b/CraftBukkit-Patches/0041-Prevent-Ghost-Players-Caused-by-Plugins.patch
@@ -1,4 +1,4 @@
-From a6a707a02e69a180f31f1eaf005a5bf9e610e43c Mon Sep 17 00:00:00 2001
+From b3497c286e366bd54813d98a74c2041fe298fb28 Mon Sep 17 00:00:00 2001
 From: Alex Ciuba <alexciuba@gmail.com>
 Date: Tue, 11 Jun 2013 15:23:03 -0400
 Subject: [PATCH] Prevent Ghost Players Caused by Plugins
@@ -22,5 +22,5 @@ index e156a5a..4c5d77e 100644
              location = respawnEvent.getRespawnLocation();
              entityplayer.reset();
 -- 
-1.8.5.2.msysgit.0
+1.9.1
 
diff --git a/CraftBukkit-Patches/0044-Entity-ticking-chunk-caching.patch b/CraftBukkit-Patches/0042-Entity-ticking-chunk-caching.patch
similarity index 89%
rename from CraftBukkit-Patches/0044-Entity-ticking-chunk-caching.patch
rename to CraftBukkit-Patches/0042-Entity-ticking-chunk-caching.patch
index d451a4e039..c4a875f906 100644
--- a/CraftBukkit-Patches/0044-Entity-ticking-chunk-caching.patch
+++ b/CraftBukkit-Patches/0042-Entity-ticking-chunk-caching.patch
@@ -1,4 +1,4 @@
-From 9d5f0caeda6236c3483e0b8338bc89d43acc48bd Mon Sep 17 00:00:00 2001
+From 9d2e1c3bc82d814be967daa62994dcc080384945 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
@@ -6,10 +6,10 @@ 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 96b5bc7..b0b9757 100644
+index 932686f..2f7be96 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1186,6 +1186,7 @@ public abstract class World implements IBlockAccess {
+@@ -1173,6 +1173,7 @@ public abstract class World implements IBlockAccess {
          CrashReport crashreport;
          CrashReportSystemDetails crashreportsystemdetails;
  
@@ -17,7 +17,7 @@ index 96b5bc7..b0b9757 100644
          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
-@@ -1194,10 +1195,15 @@ public abstract class World implements IBlockAccess {
+@@ -1181,10 +1182,15 @@ public abstract class World implements IBlockAccess {
              }
  
              ChunkProviderServer chunkProviderServer = ((WorldServer) this).chunkProviderServer;
@@ -35,7 +35,7 @@ index 96b5bc7..b0b9757 100644
  
              try {
                  ++entity.ticksLived;
-@@ -1218,6 +1224,7 @@ public abstract class World implements IBlockAccess {
+@@ -1205,6 +1211,7 @@ public abstract class World implements IBlockAccess {
                  this.i.remove(i--);
              }
          }
@@ -43,7 +43,7 @@ index 96b5bc7..b0b9757 100644
  
          this.methodProfiler.c("remove");
          this.entityList.removeAll(this.f);
-@@ -1249,10 +1256,15 @@ public abstract class World implements IBlockAccess {
+@@ -1236,10 +1243,15 @@ public abstract class World implements IBlockAccess {
  
              // Don't tick entities in chunks queued for unload
              ChunkProviderServer chunkProviderServer = ((WorldServer) this).chunkProviderServer;
@@ -62,5 +62,5 @@ index 96b5bc7..b0b9757 100644
              if (entity.vehicle != null) {
                  if (!entity.vehicle.dead && entity.vehicle.passenger == entity) {
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0045-Plug-World-Unload-Memory-Leak.patch b/CraftBukkit-Patches/0043-Plug-World-Unload-Memory-Leak.patch
similarity index 91%
rename from CraftBukkit-Patches/0045-Plug-World-Unload-Memory-Leak.patch
rename to CraftBukkit-Patches/0043-Plug-World-Unload-Memory-Leak.patch
index 571048e4ec..b4ae1fb090 100644
--- a/CraftBukkit-Patches/0045-Plug-World-Unload-Memory-Leak.patch
+++ b/CraftBukkit-Patches/0043-Plug-World-Unload-Memory-Leak.patch
@@ -1,4 +1,4 @@
-From 9cc0ddfa178ec0b0aa06f17da9708cefbffd318a Mon Sep 17 00:00:00 2001
+From 6332634076b09d18af7ee9fc6deeffd1de566f58 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
@@ -18,5 +18,5 @@ index 8e01414..e0469bb 100644
      private boolean a(World world, int i, int j, int k, boolean flag) {
          if (!b.containsKey(world)) {
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0046-Player-Collision-API.patch b/CraftBukkit-Patches/0044-Player-Collision-API.patch
similarity index 95%
rename from CraftBukkit-Patches/0046-Player-Collision-API.patch
rename to CraftBukkit-Patches/0044-Player-Collision-API.patch
index ffe48b49ba..b4b3f07f88 100644
--- a/CraftBukkit-Patches/0046-Player-Collision-API.patch
+++ b/CraftBukkit-Patches/0044-Player-Collision-API.patch
@@ -1,11 +1,11 @@
-From 4063f09d6a735da6f77eb959f5fac2dfafad657c Mon Sep 17 00:00:00 2001
+From 35608171284d5462cc9a5e0cceb58c311bdc6bbb 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/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index e2e7b9c..5b50df0 100644
+index 1fc7a22..d091bcf 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -430,7 +430,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
@@ -31,7 +31,7 @@ index 6c77253..4c3fd8a 100644
                  Entity entity = (Entity) list.get(i);
  
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 9b80aef..b519903 100644
+index 3a0d679..367472d 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -63,6 +63,21 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -57,7 +57,7 @@ index 9b80aef..b519903 100644
      public EntityPlayer(MinecraftServer minecraftserver, WorldServer worldserver, GameProfile gameprofile, PlayerInteractManager playerinteractmanager) {
          super(worldserver, gameprofile);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d6bfa0d..deb4009 100644
+index fd1c137..059438d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1290,6 +1290,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -81,5 +81,5 @@ index d6bfa0d..deb4009 100644
  
      public Player.Spigot spigot()
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0047-Fully-Disable-Snooper-When-Not-Required.patch b/CraftBukkit-Patches/0045-Fully-Disable-Snooper-When-Not-Required.patch
similarity index 90%
rename from CraftBukkit-Patches/0047-Fully-Disable-Snooper-When-Not-Required.patch
rename to CraftBukkit-Patches/0045-Fully-Disable-Snooper-When-Not-Required.patch
index ed018ab987..32e98ddff1 100644
--- a/CraftBukkit-Patches/0047-Fully-Disable-Snooper-When-Not-Required.patch
+++ b/CraftBukkit-Patches/0045-Fully-Disable-Snooper-When-Not-Required.patch
@@ -1,11 +1,11 @@
-From b61831e527703aa087de238c808ff76ec67591dd Mon Sep 17 00:00:00 2001
+From 180007c871b7fa8a181cadabed4bbc09a26cd747 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/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d7b93a3..35453be 100644
+index 21cf068..007fb86 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -583,11 +583,11 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -23,5 +23,5 @@ index d7b93a3..35453be 100644
          }
  
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0048-Add-Getter-for-Entity-Invulnerability.patch b/CraftBukkit-Patches/0046-Add-Getter-for-Entity-Invulnerability.patch
similarity index 91%
rename from CraftBukkit-Patches/0048-Add-Getter-for-Entity-Invulnerability.patch
rename to CraftBukkit-Patches/0046-Add-Getter-for-Entity-Invulnerability.patch
index 655a01090e..77169de661 100644
--- a/CraftBukkit-Patches/0048-Add-Getter-for-Entity-Invulnerability.patch
+++ b/CraftBukkit-Patches/0046-Add-Getter-for-Entity-Invulnerability.patch
@@ -1,4 +1,4 @@
-From 1f9256b71314d22062c5a8724203cd17bfb120e1 Mon Sep 17 00:00:00 2001
+From 957a9bcb2fa0c3b06c2cb98c82ca67ff66bff4a2 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
@@ -21,5 +21,5 @@ index e026c1f..96d763b 100644
  
      public Spigot spigot()
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0049-Cap-Minimum-Player-Speed.patch b/CraftBukkit-Patches/0047-Cap-Minimum-Player-Speed.patch
similarity index 91%
rename from CraftBukkit-Patches/0049-Cap-Minimum-Player-Speed.patch
rename to CraftBukkit-Patches/0047-Cap-Minimum-Player-Speed.patch
index 1c28cd048b..3d7a8aa8a5 100644
--- a/CraftBukkit-Patches/0049-Cap-Minimum-Player-Speed.patch
+++ b/CraftBukkit-Patches/0047-Cap-Minimum-Player-Speed.patch
@@ -1,11 +1,11 @@
-From 14c71f7805bbcf37f398eb162f562533fe5952ee Mon Sep 17 00:00:00 2001
+From b8af49b4889a987e67cffffef28abb55fe9bb5b8 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 deb4009..9eb8e19 100644
+index 059438d..207ab87 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 {
@@ -27,5 +27,5 @@ index deb4009..9eb8e19 100644
      }
  
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0050-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch b/CraftBukkit-Patches/0048-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch
similarity index 91%
rename from CraftBukkit-Patches/0050-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch
rename to CraftBukkit-Patches/0048-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch
index 9eddea6dc8..9eb84f2dc9 100644
--- a/CraftBukkit-Patches/0050-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch
+++ b/CraftBukkit-Patches/0048-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch
@@ -1,11 +1,11 @@
-From 8d33ea18c42f4dfcee84dfb398bdabb701cc1078 Mon Sep 17 00:00:00 2001
+From 7eb7f425e6d81bd6b1bc30b4d9fbf4d1e87815ff 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/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 5b50df0..bc55fcc 100644
+index d091bcf..c3a0dc3 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -277,6 +277,10 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
@@ -20,5 +20,5 @@ index 5b50df0..bc55fcc 100644
                  return;
              }
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0051-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch b/CraftBukkit-Patches/0049-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch
similarity index 95%
rename from CraftBukkit-Patches/0051-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch
rename to CraftBukkit-Patches/0049-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch
index 32962be94d..e20eb753a8 100644
--- a/CraftBukkit-Patches/0051-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch
+++ b/CraftBukkit-Patches/0049-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch
@@ -1,4 +1,4 @@
-From a8d499d7d67e9545e96be449ba713181cf683518 Mon Sep 17 00:00:00 2001
+From a635de6cac4afd3ac997246944eb991f8abf543e 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
@@ -31,5 +31,5 @@ index e943676..7320a88 100644
                  world.setAir(i, j, k);
              }
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0052-Allow-Disabling-of-1.6.3-Structure-Saving.patch b/CraftBukkit-Patches/0050-Allow-Disabling-of-1.6.3-Structure-Saving.patch
similarity index 96%
rename from CraftBukkit-Patches/0052-Allow-Disabling-of-1.6.3-Structure-Saving.patch
rename to CraftBukkit-Patches/0050-Allow-Disabling-of-1.6.3-Structure-Saving.patch
index ccc0bcea5e..e66881b0b2 100644
--- a/CraftBukkit-Patches/0052-Allow-Disabling-of-1.6.3-Structure-Saving.patch
+++ b/CraftBukkit-Patches/0050-Allow-Disabling-of-1.6.3-Structure-Saving.patch
@@ -1,4 +1,4 @@
-From e5384725d1e52d3d48985d6398950f1300573b4a Mon Sep 17 00:00:00 2001
+From 973a2a6dd2f6c8dc8480e61b6dd915e112e593d0 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
@@ -46,5 +46,5 @@ index adebd03..9586c44 100644
 +    }
  }
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0053-Item-Despawn-Rate.patch b/CraftBukkit-Patches/0051-Item-Despawn-Rate.patch
similarity index 95%
rename from CraftBukkit-Patches/0053-Item-Despawn-Rate.patch
rename to CraftBukkit-Patches/0051-Item-Despawn-Rate.patch
index 7ee860b257..25f30c405b 100644
--- a/CraftBukkit-Patches/0053-Item-Despawn-Rate.patch
+++ b/CraftBukkit-Patches/0051-Item-Despawn-Rate.patch
@@ -1,4 +1,4 @@
-From 2558f8f50bdfe2c9d8fee5ad9629a2af43379712 Mon Sep 17 00:00:00 2001
+From 6a3fa409b3105217da2dbdba5aad0638d1940363 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
@@ -34,5 +34,5 @@ index 9586c44..82d59e7 100644
 +    }
  }
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0054-Don-t-Special-Case-X-Move-Value.patch b/CraftBukkit-Patches/0052-Don-t-Special-Case-X-Move-Value.patch
similarity index 95%
rename from CraftBukkit-Patches/0054-Don-t-Special-Case-X-Move-Value.patch
rename to CraftBukkit-Patches/0052-Don-t-Special-Case-X-Move-Value.patch
index 09c0269fc2..6ff22fab58 100644
--- a/CraftBukkit-Patches/0054-Don-t-Special-Case-X-Move-Value.patch
+++ b/CraftBukkit-Patches/0052-Don-t-Special-Case-X-Move-Value.patch
@@ -1,11 +1,11 @@
-From e84d44cc072262050be162110feb55a1010954e0 Mon Sep 17 00:00:00 2001
+From 1f05592622009732f3d63f6b61ed03185e8aa895 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 917a587..c1ddb33 100644
+index 07658df..d90d332 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 {
@@ -45,5 +45,5 @@ index 917a587..c1ddb33 100644
                      this.server.getPluginManager().callEvent(event);
  
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0055-Implement-respawn-API.patch b/CraftBukkit-Patches/0053-Implement-respawn-API.patch
similarity index 90%
rename from CraftBukkit-Patches/0055-Implement-respawn-API.patch
rename to CraftBukkit-Patches/0053-Implement-respawn-API.patch
index 51493d0422..78a8462ec3 100644
--- a/CraftBukkit-Patches/0055-Implement-respawn-API.patch
+++ b/CraftBukkit-Patches/0053-Implement-respawn-API.patch
@@ -1,11 +1,11 @@
-From 05861ecb4bd0b4b22a3233c9907e885b22b36a1b Mon Sep 17 00:00:00 2001
+From 87430759742330ab89539a453b5d1a77afaa46b7 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 9eb8e19..5d15396 100644
+index 207ab87..a63db3b 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 {
@@ -25,5 +25,5 @@ index 9eb8e19..5d15396 100644
  
      public Player.Spigot spigot()
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0056-Fix-BrewingStands-Removing-NBT-Potions.patch b/CraftBukkit-Patches/0054-Fix-BrewingStands-Removing-NBT-Potions.patch
similarity index 94%
rename from CraftBukkit-Patches/0056-Fix-BrewingStands-Removing-NBT-Potions.patch
rename to CraftBukkit-Patches/0054-Fix-BrewingStands-Removing-NBT-Potions.patch
index 2fac99ef90..c6fb9d9b0b 100644
--- a/CraftBukkit-Patches/0056-Fix-BrewingStands-Removing-NBT-Potions.patch
+++ b/CraftBukkit-Patches/0054-Fix-BrewingStands-Removing-NBT-Potions.patch
@@ -1,4 +1,4 @@
-From d56362c6b3f949b07066d5b75c0d89b7645a7809 Mon Sep 17 00:00:00 2001
+From 5e1c8021be395a605c3d504b0d66af3eb5852add 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
@@ -24,5 +24,5 @@ index 3287d77..eabea5a 100644
                  }
              }
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0057-Arrow-Despawn-Rate.patch b/CraftBukkit-Patches/0055-Arrow-Despawn-Rate.patch
similarity index 95%
rename from CraftBukkit-Patches/0057-Arrow-Despawn-Rate.patch
rename to CraftBukkit-Patches/0055-Arrow-Despawn-Rate.patch
index a4674632ee..79915bc74c 100644
--- a/CraftBukkit-Patches/0057-Arrow-Despawn-Rate.patch
+++ b/CraftBukkit-Patches/0055-Arrow-Despawn-Rate.patch
@@ -1,4 +1,4 @@
-From ad6f0ad1cc97e082ab11f471774a88a4dd7c7370 Mon Sep 17 00:00:00 2001
+From b483d47362aa2037c79bec0b19075964c33ac0a2 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
@@ -34,5 +34,5 @@ index 82d59e7..2ec047c 100644
 +    }
  }
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0058-Fix-packed-ice-generation.patch b/CraftBukkit-Patches/0056-Fix-packed-ice-generation.patch
similarity index 96%
rename from CraftBukkit-Patches/0058-Fix-packed-ice-generation.patch
rename to CraftBukkit-Patches/0056-Fix-packed-ice-generation.patch
index 58a0c57467..c723072946 100644
--- a/CraftBukkit-Patches/0058-Fix-packed-ice-generation.patch
+++ b/CraftBukkit-Patches/0056-Fix-packed-ice-generation.patch
@@ -1,4 +1,4 @@
-From 781e41cf5b3935d4d4b314f7baf475f3cf81056a Mon Sep 17 00:00:00 2001
+From d25f0c8532d6d79b0166abbc9aac5ecf7f1a911f 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
@@ -34,5 +34,5 @@ index c0db754..a830758 100644
                                  --k2;
                                  if (k2 <= 0) {
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0059-Watchdog-Thread.patch b/CraftBukkit-Patches/0057-Watchdog-Thread.patch
similarity index 99%
rename from CraftBukkit-Patches/0059-Watchdog-Thread.patch
rename to CraftBukkit-Patches/0057-Watchdog-Thread.patch
index 3ea0acd2d1..444008b573 100644
--- a/CraftBukkit-Patches/0059-Watchdog-Thread.patch
+++ b/CraftBukkit-Patches/0057-Watchdog-Thread.patch
@@ -1,11 +1,11 @@
-From 8e1e8ca5baa8180ccc679d3d72776f3f94061c40 Mon Sep 17 00:00:00 2001
+From ae16eaf1009911e4f515a72b37cbb2bf55a32a0c 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/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 35453be..e78d8f3 100644
+index 007fb86..51f1761 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -498,6 +498,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -287,5 +287,5 @@ index 0000000..de08ad6
 +    }
 +}
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0060-Clear-Flower-Pot-on-Drop.patch b/CraftBukkit-Patches/0058-Clear-Flower-Pot-on-Drop.patch
similarity index 91%
rename from CraftBukkit-Patches/0060-Clear-Flower-Pot-on-Drop.patch
rename to CraftBukkit-Patches/0058-Clear-Flower-Pot-on-Drop.patch
index 7fcc0ead4c..0c67046dab 100644
--- a/CraftBukkit-Patches/0060-Clear-Flower-Pot-on-Drop.patch
+++ b/CraftBukkit-Patches/0058-Clear-Flower-Pot-on-Drop.patch
@@ -1,4 +1,4 @@
-From 6c75964a5839dcc79ee1c6a76b5d76b8fd01a265 Mon Sep 17 00:00:00 2001
+From e04497eb7fff37623d568f75cafa5881028f9da4 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
@@ -17,5 +17,5 @@ index ca6f4f0..0fa90b4 100644
  
          super.remove(world, i, j, k, block, l);
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0061-Fix-some-chunks-not-being-sent-to-the-client.patch b/CraftBukkit-Patches/0059-Fix-some-chunks-not-being-sent-to-the-client.patch
similarity index 94%
rename from CraftBukkit-Patches/0061-Fix-some-chunks-not-being-sent-to-the-client.patch
rename to CraftBukkit-Patches/0059-Fix-some-chunks-not-being-sent-to-the-client.patch
index fd68d15652..43d42e87a0 100644
--- a/CraftBukkit-Patches/0061-Fix-some-chunks-not-being-sent-to-the-client.patch
+++ b/CraftBukkit-Patches/0059-Fix-some-chunks-not-being-sent-to-the-client.patch
@@ -1,4 +1,4 @@
-From 5f093f85ed2c1d9da20455743d3ccb08915c4a3c Mon Sep 17 00:00:00 2001
+From 97d4b54cc547e0c2efcfdf583831c8d7c71e4c9c 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
@@ -26,5 +26,5 @@ index 3fc83e5..3712009 100644
  
      public ChunkCoordIntPair l() {
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0062-Fix-Broken-Async-Chat.patch b/CraftBukkit-Patches/0060-Fix-Broken-Async-Chat.patch
similarity index 94%
rename from CraftBukkit-Patches/0062-Fix-Broken-Async-Chat.patch
rename to CraftBukkit-Patches/0060-Fix-Broken-Async-Chat.patch
index b15e8e6f55..a463be8f3c 100644
--- a/CraftBukkit-Patches/0062-Fix-Broken-Async-Chat.patch
+++ b/CraftBukkit-Patches/0060-Fix-Broken-Async-Chat.patch
@@ -1,4 +1,4 @@
-From 3d991969a4a2a4490524309060e287d6ac1b7fb4 Mon Sep 17 00:00:00 2001
+From 974ada4dd1a0edf87f0880811249d3db38a2fa30 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
@@ -36,5 +36,5 @@ index 604a7af..d419f0f 100644
      }
  }
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0063-Allow-Teleportation-of-Vehicles-and-Passengers.patch b/CraftBukkit-Patches/0061-Allow-Teleportation-of-Vehicles-and-Passengers.patch
similarity index 92%
rename from CraftBukkit-Patches/0063-Allow-Teleportation-of-Vehicles-and-Passengers.patch
rename to CraftBukkit-Patches/0061-Allow-Teleportation-of-Vehicles-and-Passengers.patch
index 1bcdc40b6b..f1da9f210b 100644
--- a/CraftBukkit-Patches/0063-Allow-Teleportation-of-Vehicles-and-Passengers.patch
+++ b/CraftBukkit-Patches/0061-Allow-Teleportation-of-Vehicles-and-Passengers.patch
@@ -1,11 +1,11 @@
-From 63e6a0b006cd2d0e08daaffb2d8227c26d464ead Mon Sep 17 00:00:00 2001
+From a55476375d2ede32ed8c70f6d84e769710e91770 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 5d15396..d7934b4 100644
+index a63db3b..317e14f 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 {
@@ -36,5 +36,5 @@ index 5d15396..d7934b4 100644
          // Update the From Location
          from = event.getFrom();
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0064-Remove-OS-X-Special-Chars-from-Signs.patch b/CraftBukkit-Patches/0062-Remove-OS-X-Special-Chars-from-Signs.patch
similarity index 82%
rename from CraftBukkit-Patches/0064-Remove-OS-X-Special-Chars-from-Signs.patch
rename to CraftBukkit-Patches/0062-Remove-OS-X-Special-Chars-from-Signs.patch
index e4ffdf523c..de4c65ee47 100644
--- a/CraftBukkit-Patches/0064-Remove-OS-X-Special-Chars-from-Signs.patch
+++ b/CraftBukkit-Patches/0062-Remove-OS-X-Special-Chars-from-Signs.patch
@@ -1,14 +1,14 @@
-From 302c780a23bf59fb71c3f57b05adafcfafbf5d12 Mon Sep 17 00:00:00 2001
+From f50f2024c1d5ed2fa1a1e3bbb5d4387f4662df84 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 c1ddb33..9f3b1a8 100644
+index d90d332..7264dc5 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1584,6 +1584,7 @@ public class PlayerConnection implements PacketPlayInListener {
+@@ -1586,6 +1586,7 @@ public class PlayerConnection implements PacketPlayInListener {
  
              for (j = 0; j < 4; ++j) {
                  boolean flag = true;
@@ -17,5 +17,5 @@ index c1ddb33..9f3b1a8 100644
                  if (packetplayinupdatesign.f()[j].length() > 15) {
                      flag = false;
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0065-Orebfuscator.patch b/CraftBukkit-Patches/0063-Orebfuscator.patch
similarity index 99%
rename from CraftBukkit-Patches/0065-Orebfuscator.patch
rename to CraftBukkit-Patches/0063-Orebfuscator.patch
index 44305cbc15..774ad85b09 100644
--- a/CraftBukkit-Patches/0065-Orebfuscator.patch
+++ b/CraftBukkit-Patches/0063-Orebfuscator.patch
@@ -1,4 +1,4 @@
-From c44d5b44a0b2f9a50a266994f0642758bd080c21 Mon Sep 17 00:00:00 2001
+From 2faa824fc272a0284e67d48e04a56e824e7de987 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 b0b9757..98900ed 100644
+index 2f7be96..7485d07 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -471,6 +471,7 @@ public abstract class World implements IBlockAccess {
+@@ -458,6 +458,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);
@@ -393,5 +393,5 @@ index 2ec047c..2c0501d 100644
 +    }
  }
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0066-Optimize-DataWatcher.patch b/CraftBukkit-Patches/0064-Optimize-DataWatcher.patch
similarity index 98%
rename from CraftBukkit-Patches/0066-Optimize-DataWatcher.patch
rename to CraftBukkit-Patches/0064-Optimize-DataWatcher.patch
index 2584f1c08c..f75230e68f 100644
--- a/CraftBukkit-Patches/0066-Optimize-DataWatcher.patch
+++ b/CraftBukkit-Patches/0064-Optimize-DataWatcher.patch
@@ -1,4 +1,4 @@
-From fa836fb4ebe6b6827b60b56a600dd714f823dd08 Mon Sep 17 00:00:00 2001
+From 0b941f57067c60c8c616fd9e1ad80e6e68cc392e 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
@@ -130,5 +130,5 @@ index 90a2a80..cca6bd9 100644
      }
  }
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0067-Fire-PreLogin-Events-in-Offline-Mode.patch b/CraftBukkit-Patches/0065-Fire-PreLogin-Events-in-Offline-Mode.patch
similarity index 99%
rename from CraftBukkit-Patches/0067-Fire-PreLogin-Events-in-Offline-Mode.patch
rename to CraftBukkit-Patches/0065-Fire-PreLogin-Events-in-Offline-Mode.patch
index 2ef9371770..50f20cc240 100644
--- a/CraftBukkit-Patches/0067-Fire-PreLogin-Events-in-Offline-Mode.patch
+++ b/CraftBukkit-Patches/0065-Fire-PreLogin-Events-in-Offline-Mode.patch
@@ -1,4 +1,4 @@
-From 462c1a850111c2cd6cf0c1882938755fbcd0733b Mon Sep 17 00:00:00 2001
+From ae5b7c2d6526c34a23893b0da0ce43e4caf68f80 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
@@ -155,5 +155,5 @@ index 6b91be7..1b2620c 100644
 +    }
  }
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0068-BungeeCord-Support.patch b/CraftBukkit-Patches/0066-BungeeCord-Support.patch
similarity index 98%
rename from CraftBukkit-Patches/0068-BungeeCord-Support.patch
rename to CraftBukkit-Patches/0066-BungeeCord-Support.patch
index 9caffd5c2f..85887a66f6 100644
--- a/CraftBukkit-Patches/0068-BungeeCord-Support.patch
+++ b/CraftBukkit-Patches/0066-BungeeCord-Support.patch
@@ -1,4 +1,4 @@
-From e676d1bb122f90e416e214117e3a4bcc5ade4fb6 Mon Sep 17 00:00:00 2001
+From 48bc926d4d3fdac6b340fc955895128a66e9e196 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
@@ -156,7 +156,7 @@ index 4c5d77e..cd9a8f5 100644
  
          if (this.j.isBanned(gameprofile) && !this.j.get(gameprofile).e()) { // Should be hasExpired
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b4488f6..27e6fb9 100644
+index 317e14f..dd80ab7 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 {
@@ -192,5 +192,5 @@ index 2b499fe..8bfffa5 100644
 +    }
  }
 -- 
-1.8.5.2.msysgit.0
+1.9.1
 
diff --git a/CraftBukkit-Patches/0069-Allow-Disabling-Zombie-Villager-Aggression.patch b/CraftBukkit-Patches/0067-Allow-Disabling-Zombie-Villager-Aggression.patch
similarity index 97%
rename from CraftBukkit-Patches/0069-Allow-Disabling-Zombie-Villager-Aggression.patch
rename to CraftBukkit-Patches/0067-Allow-Disabling-Zombie-Villager-Aggression.patch
index ba08e9fa4b..ba6ecd2c86 100644
--- a/CraftBukkit-Patches/0069-Allow-Disabling-Zombie-Villager-Aggression.patch
+++ b/CraftBukkit-Patches/0067-Allow-Disabling-Zombie-Villager-Aggression.patch
@@ -1,4 +1,4 @@
-From 3952f7c334513ce3a02d4d230327bd165dfdab49 Mon Sep 17 00:00:00 2001
+From 0550daf8c61dd5b0710f91a74b179eba18499cf1 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
diff --git a/CraftBukkit-Patches/0070-Configurable-Amount-of-Netty-Threads.patch b/CraftBukkit-Patches/0068-Configurable-Amount-of-Netty-Threads.patch
similarity index 96%
rename from CraftBukkit-Patches/0070-Configurable-Amount-of-Netty-Threads.patch
rename to CraftBukkit-Patches/0068-Configurable-Amount-of-Netty-Threads.patch
index 78acac72fb..716e64f47c 100644
--- a/CraftBukkit-Patches/0070-Configurable-Amount-of-Netty-Threads.patch
+++ b/CraftBukkit-Patches/0068-Configurable-Amount-of-Netty-Threads.patch
@@ -1,4 +1,4 @@
-From fa5a84e48c0ea5dd2a391bf8c47dfcf0d93d4a1d Mon Sep 17 00:00:00 2001
+From c2933cd397bee0d3f35cd0067caace8d9bc0121a 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Amount of Netty Threads
 This brings back the option that the Spigot version of netty saw. By default Netty will try and use cores*2 threads, however if running multiple servers on the same machine, this can be too many threads. Additionally some people have 16 core servers. If 32 Netty threads are allowed in this setup, then the lock contention, and thus blocking between threads becomes much greater, leading to decreased performance.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e78d8f3..c3011fd 100644
+index 51f1761..64fa9ab 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -54,7 +54,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -53,5 +53,5 @@ index 8bfffa5..b3278fd 100644
 +    }
  }
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0071-Prevent-Mineshaft-Saving.patch b/CraftBukkit-Patches/0069-Prevent-Mineshaft-Saving.patch
similarity index 92%
rename from CraftBukkit-Patches/0071-Prevent-Mineshaft-Saving.patch
rename to CraftBukkit-Patches/0069-Prevent-Mineshaft-Saving.patch
index 770cfe280f..5f6814098e 100644
--- a/CraftBukkit-Patches/0071-Prevent-Mineshaft-Saving.patch
+++ b/CraftBukkit-Patches/0069-Prevent-Mineshaft-Saving.patch
@@ -1,4 +1,4 @@
-From 0f18693ff71bcfa53e5a046c0bd4617836ebc5ed Mon Sep 17 00:00:00 2001
+From b0a23b8b4f4255059c9de756f4b104e9c1b94ea1 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
@@ -18,5 +18,5 @@ index 4d336d8..f835b01 100644
              this.e = (PersistentStructure) world.a(PersistentStructure.class, this.a());
              } else
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0072-Log-Cause-of-Unexpected-Exceptions.patch b/CraftBukkit-Patches/0070-Log-Cause-of-Unexpected-Exceptions.patch
similarity index 90%
rename from CraftBukkit-Patches/0072-Log-Cause-of-Unexpected-Exceptions.patch
rename to CraftBukkit-Patches/0070-Log-Cause-of-Unexpected-Exceptions.patch
index 19bb978ff4..353e631bb9 100644
--- a/CraftBukkit-Patches/0072-Log-Cause-of-Unexpected-Exceptions.patch
+++ b/CraftBukkit-Patches/0070-Log-Cause-of-Unexpected-Exceptions.patch
@@ -1,11 +1,11 @@
-From be9a009c45b548f6f8b7a14d0cce4da369cac035 Mon Sep 17 00:00:00 2001
+From f5276f2f5fdec5c58cf8696f342919351deefa28 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/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c3011fd..66bea38 100644
+index 64fa9ab..ab29ad7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -479,6 +479,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -22,5 +22,5 @@ index c3011fd..66bea38 100644
  
              if (throwable instanceof ReportedException) {
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0073-Particle-API.patch b/CraftBukkit-Patches/0071-Particle-API.patch
similarity index 99%
rename from CraftBukkit-Patches/0073-Particle-API.patch
rename to CraftBukkit-Patches/0071-Particle-API.patch
index f581bf63a0..c7353c7b8a 100644
--- a/CraftBukkit-Patches/0073-Particle-API.patch
+++ b/CraftBukkit-Patches/0071-Particle-API.patch
@@ -1,4 +1,4 @@
-From 0952167f4e9323fbba6a59b610251bd01c9b0959 Mon Sep 17 00:00:00 2001
+From 58a7ca9681577897b5d7ccdb9ae8f6db43c027cf 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
diff --git a/CraftBukkit-Patches/0074-Fix-Biome-Decoration-Crashes.patch b/CraftBukkit-Patches/0072-Fix-Biome-Decoration-Crashes.patch
similarity index 98%
rename from CraftBukkit-Patches/0074-Fix-Biome-Decoration-Crashes.patch
rename to CraftBukkit-Patches/0072-Fix-Biome-Decoration-Crashes.patch
index cccab541fb..a96bc56879 100644
--- a/CraftBukkit-Patches/0074-Fix-Biome-Decoration-Crashes.patch
+++ b/CraftBukkit-Patches/0072-Fix-Biome-Decoration-Crashes.patch
@@ -1,4 +1,4 @@
-From d982b6075b81dd4c7416b7a26d47c4f034e67f7f Mon Sep 17 00:00:00 2001
+From c60fd58c9b3b98dd532f549e698f700fe5d5104e 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
@@ -107,5 +107,5 @@ index b048d6c..962d719 100644
 +    // Spigot End
  }
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0075-Save-ticks-lived-to-nbttag.patch b/CraftBukkit-Patches/0073-Save-ticks-lived-to-nbttag.patch
similarity index 95%
rename from CraftBukkit-Patches/0075-Save-ticks-lived-to-nbttag.patch
rename to CraftBukkit-Patches/0073-Save-ticks-lived-to-nbttag.patch
index d01e27415b..e37cc5877b 100644
--- a/CraftBukkit-Patches/0075-Save-ticks-lived-to-nbttag.patch
+++ b/CraftBukkit-Patches/0073-Save-ticks-lived-to-nbttag.patch
@@ -1,4 +1,4 @@
-From d2dd0fc6612d7c94a574ba9bfca8616b5ed6b6a2 Mon Sep 17 00:00:00 2001
+From 6a28d40d8fb999253b775d2bda9868db9652e555 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/CraftBukkit-Patches/0076-More-Efficient-GetCubes.patch b/CraftBukkit-Patches/0074-More-Efficient-GetCubes.patch
similarity index 94%
rename from CraftBukkit-Patches/0076-More-Efficient-GetCubes.patch
rename to CraftBukkit-Patches/0074-More-Efficient-GetCubes.patch
index 01e98d9fca..57d84197fd 100644
--- a/CraftBukkit-Patches/0076-More-Efficient-GetCubes.patch
+++ b/CraftBukkit-Patches/0074-More-Efficient-GetCubes.patch
@@ -1,14 +1,14 @@
-From 806a7547a99fbb5c010fbe9fd8cb4b08c10688c1 Mon Sep 17 00:00:00 2001
+From 28644f9ab3b3cd71aad60850537ec7248db6e5f6 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 98900ed..c0a4bea 100644
+index 7485d07..aa3547e 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1051,23 +1051,42 @@ public abstract class World implements IBlockAccess {
+@@ -1038,23 +1038,42 @@ public abstract class World implements IBlockAccess {
          int i1 = MathHelper.floor(axisalignedbb.c);
          int j1 = MathHelper.floor(axisalignedbb.f + 1.0D);
  
@@ -64,5 +64,5 @@ index 98900ed..c0a4bea 100644
          double d0 = 0.25D;
          List list = this.getEntities(entity, axisalignedbb.grow(d0, d0, d0));
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0077-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch b/CraftBukkit-Patches/0075-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch
similarity index 98%
rename from CraftBukkit-Patches/0077-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch
rename to CraftBukkit-Patches/0075-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch
index 144f60c381..77e08e9ffa 100644
--- a/CraftBukkit-Patches/0077-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch
+++ b/CraftBukkit-Patches/0075-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch
@@ -1,4 +1,4 @@
-From 78b6f43b0063ceed96a513e5a861b7a59f76bdbc Mon Sep 17 00:00:00 2001
+From 73c3802943f52d19b4ea8ec90fe6d54d0dc79a21 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/0078-Warn-if-PermGen-may-be-insufficient.patch b/CraftBukkit-Patches/0076-Warn-if-PermGen-may-be-insufficient.patch
similarity index 96%
rename from CraftBukkit-Patches/0078-Warn-if-PermGen-may-be-insufficient.patch
rename to CraftBukkit-Patches/0076-Warn-if-PermGen-may-be-insufficient.patch
index cb782c40ff..36706b6629 100644
--- a/CraftBukkit-Patches/0078-Warn-if-PermGen-may-be-insufficient.patch
+++ b/CraftBukkit-Patches/0076-Warn-if-PermGen-may-be-insufficient.patch
@@ -1,4 +1,4 @@
-From ef83894b43dcbbe290db12b9f6b6e523ce67cc7e Mon Sep 17 00:00:00 2001
+From da196639f65ce4d523caef44dbb560ae6a74d9a0 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
@@ -32,5 +32,5 @@ index 8d127fb..008e037 100644
                  MinecraftServer.main(options);
              } catch (Throwable t) {
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0079-Disable-Connected-Check-on-setScoreboard.patch b/CraftBukkit-Patches/0077-Disable-Connected-Check-on-setScoreboard.patch
similarity index 90%
rename from CraftBukkit-Patches/0079-Disable-Connected-Check-on-setScoreboard.patch
rename to CraftBukkit-Patches/0077-Disable-Connected-Check-on-setScoreboard.patch
index 1acb9d053f..921a7f4207 100644
--- a/CraftBukkit-Patches/0079-Disable-Connected-Check-on-setScoreboard.patch
+++ b/CraftBukkit-Patches/0077-Disable-Connected-Check-on-setScoreboard.patch
@@ -1,11 +1,11 @@
-From d94e594f5bce82ad3eda6d4771dee9a58e502039 Mon Sep 17 00:00:00 2001
+From d8306d27ef753a672a0311b751ee53e96ebbd090 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 5de0000..f8f1a90 100644
+index 4d4516f..10e8d03 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 {
@@ -18,5 +18,5 @@ index 5de0000..f8f1a90 100644
  
          this.server.getScoreboardManager().setPlayerBoard(this, scoreboard);
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0080-Add-Late-Bind-Option.patch b/CraftBukkit-Patches/0078-Add-Late-Bind-Option.patch
similarity index 96%
rename from CraftBukkit-Patches/0080-Add-Late-Bind-Option.patch
rename to CraftBukkit-Patches/0078-Add-Late-Bind-Option.patch
index a61fb3f750..980a9807ba 100644
--- a/CraftBukkit-Patches/0080-Add-Late-Bind-Option.patch
+++ b/CraftBukkit-Patches/0078-Add-Late-Bind-Option.patch
@@ -1,4 +1,4 @@
-From 5c1b57a167f53ec9d75190e48fe075bf40abb3da Mon Sep 17 00:00:00 2001
+From b8703401078ff70ff96eff3d9f79c1eb254272ca 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Add Late Bind Option
 Add late-bind config option to delay binding until loading is done.
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 74e28cc..befcdbd 100644
+index 00f9b89..dc9625b 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -119,6 +119,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -59,5 +59,5 @@ index b3278fd..af73544 100644
 +    }
  }
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0083-Allow-statistics-to-be-disabled-forced.patch b/CraftBukkit-Patches/0079-Allow-statistics-to-be-disabled-forced.patch
similarity index 98%
rename from CraftBukkit-Patches/0083-Allow-statistics-to-be-disabled-forced.patch
rename to CraftBukkit-Patches/0079-Allow-statistics-to-be-disabled-forced.patch
index 4a81c06cfb..c4f0d93e28 100644
--- a/CraftBukkit-Patches/0083-Allow-statistics-to-be-disabled-forced.patch
+++ b/CraftBukkit-Patches/0079-Allow-statistics-to-be-disabled-forced.patch
@@ -1,4 +1,4 @@
-From 1587cd387839a5a012c17ff8c6e3a2fe1d084219 Mon Sep 17 00:00:00 2001
+From 16561bbd9dae7bc87542e67953ced80164fc7f9c 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
@@ -90,5 +90,5 @@ index af73544..54d9117 100644
 +    }
  }
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0084-Fix-anvil-collisions.patch b/CraftBukkit-Patches/0080-Fix-anvil-collisions.patch
similarity index 91%
rename from CraftBukkit-Patches/0084-Fix-anvil-collisions.patch
rename to CraftBukkit-Patches/0080-Fix-anvil-collisions.patch
index 73f50dd529..4a8ed5cb30 100644
--- a/CraftBukkit-Patches/0084-Fix-anvil-collisions.patch
+++ b/CraftBukkit-Patches/0080-Fix-anvil-collisions.patch
@@ -1,4 +1,4 @@
-From 3ecc0f61ac0a62c8bb88ee6035b9b2c6fb873a45 Mon Sep 17 00:00:00 2001
+From 151a7a8ee2cd7d04da98472223bd9264df5d6067 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
@@ -25,5 +25,5 @@ index 9e1ce2f..1fa14c5 100644
          return false;
      }
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0085-Fix-ItemStack-Unbreakable-Code.patch b/CraftBukkit-Patches/0081-Fix-ItemStack-Unbreakable-Code.patch
similarity index 92%
rename from CraftBukkit-Patches/0085-Fix-ItemStack-Unbreakable-Code.patch
rename to CraftBukkit-Patches/0081-Fix-ItemStack-Unbreakable-Code.patch
index ff0e16305c..5cb191500f 100644
--- a/CraftBukkit-Patches/0085-Fix-ItemStack-Unbreakable-Code.patch
+++ b/CraftBukkit-Patches/0081-Fix-ItemStack-Unbreakable-Code.patch
@@ -1,4 +1,4 @@
-From 710037cf99f0978b5349dcf1c1daf673030406ec Mon Sep 17 00:00:00 2001
+From 8d3c0de3c0e455a06c338d75405d6549603063f7 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
@@ -24,5 +24,5 @@ index cc18816..a535479 100644
  
      public boolean usesData() {
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0081-Update-Chest-Animation-when-Cancelling-Event.patch b/CraftBukkit-Patches/0081-Update-Chest-Animation-when-Cancelling-Event.patch
deleted file mode 100644
index c125243217..0000000000
--- a/CraftBukkit-Patches/0081-Update-Chest-Animation-when-Cancelling-Event.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From eb1838a1a4497940d2b6ea035eebddb7e164ac4b Mon Sep 17 00:00:00 2001
-From: bloodshot <jdroque@gmail.com>
-Date: Mon, 6 Jan 2014 16:29:51 -0500
-Subject: [PATCH] Update Chest Animation when Cancelling Event
-
-Update chest animation after cancelling InventoryOpenEvent. Fixes BUKKIT-1440
-
-Currently if a plugin cancels an InventoryOpenEvent for vanilla chests,
-the chest animation for clients is stuck in the open state since
-IInventory's closeChest method is never called. To fix the issue, closeChest
-is called before exiting the display GUI method.
-More info can be found here
-https://bukkit.atlassian.net/browse/BUKKIT-1440
-
-diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index b519903..9411132 100644
---- a/src/main/java/net/minecraft/server/EntityPlayer.java
-+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -634,7 +634,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
- 
-         // CraftBukkit start - Inventory open hook
-         Container container = CraftEventFactory.callInventoryOpenEvent(this, new ContainerChest(this.inventory, iinventory));
--        if(container == null) return;
-+        if(container == null) {
-+            iinventory.l_();
-+            return;
-+        }
-         // CraftBukkit end
- 
-         this.nextContainerCounter();
-@@ -647,7 +650,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
-     public void openHopper(TileEntityHopper tileentityhopper) {
-         // CraftBukkit start - Inventory open hook
-         Container container = CraftEventFactory.callInventoryOpenEvent(this, new ContainerHopper(this.inventory, tileentityhopper));
--        if(container == null) return;
-+        if(container == null) {
-+            tileentityhopper.l_();
-+            return;
-+        }
-         // CraftBukkit end
- 
-         this.nextContainerCounter();
-@@ -660,7 +666,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
-     public void openMinecartHopper(EntityMinecartHopper entityminecarthopper) {
-         // CraftBukkit start - Inventory open hook
-         Container container = CraftEventFactory.callInventoryOpenEvent(this, new ContainerHopper(this.inventory, entityminecarthopper));
--        if(container == null) return;
-+        if(container == null) {
-+            entityminecarthopper.l_();
-+            return;
-+        }
-         // CraftBukkit end
- 
-         this.nextContainerCounter();
-@@ -673,7 +682,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
-     public void openFurnace(TileEntityFurnace tileentityfurnace) {
-         // CraftBukkit start - Inventory open hook
-         Container container = CraftEventFactory.callInventoryOpenEvent(this, new ContainerFurnace(this.inventory, tileentityfurnace));
--        if(container == null) return;
-+        if(container == null) {
-+            tileentityfurnace.l_();
-+            return;
-+        }
-         // CraftBukkit end
- 
-         this.nextContainerCounter();
-@@ -686,7 +698,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
-     public void openDispenser(TileEntityDispenser tileentitydispenser) {
-         // CraftBukkit start - Inventory open hook
-         Container container = CraftEventFactory.callInventoryOpenEvent(this, new ContainerDispenser(this.inventory, tileentitydispenser));
--        if(container == null) return;
-+        if(container == null) {
-+            tileentitydispenser.l_();
-+            return;
-+        }
-         // CraftBukkit end
- 
-         this.nextContainerCounter();
-@@ -699,7 +714,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
-     public void openBrewingStand(TileEntityBrewingStand tileentitybrewingstand) {
-         // CraftBukkit start - Inventory open hook
-         Container container = CraftEventFactory.callInventoryOpenEvent(this, new ContainerBrewingStand(this.inventory, tileentitybrewingstand));
--        if(container == null) return;
-+        if(container == null) {
-+            tileentitybrewingstand.l_();
-+            return;
-+        }
-         // CraftBukkit end
- 
-         this.nextContainerCounter();
-@@ -712,7 +730,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
-     public void openBeacon(TileEntityBeacon tileentitybeacon) {
-         // CraftBukkit start - Inventory open hook
-         Container container = CraftEventFactory.callInventoryOpenEvent(this, new ContainerBeacon(this.inventory, tileentitybeacon));
--        if(container == null) return;
-+        if(container == null) {
-+            tileentitybeacon.l_();
-+            return;
-+        }
-         // CraftBukkit end
- 
-         this.nextContainerCounter();
-@@ -755,7 +776,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
-     public void openHorseInventory(EntityHorse entityhorse, IInventory iinventory) {
-         // CraftBukkit start - Inventory open hook
-         Container container = CraftEventFactory.callInventoryOpenEvent(this, new ContainerHorse(this.inventory, iinventory, entityhorse));
--        if(container == null) return;
-+        if(container == null) {
-+            iinventory.l_();
-+            return;
-+        }
-         // CraftBukkit end
- 
-         if (this.activeContainer != this.defaultContainer) {
--- 
-1.8.3.2
-
diff --git a/CraftBukkit-Patches/0086-Try-and-Debug-Crash-Reports-Crashing.patch b/CraftBukkit-Patches/0082-Try-and-Debug-Crash-Reports-Crashing.patch
similarity index 94%
rename from CraftBukkit-Patches/0086-Try-and-Debug-Crash-Reports-Crashing.patch
rename to CraftBukkit-Patches/0082-Try-and-Debug-Crash-Reports-Crashing.patch
index 31b3438309..d9b3f7188c 100644
--- a/CraftBukkit-Patches/0086-Try-and-Debug-Crash-Reports-Crashing.patch
+++ b/CraftBukkit-Patches/0082-Try-and-Debug-Crash-Reports-Crashing.patch
@@ -1,11 +1,11 @@
-From ea8c941f26554452225f8cde07a42fe8c380db81 Mon Sep 17 00:00:00 2001
+From 36e78a435944de02330b78498e615855658554ab 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/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 66bea38..c052ff5 100644
+index ab29ad7..242b126 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -653,7 +653,13 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -37,5 +37,5 @@ index 66bea38..c052ff5 100644
                      throw new ReportedException(crashreport);
                  }
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0082-Update-Client-s-Hand-when-BlockPlaceEvent-Cancelled.patch b/CraftBukkit-Patches/0082-Update-Client-s-Hand-when-BlockPlaceEvent-Cancelled.patch
deleted file mode 100644
index 25fb8ff083..0000000000
--- a/CraftBukkit-Patches/0082-Update-Client-s-Hand-when-BlockPlaceEvent-Cancelled.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 822aeeaab3d8189633d98e963e05bd7d0a82eead Mon Sep 17 00:00:00 2001
-From: bloodshot <jdroque@gmail.com>
-Date: Mon, 6 Jan 2014 18:02:01 -0500
-Subject: [PATCH] Update Client's Hand when BlockPlaceEvent Cancelled
-
-Send a Packet103SetSlot to client when a BlockPlaceEvent is cancelled.
-
-Fixes BUKKIT-5284
-
-Currently, whenever a player places a block in a protected area the
-equipped itemstack size on client is never updated properly since the
-client thinks the block was placed. The reason this happens is because
-ItemStack.matches returns true since the server does not decrement stack
-size if a BlockPlaceEvent is cancelled. This causes
-PlayerConnection.a(handlePlace) not to send the appropriate packet to
-client which causes the bug.
-
-diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 9f3b1a8..629e360 100644
---- a/src/main/java/net/minecraft/server/PlayerConnection.java
-+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -639,7 +639,9 @@ public class PlayerConnection implements PacketPlayInListener {
-                 return;
-             }
- 
--            this.player.playerInteractManager.interact(this.player, worldserver, itemstack, i, j, k, l, packetplayinblockplace.h(), packetplayinblockplace.i(), packetplayinblockplace.j());
-+            if (!this.player.playerInteractManager.interact(this.player, worldserver, itemstack, i, j, k, l, packetplayinblockplace.h(), packetplayinblockplace.i(), packetplayinblockplace.j())) {
-+                always = true; // force Packet103SetSlot to be sent to client to update ItemStack count
-+            }
-             // CraftBukkit end
- 
-             flag = true;
--- 
-1.8.3.2
-
diff --git a/CraftBukkit-Patches/0087-Replace-AutoSave-Mechanism.patch b/CraftBukkit-Patches/0083-Replace-AutoSave-Mechanism.patch
similarity index 94%
rename from CraftBukkit-Patches/0087-Replace-AutoSave-Mechanism.patch
rename to CraftBukkit-Patches/0083-Replace-AutoSave-Mechanism.patch
index a0683b9f34..e328ff9cec 100644
--- a/CraftBukkit-Patches/0087-Replace-AutoSave-Mechanism.patch
+++ b/CraftBukkit-Patches/0083-Replace-AutoSave-Mechanism.patch
@@ -1,4 +1,4 @@
-From d6e55aba09bb3301d68ae726859c9d2ffd4c04b0 Mon Sep 17 00:00:00 2001
+From 43f8ffc1e273f54966c4e611a44aedb4293a5a56 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Replace AutoSave Mechanism
 The problem here is that MinecraftServer.save(..), will attempt to sleep whilst all pending chunks are written to disk, however due to various and complicated bugs, it will wait for an incorrect amount of chunks, which may cause it to sleep for an overly long amount of time. Instead we will mimic the save-all command in its behaviour, which is both safe and performant.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c052ff5..8738e28 100644
+index 242b126..b52c101 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -582,7 +582,16 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -28,5 +28,5 @@ index c052ff5..8738e28 100644
          }
  
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0088-Block-data-values-that-crash-the-client.patch b/CraftBukkit-Patches/0084-Block-data-values-that-crash-the-client.patch
similarity index 96%
rename from CraftBukkit-Patches/0088-Block-data-values-that-crash-the-client.patch
rename to CraftBukkit-Patches/0084-Block-data-values-that-crash-the-client.patch
index 73c7dab982..4b6f61d3bb 100644
--- a/CraftBukkit-Patches/0088-Block-data-values-that-crash-the-client.patch
+++ b/CraftBukkit-Patches/0084-Block-data-values-that-crash-the-client.patch
@@ -1,4 +1,4 @@
-From b3bc94b822f4e83bd64473abb7e6bdd585e00da7 Mon Sep 17 00:00:00 2001
+From a8d96be1342208847066046da8804175a4f4925d 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
@@ -57,5 +57,5 @@ index 3712009..90f32ed 100644
  
                      if (tileentity != null) {
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0089-Support-vanilla-s-direction-tag-on-fireballs.patch b/CraftBukkit-Patches/0085-Support-vanilla-s-direction-tag-on-fireballs.patch
similarity index 95%
rename from CraftBukkit-Patches/0089-Support-vanilla-s-direction-tag-on-fireballs.patch
rename to CraftBukkit-Patches/0085-Support-vanilla-s-direction-tag-on-fireballs.patch
index 6db17be9cb..9c98927352 100644
--- a/CraftBukkit-Patches/0089-Support-vanilla-s-direction-tag-on-fireballs.patch
+++ b/CraftBukkit-Patches/0085-Support-vanilla-s-direction-tag-on-fireballs.patch
@@ -1,4 +1,4 @@
-From 73f6d0da1a6427fb026cf6c1247dafb441cf5ae6 Mon Sep 17 00:00:00 2001
+From 6fae3f8da576d7edbd0b60c9e79a525788189590 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
@@ -32,5 +32,5 @@ index 0eecaad..b14c73e 100644
              this.die();
          }
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0090-Support-non-prefixed-URLs.patch b/CraftBukkit-Patches/0086-Support-non-prefixed-URLs.patch
similarity index 97%
rename from CraftBukkit-Patches/0090-Support-non-prefixed-URLs.patch
rename to CraftBukkit-Patches/0086-Support-non-prefixed-URLs.patch
index b4a0a54db2..78b2faab56 100644
--- a/CraftBukkit-Patches/0090-Support-non-prefixed-URLs.patch
+++ b/CraftBukkit-Patches/0086-Support-non-prefixed-URLs.patch
@@ -1,4 +1,4 @@
-From 60d13067607d49b8e4b3709249f2bfb0ea81c5f2 Mon Sep 17 00:00:00 2001
+From 9be24c650e154b8e97d91c4f1fa380d34a4726b1 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/0091-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch b/CraftBukkit-Patches/0087-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch
similarity index 95%
rename from CraftBukkit-Patches/0091-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch
rename to CraftBukkit-Patches/0087-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch
index 29fceefdf1..b099f1a0ec 100644
--- a/CraftBukkit-Patches/0091-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch
+++ b/CraftBukkit-Patches/0087-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch
@@ -1,4 +1,4 @@
-From 1a8a248bbabf2f8d81d31b40d2b0301581306e34 Mon Sep 17 00:00:00 2001
+From 01ebe2c7096ad492f3c6d0e58b3b872755cbfe9b 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.
@@ -29,5 +29,5 @@ index c7cea7f..099e16a 100644
          nbtreadlimiter.a((long) (32 * j));
          this.data = new int[j];
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0092-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch b/CraftBukkit-Patches/0088-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch
similarity index 96%
rename from CraftBukkit-Patches/0092-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch
rename to CraftBukkit-Patches/0088-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch
index 8f3af07967..efb1b7e0d8 100644
--- a/CraftBukkit-Patches/0092-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch
+++ b/CraftBukkit-Patches/0088-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch
@@ -1,4 +1,4 @@
-From 09677540762053e0814db3afd0756b0cb3e9475c Mon Sep 17 00:00:00 2001
+From 321688b2a2f43f5670346ffd8f1729eee12a096d 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
@@ -34,5 +34,5 @@ index 558e9cd..ffdb33e 100644
 +    }
  }
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0093-Don-t-let-trees-replace-any-block-when-growing.patch b/CraftBukkit-Patches/0089-Don-t-let-trees-replace-any-block-when-growing.patch
similarity index 94%
rename from CraftBukkit-Patches/0093-Don-t-let-trees-replace-any-block-when-growing.patch
rename to CraftBukkit-Patches/0089-Don-t-let-trees-replace-any-block-when-growing.patch
index fb8171f095..321cbbd529 100644
--- a/CraftBukkit-Patches/0093-Don-t-let-trees-replace-any-block-when-growing.patch
+++ b/CraftBukkit-Patches/0089-Don-t-let-trees-replace-any-block-when-growing.patch
@@ -1,4 +1,4 @@
-From 56cb3d756f5d2f3471bc0f6a85dd49dd48d92c8b Mon Sep 17 00:00:00 2001
+From 36e1317ec3b5e31ade6b2e54dc4d305b6ee7bf52 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 when growing
@@ -23,5 +23,5 @@ index 71ce973..caaac9a 100644
  
                                  int l3;
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0094-Highly-Optimized-Tick-Loop.patch b/CraftBukkit-Patches/0090-Highly-Optimized-Tick-Loop.patch
similarity index 98%
rename from CraftBukkit-Patches/0094-Highly-Optimized-Tick-Loop.patch
rename to CraftBukkit-Patches/0090-Highly-Optimized-Tick-Loop.patch
index 6c843668e8..296506b6cc 100644
--- a/CraftBukkit-Patches/0094-Highly-Optimized-Tick-Loop.patch
+++ b/CraftBukkit-Patches/0090-Highly-Optimized-Tick-Loop.patch
@@ -1,4 +1,4 @@
-From 45ebc973b86bf0604e180ae7a6b2d3ecc7ccd534 Mon Sep 17 00:00:00 2001
+From b7b1ae0e44dcb5366584904a8227d480a4ed7600 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
@@ -161,5 +161,5 @@ index 0000000..2b8343d
 +    }
 +}
 -- 
-1.8.5.2.msysgit.0
+1.9.1
 
diff --git a/CraftBukkit-Patches/0095-Add-Spigot-Links.patch b/CraftBukkit-Patches/0091-Add-Spigot-Links.patch
similarity index 97%
rename from CraftBukkit-Patches/0095-Add-Spigot-Links.patch
rename to CraftBukkit-Patches/0091-Add-Spigot-Links.patch
index c346936e55..85b6d1be09 100644
--- a/CraftBukkit-Patches/0095-Add-Spigot-Links.patch
+++ b/CraftBukkit-Patches/0091-Add-Spigot-Links.patch
@@ -1,4 +1,4 @@
-From e04e1c93033aa2b9ec322b563ff2327f3c0a7ea0 Mon Sep 17 00:00:00 2001
+From 70b888d12018b159ad7b30a637b580951e0903e1 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
@@ -75,5 +75,5 @@ index 0a5d414..d6bcf5c 100644
  command-block-overrides: []
  aliases:
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0096-Configurable-Ping-Sample-Size.patch b/CraftBukkit-Patches/0092-Configurable-Ping-Sample-Size.patch
similarity index 96%
rename from CraftBukkit-Patches/0096-Configurable-Ping-Sample-Size.patch
rename to CraftBukkit-Patches/0092-Configurable-Ping-Sample-Size.patch
index a4437e19d1..b4408dda19 100644
--- a/CraftBukkit-Patches/0096-Configurable-Ping-Sample-Size.patch
+++ b/CraftBukkit-Patches/0092-Configurable-Ping-Sample-Size.patch
@@ -1,4 +1,4 @@
-From 02573d29f934b6c387e5458c22e7b4516d663b78 Mon Sep 17 00:00:00 2001
+From 98083979ea08c5486889194226e0a6b5ae680c82 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
@@ -39,5 +39,5 @@ index 2baed09..8eac742 100644
 +    }
  }
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0097-Add-Optional-Tick-Shuffling.patch b/CraftBukkit-Patches/0093-Add-Optional-Tick-Shuffling.patch
similarity index 96%
rename from CraftBukkit-Patches/0097-Add-Optional-Tick-Shuffling.patch
rename to CraftBukkit-Patches/0093-Add-Optional-Tick-Shuffling.patch
index 397028ef57..8156bdfc58 100644
--- a/CraftBukkit-Patches/0097-Add-Optional-Tick-Shuffling.patch
+++ b/CraftBukkit-Patches/0093-Add-Optional-Tick-Shuffling.patch
@@ -1,4 +1,4 @@
-From d13124e48d19ef9f4eed821d1d962832032469bc Mon Sep 17 00:00:00 2001
+From 1b220d10cd0d54f9de7355c7779757b1a92d89b6 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
@@ -39,5 +39,5 @@ index 8eac742..e26b964 100644
 +    }
  }
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0098-Allow-Configuring-Chunks-per-Packet.patch b/CraftBukkit-Patches/0094-Allow-Configuring-Chunks-per-Packet.patch
similarity index 93%
rename from CraftBukkit-Patches/0098-Allow-Configuring-Chunks-per-Packet.patch
rename to CraftBukkit-Patches/0094-Allow-Configuring-Chunks-per-Packet.patch
index 00b4c3138f..2d67fabd31 100644
--- a/CraftBukkit-Patches/0098-Allow-Configuring-Chunks-per-Packet.patch
+++ b/CraftBukkit-Patches/0094-Allow-Configuring-Chunks-per-Packet.patch
@@ -1,11 +1,11 @@
-From ae57253e0e1dfb4f4ea19fa8b85445993c5f2713 Mon Sep 17 00:00:00 2001
+From 19ab54c5f1481765f09e9d9e8b04cd827c32005d 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/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 9411132..585df73 100644
+index 367472d..d5a5426 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -214,7 +214,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -34,5 +34,5 @@ index ffdb33e..1290829 100644
 +    }
  }
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0099-Implement-Locale-Getter-for-Players.patch b/CraftBukkit-Patches/0095-Implement-Locale-Getter-for-Players.patch
similarity index 91%
rename from CraftBukkit-Patches/0099-Implement-Locale-Getter-for-Players.patch
rename to CraftBukkit-Patches/0095-Implement-Locale-Getter-for-Players.patch
index 62a322abda..8adde82ad1 100644
--- a/CraftBukkit-Patches/0099-Implement-Locale-Getter-for-Players.patch
+++ b/CraftBukkit-Patches/0095-Implement-Locale-Getter-for-Players.patch
@@ -1,11 +1,11 @@
-From 5d9faa7e8f6340570872bfa54125c3c8d8efab3b Mon Sep 17 00:00:00 2001
+From e9fe48eb126181b69c610e4c7790cc5f4f27b870 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 585df73..4fb5f75 100644
+index d5a5426..d376beb 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -30,7 +30,7 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
@@ -18,7 +18,7 @@ index 585df73..4fb5f75 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 f8f1a90..354cc07 100644
+index 10e8d03..a447add 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 {
@@ -35,5 +35,5 @@ index f8f1a90..354cc07 100644
  
      public Player.Spigot spigot()
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0100-Cap-Entity-Collisions.patch b/CraftBukkit-Patches/0096-Cap-Entity-Collisions.patch
similarity index 97%
rename from CraftBukkit-Patches/0100-Cap-Entity-Collisions.patch
rename to CraftBukkit-Patches/0096-Cap-Entity-Collisions.patch
index c8e9b2dfa4..126a9d5b07 100644
--- a/CraftBukkit-Patches/0100-Cap-Entity-Collisions.patch
+++ b/CraftBukkit-Patches/0096-Cap-Entity-Collisions.patch
@@ -1,4 +1,4 @@
-From 963fdf81cdc62893dbcd4246e28a9fdf73b3df17 Mon Sep 17 00:00:00 2001
+From 6dd165c327b68a2faa7be234b4e703ec2d2069df 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/0101-Fix-dispensing-bone-meal-not-having-the-correct-data.patch b/CraftBukkit-Patches/0097-Fix-dispensing-bone-meal-not-having-the-correct-data.patch
similarity index 93%
rename from CraftBukkit-Patches/0101-Fix-dispensing-bone-meal-not-having-the-correct-data.patch
rename to CraftBukkit-Patches/0097-Fix-dispensing-bone-meal-not-having-the-correct-data.patch
index f3d303c9f1..5b924b76b6 100644
--- a/CraftBukkit-Patches/0101-Fix-dispensing-bone-meal-not-having-the-correct-data.patch
+++ b/CraftBukkit-Patches/0097-Fix-dispensing-bone-meal-not-having-the-correct-data.patch
@@ -1,4 +1,4 @@
-From 15fff496d47b970896b595a8987c71c36a43ea16 Mon Sep 17 00:00:00 2001
+From e404feef50c6e75ca09bf0aca6c22984fe449358 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
@@ -18,5 +18,5 @@ index b547bc9..c06e9a1 100644
              BlockDispenseEvent event = new BlockDispenseEvent(block, craftItem.clone(), new org.bukkit.util.Vector(0, 0, 0));
              if (!BlockDispenser.eventFired) {
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0102-Spam-Filter-Exclusions.patch b/CraftBukkit-Patches/0098-Spam-Filter-Exclusions.patch
similarity index 95%
rename from CraftBukkit-Patches/0102-Spam-Filter-Exclusions.patch
rename to CraftBukkit-Patches/0098-Spam-Filter-Exclusions.patch
index f6cda3b02f..5d13bf7324 100644
--- a/CraftBukkit-Patches/0102-Spam-Filter-Exclusions.patch
+++ b/CraftBukkit-Patches/0098-Spam-Filter-Exclusions.patch
@@ -1,11 +1,11 @@
-From 2b8500f85b705a5cb5699970cc4a42d4f6fefe88 Mon Sep 17 00:00:00 2001
+From aefd749240cd861d2ec2a26b1fccbe2ff4c594e1 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 629e360..40fb962 100644
+index 7264dc5..59e98a6 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 {
@@ -56,5 +56,5 @@ index e26b964..5d65983 100644
 +    }
  }
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0103-Add-Option-to-Silence-CommandBlock-Console.patch b/CraftBukkit-Patches/0099-Add-Option-to-Silence-CommandBlock-Console.patch
similarity index 94%
rename from CraftBukkit-Patches/0103-Add-Option-to-Silence-CommandBlock-Console.patch
rename to CraftBukkit-Patches/0099-Add-Option-to-Silence-CommandBlock-Console.patch
index d47ce19ffc..9681251f34 100644
--- a/CraftBukkit-Patches/0103-Add-Option-to-Silence-CommandBlock-Console.patch
+++ b/CraftBukkit-Patches/0099-Add-Option-to-Silence-CommandBlock-Console.patch
@@ -1,4 +1,4 @@
-From b221c8c5c0203cbe6da2d8726e4646fe97a70735 Mon Sep 17 00:00:00 2001
+From 319be2ba8054c81bffee539e97855fa0a160ab73 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
@@ -33,5 +33,5 @@ index 5d65983..d749f16 100644
 +    }
  }
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0104-Add-support-for-fetching-hidden-players.patch b/CraftBukkit-Patches/0100-Add-support-for-fetching-hidden-players.patch
similarity index 90%
rename from CraftBukkit-Patches/0104-Add-support-for-fetching-hidden-players.patch
rename to CraftBukkit-Patches/0100-Add-support-for-fetching-hidden-players.patch
index ff10145650..c0d781f291 100644
--- a/CraftBukkit-Patches/0104-Add-support-for-fetching-hidden-players.patch
+++ b/CraftBukkit-Patches/0100-Add-support-for-fetching-hidden-players.patch
@@ -1,11 +1,11 @@
-From bb55a92d7f8888f22160c9cf382b1225856629b6 Mon Sep 17 00:00:00 2001
+From 829e6ee60d506b022b0da761cc6e927527c484a1 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 354cc07..bdb74b0 100644
+index a447add..3c4b42f 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 {
@@ -28,5 +28,5 @@ index 354cc07..bdb74b0 100644
  
      public Player.Spigot spigot()
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0105-Allow-Disabling-Creative-Item-Filter.patch b/CraftBukkit-Patches/0101-Allow-Disabling-Creative-Item-Filter.patch
similarity index 94%
rename from CraftBukkit-Patches/0105-Allow-Disabling-Creative-Item-Filter.patch
rename to CraftBukkit-Patches/0101-Allow-Disabling-Creative-Item-Filter.patch
index 0719136e74..307baacdba 100644
--- a/CraftBukkit-Patches/0105-Allow-Disabling-Creative-Item-Filter.patch
+++ b/CraftBukkit-Patches/0101-Allow-Disabling-Creative-Item-Filter.patch
@@ -1,11 +1,11 @@
-From 33cbf11d3399b41fda5ec523ec67c9a435941193 Mon Sep 17 00:00:00 2001
+From afdcd39f4d49e79d5154922552a22ce6b0389407 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 40fb962..f998670 100644
+index 59e98a6..cc7457f 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1501,7 +1501,7 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -33,5 +33,5 @@ index d749f16..0d0c7b0 100644
 +    }
  }
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0106-Cap-Channel-Registrations.patch b/CraftBukkit-Patches/0102-Cap-Channel-Registrations.patch
similarity index 88%
rename from CraftBukkit-Patches/0106-Cap-Channel-Registrations.patch
rename to CraftBukkit-Patches/0102-Cap-Channel-Registrations.patch
index 96819f5391..e3b3104403 100644
--- a/CraftBukkit-Patches/0106-Cap-Channel-Registrations.patch
+++ b/CraftBukkit-Patches/0102-Cap-Channel-Registrations.patch
@@ -1,11 +1,11 @@
-From 46f98a9520a93c7bfe941dbb8cb75923eb6901da Mon Sep 17 00:00:00 2001
+From 39baed0fad7774a997ffa0458b0bb1a971d8da34 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 bdb74b0..b42b338 100644
+index 3c4b42f..41e785c 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 {
@@ -17,5 +17,5 @@ index bdb74b0..b42b338 100644
              server.getPluginManager().callEvent(new PlayerRegisterChannelEvent(this, channel));
          }
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0107-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch b/CraftBukkit-Patches/0103-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch
similarity index 99%
rename from CraftBukkit-Patches/0107-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch
rename to CraftBukkit-Patches/0103-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch
index b5bd5141f0..d70d5355cd 100644
--- a/CraftBukkit-Patches/0107-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch
+++ b/CraftBukkit-Patches/0103-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch
@@ -1,11 +1,11 @@
-From b4c05848c289c74884e21c70ff99fc36fc8b36e9 Mon Sep 17 00:00:00 2001
+From fdcf14ce34b08518263ebce08493a9f56d347b51 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/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8d33f56..ddce3d9 100644
+index e209ef4..80a1eeb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -121,6 +121,7 @@ import org.bukkit.command.CommandSender;
@@ -170,5 +170,5 @@ index 0d0c7b0..4703768 100644
 +    }
  }
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0108-Unfinalize-the-isDisconnected-method-by-bukkit.patch b/CraftBukkit-Patches/0104-Unfinalize-the-isDisconnected-method-by-bukkit.patch
similarity index 90%
rename from CraftBukkit-Patches/0108-Unfinalize-the-isDisconnected-method-by-bukkit.patch
rename to CraftBukkit-Patches/0104-Unfinalize-the-isDisconnected-method-by-bukkit.patch
index 87bf948760..cca87b3ef4 100644
--- a/CraftBukkit-Patches/0108-Unfinalize-the-isDisconnected-method-by-bukkit.patch
+++ b/CraftBukkit-Patches/0104-Unfinalize-the-isDisconnected-method-by-bukkit.patch
@@ -1,4 +1,4 @@
-From 42950edb14c3917227b26375a85a3df7bc971f2b Mon Sep 17 00:00:00 2001
+From 99712343d55ca1d71f967991fa64b0d108d19778 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 f998670..b01b6d4 100644
+index cc7457f..652f7a1 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1887,7 +1887,7 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -19,5 +19,5 @@ index f998670..b01b6d4 100644
      }
      // CraftBukkit end
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0109-Implement-Silenceable-Lightning-API.patch b/CraftBukkit-Patches/0105-Implement-Silenceable-Lightning-API.patch
similarity index 98%
rename from CraftBukkit-Patches/0109-Implement-Silenceable-Lightning-API.patch
rename to CraftBukkit-Patches/0105-Implement-Silenceable-Lightning-API.patch
index b9860a10a2..6f7e506a46 100644
--- a/CraftBukkit-Patches/0109-Implement-Silenceable-Lightning-API.patch
+++ b/CraftBukkit-Patches/0105-Implement-Silenceable-Lightning-API.patch
@@ -1,4 +1,4 @@
-From 84c1d0d0a562ceea87ea7203113102e48a0ed3c9 Mon Sep 17 00:00:00 2001
+From 4570b01d5993df8e9c1ea3b191402d535c05a3a2 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/0110-Normalize-spaces-on-when-reading-a-chat-packet.patch b/CraftBukkit-Patches/0106-Normalize-spaces-on-when-reading-a-chat-packet.patch
similarity index 94%
rename from CraftBukkit-Patches/0110-Normalize-spaces-on-when-reading-a-chat-packet.patch
rename to CraftBukkit-Patches/0106-Normalize-spaces-on-when-reading-a-chat-packet.patch
index 2238f57725..402e027c2f 100644
--- a/CraftBukkit-Patches/0110-Normalize-spaces-on-when-reading-a-chat-packet.patch
+++ b/CraftBukkit-Patches/0106-Normalize-spaces-on-when-reading-a-chat-packet.patch
@@ -1,4 +1,4 @@
-From 53d2f0be06d32769dbbada0544ed843a3d77554f Mon Sep 17 00:00:00 2001
+From 57094a1231b173fc72c6a09458bb4463014f9093 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Wed, 26 Feb 2014 14:45:22 +0000
 Subject: [PATCH] Normalize spaces on when reading a chat packet
@@ -18,7 +18,7 @@ index d419f0f..b26c290 100644
  
      public void b(PacketDataSerializer packetdataserializer) throws IOException { // CraftBukkit - added throws
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index b01b6d4..55db414 100644
+index 652f7a1..68c1f27 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -792,7 +792,7 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -31,5 +31,5 @@ index b01b6d4..55db414 100644
              for (int i = 0; i < s.length(); ++i) {
                  if (!SharedConstants.isAllowedChatCharacter(s.charAt(i))) {
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0111-Use-one-PermissibleBase-for-all-Command-Blocks.patch b/CraftBukkit-Patches/0107-Use-one-PermissibleBase-for-all-Command-Blocks.patch
similarity index 94%
rename from CraftBukkit-Patches/0111-Use-one-PermissibleBase-for-all-Command-Blocks.patch
rename to CraftBukkit-Patches/0107-Use-one-PermissibleBase-for-all-Command-Blocks.patch
index d5ca8df7b4..15b99ed336 100644
--- a/CraftBukkit-Patches/0111-Use-one-PermissibleBase-for-all-Command-Blocks.patch
+++ b/CraftBukkit-Patches/0107-Use-one-PermissibleBase-for-all-Command-Blocks.patch
@@ -1,4 +1,4 @@
-From addfaa130016f12bbb2780b77b9a19b4ed184da4 Mon Sep 17 00:00:00 2001
+From 472fa25f89d004f94208884760c60e10d0099f94 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
@@ -29,5 +29,5 @@ index 1314c74..b339cf3 100644
  
      public boolean isPermissionSet(String name) {
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0112-Prevent-hoppers-from-loading-chunks.patch b/CraftBukkit-Patches/0108-Prevent-hoppers-from-loading-chunks.patch
similarity index 88%
rename from CraftBukkit-Patches/0112-Prevent-hoppers-from-loading-chunks.patch
rename to CraftBukkit-Patches/0108-Prevent-hoppers-from-loading-chunks.patch
index 4696470320..9ddf46e196 100644
--- a/CraftBukkit-Patches/0112-Prevent-hoppers-from-loading-chunks.patch
+++ b/CraftBukkit-Patches/0108-Prevent-hoppers-from-loading-chunks.patch
@@ -1,11 +1,11 @@
-From 36bedcc518070cca6f0de1a718039048c0baf2f9 Mon Sep 17 00:00:00 2001
+From 44c944690ed4b0d080fce725753966ff3ffd0d0d 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/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
-index d7a3178..b6718bf 100644
+index baa158b..38e526b 100644
 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java
 +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
 @@ -540,6 +540,7 @@ public class TileEntityHopper extends TileEntity implements IHopper {
@@ -17,5 +17,5 @@ index d7a3178..b6718bf 100644
  
          if (tileentity != null && tileentity instanceof IInventory) {
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0113-Guard-Entity-List.patch b/CraftBukkit-Patches/0109-Guard-Entity-List.patch
similarity index 91%
rename from CraftBukkit-Patches/0113-Guard-Entity-List.patch
rename to CraftBukkit-Patches/0109-Guard-Entity-List.patch
index a5b120b5ae..e6917a80c9 100644
--- a/CraftBukkit-Patches/0113-Guard-Entity-List.patch
+++ b/CraftBukkit-Patches/0109-Guard-Entity-List.patch
@@ -1,11 +1,11 @@
-From 82f7a64c978d48d780878bae773961e8eeb683b3 Mon Sep 17 00:00:00 2001
+From 5329a431fb981cbec731b82387798bd0e836821d 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 c0a4bea..61fa519 100644
+index aa3547e..8b3d92c 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -30,7 +30,32 @@ import org.bukkit.event.weather.ThunderChangeEvent;
@@ -50,7 +50,7 @@ index c0a4bea..61fa519 100644
      protected final gnu.trove.map.hash.TLongShortHashMap chunkTickList;
      protected float growthOdds = 100;
      protected float modifiedOdds = 100;
-@@ -1270,6 +1296,7 @@ public abstract class World implements IBlockAccess {
+@@ -1257,6 +1283,7 @@ public abstract class World implements IBlockAccess {
  
          org.spigotmc.ActivationRange.activateEntities(this); // Spigot
          timings.entityTick.startTiming(); // Spigot
@@ -58,7 +58,7 @@ index c0a4bea..61fa519 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);
-@@ -1318,12 +1345,15 @@ public abstract class World implements IBlockAccess {
+@@ -1305,12 +1332,15 @@ public abstract class World implements IBlockAccess {
                      this.getChunkAt(j, k).b(entity);
                  }
  
@@ -75,5 +75,5 @@ index c0a4bea..61fa519 100644
          timings.entityTick.stopTiming(); // Spigot
          this.methodProfiler.c("blockEntities");
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0114-Fix-ConcurrentModificationException-while-being-idle.patch b/CraftBukkit-Patches/0110-Fix-ConcurrentModificationException-while-being-idle.patch
similarity index 91%
rename from CraftBukkit-Patches/0114-Fix-ConcurrentModificationException-while-being-idle.patch
rename to CraftBukkit-Patches/0110-Fix-ConcurrentModificationException-while-being-idle.patch
index eef29642b6..eb3d7f7dab 100644
--- a/CraftBukkit-Patches/0114-Fix-ConcurrentModificationException-while-being-idle.patch
+++ b/CraftBukkit-Patches/0110-Fix-ConcurrentModificationException-while-being-idle.patch
@@ -1,4 +1,4 @@
-From 9e9c492c30d861cf4c22021be30689c5588f549c Mon Sep 17 00:00:00 2001
+From c8c9dcd1724707439a8e83892cfb1189a84bb997 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 61fa519..40325bf 100644
+index 8b3d92c..ee43bd7 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1043,23 +1043,24 @@ public abstract class World implements IBlockAccess {
+@@ -1030,23 +1030,24 @@ public abstract class World implements IBlockAccess {
              this.players.remove(entity);
              this.everyoneSleeping();
          }
@@ -50,5 +50,5 @@ index 61fa519..40325bf 100644
          this.b(entity);
      }
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0115-Cancellable-WitherSkull-potion-effect.patch b/CraftBukkit-Patches/0111-Cancellable-WitherSkull-potion-effect.patch
similarity index 96%
rename from CraftBukkit-Patches/0115-Cancellable-WitherSkull-potion-effect.patch
rename to CraftBukkit-Patches/0111-Cancellable-WitherSkull-potion-effect.patch
index 87630eaa0c..801e32760d 100644
--- a/CraftBukkit-Patches/0115-Cancellable-WitherSkull-potion-effect.patch
+++ b/CraftBukkit-Patches/0111-Cancellable-WitherSkull-potion-effect.patch
@@ -1,4 +1,4 @@
-From 8a131926292404349a1f211d04cd160864b6f507 Mon Sep 17 00:00:00 2001
+From 7e3133d0b2e17bf86e80f55d9c43b267592a978a 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
@@ -32,5 +32,5 @@ index d749175..b8c3cef 100644
  
                      if (this.world.difficulty == EnumDifficulty.NORMAL) {
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0116-Descriptive-kick-reasons-instead-of-Nope.patch b/CraftBukkit-Patches/0112-Descriptive-kick-reasons-instead-of-Nope.patch
similarity index 96%
rename from CraftBukkit-Patches/0116-Descriptive-kick-reasons-instead-of-Nope.patch
rename to CraftBukkit-Patches/0112-Descriptive-kick-reasons-instead-of-Nope.patch
index 5aadd76118..e336ad500a 100644
--- a/CraftBukkit-Patches/0116-Descriptive-kick-reasons-instead-of-Nope.patch
+++ b/CraftBukkit-Patches/0112-Descriptive-kick-reasons-instead-of-Nope.patch
@@ -1,4 +1,4 @@
-From e6d30fec201e289154842583df812bffb9b10af0 Mon Sep 17 00:00:00 2001
+From 78ae96c3f3e3eca5ab5e73ceb72854107eeb6552 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!
@@ -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 f645690..170ab7e 100644
+index 68c1f27..51ba843 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/0119-Check-for-manually-prefixed-commands-or-commands-tha.patch b/CraftBukkit-Patches/0113-Check-for-manually-prefixed-commands-or-commands-tha.patch
similarity index 94%
rename from CraftBukkit-Patches/0119-Check-for-manually-prefixed-commands-or-commands-tha.patch
rename to CraftBukkit-Patches/0113-Check-for-manually-prefixed-commands-or-commands-tha.patch
index 7e58180c17..28464dfbfb 100644
--- a/CraftBukkit-Patches/0119-Check-for-manually-prefixed-commands-or-commands-tha.patch
+++ b/CraftBukkit-Patches/0113-Check-for-manually-prefixed-commands-or-commands-tha.patch
@@ -1,4 +1,4 @@
-From 4247f5bf0c95cd9adfd5b7b4a3814091c725050d Mon Sep 17 00:00:00 2001
+From 6654ae053ee4372d4764a7c3c045ad9114b577a0 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
@@ -25,5 +25,5 @@ index da235e5..0b04e94 100644
              if (commandMap.getCommand(args[0]) == null) {
                  this.b = 0;
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0120-Cap-window-names-to-prevent-client-disconnects.patch b/CraftBukkit-Patches/0114-Cap-window-names-to-prevent-client-disconnects.patch
similarity index 92%
rename from CraftBukkit-Patches/0120-Cap-window-names-to-prevent-client-disconnects.patch
rename to CraftBukkit-Patches/0114-Cap-window-names-to-prevent-client-disconnects.patch
index 301c7ba01c..133aa7a597 100644
--- a/CraftBukkit-Patches/0120-Cap-window-names-to-prevent-client-disconnects.patch
+++ b/CraftBukkit-Patches/0114-Cap-window-names-to-prevent-client-disconnects.patch
@@ -1,4 +1,4 @@
-From c49d7ce1986a04ccbabde9f093eae36ba5845742 Mon Sep 17 00:00:00 2001
+From 63d9eeebbe7c6d6a288a6e601d3ebfd5650b65f3 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
@@ -17,5 +17,5 @@ index f6d7b2b..860592d 100644
          this.b = j;
          this.c = s;
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0121-Enable-Improved-Ping-Sending.patch b/CraftBukkit-Patches/0115-Enable-Improved-Ping-Sending.patch
similarity index 95%
rename from CraftBukkit-Patches/0121-Enable-Improved-Ping-Sending.patch
rename to CraftBukkit-Patches/0115-Enable-Improved-Ping-Sending.patch
index 2ab1ccc79c..9cb5d23780 100644
--- a/CraftBukkit-Patches/0121-Enable-Improved-Ping-Sending.patch
+++ b/CraftBukkit-Patches/0115-Enable-Improved-Ping-Sending.patch
@@ -1,11 +1,11 @@
-From 33e15a4463401f66e8ca222ecfdb7584ec25af4d Mon Sep 17 00:00:00 2001
+From 6a3edc587a7e2707a2dff6ac6a4659b1d5301844 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/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 4fb5f75..c164e39 100644
+index d376beb..de20c6a 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -62,6 +62,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -61,5 +61,5 @@ index cd9a8f5..8be8e9c 100644
  
      public void sendAll(Packet packet) {
 -- 
-1.8.5.2.msysgit.0
+1.9.1
 
diff --git a/CraftBukkit-Patches/0122-Configurable-dragon-death-and-wither-spawn-sounds.patch b/CraftBukkit-Patches/0116-Configurable-dragon-death-and-wither-spawn-sounds.patch
similarity index 98%
rename from CraftBukkit-Patches/0122-Configurable-dragon-death-and-wither-spawn-sounds.patch
rename to CraftBukkit-Patches/0116-Configurable-dragon-death-and-wither-spawn-sounds.patch
index aab3b9ac1b..8a43e14f21 100644
--- a/CraftBukkit-Patches/0122-Configurable-dragon-death-and-wither-spawn-sounds.patch
+++ b/CraftBukkit-Patches/0116-Configurable-dragon-death-and-wither-spawn-sounds.patch
@@ -1,4 +1,4 @@
-From 1d656f452be97d6681875b04c4fd5142ace84c4b Mon Sep 17 00:00:00 2001
+From c87300260fcc81bb2b17c85797f5fd4c7f9469bd 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
diff --git a/CraftBukkit-Patches/0117-Allow-enchanting-tables-to-enchant-any-item.patch b/CraftBukkit-Patches/0117-Allow-enchanting-tables-to-enchant-any-item.patch
deleted file mode 100644
index 05716a3ae7..0000000000
--- a/CraftBukkit-Patches/0117-Allow-enchanting-tables-to-enchant-any-item.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 062951fa5d424e8d518339491d96bb551086009e Mon Sep 17 00:00:00 2001
-From: andrepl <andre@norcode.com>
-Date: Sat, 15 Mar 2014 12:50:00 -0400
-Subject: [PATCH] Allow enchanting tables to enchant any item
-
-
-diff --git a/src/main/java/net/minecraft/server/ContainerEnchantTable.java b/src/main/java/net/minecraft/server/ContainerEnchantTable.java
-index 528fbc9..372ccde 100644
---- a/src/main/java/net/minecraft/server/ContainerEnchantTable.java
-+++ b/src/main/java/net/minecraft/server/ContainerEnchantTable.java
-@@ -152,6 +152,11 @@ public class ContainerEnchantTable extends Container {
-         if (this.costs[i] > 0 && itemstack != null && (entityhuman.expLevel >= this.costs[i] || entityhuman.abilities.canInstantlyBuild)) {
-             if (!this.world.isStatic) {
-                 List list = EnchantmentManager.b(this.l, itemstack, this.costs[i]);
-+                // Spigot - Provide an empty enchantment list
-+                if (list == null) {
-+                    list = new java.util.ArrayList<EnchantmentInstance>();
-+                }
-+                // Spigot End
-                 boolean flag = itemstack.getItem() == Items.BOOK;
- 
-                 if (list != null) {
-@@ -186,7 +191,7 @@ public class ContainerEnchantTable extends Container {
-                                 EnchantmentInstance enchantment = new EnchantmentInstance(enchantId, entry.getValue());
-                                 Items.ENCHANTED_BOOK.a(itemstack, enchantment);
-                             } else {
--                                item.addEnchantment(entry.getKey(), entry.getValue());
-+                                item.addUnsafeEnchantment(entry.getKey(), entry.getValue()); // Spigot addEnchantment -> addUnsafeEnchantment
-                             }
-                         } catch (IllegalArgumentException e) {
-                             /* Just swallow invalid enchantments */
--- 
-1.8.3.2
-
diff --git a/CraftBukkit-Patches/0123-Fix-TileEntities-getting-ticked-after-being-queued-f.patch b/CraftBukkit-Patches/0117-Fix-TileEntities-getting-ticked-after-being-queued-f.patch
similarity index 84%
rename from CraftBukkit-Patches/0123-Fix-TileEntities-getting-ticked-after-being-queued-f.patch
rename to CraftBukkit-Patches/0117-Fix-TileEntities-getting-ticked-after-being-queued-f.patch
index d47db9ca9e..5cb427afd4 100644
--- a/CraftBukkit-Patches/0123-Fix-TileEntities-getting-ticked-after-being-queued-f.patch
+++ b/CraftBukkit-Patches/0117-Fix-TileEntities-getting-ticked-after-being-queued-f.patch
@@ -1,4 +1,4 @@
-From ace02f9bfa21be458e0bc3da7c77d36ae2bf8fa9 Mon Sep 17 00:00:00 2001
+From c104bf6c03a89946aba78481e78f33847246795f 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
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix TileEntities getting ticked after being queued for
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index ca8d029..e576397 100644
+index ee43bd7..52ed625 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1359,6 +1359,12 @@ public abstract class World implements IBlockAccess {
+@@ -1346,6 +1346,12 @@ public abstract class World implements IBlockAccess {
          timings.entityTick.stopTiming(); // Spigot
          this.methodProfiler.c("blockEntities");
          timings.tileEntityTick.startTiming(); // Spigot
@@ -22,7 +22,7 @@ index ca8d029..e576397 100644
          this.M = true;
          Iterator iterator = this.tileEntityList.iterator();
  
-@@ -1407,10 +1413,6 @@ public abstract class World implements IBlockAccess {
+@@ -1394,10 +1400,6 @@ public abstract class World implements IBlockAccess {
          timings.tileEntityTick.stopTiming(); // Spigot
          timings.tileEntityPending.startTiming(); // Spigot
          this.M = false;
@@ -34,5 +34,5 @@ index ca8d029..e576397 100644
          this.methodProfiler.c("pendingBlockEntities");
          if (!this.a.isEmpty()) {
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0124-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch b/CraftBukkit-Patches/0118-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch
similarity index 88%
rename from CraftBukkit-Patches/0124-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch
rename to CraftBukkit-Patches/0118-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch
index 9f5772632e..53bb2c0b51 100644
--- a/CraftBukkit-Patches/0124-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch
+++ b/CraftBukkit-Patches/0118-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch
@@ -1,4 +1,4 @@
-From 4557313024c56ec5553d35f9d91047b0eb42969a Mon Sep 17 00:00:00 2001
+From 63bcb8d073906b41c60b2ae4ebfced2aa92cc887 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Display 'Spigot' in client crashes, server lists and Mojang
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 170e097..3233353 100644
+index b905ceb..357d11b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -969,7 +969,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -19,5 +19,5 @@ index 170e097..3233353 100644
  
      public CrashReport b(CrashReport crashreport) {
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0118-Remove-the-lastChunkAccessed-if-it-is-unloaded.patch b/CraftBukkit-Patches/0118-Remove-the-lastChunkAccessed-if-it-is-unloaded.patch
deleted file mode 100644
index 91dde4b74f..0000000000
--- a/CraftBukkit-Patches/0118-Remove-the-lastChunkAccessed-if-it-is-unloaded.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 2317a818c043982fd266b38c53d737dbae4c0260 Mon Sep 17 00:00:00 2001
-From: Thinkofdeath <thethinkofdeath@gmail.com>
-Date: Tue, 18 Mar 2014 09:49:30 +0000
-Subject: [PATCH] Remove the lastChunkAccessed if it is unloaded.
-
-This fixes an issue where a chunk would be unloaded but remain in lastChunkAccessed meaning calls on getChunkAt could return a chunk that is no longer loaded, this caused an issue where the chunk could be reloaded whilst in use reverting any block changes. This caused findEndPortal to return null even after createEndPortal which would crash the server trying to teleport to a null location.
-
-diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index b669d05..33e4cff 100644
---- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
-+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-@@ -316,6 +316,13 @@ public class ChunkProviderServer implements IChunkProvider {
-                 long chunkcoordinates = this.unloadQueue.popFirst();
-                 Chunk chunk = this.chunks.get(chunkcoordinates);
-                 if (chunk == null) continue;
-+                // Spigot start - Remove the chunk from the cache if it is unloaded
-+                Chunk result = world.lastChunkAccessed;
-+                if ( result != null && result.locX == chunk.locX && result.locZ == chunk.locZ )
-+                {
-+                    world.lastChunkAccessed = null;
-+                }
-+                // Spigot end
- 
-                 ChunkUnloadEvent event = new ChunkUnloadEvent(chunk.bukkitChunk);
-                 server.getPluginManager().callEvent(event);
-diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 40325bf..ca8d029 100644
---- a/src/main/java/net/minecraft/server/World.java
-+++ b/src/main/java/net/minecraft/server/World.java
-@@ -154,7 +154,7 @@ public abstract class World implements IBlockAccess {
-     public boolean pvpMode;
-     public boolean keepSpawnInMemory = true;
-     public ChunkGenerator generator;
--    Chunk lastChunkAccessed;
-+    public Chunk lastChunkAccessed; // Spigot - Make public
-     int lastXAccessed = Integer.MIN_VALUE;
-     int lastZAccessed = Integer.MIN_VALUE;
-     final Object chunkLock = new Object();
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 154b868..8592205 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -187,6 +187,14 @@ public class CraftWorld implements World {
-             world.chunkProviderServer.saveChunkNOP(chunk);
-         }
- 
-+        // Spigot start - Remove the chunk from the cache if it is unloaded
-+        net.minecraft.server.Chunk result = world.lastChunkAccessed;
-+        if ( result != null && result.locX == chunk.locX && result.locZ == chunk.locZ )
-+        {
-+            world.lastChunkAccessed = null;
-+        }
-+        // Spigot end
-+
-         world.chunkProviderServer.unloadQueue.remove(x, z);
-         world.chunkProviderServer.chunks.remove(LongHash.toLong(x, z));
- 
--- 
-1.8.3.2
-
diff --git a/CraftBukkit-Patches/0125-Old-New-Version-Support.patch b/CraftBukkit-Patches/0119-Old-New-Version-Support.patch
similarity index 99%
rename from CraftBukkit-Patches/0125-Old-New-Version-Support.patch
rename to CraftBukkit-Patches/0119-Old-New-Version-Support.patch
index 457a0ab7c8..18f9abd53e 100644
--- a/CraftBukkit-Patches/0125-Old-New-Version-Support.patch
+++ b/CraftBukkit-Patches/0119-Old-New-Version-Support.patch
@@ -1,4 +1,4 @@
-From db0c6edd29ec690814c9a07bb9c5e4a20237b12d Mon Sep 17 00:00:00 2001
+From 1086a67b3b1c4096176d48238b6595b26053f1b1 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.
@@ -214,5 +214,5 @@ index 6423aec..f1571f1 100644
          this.networkManager.handle(new PacketStatusOutServerInfo(ping), new GenericFutureListener[0]);
          // CraftBukkit end
 -- 
-1.8.5.2.msysgit.0
+1.9.1
 
diff --git a/CraftBukkit-Patches/0126-Treat-Bungee-as-Online-Mode.patch b/CraftBukkit-Patches/0120-Treat-Bungee-as-Online-Mode.patch
similarity index 91%
rename from CraftBukkit-Patches/0126-Treat-Bungee-as-Online-Mode.patch
rename to CraftBukkit-Patches/0120-Treat-Bungee-as-Online-Mode.patch
index 6fb582e24e..e381d6f021 100644
--- a/CraftBukkit-Patches/0126-Treat-Bungee-as-Online-Mode.patch
+++ b/CraftBukkit-Patches/0120-Treat-Bungee-as-Online-Mode.patch
@@ -1,11 +1,11 @@
-From b007a5c351d2f1ee7929b86241020ab4b5a483fe Mon Sep 17 00:00:00 2001
+From 22fd5a35456d9aa916105f5d1e57e84aeef95c33 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/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
-index 45561e9..f218a59 100644
+index a472431..05a8c9e 100644
 --- a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
 +++ b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
 @@ -56,7 +56,7 @@ public class NameReferencingFileConverter {
@@ -18,5 +18,5 @@ index 45561e9..f218a59 100644
          } else {
              String[] astring1 = astring;
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0127-Fix-several-occurances-of-missed-diff.patch b/CraftBukkit-Patches/0121-Fix-several-occurances-of-missed-diff.patch
similarity index 96%
rename from CraftBukkit-Patches/0127-Fix-several-occurances-of-missed-diff.patch
rename to CraftBukkit-Patches/0121-Fix-several-occurances-of-missed-diff.patch
index 42b703f98a..4589c21a12 100644
--- a/CraftBukkit-Patches/0127-Fix-several-occurances-of-missed-diff.patch
+++ b/CraftBukkit-Patches/0121-Fix-several-occurances-of-missed-diff.patch
@@ -1,4 +1,4 @@
-From 6ef2e1e42b3f9cb632d28c92fe22ff507f361374 Mon Sep 17 00:00:00 2001
+From 034be6d215f5e6f81e2beea636fc475e257d02a1 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.
@@ -18,7 +18,7 @@ index d16f035..9fe2a8b 100644
          World world = isourceblock.k();
          Random random = world.random;
 diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java
-index 0df3b6b..cc0776f 100644
+index 8250395..066a3be 100644
 --- a/src/main/java/net/minecraft/server/EntityBoat.java
 +++ b/src/main/java/net/minecraft/server/EntityBoat.java
 @@ -147,7 +147,7 @@ public class EntityBoat extends Entity {
@@ -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 db53569..fd6e057 100644
+index 51ba843..8039bee 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1740,7 +1740,7 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -91,5 +91,5 @@ index e86e21b..418ec40 100644
  
      public boolean b(Achievement achievement) {
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0128-Fix-PlayerFishEvent-not-properly-cancelling.-Fixes-B.patch b/CraftBukkit-Patches/0122-Fix-PlayerFishEvent-not-properly-cancelling.-Fixes-B.patch
similarity index 97%
rename from CraftBukkit-Patches/0128-Fix-PlayerFishEvent-not-properly-cancelling.-Fixes-B.patch
rename to CraftBukkit-Patches/0122-Fix-PlayerFishEvent-not-properly-cancelling.-Fixes-B.patch
index b51d77295d..c1ade16437 100644
--- a/CraftBukkit-Patches/0128-Fix-PlayerFishEvent-not-properly-cancelling.-Fixes-B.patch
+++ b/CraftBukkit-Patches/0122-Fix-PlayerFishEvent-not-properly-cancelling.-Fixes-B.patch
@@ -1,4 +1,4 @@
-From 7f21cf38dd9bdd817558af943078eaf7377850ca Mon Sep 17 00:00:00 2001
+From 892606c5b33c7f52b15160d5be2efefc1f9010b0 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
@@ -55,5 +55,5 @@ index 2a73b6c..0763dd1 100644
              // CraftBukkit end
  
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0129-Update-Warning.patch b/CraftBukkit-Patches/0123-Update-Warning.patch
similarity index 97%
rename from CraftBukkit-Patches/0129-Update-Warning.patch
rename to CraftBukkit-Patches/0123-Update-Warning.patch
index 7199b67b26..9900c20f45 100644
--- a/CraftBukkit-Patches/0129-Update-Warning.patch
+++ b/CraftBukkit-Patches/0123-Update-Warning.patch
@@ -1,4 +1,4 @@
-From 2c1908bc333875cfb968785dd5ac8d620bbb0ebd Mon Sep 17 00:00:00 2001
+From dca8c73a51050b270239084f2d5c3ab896a6fa7a 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
@@ -53,5 +53,5 @@ index 008e037..9bbc782 100644
          OptionParser parser = new OptionParser() {
              {
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0130-Add-Conversion-Message.patch b/CraftBukkit-Patches/0124-Add-Conversion-Message.patch
similarity index 87%
rename from CraftBukkit-Patches/0130-Add-Conversion-Message.patch
rename to CraftBukkit-Patches/0124-Add-Conversion-Message.patch
index 32edc82e64..7f4a136032 100644
--- a/CraftBukkit-Patches/0130-Add-Conversion-Message.patch
+++ b/CraftBukkit-Patches/0124-Add-Conversion-Message.patch
@@ -1,11 +1,11 @@
-From 97d07d8cb04d693b475287e2cd19b149018c3bb7 Mon Sep 17 00:00:00 2001
+From ccf1116617229ca6833047a852acd7afa7172653 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/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index befcdbd..ca7805c 100644
+index dc9625b..62d5847 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -414,6 +414,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -17,5 +17,5 @@ index befcdbd..ca7805c 100644
  
          int i;
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0131-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch b/CraftBukkit-Patches/0125-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch
similarity index 94%
rename from CraftBukkit-Patches/0131-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch
rename to CraftBukkit-Patches/0125-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch
index e8004e68fa..9a926377fd 100644
--- a/CraftBukkit-Patches/0131-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch
+++ b/CraftBukkit-Patches/0125-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch
@@ -1,4 +1,4 @@
-From aa1660824dc92b879d8fa657812cbf2726209936 Mon Sep 17 00:00:00 2001
+From 564531446a8a13eb3a3b575d6e149e2e92a822da 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
@@ -22,5 +22,5 @@ index 4451a9f..3ced72b 100644
              }
              // CraftBukkit end
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0132-Print-Stack-on-InternalException.patch b/CraftBukkit-Patches/0126-Print-Stack-on-InternalException.patch
similarity index 89%
rename from CraftBukkit-Patches/0132-Print-Stack-on-InternalException.patch
rename to CraftBukkit-Patches/0126-Print-Stack-on-InternalException.patch
index 3c5ed4a0a5..ef2798cac8 100644
--- a/CraftBukkit-Patches/0132-Print-Stack-on-InternalException.patch
+++ b/CraftBukkit-Patches/0126-Print-Stack-on-InternalException.patch
@@ -1,4 +1,4 @@
-From ededca7f1e9805ebe0941ac01665b45238bc4c22 Mon Sep 17 00:00:00 2001
+From e93dbc39f80b20a0df267e4c07a00edd7430dffd 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
@@ -17,5 +17,5 @@ index 0c10e18..d1b9c49 100644
  
      protected void a(ChannelHandlerContext channelhandlercontext, Packet packet) {
 -- 
-1.8.5.2.msysgit.0
+1.9.1
 
diff --git a/CraftBukkit-Patches/0133-Use-Offline-Player-Data-Once-if-Required.patch b/CraftBukkit-Patches/0127-Use-Offline-Player-Data-Once-if-Required.patch
similarity index 96%
rename from CraftBukkit-Patches/0133-Use-Offline-Player-Data-Once-if-Required.patch
rename to CraftBukkit-Patches/0127-Use-Offline-Player-Data-Once-if-Required.patch
index 048a54b004..0b758b0ac6 100644
--- a/CraftBukkit-Patches/0133-Use-Offline-Player-Data-Once-if-Required.patch
+++ b/CraftBukkit-Patches/0127-Use-Offline-Player-Data-Once-if-Required.patch
@@ -1,4 +1,4 @@
-From 6537fd25ac26a4c88355e62671a8ad2a906f0384 Mon Sep 17 00:00:00 2001
+From 848ac7692c4eab0f25bf59333165ee86d7a3b12f 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.
@@ -39,5 +39,5 @@ index 93ff8d3..cc4d487 100644
              a.warn("Failed to load player data for " + entityhuman.getName());
          }
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0134-Use-Provided-Case-for-Non-Existent-Offline-Players.patch b/CraftBukkit-Patches/0128-Use-Provided-Case-for-Non-Existent-Offline-Players.patch
similarity index 91%
rename from CraftBukkit-Patches/0134-Use-Provided-Case-for-Non-Existent-Offline-Players.patch
rename to CraftBukkit-Patches/0128-Use-Provided-Case-for-Non-Existent-Offline-Players.patch
index 94edf96f90..1435cdf832 100644
--- a/CraftBukkit-Patches/0134-Use-Provided-Case-for-Non-Existent-Offline-Players.patch
+++ b/CraftBukkit-Patches/0128-Use-Provided-Case-for-Non-Existent-Offline-Players.patch
@@ -1,4 +1,4 @@
-From a3c7ac25e8844684bae259cefbbedb721ae7ce32 Mon Sep 17 00:00:00 2001
+From 4a8b0cc2b1371ace2eb003f12b43ab745b1b278c 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
@@ -18,5 +18,5 @@ index cde2651..bcccaa9 100644
                  this.a(gameprofile);
                  usercacheentry = (UserCacheEntry) this.c.get(s1);
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0136-Check-for-blank-OfflinePlayer-Names.patch b/CraftBukkit-Patches/0129-Check-for-blank-OfflinePlayer-Names.patch
similarity index 89%
rename from CraftBukkit-Patches/0136-Check-for-blank-OfflinePlayer-Names.patch
rename to CraftBukkit-Patches/0129-Check-for-blank-OfflinePlayer-Names.patch
index 7180ce11ff..e058e95ff2 100644
--- a/CraftBukkit-Patches/0136-Check-for-blank-OfflinePlayer-Names.patch
+++ b/CraftBukkit-Patches/0129-Check-for-blank-OfflinePlayer-Names.patch
@@ -1,11 +1,11 @@
-From 0075a3a74cd4e5fd1d1c77a27b4632606da7d19a Mon Sep 17 00:00:00 2001
+From 338ff1aad7e50605e5fdd61d8ad33a9aaa39fbf6 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/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ddce3d9..e98c1ef 100644
+index 80a1eeb..7c265b5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1319,6 +1319,7 @@ public final class CraftServer implements Server {
@@ -17,5 +17,5 @@ index ddce3d9..e98c1ef 100644
          // If the name given cannot ever be a valid username give a dummy return, for scoreboard plugins
          if (!validUserPattern.matcher(name).matches()) {
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0137-Fix-Player-Banning.patch b/CraftBukkit-Patches/0130-Fix-Player-Banning.patch
similarity index 96%
rename from CraftBukkit-Patches/0137-Fix-Player-Banning.patch
rename to CraftBukkit-Patches/0130-Fix-Player-Banning.patch
index 40200fd570..b9a0eedf2e 100644
--- a/CraftBukkit-Patches/0137-Fix-Player-Banning.patch
+++ b/CraftBukkit-Patches/0130-Fix-Player-Banning.patch
@@ -1,4 +1,4 @@
-From 1bee53e1e4ffe5a043427ec9d9a45d9373378155 Mon Sep 17 00:00:00 2001
+From a391e481f89e10e825bac6f9d24941ad2a3b056e 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
@@ -45,5 +45,5 @@ index 33cfdb2..3738b3e 100644
      }
  }
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0138-Check-Skull-canPlace.patch b/CraftBukkit-Patches/0131-Check-Skull-canPlace.patch
similarity index 93%
rename from CraftBukkit-Patches/0138-Check-Skull-canPlace.patch
rename to CraftBukkit-Patches/0131-Check-Skull-canPlace.patch
index 62926f3cc2..825abf5cdc 100644
--- a/CraftBukkit-Patches/0138-Check-Skull-canPlace.patch
+++ b/CraftBukkit-Patches/0131-Check-Skull-canPlace.patch
@@ -1,4 +1,4 @@
-From 7543edf708c1007c3d7501ba48b08c9a7d7ad9cd Mon Sep 17 00:00:00 2001
+From dfe20c18163c5048564dd93153f1100fb98ac9ee 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
@@ -22,5 +22,5 @@ index dd7e5cc..49346a6 100644
                      return false;
                  }
 -- 
-1.8.3.2
+1.9.1
 
diff --git a/CraftBukkit-Patches/0139-Fix-ban-expire-dates.patch b/CraftBukkit-Patches/0132-Fix-ban-expire-dates.patch
similarity index 90%
rename from CraftBukkit-Patches/0139-Fix-ban-expire-dates.patch
rename to CraftBukkit-Patches/0132-Fix-ban-expire-dates.patch
index 96637b9343..06d466cdbc 100644
--- a/CraftBukkit-Patches/0139-Fix-ban-expire-dates.patch
+++ b/CraftBukkit-Patches/0132-Fix-ban-expire-dates.patch
@@ -1,4 +1,4 @@
-From b2bad76db2be7ed3a017f21d65ca80010b08090b Mon Sep 17 00:00:00 2001
+From e3d1772ead39601b40ee9f6f566900d65ea7fe34 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.
@@ -18,5 +18,5 @@ index 3738b3e..4e8ffd4 100644
  
      public GameProfileBanEntry(JsonObject jsonobject) {
 -- 
-1.8.5.2.msysgit.0
+1.9.1
 
diff --git a/CraftBukkit-Patches/0140-Correct-Ban-Expiration.patch b/CraftBukkit-Patches/0133-Correct-Ban-Expiration.patch
similarity index 91%
rename from CraftBukkit-Patches/0140-Correct-Ban-Expiration.patch
rename to CraftBukkit-Patches/0133-Correct-Ban-Expiration.patch
index 8de0dce71e..5b0e8f067f 100644
--- a/CraftBukkit-Patches/0140-Correct-Ban-Expiration.patch
+++ b/CraftBukkit-Patches/0133-Correct-Ban-Expiration.patch
@@ -1,4 +1,4 @@
-From 201a50c0093ef26e019636b70eaffc71da547e56 Mon Sep 17 00:00:00 2001
+From c8af809c84dad3bd49b6839ee7193a786d846db6 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
@@ -18,5 +18,5 @@ index 8be8e9c..49837b4 100644
              // return "You are not white-listed on this server!";
              event.disallow(PlayerLoginEvent.Result.KICK_WHITELIST, org.spigotmc.SpigotConfig.whitelistMessage); // Spigot
 -- 
-1.8.5.2.msysgit.0
+1.9.1
 
diff --git a/CraftBukkit-Patches/0141-Convert-Horses-owner-to-UUID.patch b/CraftBukkit-Patches/0134-Convert-Horses-owner-to-UUID.patch
similarity index 94%
rename from CraftBukkit-Patches/0141-Convert-Horses-owner-to-UUID.patch
rename to CraftBukkit-Patches/0134-Convert-Horses-owner-to-UUID.patch
index e6d1cf3a88..022e8ce08a 100644
--- a/CraftBukkit-Patches/0141-Convert-Horses-owner-to-UUID.patch
+++ b/CraftBukkit-Patches/0134-Convert-Horses-owner-to-UUID.patch
@@ -1,4 +1,4 @@
-From 1441910574b7f650f36372c0c1321ce86c8f8958 Mon Sep 17 00:00:00 2001
+From feba07303481bbdf7d344d1fbc4553b4be903392 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/0142-Expand-team-API-to-allow-arbitrary-strings.patch b/CraftBukkit-Patches/0135-Expand-team-API-to-allow-arbitrary-strings.patch
similarity index 97%
rename from CraftBukkit-Patches/0142-Expand-team-API-to-allow-arbitrary-strings.patch
rename to CraftBukkit-Patches/0135-Expand-team-API-to-allow-arbitrary-strings.patch
index 7d4513e0df..0878b83729 100644
--- a/CraftBukkit-Patches/0142-Expand-team-API-to-allow-arbitrary-strings.patch
+++ b/CraftBukkit-Patches/0135-Expand-team-API-to-allow-arbitrary-strings.patch
@@ -1,4 +1,4 @@
-From 744d4cfaf407ae2e63c7c34683fc152315186c68 Mon Sep 17 00:00:00 2001
+From 0cf6625019f5b75706a7f51591deeb67e9f2a17c 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.
@@ -84,5 +84,5 @@ index 8a640d3..a1864a5 100644
  
      @Override
 -- 
-1.8.5.2.msysgit.0
+1.9.1
 
diff --git a/CraftBukkit-Patches/0135-Prevent-crash-from-a-ConversationTracker-exception.patch b/CraftBukkit-Patches/0135-Prevent-crash-from-a-ConversationTracker-exception.patch
deleted file mode 100644
index 66ac0e43d4..0000000000
--- a/CraftBukkit-Patches/0135-Prevent-crash-from-a-ConversationTracker-exception.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 5452cbaf8ee7a06a0796abdab9479e5adbcdb935 Mon Sep 17 00:00:00 2001
-From: Devin Ryan <devin@forairan.com>
-Date: Mon, 14 Apr 2014 11:33:48 +1000
-Subject: [PATCH] Prevent crash from a ConversationTracker exception.
-
-Fixes BUKKIT-5436
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/conversations/ConversationTracker.java b/src/main/java/org/bukkit/craftbukkit/conversations/ConversationTracker.java
-index 1d770a5..497d1d7 100644
---- a/src/main/java/org/bukkit/craftbukkit/conversations/ConversationTracker.java
-+++ b/src/main/java/org/bukkit/craftbukkit/conversations/ConversationTracker.java
-@@ -1,10 +1,12 @@
- package org.bukkit.craftbukkit.conversations;
- 
-+import org.bukkit.Bukkit;
- import org.bukkit.conversations.Conversation;
- import org.bukkit.conversations.ConversationAbandonedEvent;
- import org.bukkit.conversations.ManuallyAbandonedConversationCanceller;
- 
- import java.util.LinkedList;
-+import java.util.logging.Level;
- 
- /**
-  */
-@@ -43,7 +45,11 @@ public class ConversationTracker {
-         LinkedList<Conversation> oldQueue = conversationQueue;
-         conversationQueue = new LinkedList<Conversation>();
-         for(Conversation conversation : oldQueue) {
--            conversation.abandon(new ConversationAbandonedEvent(conversation, new ManuallyAbandonedConversationCanceller()));
-+            try {
-+                conversation.abandon(new ConversationAbandonedEvent(conversation, new ManuallyAbandonedConversationCanceller()));
-+            } catch (Throwable t) {
-+                Bukkit.getLogger().log(Level.SEVERE, "Unexpected exception while abandoning a conversation", t);
-+            }
-         }
-     }
- 
--- 
-1.8.3.2
-
diff --git a/CraftBukkit-Patches/0143-Add-Score.isScoreSet-Z-API.patch b/CraftBukkit-Patches/0136-Add-Score.isScoreSet-Z-API.patch
similarity index 95%
rename from CraftBukkit-Patches/0143-Add-Score.isScoreSet-Z-API.patch
rename to CraftBukkit-Patches/0136-Add-Score.isScoreSet-Z-API.patch
index f44bcbbecc..2de20cee96 100644
--- a/CraftBukkit-Patches/0143-Add-Score.isScoreSet-Z-API.patch
+++ b/CraftBukkit-Patches/0136-Add-Score.isScoreSet-Z-API.patch
@@ -1,4 +1,4 @@
-From 6b02ebd8eebd2581c191540583e61495ccd725f5 Mon Sep 17 00:00:00 2001
+From 963e83f965e56fd4083bce3238eeedb164e6625d 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.
@@ -35,5 +35,5 @@ index 7095f6d..b265616 100644
          return objective.getScoreboard();
      }
 -- 
-1.8.5.2.msysgit.0
+1.9.1
 
diff --git a/CraftBukkit-Patches/0144-Add-quiet-option-to-hasKeyOfType.patch b/CraftBukkit-Patches/0137-Add-quiet-option-to-hasKeyOfType.patch
similarity index 93%
rename from CraftBukkit-Patches/0144-Add-quiet-option-to-hasKeyOfType.patch
rename to CraftBukkit-Patches/0137-Add-quiet-option-to-hasKeyOfType.patch
index 1e499759ba..4bb3ddd40e 100644
--- a/CraftBukkit-Patches/0144-Add-quiet-option-to-hasKeyOfType.patch
+++ b/CraftBukkit-Patches/0137-Add-quiet-option-to-hasKeyOfType.patch
@@ -1,4 +1,4 @@
-From af1ffa18a57d7474ab9c79f7f2af16e02bc7d867 Mon Sep 17 00:00:00 2001
+From 59a46b8a6c85a4c77499ee8fe98b140b87ec524b Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Thu, 17 Apr 2014 12:58:08 +0100
 Subject: [PATCH] Add quiet option to hasKeyOfType
@@ -33,5 +33,5 @@ index 5b8842f..7931c4a 100644
              }
  
 -- 
-1.8.5.2.msysgit.0
+1.9.1