diff --git a/Bukkit b/Bukkit
index a70ffc551..f638ec1bf 160000
--- a/Bukkit
+++ b/Bukkit
@@ -1 +1 @@
-Subproject commit a70ffc5519c0f2d4a33eeb74486e3af1ab2f80c3
+Subproject commit f638ec1bfbcfd6bb1cf21d427d76ea1db640b235
diff --git a/Bukkit-Patches/0001-POM-Changes.patch b/Bukkit-Patches/0001-POM-Changes.patch
index b1f33a498..c9aab588e 100644
--- a/Bukkit-Patches/0001-POM-Changes.patch
+++ b/Bukkit-Patches/0001-POM-Changes.patch
@@ -1,4 +1,4 @@
-From 8452737fcbc24d005dce588dd62e42f64fbee981 Mon Sep 17 00:00:00 2001
+From 9db1438e367a3affd9f1d5bd9c884e132372053a Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 10:36:24 +1000
 Subject: [PATCH] POM Changes
diff --git a/Bukkit-Patches/0002-Measure-Timings-Duration.patch b/Bukkit-Patches/0002-Measure-Timings-Duration.patch
index ee606b2db..1ef38446c 100644
--- a/Bukkit-Patches/0002-Measure-Timings-Duration.patch
+++ b/Bukkit-Patches/0002-Measure-Timings-Duration.patch
@@ -1,4 +1,4 @@
-From 0dd63da31dd4362f247137dfeae4d430f6748f88 Mon Sep 17 00:00:00 2001
+From f20ab58bf8d3bcf2d7fe5e8275d3127874bbd61a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 2 Jun 2013 10:42:57 +1000
 Subject: [PATCH] Measure Timings Duration
diff --git a/Bukkit-Patches/0003-Timings-Paste-Command.patch b/Bukkit-Patches/0003-Timings-Paste-Command.patch
index 8608fa604..9da6ecc46 100644
--- a/Bukkit-Patches/0003-Timings-Paste-Command.patch
+++ b/Bukkit-Patches/0003-Timings-Paste-Command.patch
@@ -1,4 +1,4 @@
-From af9e9b5585b81ee36211d584d8678a47e4ffa3c4 Mon Sep 17 00:00:00 2001
+From 51945be4f1d912c546ae3bbe12639de2784b5537 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 10:55:20 +1000
 Subject: [PATCH] Timings Paste Command
diff --git a/Bukkit-Patches/0004-Enchanced-Timings.patch b/Bukkit-Patches/0004-Enchanced-Timings.patch
index fde338d03..28c956ac2 100644
--- a/Bukkit-Patches/0004-Enchanced-Timings.patch
+++ b/Bukkit-Patches/0004-Enchanced-Timings.patch
@@ -1,4 +1,4 @@
-From 90ae49502716d9ff22eaca133e5e1f54e5155dc0 Mon Sep 17 00:00:00 2001
+From 470fc3682694b37bfe795b505e2cbf91b8f9d437 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 11:17:05 +1000
 Subject: [PATCH] Enchanced Timings
diff --git a/Bukkit-Patches/0005-Add-PlayerItemDamageEvent.patch b/Bukkit-Patches/0005-Add-PlayerItemDamageEvent.patch
index a8f491cb3..2a8ca68e4 100644
--- a/Bukkit-Patches/0005-Add-PlayerItemDamageEvent.patch
+++ b/Bukkit-Patches/0005-Add-PlayerItemDamageEvent.patch
@@ -1,4 +1,4 @@
-From 4bd62fd895e241b32e47dbbd3d43415ff710be88 Mon Sep 17 00:00:00 2001
+From 3203acca82b7ada939eb2c820ae112bec684d7d4 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Mon, 4 Mar 2013 18:31:20 +1100
 Subject: [PATCH] Add PlayerItemDamageEvent
diff --git a/Bukkit-Patches/0006-BungeeCord-Support.patch b/Bukkit-Patches/0006-BungeeCord-Support.patch
index ac5780223..40e9a5ca6 100644
--- a/Bukkit-Patches/0006-BungeeCord-Support.patch
+++ b/Bukkit-Patches/0006-BungeeCord-Support.patch
@@ -1,4 +1,4 @@
-From 5be525c5bc3bd8ad23a17716a35fa76d638a7c32 Mon Sep 17 00:00:00 2001
+From 6529e4d6c6a0b3a11775299d9838a46ee16c92a8 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 15:20:49 +1000
 Subject: [PATCH] BungeeCord Support
diff --git a/Bukkit-Patches/0007-Add-Arrow-API.patch b/Bukkit-Patches/0007-Add-Arrow-API.patch
index 3bac05573..b131191a4 100644
--- a/Bukkit-Patches/0007-Add-Arrow-API.patch
+++ b/Bukkit-Patches/0007-Add-Arrow-API.patch
@@ -1,4 +1,4 @@
-From c18d2d4d3d4a6fa1a14c7bc35c77b1dccba60939 Mon Sep 17 00:00:00 2001
+From ba11438ff1ded708c6ddd33fbb14b2c1785dec19 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 15:08:24 +1000
 Subject: [PATCH] Add Arrow API
diff --git a/Bukkit-Patches/0008-Add-Particle-API.patch b/Bukkit-Patches/0008-Add-Particle-API.patch
index f2cce9f30..8d630c9a4 100644
--- a/Bukkit-Patches/0008-Add-Particle-API.patch
+++ b/Bukkit-Patches/0008-Add-Particle-API.patch
@@ -1,4 +1,4 @@
-From a5ed58c6aa2dfef8c8b51fc9c6dfbf4d5e993983 Mon Sep 17 00:00:00 2001
+From b08b4b61746b4a26079cc40f2d4b991e56f6f0a7 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 15:57:09 +1000
 Subject: [PATCH] Add Particle API
diff --git a/Bukkit-Patches/0009-Define-EntitySpawnEvent-and-SpawnerSpawnEvent.patch b/Bukkit-Patches/0009-Define-EntitySpawnEvent-and-SpawnerSpawnEvent.patch
index a08158469..64b8a3a54 100644
--- a/Bukkit-Patches/0009-Define-EntitySpawnEvent-and-SpawnerSpawnEvent.patch
+++ b/Bukkit-Patches/0009-Define-EntitySpawnEvent-and-SpawnerSpawnEvent.patch
@@ -1,4 +1,4 @@
-From 211da6785fca3ebdf26387c97a5472a2f5612393 Mon Sep 17 00:00:00 2001
+From f4c3f11329a362ba8a213030895b1cf04fe85f46 Mon Sep 17 00:00:00 2001
 From: Andy Shulman <andy.shulman@hotmail.com>
 Date: Mon, 15 Apr 2013 20:06:01 -0500
 Subject: [PATCH] Define EntitySpawnEvent and SpawnerSpawnEvent
diff --git a/Bukkit-Patches/0010-Entity-Mount-and-Dismount-Events.patch b/Bukkit-Patches/0010-Entity-Mount-and-Dismount-Events.patch
index 2fd30d214..f456c5c74 100644
--- a/Bukkit-Patches/0010-Entity-Mount-and-Dismount-Events.patch
+++ b/Bukkit-Patches/0010-Entity-Mount-and-Dismount-Events.patch
@@ -1,4 +1,4 @@
-From 0f3bb9c6ff5727243486a28ce8470ec7024d2e70 Mon Sep 17 00:00:00 2001
+From c4a7b5cdf8ac2fa08df84014e94e53c80ed82a46 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 2 Jul 2013 20:32:53 +1000
 Subject: [PATCH] Entity Mount and Dismount Events
diff --git a/Bukkit-Patches/0011-Update-Depends.patch b/Bukkit-Patches/0011-Update-Depends.patch
index 3ca7bbc6d..c36715e21 100644
--- a/Bukkit-Patches/0011-Update-Depends.patch
+++ b/Bukkit-Patches/0011-Update-Depends.patch
@@ -1,4 +1,4 @@
-From b4184510926c807d10c4f125fdcc670da12abcf8 Mon Sep 17 00:00:00 2001
+From 7d30d01ca1ae5c7c6fcf81396ad4919360c4e81c Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 4 Jul 2013 20:05:19 +1000
 Subject: [PATCH] Update Depends
@@ -6,7 +6,7 @@ Subject: [PATCH] Update Depends
 - All of these changes have been reviewed to be binary compatible and in general contract compatible with previous versions of the libraries.
 
 diff --git a/pom.xml b/pom.xml
-index bc164c0..cb39d0a 100644
+index 95d042b..b011de6 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -77,21 +77,21 @@
diff --git a/Bukkit-Patches/0012-Console-Command-Completion.patch b/Bukkit-Patches/0012-Console-Command-Completion.patch
index c71f884e4..986f0461b 100644
--- a/Bukkit-Patches/0012-Console-Command-Completion.patch
+++ b/Bukkit-Patches/0012-Console-Command-Completion.patch
@@ -1,4 +1,4 @@
-From e0673d1050250f5e32ac173a12b3c65cab315b40 Mon Sep 17 00:00:00 2001
+From a9d4188a487013c7dd5602f6a22d967035820cdd Mon Sep 17 00:00:00 2001
 From: Phillip Schichtel <quick_wango@code-infection.de>
 Date: Mon, 29 Apr 2013 23:07:42 +0200
 Subject: [PATCH] Console Command Completion
diff --git a/Bukkit-Patches/0013-InventoryClickEvent-getClickedInventory.patch b/Bukkit-Patches/0013-InventoryClickEvent-getClickedInventory.patch
index ece50ef5b..a821e2bfa 100644
--- a/Bukkit-Patches/0013-InventoryClickEvent-getClickedInventory.patch
+++ b/Bukkit-Patches/0013-InventoryClickEvent-getClickedInventory.patch
@@ -1,4 +1,4 @@
-From fb9382fe420c5f7d200cedb929bbeba37eef4531 Mon Sep 17 00:00:00 2001
+From 325d5e9fcec324f6d39425a4dede2a6b1eb1d793 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 7 Jul 2013 10:32:05 -0400
 Subject: [PATCH] InventoryClickEvent getClickedInventory
diff --git a/Bukkit-Patches/0014-InventoryClickEvent-getClickedInventory.patch b/Bukkit-Patches/0014-InventoryClickEvent-getClickedInventory.patch
deleted file mode 100644
index 54f976b15..000000000
--- a/Bukkit-Patches/0014-InventoryClickEvent-getClickedInventory.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 87b85aeb82022fe819ac1605e9c7fa4ea48d3c11 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sun, 7 Jul 2013 10:32:05 -0400
-Subject: [PATCH] InventoryClickEvent getClickedInventory
-
-Add InventoryClickEvent.getClickedInventory. Adds BUKKIT-4495
-Plugins currently have to do the logic themselves on the raw slot ID
-in order to determine the inventory clicked. This provides the logic for plugins to
-readily identify which inventory was clicked.
-
-diff --git a/src/main/java/org/bukkit/event/inventory/InventoryClickEvent.java b/src/main/java/org/bukkit/event/inventory/InventoryClickEvent.java
-index 28198b8..3313d91 100644
---- a/src/main/java/org/bukkit/event/inventory/InventoryClickEvent.java
-+++ b/src/main/java/org/bukkit/event/inventory/InventoryClickEvent.java
-@@ -47,6 +47,7 @@ public class InventoryClickEvent extends InventoryInteractEvent {
-     private static final HandlerList handlers = new HandlerList();
-     private final ClickType click;
-     private final InventoryAction action;
-+    private final Inventory clickedInventory;
-     private SlotType slot_type;
-     private int whichSlot;
-     private int rawSlot;
-@@ -62,6 +63,13 @@ public class InventoryClickEvent extends InventoryInteractEvent {
-         super(view);
-         this.slot_type = type;
-         this.rawSlot = slot;
-+        if (slot < 0) {
-+            this.clickedInventory = null;
-+        } else if (view.getTopInventory() != null && slot < view.getTopInventory().getSize()) {
-+            this.clickedInventory = view.getTopInventory();
-+        } else {
-+            this.clickedInventory = view.getBottomInventory();
-+        }
-         this.whichSlot = view.convertSlot(slot);
-         this.click = click;
-         this.action = action;
-@@ -73,6 +81,14 @@ public class InventoryClickEvent extends InventoryInteractEvent {
-     }
- 
-     /**
-+     * Gets the inventory that was clicked, or null if outside of window
-+     * @return The clicked inventory
-+     */
-+    public Inventory getClickedInventory() {
-+        return clickedInventory;
-+    }
-+
-+    /**
-      * Gets the type of slot that was clicked.
-      *
-      * @return the slot type
--- 
-1.8.1.2
-
diff --git a/CraftBukkit b/CraftBukkit
index 58c4152e3..2a13a5af3 160000
--- a/CraftBukkit
+++ b/CraftBukkit
@@ -1 +1 @@
-Subproject commit 58c4152e3d63d5d034b78b8ac9d6cfb8f1989a71
+Subproject commit 2a13a5af3218bf2cacfa791cf70cec417e0fdbd5
diff --git a/CraftBukkit-Patches/0001-POM-Changes.patch b/CraftBukkit-Patches/0001-POM-Changes.patch
index 07036c86c..f0bf368a7 100644
--- a/CraftBukkit-Patches/0001-POM-Changes.patch
+++ b/CraftBukkit-Patches/0001-POM-Changes.patch
@@ -1,4 +1,4 @@
-From 82ed6fd2bc75dbead3183ee5c2ec0b3345d72df2 Mon Sep 17 00:00:00 2001
+From fd0c4c152a4a3c0d4bc8d5c4471715695c9c6b4b 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
diff --git a/CraftBukkit-Patches/0002-mc-dev-imports.patch b/CraftBukkit-Patches/0002-mc-dev-imports.patch
index c9494c13f..2a788dc71 100644
--- a/CraftBukkit-Patches/0002-mc-dev-imports.patch
+++ b/CraftBukkit-Patches/0002-mc-dev-imports.patch
@@ -1,4 +1,4 @@
-From 876fb3fa05b7f3e1307bb973a4881ed68fa239a1 Mon Sep 17 00:00:00 2001
+From 9520c287eca34c28ed9a7a53e65755b89b22e7af Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 2 Jul 2013 13:13:29 +1000
 Subject: [PATCH] mc-dev imports
diff --git a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
index 4c35ceab0..b3acac4df 100644
--- a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
+++ b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
@@ -1,14 +1,14 @@
-From af557fd6f13fce2560eb4889cf556c88cc045298 Mon Sep 17 00:00:00 2001
+From 3d9160caf85e0157802ddbbc5ccc519387eccd3e 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
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index e06e23b..4c16040 100644
+index 75b1fb2..8881878 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1263,4 +1263,14 @@ public class CraftWorld implements World {
+@@ -1265,4 +1265,14 @@ public class CraftWorld implements World {
              cps.queueUnload(chunk.x, chunk.z);
          }
      }
diff --git a/CraftBukkit-Patches/0004-Spigot-Configuration.patch b/CraftBukkit-Patches/0004-Spigot-Configuration.patch
index 02b2b321f..b9b8f11e0 100644
--- a/CraftBukkit-Patches/0004-Spigot-Configuration.patch
+++ b/CraftBukkit-Patches/0004-Spigot-Configuration.patch
@@ -1,11 +1,11 @@
-From ac7ad239ca0a822289a8263e803be7d48eb5c307 Mon Sep 17 00:00:00 2001
+From 44f4c66981071f0c90253d9e08a5d7a57f63b9c0 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
 
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 0ce6c49..160d749 100644
+index 95d7e5d..6fe33d0 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -89,6 +89,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -34,7 +34,7 @@ index 0ce6c49..160d749 100644
          if (!this.getOnlineMode()) {
              this.getLogger().warning("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!");
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f134856..0dc673d 100644
+index 0435ca7..7d4def3 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -99,6 +99,7 @@ public abstract class World implements IBlockAccess {
diff --git a/CraftBukkit-Patches/0005-Better-Chunk-Tick-Selection.patch b/CraftBukkit-Patches/0005-Better-Chunk-Tick-Selection.patch
index 1dc251065..56c0ba130 100644
--- a/CraftBukkit-Patches/0005-Better-Chunk-Tick-Selection.patch
+++ b/CraftBukkit-Patches/0005-Better-Chunk-Tick-Selection.patch
@@ -1,11 +1,11 @@
-From 7b266e982dfda605efd4355fd0947d5f1ef34bac Mon Sep 17 00:00:00 2001
+From fe19bcc370679630fa1d80fd36fd5d9e0fa07bab 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
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 0dc673d..41baf2b 100644
+index 7d4def3..15d2a62 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -66,13 +66,35 @@ public abstract class World implements IBlockAccess {
@@ -113,7 +113,7 @@ index 0dc673d..41baf2b 100644
  
          this.methodProfiler.b();
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index e787fb1..09d076e 100644
+index eb9540f..b073b90 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -300,9 +300,19 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
diff --git a/CraftBukkit-Patches/0006-Crop-Growth-Rates.patch b/CraftBukkit-Patches/0006-Crop-Growth-Rates.patch
index d269e38fc..d961dc2d3 100644
--- a/CraftBukkit-Patches/0006-Crop-Growth-Rates.patch
+++ b/CraftBukkit-Patches/0006-Crop-Growth-Rates.patch
@@ -1,4 +1,4 @@
-From e57cb696c341a8ec945e3b4cb90613add51ff8e1 Mon Sep 17 00:00:00 2001
+From 33080e70fd655ca796ed9069fa2daef5bf71b8a3 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
diff --git a/CraftBukkit-Patches/0007-More-Efficient-Chunk-Save-Queue.patch b/CraftBukkit-Patches/0007-More-Efficient-Chunk-Save-Queue.patch
index 410062109..b02669786 100644
--- a/CraftBukkit-Patches/0007-More-Efficient-Chunk-Save-Queue.patch
+++ b/CraftBukkit-Patches/0007-More-Efficient-Chunk-Save-Queue.patch
@@ -1,11 +1,11 @@
-From 3be8bbfd99e5390f7c192f90841a88ab8b4660b8 Mon Sep 17 00:00:00 2001
+From a47bb2a8c87e3c9d9ea238e46f01c984c71428f8 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
 
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index bee715b..5c67fe4 100644
+index 8a21f35..ba6d32f 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -13,8 +13,7 @@ import java.util.Set;
diff --git a/CraftBukkit-Patches/0008-More-Efficient-GetCubes.patch b/CraftBukkit-Patches/0008-More-Efficient-GetCubes.patch
index 8970c3cbb..b893946b0 100644
--- a/CraftBukkit-Patches/0008-More-Efficient-GetCubes.patch
+++ b/CraftBukkit-Patches/0008-More-Efficient-GetCubes.patch
@@ -1,11 +1,11 @@
-From d7b9305d672eb1fdb2e248e4f0f2c274e5021d70 Mon Sep 17 00:00:00 2001
+From 60ef2965fff046cd970c123c931facd7ee291f39 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 41baf2b..18994b6 100644
+index 15d2a62..8ac0e8e 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1044,19 +1044,47 @@ public abstract class World implements IBlockAccess {
diff --git a/CraftBukkit-Patches/0009-Proxy-IP-Filter.patch b/CraftBukkit-Patches/0009-Proxy-IP-Filter.patch
index 201da8bf9..3ab86f4a7 100644
--- a/CraftBukkit-Patches/0009-Proxy-IP-Filter.patch
+++ b/CraftBukkit-Patches/0009-Proxy-IP-Filter.patch
@@ -1,4 +1,4 @@
-From af630d59b1f8a97ccf6d73b1d183a73d03c6f845 Mon Sep 17 00:00:00 2001
+From b775da9b4f2ff04d33eec48bcb45c5637f92dda5 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 23 Apr 2013 11:22:07 +1000
 Subject: [PATCH] Proxy IP Filter
diff --git a/CraftBukkit-Patches/0010-Merge-tweaks-and-configuration.patch b/CraftBukkit-Patches/0010-Merge-tweaks-and-configuration.patch
index 007529d8e..52a298ece 100644
--- a/CraftBukkit-Patches/0010-Merge-tweaks-and-configuration.patch
+++ b/CraftBukkit-Patches/0010-Merge-tweaks-and-configuration.patch
@@ -1,4 +1,4 @@
-From dcf697293680dd7593a8e1f92ac65b36c7be48db Mon Sep 17 00:00:00 2001
+From add74cc2f0f32f3fc3199fcc3b8054ffef974ad2 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Merge tweaks and configuration
 This allows the merging of Experience orbs, as well as the configuration of the merge radius of items. Additionally it refactors the merge algorithm to be a better experience for players.
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index cb2b114..6895b53 100644
+index 8e1b024..0b8756b 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -112,7 +112,10 @@ public class EntityItem extends Entity {
@@ -41,7 +41,7 @@ index cb2b114..6895b53 100644
              }
          } else {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 18994b6..3e7c493 100644
+index 8ac0e8e..0968ed8 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -956,6 +956,23 @@ public abstract class World implements IBlockAccess {
diff --git a/CraftBukkit-Patches/0011-LongHash-Tweaks.patch b/CraftBukkit-Patches/0011-LongHash-Tweaks.patch
index 97bcea1ac..d7bbe6af1 100644
--- a/CraftBukkit-Patches/0011-LongHash-Tweaks.patch
+++ b/CraftBukkit-Patches/0011-LongHash-Tweaks.patch
@@ -1,4 +1,4 @@
-From aa15e3095f30c11c90f034e2b1b9ebbe08337c56 Mon Sep 17 00:00:00 2001
+From 395c1f65df10f279940151e1b9242861373a2578 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 17:13:47 +1000
 Subject: [PATCH] LongHash Tweaks
diff --git a/CraftBukkit-Patches/0012-Async-Operation-Catching.patch b/CraftBukkit-Patches/0012-Async-Operation-Catching.patch
index 28fb36f9c..cc62e2e22 100644
--- a/CraftBukkit-Patches/0012-Async-Operation-Catching.patch
+++ b/CraftBukkit-Patches/0012-Async-Operation-Catching.patch
@@ -1,4 +1,4 @@
-From 2ca037f07251ec82625905573ff1926563aacbdc Mon Sep 17 00:00:00 2001
+From a7ffffafca73803554e56ab978d6b1334a58969a Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 7 Mar 2013 20:12:46 +1100
 Subject: [PATCH] Async Operation Catching
@@ -26,7 +26,7 @@ index a8e45dd..7f23f71 100644
              EntityPlayer entityplayer = (EntityPlayer) entity;
              Iterator iterator = this.b.iterator();
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index e58af63..edd2460 100644
+index 673c204..b14e1e0 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -292,6 +292,7 @@ public class EntityTrackerEntry {
@@ -46,7 +46,7 @@ index e58af63..edd2460 100644
              this.trackedPlayers.remove(entityplayer);
              entityplayer.removeQueue.add(Integer.valueOf(this.tracker.id));
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 3e7c493..04fa7d6 100644
+index 0968ed8..4ec4d08 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -925,6 +925,7 @@ public abstract class World implements IBlockAccess {
@@ -74,7 +74,7 @@ index 3e7c493..04fa7d6 100644
          Entity entity = null;
          for (int i = 0; i < list.size(); ++i) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 4c16040..8508d22 100644
+index 8881878..e8bb8ae 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -160,6 +160,7 @@ public class CraftWorld implements World {
diff --git a/CraftBukkit-Patches/0013-View-Distance.patch b/CraftBukkit-Patches/0013-View-Distance.patch
index 46697f08e..fb730a053 100644
--- a/CraftBukkit-Patches/0013-View-Distance.patch
+++ b/CraftBukkit-Patches/0013-View-Distance.patch
@@ -1,4 +1,4 @@
-From 70bf4a9446eddbe4a3dad0be25ecfdefe1f0af39 Mon Sep 17 00:00:00 2001
+From 4507134ba87b783d290621344c31b154a441b4f6 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
@@ -19,7 +19,7 @@ index 4e0398c..ae4ca63 100644
          } else {
              this.f = i;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 09d076e..c4248d0 100644
+index b073b90..1a34feb 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -49,7 +49,7 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
diff --git a/CraftBukkit-Patches/0014-Compressed-Nibble-Arrays.patch b/CraftBukkit-Patches/0014-Compressed-Nibble-Arrays.patch
index 81257da81..8a696ecb3 100644
--- a/CraftBukkit-Patches/0014-Compressed-Nibble-Arrays.patch
+++ b/CraftBukkit-Patches/0014-Compressed-Nibble-Arrays.patch
@@ -1,4 +1,4 @@
-From 4a04b15cf84b0ae02d738271808890199f735331 Mon Sep 17 00:00:00 2001
+From d10857c13d5eea02e7d70951421a73469468b7ca Mon Sep 17 00:00:00 2001
 From: Mike Primm <mike@primmhome.com>
 Date: Sun, 13 Jan 2013 03:49:07 -0800
 Subject: [PATCH] Compressed Nibble Arrays
diff --git a/CraftBukkit-Patches/0015-Sync-Free-Chunk-Reference-Cache.patch b/CraftBukkit-Patches/0015-Sync-Free-Chunk-Reference-Cache.patch
index 9f0ce5124..24edfa454 100644
--- a/CraftBukkit-Patches/0015-Sync-Free-Chunk-Reference-Cache.patch
+++ b/CraftBukkit-Patches/0015-Sync-Free-Chunk-Reference-Cache.patch
@@ -1,11 +1,11 @@
-From 99dc46381b11ee5325f14d7e729a11f05c1a6113 Mon Sep 17 00:00:00 2001
+From c876ff9dabc9bf638b9fcb1fd21521904c87193a Mon Sep 17 00:00:00 2001
 From: Mike Primm <mike@primmhome.com>
 Date: Wed, 16 Jan 2013 15:27:22 -0600
 Subject: [PATCH] Sync Free Chunk Reference Cache
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 04fa7d6..8c4bbf9 100644
+index 4ec4d08..d5552b6 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -300,15 +300,13 @@ public abstract class World implements IBlockAccess {
diff --git a/CraftBukkit-Patches/0016-Highly-Optimized-Tick-Loop.patch b/CraftBukkit-Patches/0016-Highly-Optimized-Tick-Loop.patch
index 1476027ab..70b82824e 100644
--- a/CraftBukkit-Patches/0016-Highly-Optimized-Tick-Loop.patch
+++ b/CraftBukkit-Patches/0016-Highly-Optimized-Tick-Loop.patch
@@ -1,11 +1,11 @@
-From 641e8a34d01845e770f07b08fe316c6ad5951f49 Mon Sep 17 00:00:00 2001
+From 9cc766f66a41723df6472db2ec244e418be7809d Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 3 Feb 2013 12:28:17 +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 3a8154a..d8e9e8d 100644
+index 26cfa0c..f025083 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -86,6 +86,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
diff --git a/CraftBukkit-Patches/0017-Improved-Timings-System.patch b/CraftBukkit-Patches/0017-Improved-Timings-System.patch
index 8aa75c4b6..f893aeda6 100644
--- a/CraftBukkit-Patches/0017-Improved-Timings-System.patch
+++ b/CraftBukkit-Patches/0017-Improved-Timings-System.patch
@@ -1,4 +1,4 @@
-From 056cb7e59eb35bc88af1e5f39d0035106087d6f6 Mon Sep 17 00:00:00 2001
+From 8606186a726ed47563cc3714dce414776efe0f19 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 10 Jan 2013 00:18:11 -0500
 Subject: [PATCH] Improved Timings System
@@ -63,7 +63,7 @@ index 671384d..e095ae0 100644
  
      protected void C() {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5652710..7b8ea64 100644
+index f025083..f52d619 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -7,7 +7,6 @@ import java.security.KeyPair;
diff --git a/CraftBukkit-Patches/0018-Orebfuscator.patch b/CraftBukkit-Patches/0018-Orebfuscator.patch
index ffaf3a378..9425de57e 100644
--- a/CraftBukkit-Patches/0018-Orebfuscator.patch
+++ b/CraftBukkit-Patches/0018-Orebfuscator.patch
@@ -1,4 +1,4 @@
-From e795b98bec6778f4f4b8a59ca061fc61d1d6bfff Mon Sep 17 00:00:00 2001
+From ba52e0a6ff1c2d470be5ad41e435bf422be98df4 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
@@ -95,7 +95,7 @@ index 04c44fc..a6e3be2 100644
          Deflater deflater = localDeflater.get();
          deflater.reset();
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index d77a4cc..4aa9ab7 100644
+index a7afa55..1a60229 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -184,6 +184,7 @@ public class PlayerInteractManager {
diff --git a/CraftBukkit-Patches/0019-Fix-Mob-Spawning-Relative-to-View-Distance.patch b/CraftBukkit-Patches/0019-Fix-Mob-Spawning-Relative-to-View-Distance.patch
index 808606d94..830ec8a22 100644
--- a/CraftBukkit-Patches/0019-Fix-Mob-Spawning-Relative-to-View-Distance.patch
+++ b/CraftBukkit-Patches/0019-Fix-Mob-Spawning-Relative-to-View-Distance.patch
@@ -1,4 +1,4 @@
-From 272cbeba4ae7fb24c5f5a56689d88381715bd32b Mon Sep 17 00:00:00 2001
+From e56ac55a6907c33ae13bab5e45eccb304212329d 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
diff --git a/CraftBukkit-Patches/0020-Handle-Null-Tile-Entities.patch b/CraftBukkit-Patches/0020-Handle-Null-Tile-Entities.patch
index bec71e202..0b06da881 100644
--- a/CraftBukkit-Patches/0020-Handle-Null-Tile-Entities.patch
+++ b/CraftBukkit-Patches/0020-Handle-Null-Tile-Entities.patch
@@ -1,11 +1,11 @@
-From e7535637a11b98cd8eebd8909b19c4000370203f Mon Sep 17 00:00:00 2001
+From 6562b0f38a2a0ddf67c80fbf2051deb098ded266 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 75402e7..fd76af0 100644
+index 9da3f13..6206167 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1334,6 +1334,13 @@ public abstract class World implements IBlockAccess {
diff --git a/CraftBukkit-Patches/0021-Entity-Activation-Range.patch b/CraftBukkit-Patches/0021-Entity-Activation-Range.patch
index 1ce4ede03..b08be51ca 100644
--- a/CraftBukkit-Patches/0021-Entity-Activation-Range.patch
+++ b/CraftBukkit-Patches/0021-Entity-Activation-Range.patch
@@ -1,4 +1,4 @@
-From 0b1f4f7d9d57f2c04277b404fe0bc53f22fb39d2 Mon Sep 17 00:00:00 2001
+From 52d11a16d8ba74727a0f426df125d33ca3210240 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
@@ -87,7 +87,7 @@ index 5ba19f3..4c73a5f 100644
          super(world);
      }
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index 65e7a88..7015f21 100644
+index a4766c5..23fd1a8 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
 @@ -14,7 +14,7 @@ public class EntityArrow extends Entity implements IProjectile {
diff --git a/CraftBukkit-Patches/0022-Metrics.patch b/CraftBukkit-Patches/0022-Metrics.patch
index e4be20549..52781c780 100644
--- a/CraftBukkit-Patches/0022-Metrics.patch
+++ b/CraftBukkit-Patches/0022-Metrics.patch
@@ -1,4 +1,4 @@
-From 09b61daa4edc61628388ef2ea9951626c72eeff0 Mon Sep 17 00:00:00 2001
+From 7f0bdda393aa374b88418f13aa631f08467a3bf5 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
diff --git a/CraftBukkit-Patches/0023-Watchdog-Thread.patch b/CraftBukkit-Patches/0023-Watchdog-Thread.patch
index 132104ca1..d9761a583 100644
--- a/CraftBukkit-Patches/0023-Watchdog-Thread.patch
+++ b/CraftBukkit-Patches/0023-Watchdog-Thread.patch
@@ -1,11 +1,11 @@
-From 1e1f355a1446897adccd3b9a8e360651ec465d27 Mon Sep 17 00:00:00 2001
+From 77856e37195b1779bdddeb9f3a2f14ae72a17961 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Feb 2013 12:33:20 +1100
 Subject: [PATCH] Watchdog Thread.
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 994b260..c59b793 100644
+index f52d619..33eaecc 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -413,6 +413,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
diff --git a/CraftBukkit-Patches/0024-Netty.patch b/CraftBukkit-Patches/0024-Netty.patch
index cf1088230..74d6d5a63 100644
--- a/CraftBukkit-Patches/0024-Netty.patch
+++ b/CraftBukkit-Patches/0024-Netty.patch
@@ -1,4 +1,4 @@
-From e45740199bcb1bff75aca5932568e15aa2ae3a11 Mon Sep 17 00:00:00 2001
+From 13da8d1098ec4326777b56ae4510a7bdee4e5de2 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 2 Jul 2013 09:06:29 +1000
 Subject: [PATCH] Netty
diff --git a/CraftBukkit-Patches/0025-PlayerItemDamageEvent.patch b/CraftBukkit-Patches/0025-PlayerItemDamageEvent.patch
index a29fa92d8..fa2224a79 100644
--- a/CraftBukkit-Patches/0025-PlayerItemDamageEvent.patch
+++ b/CraftBukkit-Patches/0025-PlayerItemDamageEvent.patch
@@ -1,4 +1,4 @@
-From 49745f38fc434eae538b673b41be1fdc6683f990 Mon Sep 17 00:00:00 2001
+From 4c20b9d01de06bcba204c1e68910e9265ea8aedb 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
diff --git a/CraftBukkit-Patches/0026-Faster-UUID-for-entities.patch b/CraftBukkit-Patches/0026-Faster-UUID-for-entities.patch
index 64f37162f..412d6653c 100644
--- a/CraftBukkit-Patches/0026-Faster-UUID-for-entities.patch
+++ b/CraftBukkit-Patches/0026-Faster-UUID-for-entities.patch
@@ -1,4 +1,4 @@
-From a58395902b9acad1f9b28d849027857361b4fbf7 Mon Sep 17 00:00:00 2001
+From 7037c64aaf24c9f00e85103e34312652e09cb091 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 17 Mar 2013 19:02:50 +1100
 Subject: [PATCH] Faster UUID for entities
@@ -6,7 +6,7 @@ Subject: [PATCH] Faster UUID for entities
 It is overkill to create a new SecureRandom on each entity create and then use it to make a new Entity ID for every entity instance created. Instead we will just use a pseudo random UUID based off the random instance we already have.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index e438df5..700e450 100644
+index 4a769ed..d4bd4ed 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -132,7 +132,7 @@ public abstract class Entity {
diff --git a/CraftBukkit-Patches/0027-Prevent-NPE-in-CraftSign.patch b/CraftBukkit-Patches/0027-Prevent-NPE-in-CraftSign.patch
index 52e4a858b..f3f25748d 100644
--- a/CraftBukkit-Patches/0027-Prevent-NPE-in-CraftSign.patch
+++ b/CraftBukkit-Patches/0027-Prevent-NPE-in-CraftSign.patch
@@ -1,4 +1,4 @@
-From 115bb33a3a3573220f1d573648d43841c5defae8 Mon Sep 17 00:00:00 2001
+From 958dd4fae14a9cb51416e08d6a30f658a62265d2 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
diff --git a/CraftBukkit-Patches/0028-Entity-Tracking-Ranges.patch b/CraftBukkit-Patches/0028-Entity-Tracking-Ranges.patch
index 698dfb087..e56583acd 100644
--- a/CraftBukkit-Patches/0028-Entity-Tracking-Ranges.patch
+++ b/CraftBukkit-Patches/0028-Entity-Tracking-Ranges.patch
@@ -1,4 +1,4 @@
-From 5f5ee043f008db9a34702ede800a6823afdcfc84 Mon Sep 17 00:00:00 2001
+From 1c0cf95f3bd793cf1324bd3c115f2b865b310bbc 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
diff --git a/CraftBukkit-Patches/0029-BungeeCord-Support.patch b/CraftBukkit-Patches/0029-BungeeCord-Support.patch
index d6d42b03e..00a939b3b 100644
--- a/CraftBukkit-Patches/0029-BungeeCord-Support.patch
+++ b/CraftBukkit-Patches/0029-BungeeCord-Support.patch
@@ -1,4 +1,4 @@
-From 8661bb93ba528c7a76cdc5f96c0d43f1d53dd0cc Mon Sep 17 00:00:00 2001
+From 232d9206c7764ad9d37012a0cf5e9e73c86d5241 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Mar 2013 11:15:11 +1100
 Subject: [PATCH] BungeeCord Support
diff --git a/CraftBukkit-Patches/0030-Limit-Custom-Map-Rendering.patch b/CraftBukkit-Patches/0030-Limit-Custom-Map-Rendering.patch
index 7ba684fb3..e1926eb6d 100644
--- a/CraftBukkit-Patches/0030-Limit-Custom-Map-Rendering.patch
+++ b/CraftBukkit-Patches/0030-Limit-Custom-Map-Rendering.patch
@@ -1,4 +1,4 @@
-From 9173937cd1ad2913e9936bf65ead353d862a356a Mon Sep 17 00:00:00 2001
+From fd8e7a05c6826d07b7f98b8c2e7eba5d2dbbb935 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Mar 2013 19:08:41 +1100
 Subject: [PATCH] Limit Custom Map Rendering
diff --git a/CraftBukkit-Patches/0031-Enable-Improved-Ping-Sending.patch b/CraftBukkit-Patches/0031-Enable-Improved-Ping-Sending.patch
index 3eea5c88e..3320a6f68 100644
--- a/CraftBukkit-Patches/0031-Enable-Improved-Ping-Sending.patch
+++ b/CraftBukkit-Patches/0031-Enable-Improved-Ping-Sending.patch
@@ -1,11 +1,11 @@
-From 875bc5fe23f26ed5d5d7cf2db951f2070e33e1db Mon Sep 17 00:00:00 2001
+From b118d779aae057d1f31a057c7ed0102e90128af4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 24 Feb 2013 20:45:20 +1100
 Subject: [PATCH] Enable Improved Ping Sending
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 8ccf851..55a0612 100644
+index 2191b07..5c9babf 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -51,6 +51,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/CraftBukkit-Patches/0032-Filter-Invalid-Names.patch b/CraftBukkit-Patches/0032-Filter-Invalid-Names.patch
index 792ba9e45..23eb47e7b 100644
--- a/CraftBukkit-Patches/0032-Filter-Invalid-Names.patch
+++ b/CraftBukkit-Patches/0032-Filter-Invalid-Names.patch
@@ -1,4 +1,4 @@
-From a28b8f77048de159f9d0c47dadc57a2138b06f3f Mon Sep 17 00:00:00 2001
+From 814cb42764064d0a31a56ff09f9ac8e28d3a9f8d Mon Sep 17 00:00:00 2001
 From: Benjamin James Harrison-Sims <tehrainbowguy@gmail.com>
 Date: Sun, 14 Apr 2013 21:19:57 +0500
 Subject: [PATCH] Filter Invalid Names
diff --git a/CraftBukkit-Patches/0033-Thread-Naming-and-Tweaks.patch b/CraftBukkit-Patches/0033-Thread-Naming-and-Tweaks.patch
index 54cbdfb4f..d66d6b187 100644
--- a/CraftBukkit-Patches/0033-Thread-Naming-and-Tweaks.patch
+++ b/CraftBukkit-Patches/0033-Thread-Naming-and-Tweaks.patch
@@ -1,4 +1,4 @@
-From 2ca1c5f5362ab67c2593d4417bc86c7b5c324b57 Mon Sep 17 00:00:00 2001
+From a621a7f48c384ee6ec697abe87822fd4ad4bd6c5 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Thread Naming and Tweaks
 Removes the sleep forever thread and adds useful names for debugging to all staged thread files.
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index ec3d104..ccbd6bc 100644
+index fa02974..a534bbd 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -34,7 +34,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
diff --git a/CraftBukkit-Patches/0034-Close-Unloaded-Save-Files.patch b/CraftBukkit-Patches/0034-Close-Unloaded-Save-Files.patch
index 00b8451cd..be5aa8136 100644
--- a/CraftBukkit-Patches/0034-Close-Unloaded-Save-Files.patch
+++ b/CraftBukkit-Patches/0034-Close-Unloaded-Save-Files.patch
@@ -1,4 +1,4 @@
-From 0f96805a0dee1a523dab9f3de7dbe365aa039ef3 Mon Sep 17 00:00:00 2001
+From 9c54993363219359145b596b3884587daebc8906 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
diff --git a/CraftBukkit-Patches/0035-Improve-NextTickList-Performance.patch b/CraftBukkit-Patches/0035-Improve-NextTickList-Performance.patch
index e1a5fed27..d905e6a2b 100644
--- a/CraftBukkit-Patches/0035-Improve-NextTickList-Performance.patch
+++ b/CraftBukkit-Patches/0035-Improve-NextTickList-Performance.patch
@@ -1,4 +1,4 @@
-From 3e56952e4d09068e39785a562bdb8057e93a0155 Mon Sep 17 00:00:00 2001
+From d608b1e2af6bc1d8e853aff5c466138653bb7ef2 Mon Sep 17 00:00:00 2001
 From: Mike Primm <mike@primmhome.com>
 Date: Wed, 24 Apr 2013 01:43:33 -0500
 Subject: [PATCH] Improve NextTickList Performance
diff --git a/CraftBukkit-Patches/0036-Remove-o-Option.patch b/CraftBukkit-Patches/0036-Remove-o-Option.patch
index 2b7fd758e..a7646e1ff 100644
--- a/CraftBukkit-Patches/0036-Remove-o-Option.patch
+++ b/CraftBukkit-Patches/0036-Remove-o-Option.patch
@@ -1,4 +1,4 @@
-From 5a7b9526e71d572e90ac4f86e81bd208e48fd906 Mon Sep 17 00:00:00 2001
+From 42ff63133d4fb993c1242d0db04e02c23dd9f3a9 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
diff --git a/CraftBukkit-Patches/0037-Recipe-Deconstruction.patch b/CraftBukkit-Patches/0037-Recipe-Deconstruction.patch
index 55dd3d982..500b03463 100644
--- a/CraftBukkit-Patches/0037-Recipe-Deconstruction.patch
+++ b/CraftBukkit-Patches/0037-Recipe-Deconstruction.patch
@@ -1,4 +1,4 @@
-From 895fdc89af141d0ea379dedc274d3509ab45f38a Mon Sep 17 00:00:00 2001
+From 7ba25a1242facf33a7617b62a35823d88d7e2942 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
diff --git a/CraftBukkit-Patches/0038-Implement-Arrow-API.patch b/CraftBukkit-Patches/0038-Implement-Arrow-API.patch
index b0b1130ed..29beefed6 100644
--- a/CraftBukkit-Patches/0038-Implement-Arrow-API.patch
+++ b/CraftBukkit-Patches/0038-Implement-Arrow-API.patch
@@ -1,4 +1,4 @@
-From 686eb38566b0d99009bcd56b67bede1dfaeb79aa Mon Sep 17 00:00:00 2001
+From 82aec046d5bb347456313d1b11bcbead5aa86942 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
diff --git a/CraftBukkit-Patches/0039-Particle-API.patch b/CraftBukkit-Patches/0039-Particle-API.patch
index 00966ab1c..b93d94f65 100644
--- a/CraftBukkit-Patches/0039-Particle-API.patch
+++ b/CraftBukkit-Patches/0039-Particle-API.patch
@@ -1,4 +1,4 @@
-From 4ec392f28cfe983d68545ec7180b3df783e2f396 Mon Sep 17 00:00:00 2001
+From c5261a6c191f636fa6b67b000923efe7ee7eec7c Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 16:14:30 +1000
 Subject: [PATCH] Particle API
@@ -43,7 +43,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 8508d22..9da1a47 100644
+index e8bb8ae..a68169f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -766,31 +766,21 @@ public class CraftWorld implements World {
@@ -88,7 +88,7 @@ index 8508d22..9da1a47 100644
      public <T extends Entity> T spawn(Location location, Class<T> clazz) throws IllegalArgumentException {
          return spawn(location, clazz, SpawnReason.CUSTOM);
      }
-@@ -1269,6 +1259,62 @@ public class CraftWorld implements World {
+@@ -1271,6 +1261,62 @@ public class CraftWorld implements World {
      // Spigot start
      private final Spigot spigot = new Spigot()
      {
diff --git a/CraftBukkit-Patches/0040-Hopper-Cooldowns.patch b/CraftBukkit-Patches/0040-Hopper-Cooldowns.patch
index 9070794f9..451bea391 100644
--- a/CraftBukkit-Patches/0040-Hopper-Cooldowns.patch
+++ b/CraftBukkit-Patches/0040-Hopper-Cooldowns.patch
@@ -1,11 +1,11 @@
-From c70d7806cbb40ac4522b732fdaeb0fe9900e4d40 Mon Sep 17 00:00:00 2001
+From 6a194f0fd5d7713292bd492b62bc423c9eb1d3b1 Mon Sep 17 00:00:00 2001
 From: DerFlash <bte@freenet.de>
 Date: Sun, 2 Jun 2013 16:23:46 +1000
 Subject: [PATCH] Hopper Cooldowns
 
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
-index 054cea4..6832b13 100644
+index e8cd525..44ddf35 100644
 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java
 +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
 @@ -182,16 +182,19 @@ public class TileEntityHopper extends TileEntity implements IHopper {
diff --git a/CraftBukkit-Patches/0041-Prevent-Shutdown-Hang.patch b/CraftBukkit-Patches/0041-Prevent-Shutdown-Hang.patch
index ecd20efa8..26b3e1ade 100644
--- a/CraftBukkit-Patches/0041-Prevent-Shutdown-Hang.patch
+++ b/CraftBukkit-Patches/0041-Prevent-Shutdown-Hang.patch
@@ -1,4 +1,4 @@
-From c5c676b1b10d279b5309913517b6d0aec529d1f7 Mon Sep 17 00:00:00 2001
+From fb7a0b89a5948ad072b6b47c7cfbf24d58290fe2 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 11 Jun 2013 11:54:32 +1000
 Subject: [PATCH] Prevent Shutdown Hang
diff --git a/CraftBukkit-Patches/0042-Implement-SpawnerSpawnEvent.patch b/CraftBukkit-Patches/0042-Implement-SpawnerSpawnEvent.patch
index 652340521..bbe096546 100644
--- a/CraftBukkit-Patches/0042-Implement-SpawnerSpawnEvent.patch
+++ b/CraftBukkit-Patches/0042-Implement-SpawnerSpawnEvent.patch
@@ -1,4 +1,4 @@
-From 25354754dfc2c8202c215a36d405e088eccf8e12 Mon Sep 17 00:00:00 2001
+From aed8f98426fff44dfbe86e4cf0b3aa106cabbd13 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.
@@ -63,7 +63,7 @@ index 108b375..4edd5e3 100644
  
          return entity;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 9986b7a..b026e54 100644
+index 6db7b9b..8cea95c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -35,6 +35,7 @@ import org.bukkit.Material;
@@ -74,7 +74,7 @@ index 9986b7a..b026e54 100644
  import org.bukkit.craftbukkit.CraftServer;
  import org.bukkit.craftbukkit.CraftWorld;
  import org.bukkit.craftbukkit.block.CraftBlock;
-@@ -116,6 +117,22 @@ public class CraftEventFactory {
+@@ -117,6 +118,22 @@ public class CraftEventFactory {
      }
  
      /**
diff --git a/CraftBukkit-Patches/0043-Firework-Meta-Crash-Fix.patch b/CraftBukkit-Patches/0043-Firework-Meta-Crash-Fix.patch
index 654d3fd99..8229eb8f5 100644
--- a/CraftBukkit-Patches/0043-Firework-Meta-Crash-Fix.patch
+++ b/CraftBukkit-Patches/0043-Firework-Meta-Crash-Fix.patch
@@ -1,4 +1,4 @@
-From 7df30e79258a916a9d421d385cd5f7f186428d50 Mon Sep 17 00:00:00 2001
+From 8ab517d12c2b337416c664f3760130263bbcf0dd 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
diff --git a/CraftBukkit-Patches/0044-Do-Not-Search-for-Offline-Players.patch b/CraftBukkit-Patches/0044-Do-Not-Search-for-Offline-Players.patch
index 8b29c74cf..0b3e7286d 100644
--- a/CraftBukkit-Patches/0044-Do-Not-Search-for-Offline-Players.patch
+++ b/CraftBukkit-Patches/0044-Do-Not-Search-for-Offline-Players.patch
@@ -1,4 +1,4 @@
-From 72b6dbf8b063587dad4e70dfa15d6ce14347a52a Mon Sep 17 00:00:00 2001
+From 59f61694395558bf97da4192abea0b02099f0414 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 16 Jun 2013 08:20:26 +1000
 Subject: [PATCH] Do Not Search for Offline Players
diff --git a/CraftBukkit-Patches/0045-Enable-Foreign-Language-Signs.patch b/CraftBukkit-Patches/0045-Enable-Foreign-Language-Signs.patch
index e3345417d..d782115d1 100644
--- a/CraftBukkit-Patches/0045-Enable-Foreign-Language-Signs.patch
+++ b/CraftBukkit-Patches/0045-Enable-Foreign-Language-Signs.patch
@@ -1,4 +1,4 @@
-From b0d75828c17738dd796e0c14ae1739827666f05a Mon Sep 17 00:00:00 2001
+From 260a6fbca541f490a78f1f82f94ba44cc7325506 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 17:53:03 +1000
 Subject: [PATCH] Enable Foreign Language Signs
diff --git a/CraftBukkit-Patches/0046-Spam-Filter-Exclusions.patch b/CraftBukkit-Patches/0046-Spam-Filter-Exclusions.patch
index 834d14aa7..41b5042ac 100644
--- a/CraftBukkit-Patches/0046-Spam-Filter-Exclusions.patch
+++ b/CraftBukkit-Patches/0046-Spam-Filter-Exclusions.patch
@@ -1,4 +1,4 @@
-From 6dbc7b15e1b041b93767db6c1f078ffbde126604 Mon Sep 17 00:00:00 2001
+From 8ed7645ee2ea113964e3dbe13f7a79e1cdd0b673 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 17:59:22 +1000
 Subject: [PATCH] Spam Filter Exclusions
diff --git a/CraftBukkit-Patches/0047-Allow-Disabling-of-Command-Logging.patch b/CraftBukkit-Patches/0047-Allow-Disabling-of-Command-Logging.patch
index 483bf81ac..df7d58209 100644
--- a/CraftBukkit-Patches/0047-Allow-Disabling-of-Command-Logging.patch
+++ b/CraftBukkit-Patches/0047-Allow-Disabling-of-Command-Logging.patch
@@ -1,4 +1,4 @@
-From 179d632758f88e6810b89505f27d914f1f99967c Mon Sep 17 00:00:00 2001
+From d26ad9c01872c1c66b3016178723d2daa757594a 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/CraftBukkit-Patches/0048-Allow-Disabling-of-Command-TabComplete.patch b/CraftBukkit-Patches/0048-Allow-Disabling-of-Command-TabComplete.patch
index da53ff4e6..41f84763f 100644
--- a/CraftBukkit-Patches/0048-Allow-Disabling-of-Command-TabComplete.patch
+++ b/CraftBukkit-Patches/0048-Allow-Disabling-of-Command-TabComplete.patch
@@ -1,4 +1,4 @@
-From 3025731337f0e93defc178f6ffebc3308e722598 Mon Sep 17 00:00:00 2001
+From 4a2d3297a65394d245d4698f0e55efd9afe152e9 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
diff --git a/CraftBukkit-Patches/0049-Configurable-Messages.patch b/CraftBukkit-Patches/0049-Configurable-Messages.patch
index 29c323721..19769bcc5 100644
--- a/CraftBukkit-Patches/0049-Configurable-Messages.patch
+++ b/CraftBukkit-Patches/0049-Configurable-Messages.patch
@@ -1,4 +1,4 @@
-From e9cbb8956e0b8c65b6c23a8775a9d2a55aa1fea8 Mon Sep 17 00:00:00 2001
+From c799d9808a710a302b625606f44280187770c6ee Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 19:21:58 +1000
 Subject: [PATCH] Configurable Messages
diff --git a/CraftBukkit-Patches/0050-Allow-Disabling-of-Random-Lighting-Updates.patch b/CraftBukkit-Patches/0050-Allow-Disabling-of-Random-Lighting-Updates.patch
index c55eba911..c3cb004a8 100644
--- a/CraftBukkit-Patches/0050-Allow-Disabling-of-Random-Lighting-Updates.patch
+++ b/CraftBukkit-Patches/0050-Allow-Disabling-of-Random-Lighting-Updates.patch
@@ -1,11 +1,11 @@
-From 4e1981e8ccbb240b82000e46ee6d9289bd83f885 Mon Sep 17 00:00:00 2001
+From eb368d6de6c2c1a2a0e2fa54decea60436a93ba6 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 22 Jun 2013 16:12:02 +1000
 Subject: [PATCH] Allow Disabling of Random Lighting Updates
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 039ba6e..6060288 100644
+index 211127b..8bd7876 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -2103,7 +2103,7 @@ public abstract class World implements IBlockAccess {
diff --git a/CraftBukkit-Patches/0051-Add-Log-Filtering.patch b/CraftBukkit-Patches/0051-Add-Log-Filtering.patch
index e586a864f..9a19c78c6 100644
--- a/CraftBukkit-Patches/0051-Add-Log-Filtering.patch
+++ b/CraftBukkit-Patches/0051-Add-Log-Filtering.patch
@@ -1,4 +1,4 @@
-From 7f9913f4949ab5635570f2130c703cd65e8dff6d Mon Sep 17 00:00:00 2001
+From 333ebc94506b39257d9b2fe719f4b7ece697154c Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 22 Jun 2013 16:40:11 +1000
 Subject: [PATCH] Add Log Filtering
diff --git a/CraftBukkit-Patches/0052-Make-AnvilInventory.getItem-use-both-containers.-Fix.patch b/CraftBukkit-Patches/0052-Make-AnvilInventory.getItem-use-both-containers.-Fix.patch
index 279990f4f..e162858a2 100644
--- a/CraftBukkit-Patches/0052-Make-AnvilInventory.getItem-use-both-containers.-Fix.patch
+++ b/CraftBukkit-Patches/0052-Make-AnvilInventory.getItem-use-both-containers.-Fix.patch
@@ -1,4 +1,4 @@
-From a1df00f1fe411d0b4f103700b14f70c685feb2af Mon Sep 17 00:00:00 2001
+From f9097217bea43bfd7fa6ee74b96f9c9a7d006a6e Mon Sep 17 00:00:00 2001
 From: Andre LeBlanc <andre@norcode.com>
 Date: Sat, 6 Apr 2013 12:00:31 -0400
 Subject: [PATCH] Make AnvilInventory.getItem() use both containers. Fixes
diff --git a/CraftBukkit-Patches/0053-Always-Fire-PreLoginEvent.patch b/CraftBukkit-Patches/0053-Always-Fire-PreLoginEvent.patch
index 3d6c60cc8..51947b51d 100644
--- a/CraftBukkit-Patches/0053-Always-Fire-PreLoginEvent.patch
+++ b/CraftBukkit-Patches/0053-Always-Fire-PreLoginEvent.patch
@@ -1,11 +1,11 @@
-From 4c1c269487e6d9d88f3b08cc279d19b7ea0ec6d5 Mon Sep 17 00:00:00 2001
+From 71acae1d31a96f258f61efeac474cfd8cf77b157 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 25 Jun 2013 18:09:26 +1000
 Subject: [PATCH] Always Fire PreLoginEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/PendingConnection.java b/src/main/java/net/minecraft/server/PendingConnection.java
-index d26b4d2..9b8ddd2 100644
+index 0eacd84..5cf58bf 100644
 --- a/src/main/java/net/minecraft/server/PendingConnection.java
 +++ b/src/main/java/net/minecraft/server/PendingConnection.java
 @@ -110,7 +110,7 @@ public class PendingConnection extends Connection {
diff --git a/CraftBukkit-Patches/0054-Properly-Close-Inventories.patch b/CraftBukkit-Patches/0054-Properly-Close-Inventories.patch
index 756a61438..0f556c40b 100644
--- a/CraftBukkit-Patches/0054-Properly-Close-Inventories.patch
+++ b/CraftBukkit-Patches/0054-Properly-Close-Inventories.patch
@@ -1,4 +1,4 @@
-From 6230fbb01c9744202288e9acef8953f25cf2c394 Mon Sep 17 00:00:00 2001
+From a813b607d41bfb17c13c0e57f90c55cf57e5c7b3 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 27 Jun 2013 17:26:09 +1000
 Subject: [PATCH] Properly Close Inventories
@@ -6,7 +6,7 @@ Subject: [PATCH] Properly Close Inventories
 Properly close inventories when unloading and switching worlds.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 04cb6fb..34d07f2 100644
+index 51db2db..0e7e09f 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -690,6 +690,15 @@ public class Chunk {
diff --git a/CraftBukkit-Patches/0055-Disallow-Interaction-With-Self.patch b/CraftBukkit-Patches/0055-Disallow-Interaction-With-Self.patch
index c76dc0452..33090e643 100644
--- a/CraftBukkit-Patches/0055-Disallow-Interaction-With-Self.patch
+++ b/CraftBukkit-Patches/0055-Disallow-Interaction-With-Self.patch
@@ -1,4 +1,4 @@
-From 078a585d0a3719c1559bb58a71b210ef45c53856 Mon Sep 17 00:00:00 2001
+From 1d5973db27210fc53faa77237664838e1e5ee550 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/CraftBukkit-Patches/0056-Lower-Chunk-Compression.patch b/CraftBukkit-Patches/0056-Lower-Chunk-Compression.patch
index 6b6a940a2..c490901a9 100644
--- a/CraftBukkit-Patches/0056-Lower-Chunk-Compression.patch
+++ b/CraftBukkit-Patches/0056-Lower-Chunk-Compression.patch
@@ -1,4 +1,4 @@
-From 2d0a030113a33e17473b14577b295e468625fcdf Mon Sep 17 00:00:00 2001
+From 765fe6a0c96ce22e609bff4ad366faf54812396f Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 2 Jul 2013 09:07:54 +1000
 Subject: [PATCH] Lower Chunk Compression
diff --git a/CraftBukkit-Patches/0057-Silence-End-of-Stream-Errors.patch b/CraftBukkit-Patches/0057-Silence-End-of-Stream-Errors.patch
index 913e0768a..ad714fe8e 100644
--- a/CraftBukkit-Patches/0057-Silence-End-of-Stream-Errors.patch
+++ b/CraftBukkit-Patches/0057-Silence-End-of-Stream-Errors.patch
@@ -1,11 +1,11 @@
-From c4fd50b8f90a07ce9b2d2fff3df0cfa3f1dcc79e Mon Sep 17 00:00:00 2001
+From d28b69277fa9bed23920302ea95067c175e5e11f Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 2 Jul 2013 13:51:38 +1000
 Subject: [PATCH] Silence End of Stream Errors
 
 
 diff --git a/src/main/java/net/minecraft/server/Packet.java b/src/main/java/net/minecraft/server/Packet.java
-index b11c26b..9389a7d 100644
+index 391c6fc..b5e0261 100644
 --- a/src/main/java/net/minecraft/server/Packet.java
 +++ b/src/main/java/net/minecraft/server/Packet.java
 @@ -112,7 +112,7 @@ public abstract class Packet {
diff --git a/CraftBukkit-Patches/0058-Entity-Mount-and-Dismount-Events.patch b/CraftBukkit-Patches/0058-Entity-Mount-and-Dismount-Events.patch
index f5aa5ef03..2e2cc93be 100644
--- a/CraftBukkit-Patches/0058-Entity-Mount-and-Dismount-Events.patch
+++ b/CraftBukkit-Patches/0058-Entity-Mount-and-Dismount-Events.patch
@@ -1,4 +1,4 @@
-From ddff742213ed919561eecebcec331cad67cf8468 Mon Sep 17 00:00:00 2001
+From 71db09c44555124b2a17045ad4ee0151b7ad6551 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 2 Jul 2013 20:32:49 +1000
 Subject: [PATCH] Entity Mount and Dismount Events
diff --git a/CraftBukkit-Patches/0059-Colour-Console-Messages.patch b/CraftBukkit-Patches/0059-Colour-Console-Messages.patch
index 8e44dfc74..9bd5d37d5 100644
--- a/CraftBukkit-Patches/0059-Colour-Console-Messages.patch
+++ b/CraftBukkit-Patches/0059-Colour-Console-Messages.patch
@@ -1,11 +1,11 @@
-From 1b3cf982d56aa8a2a0df4cf97bf1eb83e87e2f1d Mon Sep 17 00:00:00 2001
+From b27b1cb7d8b50442631a95271b364bc41e38a0c0 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 4 Jul 2013 10:11:46 +1000
 Subject: [PATCH] Colour Console Messages
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c59b793..415087a 100644
+index 33eaecc..413e3d8 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -917,7 +917,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
diff --git a/CraftBukkit-Patches/0060-Create-CraftHorse-Instance-for-EntityHorse.patch b/CraftBukkit-Patches/0060-Create-CraftHorse-Instance-for-EntityHorse.patch
index cde77879f..ac14cb9d3 100644
--- a/CraftBukkit-Patches/0060-Create-CraftHorse-Instance-for-EntityHorse.patch
+++ b/CraftBukkit-Patches/0060-Create-CraftHorse-Instance-for-EntityHorse.patch
@@ -1,4 +1,4 @@
-From f4021d998e46e7453c071ed237055ffb1db2e41d Mon Sep 17 00:00:00 2001
+From d54719af52c66e89509b9ee01cfe700bc05be5be Mon Sep 17 00:00:00 2001
 From: Mike Primm <mike@primmhome.com>
 Date: Thu, 4 Jul 2013 00:03:42 -0500
 Subject: [PATCH] Create CraftHorse Instance for EntityHorse
@@ -6,7 +6,7 @@ Subject: [PATCH] Create CraftHorse Instance for EntityHorse
 Handle creating instance of CraftHorse for EntityHorse instances and spawn()
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 9da1a47..88745a4 100644
+index a68169f..7c0a026 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -893,6 +893,8 @@ public class CraftWorld implements World {
@@ -18,18 +18,6 @@ index 9da1a47..88745a4 100644
              } else if (Pig.class.isAssignableFrom(clazz)) {
                  entity = new EntityPig(world);
              } else if (Player.class.isAssignableFrom(clazz)) {
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 97f3c1d..4aec8e9 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -51,6 +51,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
-                         else if (entity instanceof EntityOcelot) { return new CraftOcelot(server, (EntityOcelot) entity); }
-                     }
-                     else if (entity instanceof EntitySheep) { return new CraftSheep(server, (EntitySheep) entity); }
-+                    else if (entity instanceof EntityHorse) { return new CraftHorse(server, (EntityHorse) entity); }
-                     else  { return new CraftAnimals(server, (EntityAnimal) entity); }
-                 }
-                 // Monsters
 -- 
 1.8.1.2
 
diff --git a/CraftBukkit-Patches/0061-Properly-Consume-Bonemeal-in-Dispensers.patch b/CraftBukkit-Patches/0061-Properly-Consume-Bonemeal-in-Dispensers.patch
index 9a048bbfe..0553bc679 100644
--- a/CraftBukkit-Patches/0061-Properly-Consume-Bonemeal-in-Dispensers.patch
+++ b/CraftBukkit-Patches/0061-Properly-Consume-Bonemeal-in-Dispensers.patch
@@ -1,4 +1,4 @@
-From a7f87f9a78885b04014e5d6685f386b6838bdf7d Mon Sep 17 00:00:00 2001
+From 28fd5fba0a7b1771bce44f361ab709022eba91b7 Mon Sep 17 00:00:00 2001
 From: Alex Ciuba <alexciuba@gmail.com>
 Date: Mon, 10 Jun 2013 16:04:38 -0400
 Subject: [PATCH] Properly Consume Bonemeal in Dispensers
diff --git a/CraftBukkit-Patches/0062-Prevent-Ghost-Players-Caused-by-Plugins.patch b/CraftBukkit-Patches/0062-Prevent-Ghost-Players-Caused-by-Plugins.patch
index b17b0ebf7..0d4a93708 100644
--- a/CraftBukkit-Patches/0062-Prevent-Ghost-Players-Caused-by-Plugins.patch
+++ b/CraftBukkit-Patches/0062-Prevent-Ghost-Players-Caused-by-Plugins.patch
@@ -1,4 +1,4 @@
-From 020f20585ed19fd45c8b75c28ca058530d416dc8 Mon Sep 17 00:00:00 2001
+From af0e59ae5d8a85658b4309c1b3a7fd8e62b28165 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
diff --git a/CraftBukkit-Patches/0063-Define-Ambient-Setting-of-Potion-Effects.patch b/CraftBukkit-Patches/0063-Define-Ambient-Setting-of-Potion-Effects.patch
index 0fbfd5210..40cde95fb 100644
--- a/CraftBukkit-Patches/0063-Define-Ambient-Setting-of-Potion-Effects.patch
+++ b/CraftBukkit-Patches/0063-Define-Ambient-Setting-of-Potion-Effects.patch
@@ -1,4 +1,4 @@
-From baf9de6d6d274ba32b58281082dd75e02fa12d8a Mon Sep 17 00:00:00 2001
+From 4cf48c39d3d68b3e7c64809909d03a3e1acea22b Mon Sep 17 00:00:00 2001
 From: Jim Bilbrey <jb_aero@verizon.net>
 Date: Wed, 19 Jun 2013 05:38:05 -0400
 Subject: [PATCH] Define Ambient Setting of Potion Effects
diff --git a/CraftBukkit-Patches/0064-Console-Command-Completion.patch b/CraftBukkit-Patches/0064-Console-Command-Completion.patch
index b1c6f81ca..c56331cac 100644
--- a/CraftBukkit-Patches/0064-Console-Command-Completion.patch
+++ b/CraftBukkit-Patches/0064-Console-Command-Completion.patch
@@ -1,4 +1,4 @@
-From d3cd68685c249b915b36b0dcfe7fbd74d7501da8 Mon Sep 17 00:00:00 2001
+From 71591c3b90d7988577409e3beda026973c18ded0 Mon Sep 17 00:00:00 2001
 From: Phillip Schichtel <quick_wango@code-infection.de>
 Date: Fri, 5 Jul 2013 21:55:00 +1000
 Subject: [PATCH] Console Command Completion
diff --git a/CraftBukkit-Patches/0065-Fix-StructureGrowEvent.getPlayer.patch b/CraftBukkit-Patches/0065-Fix-StructureGrowEvent.getPlayer.patch
index d1822168b..6cd642ee2 100644
--- a/CraftBukkit-Patches/0065-Fix-StructureGrowEvent.getPlayer.patch
+++ b/CraftBukkit-Patches/0065-Fix-StructureGrowEvent.getPlayer.patch
@@ -1,4 +1,4 @@
-From a2e7aa0a3718a82ab062a2101232b24bea51bcc2 Mon Sep 17 00:00:00 2001
+From d5e673509003b9580269ce356f1f62a8f2cde4b3 Mon Sep 17 00:00:00 2001
 From: ItsHarry <info@itsjerryandharry.com>
 Date: Wed, 10 Jul 2013 13:45:08 +0200
 Subject: [PATCH] Fix StructureGrowEvent.getPlayer()
diff --git a/CraftBukkit-Patches/0066-Client-Crash-Cannot-Send-Message.patch b/CraftBukkit-Patches/0066-Client-Crash-Cannot-Send-Message.patch
index 062882fc3..3c9169309 100644
--- a/CraftBukkit-Patches/0066-Client-Crash-Cannot-Send-Message.patch
+++ b/CraftBukkit-Patches/0066-Client-Crash-Cannot-Send-Message.patch
@@ -1,4 +1,4 @@
-From 7bc3292ff08b6d1630dfeb08ef83ce115a427bb9 Mon Sep 17 00:00:00 2001
+From 1cb88b278d03153c18df3801bff262d80e91642b Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Wed, 10 Jul 2013 23:46:09 +1000
 Subject: [PATCH] Client Crash Cannot Send Message
diff --git a/CraftBukkit-Patches/0067-Fix-potion-effects-not-being-reset-on-death.patch b/CraftBukkit-Patches/0067-Fix-potion-effects-not-being-reset-on-death.patch
deleted file mode 100644
index 6ae59d9ba..000000000
--- a/CraftBukkit-Patches/0067-Fix-potion-effects-not-being-reset-on-death.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From cc21d7cb9d61eee4efef76e59a04257f1690c90e Mon Sep 17 00:00:00 2001
-From: MonsieurApple <tony@oc.tc>
-Date: Tue, 9 Jul 2013 09:48:49 -0500
-Subject: [PATCH] Fix potion effects not being reset on death
-
-Fix potion effects not being reset on death. Fixes BUKKIT-4515
-
-diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 55a0612..5c9babf 100644
---- a/src/main/java/net/minecraft/server/EntityPlayer.java
-+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -922,7 +922,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
-         this.expTotal = this.newTotalExp;
-         this.exp = 0;
-         this.deathTicks = 0;
--        this.aG(); // Should be removeAllEffects.
-+        this.aJ(); // Should be removeAllEffects.
-         this.updateEffects = true;
-         this.activeContainer = this.defaultContainer;
-         this.killer = null;
--- 
-1.8.1.2
-