Update Spigot's Patches round 2?

The hell happened here.
:
Fix Build 2339ac14a8e
Regen the patches 89d3fcbdfaf

This new system breaks a lot :(

.gitignore

@@ -40,5 +40,3 @@ Spigot-API
 Spigot-Server
 PaperSpigot-Server
 PaperSpigot-API
-Bukkit
-CraftBukkit

Bukkit

@@ -0,0 +1 @@
+Subproject commit 277baff1a14c0eb57ef723d625446698a857884e

CraftBukkit

@@ -0,0 +1 @@
+Subproject commit 8fc4c8321883ec02a43185e494404d1ba2079d3e

CraftBukkit-Patches/0001-POM-Changes.patch

@@ -1,4 +1,4 @@
-From 02a078677cd7891bda112d4df03b4ae357c5e58c Mon Sep 17 00:00:00 2001
+From a648a0a8b0e53cc753bb37b9a34e7fee8600a977 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 81f756d36cafb87ed4f63e55253162111eac24c7 Mon Sep 17 00:00:00 2001
+From fef5885eb9ba89075b623d31b95da768e078aa0c 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 f313b15b07c642bdd687eada899fa22f4d43d653 Mon Sep 17 00:00:00 2001
+From 4f493e30fb31c21faae3c325034835f25752e915 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
@@ -25,7 +25,7 @@ index f2a78c1..c20a2d5 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 2f21f7a..4ab7c05 100644
+index f20a040..17d24ce 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1323,4 +1323,14 @@ public class CraftWorld implements World {

CraftBukkit-Patches/0004-Obfuscation-Helpers.patch

@@ -1,4 +1,4 @@
-From 0ec0c2a68e29d25a42c0c5c9d55d99b189df039f Mon Sep 17 00:00:00 2001
+From 930d80ace4fb089739b570ddcd2bc247281aa2b4 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 4a39203..00e897b 100644
+index c12b192..586123c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1298,6 +1298,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs

CraftBukkit-Patches/0005-Spigot-Configuration.patch

@@ -1,4 +1,4 @@
-From 246253b92d92085145293e7c5d64a20fd836f083 Mon Sep 17 00:00:00 2001
+From 281c065d2ecfa8d09a07ca862d585ef02ae2ea7c 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

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

@@ -1,4 +1,4 @@
-From 0e407f08a361f677443120db69572f7c73268167 Mon Sep 17 00:00:00 2001
+From 62ad744472fdb9885c06d58f0ef5a47652b88d50 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 e8c86d2..4d630b1 100644
+index 94463a4..a01da14 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -64,7 +64,7 @@ public abstract class World implements IBlockAccess {

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

@@ -1,4 +1,4 @@
-From bec392e5a87c0d036a931c482c6e13df404bbded Mon Sep 17 00:00:00 2001
+From 9a1a0d43423b68c8c3a2e36b44d4a4aa47b3b866 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
@@ -54,7 +54,7 @@ index 2ce2e34..d61251f 100644
                      CraftEventFactory.handleBlockGrowEvent(world, blockposition.getX(), blockposition.getY(), blockposition.getZ(), this, toLegacyData(data)); 
                      // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/BlockGrass.java b/src/main/java/net/minecraft/server/BlockGrass.java
-index 7516e21..8357fee 100644
+index fc0e540..09cdd8a 100644
 --- a/src/main/java/net/minecraft/server/BlockGrass.java
 +++ b/src/main/java/net/minecraft/server/BlockGrass.java
 @@ -45,7 +45,7 @@ public class BlockGrass extends Block implements IBlockFragilePlantElement {
@@ -119,7 +119,7 @@ index ff4f576..39c0cba 100644
                  world.captureTreeGeneration = true;
                  // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/BlockStem.java b/src/main/java/net/minecraft/server/BlockStem.java
-index 23661a8..24e4d85 100644
+index e4c65ff..dba443a 100644
 --- a/src/main/java/net/minecraft/server/BlockStem.java
 +++ b/src/main/java/net/minecraft/server/BlockStem.java
 @@ -47,7 +47,7 @@ public class BlockStem extends BlockPlant implements IBlockFragilePlantElement {

CraftBukkit-Patches/0008-More-Efficient-Chunk-Save-Queue.patch

@@ -1,4 +1,4 @@
-From 0274f34174a47601b4fececf698e65325670b3bb Mon Sep 17 00:00:00 2001
+From 6d0c5cae337957d4c1b3d8b5ff8eb01385433532 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 5fbdb53b2c7e4ed1a2eebbeaeb9f4b28d34f23a8 Mon Sep 17 00:00:00 2001
+From e9147b159cf2d57870d56030b3f0a9c7f803f3fa 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,7 +41,7 @@ index e2c0712..7f16401 100644
                      }
                  } else {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 4d630b1..18f0311 100644
+index a01da14..4cd59aa 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -908,6 +908,23 @@ public abstract class World implements IBlockAccess {

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

@@ -1,4 +1,4 @@
-From 3397d600dc9d5afeb67b5979f7490b5bfce721c1 Mon Sep 17 00:00:00 2001
+From 9e5facb25e4f5cd1aefa2709f65a6b3b54f69f12 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
@@ -94,7 +94,7 @@ index 4cd59aa..a16be9b 100644
          // this.entityList.addAll(collection);
          Iterator iterator = collection.iterator();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 4ab7c05..b9032cd 100644
+index 17d24ce..a45f2a3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -162,6 +162,7 @@ public class CraftWorld implements World {

CraftBukkit-Patches/0011-View-Distance.patch

@@ -1,4 +1,4 @@
-From 84fd7cb51f698d601ac8d22e24e9baf6f04953b7 Mon Sep 17 00:00:00 2001
+From 5ade27e51b2ffa3362e42dfba15d1b40a28847a9 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/0012-Spigot-Timings.patch

@@ -1,4 +1,4 @@
-From 0684c3cc896612daa522771c2faadafebd1c776a Mon Sep 17 00:00:00 2001
+From 0ebc78268112f256eabea7219e1bd2921fd2b3a8 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 0aaee5f..803b5df 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 00e897b..1cb9d38 100644
+index 586123c..ab31862 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -45,6 +45,7 @@ import joptsimple.OptionSet;
@@ -367,10 +367,10 @@ index 00e897b..1cb9d38 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 9b71ffc..2a0cea5 100644
+index 9c7c2bd..47ecfdd 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1031,6 +1031,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+@@ -1009,6 +1009,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
      // CraftBukkit end
  
      private void handleCommand(String s) {
@@ -379,7 +379,7 @@ index 9b71ffc..2a0cea5 100644
         // CraftBukkit start - whole method
          this.c.info(this.player.getName() + " issued server command: " + s);
  
-@@ -1040,18 +1042,22 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+@@ -1018,18 +1020,22 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
          this.server.getPluginManager().callEvent(event);
  
          if (event.isCancelled()) {
@@ -600,7 +600,7 @@ index ff9efe9..0d23ec1 100644
  
      public Spigot spigot()
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index b9032cd..84c52d4 100644
+index a45f2a3..13f85d5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -252,9 +252,11 @@ public class CraftWorld implements World {

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

@@ -1,4 +1,4 @@
-From 008dfe5d5d4c87964fc09c34e6ffd46f66d33f09 Mon Sep 17 00:00:00 2001
+From bc6052de701c26b98da0e84539c029dfadd6b153 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,11 +1,11 @@
-From 81e9b691cfb2a3c0e0df11bf2e05f041e0d7438f Mon Sep 17 00:00:00 2001
+From 0c10eb34353da6d37510534f7747584e8b45d470 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 3802264..a3fc086 100644
+index 5fc707f..974daf4 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1303,6 +1303,13 @@ public abstract class World implements IBlockAccess {

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

@@ -1,4 +1,4 @@
-From 160cff443e01980c29589470d51bc54fb447148e Mon Sep 17 00:00:00 2001
+From f1ac20811c2a33c2149c56883af5fabb560fa65c 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
@@ -9,7 +9,7 @@ This will drastically cut down on tick timings for entities that are not in rang
 This change can have dramatic impact on gameplay if configured too low. Balance according to your servers desired gameplay.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index bb5e17d..ba1c2f2 100644
+index e2f3456..10e99d1 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -89,7 +89,7 @@ public abstract class Entity implements ICommandListener {
@@ -137,7 +137,7 @@ index 8357157..16400c3 100644
          super(world);
          this.a(0.25F, 0.25F);
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 8da3ddd..c4e3e9d 100644
+index 803b5df..86474de 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -83,6 +83,13 @@ public abstract class EntityLiving extends Entity {
@@ -155,7 +155,7 @@ index 8da3ddd..c4e3e9d 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 a3fc086..c006526 100644
+index 974daf4..076b4fc 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1243,6 +1243,7 @@ public abstract class World implements IBlockAccess {

CraftBukkit-Patches/0016-Metrics.patch

@@ -1,4 +1,4 @@
-From 73ed5ee29cb1766c1646967dffab9f104a63d1cb Mon Sep 17 00:00:00 2001
+From 74c8d363f218b601d7059aa9cbc546f9da0c0db9 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 cc4f72301e86bf997da5da7adf86ed658aed26c6 Mon Sep 17 00:00:00 2001
+From cb6f24f19cbd3a6f2a337b8228d32b749bc7216e 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 fab5ba1054b3144296518fdd3852e561218de1ad Mon Sep 17 00:00:00 2001
+From a2ee07d7ddf431e275dec7fb6279daf63433aeb7 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 e24ea35293d323a1666931db31c059e2f8775fff Mon Sep 17 00:00:00 2001
+From 5933e32258ce700258244a95c28a6e1e3f3ad89d 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 9c06e031213caf1c0463c736134f5bee4f91b1a9 Mon Sep 17 00:00:00 2001
+From fbba0bd76ebbcd4d2ba2ecafd0e91f1a040095d6 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 6c17a534faf1cbea851c45f3b3ba2963c9554ba3 Mon Sep 17 00:00:00 2001
+From 75800d61cf22442d4d1bc93c1f236af83a4d4998 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 74aa07fb1297175eaebfd4192c8b8e2668518e2e Mon Sep 17 00:00:00 2001
+From a47d75e84a1dc350dd415a8c5db259cfa328c253 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 d7c816bdcb7621b4a0d16b696c01c3b248f25f8c Mon Sep 17 00:00:00 2001
+From c1f5c0814bd607378cbbefe75da2700a888106ee 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 fee2702652112ad10f09a9a7234fdd897ed1cc6a Mon Sep 17 00:00:00 2001
+From 8e4326ea42b4006f8f38bd9f3023560dfe9f7a55 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 01eedb54f5e95a52f76687ef625bddea00f9f368 Mon Sep 17 00:00:00 2001
+From 6e47263580456c9da8b556515c903cbfbbdf8c88 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 83d0c4260671e7729eb482d7ce8fbe7d3b9b53e0 Mon Sep 17 00:00:00 2001
+From d0f19a283206f07de4ce8eaa985ad0a9a38d3b2f 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 0680e62f3ebfa2e03d9eeef5188b4b2707304028 Mon Sep 17 00:00:00 2001
+From 72b3a001f6613cdfd324897004a0c3a2ea87d95a 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,14 +1,14 @@
-From b3bcb677bd5bc7c5f845659b9239db32b9e293a6 Mon Sep 17 00:00:00 2001
+From b2a198ade17a9e1d3f8afdf16efd2d308a204398 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 0e4f35d..19aaf8f 100644
+index 47ecfdd..e21bed0 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1034,6 +1034,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+@@ -1012,6 +1012,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
          org.bukkit.craftbukkit.SpigotTimings.playerCommandTimer.startTiming(); // Spigot
  
         // CraftBukkit start - whole method

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

@@ -1,4 +1,4 @@
-From 12e15f58613b671b868f1a0e74838e4780229a41 Mon Sep 17 00:00:00 2001
+From 3219a5db66508a6996bd785c66421f7446214209 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 47b279108fd9133ea5de128653e563793275c2e1 Mon Sep 17 00:00:00 2001
+From 81b044be2a6583f986e9c9d0f08ef51a57883e66 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/0031-Allow-Disabling-of-Random-Lighting-Updates.patch

@@ -1,4 +1,4 @@
-From 88b404cb998842371744ba03f5ebd98f592f961c Mon Sep 17 00:00:00 2001
+From 0945d83063d51846a2cd6b8043c59baa3c6abff0 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,7 +18,7 @@ index c3059b6..9e9ea23 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index c006526..fcb6557 100644
+index 076b4fc..9b4e05a 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -2009,7 +2009,7 @@ public abstract class World implements IBlockAccess {

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

@@ -1,4 +1,4 @@
-From 2847ce7bd37c53add794fec473be60b60224a17b Mon Sep 17 00:00:00 2001
+From db18a4785b18daf00b86c88fd4dc0d32eebb5df3 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,14 +1,14 @@
-From 9e733588f48678280a2209ff0b56c3d677aa9e02 Mon Sep 17 00:00:00 2001
+From c7e3163a08a3797e61608ac9fcbbdf5ebfd34ba2 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 3bfcd94..24dd7f0 100644
+index e21bed0..2bf9f49 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1169,6 +1169,13 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+@@ -1147,6 +1147,13 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
          PlayerConnectionUtils.ensureMainThread(packetplayinuseentity, this, this.player.u());
          WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension);
          Entity entity = packetplayinuseentity.a((World) worldserver);

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

@@ -1,4 +1,4 @@
-From 3deeab2aa8e79f1f1d45d3eb551e2ab981ee90cb Mon Sep 17 00:00:00 2001
+From 39908f7095fd34b8ce478c42808bd83747fcafcc 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 c963624b5abc0547e7c0eb224d362f23e130ac00 Mon Sep 17 00:00:00 2001
+From d2347b2bad3317dcd6774c60255af50c18ffbf49 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/0036-Plug-World-Unload-Memory-Leak.patch

@@ -1,4 +1,4 @@
-From e6efbdee7fa312e978fc1cb5eedfd3568eb5684f Mon Sep 17 00:00:00 2001
+From cb4abf0876742f68cb52fa57d0f05eef21de148f 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 1416d961e1445f05084e49af2b1e7c64b293761f Mon Sep 17 00:00:00 2001
+From 34960664e3295fc6a2dde8148d5984d185fda497 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,11 +1,11 @@
-From 7cbfd8567af8064f01aba1ff03ce9b581d46226f Mon Sep 17 00:00:00 2001
+From 900e9db269b400872ce1388c48c21879deeb0ebf 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 1cb9d38..a227340 100644
+index ab31862..1d67c07 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -627,11 +627,11 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs

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

@@ -1,4 +1,4 @@
-From d55e61ec721eaca35a88a0ff4fd900288beebe76 Mon Sep 17 00:00:00 2001
+From 680b66ad471af5c09814c9c3495f6eb10e779fad 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 3c4614e2e411ef1ffcb250b7c2dfde392fd0f340 Mon Sep 17 00:00:00 2001
+From caacb61f2c1776f5d877fff024bab374ddf178f0 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 bccecea300f4b3dc11024365a81ce16978dd240e Mon Sep 17 00:00:00 2001
+From e410f14442e2f20e4e6e8e0359a3fb4a22389c0e 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 8a3ecfb1768bc58ad25261d4ff1922989d3d1c2f Mon Sep 17 00:00:00 2001
+From 278e9ad5469a08b0ad4b7a5b023361c7f7fad92d 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 42a42f6ec9d5ad895bf66a398ac9de97f6a25d45 Mon Sep 17 00:00:00 2001
+From 55d876c1cefd9c7fe8b7959d7af94435bfd60fd6 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 f6fe4b96cae27d007b322988f85dc7c3876c5a25 Mon Sep 17 00:00:00 2001
+From 97da24a6e7b5d85dbd82820807708f1962e68b2f 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,11 +1,11 @@
-From f27c8faa6a5a02f356acebca0f5c178265c79fef Mon Sep 17 00:00:00 2001
+From 206178759589ab1942cda1d8aa21a3336f1fd7b8 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 b903a81..310ab0c 100644
+index 2bf9f49..6ffce8f 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -108,6 +108,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
@@ -14,9 +14,9 @@ index b903a81..310ab0c 100644
      private boolean justTeleported = false;
 +    private boolean hasMoved; // Spigot
  
-     // For the PacketPlayOutBlockPlace hack :(
+     public CraftPlayer getPlayer() {
-     Long lastPacket;
+         return (this.player == null) ? null : (CraftPlayer) this.player.getBukkitEntity();
-@@ -214,6 +215,18 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+@@ -208,6 +209,18 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
              }
              // CraftBukkit start - fire PlayerMoveEvent
              Player player = this.getPlayer();
@@ -35,7 +35,7 @@ index b903a81..310ab0c 100644
              Location from = new Location(player.getWorld(), lastPosX, lastPosY, lastPosZ, lastYaw, lastPitch); // Get the Players previous Event location.
              Location to = player.getLocation().clone(); // Start off the To location as the Players current location.
  
-@@ -242,7 +255,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+@@ -236,7 +249,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
                  this.lastPitch = to.getPitch();
  
                  // Skip the first time we do this

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

@@ -1,4 +1,4 @@
-From c45455632dc675c3f43ba0f0b811e9479ddc9c40 Mon Sep 17 00:00:00 2001
+From ed784d4bf689c5e60c333806b8b63bf4334160d3 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 ac8b907b3f05c7f88346f5ed2d0fdbe0ab281d12 Mon Sep 17 00:00:00 2001
+From 14530ddad995a1001d4434971234b7a8ea765823 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 99ee83952a261f744f8c689615e28c49e5853cbf Mon Sep 17 00:00:00 2001
+From 6d6b5bcad06ca34d88abaa9cbeee95158d5925c6 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 d4ad0adea49e54a330c38b8e44c10b9ce8fa1234 Mon Sep 17 00:00:00 2001
+From d4b5d31d08c0240e5ce5e8104c84e377e872efbb 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,7 +18,7 @@ index 390c6eb..240c909 100644
  
                      thread.setName("Server Watchdog");
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a227340..c5a6bec 100644
+index 1d67c07..65c3a66 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -537,6 +537,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs

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

@@ -1,4 +1,4 @@
-From c58440804a708a12053e7d0938f6bd85f7bf4c10 Mon Sep 17 00:00:00 2001
+From b3c989b0fb4d2fcdbf2f331c38e56ef1ce2e133f 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 0fa249558b94c997140a25a1236626c9e22f7340 Mon Sep 17 00:00:00 2001
+From 6e90d5453c0852c00ea47ba024d83ceb728f8aa4 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 21fba8d7f5b9b5384f1168dd7d9bb4276de80c81 Mon Sep 17 00:00:00 2001
+From 5b8767e1d3aacd236a1e081e450ee69c3391de28 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 75e2457256bf4e36cc2ce32af9a8b188bcf5d182 Mon Sep 17 00:00:00 2001
+From 65eae3b8ffa2e0ee6f4242b90aa2df6fc8b24721 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
@@ -79,7 +79,7 @@ index 8af5e1f..9df0d53 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index 3e24620..f0d915f 100644
+index e6145ac..34c22d2 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -197,6 +197,7 @@ public class PlayerInteractManager {
@@ -91,7 +91,7 @@ index 3e24620..f0d915f 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 fcb6557..e0a7160 100644
+index 9b4e05a..045defc 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -445,6 +445,7 @@ public abstract class World implements IBlockAccess {

CraftBukkit-Patches/0054-Optimize-DataWatcher.patch

@@ -1,4 +1,4 @@
-From af655ad8d3d0b4676e5ab4f6cd78c4f6e2f6bf6d Mon Sep 17 00:00:00 2001
+From f1803422eba940c40a526653484f681e7f380846 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 f86f19addeaf624be20e4bae0627444810221fee Mon Sep 17 00:00:00 2001
+From 1fed60fae44318412d1b5b37820c7b6a38814d10 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 ee8fda0b3febdea34a3d61d004269bdf7e718d15 Mon Sep 17 00:00:00 2001
+From be18153c2049202699a2659ed4891f40ede9f117 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

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

@@ -1,4 +1,4 @@
-From 3f1a783d85a5c607779bfabcb092a2d4fdf207a7 Mon Sep 17 00:00:00 2001
+From 2745cb1ef3ac96e96fc5147043cd587c5143aac3 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 c017a37c50c0b7924730665019c8916b39acc055 Mon Sep 17 00:00:00 2001
+From 6ba534764c69a6f193cb1fce8af5d6e13a0f6b1e 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 c5a6bec..471e6d1 100644
+index 65c3a66..79f0fdb 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -61,7 +61,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs

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

@@ -1,4 +1,4 @@
-From e58a21889e5c6a0ba5ab15714d0d3c045827496f Mon Sep 17 00:00:00 2001
+From acccbf3a5331907ed855cafc8fba8b6ce8e995e7 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,11 +1,11 @@
-From 3300cd586685815d7a61e813efc6357f972e4ec4 Mon Sep 17 00:00:00 2001
+From cfaf51175deab8cb8606e574dbd5515b28dc55c8 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 471e6d1..bd79bea 100644
+index 79f0fdb..0d2682d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -518,6 +518,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs

CraftBukkit-Patches/0061-Particle-API.patch

@@ -1,4 +1,4 @@
-From 46651bf2dc09eff03441027909a51561b2e6a1be Mon Sep 17 00:00:00 2001
+From 2ab992704cc79f958e0f794be42191c004ecbed9 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
@@ -18,7 +18,7 @@ index 7de0de5..7eca388 100644
              datavalue = 0;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 84c52d4..260aece 100644
+index 13f85d5..e395704 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -811,28 +811,18 @@ public class CraftWorld implements World {

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

@@ -1,4 +1,4 @@
-From f643aa65e716444ff37db596870b58f9d5d41efe Mon Sep 17 00:00:00 2001
+From 8cd4d276b754d7b0967c9e00cb1bcb29ab60a8c0 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,11 +1,11 @@
-From 5d158e48d9e66e2b9342d9459591075864e45196 Mon Sep 17 00:00:00 2001
+From 7156eb1dd517f94b6411650424fc37e4bd394d9b 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 e0a7160..69e0e78 100644
+index 045defc..a35ec3f 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1037,33 +1037,60 @@ public abstract class World implements IBlockAccess {

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

@@ -1,4 +1,4 @@
-From f636b5da615846f11fff67c168a28a5ef34a6b9a Mon Sep 17 00:00:00 2001
+From 3b6a6cd4f4eb99f3788c780cd02e47c7a4eed45c 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 ba3cb8a97f86170714630163965e420dd7e3dee9 Mon Sep 17 00:00:00 2001
+From 423d560676e360967616e27a0699bb2a1ac123a6 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 3492d9f210df06c7fcfa72c04ada822eed1972e5 Mon Sep 17 00:00:00 2001
+From b0fb0d01c45d1489f6b10fda2fe987ec822cb115 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 9178c98cc3278727839867387c8b3feebe8e4295 Mon Sep 17 00:00:00 2001
+From 7a91f20d04ef923de42b623bab99e54f921820bd 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 ec81ebb55338e6e7de1dfad123a28235c8926adf Mon Sep 17 00:00:00 2001
+From 704d165c8f08c6ab3028c3f4721a49ae652d7f24 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 5ca384fbadcd22850b93749fdac40df57fd75b54 Mon Sep 17 00:00:00 2001
+From 59f1349abaf58fc3075438f33491036bd9f86dc8 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,11 +1,11 @@
-From 4a3318d2891f8a8b28fc9dae6714ab0495291016 Mon Sep 17 00:00:00 2001
+From 49b0c41fc7fde1660d06dbb04f5b0278935f9b92 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 bd79bea..b686a49 100644
+index 0d2682d..e82c297 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -717,7 +717,13 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs

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

@@ -1,4 +1,4 @@
-From 2a40e42c5a2306b047bc3b6d913aac81f51210a2 Mon Sep 17 00:00:00 2001
+From dd974038e5345b2a5eeea4c73328db406d16abe0 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 12 Jan 2014 21:07:18 +1100
 Subject: [PATCH] Replace AutoSave Mechanism
@@ -6,7 +6,7 @@ Subject: [PATCH] Replace AutoSave Mechanism
 The problem here is that MinecraftServer.save(..), will attempt to sleep whilst all pending chunks are written to disk, however due to various and complicated bugs, it will wait for an incorrect amount of chunks, which may cause it to sleep for an overly long amount of time. Instead we will mimic the save-all command in its behaviour, which is both safe and performant.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b686a49..5c7a9c6 100644
+index e82c297..83e73a4 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -625,7 +625,16 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs

CraftBukkit-Patches/0072-Support-vanilla-s-direction-tag-on-fireballs.patch

@@ -1,4 +1,4 @@
-From d5275a1b06907c466dfc778a7f0f216d2e0a7254 Mon Sep 17 00:00:00 2001
+From 0b32283b5dd3214150ac86dbb4e5c07e93a57c8b Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Sat, 18 Jan 2014 14:27:03 +0000
 Subject: [PATCH] Support vanilla's direction tag on fireballs

CraftBukkit-Patches/0073-Support-non-prefixed-URLs.patch

@@ -1,11 +1,11 @@
-From e59ebaf9c574922bc89e5a7edc25e32a5515af63 Mon Sep 17 00:00:00 2001
+From 11d7d1221554e9a1dc18f9ef598608fa90e972b8 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Sat, 18 Jan 2014 19:32:42 +0000
 Subject: [PATCH] Support non-prefixed URLs
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
-index b7b9c81..42f074b 100644
+index 844bf6a..0481688 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
 @@ -19,7 +19,7 @@ import com.google.common.collect.ImmutableMap.Builder;

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

@@ -1,4 +1,4 @@
-From 7516ef8151a06ceb3384927015bed5197eda10ed Mon Sep 17 00:00:00 2001
+From 06bbb81efa37499c608feaa4911d006a27c07eaf 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/0075-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch

@@ -1,4 +1,4 @@
-From ce7f8fb7367be24f48b4c73d53a0b816baeb1db2 Mon Sep 17 00:00:00 2001
+From 511f7cb92f5fedc1e1f3b652da47e7aee95e7c7f 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/0076-Highly-Optimized-Tick-Loop.patch

@@ -1,11 +1,11 @@
-From 4deaf7e75e99e1038f7a93d09274226dacf52fcc Mon Sep 17 00:00:00 2001
+From 3dd34878baf715348c1253f0c29229b7e6fb5cd1 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 25 Jan 2014 14:08:35 +1100
 Subject: [PATCH] Highly Optimized Tick Loop
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5c7a9c6..7749d9f 100644
+index 83e73a4..36fdaf7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -118,6 +118,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs

CraftBukkit-Patches/0077-Add-Spigot-Links.patch

@@ -1,4 +1,4 @@
-From 2757957ab4f50400475cbd19145b9b6fd40a974e Mon Sep 17 00:00:00 2001
+From 504ed1e4c77c1c7f64e8ecaccdac7fb2233a47c4 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Thu, 23 Jan 2014 13:17:35 +1100
 Subject: [PATCH] Add Spigot Links
@@ -35,7 +35,7 @@ index cda766b..1f12a75 100644
 +    * *Note*: this is not needed as the repository we use has Spigot-API too, but you might have a newer one (with your own changes :D)
  * Check out this repo and: `mvn clean package`
 diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml
-index 129ac34..751bbfc 100644
+index a6c1178..6b7ad05 100644
 --- a/src/main/resources/configurations/bukkit.yml
 +++ b/src/main/resources/configurations/bukkit.yml
 @@ -6,11 +6,10 @@

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

@@ -1,4 +1,4 @@
-From c11f7939c995beea9ecbae1ed4c4dba437e31474 Mon Sep 17 00:00:00 2001
+From d8949d3fc0f3f931dc7f9d1bd878c6207621575c 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/0079-Add-Optional-Tick-Shuffling.patch

@@ -1,4 +1,4 @@
-From 0fff2861e9df1d5ab914b98475c98e8ac12e6de1 Mon Sep 17 00:00:00 2001
+From 4a300e8267e9bffccbd8070e05cfeb69de810358 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/0080-Allow-Configuring-Chunks-per-Packet.patch

@@ -1,11 +1,11 @@
-From bc1a7637538a13c614c833c079e2cbf296231994 Mon Sep 17 00:00:00 2001
+From 741a5657bb224d4284d47f2c7c57a62697746406 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 28 Jan 2014 20:35:35 +1100
 Subject: [PATCH] Allow Configuring Chunks per Packet
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 4e0db00..6665502 100644
+index 3bc77ae..5578300 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -220,7 +220,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

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

@@ -1,4 +1,4 @@
-From 513e8be75d433d8efcb799148b4ced24e5a933fc Mon Sep 17 00:00:00 2001
+From 26840bbaeb380ec51927a9643f2642320d2d5c2e 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/0082-Cap-Entity-Collisions.patch

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

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

@@ -1,4 +1,4 @@
-From 0abdde40f3c86120fdece2f96f4abee4b5e283de Mon Sep 17 00:00:00 2001
+From 16bd2064ad68aa5561e0f6e4840af0eafb698955 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/0084-Spam-Filter-Exclusions.patch

@@ -1,14 +1,14 @@
-From faa2df863c36e6606e4aed1cd60e379bc85e9832 Mon Sep 17 00:00:00 2001
+From 44c738d328190c1e42e7b1d5a701a389934704a9 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 310ab0c..393831b 100644
+index 6ffce8f..064b4c6 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -940,9 +940,20 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+@@ -918,9 +918,20 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
                  this.minecraftServer.getPlayerList().sendMessage(chatmessage1, false);
              }
  

CraftBukkit-Patches/0085-Add-Option-to-Silence-CommandBlock-Console.patch

@@ -1,4 +1,4 @@
-From ff04acbb4f541280b03153bddcb4bae9b9ca00bb Mon Sep 17 00:00:00 2001
+From 94f26cdbde92dbf7d2d0587208bcdcd85ac33e9a Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 9 Feb 2014 14:39:01 +1100
 Subject: [PATCH] Add Option to Silence CommandBlock Console

CraftBukkit-Patches/0086-Add-support-for-fetching-hidden-players.patch

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

CraftBukkit-Patches/0087-Allow-Disabling-Creative-Item-Filter.patch

@@ -1,14 +1,14 @@
-From 5313d1395974a2023bbb576effcbd669df0c77d0 Mon Sep 17 00:00:00 2001
+From b0afa4907c4edd212821d34e57f4165875c95532 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 12 Feb 2014 18:18:01 +1100
 Subject: [PATCH] Allow Disabling Creative Item Filter
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 393831b..54fba6d 100644
+index 064b4c6..da185c1 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1664,7 +1664,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+@@ -1642,7 +1642,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
  
              boolean flag1 = packetplayinsetcreativeslot.a() >= 1 && packetplayinsetcreativeslot.a() < 36 + PlayerInventory.getHotbarSize();
              // CraftBukkit - Add invalidItems check

CraftBukkit-Patches/0088-Cap-Channel-Registrations.patch

@@ -1,4 +1,4 @@
-From bedff1820ef18d59fee61734f72d99c05f8c93b5 Mon Sep 17 00:00:00 2001
+From 86719075f68287a5c5ddeb0482c6bc96ed06f6c1 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 12 Feb 2014 20:02:58 +1100
 Subject: [PATCH] Cap Channel Registrations

CraftBukkit-Patches/0089-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch

@@ -1,4 +1,4 @@
-From c51b2f9d4cbae39ba2f25d49b663cabc184b6f95 Mon Sep 17 00:00:00 2001
+From eaf88de580420442d6a126d77a927140b7765cca Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Wed, 12 Feb 2014 20:44:14 +0000
 Subject: [PATCH] Allow vanilla commands to be the main version of a command

CraftBukkit-Patches/0090-Unfinalize-the-isDisconnected-method-by-bukkit.patch

@@ -1,4 +1,4 @@
-From 69fb81ace8ff782f6dd7038b9a9a7487121881d4 Mon Sep 17 00:00:00 2001
+From ea7cdc3104db651903e099f2a012cd2005e6ec90 Mon Sep 17 00:00:00 2001
 From: hcherndon <hcherndon@gmail.com>
 Date: Sat, 15 Feb 2014 01:51:20 -0600
 Subject: [PATCH] Unfinalize the isDisconnected() method by bukkit.
@@ -6,10 +6,10 @@ Subject: [PATCH] Unfinalize the isDisconnected() method by bukkit.
 This would literally mean the world to me. You have no idea how much this method being final is fucking me over right now. (Working with NPC's and what not.)
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 237ff57..ce3f04d 100644
+index da185c1..92607c6 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2021,7 +2021,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+@@ -1999,7 +1999,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
      }
  
      // CraftBukkit start - Add "isDisconnected" method

CraftBukkit-Patches/0091-Implement-Silenceable-Lightning-API.patch

@@ -1,4 +1,4 @@
-From 56976846cfa4a3138592077288f3592572a50b08 Mon Sep 17 00:00:00 2001
+From c5c47eb99e11506b4829c1c76e132b6268d8d80a Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Sun, 23 Feb 2014 16:16:59 -0400
 Subject: [PATCH] Implement Silenceable Lightning API
@@ -39,7 +39,7 @@ index 5bda5d3..1bbce9b 100644
              //this.world.makeSound(this.locX, this.locY, this.locZ, "ambient.weather.thunder", 10000.0F, 0.8F + this.random.nextFloat() * 0.2F);
              float pitch = 0.8F + this.random.nextFloat() * 0.2F;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 260aece..19c606e 100644
+index e395704..50fdfcd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1385,6 +1385,22 @@ public class CraftWorld implements World {

CraftBukkit-Patches/0092-Use-one-PermissibleBase-for-all-Command-Blocks.patch

@@ -1,4 +1,4 @@
-From 5a6071e6f1967baad96fe370e5497a1bcac43ac9 Mon Sep 17 00:00:00 2001
+From 88d4630955659bc4cf65d8853014f7422a360b98 Mon Sep 17 00:00:00 2001
 From: FrozenBrain <carstenbamsti@googlemail.com>
 Date: Sun, 2 Mar 2014 21:13:46 +0100
 Subject: [PATCH] Use one PermissibleBase for all Command Blocks

CraftBukkit-Patches/0093-Prevent-hoppers-from-loading-chunks.patch

@@ -1,4 +1,4 @@
-From 4e6040427ecb0cf9ab498d403e6d731972310a22 Mon Sep 17 00:00:00 2001
+From ed0834d044f738e2e879bb96bd4cc9b67e7dc3c4 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Wed, 5 Mar 2014 20:27:27 +0000
 Subject: [PATCH] Prevent hoppers from loading chunks

CraftBukkit-Patches/0094-Guard-Entity-List.patch

@@ -1,4 +1,4 @@
-From 37911f5c7eacd81e8c81158a396fe8f6f154ada9 Mon Sep 17 00:00:00 2001
+From 4d78db78eea3b9c0ad686d1283f5a1c7586c972f Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 10 Mar 2014 09:03:28 +1100
 Subject: [PATCH] Guard Entity List

CraftBukkit-Patches/0095-Fix-ConcurrentModificationException-while-being-idle.patch

@@ -1,4 +1,4 @@
-From 6a4a46f7eaa9666f3ac0bcd72ddffab97d43ae48 Mon Sep 17 00:00:00 2001
+From 2317d87940f106c27011d4246d99e6e074d15acd Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Tue, 14 Jan 2014 20:11:25 +0000
 Subject: [PATCH] Fix ConcurrentModificationException while being idle kicked
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix ConcurrentModificationException while being idle kicked
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 59a2c58..763ea9d 100644
+index 703b919..d525845 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1031,6 +1031,7 @@ public abstract class World implements IBlockAccess {

CraftBukkit-Patches/0096-Cancellable-WitherSkull-potion-effect.patch

@@ -1,4 +1,4 @@
-From b90a8671d89d40f9d99598465225b1efdfc43d63 Mon Sep 17 00:00:00 2001
+From e21ce8917903200e7db168d5169544aed2543428 Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Tue, 25 Feb 2014 15:15:26 -0400
 Subject: [PATCH] Cancellable WitherSkull potion effect

CraftBukkit-Patches/0097-Descriptive-kick-reasons-instead-of-Nope.patch

@@ -1,11 +1,11 @@
-From 43257f49aed689a59e7d09a4f64f7dc7220a4848 Mon Sep 17 00:00:00 2001
+From a0923006217408d7fb8141f8a6c54838f2c09206 Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Sat, 15 Mar 2014 01:30:05 -0400
 Subject: [PATCH] Descriptive kick reasons instead of Nope!
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 8c7ec1d..f5a204d 100644
+index d6c8be8..b0a90d7 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -207,7 +207,7 @@ public abstract class Entity implements ICommandListener {
@@ -27,10 +27,10 @@ index 8c7ec1d..f5a204d 100644
              f1 = 0;
          }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index c95471c..fab3a4e 100644
+index 92607c6..05ca762 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -191,7 +191,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+@@ -185,7 +185,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
          // CraftBukkit start - Check for NaN
          if (Double.isNaN(packetplayinflying.x) || Double.isNaN(packetplayinflying.y) || Double.isNaN(packetplayinflying.z)) {
              c.warn(player.getName() + " was caught trying to crash the server with an invalid position.");
@@ -39,7 +39,7 @@ index c95471c..fab3a4e 100644
              return;
          }
          // CraftBukkit end
-@@ -863,7 +863,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+@@ -841,7 +841,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
              this.player.z();
          } else {
              PlayerConnection.c.warn(this.player.getName() + " tried to set an invalid carried item");