Rebuild patches

Bukkit-Patches/0001-POM-Changes.patch

@@ -1,11 +1,11 @@
-From eaef9b5a74b7256497d5f048a61118d7403c7114 Mon Sep 17 00:00:00 2001
+From d891d4be23a02b08bc01d00115df54e08a8e46f7 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 085883e..f29b8f7 100644
+index 9dd0d06..78f50bd 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -9,14 +9,14 @@

Bukkit-Patches/0002-Spigot-Timings.patch

@@ -1,4 +1,4 @@
-From 689cae373c73f7012af4983c0e860aacb30e5e2c Mon Sep 17 00:00:00 2001
+From e936ff8404ffc760fa6b35013d5a5aa0fb31fc5b 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 9d86b5c2fb34a29f2359296b11741944cf852009 Mon Sep 17 00:00:00 2001
+From 8b80c8028e90874d6382b6355c2bfa1ef3f32d0c 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 c140066e1e72dff10c6990391c2da4fcd3d49ae2 Mon Sep 17 00:00:00 2001
+From 69d4e2d62418e869b729afb72fac752cc9867f9a 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 1107e878ce9a25d6d227c2f5911e50b9426ae5fc Mon Sep 17 00:00:00 2001
+From e3cb1034dbd5e6104b9608940e064b9ff3459a06 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 f7119640acf3aefc407193af0d008ad5778fe7a0 Mon Sep 17 00:00:00 2001
+From 8b3d44e37663dc4ed2dca9f48dc22aa2d4b4a220 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 b16fcc0277690b95e0a0dccc467dcbe672d0fbcc Mon Sep 17 00:00:00 2001
+From ba12db25ac5b54b40b72db6c72ab90117a9ca455 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 af797118a38842d6300e9dd3db533d51ebdbfec0 Mon Sep 17 00:00:00 2001
+From b1d35ad51d9d4212545c99ae86f524a01eab893d 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 0e9484d192ed40fd73c72d200ed21b9663181c76 Mon Sep 17 00:00:00 2001
+From d125f464619755c15a17c3b0adb9aebf2f542b28 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 081d8be0bb12572c5c9945a971e8e3bc70a54342 Mon Sep 17 00:00:00 2001
+From 7bf1782e4502a1c496c1c37086fa11ebb07a8bd5 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 4039cbb3b48bfd5b9d12101aadd1cf85a50d9247 Mon Sep 17 00:00:00 2001
+From f5c4949d33fc3d140debef621a8f8cb7a0a4235a 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 11a025f86c9e1eea7da513911ab7ed16a58764f6 Mon Sep 17 00:00:00 2001
+From 9a694e870f7c2e879d6ad3025dcead613c0d038c 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 d9817e86983bce15317ebcfe2b7f022ae1739f6d Mon Sep 17 00:00:00 2001
+From b5368a57b93cf6b2a8e6c4a7c6ed9ce1d0721210 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 571575a4200bd728c3c561f2d54b4f53d6d257c4 Mon Sep 17 00:00:00 2001
+From c779725fc83b658a046c25ab3f66c036052d324b 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 c3acc780182736c8425c7cb4c863d715aab221d7 Mon Sep 17 00:00:00 2001
+From 429027da131e8b962220694075db98f376fe83e7 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 01b001dbfffa571b1bfdd0e93078d5e45eb5893a Mon Sep 17 00:00:00 2001
+From b49464f5caf99a002acfa85c3cc56bdbee4f0477 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 a8e072d75fe03cc8a2223dc168209af41aa9a458 Mon Sep 17 00:00:00 2001
+From 7ca11bfbb3cafca7d3757dd3996e602fd341c97f 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 9872118ae85e59d9c21ef52a292c76b5ee9b1550 Mon Sep 17 00:00:00 2001
+From e924276d69a16e1d79e2d48d511df42775cc43e8 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 f7f681c0df320cebcb422096fe5e1277966c0e39 Mon Sep 17 00:00:00 2001
+From 36011cffe8c7bac88958cbe552179fb380cbe956 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 27f902f0f3e5f5433c2b6b57de05f1c9377b6770 Mon Sep 17 00:00:00 2001
+From a988407d71c84e3ef90de14c3ff65a96f9d87c1d 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 df1fabfccd3c12db91cd70dbdde0fd9548ec8534 Mon Sep 17 00:00:00 2001
+From 93b6f873372e738e553ec8b492a2f684e020fd66 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-Expand-team-API-to-allow-arbitrary-strings.patch

@@ -1,4 +1,4 @@
-From a7d96665f0fb75d63e5303a2e760acddcabd1df2 Mon Sep 17 00:00:00 2001
+From 283dd91bb895cb4cf2a6b1989fd386ab7643155a Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Thu, 17 Apr 2014 19:22:26 +1000
 Subject: [PATCH] Expand team API to allow arbitrary strings.

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

@@ -1,4 +1,4 @@
-From ec920caa2743fc3a032539493e96fd51f076d4a2 Mon Sep 17 00:00:00 2001
+From 329a878ba3ccd1d13de31644a2b82cca84fb1312 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/0024-Add-PlayerSpawnLocationEvent.patch

@@ -1,4 +1,4 @@
-From 0a5a22816e41523289aca5ec44126380bc9697c3 Mon Sep 17 00:00:00 2001
+From 54a99a5f2276ff976a9761de510c8f608c625b5b 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/0025-Ease-ClassLoader-Deadlocks-Where-Possible.patch

@@ -1,4 +1,4 @@
-From 2ba02b2dcbcf4746d935e4bb91dfee0c8db9efeb Mon Sep 17 00:00:00 2001
+From be27bd9a37286960ad6cc36f7506b7c132e7643a 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/0026-Fix-slow-tab-complete-for-some-commands.patch

@@ -1,4 +1,4 @@
-From 7b8f24dfa0f3330c0bf3b554f66a4151f5d8b8f8 Mon Sep 17 00:00:00 2001
+From b0c692aebcc6fbf8fbd53e71cb5aee4b6ec750e7 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/0027-Undeprecate-Player-updateInventory-V.patch

@@ -1,4 +1,4 @@
-From 0ac0cc773249d1d92d2f6ccbbf86bb17b558efcd Mon Sep 17 00:00:00 2001
+From 842dc66ea002c8083bdd26df9babecdd23adda6f 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/0028-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch

@@ -1,4 +1,4 @@
-From 02bf5d1c82da784135f5519c58b0d7e6157971b7 Mon Sep 17 00:00:00 2001
+From f86c7781ee4d20a2b45bedbab35771c594b123f0 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/0029-BungeeCord-Chat-API.patch

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

CraftBukkit-Patches/0001-POM-Changes.patch

@@ -1,4 +1,4 @@
-From 8aef7c3b71fe438e210691764d955554efd55040 Mon Sep 17 00:00:00 2001
+From 9559d82514814e006a54738572cbe0f313c2f639 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-mc-dev-imports.patch

@@ -1,4 +1,4 @@
-From 8a02778847d1de2be3ea1e3a136968a13f989d96 Mon Sep 17 00:00:00 2001
+From d69d53f8ab2ce47b0b39cd6bce280146f4ae04b4 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 e31c5dbce193a2d4aaedd1094e2d37821bdeba7b Mon Sep 17 00:00:00 2001
+From af542d3375e7b4fa8fed4bca3c6a8460ed1f4257 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 a5d8ed7311a8a717390419672a8b7b4165adad01 Mon Sep 17 00:00:00 2001
+From 739b1d49598331c16444398df4315cff5ce5f473 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,10 +6,10 @@ 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 4219e7b..486e652 100644
+index 47aff5a..738fb52 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1288,6 +1288,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -1284,6 +1284,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
  
      }
  

CraftBukkit-Patches/0005-Spigot-Configuration.patch

@@ -1,4 +1,4 @@
-From 0b8be4fd43a70c45431189ab67cc200fa0669586 Mon Sep 17 00:00:00 2001
+From 87a1b9de0edd52ea0f5b7ba3c313b99770259d74 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
@@ -35,7 +35,7 @@ index d57a796..8bc6ad6 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 5c2e218..345ede9 100644
+index 9b0e0ed..437c64d 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -99,6 +99,7 @@ public abstract class World implements IBlockAccess {
@@ -53,7 +53,7 @@ index 5c2e218..345ede9 100644
 +        this.spigotConfig = new org.spigotmc.SpigotWorldConfig( worlddata.getName() ); // Spigot
          this.generator = gen;
          this.world = new CraftWorld((WorldServer) this, gen, env);
-         this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
+         if (gen != null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 index 4b3fcac..2aceeb4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java

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

@@ -1,4 +1,4 @@
-From 33973c35cda51ba40c37a81cd5772b3003b95c8b Mon Sep 17 00:00:00 2001
+From 1dc62bd472d5ecaa6a0d08c963796e1499bff2bc 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 345ede9..bed457a 100644
+index 437c64d..bc0d479 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -65,7 +65,7 @@ public abstract class World implements IBlockAccess {
@@ -50,7 +50,7 @@ index 345ede9..bed457a 100644
      public final org.spigotmc.SpigotWorldConfig spigotConfig; // Spigot
  
      public CraftWorld getWorld() {
-@@ -120,6 +145,12 @@ public abstract class World implements IBlockAccess {
+@@ -123,6 +148,12 @@ public abstract class World implements IBlockAccess {
          this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
          this.ticksPerMonsterSpawns = this.getServer().getTicksPerMonsterSpawns(); // CraftBukkit
          // CraftBukkit end
@@ -63,7 +63,7 @@ index 345ede9..bed457a 100644
          this.L = this.random.nextInt(12000);
          this.allowMonsters = true;
          this.allowAnimals = true;
-@@ -1945,17 +1976,44 @@ public abstract class World implements IBlockAccess {
+@@ -1948,17 +1979,44 @@ public abstract class World implements IBlockAccess {
          int k;
          int l;
  
@@ -112,7 +112,7 @@ index 345ede9..bed457a 100644
  
          this.methodProfiler.b();
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 9f96e11..f4d313e 100644
+index 1587cf2..b04b512 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -344,12 +344,15 @@ public class WorldServer extends World implements IAsyncTaskHandler {

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

@@ -1,4 +1,4 @@
-From b018b675a420b7150b58a336044582a1ce034ba6 Mon Sep 17 00:00:00 2001
+From 5c4995c2fc8ca3530f65c62daf69a75d0244ae97 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-More-Efficient-Chunk-Save-Queue.patch

@@ -1,4 +1,4 @@
-From a343b092ffaac6e336eef36fac78bb6ad4962d1c Mon Sep 17 00:00:00 2001
+From 9bf8623ff0667c6d6d10b4d1276e0a86c59f8d65 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 11 Jun 2013 12:09:45 +1000
 Subject: [PATCH] More Efficient Chunk Save Queue

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

@@ -1,4 +1,4 @@
-From d715d750c402d8651a2df9457336ad821ba3085a Mon Sep 17 00:00:00 2001
+From d23b5e9c3bd170760516f2b11e4be553dd5696a2 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Mar 2013 09:46:33 +1100
 Subject: [PATCH] Merge tweaks and configuration
@@ -41,10 +41,10 @@ index 1e575fe..fa7e6df 100644
                      }
                  } else {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index bed457a..581224f 100644
+index bc0d479..33edb6d 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -967,6 +967,23 @@ public abstract class World implements IBlockAccess {
+@@ -970,6 +970,23 @@ public abstract class World implements IBlockAccess {
              // Not all projectiles extend EntityProjectile, so check for Bukkit interface instead
              event = CraftEventFactory.callProjectileLaunchEvent(entity);
          }

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

@@ -1,4 +1,4 @@
-From 96589be25d952b55e40a187d76180559f16c4e66 Mon Sep 17 00:00:00 2001
+From b8b201abbbe9c86165bb5e6452f5ed65a4bcf5a7 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
@@ -78,10 +78,10 @@ index 5ef2be4..8d50e05 100644
              this.trackedPlayers.remove(entityplayer);
              entityplayer.d(this.tracker);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 581224f..a67736a 100644
+index 33edb6d..5e25f3f 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -937,6 +937,7 @@ public abstract class World implements IBlockAccess {
+@@ -940,6 +940,7 @@ public abstract class World implements IBlockAccess {
      }
  
      public boolean addEntity(Entity entity, SpawnReason spawnReason) { // Changed signature, added SpawnReason
@@ -89,7 +89,7 @@ index 581224f..a67736a 100644
          if (entity == null) return false;
          // CraftBukkit end
          int i = MathHelper.floor(entity.locX / 16.0D);
-@@ -1044,6 +1045,7 @@ public abstract class World implements IBlockAccess {
+@@ -1047,6 +1048,7 @@ public abstract class World implements IBlockAccess {
      }
  
      public void removeEntity(Entity entity) {
@@ -97,7 +97,7 @@ index 581224f..a67736a 100644
          entity.die();
          if (entity instanceof EntityHuman) {
              this.players.remove(entity);
-@@ -2474,6 +2476,7 @@ public abstract class World implements IBlockAccess {
+@@ -2484,6 +2486,7 @@ public abstract class World implements IBlockAccess {
      }
  
      public void b(Collection<Entity> collection) {

CraftBukkit-Patches/0011-View-Distance.patch

@@ -1,4 +1,4 @@
-From b0d1021f4563af84588befe541738357b38a8cbb Mon Sep 17 00:00:00 2001
+From ed3bb3dddd315ad5efd3b9bc82736cf8c1e2738c 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 f4d313e..08b21a5 100644
+index b04b512..31bb2eb 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -61,7 +61,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {

CraftBukkit-Patches/0012-Spigot-Timings.patch

@@ -1,4 +1,4 @@
-From 6b26c0f937b54831297537d4753d9cc6d3acdbcb Mon Sep 17 00:00:00 2001
+From ce8c304984522d44281eb7b859d7c9783f3e9234 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
@@ -242,7 +242,7 @@ index 256953f..24aaec5 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 486e652..61abf67 100644
+index 738fb52..96d38b6 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -46,6 +46,7 @@ import joptsimple.OptionSet;
@@ -253,7 +253,7 @@ index 486e652..61abf67 100644
  import org.bukkit.craftbukkit.util.Waitable;
  import org.bukkit.event.server.RemoteServerCommandEvent;
  import org.bukkit.event.world.WorldSaveEvent;
-@@ -617,6 +618,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -613,6 +614,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
      protected void y() {}
  
      protected void z() throws ExceptionWorldConflict { // CraftBukkit - added throws
@@ -261,7 +261,7 @@ index 486e652..61abf67 100644
          long i = System.nanoTime();
  
          ++this.ticks;
-@@ -643,10 +645,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -639,10 +641,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
          }
  
          if (autosavePeriod > 0 && this.ticks % autosavePeriod == 0) { // CraftBukkit
@@ -274,7 +274,7 @@ index 486e652..61abf67 100644
          }
  
          this.methodProfiler.a("tallying");
-@@ -663,6 +667,8 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -659,6 +663,8 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
  
          this.methodProfiler.b();
          this.methodProfiler.b();
@@ -283,7 +283,7 @@ index 486e652..61abf67 100644
      }
  
      public void A() {
-@@ -677,16 +683,23 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -673,16 +679,23 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
  
          this.methodProfiler.c("levels");
  
@@ -307,7 +307,7 @@ index 486e652..61abf67 100644
          // Send time updates to everyone, it will get the right time from the world the player is in.
          if (this.ticks % 20 == 0) {
              for (int i = 0; i < this.getPlayerList().players.size(); ++i) {
-@@ -694,6 +707,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -690,6 +703,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
                  entityplayer.playerConnection.sendPacket(new PacketPlayOutUpdateTime(entityplayer.world.getTime(), entityplayer.getPlayerTime(), entityplayer.world.getGameRules().getBoolean("doDaylightCycle"))); // Add support for per player time
              }
          }
@@ -315,7 +315,7 @@ index 486e652..61abf67 100644
  
          int i;
  
-@@ -717,7 +731,9 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -713,7 +727,9 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
                  CrashReport crashreport;
  
                  try {
@@ -325,7 +325,7 @@ index 486e652..61abf67 100644
                  } catch (Throwable throwable) {
                      crashreport = CrashReport.a(throwable, "Exception ticking world");
                      worldserver.a(crashreport);
-@@ -725,7 +741,9 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -721,7 +737,9 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
                  }
  
                  try {
@@ -335,7 +335,7 @@ index 486e652..61abf67 100644
                  } catch (Throwable throwable1) {
                      crashreport = CrashReport.a(throwable1, "Exception ticking world entities");
                      worldserver.a(crashreport);
-@@ -734,7 +752,9 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -730,7 +748,9 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
  
                  this.methodProfiler.b();
                  this.methodProfiler.a("tracker");
@@ -345,7 +345,7 @@ index 486e652..61abf67 100644
                  this.methodProfiler.b();
                  this.methodProfiler.b();
              // } // CraftBukkit
-@@ -743,14 +763,20 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -739,14 +759,20 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
          }
  
          this.methodProfiler.c("connection");
@@ -419,7 +419,7 @@ index 8afd376..71bf63a 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 a67736a..bf4c758 100644
+index 5e25f3f..d141c98 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -18,6 +18,7 @@ import org.bukkit.Bukkit;
@@ -439,7 +439,7 @@ index a67736a..bf4c758 100644
      public CraftWorld getWorld() {
          return this.world;
      }
-@@ -190,6 +193,7 @@ public abstract class World implements IBlockAccess {
+@@ -193,6 +196,7 @@ public abstract class World implements IBlockAccess {
          }); 
          this.getServer().addWorld(this.world); 
          // CraftBukkit end
@@ -447,7 +447,7 @@ index a67736a..bf4c758 100644
      }
  
      public World b() {
-@@ -1299,6 +1303,7 @@ public abstract class World implements IBlockAccess {
+@@ -1302,6 +1306,7 @@ public abstract class World implements IBlockAccess {
          this.g.clear();
          this.methodProfiler.c("regular");
  
@@ -455,7 +455,7 @@ index a67736a..bf4c758 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);
-@@ -1315,7 +1320,9 @@ public abstract class World implements IBlockAccess {
+@@ -1318,7 +1323,9 @@ public abstract class World implements IBlockAccess {
              this.methodProfiler.a("tick");
              if (!entity.dead) {
                  try {
@@ -465,7 +465,7 @@ index a67736a..bf4c758 100644
                  } catch (Throwable throwable1) {
                      crashreport = CrashReport.a(throwable1, "Ticking entity");
                      crashreportsystemdetails = crashreport.a("Entity being ticked");
-@@ -1340,7 +1347,9 @@ public abstract class World implements IBlockAccess {
+@@ -1343,7 +1350,9 @@ public abstract class World implements IBlockAccess {
              this.methodProfiler.b();
          }
  
@@ -475,7 +475,7 @@ index a67736a..bf4c758 100644
          this.M = true;
          // CraftBukkit start - From below, clean up tile entities before ticking them
          if (!this.c.isEmpty()) {
-@@ -1359,6 +1368,7 @@ public abstract class World implements IBlockAccess {
+@@ -1362,6 +1371,7 @@ public abstract class World implements IBlockAccess {
  
                  if (this.isLoaded(blockposition) && this.N.a(blockposition)) {
                      try {
@@ -483,7 +483,7 @@ index a67736a..bf4c758 100644
                          ((IUpdatePlayerListBox) tileentity).c();
                      } catch (Throwable throwable2) {
                          CrashReport crashreport1 = CrashReport.a(throwable2, "Ticking block entity");
-@@ -1367,6 +1377,11 @@ public abstract class World implements IBlockAccess {
+@@ -1370,6 +1380,11 @@ public abstract class World implements IBlockAccess {
                          tileentity.a(crashreportsystemdetails1);
                          throw new ReportedException(crashreport1);
                      }
@@ -495,7 +495,7 @@ index a67736a..bf4c758 100644
                  }
              }
  
-@@ -1379,6 +1394,8 @@ public abstract class World implements IBlockAccess {
+@@ -1382,6 +1397,8 @@ public abstract class World implements IBlockAccess {
              }
          }
  
@@ -504,7 +504,7 @@ index a67736a..bf4c758 100644
          this.M = false;
          /* CraftBukkit start - Moved up
          if (!this.c.isEmpty()) {
-@@ -1411,6 +1428,7 @@ public abstract class World implements IBlockAccess {
+@@ -1414,6 +1431,7 @@ public abstract class World implements IBlockAccess {
              this.b.clear();
          }
  
@@ -512,7 +512,7 @@ index a67736a..bf4c758 100644
          this.methodProfiler.b();
          this.methodProfiler.b();
      }
-@@ -1455,6 +1473,7 @@ public abstract class World implements IBlockAccess {
+@@ -1458,6 +1476,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) */) {
@@ -520,7 +520,7 @@ index a67736a..bf4c758 100644
              // CraftBukkit end
              entity.P = entity.locX;
              entity.Q = entity.locY;
-@@ -1518,6 +1537,7 @@ public abstract class World implements IBlockAccess {
+@@ -1521,6 +1540,7 @@ public abstract class World implements IBlockAccess {
                  }
              }
  
@@ -529,7 +529,7 @@ index a67736a..bf4c758 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 08b21a5..af4a551 100644
+index 31bb2eb..cd07095 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -210,10 +210,13 @@ public class WorldServer extends World implements IAsyncTaskHandler {

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

@@ -1,4 +1,4 @@
-From 5bf8504ba7b121589bb1244e4d1bc77eea87e938 Mon Sep 17 00:00:00 2001
+From 443e7bdd84b69b218b3605e9115ce9881c10a1ad 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/0014-Handle-Null-Tile-Entities.patch

@@ -1,14 +1,14 @@
-From e05b61bd35a73364115bba2cf092b4a168a85dcc Mon Sep 17 00:00:00 2001
+From bee61fa06a11c6801d572612e9db8836b481cd3f 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 bf4c758..c78c2d8 100644
+index d141c98..40faa66 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1362,6 +1362,13 @@ public abstract class World implements IBlockAccess {
+@@ -1365,6 +1365,13 @@ public abstract class World implements IBlockAccess {
  
          while (iterator.hasNext()) {
              TileEntity tileentity = (TileEntity) iterator.next();

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

@@ -1,4 +1,4 @@
-From 8bf46817709567086980648b133a6f148823dafd Mon Sep 17 00:00:00 2001
+From 4c0c9850ed8e0d16ab2a08b3cd6c638a3958d713 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
@@ -196,10 +196,10 @@ index 24aaec5..e90ff2f 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 c78c2d8..6a975d3 100644
+index 40faa66..5116444 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1303,6 +1303,7 @@ public abstract class World implements IBlockAccess {
+@@ -1306,6 +1306,7 @@ public abstract class World implements IBlockAccess {
          this.g.clear();
          this.methodProfiler.c("regular");
  
@@ -207,7 +207,7 @@ index c78c2d8..6a975d3 100644
          timings.entityTick.startTiming(); // Spigot
          // CraftBukkit start - Use field for loop variable
          for (this.tickPosition = 0; this.tickPosition < this.entityList.size(); ++this.tickPosition) {
-@@ -1477,9 +1478,11 @@ public abstract class World implements IBlockAccess {
+@@ -1480,9 +1481,11 @@ public abstract class World implements IBlockAccess {
          int j = MathHelper.floor(entity.locZ);
          byte b0 = 32;
  

CraftBukkit-Patches/0016-Metrics.patch

@@ -1,4 +1,4 @@
-From d43cb74feda3fbf8926bd8a5976bdf080ef1b7bd Mon Sep 17 00:00:00 2001
+From 28205cc367394da317ed298563cb1afb2b1955cc 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/0017-PlayerItemDamageEvent.patch

@@ -1,4 +1,4 @@
-From 1447382b4c93fa76fea2224645c098378fed842f Mon Sep 17 00:00:00 2001
+From 7230fb058e223a98656be635d9df294b09850a19 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/0018-Prevent-NPE-in-CraftSign.patch

@@ -1,4 +1,4 @@
-From 0fc477fceaa65b72cb18e542807c922c25e3ea09 Mon Sep 17 00:00:00 2001
+From 3a5a748f61e6319b40762319333d5fdde3d9ef1c 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/0019-Entity-Tracking-Ranges.patch

@@ -1,4 +1,4 @@
-From 3610083330f3022f069598e344801350f76fa74e Mon Sep 17 00:00:00 2001
+From bf159007e9934710d7427b9d9fdba4f9a052f8d7 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/0020-Thread-Naming-and-Tweaks.patch

@@ -1,4 +1,4 @@
-From 4a0dd916ac1f28729c9a269f5213c7340f1aad0e Mon Sep 17 00:00:00 2001
+From 6e843f7ecb84a851340a837a34bea344e0d5b56e 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/0021-Close-Unloaded-Save-Files.patch

@@ -1,4 +1,4 @@
-From 0e944971858decdee97370dc2da8cc1f94bce1e1 Mon Sep 17 00:00:00 2001
+From 51dae18859d8773e1af0b34cbb9066d8039db4ac 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/0022-Remove-o-Option.patch

@@ -1,4 +1,4 @@
-From 6edd9fd1c7bd9f906f4668e9be876fc679557e08 Mon Sep 17 00:00:00 2001
+From b02d69d3e5f8901a98ba7861012fbfaffa1219ab 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/0023-Recipe-Deconstruction.patch

@@ -1,4 +1,4 @@
-From 157bffdb7ed6d858ad9055e98c25ba08488126eb Mon Sep 17 00:00:00 2001
+From 431b05b1cb027066192b092f1d36509367c135bb 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/0024-Implement-Arrow-API.patch

@@ -1,4 +1,4 @@
-From 094f53bc27b0ac80ef7d0142db127b8ffecfd12d Mon Sep 17 00:00:00 2001
+From 0a6d63cf9c9a2df92c5bb37a68f1594bf717c241 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/0025-Hopper-Customisations.patch

@@ -1,4 +1,4 @@
-From a1f5331d1b57175a29474e6c1465db9c9d56b5af Mon Sep 17 00:00:00 2001
+From d6d400e05c13b2b5b7937d4bd63a336fe3a482ea 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/0026-Implement-SpawnerSpawnEvent.patch

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

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

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

@@ -1,4 +1,4 @@
-From 13dc74685ff2babf3e4f068a0b1c519f515b884c Mon Sep 17 00:00:00 2001
+From 54c5246ad26fa7f5728b2b26928e9e16f2ff2be8 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

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

@@ -1,4 +1,4 @@
-From 68e5367a039241677a762a1af4b76c90a5ef6e53 Mon Sep 17 00:00:00 2001
+From a5e7345a25a12e589e3fc6971e3fd84c8a7d690a 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/0030-Configurable-Messages.patch

@@ -1,4 +1,4 @@
-From 2697f8ced8ddd323cd47b8c74799dc4dafedc5a8 Mon Sep 17 00:00:00 2001
+From 99d8980c925322999a44f8dceb63a114d5c05402 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
@@ -23,7 +23,7 @@ index 98f40f1..8f421f3 100644
                  this.b.close(chatcomponenttext);
              } else {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 64b755d..e396288 100644
+index f8145b0..96aede6 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -418,7 +418,7 @@ public abstract class PlayerList {

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

@@ -1,4 +1,4 @@
-From 1efa3a7b78341805aff195eedcce8094fca56682 Mon Sep 17 00:00:00 2001
+From 7f73cd075e1a1a9a55d562c1893b9a7f5504500d Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 22 Jun 2013 16:12:02 +1000
 Subject: [PATCH] Allow Disabling of Random Lighting Updates
@@ -18,10 +18,10 @@ index 92b25f0..ab971cf 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 6a975d3..8fc5c71 100644
+index 5116444..f32985f 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -2071,7 +2071,7 @@ public abstract class World implements IBlockAccess {
+@@ -2074,7 +2074,7 @@ public abstract class World implements IBlockAccess {
          }
  
          this.methodProfiler.a("playerCheckLight");

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

@@ -1,4 +1,4 @@
-From 1aee6e97da0635b4c3df6e10290b98ee9ae03850 Mon Sep 17 00:00:00 2001
+From 855af52bcc82a9b02da539c3c836d547e460d8d5 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/0033-Disallow-Interaction-With-Self.patch

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

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

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

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

@@ -1,4 +1,4 @@
-From d2dadf6c02543ca71f6f8b85e5cb2f6046dbbc12 Mon Sep 17 00:00:00 2001
+From a7d04bd5aff0adb428acff5976763e69fc9410f9 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 e396288..f24739d 100644
+index 96aede6..7f3be50 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/0036-Plug-World-Unload-Memory-Leak.patch

@@ -1,4 +1,4 @@
-From b61ff25808179d81c140fdff162e6e84f1e43fab Mon Sep 17 00:00:00 2001
+From 22ac72163c0c404835bbda88a9bb41ba491477ae 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/0037-Player-Collision-API.patch

@@ -1,4 +1,4 @@
-From a3aa58034bd77397a293f64aab4e88ac804917a2 Mon Sep 17 00:00:00 2001
+From f1dfb80663f7abb86d87c43d35bac5cbfa983d2a 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/0038-Fully-Disable-Snooper-When-Not-Required.patch

@@ -1,14 +1,14 @@
-From 4bd1dd657b32a94cbc065a2189d77e5a7779732f Mon Sep 17 00:00:00 2001
+From 59b26c473525c8d634abc4f5b426bb154b4298f6 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 61abf67..b7a8a4c 100644
+index 96d38b6..c90cbcc 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
+@@ -653,11 +653,11 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
          this.h[this.ticks % 100] = System.nanoTime() - i;
          this.methodProfiler.b();
          this.methodProfiler.a("snooper");

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

@@ -1,4 +1,4 @@
-From 49d817977c0e7021a305e98a9df7d3575f1c298e Mon Sep 17 00:00:00 2001
+From f9ab67a94655dc471e13fdcaad405ee26783ddeb 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/0040-Cap-Minimum-Player-Speed.patch

@@ -1,4 +1,4 @@
-From 8ac4f210d0dd342a3569297679026acda3533ba2 Mon Sep 17 00:00:00 2001
+From 185aa15dbc89fc126c1d130ec40b7856cadbe77b 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/0041-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch

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

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

@@ -1,4 +1,4 @@
-From 83d50f5bf12811352b54643722ddfc0348a5c658 Mon Sep 17 00:00:00 2001
+From ff590db56efdc04faf59d1754b60a7ed8c746621 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/0043-Allow-Disabling-of-1.6.3-Structure-Saving.patch

@@ -1,4 +1,4 @@
-From 9fe0e6a0eb3e48eb3b1668c800cba2b45dd052a4 Mon Sep 17 00:00:00 2001
+From 9b38c1c2a1c812f1d4051367bc1793083ccb4ea8 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/0044-Item-Despawn-Rate.patch

@@ -1,4 +1,4 @@
-From 37d47654d1062f881edd92496fb62005521b8127 Mon Sep 17 00:00:00 2001
+From f6c0db898ff4bd6d86b4ef006a1d7a0f59824d92 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/0045-Don-t-Special-Case-X-Move-Value.patch

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

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

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

@@ -1,4 +1,4 @@
-From c9433b9cc24018bc3fb0c172a7792aebc8bbf536 Mon Sep 17 00:00:00 2001
+From b07b50b630caaa20c7bc5ed0397b3991a0720e59 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/0048-Fix-packed-ice-generation.patch

@@ -1,4 +1,4 @@
-From ac1c585ef55565675089fe2fd8e73955f6f94532 Mon Sep 17 00:00:00 2001
+From c72f2b878b698ff168438d0349777835402d899e 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/0049-Watchdog-Thread.patch

@@ -1,4 +1,4 @@
-From 6e9323fac10fa52d12de38ee61b2aaccc1ff3bec Mon Sep 17 00:00:00 2001
+From f1b48127671f649c0a241fbbe94af76f14c37513 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.
@@ -18,10 +18,10 @@ index 1e682e9..ae9e255 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 b7a8a4c..bcdd918 100644
+index c90cbcc..35e0a15 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -567,6 +567,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -563,6 +563,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
              this.a(crashreport);
          } finally {
              try {
@@ -29,7 +29,7 @@ index b7a8a4c..bcdd918 100644
                  this.isStopped = true;
                  this.stop();
              } catch (Throwable throwable1) {
-@@ -667,6 +668,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -663,6 +664,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
  
          this.methodProfiler.b();
          this.methodProfiler.b();

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

@@ -1,4 +1,4 @@
-From 5498542d2f34ab0718066833f973fb2b4f9de6b8 Mon Sep 17 00:00:00 2001
+From b92a3ea19ea40afe834c9a40a08ebf586dd628cb 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/0051-Fix-some-chunks-not-being-sent-to-the-client.patch

@@ -1,4 +1,4 @@
-From d57ae577426a74a98f9b776aceffad9ae6297e9f Mon Sep 17 00:00:00 2001
+From 3705cb92a2a8adc06ea06c3688700b6979f76a41 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/0052-Fix-Broken-Async-Chat.patch

@@ -1,4 +1,4 @@
-From add640221c6a7a23228de32c3147fb2f0daa4cbd Mon Sep 17 00:00:00 2001
+From 6c0fe93ff5ca68845ce1210546260ac5a27a7d97 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/0053-Orebfuscator.patch

@@ -1,4 +1,4 @@
-From 178ba754758e09c17d82ac88d52f0f86591f7142 Mon Sep 17 00:00:00 2001
+From afb5ac02e70cb648e6b2f3e0697f1be5b361775f 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
@@ -91,10 +91,10 @@ index 0301fba..7a84a95 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 8fc5c71..a4fda33 100644
+index f32985f..c6ea886 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -494,6 +494,7 @@ public abstract class World implements IBlockAccess {
+@@ -497,6 +497,7 @@ public abstract class World implements IBlockAccess {
          this.d(blockposition.up(), block);
          this.d(blockposition.north(), block);
          this.d(blockposition.south(), block);
@@ -102,7 +102,7 @@ index 8fc5c71..a4fda33 100644
      }
  
      public void a(BlockPosition blockposition, Block block, EnumDirection enumdirection) {
-@@ -719,9 +720,16 @@ public abstract class World implements IBlockAccess {
+@@ -722,9 +723,16 @@ public abstract class World implements IBlockAccess {
          return this.worldProvider.p()[this.getLightLevel(blockposition)];
      }
  

CraftBukkit-Patches/0054-Optimize-DataWatcher.patch

@@ -1,4 +1,4 @@
-From 13c622659e5b7767c3240d9ab5f260252a5226b6 Mon Sep 17 00:00:00 2001
+From 1fb735ca7b041fe1720f77bf3dcdd5f3a09b59db 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/0055-Fire-PreLogin-Events-in-Offline-Mode.patch

@@ -1,4 +1,4 @@
-From 70a5f335afc7120e0a0ef56dbeb97b90fd0805e8 Mon Sep 17 00:00:00 2001
+From 788b2f3ba573ae071ff490d48bd8d8a923892452 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/0056-BungeeCord-Support.patch

@@ -1,4 +1,4 @@
-From 5c24f2e31369f0c038b9fdde57327bd0e9c1f99c Mon Sep 17 00:00:00 2001
+From d4d3cba7e71f2f5f3580322b0a8596a178e24e68 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
@@ -45,7 +45,7 @@ index 8f421f3..727948a 100644
              }
              break;
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 42905fd..3508f87 100644
+index 9bfb5a2..7410718 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -84,9 +84,24 @@ public class LoginListener implements PacketLoginInListener, IUpdatePlayerListBo
@@ -117,7 +117,7 @@ index cc5aee0..18d0c6b 100644
          this.d = EnumProtocol.a(packetdataserializer.e());
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index f24739d..b674e67 100644
+index 7f3be50..770983e 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -403,7 +403,7 @@ public abstract class PlayerList {

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

@@ -1,4 +1,4 @@
-From 96c4623c1ce960e00d9998d7c0fbeab9d9eaa10f Mon Sep 17 00:00:00 2001
+From 4bc32928aa415a3a9f949b45651f6f44c1450184 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/0058-Configurable-Amount-of-Netty-Threads.patch

@@ -1,4 +1,4 @@
-From a52ed5af41b4f75024cbeba009eaa85aabc1e37b Mon Sep 17 00:00:00 2001
+From 60fc3efe1cfd4ab36f4407c1464324396e56b105 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 bcdd918..4c18e24 100644
+index 35e0a15..c8ba6ab 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -63,7 +63,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -27,7 +27,7 @@ index bcdd918..4c18e24 100644
          this.Z = new UserCache(this, file1);
          this.b = this.h();
          // this.convertable = new WorldLoaderServer(file); // CraftBukkit - moved to DedicatedServer.init
-@@ -1323,7 +1323,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -1319,7 +1319,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
      }
      // Spigot End
      public ServerConnection ap() {

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

@@ -1,4 +1,4 @@
-From 975fbd6108019d07c966a3d2d6b1100794a54c20 Mon Sep 17 00:00:00 2001
+From 25da61d4064c2034de29dc150103669386f6d6dd 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/0060-Log-Cause-of-Unexpected-Exceptions.patch

@@ -1,14 +1,14 @@
-From 51d23beae4d968713dc6c8bdf2c7c41c470a333b Mon Sep 17 00:00:00 2001
+From 49600e0533984de5413e44aa5d3139a03885b664 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 4c18e24..d57af9e 100644
+index c8ba6ab..70df1ad 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -548,6 +548,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -544,6 +544,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
              }
          } catch (Throwable throwable) {
              MinecraftServer.LOGGER.error("Encountered an unexpected exception", throwable);

CraftBukkit-Patches/0061-Particle-API.patch

@@ -1,4 +1,4 @@
-From 113c3cdca3e582d522b1ff90f5a486b8092cc28d Mon Sep 17 00:00:00 2001
+From 46f2bc4a1fa7f46ab1b371eadb9629793ca2044e 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/0062-Save-ticks-lived-to-nbttag.patch

@@ -1,4 +1,4 @@
-From 07ac2c012866680de5f9301196a037e5806bff2f Mon Sep 17 00:00:00 2001
+From 0096f0ac9e3453043f1a5892effd4b6446674b79 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/0063-More-Efficient-GetCubes.patch

@@ -1,14 +1,14 @@
-From 162e0a05ba706a962485f55cb36cd998a9446cd1 Mon Sep 17 00:00:00 2001
+From 167ef06dcd77a658fd9994a2ce5c0a4a2602aea8 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 a4fda33..974fe77 100644
+index c6ea886..9be6fb7 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1101,28 +1101,56 @@ public abstract class World implements IBlockAccess {
+@@ -1104,28 +1104,56 @@ public abstract class World implements IBlockAccess {
          IBlockData iblockdata = Blocks.STONE.getBlockData();
          BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition();
  

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

@@ -1,4 +1,4 @@
-From 4bb35602ee6638ad0778370e8b8f97c210469400 Mon Sep 17 00:00:00 2001
+From 3d513e57a5dd66a39850efe2546955cd88ba75b1 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/0065-Warn-if-PermGen-may-be-insufficient.patch

@@ -1,4 +1,4 @@
-From 75a2543c83ce99ca4c1b60a45c6caca5d604adeb Mon Sep 17 00:00:00 2001
+From 6ce3b23df3047f1498c060cfd075fe5ee4f5f242 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/0066-Disable-Connected-Check-on-setScoreboard.patch

@@ -1,4 +1,4 @@
-From dcf83e0337de967e36ed1e2a028c4a976d26c1f6 Mon Sep 17 00:00:00 2001
+From eea3f50b6920d99524565206a10a4c9dd3cebba2 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/0067-Add-Late-Bind-Option.patch

@@ -1,4 +1,4 @@
-From 325f69316cc1566252e7b178f281d36ec5fb65e0 Mon Sep 17 00:00:00 2001
+From 47821af90f75fed72ed71e8e203b435c216e93b4 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

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

@@ -1,4 +1,4 @@
-From 5428d854f3be41d9a03048775e572f867464cab0 Mon Sep 17 00:00:00 2001
+From c693eb08f9beb8d2cdc5c66a8c71e60b999ebf34 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/0069-Fix-ItemStack-Unbreakable-Code.patch

@@ -1,4 +1,4 @@
-From fc35ee9742d0f9352ad14e2345eeb2fe342205a7 Mon Sep 17 00:00:00 2001
+From 84daed6644e5628abf26b64f6e670e7f18297ced 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/0070-Try-and-Debug-Crash-Reports-Crashing.patch

@@ -1,14 +1,14 @@
-From 9489a7b68288b5b2c19bc3ab0418ed17df89c17b Mon Sep 17 00:00:00 2001
+From dec506f2dafe576c4a20a17a0133fad16d86a3b6 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 d57af9e..1fe3014 100644
+index 70df1ad..d2c4e6f 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
+@@ -739,7 +739,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
                      worldserver.doTick();
                      worldserver.timings.doTick.stopTiming(); // Spigot
                  } catch (Throwable throwable) {
@@ -22,7 +22,7 @@ index d57af9e..1fe3014 100644
                      worldserver.a(crashreport);
                      throw new ReportedException(crashreport);
                  }
-@@ -753,7 +759,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -749,7 +755,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
                      worldserver.tickEntities();
                      worldserver.timings.tickEntities.stopTiming(); // Spigot
                  } catch (Throwable throwable1) {

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

@@ -1,4 +1,4 @@
-From 1eb61c31c972d2eeb44c69d3fe3d889cc470c933 Mon Sep 17 00:00:00 2001
+From 2b6bdb57c6ac9923c2c1fca0085c8963571c308d 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
@@ -24,10 +24,10 @@ index b2ce05f..a59ff8e 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1fe3014..fbd9b4e 100644
+index d2c4e6f..4784bbc 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
+@@ -651,7 +651,17 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
              SpigotTimings.worldSaveTimer.startTiming(); // Spigot
              this.methodProfiler.a("save");
              this.v.savePlayers();