Patch rebuild

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

@@ -1,4 +1,4 @@
-From 6c97425d256842a87fefd636af5854d0fe315086 Mon Sep 17 00:00:00 2001
+From 701131eeaff795c9a7745ee77f668266db96b9f8 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
@@ -48,112 +48,6 @@ index 0000000..130597c
 +        return d0;
 +    }
 +}
-diff --git a/src/main/java/net/minecraft/server/BlockTNT.java b/src/main/java/net/minecraft/server/BlockTNT.java
-new file mode 100644
-index 0000000..863cba4
---- /dev/null
-+++ b/src/main/java/net/minecraft/server/BlockTNT.java
-@@ -0,0 +1,100 @@
-+package net.minecraft.server;
-+
-+import javax.annotation.Nullable;
-+
-+public class BlockTNT extends Block {
-+
-+    public static final BlockStateBoolean EXPLODE = BlockStateBoolean.of("explode");
-+
-+    public BlockTNT() {
-+        super(Material.TNT);
-+        this.w(this.blockStateList.getBlockData().set(BlockTNT.EXPLODE, Boolean.valueOf(false)));
-+        this.a(CreativeModeTab.d);
-+    }
-+
-+    public void onPlace(World world, BlockPosition blockposition, IBlockData iblockdata) {
-+        super.onPlace(world, blockposition, iblockdata);
-+        if (world.isBlockIndirectlyPowered(blockposition)) {
-+            this.postBreak(world, blockposition, iblockdata.set(BlockTNT.EXPLODE, Boolean.valueOf(true)));
-+            world.setAir(blockposition);
-+        }
-+
-+    }
-+
-+    public void a(IBlockData iblockdata, World world, BlockPosition blockposition, Block block) {
-+        if (world.isBlockIndirectlyPowered(blockposition)) {
-+            this.postBreak(world, blockposition, iblockdata.set(BlockTNT.EXPLODE, Boolean.valueOf(true)));
-+            world.setAir(blockposition);
-+        }
-+
-+    }
-+
-+    public void wasExploded(World world, BlockPosition blockposition, Explosion explosion) {
-+        if (!world.isClientSide) {
-+            EntityTNTPrimed entitytntprimed = new EntityTNTPrimed(world, (double) ((float) blockposition.getX() + 0.5F), (double) blockposition.getY(), (double) ((float) blockposition.getZ() + 0.5F), explosion.getSource());
-+
-+            entitytntprimed.setFuseTicks((short) (world.random.nextInt(entitytntprimed.getFuseTicks() / 4) + entitytntprimed.getFuseTicks() / 8));
-+            world.addEntity(entitytntprimed);
-+        }
-+    }
-+
-+    public void postBreak(World world, BlockPosition blockposition, IBlockData iblockdata) {
-+        this.a(world, blockposition, iblockdata, (EntityLiving) null);
-+    }
-+
-+    public void a(World world, BlockPosition blockposition, IBlockData iblockdata, EntityLiving entityliving) {
-+        if (!world.isClientSide) {
-+            if (((Boolean) iblockdata.get(BlockTNT.EXPLODE)).booleanValue()) {
-+                EntityTNTPrimed entitytntprimed = new EntityTNTPrimed(world, (double) ((float) blockposition.getX() + 0.5F), (double) blockposition.getY(), (double) ((float) blockposition.getZ() + 0.5F), entityliving);
-+
-+                world.addEntity(entitytntprimed);
-+                world.a((EntityHuman) null, entitytntprimed.locX, entitytntprimed.locY, entitytntprimed.locZ, SoundEffects.gz, SoundCategory.BLOCKS, 1.0F, 1.0F);
-+            }
-+
-+        }
-+    }
-+
-+    public boolean interact(World world, BlockPosition blockposition, IBlockData iblockdata, EntityHuman entityhuman, EnumHand enumhand, @Nullable ItemStack itemstack, EnumDirection enumdirection, float f, float f1, float f2) {
-+        if (itemstack != null && (itemstack.getItem() == Items.FLINT_AND_STEEL || itemstack.getItem() == Items.FIRE_CHARGE)) {
-+            this.a(world, blockposition, iblockdata.set(BlockTNT.EXPLODE, Boolean.valueOf(true)), (EntityLiving) entityhuman);
-+            world.setTypeAndData(blockposition, Blocks.AIR.getBlockData(), 11);
-+            if (itemstack.getItem() == Items.FLINT_AND_STEEL) {
-+                itemstack.damage(1, entityhuman);
-+            } else if (!entityhuman.abilities.canInstantlyBuild) {
-+                --itemstack.count;
-+            }
-+
-+            return true;
-+        } else {
-+            return super.interact(world, blockposition, iblockdata, entityhuman, enumhand, itemstack, enumdirection, f, f1, f2);
-+        }
-+    }
-+
-+    public void a(World world, BlockPosition blockposition, IBlockData iblockdata, Entity entity) {
-+        if (!world.isClientSide && entity instanceof EntityArrow) {
-+            EntityArrow entityarrow = (EntityArrow) entity;
-+
-+            if (entityarrow.isBurning()) {
-+                this.a(world, blockposition, world.getType(blockposition).set(BlockTNT.EXPLODE, Boolean.valueOf(true)), entityarrow.shooter instanceof EntityLiving ? (EntityLiving) entityarrow.shooter : null);
-+                world.setAir(blockposition);
-+            }
-+        }
-+
-+    }
-+
-+    public boolean a(Explosion explosion) {
-+        return false;
-+    }
-+
-+    public IBlockData fromLegacyData(int i) {
-+        return this.getBlockData().set(BlockTNT.EXPLODE, Boolean.valueOf((i & 1) > 0));
-+    }
-+
-+    public int toLegacyData(IBlockData iblockdata) {
-+        return ((Boolean) iblockdata.get(BlockTNT.EXPLODE)).booleanValue() ? 1 : 0;
-+    }
-+
-+    protected BlockStateList getStateList() {
-+        return new BlockStateList(this, new IBlockState[] { BlockTNT.EXPLODE});
-+    }
-+}
 diff --git a/src/main/java/net/minecraft/server/CommandDispatcher.java b/src/main/java/net/minecraft/server/CommandDispatcher.java
 new file mode 100644
 index 0000000..e44fc86

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

@@ -1,4 +1,4 @@
-From 8d81f7bd8280bae3173a1d9b02d49b5494d7fd6c Mon Sep 17 00:00:00 2001
+From 86a4664144df9b6ab45e26ab811d618ba528490d 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
@@ -24,7 +24,7 @@ index fda8eee..778d671 100644
                  this.a = new PersistentStructure(this.a());
                  world.a(this.a(), (PersistentBase) this.a);
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index c2452d6..89f9bc3 100644
+index ce6dc2a..bac023b 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -184,4 +184,16 @@ public class SpigotWorldConfig

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

@@ -1,26 +0,0 @@
-From b4f73432b4ce26d50ab866b5313a6a82d788fbd8 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
-
-Adds BUKKIT-4355
-
-diff --git a/src/main/java/net/minecraft/server/BlockTNT.java b/src/main/java/net/minecraft/server/BlockTNT.java
-index 863cba4..4e5b437 100644
---- a/src/main/java/net/minecraft/server/BlockTNT.java
-+++ b/src/main/java/net/minecraft/server/BlockTNT.java
-@@ -75,6 +75,11 @@ public class BlockTNT extends Block {
-             EntityArrow entityarrow = (EntityArrow) entity;
- 
-             if (entityarrow.isBurning()) {
-+                // CraftBukkit start
-+                if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(entityarrow, blockposition.getX(), blockposition.getY(), blockposition.getZ(), Blocks.AIR, 0).isCancelled()) {
-+                    return;
-+                }
-+                // CraftBukkit end
-                 this.a(world, blockposition, world.getType(blockposition).set(BlockTNT.EXPLODE, Boolean.valueOf(true)), entityarrow.shooter instanceof EntityLiving ? (EntityLiving) entityarrow.shooter : null);
-                 world.setAir(blockposition);
-             }
--- 
-2.7.4
-

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

@@ -1,11 +1,11 @@
-From f3360dd3b177f01ddfb14d873554be12a0fb181d Mon Sep 17 00:00:00 2001
+From e5b24d90e64e95fb7863603c0a71ea43f19b31a7 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 f6a7a57..5817601 100644
+index 39db6fc..6589ecd 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -125,6 +125,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {

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

@@ -1,4 +1,4 @@
-From 506767ba944added8c07a797657580112a335506 Mon Sep 17 00:00:00 2001
+From d44af57efd1537e2947c0fc469e3092cb572c0a5 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/0042-Arrow-Despawn-Rate.patch

@@ -1,11 +1,11 @@
-From 29e6905db83167a1a0479d06827a57af2c74fe1a Mon Sep 17 00:00:00 2001
+From 3c902f049ac8fd71babc4c154382371349d2a0fe Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Mon, 14 Oct 2013 19:20:10 +1100
 Subject: [PATCH] Arrow Despawn Rate
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index 0b73db8..cd2f7be 100644
+index 362acb0..8d52140 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
 @@ -149,7 +149,7 @@ public abstract class EntityArrow extends Entity implements IProjectile {
@@ -18,7 +18,7 @@ index 0b73db8..cd2f7be 100644
                  }
              } else {
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 89f9bc3..28643c5 100644
+index bac023b..d5393f4 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -196,4 +196,11 @@ public class SpigotWorldConfig

CraftBukkit-Patches/0043-Watchdog-Thread.patch

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

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

@@ -1,4 +1,4 @@
-From 66e30a72988fada1412d5477ca0f27776eb72654 Mon Sep 17 00:00:00 2001
+From 418cca8001217f0bdbebb3e64349e0f9a82aa7ce 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/0045-Fix-Broken-Async-Chat.patch

@@ -1,4 +1,4 @@
-From 3c57ca98a98551b15a7f9a8cbef65794270a8292 Mon Sep 17 00:00:00 2001
+From ffa4d5111fb6ba3587a177ef6872f6b74310f7c1 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/0046-Fire-PreLogin-Events-in-Offline-Mode.patch

@@ -1,4 +1,4 @@
-From 440915caa336abd6adef6566a2b6d93fe8db7844 Mon Sep 17 00:00:00 2001
+From 3aeb2dd63c1881762bdc94f762d00657fab613ad 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/0047-BungeeCord-Support.patch

@@ -1,4 +1,4 @@
-From ade88e0bbc293fce372d1c73b7403130b3ec2f17 Mon Sep 17 00:00:00 2001
+From 5fca3834d11807f9c73b131070be219ce76c0d5d 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
@@ -117,7 +117,7 @@ index 1cb9d60..aececa3 100644
          this.d = EnumProtocol.a(packetdataserializer.g());
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 26f4d57..6cbc748 100644
+index 4398686..3bec0db 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -454,7 +454,7 @@ public abstract class PlayerList {

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

@@ -1,4 +1,4 @@
-From bb32a3d916760df5265191f5fc2ca9527bc297a5 Mon Sep 17 00:00:00 2001
+From 95382b0a09bdbc7d0efb024b53f75f98694bb97f 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
@@ -19,7 +19,7 @@ index 8264cac..c2913d6 100644
      }
  
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 28643c5..6df2186 100644
+index d5393f4..8c6e08d 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -203,4 +203,11 @@ public class SpigotWorldConfig

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

@@ -1,4 +1,4 @@
-From 4254f17041cbaf4c5d781cfd805066b4789e5528 Mon Sep 17 00:00:00 2001
+From 4e9588b9627ca6a0330a4b44520098e9c1298071 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 4c8047b..b566d30 100644
+index 87d9a03..42c10ec 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -62,7 +62,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs

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

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

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

CraftBukkit-Patches/0052-Particle-API.patch

@@ -1,4 +1,4 @@
-From 0ac0354bea22d45f1a9bb425084e59a427de93e7 Mon Sep 17 00:00:00 2001
+From f6946c29866964b73f8c9babb91b7dc5a2c968f0 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/0053-Save-ticks-lived-to-nbttag.patch

@@ -1,11 +1,11 @@
-From 73467fb4b14b016ecb3841262615831cc566da61 Mon Sep 17 00:00:00 2001
+From 079d28559301806924ff8f68bf4cd384885ec823 Mon Sep 17 00:00:00 2001
 From: DerFlash <bte@freenet.de>
 Date: Tue, 9 Jul 2013 00:11:12 +0200
 Subject: [PATCH] Save ticks lived to nbttag
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 5ff6400..ee20dfb 100644
+index af02b56..86bfc39 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1313,6 +1313,7 @@ public abstract class Entity implements ICommandListener {

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

@@ -1,11 +1,11 @@
-From e72f9739ce0bf9d36bf8a6e93830403802391495 Mon Sep 17 00:00:00 2001
+From 55ea01c3957791ee6ca9a79d920ef4be0b058350 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 2 Feb 2014 16:55:46 +0000
 Subject: [PATCH] Add Option to Nerf Mobs from Spawner's
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index baddae6..f818dae 100644
+index 86bfc39..875dbb9 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -147,6 +147,7 @@ public abstract class Entity implements ICommandListener {
@@ -52,7 +52,7 @@ index 8086487..535dcfe 100644
                          world.triggerEffect(2004, blockposition, 0);
                          if (entityinsentient != null) {
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 6df2186..3854195 100644
+index 8c6e08d..82c9602 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -210,4 +210,11 @@ public class SpigotWorldConfig

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

@@ -1,4 +1,4 @@
-From 243515268d7e3807212658a1f3acd9ead9eb4282 Mon Sep 17 00:00:00 2001
+From 9a721b8b2ad82cf8b51f0464f9842ccdaa14f947 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/0056-Disable-Connected-Check-on-setScoreboard.patch

@@ -1,11 +1,11 @@
-From d2001d39fc509f566b818c198cb1a3a8bc11fb38 Mon Sep 17 00:00:00 2001
+From 9e6cd6b8e9a7fb3d151bac33d850b1c29ecee8eb Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 23 Dec 2013 15:57:57 +1100
 Subject: [PATCH] Disable Connected Check on setScoreboard
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a34242f..aa3c3c9 100644
+index d4b73c4..964a6a4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1252,7 +1252,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

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

@@ -1,4 +1,4 @@
-From ba89045ad43830763a348863e1d90fbaaec526c2 Mon Sep 17 00:00:00 2001
+From f1911b2852cefc2ed5d7dbae4a6a609d18bc6a80 Mon Sep 17 00:00:00 2001
 From: slide23 <me@slide.ws>
 Date: Fri, 20 Dec 2013 20:15:33 -0600
 Subject: [PATCH] Add Late Bind Option
@@ -6,7 +6,7 @@ Subject: [PATCH] Add Late Bind Option
 Add late-bind config option to delay binding until loading is done.
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 19dcd82..61c6702 100644
+index f2ff8fc..7a15ea6 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -177,6 +177,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer

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

@@ -1,4 +1,4 @@
-From 00a5b0e790ce14c5aca69df7252346ad7d0f56e6 Mon Sep 17 00:00:00 2001
+From b29c0572a5bb91ee923f89ede3dea6ae6361177a 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/0059-Fix-ItemStack-Unbreakable-Code.patch

@@ -1,4 +1,4 @@
-From 56f1e18faae3b184a37ee5043f2632eac7f8b814 Mon Sep 17 00:00:00 2001
+From ab3fb1775613de486ec72f7de46f13ca644098b3 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/0060-Try-and-Debug-Crash-Reports-Crashing.patch

@@ -1,11 +1,11 @@
-From ff217f50ed9c4d4e908bb2c3c23e6b8f0a458bcb Mon Sep 17 00:00:00 2001
+From 3a96a5f1c69b0b1dd07691ea1d2831accdeaf6bf 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 b3aa8e2..ab4d50d 100644
+index 7a92089..5cbe3bd 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -760,7 +760,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs

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

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

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

@@ -1,4 +1,4 @@
-From 35c3bb2d0bf81dd1aed3e9acdbf704f67ab7743a Mon Sep 17 00:00:00 2001
+From 76b4af4f514855baae2316665978e1dd02f7d145 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/0063-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch

@@ -1,4 +1,4 @@
-From 9cb4e80065977beb151b05765aea1e78786cbf2d Mon Sep 17 00:00:00 2001
+From fb4f20ffe72d67a5fb069fde1d9c7ddb70883739 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
@@ -18,7 +18,7 @@ index 3e4163e..88d267c 100644
  
              BlockPosition blockposition1;
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 3854195..4cca76a 100644
+index 82c9602..4ea200d 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -217,4 +217,11 @@ public class SpigotWorldConfig

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

@@ -1,4 +1,4 @@
-From 9d0399f3c9dacbb5e9456d0670d2e43ba0705bf7 Mon Sep 17 00:00:00 2001
+From 1239f4cfec2743fb68dccafdd9403cf8ffabf778 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 25 Jan 2014 14:08:35 +1100
 Subject: [PATCH] Highly Optimized Tick Loop

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

@@ -1,4 +1,4 @@
-From 56954b6420ba19e542b16ba8bae079be67430c5f Mon Sep 17 00:00:00 2001
+From 56987dd30dcc9ad704e015e1b74ebb9b6332350f 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/0066-Add-Optional-Tick-Shuffling.patch

@@ -1,4 +1,4 @@
-From b65fe44acec4cfd4a6f1e576bbab9351023e460f Mon Sep 17 00:00:00 2001
+From 39a009eae0c078872062b6bdede31d4be8219b75 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/0067-Implement-Locale-Getter-for-Players.patch

@@ -1,4 +1,4 @@
-From 43c13a378583aacaca3b9c3d045905dff952c0a3 Mon Sep 17 00:00:00 2001
+From 9898c4765093a1cc54ace1656322df493fece110 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/0068-Cap-Entity-Collisions.patch

@@ -1,4 +1,4 @@
-From 1e7b26f2f1488ad6d88b1ef056c00c29498cc4e1 Mon Sep 17 00:00:00 2001
+From a3990718d6c910916bbff7590a9d64b4226068b0 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
@@ -7,7 +7,7 @@ Limit a single entity to colliding a max of configurable times per tick.
 This will alleviate issues where living entities are hoarded in 1x1 pens.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index f818dae..3b2d552 100644
+index 875dbb9..4427af9 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -149,6 +149,7 @@ public abstract class Entity implements ICommandListener {
@@ -19,7 +19,7 @@ index f818dae..3b2d552 100644
  
      public Entity(World world) {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 42ba97e..3af0765 100644
+index 05a7c9a..a32e453 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2026,7 +2026,8 @@ public abstract class EntityLiving extends Entity {
@@ -43,7 +43,7 @@ index 42ba97e..3af0765 100644
              }
          }
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 4cca76a..19525eb 100644
+index 4ea200d..0a6bbba 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -224,4 +224,11 @@ public class SpigotWorldConfig

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

@@ -1,4 +1,4 @@
-From 7cda472769872fadd307b4cde51142b0badc215f Mon Sep 17 00:00:00 2001
+From 69ac222dd79ce8b0a54e5540b7932e2ddcaf26e3 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/0070-Spam-Filter-Exclusions.patch

@@ -1,11 +1,11 @@
-From 50164240186aded4bb19b38447d8cf1f5263b185 Mon Sep 17 00:00:00 2001
+From b4ef6ddd71b8ce74c61ac6a14b5dec4bd0d6144a 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 5817601..17e4acb 100644
+index 6589ecd..8211e60 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1191,9 +1191,20 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {

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

@@ -1,4 +1,4 @@
-From 3771763df5622d153a1a3a823bca681dfb5b16b0 Mon Sep 17 00:00:00 2001
+From 352c681245d0410e696ec53f3a206555047acec5 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/0072-Add-support-for-fetching-hidden-players.patch

@@ -1,4 +1,4 @@
-From 05889870c73ed4293b7797b6d219980dbe0c4be3 Mon Sep 17 00:00:00 2001
+From 0d910216514c221e8a7bef6bd3676e9efa77c9f8 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/0073-Allow-Disabling-Creative-Item-Filter.patch

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

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

@@ -1,11 +1,11 @@
-From 89df2a3ed3804440941c1b48a4276ea20f5b372a Mon Sep 17 00:00:00 2001
+From ffed8d470d8f0676820092286f6f757c91232162 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 12 Feb 2014 20:02:58 +1100
 Subject: [PATCH] Cap Channel Registrations
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ac40bec..b400080 100644
+index 5d3ce3e..c1cb39b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1072,6 +1072,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

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

@@ -1,11 +1,11 @@
-From d1d12cd7121882999904355865f3ad22abf82034 Mon Sep 17 00:00:00 2001
+From 523e555d5b52d9ef6d1636cee7655c920ec8daf4 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Wed, 12 Feb 2014 20:44:14 +0000
 Subject: [PATCH] Allow vanilla commands to be the main version of a command
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 259a37b..3ed282e 100644
+index c397771..261fffc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -323,8 +323,11 @@ public final class CraftServer implements Server {

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

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

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

@@ -1,4 +1,4 @@
-From 322e05e7b2fa04ce47796cbb93eec945ec2bcc3e Mon Sep 17 00:00:00 2001
+From 04fd3ce016366dcda9de96606e06265655aa95f5 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/0078-Prevent-hoppers-from-loading-chunks.patch

@@ -1,4 +1,4 @@
-From 0b541eb377fb5f9309259d18918f89523731a3b2 Mon Sep 17 00:00:00 2001
+From 493f74940b79175c7facf9daf1cc49277bb9d7e2 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/0079-Guard-Entity-List.patch

@@ -1,11 +1,11 @@
-From b0ee0ca16e6d34356db689e6f6cef3f1e60b1035 Mon Sep 17 00:00:00 2001
+From 9d54050b1fa15e8e7316d9b639e128bfb3759ad4 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 10 Mar 2014 09:03:28 +1100
 Subject: [PATCH] Guard Entity List
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f8df1ec..0a6fd3a 100644
+index 1c56a2b..03c1a72 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -33,7 +33,32 @@ public abstract class World implements IBlockAccess {

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

@@ -1,4 +1,4 @@
-From 0670dc603ea6797cb554362aa6993955acbcb032 Mon Sep 17 00:00:00 2001
+From ade86982318e8ce044b6c72493a3af1439acb459 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 0a6fd3a..41b279c 100644
+index 03c1a72..3174a71 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1,4 +1,4 @@

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

@@ -1,4 +1,4 @@
-From dd77f58f27756dddb675e2d8a843581461548ade Mon Sep 17 00:00:00 2001
+From 7579f9641d2d67488dcc90e793c9944884b1f83f 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/0082-Descriptive-kick-reasons-instead-of-Nope.patch

@@ -1,4 +1,4 @@
-From 57b29f339bf8f79f5634ab73d1351aebb77a312b Mon Sep 17 00:00:00 2001
+From dfc76ef3293d2bf40f749354310484f17a3b7024 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!
@@ -27,7 +27,7 @@ index 4427af9..6ac7f42 100644
              f1 = 0;
          }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 1f40f27..937adcf 100644
+index b1a8900..e13b2c3 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1114,7 +1114,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {

CraftBukkit-Patches/0083-Configurable-dragon-death-and-wither-spawn-sounds.patch

@@ -1,4 +1,4 @@
-From a089f053a753f009e2d707c2822eb7d68abff2be Mon Sep 17 00:00:00 2001
+From d361bee239491590578addeb605bd61284e5fb68 Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Sat, 29 Mar 2014 13:44:25 -0400
 Subject: [PATCH] Configurable dragon death and wither spawn sounds
@@ -35,7 +35,7 @@ index f768be8..5c5452d 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java
-index 53ede00..c7031fc 100644
+index c1d8798..48b5b2c 100644
 --- a/src/main/java/net/minecraft/server/EntityWither.java
 +++ b/src/main/java/net/minecraft/server/EntityWither.java
 @@ -207,6 +207,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@@ -47,7 +47,7 @@ index 53ede00..c7031fc 100644
                          double deltaLength = Math.sqrt(distanceSquared);
                          double relativeX = player.locX + (deltaX / deltaLength) * viewDistance;
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 19525eb..79a3124 100644
+index 0a6bbba..c3dea1e 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -231,4 +231,16 @@ public class SpigotWorldConfig

CraftBukkit-Patches/0084-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch

@@ -1,4 +1,4 @@
-From 2943993ce561f20bc1e7a9f63316abec9c573905 Mon Sep 17 00:00:00 2001
+From 5ea3ed6ec0307d6259495b264e4da0c514af0e71 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Fri, 11 Apr 2014 11:16:34 +0100
 Subject: [PATCH] Display 'Spigot' in client crashes, server lists and Mojang
@@ -6,7 +6,7 @@ Subject: [PATCH] Display 'Spigot' in client crashes, server lists and Mojang
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a21fc76..9f79650 100644
+index 5a2f8c2..738205a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1025,7 +1025,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs

CraftBukkit-Patches/0085-Treat-Bungee-as-Online-Mode.patch

@@ -1,11 +1,11 @@
-From 559ca685d5ac60ee77cc9bef55942674475222d7 Mon Sep 17 00:00:00 2001
+From ad3623c2784f9553b3e6f00dacafd7504016fe9a Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 12 Apr 2014 21:23:58 +1000
 Subject: [PATCH] Treat Bungee as Online Mode
 
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 61c6702..3862463 100644
+index 7a15ea6..6bff471 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -197,7 +197,14 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer

CraftBukkit-Patches/0086-Add-Conversion-Message.patch

@@ -1,11 +1,11 @@
-From 873f6777a11b7a8c6516b92b8024f1a8466ddec8 Mon Sep 17 00:00:00 2001
+From 4ae6a91a3b3537d098c6ff3d066d0f7d80dd0af6 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 12 Apr 2014 23:30:44 +1000
 Subject: [PATCH] Add Conversion Message
 
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 3862463..cf8543a 100644
+index 6bff471..748e564 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -561,6 +561,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer

CraftBukkit-Patches/0087-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch

@@ -1,4 +1,4 @@
-From ab199318824503734565411b611a8e36dbc7c4a6 Mon Sep 17 00:00:00 2001
+From 9ad16824f845883d2c3cb4bf528fb49d882cb7d8 Mon Sep 17 00:00:00 2001
 From: "gjmcferrin@gmail.com" <gjmcferrin@gmail.com>
 Date: Mon, 10 Feb 2014 10:05:11 -0500
 Subject: [PATCH] Properly cancel fishing event. Fixes BUKKIT-5396

CraftBukkit-Patches/0088-Print-Stack-on-InternalException.patch

@@ -1,4 +1,4 @@
-From 37bd1411fa85c467b571e993f5c7f02227246de1 Mon Sep 17 00:00:00 2001
+From 0b49005fe3a78a5844ecc722bca8b3b88a3be6f1 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 13 Apr 2014 09:00:59 +1000
 Subject: [PATCH] Print Stack on InternalException

CraftBukkit-Patches/0089-Use-Offline-Player-Data-Once-if-Required.patch

@@ -1,4 +1,4 @@
-From ab20bdb4eab58257b60f85e8b3beaefcec84fb67 Mon Sep 17 00:00:00 2001
+From e427986b51986c6f471083dea68f08b3d67021cf Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 13 Apr 2014 14:41:23 +1000
 Subject: [PATCH] Use Offline Player Data Once if Required.

CraftBukkit-Patches/0090-Use-Provided-Case-for-Non-Existent-Offline-Players.patch

@@ -1,4 +1,4 @@
-From b836cd57ddea85eb3e862629a842864f282965c8 Mon Sep 17 00:00:00 2001
+From c0b3d1d478fbb238847660ad3eb6aa8b91af1cab Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 14 Apr 2014 09:46:20 +1000
 Subject: [PATCH] Use Provided Case for Non Existent Offline Players

CraftBukkit-Patches/0091-Check-for-blank-OfflinePlayer-Names.patch

@@ -1,11 +1,11 @@
-From 7ac1cdb8605ecc1175842275dec50a9332ae549e Mon Sep 17 00:00:00 2001
+From 56ff1522825052e7cc2f66b6956ca1478faafa0b Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 14 Apr 2014 17:21:24 +1000
 Subject: [PATCH] Check for blank OfflinePlayer Names
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3ed282e..2f5d7f8 100644
+index 261fffc..8fc8b9f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1297,6 +1297,7 @@ public final class CraftServer implements Server {

CraftBukkit-Patches/0092-Fix-Player-Banning.patch

@@ -1,4 +1,4 @@
-From 6c3b5a19733346a3573399496edf851ae819d1f6 Mon Sep 17 00:00:00 2001
+From c8e819b28047a8703ece164976b69460f23478a0 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 15 Apr 2014 10:32:48 +1000
 Subject: [PATCH] Fix Player Banning

CraftBukkit-Patches/0093-Fix-ban-expire-dates.patch

@@ -1,4 +1,4 @@
-From 2de7a4d1d38f1ccc3bfa04f44f00fe3b1f8613c9 Mon Sep 17 00:00:00 2001
+From 3102ed233dc809cfc4437145fdc273f82a26f9e7 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 16 Apr 2014 10:09:56 +1000
 Subject: [PATCH] Fix ban expire dates.

CraftBukkit-Patches/0094-Correct-Ban-Expiration.patch

@@ -1,11 +1,11 @@
-From 93803bbb28cb8030f148fc579cc78b5ec26c602e Mon Sep 17 00:00:00 2001
+From 27e69984c37f0d07202311fa7354431e82ef5aa5 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 16 Apr 2014 11:14:38 +1000
 Subject: [PATCH] Correct Ban Expiration
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 10516dd..a11d281 100644
+index 3bec0db..f5c48a1 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -466,7 +466,7 @@ public abstract class PlayerList {

CraftBukkit-Patches/0095-Convert-Horses-owner-to-UUID.patch

@@ -1,4 +1,4 @@
-From 1a1e7045c19448402314103d3dbca509964c105c Mon Sep 17 00:00:00 2001
+From c4304d581acb25f1dd4ccbc3b0057ac98910dee1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 16 Apr 2014 01:40:30 -0400
 Subject: [PATCH] Convert Horses owner to UUID

CraftBukkit-Patches/0096-Add-Score.isScoreSet-Z-API.patch

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

CraftBukkit-Patches/0097-Log-null-TileEntity-Owner.patch

@@ -1,4 +1,4 @@
-From 39f3352a48ce7e9692ae6bbcc3880e45af113913 Mon Sep 17 00:00:00 2001
+From b08773bba6347b4fe78e42e485e7d0d162ed1b08 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 20 Apr 2014 11:16:54 +1000
 Subject: [PATCH] Log null TileEntity Owner

CraftBukkit-Patches/0098-Don-t-special-case-invalid-usernames-for-UUIDs.patch

@@ -1,11 +1,11 @@
-From eafc0bc0dd8a1616e85c23a1ad49518c8c002156 Mon Sep 17 00:00:00 2001
+From 226985c0216c19435aca8d52f37a04d66127d7af Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 20 Apr 2014 18:58:00 +1000
 Subject: [PATCH] Don't special case 'invalid' usernames for UUIDs.
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2f5d7f8..09eb980 100644
+index 8fc8b9f..5eeca09 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1299,11 +1299,6 @@ public final class CraftServer implements Server {

CraftBukkit-Patches/0099-Convert-player-skulls-async.patch

@@ -1,4 +1,4 @@
-From 7bd9ed84814242c40dc9b7fb7f2d80111f83a6f7 Mon Sep 17 00:00:00 2001
+From 73991a09568d5ba9953ede0db74129b06497d799 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Sun, 20 Apr 2014 13:18:55 +0100
 Subject: [PATCH] Convert player skulls async

CraftBukkit-Patches/0100-Prevent-NoClassDefError-crash-and-notify-on-crash.patch

@@ -1,11 +1,11 @@
-From 2fe7038068ade5da16c436e488ca0c064dcc24a6 Mon Sep 17 00:00:00 2001
+From 2f15f68972a49325b2686791f78f464f839c7383 Mon Sep 17 00:00:00 2001
 From: David <dmck2b@gmail.com>
 Date: Mon, 21 Apr 2014 12:43:08 +0100
 Subject: [PATCH] Prevent NoClassDefError crash and notify on crash
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 41b279c..0196d48 100644
+index 3174a71..0c9031a 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -127,6 +127,8 @@ public abstract class World implements IBlockAccess {

CraftBukkit-Patches/0101-Check-Skull-canPlace.patch

@@ -1,4 +1,4 @@
-From 23148e02d0df68baf8fa0c5501c041578412087c Mon Sep 17 00:00:00 2001
+From 5d237429363fd2de5856474d6fb4e8673c620323 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 15 Apr 2014 10:48:35 +1000
 Subject: [PATCH] Check Skull canPlace

CraftBukkit-Patches/0102-Fix-race-condition-that-could-kill-connections-befor.patch

@@ -1,4 +1,4 @@
-From e9c7e02bdb1fb7d331f1a1025f0ce6699b40a29a Mon Sep 17 00:00:00 2001
+From 224f848441996ae8662b0027687a596d196858c7 Mon Sep 17 00:00:00 2001
 From: Jonas Konrad <me@yawk.at>
 Date: Fri, 25 Apr 2014 23:46:46 +0200
 Subject: [PATCH] Fix race condition that could kill connections before they

CraftBukkit-Patches/0103-Configurable-UserCache-cap.patch

@@ -1,4 +1,4 @@
-From 3d13a0df876ccfb065f3feef1fa89b87ebd7ed0b Mon Sep 17 00:00:00 2001
+From cf44678d63b500bd154e7e433ebe3158e7c3f671 Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Fri, 25 Apr 2014 18:17:30 -0400
 Subject: [PATCH] Configurable UserCache cap

CraftBukkit-Patches/0104-Implement-PlayerSpawnLocationEvent.patch

@@ -1,11 +1,11 @@
-From dba6bbd322e1465e16d103401cb517ede79dcbba Mon Sep 17 00:00:00 2001
+From 81386c1a32b05e9ac980b90599bcb6a6bf7831e5 Mon Sep 17 00:00:00 2001
 From: ninja <xninja@openmailbox.org>
 Date: Tue, 8 Apr 2014 14:05:19 +0200
 Subject: [PATCH] Implement PlayerSpawnLocationEvent.
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index e970c02..b017589 100644
+index f5c48a1..330b8ab 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -37,6 +37,7 @@ import org.bukkit.event.player.PlayerQuitEvent;

CraftBukkit-Patches/0105-Cap-Objective-Score-Length.patch

@@ -1,4 +1,4 @@
-From 717a531661fbc30faf9c9100b08d812a1035883e Mon Sep 17 00:00:00 2001
+From 0fb6e0197c982ec7bf47149e271cde659e6d5851 Mon Sep 17 00:00:00 2001
 From: hauno <imhauno@gmail.com>
 Date: Tue, 6 May 2014 18:01:37 -0700
 Subject: [PATCH] Cap Objective Score Length

CraftBukkit-Patches/0106-Process-conversation-input-on-the-main-thread.-Fixes.patch

@@ -1,4 +1,4 @@
-From af756c2d7392a9b27b5ae43b569873caaecdc7bc Mon Sep 17 00:00:00 2001
+From d78280300bf1d193653669c158fa669bf82bbf0b Mon Sep 17 00:00:00 2001
 From: riking <rikingcoding@gmail.com>
 Date: Wed, 14 May 2014 13:46:48 -0700
 Subject: [PATCH] Process conversation input on the main thread. Fixes
@@ -6,7 +6,7 @@ Subject: [PATCH] Process conversation input on the main thread. Fixes
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 937adcf..cc19d79 100644
+index e13b2c3..b3adbef 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1176,7 +1176,18 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {

CraftBukkit-Patches/0107-Configurable-save-on-stop-only-for-UserCache.patch

@@ -1,4 +1,4 @@
-From c7e463924c2c4daeeba46044919f89ee4e6e0c20 Mon Sep 17 00:00:00 2001
+From f57061799260b9eb019f2986b694a0cbf6306359 Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Fri, 23 May 2014 18:05:10 -0400
 Subject: [PATCH] Configurable save-on-stop-only for UserCache

CraftBukkit-Patches/0108-Prevent-Unbounded-IntCache-Growth.patch

@@ -1,4 +1,4 @@
-From 1d55a59e375139bb70786f6bdb2ffbfd7721e233 Mon Sep 17 00:00:00 2001
+From 242caeef39f6afaacd79b83585cafbc3b8ce3e97 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 20 Jun 2014 19:40:00 +1000
 Subject: [PATCH] Prevent Unbounded IntCache Growth

CraftBukkit-Patches/0109-Cross-World-Entity-Teleportation.patch

@@ -1,4 +1,4 @@
-From deb9123fb41b2376681cfee7a211ca6e89dd9a40 Mon Sep 17 00:00:00 2001
+From 9a62feaed28b5717c66300db16f65665d520a322 Mon Sep 17 00:00:00 2001
 From: Andrew Krieger <Slizyboy@hotmail.com>
 Date: Tue, 24 Dec 2013 07:55:23 -0800
 Subject: [PATCH] Cross World Entity Teleportation
@@ -6,7 +6,7 @@ Subject: [PATCH] Cross World Entity Teleportation
 Use Entity.teleportTo for cross-world teleportation in CraftEntity.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 021db12..ff7bfdc 100644
+index 12d33f0..fd3b39c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -234,7 +234,14 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {

CraftBukkit-Patches/0110-Limit-block-placement-interaction-packets.patch

@@ -1,4 +1,4 @@
-From 92eb8cf98d351aa5c99963a660b25cb476b13082 Mon Sep 17 00:00:00 2001
+From aeede6ac4dfc7ee0567f7e60f824b52180527c52 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thinkofdeath@spigotmc.org>
 Date: Sun, 29 Jun 2014 21:10:34 +0100
 Subject: [PATCH] Limit block placement/interaction packets
@@ -41,7 +41,7 @@ index cb0356e..0000000
 -    }
 -}
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index cc19d79..0d7ed57 100644
+index b3adbef..25ec589 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -899,6 +899,10 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {

CraftBukkit-Patches/0111-Better-item-validation.patch

@@ -1,4 +1,4 @@
-From 81b4cf5d3e1037298a56565d59a70132bcfe900d Mon Sep 17 00:00:00 2001
+From 5afdd1ed7703c810a820c550bacf1dbb99283c48 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thinkofdeath@spigotmc.org>
 Date: Wed, 2 Jul 2014 23:35:51 +0100
 Subject: [PATCH] Better item validation
@@ -20,7 +20,7 @@ index a24c2c0..b056457 100644
              }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
-index d517d7d..7f2a30a 100644
+index 2ed6ad7..9441364 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
 @@ -22,6 +22,10 @@ import net.minecraft.server.IChatBaseComponent;

CraftBukkit-Patches/0112-Further-Seed-Customisation.patch

@@ -1,4 +1,4 @@
-From a1694b2cd447789bba152d16cc840d40013955f8 Mon Sep 17 00:00:00 2001
+From a40921d330cacffae84b85cc73e948e0e503622d Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 4 Jul 2014 13:28:45 +1000
 Subject: [PATCH] Further Seed Customisation
@@ -32,7 +32,7 @@ index 6ddb752..f9bce56 100644
          i1 *= this.d;
          j1 *= this.d;
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 79a3124..7cf8f2d 100644
+index c3dea1e..30eb1e8 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -243,4 +243,13 @@ public class SpigotWorldConfig

CraftBukkit-Patches/0113-Disable-ResourceLeakDetector.patch

@@ -1,4 +1,4 @@
-From c13e7779a91fd97cd62ca8527e911e369f751ac3 Mon Sep 17 00:00:00 2001
+From 2e3de0e2bd759e3bb03bd65c9ed715baa294f616 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 8 Jul 2014 09:01:50 +1000
 Subject: [PATCH] Disable ResourceLeakDetector
@@ -6,7 +6,7 @@ Subject: [PATCH] Disable ResourceLeakDetector
 Hopefully no plugins are somehow leaking buffers, but disabling the ResourceLeakDetector is a good thing for performance of the Netty IO subsytem (it's been disabled in BungeeCord for a while now).
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a41d97d..8b44eea 100644
+index fd04133..1196307 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -127,6 +127,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs

CraftBukkit-Patches/0114-Add-More-Information-to-session.lock-Errors.patch

@@ -1,4 +1,4 @@
-From 529b202ff81221350ab1ad8a83960dd532da17e4 Mon Sep 17 00:00:00 2001
+From bcec8c273d9b1da8fe93e7905c956ca48f77780a Mon Sep 17 00:00:00 2001
 From: Suddenly <suddenly@suddenly.coffee>
 Date: Sat, 5 Jul 2014 16:56:44 +0100
 Subject: [PATCH] Add More Information to session.lock Errors

CraftBukkit-Patches/0115-Safer-JSON-Loading.patch

@@ -1,4 +1,4 @@
-From 6e5226ac34f80bda29495913ed25fbc96f16dcee Mon Sep 17 00:00:00 2001
+From e6297790d117fe7fc6e5fbe47a6f8144227e21de Mon Sep 17 00:00:00 2001
 From: Suddenly <suddenly@suddenly.coffee>
 Date: Tue, 8 Jul 2014 09:44:18 +1000
 Subject: [PATCH] Safer JSON Loading

CraftBukkit-Patches/0116-Add-CommandLine-EULA-Flag.patch

@@ -1,4 +1,4 @@
-From 8bd3624410837db220b18c658158c7b4d83d3986 Mon Sep 17 00:00:00 2001
+From 5274ca56ce6cf628af4eea0cdd50bc60842ed784 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 9 Jul 2014 10:35:44 +1000
 Subject: [PATCH] Add CommandLine EULA Flag
@@ -8,7 +8,7 @@ This flag contains the same message as eula.txt (albeit with proper grammar for
 This feature only exists for hosting companies and people who manage servers in bulk who wish to agree to the terms by setting a flag in a script.
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index cf8543a..8f26ab4 100644
+index 748e564..c277d23 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -127,7 +127,16 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer

CraftBukkit-Patches/0117-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch

@@ -1,4 +1,4 @@
-From 9afa0b2b9b771fe426234fd913c26865d19e4faf Mon Sep 17 00:00:00 2001
+From 29c6035fc664652a4a399a45acc4a5123b8ad77e Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Thu, 17 Jul 2014 21:13:15 -0400
 Subject: [PATCH] Fix for enchanting table wiping meta when placing stacked

CraftBukkit-Patches/0118-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch

@@ -1,4 +1,4 @@
-From 0aeb061ed696c542a0df192227f84da569ddaf52 Mon Sep 17 00:00:00 2001
+From b8926177073ff9f1fe98b839ef7679a1478afc69 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thinkofdeath@spigotmc.org>
 Date: Sat, 19 Jul 2014 12:49:48 +0100
 Subject: [PATCH] Don't spawn bonus ocelots when plugins spawn ocelots

CraftBukkit-Patches/0119-Prevent-a-crash-involving-attributes.patch

@@ -1,4 +1,4 @@
-From fd1898bd073f3871b64eeb21ca463ef7cf4d59c3 Mon Sep 17 00:00:00 2001
+From 8b9cf9670d568efbc7065c9729786e28d1ac69d9 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thinkofdeath@spigotmc.org>
 Date: Sat, 19 Jul 2014 19:54:41 +0100
 Subject: [PATCH] Prevent a crash involving attributes

CraftBukkit-Patches/0120-Make-moved-wrongly-limit-configurable.patch

@@ -1,11 +1,11 @@
-From 532931ecc96a640d80539317963d7d3b56ff52d9 Mon Sep 17 00:00:00 2001
+From 5bc59c176a0d2981c48dac829f061cf4696036ec Mon Sep 17 00:00:00 2001
 From: Jonas Konrad <me@yawk.at>
 Date: Fri, 4 Jul 2014 23:03:13 +0200
 Subject: [PATCH] Make "moved wrongly" limit configurable
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 0d7ed57..1422d65 100644
+index 25ec589..6a06f15 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -340,7 +340,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {

CraftBukkit-Patches/0121-Fix-Null-Tile-Entity-Worlds.patch

@@ -1,4 +1,4 @@
-From b2d8a8060541d63d6558b5af3b79d054484e5347 Mon Sep 17 00:00:00 2001
+From 04ca2cfb872d23d99b2993b1c3a38ba7a77ebcb8 Mon Sep 17 00:00:00 2001
 From: "Evan A. Haskell" <eah2119@gmail.com>
 Date: Thu, 26 Jun 2014 18:37:29 -0400
 Subject: [PATCH] Fix Null Tile Entity Worlds

CraftBukkit-Patches/0122-Make-moved-too-quickly-limit-configurable.patch

@@ -1,11 +1,11 @@
-From 723e568dfb37283a3d324d1ece342a079e3a9e8a Mon Sep 17 00:00:00 2001
+From ea31ac8350c8a4b3a0b539c066af1b196c660418 Mon Sep 17 00:00:00 2001
 From: Jonas Konrad <me@yawk.at>
 Date: Tue, 22 Jul 2014 15:59:01 +0200
 Subject: [PATCH] Make "moved too quickly" limit configurable
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 1422d65..ba8a69a 100644
+index 6a06f15..86dfda6 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -315,7 +315,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {

CraftBukkit-Patches/0123-Apply-NBTReadLimiter-to-more-things.patch

@@ -1,4 +1,4 @@
-From d043446c406a4fabf043529eea02f9fdc434787e Mon Sep 17 00:00:00 2001
+From c0b57c7213e2093bf2663f0c222fc59a275aa77c Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 27 Jul 2014 20:46:04 +1000
 Subject: [PATCH] Apply NBTReadLimiter to more things.

CraftBukkit-Patches/0124-Allow-Attribute-Capping.patch

@@ -1,4 +1,4 @@
-From 623905825505a8f2416641d88ecb51efb7f60efb Mon Sep 17 00:00:00 2001
+From 1276e5a6089ce3b9ba2665daea1fd5344693236a Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 28 Jul 2014 16:55:51 +1000
 Subject: [PATCH] Allow Attribute Capping.

CraftBukkit-Patches/0125-Only-fetch-an-online-UUID-in-online-mode.patch

@@ -1,4 +1,4 @@
-From 859c6b0a4c974d2e24063bbe7ff5793f2f07552b Mon Sep 17 00:00:00 2001
+From 6bc52f0e4d172428438332d7763ce1dea8389287 Mon Sep 17 00:00:00 2001
 From: Maxim Van de Wynckel <maxim_vdw@hotmail.com>
 Date: Wed, 30 Jul 2014 01:19:51 +0200
 Subject: [PATCH] Only fetch an online UUID in online mode
@@ -12,7 +12,7 @@ You want to store data for player "Test"  who never joined. An online UUID is cr
 The player Test joins with an offline UUID but that will not match the online UUID of the saved data.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 09eb980..256601b 100644
+index 5eeca09..d7a29e7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1301,8 +1301,14 @@ public final class CraftServer implements Server {

CraftBukkit-Patches/0126-Filter-attribute-modifiers-which-cause-the-attribute.patch

@@ -1,4 +1,4 @@
-From 6602fba75ee0621a2ef603f571f1301242f77bf4 Mon Sep 17 00:00:00 2001
+From b1f986b3408b0d517d6f5d70ce0d9165b3b49872 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thinkofdeath@spigotmc.org>
 Date: Thu, 31 Jul 2014 17:48:20 +0100
 Subject: [PATCH] Filter attribute modifiers which cause the attribute to go

CraftBukkit-Patches/0127-Plug-WorldMap-Memory-Leak.patch

@@ -1,4 +1,4 @@
-From 103090a7622cb0e9e6b3810c4a6d4954d0f745e9 Mon Sep 17 00:00:00 2001
+From b2ac15fdf3b54a1f4ed3e14dfae3a1038f567c4d Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 8 Aug 2014 19:57:03 +1000
 Subject: [PATCH] Plug WorldMap Memory Leak
@@ -18,7 +18,7 @@ index fe59b75..936d6c6 100644
  
      public PersistentCollection(IDataManager idatamanager) {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f23ca74..c33e246 100644
+index 39740e0..9645393 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1046,6 +1046,23 @@ public abstract class World implements IBlockAccess {

CraftBukkit-Patches/0128-Fix-Corrupted-Trapped-Chest.patch

@@ -1,4 +1,4 @@
-From 6a0833c7923035f1a222ad7ee64353eba759b427 Mon Sep 17 00:00:00 2001
+From daaf07702ab2ad87a1dae3e0337fbbbcf7b05e2c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 15 Aug 2014 00:56:41 -0400
 Subject: [PATCH] Fix Corrupted Trapped Chest
@@ -9,7 +9,7 @@ If a Trapped Chest gets its Tile Entity corrupted, it will crash the server ever
 This will now fix Trapped Chests too.
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 3c6628f..d202462 100644
+index bdf46d6..f7c4309 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -126,7 +126,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {

CraftBukkit-Patches/0129-Remove-uneeded-validation.patch

@@ -1,4 +1,4 @@
-From 3b406cddff5ebd24de10c2acb69f62a1210b0538 Mon Sep 17 00:00:00 2001
+From ee3cba2f4dd08f828a255979059dfe3ce89c8828 Mon Sep 17 00:00:00 2001
 From: drXor <mcyoung@mit.edu>
 Date: Fri, 15 Aug 2014 18:11:09 -0400
 Subject: [PATCH] Remove uneeded validation

CraftBukkit-Patches/0130-Add-Hunger-Config-Values.patch

@@ -1,11 +1,11 @@
-From 941a53c613e022171701637ce44d9c4edf8cd52f Mon Sep 17 00:00:00 2001
+From b0ccbe8691f9074d4bce55c6d80d3f156400c716 Mon Sep 17 00:00:00 2001
 From: lazertester <austin.techhead@gmail.com>
 Date: Sun, 17 Aug 2014 19:56:17 +1000
 Subject: [PATCH] Add Hunger Config Values
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 81c0712..ca9f0fe 100644
+index a4e3825..30c5116 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1153,7 +1153,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -30,7 +30,7 @@ index 81c0712..ca9f0fe 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/FoodMetaData.java b/src/main/java/net/minecraft/server/FoodMetaData.java
-index f9819c4..af4f97e 100644
+index d0bc862..3a7ce8d 100644
 --- a/src/main/java/net/minecraft/server/FoodMetaData.java
 +++ b/src/main/java/net/minecraft/server/FoodMetaData.java
 @@ -73,7 +73,7 @@ public class FoodMetaData {
@@ -43,7 +43,7 @@ index f9819c4..af4f97e 100644
              }
          } else if (this.foodLevel <= 0) {
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 7cf8f2d..4cbcd14 100644
+index 30eb1e8..30db708 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -252,4 +252,16 @@ public class SpigotWorldConfig

CraftBukkit-Patches/0131-Make-debug-logging-togglable.patch

@@ -1,4 +1,4 @@
-From fb7b33519032c983b774b199fcff1f05da454e62 Mon Sep 17 00:00:00 2001
+From 95abdcbc436ad9d62d584b85cb2e531cfec6aa2c Mon Sep 17 00:00:00 2001
 From: Minecrell <dev@minecrell.net>
 Date: Sun, 17 Aug 2014 12:42:53 +0200
 Subject: [PATCH] Make debug logging togglable.

CraftBukkit-Patches/0132-Skip-invalid-enchants-in-CraftMetaItem.patch

@@ -1,4 +1,4 @@
-From c9446cd3f2add4b88a57b49ab274e8fea531433c Mon Sep 17 00:00:00 2001
+From e96322d3e1420feff8f88af9906ff66ea1014602 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thinkofdeath@spigotmc.org>
 Date: Tue, 19 Aug 2014 11:04:21 +0100
 Subject: [PATCH] Skip invalid enchants in CraftMetaItem

CraftBukkit-Patches/0133-Limit-TNT-Detonations-per-tick.patch

@@ -1,4 +1,4 @@
-From c15cc1cb75cdcece03be8ad6d50a95ea6ce831da Mon Sep 17 00:00:00 2001
+From 7a82f6b128b592ee4e9cf2aa224050206873b32f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 20 Aug 2014 18:12:32 -0400
 Subject: [PATCH] Limit TNT Detonations per tick
@@ -19,7 +19,7 @@ index fc7d581..0ed3f89 100644
          this.lastY = this.locY;
          this.lastZ = this.locZ;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index d202462..bea2af7 100644
+index f7c4309..a6687c9 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -629,6 +629,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -31,7 +31,7 @@ index d202462..bea2af7 100644
  
      protected void l() {
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 4cbcd14..a4d7ebb 100644
+index 30db708..56b33b1 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -264,4 +264,15 @@ public class SpigotWorldConfig

CraftBukkit-Patches/0134-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch

@@ -1,4 +1,4 @@
-From 8b4909059cf9171bfb67e1fef54b4ff5a847b946 Mon Sep 17 00:00:00 2001
+From da340326cbe2613ee067dff4c0da03ac8556ed09 Mon Sep 17 00:00:00 2001
 From: libraryaddict <redwarfare@live.com>
 Date: Fri, 22 Aug 2014 05:35:16 -0400
 Subject: [PATCH] Added isUnbreakable and setUnbreakable to ItemMeta

CraftBukkit-Patches/0135-Configurable-Hanging-Tick.patch

@@ -1,4 +1,4 @@
-From 5bfe6889d8b8dead076331af831fe78e971c7343 Mon Sep 17 00:00:00 2001
+From 4757fe9eb93771d7c9a824d863feb0fdd9422de0 Mon Sep 17 00:00:00 2001
 From: drXor <mcyoung@mit.edu>
 Date: Sat, 9 Aug 2014 13:56:51 -0400
 Subject: [PATCH] Configurable Hanging Tick
@@ -18,7 +18,7 @@ index e69634b..3901204 100644
              if (!this.dead && !this.survives()) {
                  // CraftBukkit start - fire break events
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index a4d7ebb..8b40760 100644
+index 56b33b1..b288379 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -275,4 +275,10 @@ public class SpigotWorldConfig

CraftBukkit-Patches/0136-Refactor-ItemDoor-Place.patch

@@ -1,4 +1,4 @@
-From 947504b842df3efac4e35f33fd6298132e5960a3 Mon Sep 17 00:00:00 2001
+From 303c62f1ceef9db6ba70e1ab8d8aed82e879aaa6 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 30 Sep 2014 21:43:15 +1000
 Subject: [PATCH] Refactor ItemDoor Place