Patch rebuild.

Bukkit-Patches/0001-POM-Changes.patch

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

Bukkit-Patches/0002-Spigot-Timings.patch

@@ -1,4 +1,4 @@
-From 307267c4b0b17ad241ae7ad8f8baf106a3408002 Mon Sep 17 00:00:00 2001
+From 8d138fbb2a8a9b588e673ee5855e662db585a34d 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 654acca108839b65a772cce9154c6f177249256b Mon Sep 17 00:00:00 2001
+From 4523472589759a21480748098592974ad2792e03 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 8f696725c1b35a064cd4fed84209f226b342b3f7 Mon Sep 17 00:00:00 2001
+From 0b286d348e11792e7da9b19a7fd02e623ed52aca 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 52741b1442b0a31830c4fc0fed12941f4952e1ff Mon Sep 17 00:00:00 2001
+From 161c7845321df654c9e26e47f251fa6c3997f82c 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 b7f4ea781b3c25795d0e7634b088c70265d6d0cc Mon Sep 17 00:00:00 2001
+From 8dda3b718e25ff37aea6e807af0070d78a6d43a4 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 04ee5f8788f7610f2486fe64de77113c126dbba1 Mon Sep 17 00:00:00 2001
+From 9d7dd9d5f9276fce1fd98a79a90d7a4b3523001e 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 a9eaefd368301b5c4864045a44fa1342ae68268f Mon Sep 17 00:00:00 2001
+From f4a34eb093b24d141daa07889a425b6c5d5b7c76 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 079a3005be2ade43d449b78816220b755c8e2d10 Mon Sep 17 00:00:00 2001
+From 36c03b52a29710a08ab8c8a4aecdf00877847315 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 80ef0d7b1087f5fe6f649ae203c725955572e767 Mon Sep 17 00:00:00 2001
+From d42215ef49162229b53cdae06df8143f7d3b8692 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 2a5b8a50c4a4f099b3c55f04fb67aa7167a0ab17 Mon Sep 17 00:00:00 2001
+From 6b81cd9d8cfc6fbc6046bd89aab7ca0b7ff83426 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 44dd38e7430e311b08d019670af02ba95edd264e Mon Sep 17 00:00:00 2001
+From 8747c4a54e1c16d7e96a02212f2583f40d9d5523 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 038d1beb08ab34c9ca9e184dec9fdc83887bb0f0 Mon Sep 17 00:00:00 2001
+From 7aef7e6c46ff1f2c9b6b348b817b7af04f4eb327 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 d5ab308d68818daf36befd871e7e2ace01d23479 Mon Sep 17 00:00:00 2001
+From d60f114d2e756c1757df92f70c3bf32a631f5a6d 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 23765cfe217052f421684a8ba05260245d33b2ec Mon Sep 17 00:00:00 2001
+From e5707119e3a0e1279df92b73c9d618eb7956c7c8 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 f0c7705947c6a451e14395327a4a99a8d410daf4 Mon Sep 17 00:00:00 2001
+From ae75234b451d6cf85e70ed248e758aa8d0510e72 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 c29cf606489a4e59e68a6c93e17200afe054c25d Mon Sep 17 00:00:00 2001
+From 4e7e25927d68916ab42503766e264c3db44155be 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 ab2d9521139e82f956683828c60f506fdf6a0da2 Mon Sep 17 00:00:00 2001
+From e3615f3fa41f42a38dbc675946b23311055a8938 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 c5fe30d39567423a3ad99602b7b16e9fea60de23 Mon Sep 17 00:00:00 2001
+From e166921a9aab5987a18667ff0faed088cdc870f2 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 9a96f7e60f3b3f14e8b93ced586c7dd7382aa18d Mon Sep 17 00:00:00 2001
+From aa93d11f7bf75114678d117ff6716ac053fbfa7a 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 f539a053099a090b756663ea24cb1138e398501a Mon Sep 17 00:00:00 2001
+From 695554e3a650ccdb4d3d1d1ae56fb6bfacda48ea 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

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

@@ -1,4 +1,4 @@
-From d16c4523a2ceb4982d61f4ab9de0de7c8365e36b Mon Sep 17 00:00:00 2001
+From c273b600a1dc967bfb9584ffb910e5ac05a3feb5 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 d4bf4914fbad3a515eee90f86b75c1ed0c4a6897 Mon Sep 17 00:00:00 2001
+From b4f68c78aa8154ab3f3fee79fa35967382eb3aff 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 0c39657113b2d277479e3d54af0d629adb382b64 Mon Sep 17 00:00:00 2001
+From 3023d912fbd278e9cce35e715477f5a1969e1441 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 f0d5641078f99b04e23d73e262a8c333a738ec35 Mon Sep 17 00:00:00 2001
+From a7b3e4ecddc7a8203270b844a902a2d0a892cf25 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,4 +1,4 @@
-From 00c7ee3cabfe5725c8a1b466cca6cdf7a6e61f01 Mon Sep 17 00:00:00 2001
+From cd9f774fd319b7bc548a18585c2ac16cbc61076a 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

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

@@ -1,4 +1,4 @@
-From f36cbb4943bd6515cb4b1192c6243223a3d3290f Mon Sep 17 00:00:00 2001
+From cead8b988efa720dedbe6a3b314552416780234d 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 d67111c349697a604e4f0d42987c1f2cf6f54d2c Mon Sep 17 00:00:00 2001
+From 5e62f68946e40092b2fddd799acc3aba09caf23c 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 0a4aa07..bad3e43 100644
+index 6377570..4f87919 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -83,6 +83,14 @@

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

@@ -1,4 +1,4 @@
-From aec4742c4696be1fb949189ddd4c02fd20bdaa00 Mon Sep 17 00:00:00 2001
+From 785014588a688d3453f23d230ef33662d51e3556 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 557701997ce405356a4c971de0a32a8587511244 Mon Sep 17 00:00:00 2001
+From 87d690ad5537531bc6eb1ac0d96dd4c21d6f64c9 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

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

@@ -1,4 +1,4 @@
-From 13ab33d4e7852bc53e1c51bac7a312b25e041503 Mon Sep 17 00:00:00 2001
+From e13667d0360393598b38b158b13e1d1018d7bd68 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/0003-mc-dev-imports.patch

@@ -1,4 +1,4 @@
-From 8e5e19fbbd923c11ef5ac57bfb402a1237bd614a Mon Sep 17 00:00:00 2001
+From fd78b8e2113ce1142bade02177cd0faa07b34ae7 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/0004-Obfuscation-Helpers.patch

@@ -1,4 +1,4 @@
-From 81c785f55dd68fa4b55c1626e3a2ab08e3776f7f Mon Sep 17 00:00:00 2001
+From e65f697fae5a24e96c2eb6d5e5e73e0256425022 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 bf1678d..f965592 100644
+index 449d336..f8274ee 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1263,6 +1263,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs

CraftBukkit-Patches/0005-Spigot-Configuration.patch

@@ -1,4 +1,4 @@
-From 92394ce4c8727ef50ae51c9090a6c8cdaaa29d73 Mon Sep 17 00:00:00 2001
+From 990c91d3496dc24aca7e201b7bb46c7fce3f0279 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 c0aff53..53b5e87 100644
+index 6d80991..9a38cca 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -165,6 +165,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -35,7 +35,7 @@ index c0aff53..53b5e87 100644
              if (!this.getOnlineMode()) {
                  DedicatedServer.LOGGER.warn("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!");
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index bb8fd66..bdedeee 100644
+index f5b497c..fa104d1 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -97,6 +97,7 @@ public abstract class World implements IBlockAccess {

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

@@ -1,4 +1,4 @@
-From 0f544805062834e55ff56f0cde813c693dbcc85d Mon Sep 17 00:00:00 2001
+From 876a2fbc11025b6010feb8734606f77f00067506 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/0007-Merge-tweaks-and-configuration.patch

@@ -1,4 +1,4 @@
-From ce110c7a6c2873311e74cc6391cdf8ebe7022b52 Mon Sep 17 00:00:00 2001
+From 53735167b867b6452097a69ee6633b6202e3d2b5 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
@@ -43,10 +43,10 @@ index 6009cac..7ea1150 100644
                      }
                  } else {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index bdedeee..a7c1afe 100644
+index fa104d1..05175e1 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -898,6 +898,23 @@ public abstract class World implements IBlockAccess {
+@@ -901,6 +901,23 @@ public abstract class World implements IBlockAccess {
              // Not all projectiles extend EntityProjectile, so check for Bukkit interface instead
              event = CraftEventFactory.callProjectileLaunchEvent(entity);
          }

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

@@ -1,4 +1,4 @@
-From dc01590bc8e5a48fa1bb790e2570e9a27c748ee0 Mon Sep 17 00:00:00 2001
+From 31fcd4d94fe479ee05cb705dc715d59a94ae2dba 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
@@ -26,7 +26,7 @@ index 12589d6..1d2f580 100644
      public int a(Random random) {
          return 1;
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index f832dc7..d5bfef5 100644
+index 33bbcbe..0b851a9 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -618,6 +618,7 @@ public abstract class EntityLiving extends Entity {
@@ -78,10 +78,10 @@ index 8b38bd2..f8570a8 100644
              this.trackedPlayers.remove(entityplayer);
              this.tracker.c(entityplayer);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index a7c1afe..010374f 100644
+index 05175e1..c5c7503 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -868,6 +868,7 @@ public abstract class World implements IBlockAccess {
+@@ -871,6 +871,7 @@ public abstract class World implements IBlockAccess {
      }
  
      public boolean addEntity(Entity entity, SpawnReason spawnReason) { // Changed signature, added SpawnReason
@@ -89,7 +89,7 @@ index a7c1afe..010374f 100644
          if (entity == null) return false;
          // CraftBukkit end
          int i = MathHelper.floor(entity.locX / 16.0D);
-@@ -974,6 +975,7 @@ public abstract class World implements IBlockAccess {
+@@ -977,6 +978,7 @@ public abstract class World implements IBlockAccess {
      }
  
      public void removeEntity(Entity entity) {
@@ -97,7 +97,7 @@ index a7c1afe..010374f 100644
          entity.b(false);
          entity.die();
          if (entity instanceof EntityHuman) {
-@@ -2417,6 +2419,7 @@ public abstract class World implements IBlockAccess {
+@@ -2420,6 +2422,7 @@ public abstract class World implements IBlockAccess {
      }
  
      public void a(Collection<Entity> collection) {

CraftBukkit-Patches/0009-View-Distance.patch

@@ -1,4 +1,4 @@
-From 64c0667e827ec6dc583a7b346be5601838c4dd51 Mon Sep 17 00:00:00 2001
+From 76af8264cfaab9954e9733d2822a35a9ab28817b 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

CraftBukkit-Patches/0010-Spigot-Timings.patch

@@ -1,4 +1,4 @@
-From b0bfccd96c4591deba5aa0f8a356cd2ee69f2775 Mon Sep 17 00:00:00 2001
+From 4a83498a6be54b7697c43eba373d11b5aedde899 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
@@ -46,7 +46,7 @@ index 38b9d16..8f3cd56 100644
  
          return chunk;
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index c8a89ed..c1b1e1a 100644
+index 003aee0..53b5296 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -44,7 +44,9 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -96,7 +96,7 @@ index c8a89ed..c1b1e1a 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 53b5e87..92dd207 100644
+index 9a38cca..1361b06 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -22,6 +22,7 @@ import java.io.PrintStream;
@@ -160,7 +160,7 @@ index 4f0098f..63cc105 100644
  
      public void recalcPosition() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 218dc63..3ca9a07 100644
+index 0b851a9..dc91f0a 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -23,6 +23,8 @@ import org.bukkit.event.entity.EntityRegainHealthEvent;
@@ -230,7 +230,7 @@ index 218dc63..3ca9a07 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f965592..9061ff2 100644
+index f8274ee..7985cb2 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -45,6 +45,7 @@ import org.bukkit.craftbukkit.CraftServer;
@@ -355,7 +355,7 @@ index f965592..9061ff2 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 d39d2fe..212c576 100644
+index ab6b36f..a125127 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1234,6 +1234,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -407,7 +407,7 @@ index baf1d73..8bbdc11 100644
      private static Map<String, Class<? extends TileEntity>> f = Maps.newHashMap();
      private static Map<Class<? extends TileEntity>, String> g = Maps.newHashMap();
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 010374f..b2305d9 100644
+index c5c7503..11e8de4 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -18,6 +18,7 @@ import com.google.common.collect.Maps;
@@ -427,15 +427,15 @@ index 010374f..b2305d9 100644
      public CraftWorld getWorld() {
          return this.world;
      }
-@@ -131,6 +134,7 @@ public abstract class World implements IBlockAccess {
+@@ -134,6 +137,7 @@ public abstract class World implements IBlockAccess {
-         this.isClientSide = flag;
+         this.N.world = (WorldServer) this;
-         this.N = worldprovider.getWorldBorder();
+         this.getServer().addWorld(this.world);
-         this.getServer().addWorld(this.world);  // CraftBukkit
+         // CraftBukkit end
 +        timings = new SpigotTimings.WorldTimingsHandler(this); // Spigot - code below can generate new world and access timings
      }
  
      public World b() {
-@@ -1303,6 +1307,7 @@ public abstract class World implements IBlockAccess {
+@@ -1306,6 +1310,7 @@ public abstract class World implements IBlockAccess {
          CrashReportSystemDetails crashreportsystemdetails1;
          CrashReport crashreport1;
  
@@ -443,7 +443,7 @@ index 010374f..b2305d9 100644
          // CraftBukkit start - Use field for loop variable
          for (this.tickPosition = 0; this.tickPosition < this.entityList.size(); ++this.tickPosition) {
              entity = (Entity) this.entityList.get(this.tickPosition);
-@@ -1320,7 +1325,9 @@ public abstract class World implements IBlockAccess {
+@@ -1323,7 +1328,9 @@ public abstract class World implements IBlockAccess {
              this.methodProfiler.a("tick");
              if (!entity.dead && !(entity instanceof EntityPlayer)) {
                  try {
@@ -453,7 +453,7 @@ index 010374f..b2305d9 100644
                  } catch (Throwable throwable1) {
                      crashreport1 = CrashReport.a(throwable1, "Ticking entity");
                      crashreportsystemdetails1 = crashreport1.a("Entity being ticked");
-@@ -1346,6 +1353,7 @@ public abstract class World implements IBlockAccess {
+@@ -1349,6 +1356,7 @@ public abstract class World implements IBlockAccess {
              this.methodProfiler.b();
          }
  
@@ -461,7 +461,7 @@ index 010374f..b2305d9 100644
          this.methodProfiler.c("blockEntities");
          this.M = true;
          // CraftBukkit start - From below, clean up tile entities before ticking them
-@@ -1366,6 +1374,7 @@ public abstract class World implements IBlockAccess {
+@@ -1369,6 +1377,7 @@ public abstract class World implements IBlockAccess {
                  if (this.isLoaded(blockposition) && this.N.a(blockposition)) {
                      try {
                          this.methodProfiler.a(tileentity.getClass().getSimpleName());
@@ -469,7 +469,7 @@ index 010374f..b2305d9 100644
                          ((ITickable) tileentity).c();
                          this.methodProfiler.b();
                      } catch (Throwable throwable2) {
-@@ -1374,6 +1383,11 @@ public abstract class World implements IBlockAccess {
+@@ -1377,6 +1386,11 @@ public abstract class World implements IBlockAccess {
                          tileentity.a(crashreportsystemdetails1);
                          throw new ReportedException(crashreport1);
                      }
@@ -481,7 +481,7 @@ index 010374f..b2305d9 100644
                  }
              }
  
-@@ -1386,6 +1400,8 @@ public abstract class World implements IBlockAccess {
+@@ -1389,6 +1403,8 @@ public abstract class World implements IBlockAccess {
              }
          }
  
@@ -490,7 +490,7 @@ index 010374f..b2305d9 100644
          this.M = false;
          /* CraftBukkit start - Moved up
          if (!this.tileEntityListUnload.isEmpty()) {
-@@ -1420,6 +1436,7 @@ public abstract class World implements IBlockAccess {
+@@ -1423,6 +1439,7 @@ public abstract class World implements IBlockAccess {
              this.b.clear();
          }
  
@@ -498,7 +498,7 @@ index 010374f..b2305d9 100644
          this.methodProfiler.b();
          this.methodProfiler.b();
      }
-@@ -1463,6 +1480,7 @@ public abstract class World implements IBlockAccess {
+@@ -1466,6 +1483,7 @@ public abstract class World implements IBlockAccess {
          // CraftBukkit start - Use neighbor cache instead of looking up
          Chunk startingChunk = this.getChunkIfLoaded(i >> 4, j >> 4);
          if (!flag || (startingChunk != null && startingChunk.areNeighborsLoaded(2)) /* this.isAreaLoaded(i - b0, 0, j - b0, i + b0, 0, j + b0) */) {
@@ -506,7 +506,7 @@ index 010374f..b2305d9 100644
              // CraftBukkit end
              entity.M = entity.locX;
              entity.N = entity.locY;
-@@ -1530,6 +1548,7 @@ public abstract class World implements IBlockAccess {
+@@ -1533,6 +1551,7 @@ public abstract class World implements IBlockAccess {
                  }
              }
  

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

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

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

@@ -1,14 +1,14 @@
-From c3f267cdf3016e997fe73dff2eeb4434dd8486ad Mon Sep 17 00:00:00 2001
+From 9976921598c758d4086bb6e29eaea4070c51e3c8 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 b2305d9..ee249b6 100644
+index 11e8de4..718ad04 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1367,6 +1367,13 @@ public abstract class World implements IBlockAccess {
+@@ -1370,6 +1370,13 @@ public abstract class World implements IBlockAccess {
  
          while (iterator.hasNext()) {
              TileEntity tileentity = (TileEntity) iterator.next();

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

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

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

@@ -1,4 +1,4 @@
-From c71914cc83d2736d7ea1c2d8a44b5e93653f3f92 Mon Sep 17 00:00:00 2001
+From e0a355fa36a67765444ee9fd9136ae31382e615c 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
@@ -168,7 +168,7 @@ index eb0f8eb..39af5d5 100644
          // Spigot start
          double radius = world.spigotConfig.itemMerge;
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index e5704fd..1ed0400 100644
+index dc91f0a..36ef280 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -102,6 +102,13 @@ public abstract class EntityLiving extends Entity {
@@ -186,10 +186,10 @@ index e5704fd..1ed0400 100644
      public void Q() {
          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 ee249b6..2eaa1cb 100644
+index 718ad04..a6bd744 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1307,6 +1307,7 @@ public abstract class World implements IBlockAccess {
+@@ -1310,6 +1310,7 @@ public abstract class World implements IBlockAccess {
          CrashReportSystemDetails crashreportsystemdetails1;
          CrashReport crashreport1;
  
@@ -197,7 +197,7 @@ index ee249b6..2eaa1cb 100644
          timings.entityTick.startTiming(); // Spigot
          // CraftBukkit start - Use field for loop variable
          for (this.tickPosition = 0; this.tickPosition < this.entityList.size(); ++this.tickPosition) {
-@@ -1484,9 +1485,11 @@ public abstract class World implements IBlockAccess {
+@@ -1487,9 +1488,11 @@ public abstract class World implements IBlockAccess {
          int j = MathHelper.floor(entity.locZ);
          byte b0 = 32;
  

CraftBukkit-Patches/0015-Metrics.patch

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

CraftBukkit-Patches/0016-PlayerItemDamageEvent.patch

@@ -1,4 +1,4 @@
-From 1083cb33e05d7bcf0b099fd46c68f1c361093bd1 Mon Sep 17 00:00:00 2001
+From d90095ba6ee7be68fed4895caf529de47525b900 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 e8ad8786c6328c9a01462f0dd6c3c1b03473bfd1 Mon Sep 17 00:00:00 2001
+From 8ab16d84c2c2527ca6d12c3f2ecee24d46e9facb 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 4cf6a4c069827b34e5d1ee8007baa6c62848352c Mon Sep 17 00:00:00 2001
+From f7020dc8e3f83b179a9ae3e8df654c1498dafc06 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

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

@@ -1,4 +1,4 @@
-From 8ff8b8fec0b8f1f483ba928a405ed0946ef4a6a3 Mon Sep 17 00:00:00 2001
+From c80bcc2152798c930886951e4a7dadec80af2623 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 5f99873d4186a6be4ce9bbf25c86328c2135edb7 Mon Sep 17 00:00:00 2001
+From 1fdbeff9746f4351c28d219906ba0827c4e042c3 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 8a37308b1c8dd725d5662048b005bc6f1b163a37 Mon Sep 17 00:00:00 2001
+From 4f8eb5a098a2303e0aa999424b5a425d6e20640a 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

CraftBukkit-Patches/0022-Recipe-Deconstruction.patch

@@ -1,4 +1,4 @@
-From 25813993ae1e7b40a6b58c7fde1ce61cb71e9108 Mon Sep 17 00:00:00 2001
+From 2eb971b8ea7c38519d0acaa6dbae6e74bf2cb457 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 9b4f5137f204ffb2f3eeeeca0787ae133fdc8257 Mon Sep 17 00:00:00 2001
+From d468b6a997fe3765682774a037d9fe7208e77647 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 68ce95ca445ea5500f1ef9e7ab0cfdf910b51e2d Mon Sep 17 00:00:00 2001
+From 6b0ebbee8cf70d21d0eb858d3fb1728ac1ae46f4 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-Firework-Meta-Crash-Fix.patch

@@ -1,4 +1,4 @@
-From d5fcc142f5bdb75438c67490e1293e89cb2194ab Mon Sep 17 00:00:00 2001
+From 12c21abb5f5c7728ff6312b73ca738cf2910085a 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/0026-Allow-Disabling-of-Command-Logging.patch

@@ -1,11 +1,11 @@
-From fd54e0852c6b1ce70392ce2596a2f93c493c9349 Mon Sep 17 00:00:00 2001
+From e8472d0d5873dad6c8bf1e32c5c30962523bdf28 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 212c576..c13a2be 100644
+index a125127..785372f 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1236,6 +1236,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {

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

@@ -1,4 +1,4 @@
-From 1ecd0d2095dc90232d8d4ece718453ed83ea336e Mon Sep 17 00:00:00 2001
+From b4675b950f4c405e96367011a77fb16fda3cd5aa 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/0028-Configurable-Messages.patch

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

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

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

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

@@ -1,4 +1,4 @@
-From 846fc496d915908dcc67a043e0261ade0b4f82ff Mon Sep 17 00:00:00 2001
+From 2dd0071691dbc596290019977fa9665463e7870b 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

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

@@ -1,11 +1,11 @@
-From 7f19d7e7e7ded0f3a6287ce0587e62ad5bfeb544 Mon Sep 17 00:00:00 2001
+From 7cbd31d918c0c0fe968f41c1bde0c971694f7ac6 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 c13a2be..f785d9f 100644
+index 785372f..57d74b1 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1397,6 +1397,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {

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

@@ -1,4 +1,4 @@
-From dff771cb23a66e9f7681e33108bcc7c7be1e9be9 Mon Sep 17 00:00:00 2001
+From cf164be65d7c2d5d3a0456d6d78e87375a0ab6e1 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 27 Feb 2016 10:07:58 +1100
 Subject: [PATCH] Entity Mount and Dismount Events

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

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

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

@@ -1,4 +1,4 @@
-From 5d3bb1f3aa738f787b50eeca611e901225094f43 Mon Sep 17 00:00:00 2001
+From 63ae188a51ad00dc2f9530ae65fa062e1332271e 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/0035-Player-Collision-API.patch

@@ -1,11 +1,11 @@
-From 5b1adb577f1517f238a6330131d4b7153db07132 Mon Sep 17 00:00:00 2001
+From d3abf8e422cced1d74772b9b14e361d65dc2a0f8 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 3 Aug 2013 19:27:07 +1000
 Subject: [PATCH] Player Collision API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 95bf165..b7355b0 100644
+index ce50925..7738af4 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -376,6 +376,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -25,7 +25,7 @@ index 95bf165..b7355b0 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index aba9047..b78b273 100644
+index 36ef280..c2f5ee1 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1966,7 +1966,7 @@ public abstract class EntityLiving extends Entity {

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

@@ -1,11 +1,11 @@
-From accd1742de8b965b819198e95f1edf8599be21b1 Mon Sep 17 00:00:00 2001
+From b479a3f64dc5ddc7b1bed9a442747649f98c97cb 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 9061ff2..ea7e0bd 100644
+index 7985cb2..2dbe78a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -657,11 +657,11 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs

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

@@ -1,4 +1,4 @@
-From 01364dbf67a69279c652d89160b45a96b7bb1470 Mon Sep 17 00:00:00 2001
+From 772a09dbea94136c4be681a8afc7dfba35965906 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/0038-Cap-Minimum-Player-Speed.patch

@@ -1,4 +1,4 @@
-From be15a2a5088b43317c26933b1645cdbd40ae76eb Mon Sep 17 00:00:00 2001
+From 248808468f949313874e7bcbb268e89ee3ea5bc7 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/0039-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch

@@ -1,4 +1,4 @@
-From 56a850636f2d5ea0d5bb4632a26e662d119be4b7 Mon Sep 17 00:00:00 2001
+From c345c700f58a271f1638e3a683c8c28c287be1f4 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/0040-Allow-Disabling-of-1.6.3-Structure-Saving.patch

@@ -1,4 +1,4 @@
-From 82fbb6298f22d11a2ed1c53d3f47c21f7e7e3e78 Mon Sep 17 00:00:00 2001
+From 338d1a0473ae949f6236f6eee08a016391f8d976 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/0041-Don-t-Special-Case-X-Move-Value.patch

@@ -1,11 +1,11 @@
-From f5f87701e5a6ab0f80580fb892c7f5c52ee40e06 Mon Sep 17 00:00:00 2001
+From 43b248af5680128ce1b8cdaf1afb938a41a14b92 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 f785d9f..83a4551 100644
+index 57d74b1..e2b215c 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -124,6 +124,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {

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

@@ -1,4 +1,4 @@
-From a823d20f36d8f9b643f84546223db8a75205b5ef Mon Sep 17 00:00:00 2001
+From b1f94449576d07debe8a8f9ff1c665328b259b57 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/0043-Arrow-Despawn-Rate.patch

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

CraftBukkit-Patches/0044-Watchdog-Thread.patch

@@ -1,11 +1,11 @@
-From fc6573b98957b800678afa46130eac7c5493fab4 Mon Sep 17 00:00:00 2001
+From 888da7cb034e6c7a729d720b21e122b9932fea27 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 92dd207..93ace97 100644
+index 1361b06..e5c0ed9 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -276,7 +276,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -18,7 +18,7 @@ index 92dd207..93ace97 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 ea7e0bd..04c36fe 100644
+index 2dbe78a..4d86a4b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -563,6 +563,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs

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

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

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

@@ -1,4 +1,4 @@
-From 88078807067fbb7644b68ed4cba439069f8eba0d Mon Sep 17 00:00:00 2001
+From ae1236a4a4a148d9eb2e7be52b04eeef85ee54fc 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/0047-Fire-PreLogin-Events-in-Offline-Mode.patch

@@ -1,4 +1,4 @@
-From b2e96c15b5a2e7d0230b712608d26d883ad2a850 Mon Sep 17 00:00:00 2001
+From 375f19d5b86d8c2498918195a67c992259ffa5f6 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/0048-BungeeCord-Support.patch

@@ -1,4 +1,4 @@
-From cbc5ee4521288a2da2b9aeae62759f7e324f9652 Mon Sep 17 00:00:00 2001
+From b43b46d1e7cdf0bff17e50a7e00f9f93faf9ee33 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 8ee721e..4fd9995 100644
+index ee987b9..ed20034 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/0049-Allow-Disabling-Zombie-Villager-Aggression.patch

@@ -1,4 +1,4 @@
-From 71376d91cdd5045cccb79238998187f706a4a5e1 Mon Sep 17 00:00:00 2001
+From 06d44f0f810440e2070437a393ac31f36df863d9 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/0050-Configurable-Amount-of-Netty-Threads.patch

@@ -1,4 +1,4 @@
-From 37d742e73b2e9e710633315d64fdae33abd658e6 Mon Sep 17 00:00:00 2001
+From 3966c642ae368fedf29af097481312ea9e6e2d8b 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 04c36fe..8602ac6 100644
+index 4d86a4b..96d1362 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -57,7 +57,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs

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

@@ -1,4 +1,4 @@
-From d1c933de9b89ebda7e58a6c6d717f8af7ef8cd0c Mon Sep 17 00:00:00 2001
+From 27435da7261f44e7b09a250d0f30068eb7d7ea37 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/0052-Log-Cause-of-Unexpected-Exceptions.patch

@@ -1,11 +1,11 @@
-From 2a2925c6b015c6423b77e307fde7646c5d3012c0 Mon Sep 17 00:00:00 2001
+From f39cb0bae58065bf899255384f87cfbe6a512f7a 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 8602ac6..0aab39b 100644
+index 96d1362..c82c67b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -544,6 +544,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs

CraftBukkit-Patches/0053-Particle-API.patch

@@ -1,4 +1,4 @@
-From d2d688e7e76a2711493cef900b44f251875f6692 Mon Sep 17 00:00:00 2001
+From 99daf1566a45a6d3e3e9e8122eec9d6cc17a0057 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/0054-Save-ticks-lived-to-nbttag.patch

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-From 92ea11e122a121b244220db0d91cbfbfac386e20 Mon Sep 17 00:00:00 2001
+From 2dfb8b1defba6566e19ab064918bb1b9316e69e6 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/0058-Add-Late-Bind-Option.patch

@@ -1,4 +1,4 @@
-From 07a28ec70f33b9e7b16d76f412bf06d060c8f191 Mon Sep 17 00:00:00 2001
+From 7aeea7d6a4332b15cc56691df077db4d28303407 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 93ace97..852f8b4 100644
+index e5c0ed9..d6a01a9 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -176,6 +176,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer

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

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

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

@@ -1,4 +1,4 @@
-From dae46463bd9260d31d69fd7f581933bd54aa7c41 Mon Sep 17 00:00:00 2001
+From 825919ad07bcfd42acb7ecb702bf6b81ab3ed65c 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/0061-Try-and-Debug-Crash-Reports-Crashing.patch

@@ -1,11 +1,11 @@
-From b48d48b32f53d99a57e02f5c1f01a4a55a3036d2 Mon Sep 17 00:00:00 2001
+From 5229014af5bb815790e2345c4fdbde5d867c3ef2 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 0aab39b..49524b1 100644
+index c82c67b..70dbd88 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -743,7 +743,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs

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

@@ -1,4 +1,4 @@
-From a80d57a9e6782a14b839f6fab8908a18377440f7 Mon Sep 17 00:00:00 2001
+From 4f5473f7769a1c5f7f51252a4817522a1a8ed1d7 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 8f3cd56..fd3f457 100644
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 49524b1..254e4bd 100644
+index 70dbd88..a16a2d2 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -655,7 +655,17 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs

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

@@ -1,4 +1,4 @@
-From 8fb434691394ab4b9de38a4c61ecb5f5717a3449 Mon Sep 17 00:00:00 2001
+From 9ac4a3b1609dd19bb6f8b14f37172207bf9ec6c0 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.

CraftBukkit-Patches/0064-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch

@@ -1,4 +1,4 @@
-From 2aaf2dce8108cd38f4107ef765439502d8efb823 Mon Sep 17 00:00:00 2001
+From 293c8c84dca0a789d28c3dcdefa8c9b46f77467a 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

CraftBukkit-Patches/0065-Highly-Optimized-Tick-Loop.patch

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

CraftBukkit-Patches/0066-Configurable-Ping-Sample-Size.patch

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

CraftBukkit-Patches/0067-Add-Optional-Tick-Shuffling.patch

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

CraftBukkit-Patches/0068-Implement-Locale-Getter-for-Players.patch

@@ -1,4 +1,4 @@
-From 42384124ef71bf2c0c1a5747cad64dcb5b523307 Mon Sep 17 00:00:00 2001
+From 2514d0515c9a29dafd7394e6c6f0becb9d81334e 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

CraftBukkit-Patches/0069-Cap-Entity-Collisions.patch

@@ -1,4 +1,4 @@
-From b8003723a21e465327a9ba3d99bcf3b57daa0a51 Mon Sep 17 00:00:00 2001
+From c055436cae43c418f24f4238d0faa39e761c0de2 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 eb552e2..5702cb0 100644
  
      public Entity(World world) {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index b78b273..f0921e8 100644
+index c2f5ee1..b410f3b 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1967,7 +1967,8 @@ public abstract class EntityLiving extends Entity {

CraftBukkit-Patches/0070-Fix-dispensing-bone-meal-not-having-the-correct-data.patch

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

CraftBukkit-Patches/0071-Spam-Filter-Exclusions.patch

@@ -1,11 +1,11 @@
-From c51471c316849ffe05d17d82a3e8248ff534ed17 Mon Sep 17 00:00:00 2001
+From e40f3f6833f52da858a3b9592681eac68298d92e Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 8 Feb 2014 08:13:40 +0000
 Subject: [PATCH] Spam Filter Exclusions
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 83a4551..04559c9 100644
+index e2b215c..859ddf0 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1142,9 +1142,20 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {