Update to Minecraft 1.8.8 (Pre-)Release.

Bukkit-Patches/0001-POM-Changes.patch

@@ -1,11 +1,11 @@
-From da920140348518cc56573db48a2e19fcbdc1b96a Mon Sep 17 00:00:00 2001
+From 43ea4b8812178c2ba6431f28b9b492138335538e Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 10:36:24 +1000
 Subject: [PATCH] POM Changes
 
 
 diff --git a/pom.xml b/pom.xml
-index 6f1dc61..dc430c0 100644
+index a2bdfbc..70d5ff8 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -9,14 +9,14 @@
@@ -16,7 +16,7 @@ index 6f1dc61..dc430c0 100644
 -    <artifactId>bukkit</artifactId>
 +    <groupId>org.spigotmc</groupId>
 +    <artifactId>spigot-api</artifactId>
-     <version>1.8.7-R0.1-SNAPSHOT</version>
+     <version>1.8.8-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>Bukkit</name>

Bukkit-Patches/0002-Spigot-Timings.patch

@@ -1,4 +1,4 @@
-From 1f187a6f5feeb611db31a38403d521bfb4b50daa Mon Sep 17 00:00:00 2001
+From 211f814d9a23e5695608c46834f2c30c2cfc4869 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 2 Jun 2013 10:42:57 +1000
 Subject: [PATCH] Spigot Timings

Bukkit-Patches/0003-Add-PlayerItemDamageEvent.patch

@@ -1,4 +1,4 @@
-From d1fb850ed9fe49904a166451978cf4701fc66069 Mon Sep 17 00:00:00 2001
+From 2d16a2bd0871f1eb71f53b0f2949a99269f0dbda Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Mon, 4 Mar 2013 18:31:20 +1100
 Subject: [PATCH] Add PlayerItemDamageEvent

Bukkit-Patches/0004-BungeeCord-Support.patch

@@ -1,4 +1,4 @@
-From 50ea9ab7498d7790cf3cdc882eb2f7cff3dd6d73 Mon Sep 17 00:00:00 2001
+From b351cd2f9562eff94b8a32f0f3cf1c066cd48690 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 15:20:49 +1000
 Subject: [PATCH] BungeeCord Support

Bukkit-Patches/0005-Add-Arrow-API.patch

@@ -1,4 +1,4 @@
-From 6df1a1942db9ba0c51f5d0d44755e7fc6c178b1f Mon Sep 17 00:00:00 2001
+From 5a6f3e6ac8d2c3b6a5600e89231a293af7ce03c8 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 15:08:24 +1000
 Subject: [PATCH] Add Arrow API

Bukkit-Patches/0006-Add-Particle-API.patch

@@ -1,4 +1,4 @@
-From ae09c30b8e2662ceb485199d761d4c8aa021ee87 Mon Sep 17 00:00:00 2001
+From b46e9679728dcaa4782c6ce491897cfc8c978ab2 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 15:57:09 +1000
 Subject: [PATCH] Add Particle API

Bukkit-Patches/0007-Define-EntitySpawnEvent-and-SpawnerSpawnEvent.patch

@@ -1,4 +1,4 @@
-From 881e18a4165bda3606d6f8a56b70fdda366d1570 Mon Sep 17 00:00:00 2001
+From e982d761707c7b217a88c4f9238feeaeaba4858d Mon Sep 17 00:00:00 2001
 From: Andy Shulman <andy.shulman@hotmail.com>
 Date: Mon, 15 Apr 2013 20:06:01 -0500
 Subject: [PATCH] Define EntitySpawnEvent and SpawnerSpawnEvent

Bukkit-Patches/0008-Entity-Mount-and-Dismount-Events.patch

@@ -1,4 +1,4 @@
-From 25b939248a75194bf269587f6b32967ff9dd50a0 Mon Sep 17 00:00:00 2001
+From 246b47b22a286b0e8bd36082f636a6edeb3d7284 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 2 Jul 2013 20:32:53 +1000
 Subject: [PATCH] Entity Mount and Dismount Events

Bukkit-Patches/0009-InventoryClickEvent-getClickedInventory.patch

@@ -1,4 +1,4 @@
-From 448b8cd86c63dc50bf5479506b85814595387256 Mon Sep 17 00:00:00 2001
+From 8a80ebccc9555a300c001caf8a8984f12a86f326 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 7 Jul 2013 10:32:05 -0400
 Subject: [PATCH] InventoryClickEvent getClickedInventory

Bukkit-Patches/0010-Added-getAllSessionData-to-the-Conversation-API.patch

@@ -1,4 +1,4 @@
-From c502417b8d25ebeb61357371aeec2e64d71aec25 Mon Sep 17 00:00:00 2001
+From 0244c6a138d2d14eebedef0b3fa06570d1772e87 Mon Sep 17 00:00:00 2001
 From: Alex Bennett <alex.eugene.bennett@gmail.com>
 Date: Thu, 11 Jul 2013 15:31:32 -0500
 Subject: [PATCH] Added getAllSessionData() to the Conversation API.

Bukkit-Patches/0011-Catch-Conversation-API-Errors.patch

@@ -1,4 +1,4 @@
-From dae3333416b4cb55f40217339e635d32f9516864 Mon Sep 17 00:00:00 2001
+From f58f3bf04a2bb21880cc76e09196a57eddc44c6d Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Mon, 22 Jul 2013 19:09:43 +1000
 Subject: [PATCH] Catch Conversation API Errors

Bukkit-Patches/0012-Player-Collision-API.patch

@@ -1,4 +1,4 @@
-From c4a87449c9728a19bcff5ba01db04343a02189a1 Mon Sep 17 00:00:00 2001
+From 6cac32aab7e7270acc0c3a3802a833007301a755 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 3 Aug 2013 19:20:50 +1000
 Subject: [PATCH] Player Collision API

Bukkit-Patches/0013-Expand-Boolean-Prompt-Values.patch

@@ -1,4 +1,4 @@
-From 8b2b862220b72654e09a83db71a8480dea4b374f Mon Sep 17 00:00:00 2001
+From cbb9593827fba7ecf040fab1fc0a0794a78345c2 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 3 Aug 2013 19:42:16 +1000
 Subject: [PATCH] Expand Boolean Prompt Values

Bukkit-Patches/0014-Add-Getter-for-Entity-Invulnerability.patch

@@ -1,4 +1,4 @@
-From 33bcec116a7d0b271a247aa325c288cebceab936 Mon Sep 17 00:00:00 2001
+From 3058e4ccec6de64c7c0a94fefecebaf76cae104c Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 3 Aug 2013 19:49:36 +1000
 Subject: [PATCH] Add Getter for Entity Invulnerability

Bukkit-Patches/0015-Add-respawn-API.patch

@@ -1,4 +1,4 @@
-From 4d98b3bae2ce9e01b5fe2ea35d8c43b297a07698 Mon Sep 17 00:00:00 2001
+From 76c4f71d40ca15b885666c5425f5b3c8a6269b26 Mon Sep 17 00:00:00 2001
 From: ninja- <xninja@openmailbox.org>
 Date: Tue, 8 Oct 2013 14:35:58 +0200
 Subject: [PATCH] Add respawn API.

Bukkit-Patches/0016-Fix-Plugin-Message-API-Disconnects.patch

@@ -1,4 +1,4 @@
-From cbf5dc1f5e2241264419592fdc12a73997f270bb Mon Sep 17 00:00:00 2001
+From 32283d1dd78f712e95675f00ae2241651ec87068 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 19 Oct 2013 12:59:42 +1100
 Subject: [PATCH] Fix Plugin Message API Disconnects

Bukkit-Patches/0017-Fix-Tab-Completion-for-Some-Commands.patch

@@ -1,4 +1,4 @@
-From 183a4b3be424e009fc996e7baf6d88de15805652 Mon Sep 17 00:00:00 2001
+From baf98de9c6282b4a8d61b2c853fd2fb070b9a180 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 24 Dec 2013 10:14:25 +1100
 Subject: [PATCH] Fix Tab Completion for Some Commands

Bukkit-Patches/0018-Implement-Locale-Getter-for-Players.patch

@@ -1,4 +1,4 @@
-From 569fe828e8596f8d4773f725c4c9cd8555a6d628 Mon Sep 17 00:00:00 2001
+From 32427451524d58b5096de3be5a98c1a9041dcacd Mon Sep 17 00:00:00 2001
 From: Smove <jan@lavasurvival.net>
 Date: Sat, 1 Feb 2014 18:10:49 +1100
 Subject: [PATCH] Implement Locale Getter for Players

Bukkit-Patches/0019-Add-support-for-fetching-hidden-players.patch

@@ -1,4 +1,4 @@
-From 96031401a0d28d40685afecf100e521e044f0753 Mon Sep 17 00:00:00 2001
+From ced760bab62605d3cccbf4886a70d3d9f0e272a5 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Sun, 9 Feb 2014 14:02:11 -0500
 Subject: [PATCH] Add support for fetching hidden players

Bukkit-Patches/0020-Silenceable-Lightning-API.patch

@@ -1,4 +1,4 @@
-From 2da3867ab296fef727f7a85a2af2f8c08ad5552c Mon Sep 17 00:00:00 2001
+From b7f82738214b66303a80cf45d071c43cefce2e4c Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Sun, 23 Feb 2014 16:16:29 -0400
 Subject: [PATCH] Silenceable Lightning API

Bukkit-Patches/0021-Remove-deprecation-on-some-player-lookup-methods.patch

@@ -1,4 +1,4 @@
-From 59c2dab8155fa5d479c75d45ffbcc719fd5d4871 Mon Sep 17 00:00:00 2001
+From 993b4ff544073462f7d9b0aae0eb4464c32e3170 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 30 Mar 2014 15:58:22 +1100
 Subject: [PATCH] Remove deprecation on some player lookup methods
@@ -6,7 +6,7 @@ Subject: [PATCH] Remove deprecation on some player lookup methods
 Most of these methods still have plenty of use given that only one player with each name can exist at a time. Deprecating these methods renders even basic functionality such as /msg <name> impossible without causing compiler warnings. We will maintain this API and it should be considered safe and appropriate for most use cases.
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index af5fe07..2ab17db 100644
+index c535498..95d8c80 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -372,12 +372,9 @@ public final class Bukkit {
@@ -49,7 +49,7 @@ index af5fe07..2ab17db 100644
          return server.matchPlayer(name);
      }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index a57d506..57b2794 100644
+index 2892a28..52dd005 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -308,23 +308,17 @@ public interface Server extends PluginMessageRecipient {

Bukkit-Patches/0022-Add-Score.isScoreSet-Z-API.patch

@@ -1,4 +1,4 @@
-From 13cf271e46dd3ab8974491f621a5be427e40e5ce Mon Sep 17 00:00:00 2001
+From e9305a7a4988acd7f73e0c444d1237409bb51db4 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Thu, 17 Apr 2014 19:35:13 +1000
 Subject: [PATCH] Add Score.isScoreSet()Z API.

Bukkit-Patches/0023-Add-PlayerSpawnLocationEvent.patch

@@ -1,4 +1,4 @@
-From bd34256ce7ea719485ccfe6819ac71e75eb438a2 Mon Sep 17 00:00:00 2001
+From 5a4a84f14e3fc0cb1b60b6d8d9e5b65055e107a9 Mon Sep 17 00:00:00 2001
 From: ninja <xninja@openmailbox.org>
 Date: Tue, 8 Apr 2014 14:01:32 +0200
 Subject: [PATCH] Add PlayerSpawnLocationEvent.

Bukkit-Patches/0024-Ease-ClassLoader-Deadlocks-Where-Possible.patch

@@ -1,4 +1,4 @@
-From 0e0c236ada77b513050d04b43f9fb37ba87f9a67 Mon Sep 17 00:00:00 2001
+From 39d5351db6c384a64b5de29d3ebc45ceb4fbcee7 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 16 Jul 2014 17:24:21 +1000
 Subject: [PATCH] Ease ClassLoader Deadlocks Where Possible

Bukkit-Patches/0025-Fix-slow-tab-complete-for-some-commands.patch

@@ -1,4 +1,4 @@
-From 774a23e8786db836f122b52878efb4ee6c09d5de Mon Sep 17 00:00:00 2001
+From f68a6b171088758dfab21917b1028246fcbfd6af Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 22 Jul 2014 21:01:32 +1000
 Subject: [PATCH] Fix slow tab complete for some commands.

Bukkit-Patches/0026-Undeprecate-Player-updateInventory-V.patch

@@ -1,11 +1,11 @@
-From 249eb8be0d33847f7d0cde8fd493d63870ddb29f Mon Sep 17 00:00:00 2001
+From 9cb8116240b7afad0bf933eae153b6c61daf6921 Mon Sep 17 00:00:00 2001
 From: drXor <mcyoung@mit.edu>
 Date: Wed, 23 Jul 2014 15:50:36 -0400
 Subject: [PATCH] Undeprecate Player#updateInventory()V
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 2d67970..7a0815c 100644
+index 0f59c07..d429074 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -333,10 +333,8 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline

Bukkit-Patches/0027-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch

@@ -1,4 +1,4 @@
-From 9b7a6f1d7eb97b23e5322809c9b2345bcc8da128 Mon Sep 17 00:00:00 2001
+From d4f00fcaa6e46a323a4e5a11427fd76ff80df8e2 Mon Sep 17 00:00:00 2001
 From: libraryaddict <redwarfare@live.com>
 Date: Fri, 22 Aug 2014 05:31:04 -0400
 Subject: [PATCH] Added isUnbreakable and setUnbreakable to ItemMeta

Bukkit-Patches/0028-BungeeCord-Chat-API.patch

@@ -1,11 +1,11 @@
-From 19ad28e2723089c484b88d70248d3c62aa2e2e69 Mon Sep 17 00:00:00 2001
+From 1c89d256fb6b6aa3b2c1a210af6c0f802473a657 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 13 Dec 2014 12:59:14 +1100
 Subject: [PATCH] BungeeCord Chat API
 
 
 diff --git a/pom.xml b/pom.xml
-index dc430c0..f0ceea5 100644
+index 70d5ff8..cb142f2 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -83,6 +83,14 @@

Bukkit-Patches/0029-Add-restart-API.patch

@@ -1,4 +1,4 @@
-From c4395cc09f91e55af6791c7f9490237ba393c73c Mon Sep 17 00:00:00 2001
+From 5fd845e883d1a8bdb75272d43f02cf42786f9bb3 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 13 Jul 2015 19:10:15 +1000
 Subject: [PATCH] Add restart API.

CraftBukkit-Patches/0001-POM-Changes.patch

@@ -1,4 +1,4 @@
-From c579a83622e1fce7be3620a36c86b763eedd06fc Mon Sep 17 00:00:00 2001
+From 2bb58d91916cf4390bef54569377f5623dbead53 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 2 Jul 2013 13:07:39 +1000
 Subject: [PATCH] POM Changes
@@ -6,7 +6,7 @@ Subject: [PATCH] POM Changes
 Basic changes to the build system which mark the artifact as Spigot, and the necessary code changes to ensure proper functionality. Also disables the auto updater provided by CraftBukkit as it is useless to us.
 
 diff --git a/pom.xml b/pom.xml
-index 2c04579..0e0fd09 100644
+index f1fb28f..91627ff 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,12 +1,12 @@
@@ -18,7 +18,7 @@ index 2c04579..0e0fd09 100644
 +    <groupId>org.spigotmc</groupId>
 +    <artifactId>spigot</artifactId>
      <packaging>jar</packaging>
-     <version>1.8.7-R0.1-SNAPSHOT</version>
+     <version>1.8.8-R0.1-SNAPSHOT</version>
 -    <name>CraftBukkit</name>
 -    <url>http://www.bukkit.org</url>
 +    <name>Spigot</name>

CraftBukkit-Patches/0002-mc-dev-imports.patch

@@ -1,4 +1,4 @@
-From e38edc080646fbffb49e6f6ea44f3c4d89a21b08 Mon Sep 17 00:00:00 2001
+From f11a143d3addb06ea169772e070441fabd20114d Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 1 Dec 2013 15:10:48 +1100
 Subject: [PATCH] mc-dev imports

CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch

@@ -1,4 +1,4 @@
-From 8cbecffde39ed8b6dd830dc48553a3f7f825aeeb Mon Sep 17 00:00:00 2001
+From 458fc7928b658349c076603609fa98fdec6e1a39 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 15:10:56 +1000
 Subject: [PATCH] Skeleton API Implementations

CraftBukkit-Patches/0004-Obfuscation-Helpers.patch

@@ -1,4 +1,4 @@
-From 14b000ffaedc98dd7a8b50a6b629d10a4f9d3afb Mon Sep 17 00:00:00 2001
+From 6fc7e7a2d7a52bf18cc053d9e045689c15e04c59 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Obfuscation Helpers
 Provides several friendly named methods which map to a obfuscated method. Obfuscated methods which are used frequently should be added to this file to ease with updates to new Minecraft versions.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c7e8914..6199d30 100644
+index b99d043..f4d8254 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1286,6 +1286,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs

CraftBukkit-Patches/0005-Spigot-Configuration.patch

@@ -1,4 +1,4 @@
-From e9ca76fd7f1f247f6219b8ded77f9532ff5ae785 Mon Sep 17 00:00:00 2001
+From fba1662e39217ab5d0f5db399286c8ee22ba77aa 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Spigot Configuration
 Provides the basic infrastructure to load and save the Spigot configuration file, spigot.yml
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 05ea307..7e93c95 100644
+index 5402532..187d2f4 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -162,6 +162,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer

CraftBukkit-Patches/0006-Better-Chunk-Tick-Selection.patch

@@ -1,4 +1,4 @@
-From fc11bf525b271e692201fea7e805e53f3ad5900f Mon Sep 17 00:00:00 2001
+From 426206c162bab9cdffb452562b8ec8f608e76655 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Better Chunk Tick Selection
 An optimized chunk ticking algorithm which better selects chunks around players which are active on the server.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 0356d9e..11e072b 100644
+index 1638081..5cb66a5 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -68,7 +68,7 @@ public abstract class World implements IBlockAccess {
@@ -111,7 +111,7 @@ index 0356d9e..11e072b 100644
          this.methodProfiler.b();
          if (this.L > 0) {
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 5faefba..03cac6e 100644
+index d27aa67..690e7dc 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -357,12 +357,15 @@ public class WorldServer extends World implements IAsyncTaskHandler {

CraftBukkit-Patches/0007-Crop-Growth-Rates.patch

@@ -1,4 +1,4 @@
-From e78adc4dd3cd3cc942950f5ada5d889ed631faf9 Mon Sep 17 00:00:00 2001
+From ceea89b9500f590905200814f6e7310c7a7fd2e3 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

CraftBukkit-Patches/0008-Merge-tweaks-and-configuration.patch

@@ -1,4 +1,4 @@
-From 69f41b5a824a8cd70b667f338cf00712a4e56ca8 Mon Sep 17 00:00:00 2001
+From 132c9f128e9b958ba9161738329c811f68553833 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

CraftBukkit-Patches/0009-Async-Operation-Catching.patch

@@ -1,4 +1,4 @@
-From 6cf841d064ceb73000411b4ff9832675da0fd2d6 Mon Sep 17 00:00:00 2001
+From 4465c430d6b6e15762957e595385cc4fd7e7dbc2 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

CraftBukkit-Patches/0010-View-Distance.patch

@@ -1,4 +1,4 @@
-From 8eceef159a4bb5b2d8f481611a996f59b05b2cd2 Mon Sep 17 00:00:00 2001
+From f738cff112c9dc5e25b93334c91f953914a805b0 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
@@ -22,7 +22,7 @@ index 688d6f0..abb24c8 100644
  
      public WorldServer a() {
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 03cac6e..b245159 100644
+index 690e7dc..9c0bcfe 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -62,7 +62,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {

CraftBukkit-Patches/0011-Spigot-Timings.patch

@@ -1,4 +1,4 @@
-From b3599f9bef1fe723ec620dcb375098821b2106f9 Mon Sep 17 00:00:00 2001
+From 7661b4adec73bb002c6d5c285781c5162c9d817b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 10 Jan 2013 00:18:11 -0500
 Subject: [PATCH] Spigot Timings
@@ -56,10 +56,10 @@ index 0ae736d..af77eef 100644
                  }
  
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index cfd28f1..ad989e6 100644
+index 706d976..206e3aa 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-@@ -41,7 +41,9 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -42,7 +42,9 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
  
      // CraftBukkit start - Add async variant, provide compatibility
      public Chunk a(World world, int i, int j) throws IOException {
@@ -69,7 +69,7 @@ index cfd28f1..ad989e6 100644
          if (data != null) {
              Chunk chunk = (Chunk) data[0];
              NBTTagCompound nbttagcompound = (NBTTagCompound) data[1];
-@@ -379,7 +381,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -392,7 +394,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
  
      public void loadEntities(Chunk chunk, NBTTagCompound nbttagcompound, World world) {
          // CraftBukkit end
@@ -78,7 +78,7 @@ index cfd28f1..ad989e6 100644
          NBTTagList nbttaglist1 = nbttagcompound.getList("Entities", 10);
  
          if (nbttaglist1 != null) {
-@@ -405,7 +407,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -418,7 +420,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
                  }
              }
          }
@@ -88,7 +88,7 @@ index cfd28f1..ad989e6 100644
          NBTTagList nbttaglist2 = nbttagcompound.getList("TileEntities", 10);
  
          if (nbttaglist2 != null) {
-@@ -418,6 +421,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -431,6 +434,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
                  }
              }
          }
@@ -97,7 +97,7 @@ index cfd28f1..ad989e6 100644
  
          if (nbttagcompound.hasKeyOfType("TileTicks", 9)) {
              NBTTagList nbttaglist3 = nbttagcompound.getList("TileTicks", 10);
-@@ -437,6 +442,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -450,6 +455,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
                  }
              }
          }
@@ -106,7 +106,7 @@ index cfd28f1..ad989e6 100644
          // return chunk; // CraftBukkit
      }
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 7e93c95..38c634f 100644
+index 187d2f4..14d2207 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -20,6 +20,7 @@ import java.io.PrintStream;
@@ -242,7 +242,7 @@ index 8125cb9..6ef9c83 100644
  
          this.world.methodProfiler.b();
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 6199d30..a58ac4b 100644
+index f4d8254..e42c0ba 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -45,6 +45,7 @@ import jline.console.ConsoleReader;
@@ -367,10 +367,10 @@ index 6199d30..a58ac4b 100644
          this.methodProfiler.b();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 6329672..a7ca537 100644
+index 1ee1abf..10e5032 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1077,6 +1077,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+@@ -1090,6 +1090,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
      // CraftBukkit end
  
     private void handleCommand(String s) {
@@ -378,7 +378,7 @@ index 6329672..a7ca537 100644
         // CraftBukkit start - whole method
          this.c.info(this.player.getName() + " issued server command: " + s);
  
-@@ -1086,18 +1087,22 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+@@ -1099,18 +1100,22 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
          this.server.getPluginManager().callEvent(event);
  
          if (event.isCancelled()) {

CraftBukkit-Patches/0012-Fix-Mob-Spawning-Relative-to-View-Distance.patch

@@ -1,4 +1,4 @@
-From d528062516b72771b4941e2e59cb02dc06cea9f0 Mon Sep 17 00:00:00 2001
+From cd53964e04b6f576d5feb91e0bc36759ec14b750 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
@@ -8,7 +8,7 @@ Changes the mob spawning algorithm to properly account for view distance and the
 Needs better documentation.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index f22e695..3d8d59a 100644
+index 7e7aa11..746cbce 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -42,6 +42,7 @@ public class Chunk {

CraftBukkit-Patches/0013-Handle-Null-Tile-Entities.patch

@@ -1,11 +1,11 @@
-From 5f633cd86ba8f838007c9d002cd871c047c837c1 Mon Sep 17 00:00:00 2001
+From 5846865ec3ebf4fcc2d6c35617cc6dddc6bc18a2 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 3 Feb 2013 09:20:19 +1100
 Subject: [PATCH] Handle Null Tile Entities
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 3e5933a..380df75 100644
+index e34964f..275856f 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1365,6 +1365,13 @@ public abstract class World implements IBlockAccess {

CraftBukkit-Patches/0014-Entity-Activation-Range.patch

@@ -1,4 +1,4 @@
-From 1a625048845e34778ffdba0ad1042370f586a797 Mon Sep 17 00:00:00 2001
+From b72486af9b48b56778166d1899644ddee8d9f94b 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
@@ -145,7 +145,7 @@ index aa36bf2..3c7814d 100644
          super(world);
          this.setSize(0.25F, 0.25F);
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index c1b904d..06d4687 100644
+index 8b7cd86..b80801a 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -121,6 +121,28 @@ public class EntityItem extends Entity {
@@ -196,7 +196,7 @@ index 6ef9c83..e3a9e44 100644
      public void G() {
          this.damageEntity(DamageSource.OUT_OF_WORLD, Float.MAX_VALUE);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 6de46dc..221e2f2 100644
+index 275856f..b959a79 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1306,6 +1306,7 @@ public abstract class World implements IBlockAccess {

CraftBukkit-Patches/0015-Metrics.patch

@@ -1,4 +1,4 @@
-From adcceacaaaa05206db36e6c06c3cded1ddb31150 Mon Sep 17 00:00:00 2001
+From c5caf2c18d39f621e699a03c53e2e6d64d5ad5cb 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
@@ -687,5 +687,5 @@ index cb88089..dcca493 100644
  
      static void readConfig(Class<?> clazz, Object instance)
 -- 
-1.9.0.msysgit.0
+2.1.4
 

CraftBukkit-Patches/0016-PlayerItemDamageEvent.patch

@@ -1,4 +1,4 @@
-From 91a207cf310c507636fec4e119b0c4b55c3a0724 Mon Sep 17 00:00:00 2001
+From 927b1e1f6463fc52c8718735deb38f5b315c7260 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

CraftBukkit-Patches/0017-Prevent-NPE-in-CraftSign.patch

@@ -1,4 +1,4 @@
-From 6d7b55496c097214f4bdb2acdee1b08c8767d2ad Mon Sep 17 00:00:00 2001
+From 6c4714ec822f04f5edd10bd57cc8db50df6d3b17 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

CraftBukkit-Patches/0018-Entity-Tracking-Ranges.patch

@@ -1,4 +1,4 @@
-From 23f036658cfea94cb5d68f4522617d3a77dcd2be Mon Sep 17 00:00:00 2001
+From 98c2490b9e0db5dbcaf154bdc8d2bcba1676a2ff 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 de38e80..1f7dd1a 100644
+index e1ff4f0..cb72b36 100644
 --- a/src/main/java/net/minecraft/server/EntityTracker.java
 +++ b/src/main/java/net/minecraft/server/EntityTracker.java
 @@ -95,6 +95,7 @@ public class EntityTracker {

CraftBukkit-Patches/0019-Thread-Naming-and-Tweaks.patch

@@ -1,4 +1,4 @@
-From 1b8f113603033107d6980169fd3f5b01eadbdfbb Mon Sep 17 00:00:00 2001
+From 11b631871b5943607fc15ec70a841a8af7020aa9 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

CraftBukkit-Patches/0020-Close-Unloaded-Save-Files.patch

@@ -1,4 +1,4 @@
-From de99b08eec3c384e0818447af13d91a1defb2004 Mon Sep 17 00:00:00 2001
+From 779b76bf2e439766383b7635b08ccc6b62398b58 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

CraftBukkit-Patches/0021-Remove-o-Option.patch

@@ -1,4 +1,4 @@
-From 7003a11b6d4ce715147b1ede2c6bb8ad53ca95e3 Mon Sep 17 00:00:00 2001
+From 561aaac2d5dc20515d3b4161fa880b9ba70962b0 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Remove -o Option
 Serves no purpose other than to confuse users.
 
 diff --git a/src/main/java/net/minecraft/server/PropertyManager.java b/src/main/java/net/minecraft/server/PropertyManager.java
-index dbb329c..0549a0f 100644
+index 856ae39..0ee7fe8 100644
 --- a/src/main/java/net/minecraft/server/PropertyManager.java
 +++ b/src/main/java/net/minecraft/server/PropertyManager.java
 @@ -54,7 +54,7 @@ public class PropertyManager {

CraftBukkit-Patches/0022-Recipe-Deconstruction.patch

@@ -1,4 +1,4 @@
-From 525b79b4b5bde8c12b36279773be7e2f67bdc1ad Mon Sep 17 00:00:00 2001
+From 40711de0bf9bd0111c07ac647f806bf899992af5 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

CraftBukkit-Patches/0023-Implement-Arrow-API.patch

@@ -1,4 +1,4 @@
-From b81ecffb87848ddccf72e3a45d41c57e62aab7dc Mon Sep 17 00:00:00 2001
+From b362f88b396a1220b9e55a48ec6ee08fb400db39 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

CraftBukkit-Patches/0024-Hopper-Customisations.patch

@@ -1,4 +1,4 @@
-From a52a850cb8198e8db2afb6c34acaa96093c6ffd7 Mon Sep 17 00:00:00 2001
+From f0d8e184d3c543840e50a775dd7aebc5b733eaba Mon Sep 17 00:00:00 2001
 From: erocs <github@erocs.org>
 Date: Sun, 8 Sep 2013 12:06:15 -0700
 Subject: [PATCH] Hopper Customisations

CraftBukkit-Patches/0025-Implement-SpawnerSpawnEvent.patch

@@ -1,4 +1,4 @@
-From 0278976e64dfd93bc2929ef0b820f0459a103c77 Mon Sep 17 00:00:00 2001
+From c376a82c02fe22df003b586879846358da93a822 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.
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement SpawnerSpawnEvent.
 Adds BUKKIT-267
 
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index 056d447..0695fe2 100644
+index 7b10821..35ed213 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -4,7 +4,11 @@ import com.google.common.collect.Lists;
@@ -64,7 +64,7 @@ index 056d447..0695fe2 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 10ac959..c5eca56 100644
+index 2a01005..260c305 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -18,6 +18,7 @@ import org.bukkit.Statistic.Type;

CraftBukkit-Patches/0026-Firework-Meta-Crash-Fix.patch

@@ -1,4 +1,4 @@
-From aa678434ade339ed00754bc9f8c80ff08d57ea6d Mon Sep 17 00:00:00 2001
+From 7de3bb97d2030311993a14f4e59c30569956d16e 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

CraftBukkit-Patches/0027-Allow-Disabling-of-Command-Logging.patch

@@ -1,14 +1,14 @@
-From 1b32b4afefa170a63a9d208a94ed43f6f3c6c0bb Mon Sep 17 00:00:00 2001
+From b33bb999524e6ccfbfdc394517e9ce7f55bc3a8c Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 18:01:29 +1000
 Subject: [PATCH] Allow Disabling of Command Logging
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index a7ca537..1fca956 100644
+index 10e5032..9ff5828 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1079,6 +1079,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+@@ -1092,6 +1092,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
     private void handleCommand(String s) {
          org.bukkit.craftbukkit.SpigotTimings.playerCommandTimer.startTiming(); // Spigot
         // CraftBukkit start - whole method

CraftBukkit-Patches/0028-Allow-Disabling-of-Command-TabComplete.patch

@@ -1,4 +1,4 @@
-From cb4b2666c77a64d2d0d69fe7128cb5b79b1eebab Mon Sep 17 00:00:00 2001
+From 8aed6e213a25e12c67b9492fe0ec99b7a847d41e 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

CraftBukkit-Patches/0029-Configurable-Messages.patch

@@ -1,24 +1,24 @@
-From d8d0242a43b027b308c0cc9ced929c804377f7dd Mon Sep 17 00:00:00 2001
+From 05da710b600ae5090d03f6f0ebe5ad1adfc58f5d 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
 
 
 diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
-index 3b6a514..fcfdb65 100644
+index fa7b6c2..e122df9 100644
 --- a/src/main/java/net/minecraft/server/HandshakeListener.java
 +++ b/src/main/java/net/minecraft/server/HandshakeListener.java
 @@ -62,11 +62,11 @@ public class HandshakeListener implements PacketHandshakingInListener {
              // CraftBukkit end
  
              if (packethandshakinginsetprotocol.b() > 47) {
--                chatcomponenttext = new ChatComponentText("Outdated server! I\'m still on 1.8.7");
+-                chatcomponenttext = new ChatComponentText("Outdated server! I\'m still on 1.8.8");
-+                chatcomponenttext = new ChatComponentText( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedServerMessage, "1.8.7" ) ); // Spigot
++                chatcomponenttext = new ChatComponentText( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedServerMessage, "1.8.8" ) ); // Spigot
                  this.b.handle(new PacketLoginOutDisconnect(chatcomponenttext));
                  this.b.close(chatcomponenttext);
              } else if (packethandshakinginsetprotocol.b() < 47) {
--                chatcomponenttext = new ChatComponentText("Outdated client! Please use 1.8.7");
+-                chatcomponenttext = new ChatComponentText("Outdated client! Please use 1.8.8");
-+                chatcomponenttext = new ChatComponentText( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedClientMessage, "1.8.7" ) ); // Spigot
++                chatcomponenttext = new ChatComponentText( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedClientMessage, "1.8.8" ) ); // Spigot
                  this.b.handle(new PacketLoginOutDisconnect(chatcomponenttext));
                  this.b.close(chatcomponenttext);
              } else {

CraftBukkit-Patches/0030-Allow-Disabling-of-Random-Lighting-Updates.patch

@@ -1,11 +1,11 @@
-From c2620e0b5e61bb275c6c6f628e66a8d495de1278 Mon Sep 17 00:00:00 2001
+From 28575eda69652a901509418b5b274bc58756bb36 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 22 Jun 2013 16:12:02 +1000
 Subject: [PATCH] Allow Disabling of Random Lighting Updates
 
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 3d8d59a..3e72a01 100644
+index 746cbce..155bccf 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -1019,7 +1019,7 @@ public class Chunk {
@@ -18,7 +18,7 @@ index 3d8d59a..3e72a01 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 221e2f2..33c4fb0 100644
+index b959a79..b07b3db 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -2088,7 +2088,7 @@ public abstract class World implements IBlockAccess {

CraftBukkit-Patches/0031-Properly-Close-Inventories.patch

@@ -1,4 +1,4 @@
-From 12be96359526588a261e120b2194e8e9a857e716 Mon Sep 17 00:00:00 2001
+From e67e56dcd5be50fa323dbb6c5e5111238295acaa Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 27 Jun 2013 17:26:09 +1000
 Subject: [PATCH] Properly Close Inventories
@@ -6,7 +6,7 @@ Subject: [PATCH] Properly Close Inventories
 Properly close inventories when unloading and switching worlds.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 3e72a01..7e56837 100644
+index 155bccf..6460ab1 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -828,6 +828,18 @@ public class Chunk {

CraftBukkit-Patches/0032-Disallow-Interaction-With-Self.patch

@@ -1,14 +1,14 @@
-From 666400319370efe36fb4f5fb4c67e745e264b044 Mon Sep 17 00:00:00 2001
+From 416a5d8363e7e87d07ceff5d97e61f547e87cf86 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 28 Jun 2013 19:52:54 +1000
 Subject: [PATCH] Disallow Interaction With Self
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 1fca956..88f469d 100644
+index 9ff5828..8d6d3c7 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1214,6 +1214,13 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+@@ -1227,6 +1227,13 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
          PlayerConnectionUtils.ensureMainThread(packetplayinuseentity, this, this.player.u());
          WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension);
          Entity entity = packetplayinuseentity.a((World) worldserver);

CraftBukkit-Patches/0033-Entity-Mount-and-Dismount-Events.patch

@@ -1,11 +1,11 @@
-From 7960af011f00e2278bdebb8a09d11b019f55ae35 Mon Sep 17 00:00:00 2001
+From d96b140e92e6d1b05ebbcd1fbb6fbd1a2ddb3b7e 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/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index ebdcaab..5cf3833 100644
+index 687fb4b..c14ff55 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1540,6 +1540,7 @@ public abstract class Entity implements ICommandListener {

CraftBukkit-Patches/0034-Prevent-Ghost-Players-Caused-by-Plugins.patch

@@ -1,4 +1,4 @@
-From 8394755568aba38313dc9ded45c0e1f4b43d2d1b Mon Sep 17 00:00:00 2001
+From d828c679ff0cacc857fe380616c5e9753e3f9b32 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent Ghost Players Caused by Plugins
 Check if the player is still connected after firing event. Fixes BUKKIT-4327
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 825823d..665d58e 100644
+index 49b908d..747d708 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -548,6 +548,11 @@ public abstract class PlayerList {

CraftBukkit-Patches/0035-Plug-World-Unload-Memory-Leak.patch

@@ -1,4 +1,4 @@
-From 30a420e5ff262b3c9772272fa74a0ad8711d9000 Mon Sep 17 00:00:00 2001
+From fc446e6747d22f32433ee0fcd83002cd7b16968b 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

CraftBukkit-Patches/0036-Player-Collision-API.patch

@@ -1,4 +1,4 @@
-From dc094e0fa27086aada7a225a7209484ef7dd460a Mon Sep 17 00:00:00 2001
+From 535c7a565c4c81ed880b0a5d3dbdbeb8108c29bb 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

CraftBukkit-Patches/0037-Fully-Disable-Snooper-When-Not-Required.patch

@@ -1,11 +1,11 @@
-From 1d1be9d558b3803373a4904f734158a013362656 Mon Sep 17 00:00:00 2001
+From e0262af8cd97118d7f5d5cbfd4f8d3b0ca28d2e7 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 a58ac4b..ed66d5e 100644
+index e42c0ba..05b0b52 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -655,11 +655,11 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs

CraftBukkit-Patches/0038-Add-Getter-for-Entity-Invulnerability.patch

@@ -1,4 +1,4 @@
-From c50de8cff776cd840dda89ad54781c745cdba93e Mon Sep 17 00:00:00 2001
+From 1b3a4837aebc2072d4229c6e2d34938342620063 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

CraftBukkit-Patches/0039-Cap-Minimum-Player-Speed.patch

@@ -1,4 +1,4 @@
-From db11f2a5d6e0b42a20e651b4435e65cd918f330e Mon Sep 17 00:00:00 2001
+From aae347ac688cad34a2bf4684deb4b14a185fde1b 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

CraftBukkit-Patches/0040-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch

@@ -1,11 +1,11 @@
-From b4a7cd5471a376e966c3219af2ca080129a620e4 Mon Sep 17 00:00:00 2001
+From 4a01fe5baa2c8bc6ff8b4ddabe047dde8f3231e0 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 14 Sep 2013 10:16:38 +1000
 Subject: [PATCH] Update Inventory and Health for PlayerConsumeItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 32dd2e1..51f196a 100644
+index c93a5da..17c9f64 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -300,6 +300,10 @@ public abstract class EntityHuman extends EntityLiving {

CraftBukkit-Patches/0041-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch

@@ -1,4 +1,4 @@
-From 91a59b2aec6c0edbab9254c6e0aa0aa3e7fef12c Mon Sep 17 00:00:00 2001
+From 4b13a7bb4f86b86b104d512f730b058734df7ff4 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

CraftBukkit-Patches/0042-Allow-Disabling-of-1.6.3-Structure-Saving.patch

@@ -1,4 +1,4 @@
-From d70f892f4f0ff325d7663895cf213ae0f742f0a0 Mon Sep 17 00:00:00 2001
+From b61bd159a881d8e31de9c8d640815e720420a77c 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

CraftBukkit-Patches/0043-Item-Despawn-Rate.patch

@@ -1,11 +1,11 @@
-From b07858f888ce0ba99638644fecc8aea78532c0f8 Mon Sep 17 00:00:00 2001
+From c2bf94e9b17ef38629028376bce393386400fe09 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/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index 06d4687..0b0f027 100644
+index b80801a..abd85b0 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -108,7 +108,7 @@ public class EntityItem extends Entity {

CraftBukkit-Patches/0044-Don-t-Special-Case-X-Move-Value.patch

@@ -1,14 +1,14 @@
-From e77ef424971b9cc45485367ec4a7a0eef3e70da0 Mon Sep 17 00:00:00 2001
+From acbb89c50b0a24da787bd49dd472f57ac885f45c Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 6 Oct 2013 17:36:28 +1100
 Subject: [PATCH] Don't Special Case X Move Value
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 8cf0b71..0d45439 100644
+index 8d6d3c7..36f0684 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -111,6 +111,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+@@ -112,6 +112,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
      private float lastPitch = Float.MAX_VALUE;
      private float lastYaw = Float.MAX_VALUE;
      private boolean justTeleported = false;
@@ -16,7 +16,7 @@ index 8cf0b71..0d45439 100644
  
      public CraftPlayer getPlayer() {
          return (this.player == null) ? null : (CraftPlayer) this.player.getBukkitEntity();
-@@ -222,6 +223,18 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+@@ -223,6 +224,18 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
                  }
                  // CraftBukkit start - fire PlayerMoveEvent
                  Player player = this.getPlayer();
@@ -35,7 +35,7 @@ index 8cf0b71..0d45439 100644
                  Location from = new Location(player.getWorld(), lastPosX, lastPosY, lastPosZ, lastYaw, lastPitch); // Get the Players previous Event location.
                  Location to = player.getLocation().clone(); // Start off the To location as the Players current location.
  
-@@ -250,7 +263,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+@@ -251,7 +264,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
                      this.lastPitch = to.getPitch();
  
                      // Skip the first time we do this

CraftBukkit-Patches/0045-Implement-respawn-API.patch

@@ -1,4 +1,4 @@
-From ace47b5797decdf1436456851d37cddbc78cda68 Mon Sep 17 00:00:00 2001
+From abebbbac98d7d10cdd59763777a847de2eb81b3b 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.

CraftBukkit-Patches/0046-Arrow-Despawn-Rate.patch

@@ -1,11 +1,11 @@
-From 9a00ec321402602d5ae5f59f2f640db206adae98 Mon Sep 17 00:00:00 2001
+From 2d9a2afdc3d508a398d1d274597aa22a3b8740cd 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/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index 01c66e3..46f6374 100644
+index 3359160..3a80776 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
 @@ -155,7 +155,7 @@ public class EntityArrow extends Entity implements IProjectile {

CraftBukkit-Patches/0047-Fix-packed-ice-generation.patch

@@ -1,4 +1,4 @@
-From 81d520fd1ca0268598fd90138eac3b4cd3dc4a29 Mon Sep 17 00:00:00 2001
+From f0d250f577da79657fec78fcdc267d3b4b221653 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 1 Dec 2013 17:52:14 +1100
 Subject: [PATCH] Fix packed ice generation

CraftBukkit-Patches/0048-Watchdog-Thread.patch

@@ -1,11 +1,11 @@
-From 08d0172ae952d1fcc324820b650e2d793615700a Mon Sep 17 00:00:00 2001
+From a20fe0d882e5f74abac041edf5cae8ace6d3f497 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 5 Aug 2014 17:20:19 +0100
 Subject: [PATCH] Watchdog Thread.
 
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 38c634f..8f7bb8b 100644
+index 14d2207..be30d17 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -270,7 +270,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -18,7 +18,7 @@ index 38c634f..8f7bb8b 100644
  
                      thread1.setName("Server Watchdog");
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ed66d5e..6cef666 100644
+index 05b0b52..98d6bce 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -565,6 +565,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs

CraftBukkit-Patches/0049-Clear-Flower-Pot-on-Drop.patch

@@ -1,4 +1,4 @@
-From d60fd451c6d5fc23094f8323735234ab64028dd7 Mon Sep 17 00:00:00 2001
+From 89eb6b05e7135406df9ca8300dd018432b763e27 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

CraftBukkit-Patches/0050-Fix-some-chunks-not-being-sent-to-the-client.patch

@@ -1,11 +1,11 @@
-From 41a87da3590d7d0dcdf8a0f9ca2a97e47d8a337b Mon Sep 17 00:00:00 2001
+From 4780ccafe1a89c999b2be1124c3a08edfa190041 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Mon, 2 Dec 2013 23:42:09 +0000
 Subject: [PATCH] Fix some chunks not being sent to the client
 
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 7e56837..5208dbc 100644
+index 6460ab1..f461f50 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -1061,7 +1061,15 @@ public class Chunk {

CraftBukkit-Patches/0051-Fix-Broken-Async-Chat.patch

@@ -1,4 +1,4 @@
-From fd55dcc3befd0b3ec8d3ab3c4f1f9e0c0d76fdb3 Mon Sep 17 00:00:00 2001
+From cc4c9041be7f3626120940a3d403c5266c101f91 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

CraftBukkit-Patches/0052-Orebfuscator.patch

@@ -1,4 +1,4 @@
-From 1f1269d671396950883aa870a3a3c147de6e4793 Mon Sep 17 00:00:00 2001
+From 994ee97c638d5ac9c57491cab3db44ffb48993cc 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
@@ -25,7 +25,7 @@ index 9e0d5ad..ce91553 100644
                                  if (block instanceof BlockFalling) {
                                      ((BlockFalling) block).a_(this.world, blockposition);
 diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
-index 6f3443b..dfc18e8 100644
+index 08eca3d..85f2ab5 100644
 --- a/src/main/java/net/minecraft/server/Explosion.java
 +++ b/src/main/java/net/minecraft/server/Explosion.java
 @@ -210,6 +210,7 @@ public class Explosion {
@@ -79,7 +79,7 @@ index 63b90f7..10c0e34 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index f2a9809..6dcf611 100644
+index 58fd07d..33a0a09 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -197,6 +197,7 @@ public class PlayerInteractManager {
@@ -91,7 +91,7 @@ index f2a9809..6dcf611 100644
  
      public void a(BlockPosition blockposition) {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index a08b401..e9211fe 100644
+index b07b3db..2c5c6b0 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -497,6 +497,7 @@ public abstract class World implements IBlockAccess {

CraftBukkit-Patches/0053-Optimize-DataWatcher.patch

@@ -1,4 +1,4 @@
-From 8e9ad5ba6b0da9211d0935a35cf869e18347127f Mon Sep 17 00:00:00 2001
+From 4e418f9a238858b1c13a6290ff5b667331073cb0 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

CraftBukkit-Patches/0054-Fire-PreLogin-Events-in-Offline-Mode.patch

@@ -1,4 +1,4 @@
-From f028d32e2c3bdbdba4b9d8fedd470f3cfe095398 Mon Sep 17 00:00:00 2001
+From 6b1f5316e3a221a450333e195178f5e29e84381d 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

CraftBukkit-Patches/0055-BungeeCord-Support.patch

@@ -1,4 +1,4 @@
-From c4a828abaeb82576f2b80dd4199fd03dc3697a84 Mon Sep 17 00:00:00 2001
+From 23a90b4cf1ac5f80a05667740682f33132c9942a 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
@@ -6,7 +6,7 @@ Subject: [PATCH] BungeeCord Support
 Provides support for IP forwarding via BungeeCord.
 
 diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
-index fcfdb65..974779c 100644
+index e122df9..36af75a 100644
 --- a/src/main/java/net/minecraft/server/HandshakeListener.java
 +++ b/src/main/java/net/minecraft/server/HandshakeListener.java
 @@ -7,6 +7,7 @@ import java.util.HashMap;

CraftBukkit-Patches/0056-Allow-Disabling-Zombie-Villager-Aggression.patch

@@ -1,4 +1,4 @@
-From a0076cb8755ae27f36b727b9a23a2b29f33dfacb Mon Sep 17 00:00:00 2001
+From fbb22dc472ea7bfda18094d280c5b7d8ae371d98 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

CraftBukkit-Patches/0057-Configurable-Amount-of-Netty-Threads.patch

@@ -1,4 +1,4 @@
-From 81a1e441ce14ac8c364b3dffd44eb282f6c07ede Mon Sep 17 00:00:00 2001
+From efe6e588fa24862c1fcf38c0c9e696aa3f66b5f0 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 6cef666..4cb8a1e 100644
+index 98d6bce..5c7c0d0 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -59,7 +59,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs

CraftBukkit-Patches/0058-Prevent-Mineshaft-Saving.patch

@@ -1,4 +1,4 @@
-From 8aee9e77f8557e093deb7e6632ecc4dd8627a4c9 Mon Sep 17 00:00:00 2001
+From 352eba0eb3c150efd3233443ec6eb2d5deaa9d83 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

CraftBukkit-Patches/0059-Log-Cause-of-Unexpected-Exceptions.patch

@@ -1,11 +1,11 @@
-From 3da26d7355a20ec9e1dec359433c47337cafc779 Mon Sep 17 00:00:00 2001
+From 2719f638dc995d03e1da40d1977ce0da149edfed 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 4cb8a1e..56126c4 100644
+index 5c7c0d0..f95d560 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -546,6 +546,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs

CraftBukkit-Patches/0060-Particle-API.patch

@@ -1,4 +1,4 @@
-From 8b1ca7bcaf8dc4526a3e2411424db2931880144a Mon Sep 17 00:00:00 2001
+From bf78106f695dd8d9f1c06e7af4eb466e3350220a 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

CraftBukkit-Patches/0061-Save-ticks-lived-to-nbttag.patch

@@ -1,11 +1,11 @@
-From 7a845c3b5215c05f955a4a69511428b35bc245ec Mon Sep 17 00:00:00 2001
+From 2e302232b2732d65787de85d660ab7c123c11b4e Mon Sep 17 00:00:00 2001
 From: DerFlash <bte@freenet.de>
 Date: Tue, 9 Jul 2013 00:11:12 +0200
 Subject: [PATCH] Save ticks lived to nbttag
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 5cf3833..5e1e695 100644
+index c14ff55..f42707e 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1191,6 +1191,7 @@ public abstract class Entity implements ICommandListener {

CraftBukkit-Patches/0062-More-Efficient-GetCubes.patch

@@ -1,11 +1,11 @@
-From 99507859014f932c1d4c637c3a02008d1bd70a18 Mon Sep 17 00:00:00 2001
+From 6387a4ad1c7e96f16dc8e84eadeb9179f814c6ec Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 11 Jun 2013 12:17:37 +1000
 Subject: [PATCH] More Efficient GetCubes
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index e9211fe..9867081 100644
+index 2c5c6b0..a09de8e 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1104,28 +1104,56 @@ public abstract class World implements IBlockAccess {

CraftBukkit-Patches/0063-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch

@@ -1,11 +1,11 @@
-From 4cbf1d01d020a85d822368814fae42d456c919a0 Mon Sep 17 00:00:00 2001
+From 2f777535f60f27652de59adf4ccdd7a57a201c5f 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/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 5e1e695..b930c0d 100644
+index f42707e..047d882 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -120,6 +120,7 @@ public abstract class Entity implements ICommandListener {
@@ -17,7 +17,7 @@ index 5e1e695..b930c0d 100644
      // Spigot end
  
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 46f696f..73cdd41 100644
+index ef3ebc4..f8aec29 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -457,6 +457,12 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -34,7 +34,7 @@ index 46f696f..73cdd41 100644
          this.bk.a();
          this.world.methodProfiler.b();
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index 0695fe2..1680918 100644
+index 35ed213..6004e23 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -144,6 +144,12 @@ public abstract class MobSpawnerAbstract {

CraftBukkit-Patches/0064-Warn-if-PermGen-may-be-insufficient.patch

@@ -1,4 +1,4 @@
-From 963b791c91cc99d28cf06b1da6b51c73e772dd25 Mon Sep 17 00:00:00 2001
+From fffa67446ecf4048eb314ed7abd8758a7287daa4 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 23 Dec 2013 14:07:41 +1100
 Subject: [PATCH] Warn if PermGen may be insufficient
@@ -32,5 +32,5 @@ index aca0d97..337aa29 100644
                  MinecraftServer.main(options);
              } catch (Throwable t) {
 -- 
-1.9.0.msysgit.0
+2.1.4
 

CraftBukkit-Patches/0065-Disable-Connected-Check-on-setScoreboard.patch

@@ -1,4 +1,4 @@
-From d3ccf96e8655a900b518b35d9acb7dfc75142192 Mon Sep 17 00:00:00 2001
+From 9bacce598c5544cba0339a9ff3da446c4a8d4a3c 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

CraftBukkit-Patches/0066-Add-Late-Bind-Option.patch

@@ -1,4 +1,4 @@
-From 90bf9dee67afa7e42e9956d5d870b572f98f2938 Mon Sep 17 00:00:00 2001
+From ab7f3c1ab5d1c13a9f0a95e347bd9be9b499af54 Mon Sep 17 00:00:00 2001
 From: slide23 <me@slide.ws>
 Date: Fri, 20 Dec 2013 20:15:33 -0600
 Subject: [PATCH] Add Late Bind Option
@@ -6,7 +6,7 @@ Subject: [PATCH] Add Late Bind Option
 Add late-bind config option to delay binding until loading is done.
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 7f7ec42..b7f2382 100644
+index be30d17..8801164 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -173,6 +173,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -58,5 +58,5 @@ index a306266..4edc6af 100644
 +    }
  }
 -- 
-1.9.0.msysgit.0
+2.1.4
 

CraftBukkit-Patches/0067-Allow-statistics-to-be-disabled-forced.patch

@@ -1,4 +1,4 @@
-From 82425c7b387b9dde3f71c10cc3261715df2452a8 Mon Sep 17 00:00:00 2001
+From d3e32f4d2fa2684eb2942b93b4bcfb237056915b 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
@@ -89,5 +89,5 @@ index 4edc6af..a2be9df 100644
 +    }
  }
 -- 
-1.9.0.msysgit.0
+2.1.4
 

CraftBukkit-Patches/0068-Fix-ItemStack-Unbreakable-Code.patch

@@ -1,4 +1,4 @@
-From b33e57aa91bef9b61bffc1c73575eae1e4717212 Mon Sep 17 00:00:00 2001
+From 3133f7ad7c02420bd68fbc080d70da3144d506cb 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

CraftBukkit-Patches/0069-Try-and-Debug-Crash-Reports-Crashing.patch

@@ -1,11 +1,11 @@
-From d12a162d9e7495788ece80532898447a4939cc52 Mon Sep 17 00:00:00 2001
+From d3396a903f9a160ece92f486114d6101e3896f4b 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 56126c4..1244fbf 100644
+index f95d560..e552226 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -741,7 +741,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs

CraftBukkit-Patches/0070-Improve-AutoSave-Mechanism.patch

@@ -1,4 +1,4 @@
-From 39097e7eef729fb5a6c9aa9d52b16ddb3ced4008 Mon Sep 17 00:00:00 2001
+From a67e84acd959b485012eb3a9fe5c757792e0521d 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] Improve AutoSave Mechanism
@@ -37,7 +37,7 @@ index af77eef..975d666 100644
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1244fbf..95b4d0f 100644
+index e552226..a4beaf8 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -653,7 +653,17 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs

CraftBukkit-Patches/0071-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch

@@ -1,4 +1,4 @@
-From 18c096c98465377a05941c51d047a678f5dfc39b Mon Sep 17 00:00:00 2001
+From cd2075b5bc30ca288ccac63f55c4f9dce31414d3 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.