From 0410a40c1f8e4e2c9673ae288af790d29713b0b3 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 14 Apr 2014 10:40:29 +1000
Subject: [PATCH] Add obfuscation helper patch to assist update process.

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

diff --git a/CraftBukkit-Patches/0004-Obfuscation-Helpers.patch b/CraftBukkit-Patches/0004-Obfuscation-Helpers.patch
new file mode 100644
index 0000000000..eec85da4f3
--- /dev/null
+++ b/CraftBukkit-Patches/0004-Obfuscation-Helpers.patch
@@ -0,0 +1,26 @@
+From 58337f50edfe719fbf71c940574371d23afc97d0 Mon Sep 17 00:00:00 2001
+From: md_5 <git@md-5.net>
+Date: Mon, 14 Apr 2014 10:38:04 +1000
+Subject: [PATCH] Obfuscation Helpers
+
+
+diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
+index 00bb455..dda2602 100644
+--- a/src/main/java/net/minecraft/server/MinecraftServer.java
++++ b/src/main/java/net/minecraft/server/MinecraftServer.java
+@@ -1225,6 +1225,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
+         }
+     }
+ 
++    // Spigot Start
++    public ServerConnection getServerConnection()
++    {
++        return this.p;
++    }
++    // Spigot End
+     public ServerConnection ai() {
+         return this.p;
+     }
+-- 
+1.8.3.2
+
diff --git a/CraftBukkit-Patches/0004-Spigot-Configuration.patch b/CraftBukkit-Patches/0005-Spigot-Configuration.patch
similarity index 99%
rename from CraftBukkit-Patches/0004-Spigot-Configuration.patch
rename to CraftBukkit-Patches/0005-Spigot-Configuration.patch
index 92bcbae26b..3ace44ed18 100644
--- a/CraftBukkit-Patches/0004-Spigot-Configuration.patch
+++ b/CraftBukkit-Patches/0005-Spigot-Configuration.patch
@@ -1,4 +1,4 @@
-From 3f08230723b80338c17bb46ad0eaaa2b4ef184a4 Mon Sep 17 00:00:00 2001
+From b9a0cde3f43f2d85373c3a494dfb9c7bf9a4f9c8 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
@@ -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 adeab3f..3a72f25 100644
+index 5f4bd23..ebaeb98 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -309,8 +309,10 @@ public final class CraftServer implements Server {
diff --git a/CraftBukkit-Patches/0005-Better-Chunk-Tick-Selection.patch b/CraftBukkit-Patches/0006-Better-Chunk-Tick-Selection.patch
similarity index 99%
rename from CraftBukkit-Patches/0005-Better-Chunk-Tick-Selection.patch
rename to CraftBukkit-Patches/0006-Better-Chunk-Tick-Selection.patch
index 82f71246ed..1cb79ce8e1 100644
--- a/CraftBukkit-Patches/0005-Better-Chunk-Tick-Selection.patch
+++ b/CraftBukkit-Patches/0006-Better-Chunk-Tick-Selection.patch
@@ -1,4 +1,4 @@
-From b532ab301efdcaa616bdfb70ab71cf81f838f2e3 Mon Sep 17 00:00:00 2001
+From 3b97fb4eaaef41db86499223495c75bdab2536c9 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/CraftBukkit-Patches/0006-Crop-Growth-Rates.patch b/CraftBukkit-Patches/0007-Crop-Growth-Rates.patch
similarity index 99%
rename from CraftBukkit-Patches/0006-Crop-Growth-Rates.patch
rename to CraftBukkit-Patches/0007-Crop-Growth-Rates.patch
index adc762bcef..3913f0442e 100644
--- a/CraftBukkit-Patches/0006-Crop-Growth-Rates.patch
+++ b/CraftBukkit-Patches/0007-Crop-Growth-Rates.patch
@@ -1,4 +1,4 @@
-From 8a5eb17b5a35a0b462a4538921f84c529fc5ae20 Mon Sep 17 00:00:00 2001
+From f7f33d6aa57afd53eb82d756077e993895658a15 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 17:17:20 +1000
 Subject: [PATCH] Crop Growth Rates
@@ -175,5 +175,5 @@ index 90a227f..7e79ba5 100644
 +    }
  }
 -- 
-1.8.5.2.msysgit.0
+1.8.3.2
 
diff --git a/CraftBukkit-Patches/0007-More-Efficient-Chunk-Save-Queue.patch b/CraftBukkit-Patches/0008-More-Efficient-Chunk-Save-Queue.patch
similarity index 98%
rename from CraftBukkit-Patches/0007-More-Efficient-Chunk-Save-Queue.patch
rename to CraftBukkit-Patches/0008-More-Efficient-Chunk-Save-Queue.patch
index a811890ff3..2924583181 100644
--- a/CraftBukkit-Patches/0007-More-Efficient-Chunk-Save-Queue.patch
+++ b/CraftBukkit-Patches/0008-More-Efficient-Chunk-Save-Queue.patch
@@ -1,4 +1,4 @@
-From 4b8464a3c11cd4f4180df88a50d805e6aad0b7b9 Mon Sep 17 00:00:00 2001
+From 0094c2822caafc637fff7309e009c67424aabc2a Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 11 Jun 2013 12:09:45 +1000
 Subject: [PATCH] More Efficient Chunk Save Queue
diff --git a/CraftBukkit-Patches/0008-Merge-tweaks-and-configuration.patch b/CraftBukkit-Patches/0009-Merge-tweaks-and-configuration.patch
similarity index 98%
rename from CraftBukkit-Patches/0008-Merge-tweaks-and-configuration.patch
rename to CraftBukkit-Patches/0009-Merge-tweaks-and-configuration.patch
index 1de031bd94..514ecfe713 100644
--- a/CraftBukkit-Patches/0008-Merge-tweaks-and-configuration.patch
+++ b/CraftBukkit-Patches/0009-Merge-tweaks-and-configuration.patch
@@ -1,4 +1,4 @@
-From 3c8d3ae7d02a158f91498a5dd3bcf32283938fb8 Mon Sep 17 00:00:00 2001
+From cb54f74739ff0a97474b244cf05a7d59cfc2b0d0 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
diff --git a/CraftBukkit-Patches/0009-LongHash-Tweaks.patch b/CraftBukkit-Patches/0010-LongHash-Tweaks.patch
similarity index 99%
rename from CraftBukkit-Patches/0009-LongHash-Tweaks.patch
rename to CraftBukkit-Patches/0010-LongHash-Tweaks.patch
index ca442af2b1..1fb76e2c84 100644
--- a/CraftBukkit-Patches/0009-LongHash-Tweaks.patch
+++ b/CraftBukkit-Patches/0010-LongHash-Tweaks.patch
@@ -1,4 +1,4 @@
-From 3f339b0dcd3c969217de62f35d7f2c3cdf8dd7a2 Mon Sep 17 00:00:00 2001
+From 0ed4d284bbdfffc523e2c2c731443a31df66de15 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 17:13:47 +1000
 Subject: [PATCH] LongHash Tweaks
diff --git a/CraftBukkit-Patches/0010-Async-Operation-Catching.patch b/CraftBukkit-Patches/0011-Async-Operation-Catching.patch
similarity index 98%
rename from CraftBukkit-Patches/0010-Async-Operation-Catching.patch
rename to CraftBukkit-Patches/0011-Async-Operation-Catching.patch
index 5b8e178647..e0f07a5b53 100644
--- a/CraftBukkit-Patches/0010-Async-Operation-Catching.patch
+++ b/CraftBukkit-Patches/0011-Async-Operation-Catching.patch
@@ -1,4 +1,4 @@
-From 4507c064694b49ed2a2e7594d0efe82e882c5f8d Mon Sep 17 00:00:00 2001
+From dbc3fd4cf4f7f6b1b81f6cd416844b93802e1de1 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
@@ -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 c1d3118..8a09d97 100644
+index 716cf70..d6bfa0d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -238,6 +238,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/CraftBukkit-Patches/0011-View-Distance.patch b/CraftBukkit-Patches/0012-View-Distance.patch
similarity index 97%
rename from CraftBukkit-Patches/0011-View-Distance.patch
rename to CraftBukkit-Patches/0012-View-Distance.patch
index 049ca7ad94..74f5fb667c 100644
--- a/CraftBukkit-Patches/0011-View-Distance.patch
+++ b/CraftBukkit-Patches/0012-View-Distance.patch
@@ -1,4 +1,4 @@
-From e4c6f8043272f1445be4b11e8fdf061804736330 Mon Sep 17 00:00:00 2001
+From f32fdf0a346328efdfa057b39d0e7503dd0d1713 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Mar 2013 09:52:41 +1100
 Subject: [PATCH] View Distance
diff --git a/CraftBukkit-Patches/0012-Compressed-Nibble-Arrays.patch b/CraftBukkit-Patches/0013-Compressed-Nibble-Arrays.patch
similarity index 99%
rename from CraftBukkit-Patches/0012-Compressed-Nibble-Arrays.patch
rename to CraftBukkit-Patches/0013-Compressed-Nibble-Arrays.patch
index f433449b38..9ae34c362e 100644
--- a/CraftBukkit-Patches/0012-Compressed-Nibble-Arrays.patch
+++ b/CraftBukkit-Patches/0013-Compressed-Nibble-Arrays.patch
@@ -1,4 +1,4 @@
-From 11ccd89a600d948d769e7f16fd841d0e7bee04c4 Mon Sep 17 00:00:00 2001
+From 5458bbfb3dfe9c40834dd68fe0e9bec527971fad Mon Sep 17 00:00:00 2001
 From: Mike Primm <mike@primmhome.com>
 Date: Sun, 13 Jan 2013 03:49:07 -0800
 Subject: [PATCH] Compressed Nibble Arrays
diff --git a/CraftBukkit-Patches/0013-Sync-Free-Chunk-Reference-Cache.patch b/CraftBukkit-Patches/0014-Sync-Free-Chunk-Reference-Cache.patch
similarity index 96%
rename from CraftBukkit-Patches/0013-Sync-Free-Chunk-Reference-Cache.patch
rename to CraftBukkit-Patches/0014-Sync-Free-Chunk-Reference-Cache.patch
index 7200c79910..bf478fa64d 100644
--- a/CraftBukkit-Patches/0013-Sync-Free-Chunk-Reference-Cache.patch
+++ b/CraftBukkit-Patches/0014-Sync-Free-Chunk-Reference-Cache.patch
@@ -1,4 +1,4 @@
-From 20d63175f20fd319c840616a9de5bf917030e184 Mon Sep 17 00:00:00 2001
+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/CraftBukkit-Patches/0014-Improved-Timings-System.patch b/CraftBukkit-Patches/0015-Improved-Timings-System.patch
similarity index 99%
rename from CraftBukkit-Patches/0014-Improved-Timings-System.patch
rename to CraftBukkit-Patches/0015-Improved-Timings-System.patch
index ca3a2318e2..0aacca21e8 100644
--- a/CraftBukkit-Patches/0014-Improved-Timings-System.patch
+++ b/CraftBukkit-Patches/0015-Improved-Timings-System.patch
@@ -1,4 +1,4 @@
-From 804169785fae027e5c3fb669fd06ab046b4d0a02 Mon Sep 17 00:00:00 2001
+From 4214005ab5b491ac0a9f6e2994cf1f5f89b01099 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
@@ -65,7 +65,7 @@ index 9d933cb..491ef6b 100644
  
      protected String G() {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 00bb455..ac2aad8 100644
+index dda2602..d7b93a3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -37,6 +37,7 @@ import jline.console.ConsoleReader;
diff --git a/CraftBukkit-Patches/0015-Fix-Mob-Spawning-Relative-to-View-Distance.patch b/CraftBukkit-Patches/0016-Fix-Mob-Spawning-Relative-to-View-Distance.patch
similarity index 98%
rename from CraftBukkit-Patches/0015-Fix-Mob-Spawning-Relative-to-View-Distance.patch
rename to CraftBukkit-Patches/0016-Fix-Mob-Spawning-Relative-to-View-Distance.patch
index 14fbdb5231..f6cca4a8fe 100644
--- a/CraftBukkit-Patches/0015-Fix-Mob-Spawning-Relative-to-View-Distance.patch
+++ b/CraftBukkit-Patches/0016-Fix-Mob-Spawning-Relative-to-View-Distance.patch
@@ -1,4 +1,4 @@
-From f6c1507a30e34eb031e40ad1d813f57370afc577 Mon Sep 17 00:00:00 2001
+From fa7ec75f87672542655a9d1a836d3090700ef8e1 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.5.2.msysgit.0
+1.8.3.2
 
diff --git a/CraftBukkit-Patches/0016-Handle-Null-Tile-Entities.patch b/CraftBukkit-Patches/0017-Handle-Null-Tile-Entities.patch
similarity index 94%
rename from CraftBukkit-Patches/0016-Handle-Null-Tile-Entities.patch
rename to CraftBukkit-Patches/0017-Handle-Null-Tile-Entities.patch
index efdd5f3ec1..f25e45647c 100644
--- a/CraftBukkit-Patches/0016-Handle-Null-Tile-Entities.patch
+++ b/CraftBukkit-Patches/0017-Handle-Null-Tile-Entities.patch
@@ -1,4 +1,4 @@
-From dad597ee08d239117fb2bbd565d097d3b2524b88 Mon Sep 17 00:00:00 2001
+From 400a4b262b161b4882e44a9f1833dd1b46ec30fb 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/CraftBukkit-Patches/0017-Entity-Activation-Range.patch b/CraftBukkit-Patches/0018-Entity-Activation-Range.patch
similarity index 99%
rename from CraftBukkit-Patches/0017-Entity-Activation-Range.patch
rename to CraftBukkit-Patches/0018-Entity-Activation-Range.patch
index bdd4b2fdd3..c16e7a2524 100644
--- a/CraftBukkit-Patches/0017-Entity-Activation-Range.patch
+++ b/CraftBukkit-Patches/0018-Entity-Activation-Range.patch
@@ -1,4 +1,4 @@
-From 8170a876eb425d2a6c4010c687bda0f26b509b6e Mon Sep 17 00:00:00 2001
+From 6232c33ae23c495c7aebf1e6575a39d2132ff76c 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
diff --git a/CraftBukkit-Patches/0018-Metrics.patch b/CraftBukkit-Patches/0019-Metrics.patch
similarity index 99%
rename from CraftBukkit-Patches/0018-Metrics.patch
rename to CraftBukkit-Patches/0019-Metrics.patch
index 56b1067ba0..ff6bfe7a37 100644
--- a/CraftBukkit-Patches/0018-Metrics.patch
+++ b/CraftBukkit-Patches/0019-Metrics.patch
@@ -1,4 +1,4 @@
-From a0e2332af7b542884f88ddf99de0c70a192cf6f8 Mon Sep 17 00:00:00 2001
+From 51a57c20021e2f9da57a803d86ad1ebcafb43096 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
@@ -657,7 +657,7 @@ index 0000000..f1690a2
 +}
 \ No newline at end of file
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 3dfe4ed..9aaa09a 100644
+index fd5997d..98fcb47 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -35,6 +35,7 @@ public class SpigotConfig
diff --git a/CraftBukkit-Patches/0019-PlayerItemDamageEvent.patch b/CraftBukkit-Patches/0020-PlayerItemDamageEvent.patch
similarity index 96%
rename from CraftBukkit-Patches/0019-PlayerItemDamageEvent.patch
rename to CraftBukkit-Patches/0020-PlayerItemDamageEvent.patch
index a5efe0274e..701069de1a 100644
--- a/CraftBukkit-Patches/0019-PlayerItemDamageEvent.patch
+++ b/CraftBukkit-Patches/0020-PlayerItemDamageEvent.patch
@@ -1,4 +1,4 @@
-From 2cdc63b515cf2e42955c527486bcf5f781e3e42e Mon Sep 17 00:00:00 2001
+From 28f16d33624ed388f82d6d959e6c1371cdb2160a 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.5.2.msysgit.0
+1.8.3.2
 
diff --git a/CraftBukkit-Patches/0020-Faster-UUID-for-entities.patch b/CraftBukkit-Patches/0021-Faster-UUID-for-entities.patch
similarity index 92%
rename from CraftBukkit-Patches/0020-Faster-UUID-for-entities.patch
rename to CraftBukkit-Patches/0021-Faster-UUID-for-entities.patch
index 5e293a4794..7930f31886 100644
--- a/CraftBukkit-Patches/0020-Faster-UUID-for-entities.patch
+++ b/CraftBukkit-Patches/0021-Faster-UUID-for-entities.patch
@@ -1,4 +1,4 @@
-From 84be7d864739993024f6a017e154ec711057fbda Mon Sep 17 00:00:00 2001
+From 0c0bfe8b1127e609cdaf82697bf7ba4a87af5cd3 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
@@ -19,5 +19,5 @@ index 4bcd57e..621f593 100644
          this.world = world;
          this.setPosition(0.0D, 0.0D, 0.0D);
 -- 
-1.8.5.2.msysgit.0
+1.8.3.2
 
diff --git a/CraftBukkit-Patches/0021-Prevent-NPE-in-CraftSign.patch b/CraftBukkit-Patches/0022-Prevent-NPE-in-CraftSign.patch
similarity index 94%
rename from CraftBukkit-Patches/0021-Prevent-NPE-in-CraftSign.patch
rename to CraftBukkit-Patches/0022-Prevent-NPE-in-CraftSign.patch
index eeb8cc3bdd..949f55faf9 100644
--- a/CraftBukkit-Patches/0021-Prevent-NPE-in-CraftSign.patch
+++ b/CraftBukkit-Patches/0022-Prevent-NPE-in-CraftSign.patch
@@ -1,4 +1,4 @@
-From 6486bb114b1a6e1a2eb2449abf34119d8b7c93a0 Mon Sep 17 00:00:00 2001
+From 497af5fb267959f215b8ac57de702065a48ae931 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.5.2.msysgit.0
+1.8.3.2
 
diff --git a/CraftBukkit-Patches/0022-Entity-Tracking-Ranges.patch b/CraftBukkit-Patches/0023-Entity-Tracking-Ranges.patch
similarity index 98%
rename from CraftBukkit-Patches/0022-Entity-Tracking-Ranges.patch
rename to CraftBukkit-Patches/0023-Entity-Tracking-Ranges.patch
index 85f4540920..5941949344 100644
--- a/CraftBukkit-Patches/0022-Entity-Tracking-Ranges.patch
+++ b/CraftBukkit-Patches/0023-Entity-Tracking-Ranges.patch
@@ -1,4 +1,4 @@
-From 8d41e5457f9da0d496a143c12e550a9e542a7214 Mon Sep 17 00:00:00 2001
+From 64e6d307ac64707605a61489c5d103511e18de64 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
@@ -12,7 +12,7 @@ This has multiple benefits:
 4) Less client lag - Not trying to render distant item frames and paintings and entities will reduce entity count on the client, which is major for shop/town worlds which may use tons of item frames.
 
 diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
-index 8f291c2..52a45da 100644
+index 70b0181..c0766d6 100644
 --- a/src/main/java/net/minecraft/server/EntityTracker.java
 +++ b/src/main/java/net/minecraft/server/EntityTracker.java
 @@ -92,6 +92,7 @@ public class EntityTracker {
diff --git a/CraftBukkit-Patches/0023-Limit-Custom-Map-Rendering.patch b/CraftBukkit-Patches/0024-Limit-Custom-Map-Rendering.patch
similarity index 98%
rename from CraftBukkit-Patches/0023-Limit-Custom-Map-Rendering.patch
rename to CraftBukkit-Patches/0024-Limit-Custom-Map-Rendering.patch
index 6c4a7d4912..0ef274376b 100644
--- a/CraftBukkit-Patches/0023-Limit-Custom-Map-Rendering.patch
+++ b/CraftBukkit-Patches/0024-Limit-Custom-Map-Rendering.patch
@@ -1,4 +1,4 @@
-From bceef7be7c61e117d00e935f7ef2c7b62a88cdfa Mon Sep 17 00:00:00 2001
+From 1a2892ea46bdb45810e99c2e858a8f335d45be2f 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
diff --git a/CraftBukkit-Patches/0024-Thread-Naming-and-Tweaks.patch b/CraftBukkit-Patches/0025-Thread-Naming-and-Tweaks.patch
similarity index 94%
rename from CraftBukkit-Patches/0024-Thread-Naming-and-Tweaks.patch
rename to CraftBukkit-Patches/0025-Thread-Naming-and-Tweaks.patch
index b15bc2b36a..f57c7002c9 100644
--- a/CraftBukkit-Patches/0024-Thread-Naming-and-Tweaks.patch
+++ b/CraftBukkit-Patches/0025-Thread-Naming-and-Tweaks.patch
@@ -1,4 +1,4 @@
-From 97aff802848009171de09dfe1743942f7e803ba7 Mon Sep 17 00:00:00 2001
+From e9def1247d73b078f8d84f3009b7a2d0ad5d59b7 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.5.2.msysgit.0
+1.8.3.2
 
diff --git a/CraftBukkit-Patches/0025-Close-Unloaded-Save-Files.patch b/CraftBukkit-Patches/0026-Close-Unloaded-Save-Files.patch
similarity index 96%
rename from CraftBukkit-Patches/0025-Close-Unloaded-Save-Files.patch
rename to CraftBukkit-Patches/0026-Close-Unloaded-Save-Files.patch
index 16619d49a3..43217b973d 100644
--- a/CraftBukkit-Patches/0025-Close-Unloaded-Save-Files.patch
+++ b/CraftBukkit-Patches/0026-Close-Unloaded-Save-Files.patch
@@ -1,4 +1,4 @@
-From cf8cf9db76559a65905429d8e266b43786de6872 Mon Sep 17 00:00:00 2001
+From bb48d36ef39d168169ba648695404764df103836 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 3a72f25..7c5db94 100644
+index ebaeb98..9abb380 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -81,6 +81,8 @@ import net.minecraft.server.MinecraftServer;
diff --git a/CraftBukkit-Patches/0026-Remove-o-Option.patch b/CraftBukkit-Patches/0027-Remove-o-Option.patch
similarity index 90%
rename from CraftBukkit-Patches/0026-Remove-o-Option.patch
rename to CraftBukkit-Patches/0027-Remove-o-Option.patch
index c34ba61ede..05ac00006a 100644
--- a/CraftBukkit-Patches/0026-Remove-o-Option.patch
+++ b/CraftBukkit-Patches/0027-Remove-o-Option.patch
@@ -1,4 +1,4 @@
-From 0a1e4d812ab47f41a9b54eb7bf34462c5427d1d1 Mon Sep 17 00:00:00 2001
+From 149cdfe128beb0df0d9055d33a40d3b7da5e179c 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.5.2.msysgit.0
+1.8.3.2
 
diff --git a/CraftBukkit-Patches/0027-Recipe-Deconstruction.patch b/CraftBukkit-Patches/0028-Recipe-Deconstruction.patch
similarity index 96%
rename from CraftBukkit-Patches/0027-Recipe-Deconstruction.patch
rename to CraftBukkit-Patches/0028-Recipe-Deconstruction.patch
index bbf08be88b..d343a6f3d0 100644
--- a/CraftBukkit-Patches/0027-Recipe-Deconstruction.patch
+++ b/CraftBukkit-Patches/0028-Recipe-Deconstruction.patch
@@ -1,4 +1,4 @@
-From 0006f13d52fd4580961dcfba2367254d705bbfee Mon Sep 17 00:00:00 2001
+From f39835e2ec7023218ad9d8227c02045e1a3015fb 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.5.2.msysgit.0
+1.8.3.2
 
diff --git a/CraftBukkit-Patches/0028-Implement-Arrow-API.patch b/CraftBukkit-Patches/0029-Implement-Arrow-API.patch
similarity index 91%
rename from CraftBukkit-Patches/0028-Implement-Arrow-API.patch
rename to CraftBukkit-Patches/0029-Implement-Arrow-API.patch
index 73a8fe0e52..7739884393 100644
--- a/CraftBukkit-Patches/0028-Implement-Arrow-API.patch
+++ b/CraftBukkit-Patches/0029-Implement-Arrow-API.patch
@@ -1,4 +1,4 @@
-From a47c3a4fd3cbb34d9f3ab7b0c6ba521430414081 Mon Sep 17 00:00:00 2001
+From 0a51dd1733e0a307cf26bafd596a70e981004f79 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.5.2.msysgit.0
+1.8.3.2
 
diff --git a/CraftBukkit-Patches/0029-Hopper-Cooldowns.patch b/CraftBukkit-Patches/0030-Hopper-Cooldowns.patch
similarity index 98%
rename from CraftBukkit-Patches/0029-Hopper-Cooldowns.patch
rename to CraftBukkit-Patches/0030-Hopper-Cooldowns.patch
index 8d7270e85c..704fd82dae 100644
--- a/CraftBukkit-Patches/0029-Hopper-Cooldowns.patch
+++ b/CraftBukkit-Patches/0030-Hopper-Cooldowns.patch
@@ -1,4 +1,4 @@
-From 58db53f2a0fc9262a36597cb24c19926af8b6cd8 Mon Sep 17 00:00:00 2001
+From 4c545da88ebd04a32e7cbb0be787afcf2ac083ef 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
@@ -81,5 +81,5 @@ index 6421bf2..827e6f9 100644
 +    }
  }
 -- 
-1.8.5.2.msysgit.0
+1.8.3.2
 
diff --git a/CraftBukkit-Patches/0030-Prevent-Shutdown-Hang.patch b/CraftBukkit-Patches/0031-Prevent-Shutdown-Hang.patch
similarity index 95%
rename from CraftBukkit-Patches/0030-Prevent-Shutdown-Hang.patch
rename to CraftBukkit-Patches/0031-Prevent-Shutdown-Hang.patch
index 16d8d01851..7f00088fab 100644
--- a/CraftBukkit-Patches/0030-Prevent-Shutdown-Hang.patch
+++ b/CraftBukkit-Patches/0031-Prevent-Shutdown-Hang.patch
@@ -1,4 +1,4 @@
-From 0911b5dd80e900a7c4c8fa7f4a5599ab3ee06592 Mon Sep 17 00:00:00 2001
+From 596282d41a999f6c08fa984d44bcf12c2937c213 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
diff --git a/CraftBukkit-Patches/0031-Implement-SpawnerSpawnEvent.patch b/CraftBukkit-Patches/0032-Implement-SpawnerSpawnEvent.patch
similarity index 97%
rename from CraftBukkit-Patches/0031-Implement-SpawnerSpawnEvent.patch
rename to CraftBukkit-Patches/0032-Implement-SpawnerSpawnEvent.patch
index fe554b2bdb..22857823e9 100644
--- a/CraftBukkit-Patches/0031-Implement-SpawnerSpawnEvent.patch
+++ b/CraftBukkit-Patches/0032-Implement-SpawnerSpawnEvent.patch
@@ -1,4 +1,4 @@
-From d1aee95f430bcaeee60611a01c201aba9ad1e303 Mon Sep 17 00:00:00 2001
+From 45421c501fe3ac16483fde71a8143794b8e147e2 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 2911d60..c7e238f 100644
+index 4cc25f2..e1e8361 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 2911d60..c7e238f 100644
       */
      public static PlayerBucketEmptyEvent callPlayerBucketEmptyEvent(EntityHuman who, int clickedX, int clickedY, int clickedZ, int clickedFace, ItemStack itemInHand) {
 -- 
-1.8.5.2.msysgit.0
+1.8.3.2
 
diff --git a/CraftBukkit-Patches/0032-Firework-Meta-Crash-Fix.patch b/CraftBukkit-Patches/0033-Firework-Meta-Crash-Fix.patch
similarity index 93%
rename from CraftBukkit-Patches/0032-Firework-Meta-Crash-Fix.patch
rename to CraftBukkit-Patches/0033-Firework-Meta-Crash-Fix.patch
index 63fef973a9..61b9e25c7c 100644
--- a/CraftBukkit-Patches/0032-Firework-Meta-Crash-Fix.patch
+++ b/CraftBukkit-Patches/0033-Firework-Meta-Crash-Fix.patch
@@ -1,4 +1,4 @@
-From b4c0a5523f7caf1cbbcbe3f85a282252616f8c47 Mon Sep 17 00:00:00 2001
+From 6a08b304c2ce4f533360478508980e91c3747b1e 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.5.2.msysgit.0
+1.8.3.2
 
diff --git a/CraftBukkit-Patches/0033-Allow-Disabling-of-Command-Logging.patch b/CraftBukkit-Patches/0034-Allow-Disabling-of-Command-Logging.patch
similarity index 96%
rename from CraftBukkit-Patches/0033-Allow-Disabling-of-Command-Logging.patch
rename to CraftBukkit-Patches/0034-Allow-Disabling-of-Command-Logging.patch
index 23a62eac17..b6317282af 100644
--- a/CraftBukkit-Patches/0033-Allow-Disabling-of-Command-Logging.patch
+++ b/CraftBukkit-Patches/0034-Allow-Disabling-of-Command-Logging.patch
@@ -1,4 +1,4 @@
-From cf5a9716d8ddb2da8634724201bcc8316d359a93 Mon Sep 17 00:00:00 2001
+From 42581137b2b8313804bd958c5166e9add3dff9fe 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/CraftBukkit-Patches/0034-Allow-Disabling-of-Command-TabComplete.patch b/CraftBukkit-Patches/0035-Allow-Disabling-of-Command-TabComplete.patch
similarity index 96%
rename from CraftBukkit-Patches/0034-Allow-Disabling-of-Command-TabComplete.patch
rename to CraftBukkit-Patches/0035-Allow-Disabling-of-Command-TabComplete.patch
index fcdf678025..af84d2149f 100644
--- a/CraftBukkit-Patches/0034-Allow-Disabling-of-Command-TabComplete.patch
+++ b/CraftBukkit-Patches/0035-Allow-Disabling-of-Command-TabComplete.patch
@@ -1,4 +1,4 @@
-From bec9ec4cdc1f74c2811c3a53d8ce1c6b845da231 Mon Sep 17 00:00:00 2001
+From 6aa66419cb3e934c0e944a3c2cb6180a29963c4f 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
diff --git a/CraftBukkit-Patches/0035-Configurable-Messages.patch b/CraftBukkit-Patches/0036-Configurable-Messages.patch
similarity index 98%
rename from CraftBukkit-Patches/0035-Configurable-Messages.patch
rename to CraftBukkit-Patches/0036-Configurable-Messages.patch
index 28c751c3b8..f2b228c5cc 100644
--- a/CraftBukkit-Patches/0035-Configurable-Messages.patch
+++ b/CraftBukkit-Patches/0036-Configurable-Messages.patch
@@ -1,4 +1,4 @@
-From 1788feaf265d532b6ffd95afd64380cc7be7fbeb Mon Sep 17 00:00:00 2001
+From 652a3e1612be1d7961f48a10e2fc73358eb07170 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
@@ -45,7 +45,7 @@ index 4977ea1..0208191 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4cb78fd..674acb9 100644
+index 2b6b9fb..6e9f95e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -701,11 +701,7 @@ public final class CraftServer implements Server {
diff --git a/CraftBukkit-Patches/0036-Allow-Disabling-of-Random-Lighting-Updates.patch b/CraftBukkit-Patches/0037-Allow-Disabling-of-Random-Lighting-Updates.patch
similarity index 97%
rename from CraftBukkit-Patches/0036-Allow-Disabling-of-Random-Lighting-Updates.patch
rename to CraftBukkit-Patches/0037-Allow-Disabling-of-Random-Lighting-Updates.patch
index 92fc1af2ef..a1f4161c42 100644
--- a/CraftBukkit-Patches/0036-Allow-Disabling-of-Random-Lighting-Updates.patch
+++ b/CraftBukkit-Patches/0037-Allow-Disabling-of-Random-Lighting-Updates.patch
@@ -1,4 +1,4 @@
-From b939e07cf00e75eee84fea4f308ba858c86691ea Mon Sep 17 00:00:00 2001
+From a90c3b1287735f4a5b27480ef39d28fa1733ccb2 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 22 Jun 2013 16:12:02 +1000
 Subject: [PATCH] Allow Disabling of Random Lighting Updates
diff --git a/CraftBukkit-Patches/0037-Make-AnvilInventory.getItem-use-both-containers.-Fix.patch b/CraftBukkit-Patches/0038-Make-AnvilInventory.getItem-use-both-containers.-Fix.patch
similarity index 97%
rename from CraftBukkit-Patches/0037-Make-AnvilInventory.getItem-use-both-containers.-Fix.patch
rename to CraftBukkit-Patches/0038-Make-AnvilInventory.getItem-use-both-containers.-Fix.patch
index c42e1a8a9a..62387536a4 100644
--- a/CraftBukkit-Patches/0037-Make-AnvilInventory.getItem-use-both-containers.-Fix.patch
+++ b/CraftBukkit-Patches/0038-Make-AnvilInventory.getItem-use-both-containers.-Fix.patch
@@ -1,4 +1,4 @@
-From df5a15e53159fdd78e0d441d0a780e7948597869 Mon Sep 17 00:00:00 2001
+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
diff --git a/CraftBukkit-Patches/0038-Properly-Close-Inventories.patch b/CraftBukkit-Patches/0039-Properly-Close-Inventories.patch
similarity index 97%
rename from CraftBukkit-Patches/0038-Properly-Close-Inventories.patch
rename to CraftBukkit-Patches/0039-Properly-Close-Inventories.patch
index 06e9092c52..5afafb43ae 100644
--- a/CraftBukkit-Patches/0038-Properly-Close-Inventories.patch
+++ b/CraftBukkit-Patches/0039-Properly-Close-Inventories.patch
@@ -1,4 +1,4 @@
-From 331e7dbd06a41d3af1c9d66c885fbd258607dc57 Mon Sep 17 00:00:00 2001
+From 051f0b21d9cdee96e11e7db6bb2577ef59bc69a9 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
diff --git a/CraftBukkit-Patches/0039-Disallow-Interaction-With-Self.patch b/CraftBukkit-Patches/0040-Disallow-Interaction-With-Self.patch
similarity index 93%
rename from CraftBukkit-Patches/0039-Disallow-Interaction-With-Self.patch
rename to CraftBukkit-Patches/0040-Disallow-Interaction-With-Self.patch
index eecfbd69b1..a04e217e99 100644
--- a/CraftBukkit-Patches/0039-Disallow-Interaction-With-Self.patch
+++ b/CraftBukkit-Patches/0040-Disallow-Interaction-With-Self.patch
@@ -1,4 +1,4 @@
-From 0120877b54f169b974c110ce3ea34ca6897da8d8 Mon Sep 17 00:00:00 2001
+From b2830d7802cb73473523fea60775ba9dc70bfd4b 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/CraftBukkit-Patches/0040-Lower-Chunk-Compression.patch b/CraftBukkit-Patches/0041-Lower-Chunk-Compression.patch
similarity index 96%
rename from CraftBukkit-Patches/0040-Lower-Chunk-Compression.patch
rename to CraftBukkit-Patches/0041-Lower-Chunk-Compression.patch
index 7be0b5c9e8..656362a168 100644
--- a/CraftBukkit-Patches/0040-Lower-Chunk-Compression.patch
+++ b/CraftBukkit-Patches/0041-Lower-Chunk-Compression.patch
@@ -1,4 +1,4 @@
-From 08c35cccfe2109d16122a5633f94d14217d5e3d6 Mon Sep 17 00:00:00 2001
+From a5924094af40aee70d68f5e69922abc147411028 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
diff --git a/CraftBukkit-Patches/0041-Entity-Mount-and-Dismount-Events.patch b/CraftBukkit-Patches/0042-Entity-Mount-and-Dismount-Events.patch
similarity index 97%
rename from CraftBukkit-Patches/0041-Entity-Mount-and-Dismount-Events.patch
rename to CraftBukkit-Patches/0042-Entity-Mount-and-Dismount-Events.patch
index b2d310eac2..956c7e1c2b 100644
--- a/CraftBukkit-Patches/0041-Entity-Mount-and-Dismount-Events.patch
+++ b/CraftBukkit-Patches/0042-Entity-Mount-and-Dismount-Events.patch
@@ -1,4 +1,4 @@
-From a4e61e2c3fef0f754763e903a94e331c9c7990b1 Mon Sep 17 00:00:00 2001
+From 7057ec11fe46ec66b9d5f35b589a1c762e31a7f6 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/0042-Prevent-Ghost-Players-Caused-by-Plugins.patch b/CraftBukkit-Patches/0043-Prevent-Ghost-Players-Caused-by-Plugins.patch
similarity index 94%
rename from CraftBukkit-Patches/0042-Prevent-Ghost-Players-Caused-by-Plugins.patch
rename to CraftBukkit-Patches/0043-Prevent-Ghost-Players-Caused-by-Plugins.patch
index e1476d3b9b..a7c429b59f 100644
--- a/CraftBukkit-Patches/0042-Prevent-Ghost-Players-Caused-by-Plugins.patch
+++ b/CraftBukkit-Patches/0043-Prevent-Ghost-Players-Caused-by-Plugins.patch
@@ -1,4 +1,4 @@
-From 6403bc23c4e6b66b0bafaa5703762a695daf23a7 Mon Sep 17 00:00:00 2001
+From 34d0001f99b84405fa2ae14bc74507764eaa6c14 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
diff --git a/CraftBukkit-Patches/0043-Entity-ticking-chunk-caching.patch b/CraftBukkit-Patches/0044-Entity-ticking-chunk-caching.patch
similarity index 98%
rename from CraftBukkit-Patches/0043-Entity-ticking-chunk-caching.patch
rename to CraftBukkit-Patches/0044-Entity-ticking-chunk-caching.patch
index 28b026a3b8..d451a4e039 100644
--- a/CraftBukkit-Patches/0043-Entity-ticking-chunk-caching.patch
+++ b/CraftBukkit-Patches/0044-Entity-ticking-chunk-caching.patch
@@ -1,4 +1,4 @@
-From 78f07fc5afe8f2620fcdaf65bfbbdeff0f38d793 Mon Sep 17 00:00:00 2001
+From 9d5f0caeda6236c3483e0b8338bc89d43acc48bd 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
diff --git a/CraftBukkit-Patches/0044-Plug-World-Unload-Memory-Leak.patch b/CraftBukkit-Patches/0045-Plug-World-Unload-Memory-Leak.patch
similarity index 92%
rename from CraftBukkit-Patches/0044-Plug-World-Unload-Memory-Leak.patch
rename to CraftBukkit-Patches/0045-Plug-World-Unload-Memory-Leak.patch
index faa135b501..571048e4ec 100644
--- a/CraftBukkit-Patches/0044-Plug-World-Unload-Memory-Leak.patch
+++ b/CraftBukkit-Patches/0045-Plug-World-Unload-Memory-Leak.patch
@@ -1,4 +1,4 @@
-From 2a46d3d0f7423526558466e9cb9db6e3a43d0b92 Mon Sep 17 00:00:00 2001
+From 9cc0ddfa178ec0b0aa06f17da9708cefbffd318a Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 3 Aug 2013 19:02:59 +1000
 Subject: [PATCH] Plug World Unload Memory Leak
diff --git a/CraftBukkit-Patches/0045-Player-Collision-API.patch b/CraftBukkit-Patches/0046-Player-Collision-API.patch
similarity index 96%
rename from CraftBukkit-Patches/0045-Player-Collision-API.patch
rename to CraftBukkit-Patches/0046-Player-Collision-API.patch
index f30c3acc18..ffe48b49ba 100644
--- a/CraftBukkit-Patches/0045-Player-Collision-API.patch
+++ b/CraftBukkit-Patches/0046-Player-Collision-API.patch
@@ -1,4 +1,4 @@
-From 4f191736ede09810d6a941c601d2ebe74c793797 Mon Sep 17 00:00:00 2001
+From 4063f09d6a735da6f77eb959f5fac2dfafad657c 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
@@ -18,7 +18,7 @@ index e2e7b9c..5b50df0 100644
                      Entity entity = (Entity) list.get(i);
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 3758411..90c0e82 100644
+index 6c77253..4c3fd8a 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1490,7 +1490,7 @@ public abstract class EntityLiving extends Entity {
@@ -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 8a09d97..0c1d655 100644
+index d6bfa0d..deb4009 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 {
diff --git a/CraftBukkit-Patches/0046-Fully-Disable-Snooper-When-Not-Required.patch b/CraftBukkit-Patches/0047-Fully-Disable-Snooper-When-Not-Required.patch
similarity index 91%
rename from CraftBukkit-Patches/0046-Fully-Disable-Snooper-When-Not-Required.patch
rename to CraftBukkit-Patches/0047-Fully-Disable-Snooper-When-Not-Required.patch
index 961a2d3755..ed018ab987 100644
--- a/CraftBukkit-Patches/0046-Fully-Disable-Snooper-When-Not-Required.patch
+++ b/CraftBukkit-Patches/0047-Fully-Disable-Snooper-When-Not-Required.patch
@@ -1,11 +1,11 @@
-From 48935cd26211ad88fb22037bab50630219a63577 Mon Sep 17 00:00:00 2001
+From b61831e527703aa087de238c808ff76ec67591dd 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 ac2aad8..16e3596 100644
+index d7b93a3..35453be 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
diff --git a/CraftBukkit-Patches/0047-Add-Getter-for-Entity-Invulnerability.patch b/CraftBukkit-Patches/0048-Add-Getter-for-Entity-Invulnerability.patch
similarity index 92%
rename from CraftBukkit-Patches/0047-Add-Getter-for-Entity-Invulnerability.patch
rename to CraftBukkit-Patches/0048-Add-Getter-for-Entity-Invulnerability.patch
index d9f8741900..655a01090e 100644
--- a/CraftBukkit-Patches/0047-Add-Getter-for-Entity-Invulnerability.patch
+++ b/CraftBukkit-Patches/0048-Add-Getter-for-Entity-Invulnerability.patch
@@ -1,4 +1,4 @@
-From 3d306ebf3a969328046d70d8ef0e7299ec33a2d2 Mon Sep 17 00:00:00 2001
+From 1f9256b71314d22062c5a8724203cd17bfb120e1 Mon Sep 17 00:00:00 2001
 From: DerFlash <bte@freenet.de>
 Date: Sat, 3 Aug 2013 19:53:48 +1000
 Subject: [PATCH] Add Getter for Entity Invulnerability
diff --git a/CraftBukkit-Patches/0048-Cap-Minimum-Player-Speed.patch b/CraftBukkit-Patches/0049-Cap-Minimum-Player-Speed.patch
similarity index 92%
rename from CraftBukkit-Patches/0048-Cap-Minimum-Player-Speed.patch
rename to CraftBukkit-Patches/0049-Cap-Minimum-Player-Speed.patch
index 2f33ad57ac..1c28cd048b 100644
--- a/CraftBukkit-Patches/0048-Cap-Minimum-Player-Speed.patch
+++ b/CraftBukkit-Patches/0049-Cap-Minimum-Player-Speed.patch
@@ -1,11 +1,11 @@
-From f3cedd8dc2ab7b9e476b4b80c974dd34e094094a Mon Sep 17 00:00:00 2001
+From 14c71f7805bbcf37f398eb162f562533fe5952ee 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 0c1d655..e47af0d 100644
+index deb4009..9eb8e19 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1162,7 +1162,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/CraftBukkit-Patches/0049-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch b/CraftBukkit-Patches/0050-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch
similarity index 94%
rename from CraftBukkit-Patches/0049-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch
rename to CraftBukkit-Patches/0050-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch
index 6a6ec35363..9eddea6dc8 100644
--- a/CraftBukkit-Patches/0049-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch
+++ b/CraftBukkit-Patches/0050-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch
@@ -1,4 +1,4 @@
-From 743480f0ba5ff6d024d38cb4b825a6753cf14039 Mon Sep 17 00:00:00 2001
+From 8d33ea18c42f4dfcee84dfb398bdabb701cc1078 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 14 Sep 2013 10:16:38 +1000
 Subject: [PATCH] Update Inventory and Health for PlayerConsumeItemEvent
diff --git a/CraftBukkit-Patches/0050-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch b/CraftBukkit-Patches/0051-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch
similarity index 96%
rename from CraftBukkit-Patches/0050-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch
rename to CraftBukkit-Patches/0051-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch
index 1ed024ba54..32962be94d 100644
--- a/CraftBukkit-Patches/0050-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch
+++ b/CraftBukkit-Patches/0051-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch
@@ -1,4 +1,4 @@
-From 10449310a86a7232158caf1d0ae880d984d65e51 Mon Sep 17 00:00:00 2001
+From a8d499d7d67e9545e96be449ba713181cf683518 Mon Sep 17 00:00:00 2001
 From: BlackHole <black-hole@live.com>
 Date: Tue, 16 Jul 2013 22:34:50 +0200
 Subject: [PATCH] Call EntityChangeBlockEvent for Fire Arrows hitting TNT
diff --git a/CraftBukkit-Patches/0051-Allow-Disabling-of-1.6.3-Structure-Saving.patch b/CraftBukkit-Patches/0052-Allow-Disabling-of-1.6.3-Structure-Saving.patch
similarity index 97%
rename from CraftBukkit-Patches/0051-Allow-Disabling-of-1.6.3-Structure-Saving.patch
rename to CraftBukkit-Patches/0052-Allow-Disabling-of-1.6.3-Structure-Saving.patch
index 7cc004016c..ccc0bcea5e 100644
--- a/CraftBukkit-Patches/0051-Allow-Disabling-of-1.6.3-Structure-Saving.patch
+++ b/CraftBukkit-Patches/0052-Allow-Disabling-of-1.6.3-Structure-Saving.patch
@@ -1,4 +1,4 @@
-From d8d5fe8e4c5673b64cb5822a6ef16cca8ecdfad0 Mon Sep 17 00:00:00 2001
+From e5384725d1e52d3d48985d6398950f1300573b4a Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 21 Sep 2013 12:33:09 +1000
 Subject: [PATCH] Allow Disabling of 1.6.3 Structure Saving
diff --git a/CraftBukkit-Patches/0052-Item-Despawn-Rate.patch b/CraftBukkit-Patches/0053-Item-Despawn-Rate.patch
similarity index 96%
rename from CraftBukkit-Patches/0052-Item-Despawn-Rate.patch
rename to CraftBukkit-Patches/0053-Item-Despawn-Rate.patch
index def7f0a4c6..7ee860b257 100644
--- a/CraftBukkit-Patches/0052-Item-Despawn-Rate.patch
+++ b/CraftBukkit-Patches/0053-Item-Despawn-Rate.patch
@@ -1,4 +1,4 @@
-From cd876340b86e6271abadd7e4319fe79ac301d0ac Mon Sep 17 00:00:00 2001
+From 2558f8f50bdfe2c9d8fee5ad9629a2af43379712 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 22 Sep 2013 19:10:53 +1000
 Subject: [PATCH] Item Despawn Rate
diff --git a/CraftBukkit-Patches/0053-Don-t-Special-Case-X-Move-Value.patch b/CraftBukkit-Patches/0054-Don-t-Special-Case-X-Move-Value.patch
similarity index 97%
rename from CraftBukkit-Patches/0053-Don-t-Special-Case-X-Move-Value.patch
rename to CraftBukkit-Patches/0054-Don-t-Special-Case-X-Move-Value.patch
index 77c43b0440..09c0269fc2 100644
--- a/CraftBukkit-Patches/0053-Don-t-Special-Case-X-Move-Value.patch
+++ b/CraftBukkit-Patches/0054-Don-t-Special-Case-X-Move-Value.patch
@@ -1,4 +1,4 @@
-From 5c6e16695c9ffc3378284ca10e0b80598d95cc00 Mon Sep 17 00:00:00 2001
+From e84d44cc072262050be162110feb55a1010954e0 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/CraftBukkit-Patches/0054-Implement-respawn-API.patch b/CraftBukkit-Patches/0055-Implement-respawn-API.patch
similarity index 90%
rename from CraftBukkit-Patches/0054-Implement-respawn-API.patch
rename to CraftBukkit-Patches/0055-Implement-respawn-API.patch
index 5c29cf06d6..51493d0422 100644
--- a/CraftBukkit-Patches/0054-Implement-respawn-API.patch
+++ b/CraftBukkit-Patches/0055-Implement-respawn-API.patch
@@ -1,11 +1,11 @@
-From 82923f38300b6c62d55ba4e61b10a45d2510ef50 Mon Sep 17 00:00:00 2001
+From 05861ecb4bd0b4b22a3233c9907e885b22b36a1b 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 e47af0d..af2ee8c 100644
+index 9eb8e19..5d15396 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1303,6 +1303,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/CraftBukkit-Patches/0055-Fix-BrewingStands-Removing-NBT-Potions.patch b/CraftBukkit-Patches/0056-Fix-BrewingStands-Removing-NBT-Potions.patch
similarity index 95%
rename from CraftBukkit-Patches/0055-Fix-BrewingStands-Removing-NBT-Potions.patch
rename to CraftBukkit-Patches/0056-Fix-BrewingStands-Removing-NBT-Potions.patch
index 02352b9ae3..2fac99ef90 100644
--- a/CraftBukkit-Patches/0055-Fix-BrewingStands-Removing-NBT-Potions.patch
+++ b/CraftBukkit-Patches/0056-Fix-BrewingStands-Removing-NBT-Potions.patch
@@ -1,4 +1,4 @@
-From acca141f0ca29a93cbb236c490997fb0338cb15f Mon Sep 17 00:00:00 2001
+From d56362c6b3f949b07066d5b75c0d89b7645a7809 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Wed, 9 Oct 2013 18:20:05 +1100
 Subject: [PATCH] Fix BrewingStands Removing NBT / Potions
diff --git a/CraftBukkit-Patches/0056-Arrow-Despawn-Rate.patch b/CraftBukkit-Patches/0057-Arrow-Despawn-Rate.patch
similarity index 95%
rename from CraftBukkit-Patches/0056-Arrow-Despawn-Rate.patch
rename to CraftBukkit-Patches/0057-Arrow-Despawn-Rate.patch
index f0fe009439..1df632567a 100644
--- a/CraftBukkit-Patches/0056-Arrow-Despawn-Rate.patch
+++ b/CraftBukkit-Patches/0057-Arrow-Despawn-Rate.patch
@@ -1,4 +1,4 @@
-From 277c9ec5a89466241ff3af7b171bd6b3db75ec5c Mon Sep 17 00:00:00 2001
+From 7f4fc5deeaf1722ba8bb9330f990688f9bf8f607 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Mon, 14 Oct 2013 19:20:10 +1100
 Subject: [PATCH] Arrow Despawn Rate
diff --git a/CraftBukkit-Patches/0057-Watchdog-Thread.patch b/CraftBukkit-Patches/0059-Watchdog-Thread.patch
similarity index 98%
rename from CraftBukkit-Patches/0057-Watchdog-Thread.patch
rename to CraftBukkit-Patches/0059-Watchdog-Thread.patch
index 4f311c2333..3ea0acd2d1 100644
--- a/CraftBukkit-Patches/0057-Watchdog-Thread.patch
+++ b/CraftBukkit-Patches/0059-Watchdog-Thread.patch
@@ -1,11 +1,11 @@
-From 9cb6e8e5ee6083bf3d3d76cf01d6d56635b16deb Mon Sep 17 00:00:00 2001
+From 8e1e8ca5baa8180ccc679d3d72776f3f94061c40 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 16e3596..883c3b5 100644
+index 35453be..e78d8f3 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
@@ -26,7 +26,7 @@ index 16e3596..883c3b5 100644
      }
 diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java
 new file mode 100644
-index 0000000..917a931
+index 0000000..7c086fd
 --- /dev/null
 +++ b/src/main/java/org/spigotmc/RestartCommand.java
 @@ -0,0 +1,110 @@
@@ -83,7 +83,7 @@ index 0000000..917a931
 +                {
 +                }
 +                // Close the socket so we can rebind with the new process
-+                MinecraftServer.getServer().ai().b();
++                MinecraftServer.getServer().getServerConnection().b();
 +
 +                // Give time for it to kick in
 +                try
diff --git a/CraftBukkit-Patches/0059-Clear-Flower-Pot-on-Drop.patch b/CraftBukkit-Patches/0060-Clear-Flower-Pot-on-Drop.patch
similarity index 92%
rename from CraftBukkit-Patches/0059-Clear-Flower-Pot-on-Drop.patch
rename to CraftBukkit-Patches/0060-Clear-Flower-Pot-on-Drop.patch
index fbd8aed061..7fcc0ead4c 100644
--- a/CraftBukkit-Patches/0059-Clear-Flower-Pot-on-Drop.patch
+++ b/CraftBukkit-Patches/0060-Clear-Flower-Pot-on-Drop.patch
@@ -1,4 +1,4 @@
-From f420cf9bcad51dfc93bcd6fef52d278f0db1a85b Mon Sep 17 00:00:00 2001
+From 6c75964a5839dcc79ee1c6a76b5d76b8fd01a265 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 3 Dec 2013 11:07:48 +1100
 Subject: [PATCH] Clear Flower Pot on Drop
diff --git a/CraftBukkit-Patches/0060-Fix-some-chunks-not-being-sent-to-the-client.patch b/CraftBukkit-Patches/0061-Fix-some-chunks-not-being-sent-to-the-client.patch
similarity index 95%
rename from CraftBukkit-Patches/0060-Fix-some-chunks-not-being-sent-to-the-client.patch
rename to CraftBukkit-Patches/0061-Fix-some-chunks-not-being-sent-to-the-client.patch
index 9516964e30..fd68d15652 100644
--- a/CraftBukkit-Patches/0060-Fix-some-chunks-not-being-sent-to-the-client.patch
+++ b/CraftBukkit-Patches/0061-Fix-some-chunks-not-being-sent-to-the-client.patch
@@ -1,4 +1,4 @@
-From ea80c509c6b04cf606dc0b2b8d55abcd082fea31 Mon Sep 17 00:00:00 2001
+From 5f093f85ed2c1d9da20455743d3ccb08915c4a3c Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Mon, 2 Dec 2013 23:42:09 +0000
 Subject: [PATCH] Fix some chunks not being sent to the client
diff --git a/CraftBukkit-Patches/0061-Fix-Broken-Async-Chat.patch b/CraftBukkit-Patches/0062-Fix-Broken-Async-Chat.patch
similarity index 95%
rename from CraftBukkit-Patches/0061-Fix-Broken-Async-Chat.patch
rename to CraftBukkit-Patches/0062-Fix-Broken-Async-Chat.patch
index 617aa081b5..b15e8e6f55 100644
--- a/CraftBukkit-Patches/0061-Fix-Broken-Async-Chat.patch
+++ b/CraftBukkit-Patches/0062-Fix-Broken-Async-Chat.patch
@@ -1,4 +1,4 @@
-From 26d428354a8730f2ddd51c761aa5226c1f8150a3 Mon Sep 17 00:00:00 2001
+From 3d991969a4a2a4490524309060e287d6ac1b7fb4 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 5 Dec 2013 13:55:53 +1100
 Subject: [PATCH] Fix Broken Async Chat
diff --git a/CraftBukkit-Patches/0062-Allow-Teleportation-of-Vehicles-and-Passengers.patch b/CraftBukkit-Patches/0063-Allow-Teleportation-of-Vehicles-and-Passengers.patch
similarity index 93%
rename from CraftBukkit-Patches/0062-Allow-Teleportation-of-Vehicles-and-Passengers.patch
rename to CraftBukkit-Patches/0063-Allow-Teleportation-of-Vehicles-and-Passengers.patch
index d53cef0eca..1bcdc40b6b 100644
--- a/CraftBukkit-Patches/0062-Allow-Teleportation-of-Vehicles-and-Passengers.patch
+++ b/CraftBukkit-Patches/0063-Allow-Teleportation-of-Vehicles-and-Passengers.patch
@@ -1,11 +1,11 @@
-From 939807f8187bbeddaad80e17a6f9b5aff5d37b26 Mon Sep 17 00:00:00 2001
+From 63e6a0b006cd2d0e08daaffb2d8227c26d464ead 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 af2ee8c..217d5dd 100644
+index 5d15396..d7934b4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -459,9 +459,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/CraftBukkit-Patches/0063-Remove-OS-X-Special-Chars-from-Signs.patch b/CraftBukkit-Patches/0064-Remove-OS-X-Special-Chars-from-Signs.patch
similarity index 93%
rename from CraftBukkit-Patches/0063-Remove-OS-X-Special-Chars-from-Signs.patch
rename to CraftBukkit-Patches/0064-Remove-OS-X-Special-Chars-from-Signs.patch
index c7bfe0602f..e4ffdf523c 100644
--- a/CraftBukkit-Patches/0063-Remove-OS-X-Special-Chars-from-Signs.patch
+++ b/CraftBukkit-Patches/0064-Remove-OS-X-Special-Chars-from-Signs.patch
@@ -1,4 +1,4 @@
-From 7cb3708727460f4851ac82174340ec5cf6cfa2c5 Mon Sep 17 00:00:00 2001
+From 302c780a23bf59fb71c3f57b05adafcfafbf5d12 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/CraftBukkit-Patches/0064-Orebfuscator.patch b/CraftBukkit-Patches/0065-Orebfuscator.patch
similarity index 99%
rename from CraftBukkit-Patches/0064-Orebfuscator.patch
rename to CraftBukkit-Patches/0065-Orebfuscator.patch
index 30674117a5..44305cbc15 100644
--- a/CraftBukkit-Patches/0064-Orebfuscator.patch
+++ b/CraftBukkit-Patches/0065-Orebfuscator.patch
@@ -1,4 +1,4 @@
-From a0f89c1e4ffcf797b4d4754a4eb1953325f0f365 Mon Sep 17 00:00:00 2001
+From c44d5b44a0b2f9a50a266994f0642758bd080c21 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
diff --git a/CraftBukkit-Patches/0065-Optimize-DataWatcher.patch b/CraftBukkit-Patches/0066-Optimize-DataWatcher.patch
similarity index 98%
rename from CraftBukkit-Patches/0065-Optimize-DataWatcher.patch
rename to CraftBukkit-Patches/0066-Optimize-DataWatcher.patch
index 88439b1c94..2584f1c08c 100644
--- a/CraftBukkit-Patches/0065-Optimize-DataWatcher.patch
+++ b/CraftBukkit-Patches/0066-Optimize-DataWatcher.patch
@@ -1,4 +1,4 @@
-From 1ec055e01968b90c4098480749669240324766f8 Mon Sep 17 00:00:00 2001
+From fa836fb4ebe6b6827b60b56a600dd714f823dd08 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 13 Dec 2013 11:45:47 +1100
 Subject: [PATCH] Optimize DataWatcher
diff --git a/CraftBukkit-Patches/0066-Fire-PreLogin-Events-in-Offline-Mode.patch b/CraftBukkit-Patches/0067-Fire-PreLogin-Events-in-Offline-Mode.patch
similarity index 99%
rename from CraftBukkit-Patches/0066-Fire-PreLogin-Events-in-Offline-Mode.patch
rename to CraftBukkit-Patches/0067-Fire-PreLogin-Events-in-Offline-Mode.patch
index c69691ab04..2ef9371770 100644
--- a/CraftBukkit-Patches/0066-Fire-PreLogin-Events-in-Offline-Mode.patch
+++ b/CraftBukkit-Patches/0067-Fire-PreLogin-Events-in-Offline-Mode.patch
@@ -1,4 +1,4 @@
-From e144ac992708501a0283d1462490e96d4f3c0b76 Mon Sep 17 00:00:00 2001
+From 462c1a850111c2cd6cf0c1882938755fbcd0733b Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 18 Dec 2013 13:32:10 +1100
 Subject: [PATCH] Fire PreLogin Events in Offline Mode
diff --git a/CraftBukkit-Patches/0067-BungeeCord-Support.patch b/CraftBukkit-Patches/0068-BungeeCord-Support.patch
similarity index 98%
rename from CraftBukkit-Patches/0067-BungeeCord-Support.patch
rename to CraftBukkit-Patches/0068-BungeeCord-Support.patch
index 0fe10ed02b..93955e6adb 100644
--- a/CraftBukkit-Patches/0067-BungeeCord-Support.patch
+++ b/CraftBukkit-Patches/0068-BungeeCord-Support.patch
@@ -1,4 +1,4 @@
-From 356dff0aa787496546e42947c933cf0b3a316114 Mon Sep 17 00:00:00 2001
+From 326665012cc6ce86d73c955b8a61c7880b734c49 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
@@ -100,7 +100,7 @@ index 9c98a62..d2a378e 100644
  
          if (this.j.isBanned(gameprofile)) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 217d5dd..7655b65 100644
+index d7934b4..cb858a0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1299,6 +1299,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/CraftBukkit-Patches/0068-Allow-Disabling-Zombie-Villager-Aggression.patch b/CraftBukkit-Patches/0069-Allow-Disabling-Zombie-Villager-Aggression.patch
similarity index 97%
rename from CraftBukkit-Patches/0068-Allow-Disabling-Zombie-Villager-Aggression.patch
rename to CraftBukkit-Patches/0069-Allow-Disabling-Zombie-Villager-Aggression.patch
index f42f6aa6ce..7489c60c82 100644
--- a/CraftBukkit-Patches/0068-Allow-Disabling-Zombie-Villager-Aggression.patch
+++ b/CraftBukkit-Patches/0069-Allow-Disabling-Zombie-Villager-Aggression.patch
@@ -1,4 +1,4 @@
-From 9a5885281074f60ef4292ee59dcddc60cef45bba Mon Sep 17 00:00:00 2001
+From ae732d661226c243c0f0c6562f87787def4d3a39 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/0069-Configurable-Amount-of-Netty-Threads.patch b/CraftBukkit-Patches/0070-Configurable-Amount-of-Netty-Threads.patch
similarity index 93%
rename from CraftBukkit-Patches/0069-Configurable-Amount-of-Netty-Threads.patch
rename to CraftBukkit-Patches/0070-Configurable-Amount-of-Netty-Threads.patch
index b1a9d75522..78acac72fb 100644
--- a/CraftBukkit-Patches/0069-Configurable-Amount-of-Netty-Threads.patch
+++ b/CraftBukkit-Patches/0070-Configurable-Amount-of-Netty-Threads.patch
@@ -1,4 +1,4 @@
-From ad25620d462d5fe70065feced92acd4e7f8ac4d4 Mon Sep 17 00:00:00 2001
+From fa5a84e48c0ea5dd2a391bf8c47dfcf0d93d4a1d 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 883c3b5..3053053 100644
+index e78d8f3..c3011fd 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
@@ -27,9 +27,9 @@ index 883c3b5..3053053 100644
          this.o = new CommandDispatcher();
          // this.convertable = new WorldLoaderServer(file1); // CraftBukkit - moved to DedicatedServer.init
          this.T = new YggdrasilAuthenticationService(proxy, UUID.randomUUID().toString());
-@@ -1244,7 +1244,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
+@@ -1250,7 +1250,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
      }
- 
+     // Spigot End
      public ServerConnection ai() {
 -        return this.p;
 +        return ( this.p ) == null ? this.p = new ServerConnection( this ) : this.p; // Spigot
diff --git a/CraftBukkit-Patches/0070-Prevent-Mineshaft-Saving.patch b/CraftBukkit-Patches/0071-Prevent-Mineshaft-Saving.patch
similarity index 93%
rename from CraftBukkit-Patches/0070-Prevent-Mineshaft-Saving.patch
rename to CraftBukkit-Patches/0071-Prevent-Mineshaft-Saving.patch
index f6e5f48786..770cfe280f 100644
--- a/CraftBukkit-Patches/0070-Prevent-Mineshaft-Saving.patch
+++ b/CraftBukkit-Patches/0071-Prevent-Mineshaft-Saving.patch
@@ -1,4 +1,4 @@
-From f2e587d7c13c76078d412cb7c61ac9dc8e4660f1 Mon Sep 17 00:00:00 2001
+From 0f18693ff71bcfa53e5a046c0bd4617836ebc5ed Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 13 Dec 2013 15:21:02 +1100
 Subject: [PATCH] Prevent Mineshaft Saving
diff --git a/CraftBukkit-Patches/0071-Log-Cause-of-Unexpected-Exceptions.patch b/CraftBukkit-Patches/0072-Log-Cause-of-Unexpected-Exceptions.patch
similarity index 90%
rename from CraftBukkit-Patches/0071-Log-Cause-of-Unexpected-Exceptions.patch
rename to CraftBukkit-Patches/0072-Log-Cause-of-Unexpected-Exceptions.patch
index 00839517ed..19bb978ff4 100644
--- a/CraftBukkit-Patches/0071-Log-Cause-of-Unexpected-Exceptions.patch
+++ b/CraftBukkit-Patches/0072-Log-Cause-of-Unexpected-Exceptions.patch
@@ -1,11 +1,11 @@
-From 8332b116219b32b6ac8eb349934b5353cc4dac1e Mon Sep 17 00:00:00 2001
+From be9a009c45b548f6f8b7a14d0cce4da369cac035 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 3053053..95eb0c0 100644
+index c3011fd..66bea38 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
diff --git a/CraftBukkit-Patches/0072-Particle-API.patch b/CraftBukkit-Patches/0073-Particle-API.patch
similarity index 98%
rename from CraftBukkit-Patches/0072-Particle-API.patch
rename to CraftBukkit-Patches/0073-Particle-API.patch
index 2131dee337..4468887798 100644
--- a/CraftBukkit-Patches/0072-Particle-API.patch
+++ b/CraftBukkit-Patches/0073-Particle-API.patch
@@ -1,4 +1,4 @@
-From 376b021ec1cfa26a6fad36a00976ab87f4506ae8 Mon Sep 17 00:00:00 2001
+From 5c1e787e2e1b96758e403785b2cacbf5ccd05c6b Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Fri, 20 Dec 2013 21:36:06 +0000
 Subject: [PATCH] Particle API
@@ -117,7 +117,7 @@ index bfa8c23..827ec16 100644
  
      public Spigot spigot()
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7655b65..5726302 100644
+index cb858a0..5de0000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1325,6 +1325,49 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/CraftBukkit-Patches/0073-Fix-Biome-Decoration-Crashes.patch b/CraftBukkit-Patches/0074-Fix-Biome-Decoration-Crashes.patch
similarity index 98%
rename from CraftBukkit-Patches/0073-Fix-Biome-Decoration-Crashes.patch
rename to CraftBukkit-Patches/0074-Fix-Biome-Decoration-Crashes.patch
index 2772d712e4..cccab541fb 100644
--- a/CraftBukkit-Patches/0073-Fix-Biome-Decoration-Crashes.patch
+++ b/CraftBukkit-Patches/0074-Fix-Biome-Decoration-Crashes.patch
@@ -1,4 +1,4 @@
-From 588665caa81c35531fe1d8d487f883dd796c4965 Mon Sep 17 00:00:00 2001
+From d982b6075b81dd4c7416b7a26d47c4f034e67f7f Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 5 Jan 2014 09:35:01 +1100
 Subject: [PATCH] Fix Biome Decoration Crashes
diff --git a/CraftBukkit-Patches/0074-Save-ticks-lived-to-nbttag.patch b/CraftBukkit-Patches/0075-Save-ticks-lived-to-nbttag.patch
similarity index 95%
rename from CraftBukkit-Patches/0074-Save-ticks-lived-to-nbttag.patch
rename to CraftBukkit-Patches/0075-Save-ticks-lived-to-nbttag.patch
index 58e1901198..858e2ea071 100644
--- a/CraftBukkit-Patches/0074-Save-ticks-lived-to-nbttag.patch
+++ b/CraftBukkit-Patches/0075-Save-ticks-lived-to-nbttag.patch
@@ -1,4 +1,4 @@
-From 98fffaa1f249dc2b18d7f7348141961e7fa51e7d Mon Sep 17 00:00:00 2001
+From ecf02f20012ab07610255ca303377134bb36f9f3 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/0075-More-Efficient-GetCubes.patch b/CraftBukkit-Patches/0076-More-Efficient-GetCubes.patch
similarity index 97%
rename from CraftBukkit-Patches/0075-More-Efficient-GetCubes.patch
rename to CraftBukkit-Patches/0076-More-Efficient-GetCubes.patch
index 288682415d..01e98d9fca 100644
--- a/CraftBukkit-Patches/0075-More-Efficient-GetCubes.patch
+++ b/CraftBukkit-Patches/0076-More-Efficient-GetCubes.patch
@@ -1,4 +1,4 @@
-From b4e5810cb71e98485b6c6acf2792e42e15c3daf8 Mon Sep 17 00:00:00 2001
+From 806a7547a99fbb5c010fbe9fd8cb4b08c10688c1 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/CraftBukkit-Patches/0076-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch b/CraftBukkit-Patches/0077-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch
similarity index 98%
rename from CraftBukkit-Patches/0076-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch
rename to CraftBukkit-Patches/0077-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch
index a0f099ddf5..4416e7f907 100644
--- a/CraftBukkit-Patches/0076-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch
+++ b/CraftBukkit-Patches/0077-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch
@@ -1,4 +1,4 @@
-From 8c22f674aff9a23cc32cc20204ffbd3c077565df Mon Sep 17 00:00:00 2001
+From abfeaef11caa4887359f27df0a3a9dc631b99ac6 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/0077-Warn-if-PermGen-may-be-insufficient.patch b/CraftBukkit-Patches/0078-Warn-if-PermGen-may-be-insufficient.patch
similarity index 96%
rename from CraftBukkit-Patches/0077-Warn-if-PermGen-may-be-insufficient.patch
rename to CraftBukkit-Patches/0078-Warn-if-PermGen-may-be-insufficient.patch
index 9b4173018d..cb782c40ff 100644
--- a/CraftBukkit-Patches/0077-Warn-if-PermGen-may-be-insufficient.patch
+++ b/CraftBukkit-Patches/0078-Warn-if-PermGen-may-be-insufficient.patch
@@ -1,4 +1,4 @@
-From 9fade57b306688afd24a2f9cb671a1ac254618a2 Mon Sep 17 00:00:00 2001
+From ef83894b43dcbbe290db12b9f6b6e523ce67cc7e Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 23 Dec 2013 14:07:41 +1100
 Subject: [PATCH] Warn if PermGen may be insufficient
diff --git a/CraftBukkit-Patches/0078-Disable-Connected-Check-on-setScoreboard.patch b/CraftBukkit-Patches/0079-Disable-Connected-Check-on-setScoreboard.patch
similarity index 91%
rename from CraftBukkit-Patches/0078-Disable-Connected-Check-on-setScoreboard.patch
rename to CraftBukkit-Patches/0079-Disable-Connected-Check-on-setScoreboard.patch
index 289330f1a7..1acb9d053f 100644
--- a/CraftBukkit-Patches/0078-Disable-Connected-Check-on-setScoreboard.patch
+++ b/CraftBukkit-Patches/0079-Disable-Connected-Check-on-setScoreboard.patch
@@ -1,11 +1,11 @@
-From 195e2747739ba50bbb38cbb6520136631e992054 Mon Sep 17 00:00:00 2001
+From d94e594f5bce82ad3eda6d4771dee9a58e502039 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 5726302..2c129ac 100644
+index 5de0000..f8f1a90 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1225,7 +1225,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/CraftBukkit-Patches/0079-Add-Late-Bind-Option.patch b/CraftBukkit-Patches/0080-Add-Late-Bind-Option.patch
similarity index 97%
rename from CraftBukkit-Patches/0079-Add-Late-Bind-Option.patch
rename to CraftBukkit-Patches/0080-Add-Late-Bind-Option.patch
index 9eb162205b..a61fb3f750 100644
--- a/CraftBukkit-Patches/0079-Add-Late-Bind-Option.patch
+++ b/CraftBukkit-Patches/0080-Add-Late-Bind-Option.patch
@@ -1,4 +1,4 @@
-From 14989e29d31c4e7f5e58368caa64a150867e2566 Mon Sep 17 00:00:00 2001
+From 5c1b57a167f53ec9d75190e48fe075bf40abb3da Mon Sep 17 00:00:00 2001
 From: slide23 <me@slide.ws>
 Date: Fri, 20 Dec 2013 20:15:33 -0600
 Subject: [PATCH] Add Late Bind Option
diff --git a/CraftBukkit-Patches/0080-Update-Chest-Animation-when-Cancelling-Event.patch b/CraftBukkit-Patches/0081-Update-Chest-Animation-when-Cancelling-Event.patch
similarity index 98%
rename from CraftBukkit-Patches/0080-Update-Chest-Animation-when-Cancelling-Event.patch
rename to CraftBukkit-Patches/0081-Update-Chest-Animation-when-Cancelling-Event.patch
index cf19c4791a..c125243217 100644
--- a/CraftBukkit-Patches/0080-Update-Chest-Animation-when-Cancelling-Event.patch
+++ b/CraftBukkit-Patches/0081-Update-Chest-Animation-when-Cancelling-Event.patch
@@ -1,4 +1,4 @@
-From bb4a9f701952be7e06e70fa583f41c8e2dc8382e Mon Sep 17 00:00:00 2001
+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
diff --git a/CraftBukkit-Patches/0081-Update-Client-s-Hand-when-BlockPlaceEvent-Cancelled.patch b/CraftBukkit-Patches/0082-Update-Client-s-Hand-when-BlockPlaceEvent-Cancelled.patch
similarity index 96%
rename from CraftBukkit-Patches/0081-Update-Client-s-Hand-when-BlockPlaceEvent-Cancelled.patch
rename to CraftBukkit-Patches/0082-Update-Client-s-Hand-when-BlockPlaceEvent-Cancelled.patch
index 15b2a96959..25fb8ff083 100644
--- a/CraftBukkit-Patches/0081-Update-Client-s-Hand-when-BlockPlaceEvent-Cancelled.patch
+++ b/CraftBukkit-Patches/0082-Update-Client-s-Hand-when-BlockPlaceEvent-Cancelled.patch
@@ -1,4 +1,4 @@
-From 77949ed9e8839d26726aa6faab8a295cd66e88fb Mon Sep 17 00:00:00 2001
+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
diff --git a/CraftBukkit-Patches/0082-Allow-statistics-to-be-disabled-forced.patch b/CraftBukkit-Patches/0083-Allow-statistics-to-be-disabled-forced.patch
similarity index 97%
rename from CraftBukkit-Patches/0082-Allow-statistics-to-be-disabled-forced.patch
rename to CraftBukkit-Patches/0083-Allow-statistics-to-be-disabled-forced.patch
index cf9ca3e0ca..4a81c06cfb 100644
--- a/CraftBukkit-Patches/0082-Allow-statistics-to-be-disabled-forced.patch
+++ b/CraftBukkit-Patches/0083-Allow-statistics-to-be-disabled-forced.patch
@@ -1,11 +1,11 @@
-From 3ad41519d19e0a3df1fd7d7f4afc777a6308202a Mon Sep 17 00:00:00 2001
+From 1587cd387839a5a012c17ff8c6e3a2fe1d084219 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Tue, 7 Jan 2014 15:56:26 +0000
 Subject: [PATCH] Allow statistics to be disabled/forced
 
 
 diff --git a/src/main/java/net/minecraft/server/ServerStatisticManager.java b/src/main/java/net/minecraft/server/ServerStatisticManager.java
-index 0becb94..b868d08 100644
+index 819896f..897e88b 100644
 --- a/src/main/java/net/minecraft/server/ServerStatisticManager.java
 +++ b/src/main/java/net/minecraft/server/ServerStatisticManager.java
 @@ -32,6 +32,14 @@ public class ServerStatisticManager extends StatisticManager {
diff --git a/CraftBukkit-Patches/0083-Fix-anvil-collisions.patch b/CraftBukkit-Patches/0084-Fix-anvil-collisions.patch
similarity index 92%
rename from CraftBukkit-Patches/0083-Fix-anvil-collisions.patch
rename to CraftBukkit-Patches/0084-Fix-anvil-collisions.patch
index 471be92055..73f50dd529 100644
--- a/CraftBukkit-Patches/0083-Fix-anvil-collisions.patch
+++ b/CraftBukkit-Patches/0084-Fix-anvil-collisions.patch
@@ -1,4 +1,4 @@
-From c0b4750afc88f8497a430b94dba3e6a8da431b61 Mon Sep 17 00:00:00 2001
+From 3ecc0f61ac0a62c8bb88ee6035b9b2c6fb873a45 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Thu, 9 Jan 2014 14:19:12 +0000
 Subject: [PATCH] Fix anvil collisions
diff --git a/CraftBukkit-Patches/0084-Fix-ItemStack-Unbreakable-Code.patch b/CraftBukkit-Patches/0085-Fix-ItemStack-Unbreakable-Code.patch
similarity index 93%
rename from CraftBukkit-Patches/0084-Fix-ItemStack-Unbreakable-Code.patch
rename to CraftBukkit-Patches/0085-Fix-ItemStack-Unbreakable-Code.patch
index 34dceb578f..ff0e16305c 100644
--- a/CraftBukkit-Patches/0084-Fix-ItemStack-Unbreakable-Code.patch
+++ b/CraftBukkit-Patches/0085-Fix-ItemStack-Unbreakable-Code.patch
@@ -1,4 +1,4 @@
-From 9eaee04d07cfd72ceacd2f04c43878a73fda0e11 Mon Sep 17 00:00:00 2001
+From 710037cf99f0978b5349dcf1c1daf673030406ec Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 10 Jan 2014 15:15:50 +1100
 Subject: [PATCH] Fix ItemStack Unbreakable Code
diff --git a/CraftBukkit-Patches/0085-Try-and-Debug-Crash-Reports-Crashing.patch b/CraftBukkit-Patches/0086-Try-and-Debug-Crash-Reports-Crashing.patch
similarity index 95%
rename from CraftBukkit-Patches/0085-Try-and-Debug-Crash-Reports-Crashing.patch
rename to CraftBukkit-Patches/0086-Try-and-Debug-Crash-Reports-Crashing.patch
index 6c50ad2b21..31b3438309 100644
--- a/CraftBukkit-Patches/0085-Try-and-Debug-Crash-Reports-Crashing.patch
+++ b/CraftBukkit-Patches/0086-Try-and-Debug-Crash-Reports-Crashing.patch
@@ -1,11 +1,11 @@
-From 947176491e5e4aadd682085aff84a04aadc8cac4 Mon Sep 17 00:00:00 2001
+From ea8c941f26554452225f8cde07a42fe8c380db81 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 95eb0c0..ba9bddd 100644
+index 66bea38..c052ff5 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
diff --git a/CraftBukkit-Patches/0086-Replace-AutoSave-Mechanism.patch b/CraftBukkit-Patches/0087-Replace-AutoSave-Mechanism.patch
similarity index 94%
rename from CraftBukkit-Patches/0086-Replace-AutoSave-Mechanism.patch
rename to CraftBukkit-Patches/0087-Replace-AutoSave-Mechanism.patch
index c0c0b73d5e..a0683b9f34 100644
--- a/CraftBukkit-Patches/0086-Replace-AutoSave-Mechanism.patch
+++ b/CraftBukkit-Patches/0087-Replace-AutoSave-Mechanism.patch
@@ -1,4 +1,4 @@
-From fe064f684461fc2ab2ac02c4fe2e958ac50f624e Mon Sep 17 00:00:00 2001
+From d6e55aba09bb3301d68ae726859c9d2ffd4c04b0 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 ba9bddd..5e6b2e0 100644
+index c052ff5..8738e28 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
diff --git a/CraftBukkit-Patches/0087-Block-data-values-that-crash-the-client.patch b/CraftBukkit-Patches/0088-Block-data-values-that-crash-the-client.patch
similarity index 97%
rename from CraftBukkit-Patches/0087-Block-data-values-that-crash-the-client.patch
rename to CraftBukkit-Patches/0088-Block-data-values-that-crash-the-client.patch
index 510158ca7b..73c7dab982 100644
--- a/CraftBukkit-Patches/0087-Block-data-values-that-crash-the-client.patch
+++ b/CraftBukkit-Patches/0088-Block-data-values-that-crash-the-client.patch
@@ -1,4 +1,4 @@
-From 53172a9b135a389798ac03f2ca0c4a3ac7360196 Mon Sep 17 00:00:00 2001
+From b3bc94b822f4e83bd64473abb7e6bdd585e00da7 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Wed, 15 Jan 2014 21:52:47 +0000
 Subject: [PATCH] Block data values that crash the client
diff --git a/CraftBukkit-Patches/0088-Support-vanilla-s-direction-tag-on-fireballs.patch b/CraftBukkit-Patches/0089-Support-vanilla-s-direction-tag-on-fireballs.patch
similarity index 96%
rename from CraftBukkit-Patches/0088-Support-vanilla-s-direction-tag-on-fireballs.patch
rename to CraftBukkit-Patches/0089-Support-vanilla-s-direction-tag-on-fireballs.patch
index 268918b387..6db17be9cb 100644
--- a/CraftBukkit-Patches/0088-Support-vanilla-s-direction-tag-on-fireballs.patch
+++ b/CraftBukkit-Patches/0089-Support-vanilla-s-direction-tag-on-fireballs.patch
@@ -1,4 +1,4 @@
-From 997e88554d0c0405c4356b94a3983d39773e13d3 Mon Sep 17 00:00:00 2001
+From 73f6d0da1a6427fb026cf6c1247dafb441cf5ae6 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Sat, 18 Jan 2014 14:27:03 +0000
 Subject: [PATCH] Support vanilla's direction tag on fireballs
diff --git a/CraftBukkit-Patches/0089-Support-non-prefixed-URLs.patch b/CraftBukkit-Patches/0090-Support-non-prefixed-URLs.patch
similarity index 97%
rename from CraftBukkit-Patches/0089-Support-non-prefixed-URLs.patch
rename to CraftBukkit-Patches/0090-Support-non-prefixed-URLs.patch
index 0cdba986f6..d115f4d256 100644
--- a/CraftBukkit-Patches/0089-Support-non-prefixed-URLs.patch
+++ b/CraftBukkit-Patches/0090-Support-non-prefixed-URLs.patch
@@ -1,4 +1,4 @@
-From a93c00b173afaded138716b8c9984615ba4c4a39 Mon Sep 17 00:00:00 2001
+From aee9dd47382b1bdbe781004dce9da712593a0b0d 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/0090-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch b/CraftBukkit-Patches/0091-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch
similarity index 95%
rename from CraftBukkit-Patches/0090-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch
rename to CraftBukkit-Patches/0091-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch
index 18adb0b562..29fceefdf1 100644
--- a/CraftBukkit-Patches/0090-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch
+++ b/CraftBukkit-Patches/0091-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch
@@ -1,4 +1,4 @@
-From bbf9a4a1446a2b32c4f0e372ef29b50bbf5bc460 Mon Sep 17 00:00:00 2001
+From 1a8a248bbabf2f8d81d31b40d2b0301581306e34 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 20 Jan 2014 13:44:07 +1100
 Subject: [PATCH] Catch stalling on corrupted map data / NBT arrays.
diff --git a/CraftBukkit-Patches/0091-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch b/CraftBukkit-Patches/0092-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch
similarity index 96%
rename from CraftBukkit-Patches/0091-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch
rename to CraftBukkit-Patches/0092-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch
index 7c9b28f7b9..8f3af07967 100644
--- a/CraftBukkit-Patches/0091-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch
+++ b/CraftBukkit-Patches/0092-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch
@@ -1,4 +1,4 @@
-From 9606ed88d74e97e1b34a8d49f0769144b8dcde01 Mon Sep 17 00:00:00 2001
+From 09677540762053e0814db3afd0756b0cb3e9475c Mon Sep 17 00:00:00 2001
 From: Dmck2b <dmck2b+github@gmail.com>
 Date: Mon, 20 Jan 2014 20:18:23 +0000
 Subject: [PATCH] Allow toggling of ZombiePigmen spawning in portal blocks
diff --git a/CraftBukkit-Patches/0092-Don-t-let-trees-replace-any-block-when-growing.patch b/CraftBukkit-Patches/0093-Don-t-let-trees-replace-any-block-when-growing.patch
similarity index 95%
rename from CraftBukkit-Patches/0092-Don-t-let-trees-replace-any-block-when-growing.patch
rename to CraftBukkit-Patches/0093-Don-t-let-trees-replace-any-block-when-growing.patch
index b1a16b4e0b..fb8171f095 100644
--- a/CraftBukkit-Patches/0092-Don-t-let-trees-replace-any-block-when-growing.patch
+++ b/CraftBukkit-Patches/0093-Don-t-let-trees-replace-any-block-when-growing.patch
@@ -1,4 +1,4 @@
-From 2d53f0548e60d1c8e6a2ef7dac7e0595389369ad Mon Sep 17 00:00:00 2001
+From 56cb3d756f5d2f3471bc0f6a85dd49dd48d92c8b 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
diff --git a/CraftBukkit-Patches/0093-Highly-Optimized-Tick-Loop.patch b/CraftBukkit-Patches/0094-Highly-Optimized-Tick-Loop.patch
similarity index 98%
rename from CraftBukkit-Patches/0093-Highly-Optimized-Tick-Loop.patch
rename to CraftBukkit-Patches/0094-Highly-Optimized-Tick-Loop.patch
index 1f348bbde6..3282a01daf 100644
--- a/CraftBukkit-Patches/0093-Highly-Optimized-Tick-Loop.patch
+++ b/CraftBukkit-Patches/0094-Highly-Optimized-Tick-Loop.patch
@@ -1,11 +1,11 @@
-From 09196b2fdf802664cadfe37c650c636ced7ebc6c Mon Sep 17 00:00:00 2001
+From 94ecacd1a98659fa044569f98daf4f118ee305b3 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
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5e6b2e0..408b25d 100644
+index 8738e28..170e097 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -107,6 +107,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
diff --git a/CraftBukkit-Patches/0094-Add-Spigot-Links.patch b/CraftBukkit-Patches/0095-Add-Spigot-Links.patch
similarity index 98%
rename from CraftBukkit-Patches/0094-Add-Spigot-Links.patch
rename to CraftBukkit-Patches/0095-Add-Spigot-Links.patch
index 12a32d0ee6..c346936e55 100644
--- a/CraftBukkit-Patches/0094-Add-Spigot-Links.patch
+++ b/CraftBukkit-Patches/0095-Add-Spigot-Links.patch
@@ -1,4 +1,4 @@
-From 215451881602f5ccd2cbcbf8944d188f87e7b992 Mon Sep 17 00:00:00 2001
+From e04e1c93033aa2b9ec322b563ff2327f3c0a7ea0 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Thu, 23 Jan 2014 13:17:35 +1100
 Subject: [PATCH] Add Spigot Links
diff --git a/CraftBukkit-Patches/0095-Configurable-Ping-Sample-Size.patch b/CraftBukkit-Patches/0096-Configurable-Ping-Sample-Size.patch
similarity index 96%
rename from CraftBukkit-Patches/0095-Configurable-Ping-Sample-Size.patch
rename to CraftBukkit-Patches/0096-Configurable-Ping-Sample-Size.patch
index baa61a6bf9..a4437e19d1 100644
--- a/CraftBukkit-Patches/0095-Configurable-Ping-Sample-Size.patch
+++ b/CraftBukkit-Patches/0096-Configurable-Ping-Sample-Size.patch
@@ -1,4 +1,4 @@
-From 417610f025b776ab0799f17c024718fc00348733 Mon Sep 17 00:00:00 2001
+From 02573d29f934b6c387e5458c22e7b4516d663b78 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
diff --git a/CraftBukkit-Patches/0096-Add-Optional-Tick-Shuffling.patch b/CraftBukkit-Patches/0097-Add-Optional-Tick-Shuffling.patch
similarity index 96%
rename from CraftBukkit-Patches/0096-Add-Optional-Tick-Shuffling.patch
rename to CraftBukkit-Patches/0097-Add-Optional-Tick-Shuffling.patch
index 36de99e49d..397028ef57 100644
--- a/CraftBukkit-Patches/0096-Add-Optional-Tick-Shuffling.patch
+++ b/CraftBukkit-Patches/0097-Add-Optional-Tick-Shuffling.patch
@@ -1,4 +1,4 @@
-From 6bc14531206238310ba1247f61fcba97643dd161 Mon Sep 17 00:00:00 2001
+From d13124e48d19ef9f4eed821d1d962832032469bc 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
diff --git a/CraftBukkit-Patches/0097-Allow-Configuring-Chunks-per-Packet.patch b/CraftBukkit-Patches/0098-Allow-Configuring-Chunks-per-Packet.patch
similarity index 96%
rename from CraftBukkit-Patches/0097-Allow-Configuring-Chunks-per-Packet.patch
rename to CraftBukkit-Patches/0098-Allow-Configuring-Chunks-per-Packet.patch
index fa3d018993..00b4c3138f 100644
--- a/CraftBukkit-Patches/0097-Allow-Configuring-Chunks-per-Packet.patch
+++ b/CraftBukkit-Patches/0098-Allow-Configuring-Chunks-per-Packet.patch
@@ -1,4 +1,4 @@
-From b23a8af39fa45b1174fa93bd92a1bf61250e4023 Mon Sep 17 00:00:00 2001
+From ae57253e0e1dfb4f4ea19fa8b85445993c5f2713 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 28 Jan 2014 20:35:35 +1100
 Subject: [PATCH] Allow Configuring Chunks per Packet
diff --git a/CraftBukkit-Patches/0098-Implement-Locale-Getter-for-Players.patch b/CraftBukkit-Patches/0099-Implement-Locale-Getter-for-Players.patch
similarity index 94%
rename from CraftBukkit-Patches/0098-Implement-Locale-Getter-for-Players.patch
rename to CraftBukkit-Patches/0099-Implement-Locale-Getter-for-Players.patch
index 84897a0b41..62a322abda 100644
--- a/CraftBukkit-Patches/0098-Implement-Locale-Getter-for-Players.patch
+++ b/CraftBukkit-Patches/0099-Implement-Locale-Getter-for-Players.patch
@@ -1,4 +1,4 @@
-From 5821acb4eb7b20891c07ae0cb701e2860dd6c696 Mon Sep 17 00:00:00 2001
+From 5d9faa7e8f6340570872bfa54125c3c8d8efab3b Mon Sep 17 00:00:00 2001
 From: Smove <jan@lavasurvival.net>
 Date: Sat, 1 Feb 2014 18:12:16 +1100
 Subject: [PATCH] Implement Locale Getter for Players
@@ -18,7 +18,7 @@ index 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 2c129ac..6f008db 100644
+index f8f1a90..354cc07 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1368,6 +1368,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/CraftBukkit-Patches/0099-Cap-Entity-Collisions.patch b/CraftBukkit-Patches/0100-Cap-Entity-Collisions.patch
similarity index 96%
rename from CraftBukkit-Patches/0099-Cap-Entity-Collisions.patch
rename to CraftBukkit-Patches/0100-Cap-Entity-Collisions.patch
index ed29452a1a..ea81fe7ef2 100644
--- a/CraftBukkit-Patches/0099-Cap-Entity-Collisions.patch
+++ b/CraftBukkit-Patches/0100-Cap-Entity-Collisions.patch
@@ -1,4 +1,4 @@
-From 529916ed53368b405e0fec69b993dba3d4562c15 Mon Sep 17 00:00:00 2001
+From 9fa021fc53595329dbb06c9bf2430846146bfbad 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
@@ -19,7 +19,7 @@ index 0ec07c2..c049cd8 100644
          if (entity.passenger != this && entity.vehicle != this) {
              double d0 = entity.locX - this.locX;
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 90c0e82..33533c7 100644
+index 4c3fd8a..f531103 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1491,7 +1491,9 @@ public abstract class EntityLiving extends Entity {
diff --git a/CraftBukkit-Patches/0100-Fix-dispensing-bone-meal-not-having-the-correct-data.patch b/CraftBukkit-Patches/0101-Fix-dispensing-bone-meal-not-having-the-correct-data.patch
similarity index 94%
rename from CraftBukkit-Patches/0100-Fix-dispensing-bone-meal-not-having-the-correct-data.patch
rename to CraftBukkit-Patches/0101-Fix-dispensing-bone-meal-not-having-the-correct-data.patch
index c4ba4587da..f3d303c9f1 100644
--- a/CraftBukkit-Patches/0100-Fix-dispensing-bone-meal-not-having-the-correct-data.patch
+++ b/CraftBukkit-Patches/0101-Fix-dispensing-bone-meal-not-having-the-correct-data.patch
@@ -1,4 +1,4 @@
-From 1e0c6cd80d0e92f6af9ce7d23b3f89f34e0f49d4 Mon Sep 17 00:00:00 2001
+From 15fff496d47b970896b595a8987c71c36a43ea16 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Thu, 6 Feb 2014 21:59:20 +0000
 Subject: [PATCH] Fix dispensing bone meal not having the correct data value
diff --git a/CraftBukkit-Patches/0101-Spam-Filter-Exclusions.patch b/CraftBukkit-Patches/0102-Spam-Filter-Exclusions.patch
similarity index 97%
rename from CraftBukkit-Patches/0101-Spam-Filter-Exclusions.patch
rename to CraftBukkit-Patches/0102-Spam-Filter-Exclusions.patch
index dc977e63a0..f6cda3b02f 100644
--- a/CraftBukkit-Patches/0101-Spam-Filter-Exclusions.patch
+++ b/CraftBukkit-Patches/0102-Spam-Filter-Exclusions.patch
@@ -1,4 +1,4 @@
-From 8416d3c33ad72d602ce5a61b4b8a704bb2290ab6 Mon Sep 17 00:00:00 2001
+From 2b8500f85b705a5cb5699970cc4a42d4f6fefe88 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/CraftBukkit-Patches/0102-Add-Option-to-Silence-CommandBlock-Console.patch b/CraftBukkit-Patches/0103-Add-Option-to-Silence-CommandBlock-Console.patch
similarity index 95%
rename from CraftBukkit-Patches/0102-Add-Option-to-Silence-CommandBlock-Console.patch
rename to CraftBukkit-Patches/0103-Add-Option-to-Silence-CommandBlock-Console.patch
index 341884e3d5..d47ce19ffc 100644
--- a/CraftBukkit-Patches/0102-Add-Option-to-Silence-CommandBlock-Console.patch
+++ b/CraftBukkit-Patches/0103-Add-Option-to-Silence-CommandBlock-Console.patch
@@ -1,4 +1,4 @@
-From b6dc5546cc63f84dd179b632c18b1df795530175 Mon Sep 17 00:00:00 2001
+From b221c8c5c0203cbe6da2d8726e4646fe97a70735 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
diff --git a/CraftBukkit-Patches/0103-Add-support-for-fetching-hidden-players.patch b/CraftBukkit-Patches/0104-Add-support-for-fetching-hidden-players.patch
similarity index 91%
rename from CraftBukkit-Patches/0103-Add-support-for-fetching-hidden-players.patch
rename to CraftBukkit-Patches/0104-Add-support-for-fetching-hidden-players.patch
index 0e703611a8..ff10145650 100644
--- a/CraftBukkit-Patches/0103-Add-support-for-fetching-hidden-players.patch
+++ b/CraftBukkit-Patches/0104-Add-support-for-fetching-hidden-players.patch
@@ -1,11 +1,11 @@
-From dcac97e8a999b9ff4bda55a612a260cc9527ea4f Mon Sep 17 00:00:00 2001
+From bb55a92d7f8888f22160c9cf382b1225856629b6 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 6f008db..779c996 100644
+index 354cc07..bdb74b0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1374,6 +1374,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/CraftBukkit-Patches/0104-Allow-Disabling-Creative-Item-Filter.patch b/CraftBukkit-Patches/0105-Allow-Disabling-Creative-Item-Filter.patch
similarity index 96%
rename from CraftBukkit-Patches/0104-Allow-Disabling-Creative-Item-Filter.patch
rename to CraftBukkit-Patches/0105-Allow-Disabling-Creative-Item-Filter.patch
index e3df0b2fc4..0719136e74 100644
--- a/CraftBukkit-Patches/0104-Allow-Disabling-Creative-Item-Filter.patch
+++ b/CraftBukkit-Patches/0105-Allow-Disabling-Creative-Item-Filter.patch
@@ -1,4 +1,4 @@
-From 6c4be5d3b8bb4ef259f6603f266d95494cc5c48d Mon Sep 17 00:00:00 2001
+From 33cbf11d3399b41fda5ec523ec67c9a435941193 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/CraftBukkit-Patches/0105-Cap-Channel-Registrations.patch b/CraftBukkit-Patches/0106-Cap-Channel-Registrations.patch
similarity index 89%
rename from CraftBukkit-Patches/0105-Cap-Channel-Registrations.patch
rename to CraftBukkit-Patches/0106-Cap-Channel-Registrations.patch
index 621ee2122d..96819f5391 100644
--- a/CraftBukkit-Patches/0105-Cap-Channel-Registrations.patch
+++ b/CraftBukkit-Patches/0106-Cap-Channel-Registrations.patch
@@ -1,11 +1,11 @@
-From 3f57d662050d82f855ea788f52df1d5bf8b004fd Mon Sep 17 00:00:00 2001
+From 46f98a9520a93c7bfe941dbb8cb75923eb6901da 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 302305d..8af4bf7 100644
+index bdb74b0..b42b338 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1056,6 +1056,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/CraftBukkit-Patches/0106-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch b/CraftBukkit-Patches/0107-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch
similarity index 99%
rename from CraftBukkit-Patches/0106-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch
rename to CraftBukkit-Patches/0107-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch
index 06e1af4b04..22b22b31ae 100644
--- a/CraftBukkit-Patches/0106-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch
+++ b/CraftBukkit-Patches/0107-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch
@@ -1,11 +1,11 @@
-From bc0b98f5a44d114aeeb8fc0b9433685c822ad781 Mon Sep 17 00:00:00 2001
+From 2cd0c48d4162d19b4eb6ff9e4c91bc13c89aa172 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 674acb9..2645c97 100644
+index 6e9f95e..4920956 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -116,6 +116,7 @@ import org.bukkit.command.CommandSender;
diff --git a/CraftBukkit-Patches/0107-Unfinalize-the-isDisconnected-method-by-bukkit.patch b/CraftBukkit-Patches/0108-Unfinalize-the-isDisconnected-method-by-bukkit.patch
similarity index 93%
rename from CraftBukkit-Patches/0107-Unfinalize-the-isDisconnected-method-by-bukkit.patch
rename to CraftBukkit-Patches/0108-Unfinalize-the-isDisconnected-method-by-bukkit.patch
index b909ee775d..87bf948760 100644
--- a/CraftBukkit-Patches/0107-Unfinalize-the-isDisconnected-method-by-bukkit.patch
+++ b/CraftBukkit-Patches/0108-Unfinalize-the-isDisconnected-method-by-bukkit.patch
@@ -1,4 +1,4 @@
-From 63647a3814e0a78e75fa6585c00f746f0f233726 Mon Sep 17 00:00:00 2001
+From 42950edb14c3917227b26375a85a3df7bc971f2b 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.
diff --git a/CraftBukkit-Patches/0108-Implement-Silenceable-Lightning-API.patch b/CraftBukkit-Patches/0109-Implement-Silenceable-Lightning-API.patch
similarity index 98%
rename from CraftBukkit-Patches/0108-Implement-Silenceable-Lightning-API.patch
rename to CraftBukkit-Patches/0109-Implement-Silenceable-Lightning-API.patch
index ebd0073fda..04b8c04bf5 100644
--- a/CraftBukkit-Patches/0108-Implement-Silenceable-Lightning-API.patch
+++ b/CraftBukkit-Patches/0109-Implement-Silenceable-Lightning-API.patch
@@ -1,4 +1,4 @@
-From 6903d591ba6c4dd342d6282c71f36502b22381d7 Mon Sep 17 00:00:00 2001
+From 1a0029c6cbdf522e8b1cdd6d7d834b0360ae0c73 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/0109-Normalize-spaces-on-when-reading-a-chat-packet.patch b/CraftBukkit-Patches/0110-Normalize-spaces-on-when-reading-a-chat-packet.patch
similarity index 96%
rename from CraftBukkit-Patches/0109-Normalize-spaces-on-when-reading-a-chat-packet.patch
rename to CraftBukkit-Patches/0110-Normalize-spaces-on-when-reading-a-chat-packet.patch
index bf1b80a98b..2238f57725 100644
--- a/CraftBukkit-Patches/0109-Normalize-spaces-on-when-reading-a-chat-packet.patch
+++ b/CraftBukkit-Patches/0110-Normalize-spaces-on-when-reading-a-chat-packet.patch
@@ -1,4 +1,4 @@
-From ed1c8f0c588306e8594a62d8e45d4ee97fdeef8a Mon Sep 17 00:00:00 2001
+From 53d2f0be06d32769dbbada0544ed843a3d77554f 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
diff --git a/CraftBukkit-Patches/0110-Use-one-PermissibleBase-for-all-Command-Blocks.patch b/CraftBukkit-Patches/0111-Use-one-PermissibleBase-for-all-Command-Blocks.patch
similarity index 94%
rename from CraftBukkit-Patches/0110-Use-one-PermissibleBase-for-all-Command-Blocks.patch
rename to CraftBukkit-Patches/0111-Use-one-PermissibleBase-for-all-Command-Blocks.patch
index 81d60f5a3f..d5ca8df7b4 100644
--- a/CraftBukkit-Patches/0110-Use-one-PermissibleBase-for-all-Command-Blocks.patch
+++ b/CraftBukkit-Patches/0111-Use-one-PermissibleBase-for-all-Command-Blocks.patch
@@ -1,4 +1,4 @@
-From 765ffd4a4782b61b8801ad2d288b415970d74967 Mon Sep 17 00:00:00 2001
+From addfaa130016f12bbb2780b77b9a19b4ed184da4 Mon Sep 17 00:00:00 2001
 From: FrozenBrain <carstenbamsti@googlemail.com>
 Date: Sun, 2 Mar 2014 21:13:46 +0100
 Subject: [PATCH] Use one PermissibleBase for all Command Blocks
diff --git a/CraftBukkit-Patches/0111-Prevent-hoppers-from-loading-chunks.patch b/CraftBukkit-Patches/0112-Prevent-hoppers-from-loading-chunks.patch
similarity index 93%
rename from CraftBukkit-Patches/0111-Prevent-hoppers-from-loading-chunks.patch
rename to CraftBukkit-Patches/0112-Prevent-hoppers-from-loading-chunks.patch
index 4cee6ccd2e..4696470320 100644
--- a/CraftBukkit-Patches/0111-Prevent-hoppers-from-loading-chunks.patch
+++ b/CraftBukkit-Patches/0112-Prevent-hoppers-from-loading-chunks.patch
@@ -1,4 +1,4 @@
-From ec9f4a5c28d7e08088a481f5069e524ea203d8c6 Mon Sep 17 00:00:00 2001
+From 36bedcc518070cca6f0de1a718039048c0baf2f9 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Wed, 5 Mar 2014 20:27:27 +0000
 Subject: [PATCH] Prevent hoppers from loading chunks
diff --git a/CraftBukkit-Patches/0112-Guard-Entity-List.patch b/CraftBukkit-Patches/0113-Guard-Entity-List.patch
similarity index 97%
rename from CraftBukkit-Patches/0112-Guard-Entity-List.patch
rename to CraftBukkit-Patches/0113-Guard-Entity-List.patch
index 9e95675afc..a5b120b5ae 100644
--- a/CraftBukkit-Patches/0112-Guard-Entity-List.patch
+++ b/CraftBukkit-Patches/0113-Guard-Entity-List.patch
@@ -1,4 +1,4 @@
-From e3dcf59a6e012570fea6a7da4aec993c9057a9e2 Mon Sep 17 00:00:00 2001
+From 82f7a64c978d48d780878bae773961e8eeb683b3 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/CraftBukkit-Patches/0113-Fix-ConcurrentModificationException-while-being-idle.patch b/CraftBukkit-Patches/0114-Fix-ConcurrentModificationException-while-being-idle.patch
similarity index 96%
rename from CraftBukkit-Patches/0113-Fix-ConcurrentModificationException-while-being-idle.patch
rename to CraftBukkit-Patches/0114-Fix-ConcurrentModificationException-while-being-idle.patch
index 162cb6a402..eef29642b6 100644
--- a/CraftBukkit-Patches/0113-Fix-ConcurrentModificationException-while-being-idle.patch
+++ b/CraftBukkit-Patches/0114-Fix-ConcurrentModificationException-while-being-idle.patch
@@ -1,4 +1,4 @@
-From ae5a874349a9d986d3b30b395ca025ecf90769bf Mon Sep 17 00:00:00 2001
+From 9e9c492c30d861cf4c22021be30689c5588f549c 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
diff --git a/CraftBukkit-Patches/0114-Cancellable-WitherSkull-potion-effect.patch b/CraftBukkit-Patches/0115-Cancellable-WitherSkull-potion-effect.patch
similarity index 96%
rename from CraftBukkit-Patches/0114-Cancellable-WitherSkull-potion-effect.patch
rename to CraftBukkit-Patches/0115-Cancellable-WitherSkull-potion-effect.patch
index ee20fa233b..87630eaa0c 100644
--- a/CraftBukkit-Patches/0114-Cancellable-WitherSkull-potion-effect.patch
+++ b/CraftBukkit-Patches/0115-Cancellable-WitherSkull-potion-effect.patch
@@ -1,4 +1,4 @@
-From 54692bd0ef4f1e11cb9ad5ac2aa62f82de65c297 Mon Sep 17 00:00:00 2001
+From 8a131926292404349a1f211d04cd160864b6f507 Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Tue, 25 Feb 2014 15:15:26 -0400
 Subject: [PATCH] Cancellable WitherSkull potion effect
diff --git a/CraftBukkit-Patches/0115-Descriptive-kick-reasons-instead-of-Nope.patch b/CraftBukkit-Patches/0116-Descriptive-kick-reasons-instead-of-Nope.patch
similarity index 97%
rename from CraftBukkit-Patches/0115-Descriptive-kick-reasons-instead-of-Nope.patch
rename to CraftBukkit-Patches/0116-Descriptive-kick-reasons-instead-of-Nope.patch
index 895ce78d21..57fc91558d 100644
--- a/CraftBukkit-Patches/0115-Descriptive-kick-reasons-instead-of-Nope.patch
+++ b/CraftBukkit-Patches/0116-Descriptive-kick-reasons-instead-of-Nope.patch
@@ -1,4 +1,4 @@
-From 8891be3ff887e394147125e5b2bf40be1f2dc822 Mon Sep 17 00:00:00 2001
+From 8f15821f59865e394ecd6e3c03c8df483918bf68 Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Sat, 15 Mar 2014 01:30:05 -0400
 Subject: [PATCH] Descriptive kick reasons instead of Nope!
diff --git a/CraftBukkit-Patches/0116-Allow-enchanting-tables-to-enchant-any-item.patch b/CraftBukkit-Patches/0117-Allow-enchanting-tables-to-enchant-any-item.patch
similarity index 96%
rename from CraftBukkit-Patches/0116-Allow-enchanting-tables-to-enchant-any-item.patch
rename to CraftBukkit-Patches/0117-Allow-enchanting-tables-to-enchant-any-item.patch
index 534ff546fa..05716a3ae7 100644
--- a/CraftBukkit-Patches/0116-Allow-enchanting-tables-to-enchant-any-item.patch
+++ b/CraftBukkit-Patches/0117-Allow-enchanting-tables-to-enchant-any-item.patch
@@ -1,4 +1,4 @@
-From aba6ecaf644f983f543b6b3fd8a44de320b91cc4 Mon Sep 17 00:00:00 2001
+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/CraftBukkit-Patches/0117-Remove-the-lastChunkAccessed-if-it-is-unloaded.patch b/CraftBukkit-Patches/0118-Remove-the-lastChunkAccessed-if-it-is-unloaded.patch
similarity index 98%
rename from CraftBukkit-Patches/0117-Remove-the-lastChunkAccessed-if-it-is-unloaded.patch
rename to CraftBukkit-Patches/0118-Remove-the-lastChunkAccessed-if-it-is-unloaded.patch
index a210f404af..91dde4b74f 100644
--- a/CraftBukkit-Patches/0117-Remove-the-lastChunkAccessed-if-it-is-unloaded.patch
+++ b/CraftBukkit-Patches/0118-Remove-the-lastChunkAccessed-if-it-is-unloaded.patch
@@ -1,4 +1,4 @@
-From 4904ff3b4497220cbeb724b3e1e49081e5ce2dfa Mon Sep 17 00:00:00 2001
+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.
diff --git a/CraftBukkit-Patches/0118-Check-for-manually-prefixed-commands-or-commands-tha.patch b/CraftBukkit-Patches/0119-Check-for-manually-prefixed-commands-or-commands-tha.patch
similarity index 95%
rename from CraftBukkit-Patches/0118-Check-for-manually-prefixed-commands-or-commands-tha.patch
rename to CraftBukkit-Patches/0119-Check-for-manually-prefixed-commands-or-commands-tha.patch
index 5591e09fd4..7e58180c17 100644
--- a/CraftBukkit-Patches/0118-Check-for-manually-prefixed-commands-or-commands-tha.patch
+++ b/CraftBukkit-Patches/0119-Check-for-manually-prefixed-commands-or-commands-tha.patch
@@ -1,4 +1,4 @@
-From 107d62ed8ad22520af5040e1f24166106e3f9909 Mon Sep 17 00:00:00 2001
+From 4247f5bf0c95cd9adfd5b7b4a3814091c725050d Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Sun, 23 Mar 2014 01:12:10 +0000
 Subject: [PATCH] Check for manually prefixed commands or commands that don't
diff --git a/CraftBukkit-Patches/0119-Cap-window-names-to-prevent-client-disconnects.patch b/CraftBukkit-Patches/0120-Cap-window-names-to-prevent-client-disconnects.patch
similarity index 93%
rename from CraftBukkit-Patches/0119-Cap-window-names-to-prevent-client-disconnects.patch
rename to CraftBukkit-Patches/0120-Cap-window-names-to-prevent-client-disconnects.patch
index 7f91eb272a..301c7ba01c 100644
--- a/CraftBukkit-Patches/0119-Cap-window-names-to-prevent-client-disconnects.patch
+++ b/CraftBukkit-Patches/0120-Cap-window-names-to-prevent-client-disconnects.patch
@@ -1,4 +1,4 @@
-From 66560851845f64cfb0491c3430a8ed07b095276e Mon Sep 17 00:00:00 2001
+From c49d7ce1986a04ccbabde9f093eae36ba5845742 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Sun, 23 Mar 2014 10:53:48 +0000
 Subject: [PATCH] Cap window names to prevent client disconnects
diff --git a/CraftBukkit-Patches/0120-Enable-Improved-Ping-Sending.patch b/CraftBukkit-Patches/0121-Enable-Improved-Ping-Sending.patch
similarity index 97%
rename from CraftBukkit-Patches/0120-Enable-Improved-Ping-Sending.patch
rename to CraftBukkit-Patches/0121-Enable-Improved-Ping-Sending.patch
index 82b45f64a8..cb948ff308 100644
--- a/CraftBukkit-Patches/0120-Enable-Improved-Ping-Sending.patch
+++ b/CraftBukkit-Patches/0121-Enable-Improved-Ping-Sending.patch
@@ -1,4 +1,4 @@
-From c33df504e1123d58fe8238e9dd238b00643baa79 Mon Sep 17 00:00:00 2001
+From 3af39a545256010c77a43b92a78a6ffe89291f67 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 24 Feb 2013 20:45:20 +1100
 Subject: [PATCH] Enable Improved Ping Sending
diff --git a/CraftBukkit-Patches/0121-Configurable-dragon-death-and-wither-spawn-sounds.patch b/CraftBukkit-Patches/0122-Configurable-dragon-death-and-wither-spawn-sounds.patch
similarity index 98%
rename from CraftBukkit-Patches/0121-Configurable-dragon-death-and-wither-spawn-sounds.patch
rename to CraftBukkit-Patches/0122-Configurable-dragon-death-and-wither-spawn-sounds.patch
index 5151bbebd9..0faa3b758c 100644
--- a/CraftBukkit-Patches/0121-Configurable-dragon-death-and-wither-spawn-sounds.patch
+++ b/CraftBukkit-Patches/0122-Configurable-dragon-death-and-wither-spawn-sounds.patch
@@ -1,4 +1,4 @@
-From 190ffd644a3fb1104d30b7697bde6cf28bb3e4bc Mon Sep 17 00:00:00 2001
+From 7326c2d7d2432a8898a42b86406a383934023512 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/0122-Fix-TileEntities-getting-ticked-after-being-queued-f.patch b/CraftBukkit-Patches/0123-Fix-TileEntities-getting-ticked-after-being-queued-f.patch
similarity index 95%
rename from CraftBukkit-Patches/0122-Fix-TileEntities-getting-ticked-after-being-queued-f.patch
rename to CraftBukkit-Patches/0123-Fix-TileEntities-getting-ticked-after-being-queued-f.patch
index d68fdf7885..d47db9ca9e 100644
--- a/CraftBukkit-Patches/0122-Fix-TileEntities-getting-ticked-after-being-queued-f.patch
+++ b/CraftBukkit-Patches/0123-Fix-TileEntities-getting-ticked-after-being-queued-f.patch
@@ -1,4 +1,4 @@
-From ce57b30bd5c30b3b97a3a4ca15f659155d3e4467 Mon Sep 17 00:00:00 2001
+From ace02f9bfa21be458e0bc3da7c77d36ae2bf8fa9 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
diff --git a/CraftBukkit-Patches/0123-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch b/CraftBukkit-Patches/0124-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch
similarity index 89%
rename from CraftBukkit-Patches/0123-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch
rename to CraftBukkit-Patches/0124-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch
index aa22b05969..9f5772632e 100644
--- a/CraftBukkit-Patches/0123-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch
+++ b/CraftBukkit-Patches/0124-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch
@@ -1,4 +1,4 @@
-From 73cec768b7e20989ac126fe26abdfc8a760d704a Mon Sep 17 00:00:00 2001
+From 4557313024c56ec5553d35f9d91047b0eb42969a 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 408b25d..43e0ab2 100644
+index 170e097..3233353 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
diff --git a/CraftBukkit-Patches/0124-Old-New-Version-Support.patch b/CraftBukkit-Patches/0125-Old-New-Version-Support.patch
similarity index 99%
rename from CraftBukkit-Patches/0124-Old-New-Version-Support.patch
rename to CraftBukkit-Patches/0125-Old-New-Version-Support.patch
index b84958bca6..79dc68bb00 100644
--- a/CraftBukkit-Patches/0124-Old-New-Version-Support.patch
+++ b/CraftBukkit-Patches/0125-Old-New-Version-Support.patch
@@ -1,4 +1,4 @@
-From 01dd91c59517cae31f9e755b93e87ac8893dfa6d Mon Sep 17 00:00:00 2001
+From 1b286e686b378ca461c3a8dbdb2af6aeeabdda96 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 12 Apr 2014 15:11:15 +1000
 Subject: [PATCH] Old / New Version Support.
diff --git a/CraftBukkit-Patches/0125-Address-Serious-Issues-with-Offline-Players.patch b/CraftBukkit-Patches/0126-Address-Serious-Issues-with-Offline-Players.patch
similarity index 94%
rename from CraftBukkit-Patches/0125-Address-Serious-Issues-with-Offline-Players.patch
rename to CraftBukkit-Patches/0126-Address-Serious-Issues-with-Offline-Players.patch
index f0a259cd34..973ef73b7f 100644
--- a/CraftBukkit-Patches/0125-Address-Serious-Issues-with-Offline-Players.patch
+++ b/CraftBukkit-Patches/0126-Address-Serious-Issues-with-Offline-Players.patch
@@ -1,4 +1,4 @@
-From 5662e336a6db545f6d610d85c3940d64e8385c70 Mon Sep 17 00:00:00 2001
+From 39524f0f91c9945265786856e1f6935a110cd601 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 12 Apr 2014 17:17:10 +1000
 Subject: [PATCH] Address Serious Issues with Offline Players
@@ -6,7 +6,7 @@ Subject: [PATCH] Address Serious Issues with Offline Players
 Such as name being entirely unresolved! This fixes the whitelist command and no doubt lots more.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-index d92f503..5cae703 100644
+index bd98822..7af54cf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 @@ -48,6 +48,12 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
diff --git a/CraftBukkit-Patches/0126-Treat-Bungee-as-Online-Mode.patch b/CraftBukkit-Patches/0127-Treat-Bungee-as-Online-Mode.patch
similarity index 93%
rename from CraftBukkit-Patches/0126-Treat-Bungee-as-Online-Mode.patch
rename to CraftBukkit-Patches/0127-Treat-Bungee-as-Online-Mode.patch
index f5c194fd90..1b777220f3 100644
--- a/CraftBukkit-Patches/0126-Treat-Bungee-as-Online-Mode.patch
+++ b/CraftBukkit-Patches/0127-Treat-Bungee-as-Online-Mode.patch
@@ -1,4 +1,4 @@
-From 12167a214f8e756d9e83dd41c202761501ca12b5 Mon Sep 17 00:00:00 2001
+From 228199fe9665874aa57419b93cbf01db68f9f1f5 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
@@ -18,5 +18,5 @@ index 01dedf2..035e6cb 100644
          } else {
              String[] astring1 = astring;
 -- 
-1.8.5.2.msysgit.0
+1.8.3.2
 
diff --git a/CraftBukkit-Patches/0127-Fix-several-occurances-of-missed-diff.patch b/CraftBukkit-Patches/0128-Fix-several-occurances-of-missed-diff.patch
similarity index 99%
rename from CraftBukkit-Patches/0127-Fix-several-occurances-of-missed-diff.patch
rename to CraftBukkit-Patches/0128-Fix-several-occurances-of-missed-diff.patch
index b78f3b7203..0b5603cd1b 100644
--- a/CraftBukkit-Patches/0127-Fix-several-occurances-of-missed-diff.patch
+++ b/CraftBukkit-Patches/0128-Fix-several-occurances-of-missed-diff.patch
@@ -1,4 +1,4 @@
-From c4143e31c1f7e1fe0a340af202798cff085300ff Mon Sep 17 00:00:00 2001
+From bec4bddd3c55a063703dd088e4d31f2f1285e9f8 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.
diff --git a/CraftBukkit-Patches/0128-Fix-PlayerFishEvent-not-properly-cancelling.-Fixes-B.patch b/CraftBukkit-Patches/0129-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/0129-Fix-PlayerFishEvent-not-properly-cancelling.-Fixes-B.patch
index 117674d00c..222c63f3dc 100644
--- a/CraftBukkit-Patches/0128-Fix-PlayerFishEvent-not-properly-cancelling.-Fixes-B.patch
+++ b/CraftBukkit-Patches/0129-Fix-PlayerFishEvent-not-properly-cancelling.-Fixes-B.patch
@@ -1,4 +1,4 @@
-From 3d66957961c0ecf777c07789120526eb77f50a42 Mon Sep 17 00:00:00 2001
+From 0898259a3967f6df388bbb7bf00b304b9275bdf9 Mon Sep 17 00:00:00 2001
 From: myiume <cursed_kidd@yahoo.com>
 Date: Wed, 19 Feb 2014 15:40:37 +0200
 Subject: [PATCH] Fix PlayerFishEvent not properly cancelling. Fixes
diff --git a/CraftBukkit-Patches/0129-Update-Warning.patch b/CraftBukkit-Patches/0130-Update-Warning.patch
similarity index 97%
rename from CraftBukkit-Patches/0129-Update-Warning.patch
rename to CraftBukkit-Patches/0130-Update-Warning.patch
index 751d19e87f..fb4dcffd0a 100644
--- a/CraftBukkit-Patches/0129-Update-Warning.patch
+++ b/CraftBukkit-Patches/0130-Update-Warning.patch
@@ -1,4 +1,4 @@
-From 8e9683aa649d7c7a0e153b36e60b014defd14812 Mon Sep 17 00:00:00 2001
+From 670661e21808edafcf1087d018f14bb8f051f3ef Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 12 Apr 2014 21:37:12 +1000
 Subject: [PATCH] Update Warning
diff --git a/CraftBukkit-Patches/0130-Add-Conversion-Message.patch b/CraftBukkit-Patches/0131-Add-Conversion-Message.patch
similarity index 92%
rename from CraftBukkit-Patches/0130-Add-Conversion-Message.patch
rename to CraftBukkit-Patches/0131-Add-Conversion-Message.patch
index 2279b591ac..43134c60ea 100644
--- a/CraftBukkit-Patches/0130-Add-Conversion-Message.patch
+++ b/CraftBukkit-Patches/0131-Add-Conversion-Message.patch
@@ -1,4 +1,4 @@
-From 790f35890a93bdcc29adb7e0236fb0b83a27b65a Mon Sep 17 00:00:00 2001
+From 930afb9aea43096aee680e9dab2c9eb574d82bb5 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 12 Apr 2014 23:30:44 +1000
 Subject: [PATCH] Add Conversion Message
diff --git a/CraftBukkit-Patches/0131-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch b/CraftBukkit-Patches/0132-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/0132-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch
index 1828a06d10..682d1b0440 100644
--- a/CraftBukkit-Patches/0131-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch
+++ b/CraftBukkit-Patches/0132-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch
@@ -1,4 +1,4 @@
-From 8c41285822798269576483bffed909f913dda5a6 Mon Sep 17 00:00:00 2001
+From 4ab067a30f5e6830ee19ed239cdecd5c875907bb Mon Sep 17 00:00:00 2001
 From: "gjmcferrin@gmail.com" <gjmcferrin@gmail.com>
 Date: Mon, 10 Feb 2014 10:05:11 -0500
 Subject: [PATCH] Properly cancel fishing event. Fixes BUKKIT-5396
diff --git a/CraftBukkit-Patches/0132-Print-Stack-on-InternalException.patch b/CraftBukkit-Patches/0133-Print-Stack-on-InternalException.patch
similarity index 93%
rename from CraftBukkit-Patches/0132-Print-Stack-on-InternalException.patch
rename to CraftBukkit-Patches/0133-Print-Stack-on-InternalException.patch
index 7f36c959a4..58bd095ee6 100644
--- a/CraftBukkit-Patches/0132-Print-Stack-on-InternalException.patch
+++ b/CraftBukkit-Patches/0133-Print-Stack-on-InternalException.patch
@@ -1,4 +1,4 @@
-From 9f04ea45a7c95c062178209c3c3515c7b6194e64 Mon Sep 17 00:00:00 2001
+From a1f6b5f98344b9a8c16ccd4bf63a363621efa362 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 13 Apr 2014 09:00:59 +1000
 Subject: [PATCH] Print Stack on InternalException
diff --git a/CraftBukkit-Patches/0133-Use-Offline-Player-Data-Once-if-Required.patch b/CraftBukkit-Patches/0134-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/0134-Use-Offline-Player-Data-Once-if-Required.patch
index d0a44e4f34..d3079d3431 100644
--- a/CraftBukkit-Patches/0133-Use-Offline-Player-Data-Once-if-Required.patch
+++ b/CraftBukkit-Patches/0134-Use-Offline-Player-Data-Once-if-Required.patch
@@ -1,4 +1,4 @@
-From 86afedb3bfc6d335774c04ee426ddaf94b3121ef Mon Sep 17 00:00:00 2001
+From e34c2596ef1fe7a757e670196b95dc3daf4ab28b Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 13 Apr 2014 14:41:23 +1000
 Subject: [PATCH] Use Offline Player Data Once if Required.
diff --git a/CraftBukkit-Patches/0134-Use-Correct-firstPlayed-Value.patch b/CraftBukkit-Patches/0135-Use-Correct-firstPlayed-Value.patch
similarity index 95%
rename from CraftBukkit-Patches/0134-Use-Correct-firstPlayed-Value.patch
rename to CraftBukkit-Patches/0135-Use-Correct-firstPlayed-Value.patch
index d00d4ba718..545539fbdf 100644
--- a/CraftBukkit-Patches/0134-Use-Correct-firstPlayed-Value.patch
+++ b/CraftBukkit-Patches/0135-Use-Correct-firstPlayed-Value.patch
@@ -1,4 +1,4 @@
-From ebc877daab1dd0cb4ee8bec504681606342b0473 Mon Sep 17 00:00:00 2001
+From 31c8db94074982f07da2cb3ce0f70f8bf721e50d Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 13 Apr 2014 14:45:57 +1000
 Subject: [PATCH] Use Correct firstPlayed Value.
diff --git a/CraftBukkit-Patches/0135-Use-Provided-Case-for-Non-Existent-Offline-Players.patch b/CraftBukkit-Patches/0136-Use-Provided-Case-for-Non-Existent-Offline-Players.patch
similarity index 92%
rename from CraftBukkit-Patches/0135-Use-Provided-Case-for-Non-Existent-Offline-Players.patch
rename to CraftBukkit-Patches/0136-Use-Provided-Case-for-Non-Existent-Offline-Players.patch
index 017e4aefaf..7d6b9f8573 100644
--- a/CraftBukkit-Patches/0135-Use-Provided-Case-for-Non-Existent-Offline-Players.patch
+++ b/CraftBukkit-Patches/0136-Use-Provided-Case-for-Non-Existent-Offline-Players.patch
@@ -1,4 +1,4 @@
-From d5b3d7663e7b6283eed246a736d507f54ddcedb9 Mon Sep 17 00:00:00 2001
+From 21597351ce90e3e55205bb002b5a7976615724d2 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