diff --git a/CraftBukkit-Patches/0003-Spigot-Changes.patch b/CraftBukkit-Patches/0003-Spigot-Changes.patch
index c0aa8b9524..12713d46c7 100644
--- a/CraftBukkit-Patches/0003-Spigot-Changes.patch
+++ b/CraftBukkit-Patches/0003-Spigot-Changes.patch
@@ -1,4 +1,4 @@
-From d626b39cd08b8c58ab090c999ee5e8308b568845 Mon Sep 17 00:00:00 2001
+From a11f742a5953cb082dea3d72f7b324aefdd7b3f7 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Mar 2013 17:57:27 +1100
 Subject: [PATCH] Spigot Changes
@@ -144,7 +144,7 @@ index 8339a35..c17ce36 100644
  
                  if (l < 7) {
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index cc30a04..b9704bd 100644
+index 3d0c23d..57f39c1 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;
@@ -198,7 +198,7 @@ index cc30a04..b9704bd 100644
          }
  
          if (nbttagcompound == null) {
-@@ -134,6 +137,11 @@ public class ChunkRegionLoader implements IAsyncChunkSaver, IChunkLoader {
+@@ -148,6 +151,11 @@ public class ChunkRegionLoader implements IAsyncChunkSaver, IChunkLoader {
          Object object = this.c;
  
          synchronized (this.c) {
@@ -210,7 +210,7 @@ index cc30a04..b9704bd 100644
              if (this.b.contains(chunkcoordintpair)) {
                  for (int i = 0; i < this.a.size(); ++i) {
                      if (((PendingChunkToSave) this.a.get(i)).a.equals(chunkcoordintpair)) {
-@@ -145,6 +153,7 @@ public class ChunkRegionLoader implements IAsyncChunkSaver, IChunkLoader {
+@@ -159,6 +167,7 @@ public class ChunkRegionLoader implements IAsyncChunkSaver, IChunkLoader {
  
              this.a.add(new PendingChunkToSave(chunkcoordintpair, nbttagcompound));
              this.b.add(chunkcoordintpair);
@@ -218,7 +218,7 @@ index cc30a04..b9704bd 100644
              FileIOThread.a.a(this);
          }
      }
-@@ -154,12 +163,20 @@ public class ChunkRegionLoader implements IAsyncChunkSaver, IChunkLoader {
+@@ -168,12 +177,20 @@ public class ChunkRegionLoader implements IAsyncChunkSaver, IChunkLoader {
          Object object = this.c;
  
          synchronized (this.c) {
@@ -239,63 +239,6 @@ index cc30a04..b9704bd 100644
          }
  
          if (pendingchunktosave != null) {
-diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java
-index 38f3038..03d511f 100644
---- a/src/main/java/net/minecraft/server/ChunkSection.java
-+++ b/src/main/java/net/minecraft/server/ChunkSection.java
-@@ -219,7 +219,7 @@ public class ChunkSection {
-     }
- 
-     public void a(byte[] abyte) {
--        this.blockIds = abyte;
-+        this.blockIds = validateByteArray(abyte); // Spigot - validate
-     }
- 
-     public void a(NibbleArray nibblearray) {
-@@ -236,19 +236,38 @@ public class ChunkSection {
-             return;
-         }
-         // CraftBukkit end
--
--        this.extBlockIds = nibblearray;
-+        this.extBlockIds = validateNibbleArray(nibblearray); // Spigot - validate
-     }
- 
-     public void b(NibbleArray nibblearray) {
--        this.blockData = nibblearray;
-+        this.blockData = validateNibbleArray(nibblearray); // Spigot - validate
-     }
- 
-     public void c(NibbleArray nibblearray) {
--        this.blockLight = nibblearray;
-+        this.blockLight = validateNibbleArray(nibblearray); // Spigot - validate
-     }
- 
-     public void d(NibbleArray nibblearray) {
--        this.skyLight = nibblearray;
-+        this.skyLight = validateNibbleArray(nibblearray); // Spigot - validate
-+    }
-+    
-+    // Spigot start - validate/correct nibble array
-+    private static final NibbleArray validateNibbleArray(NibbleArray na) {
-+        if ((na != null) && (na.a.length < 2048)) {
-+            NibbleArray newna = new NibbleArray(4096, 4);
-+            System.arraycopy(na.a, 0, newna.a, 0, na.a.length);
-+            na = newna;
-+        }
-+        return na;
-+    }
-+    // Validate/correct byte array
-+    private static final byte[] validateByteArray(byte[] ba) {
-+        if ((ba != null) && (ba.length < 4096)) {
-+            byte[] newba = new byte[4096];
-+            System.arraycopy(ba,  0,  newba,  0,  ba.length);
-+            ba = newba;
-+        }
-+        return ba;
-     }
-+    // Spigot end
- }
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
 index a28d233..e7481dd 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
diff --git a/CraftBukkit-Patches/0009-Implement-lightening-of-NibbleArrays-only-allocate-b.patch b/CraftBukkit-Patches/0009-Implement-lightening-of-NibbleArrays-only-allocate-b.patch
index e82a91593c..d4d200b660 100644
--- a/CraftBukkit-Patches/0009-Implement-lightening-of-NibbleArrays-only-allocate-b.patch
+++ b/CraftBukkit-Patches/0009-Implement-lightening-of-NibbleArrays-only-allocate-b.patch
@@ -1,6 +1,6 @@
-From 3d38587aa973e480cb8934c99d2f6911ce118151 Mon Sep 17 00:00:00 2001
-From: Mike Primm <mike@primmhome.com>
-Date: Sun, 23 Dec 2012 14:46:23 -0600
+From 66e69212e40d4e2547d60dc3051c7d2271821e2b Mon Sep 17 00:00:00 2001
+From: Mike Primm <mike@primmhome.com> 
+Date: Sun, 13 Jan 2013 03:49:07 -0800
 Subject: [PATCH] Implement 'lightening' of NibbleArrays - only allocate
  buffers when non-trivial value Saving from 40-45% of memory use by chunk
  section data.
@@ -10,10 +10,10 @@ Finish up NibbleArray lightening work - use for Snapshots, reduce copies
 Fix nibble handling with NBT - arrays aren't copied by NBTByteArray
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index b9704bd..7a98822 100644
+index 57f39c1..1e97aff 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-@@ -225,15 +225,15 @@ public class ChunkRegionLoader implements IAsyncChunkSaver, IChunkLoader {
+@@ -239,15 +239,15 @@ public class ChunkRegionLoader implements IAsyncChunkSaver, IChunkLoader {
                  nbttagcompound1.setByte("Y", (byte) (chunksection.d() >> 4 & 255));
                  nbttagcompound1.setByteArray("Blocks", chunksection.g());
                  if (chunksection.i() != null) {
@@ -35,7 +35,7 @@ index b9704bd..7a98822 100644
  
                  nbttaglist.add(nbttagcompound1);
 diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java
-index 03d511f..623399f 100644
+index bac819f..da57d90 100644
 --- a/src/main/java/net/minecraft/server/ChunkSection.java
 +++ b/src/main/java/net/minecraft/server/ChunkSection.java
 @@ -134,7 +134,8 @@ public class ChunkSection {
@@ -78,18 +78,21 @@ index 03d511f..623399f 100644
  
          if (empty) {
              return;
-@@ -253,10 +259,8 @@ public class ChunkSection {
-     
-     // Spigot start - validate/correct nibble array
-     private static final NibbleArray validateNibbleArray(NibbleArray na) {
--        if ((na != null) && (na.a.length < 2048)) {
--            NibbleArray newna = new NibbleArray(4096, 4);
--            System.arraycopy(na.a, 0, newna.a, 0, na.a.length);
--            na = newna;
-+        if ((na != null) && (na.getByteLength() < 2048)) {
-+            na.resizeArray(2048);
+@@ -254,11 +260,11 @@ public class ChunkSection {
+ 
+     // CraftBukkit start - Validate array lengths
+     private NibbleArray validateNibbleArray(NibbleArray nibbleArray) {
+-        if (nibbleArray != null && nibbleArray.a.length < 2048) {
+-            byte[] newArray = new byte[2048];
+-            System.arraycopy(nibbleArray.a, 0, newArray, 0, ((nibbleArray.a.length > 2048) ? 2048 : nibbleArray.a.length));
+-            nibbleArray = new NibbleArray(newArray, 4);
++        // Spigot start - fix for more awesome nibble arrays
++        if (nibbleArray != null && nibbleArray.getByteLength() < 2048) {
++            nibbleArray.resizeArray(2048);
          }
-         return na;
++        // Spigot end
+ 
+         return nibbleArray;
      }
 diff --git a/src/main/java/net/minecraft/server/NibbleArray.java b/src/main/java/net/minecraft/server/NibbleArray.java
 index 5d75a54..c9bc20c 100644
@@ -246,6 +249,25 @@ index 5d75a54..c9bc20c 100644
          int i1 = j << this.c | k << this.b | i;
          int j1 = i1 >> 1;
          int k1 = i1 & 1;
+diff --git a/src/main/java/net/minecraft/server/OldChunkLoader.java b/src/main/java/net/minecraft/server/OldChunkLoader.java
+index 53c1cb5..9a9e20f 100644
+--- a/src/main/java/net/minecraft/server/OldChunkLoader.java
++++ b/src/main/java/net/minecraft/server/OldChunkLoader.java
+@@ -94,9 +94,11 @@ public class OldChunkLoader {
+ 
+                 nbttagcompound1.setByte("Y", (byte) (k & 255));
+                 nbttagcompound1.setByteArray("Blocks", abyte);
+-                nbttagcompound1.setByteArray("Data", nibblearray.a);
+-                nbttagcompound1.setByteArray("SkyLight", nibblearray1.a);
+-                nbttagcompound1.setByteArray("BlockLight", nibblearray2.a);
++                // Spigot start - a -> getValueArray() accessor
++                nbttagcompound1.setByteArray("Data", nibblearray.getValueArray());
++                nbttagcompound1.setByteArray("SkyLight", nibblearray1.getValueArray());
++                nbttagcompound1.setByteArray("BlockLight", nibblearray2.getValueArray());
++                // Spigot end
+                 nbttaglist.add(nbttagcompound1);
+             }
+         }
 diff --git a/src/main/java/net/minecraft/server/Packet51MapChunk.java b/src/main/java/net/minecraft/server/Packet51MapChunk.java
 index 14a6245..ee179be 100644
 --- a/src/main/java/net/minecraft/server/Packet51MapChunk.java
diff --git a/CraftBukkit-Patches/0010-Fix-mcRegion-to-Anvil-conversion.patch b/CraftBukkit-Patches/0010-Fix-mcRegion-to-Anvil-conversion.patch
deleted file mode 100644
index 077fadd8fe..0000000000
--- a/CraftBukkit-Patches/0010-Fix-mcRegion-to-Anvil-conversion.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From f2a957fcd4a22ec15721eb5696c4ae404587c89e Mon Sep 17 00:00:00 2001
-From: Agaricus <agaricusb@yahoo.com>
-Date: Sun, 13 Jan 2013 03:49:07 -0800
-Subject: [PATCH] Fix mcRegion-to-Anvil conversion
-
-
-diff --git a/src/main/java/net/minecraft/server/OldChunkLoader.java b/src/main/java/net/minecraft/server/OldChunkLoader.java
-index 53c1cb5..9a9e20f 100644
---- a/src/main/java/net/minecraft/server/OldChunkLoader.java
-+++ b/src/main/java/net/minecraft/server/OldChunkLoader.java
-@@ -94,9 +94,11 @@ public class OldChunkLoader {
- 
-                 nbttagcompound1.setByte("Y", (byte) (k & 255));
-                 nbttagcompound1.setByteArray("Blocks", abyte);
--                nbttagcompound1.setByteArray("Data", nibblearray.a);
--                nbttagcompound1.setByteArray("SkyLight", nibblearray1.a);
--                nbttagcompound1.setByteArray("BlockLight", nibblearray2.a);
-+                // Spigot start - a -> getValueArray() accessor
-+                nbttagcompound1.setByteArray("Data", nibblearray.getValueArray());
-+                nbttagcompound1.setByteArray("SkyLight", nibblearray1.getValueArray());
-+                nbttagcompound1.setByteArray("BlockLight", nibblearray2.getValueArray());
-+                // Spigot end
-                 nbttaglist.add(nbttagcompound1);
-             }
-         }
--- 
-1.8.2.1
-
diff --git a/CraftBukkit-Patches/0011-Update-versioning-check-to-correctly-resolve-api-ver.patch b/CraftBukkit-Patches/0010-Update-versioning-check-to-correctly-resolve-api-ver.patch
similarity index 93%
rename from CraftBukkit-Patches/0011-Update-versioning-check-to-correctly-resolve-api-ver.patch
rename to CraftBukkit-Patches/0010-Update-versioning-check-to-correctly-resolve-api-ver.patch
index 7e4fe712f2..b797422d83 100644
--- a/CraftBukkit-Patches/0011-Update-versioning-check-to-correctly-resolve-api-ver.patch
+++ b/CraftBukkit-Patches/0010-Update-versioning-check-to-correctly-resolve-api-ver.patch
@@ -1,4 +1,4 @@
-From c75c722c045962b2e8908b92af643ceba6bcd613 Mon Sep 17 00:00:00 2001
+From 5bacc90f15903a28fe329fee89c920d51ea9585e Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@bigpond.com>
 Date: Tue, 15 Jan 2013 15:05:02 +1100
 Subject: [PATCH] Update versioning check to correctly resolve api version.
diff --git a/CraftBukkit-Patches/0012-Optimize-packet-used-to-unload-chunks-for-the-client.patch b/CraftBukkit-Patches/0011-Optimize-packet-used-to-unload-chunks-for-the-client.patch
similarity index 97%
rename from CraftBukkit-Patches/0012-Optimize-packet-used-to-unload-chunks-for-the-client.patch
rename to CraftBukkit-Patches/0011-Optimize-packet-used-to-unload-chunks-for-the-client.patch
index a104737e05..620dadc8f5 100644
--- a/CraftBukkit-Patches/0012-Optimize-packet-used-to-unload-chunks-for-the-client.patch
+++ b/CraftBukkit-Patches/0011-Optimize-packet-used-to-unload-chunks-for-the-client.patch
@@ -1,4 +1,4 @@
-From f623e062de37c65c8e65ff2491f6f7deebc5fc68 Mon Sep 17 00:00:00 2001
+From 2faa51280c0e87153593785c54976e699ae612b2 Mon Sep 17 00:00:00 2001
 From: Ammar Askar <ammar@ammaraskar.com>
 Date: Fri, 18 Jan 2013 16:20:01 +0500
 Subject: [PATCH] Optimize packet used to unload chunks for the client
diff --git a/CraftBukkit-Patches/0013-Alternate-sync-free-but-safe-chunk-reference-cache.patch b/CraftBukkit-Patches/0012-Alternate-sync-free-but-safe-chunk-reference-cache.patch
similarity index 95%
rename from CraftBukkit-Patches/0013-Alternate-sync-free-but-safe-chunk-reference-cache.patch
rename to CraftBukkit-Patches/0012-Alternate-sync-free-but-safe-chunk-reference-cache.patch
index 80e790a8bd..2cf4697832 100644
--- a/CraftBukkit-Patches/0013-Alternate-sync-free-but-safe-chunk-reference-cache.patch
+++ b/CraftBukkit-Patches/0012-Alternate-sync-free-but-safe-chunk-reference-cache.patch
@@ -1,4 +1,4 @@
-From 2ab60d53837805246d5637de9409d581333d6258 Mon Sep 17 00:00:00 2001
+From 13a6bd378bcbf0f58a931b4bc6a24fb3f12b1ff7 Mon Sep 17 00:00:00 2001
 From: Mike Primm <mike@primmhome.com>
 Date: Wed, 16 Jan 2013 15:27:22 -0600
 Subject: [PATCH] Alternate, sync-free-but-safe chunk reference cache
diff --git a/CraftBukkit-Patches/0014-Tick-loop-optimization-sleep-for-as-long-as-possible.patch b/CraftBukkit-Patches/0013-Tick-loop-optimization-sleep-for-as-long-as-possible.patch
similarity index 98%
rename from CraftBukkit-Patches/0014-Tick-loop-optimization-sleep-for-as-long-as-possible.patch
rename to CraftBukkit-Patches/0013-Tick-loop-optimization-sleep-for-as-long-as-possible.patch
index e2bc40e336..a7b79039bf 100644
--- a/CraftBukkit-Patches/0014-Tick-loop-optimization-sleep-for-as-long-as-possible.patch
+++ b/CraftBukkit-Patches/0013-Tick-loop-optimization-sleep-for-as-long-as-possible.patch
@@ -1,4 +1,4 @@
-From 42618ef73f272138aca156f65e61f190d359f2e1 Mon Sep 17 00:00:00 2001
+From 6503e881c0b5c4ebb28137f25052520d985cf78d 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] Tick loop optimization - sleep for as long as possible.
diff --git a/CraftBukkit-Patches/0015-Improved-Timings-System.patch b/CraftBukkit-Patches/0014-Improved-Timings-System.patch
similarity index 99%
rename from CraftBukkit-Patches/0015-Improved-Timings-System.patch
rename to CraftBukkit-Patches/0014-Improved-Timings-System.patch
index 12896292f5..79a666e9d5 100644
--- a/CraftBukkit-Patches/0015-Improved-Timings-System.patch
+++ b/CraftBukkit-Patches/0014-Improved-Timings-System.patch
@@ -1,4 +1,4 @@
-From 17b35282ddc9b836277eaac64846981fca852c54 Mon Sep 17 00:00:00 2001
+From bd0ceaaf0d67618c4c036b436b3fc73caa2b9117 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
diff --git a/CraftBukkit-Patches/0016-Add-oreobfuscator-for-Spigot.patch b/CraftBukkit-Patches/0015-Add-oreobfuscator-for-Spigot.patch
similarity index 99%
rename from CraftBukkit-Patches/0016-Add-oreobfuscator-for-Spigot.patch
rename to CraftBukkit-Patches/0015-Add-oreobfuscator-for-Spigot.patch
index 6f4b34aa9f..68e63c3b72 100644
--- a/CraftBukkit-Patches/0016-Add-oreobfuscator-for-Spigot.patch
+++ b/CraftBukkit-Patches/0015-Add-oreobfuscator-for-Spigot.patch
@@ -1,4 +1,4 @@
-From 4e68a1a17ba2f0cd98c20d2b8b3f74abf633de6a Mon Sep 17 00:00:00 2001
+From 437f0288d071cd51f0c7903b13440ceb676c295e Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Mar 2013 10:58:17 +1100
 Subject: [PATCH] Add oreobfuscator for Spigot.
diff --git a/CraftBukkit-Patches/0017-Only-count-entities-in-chunks-being-processed-for-th.patch b/CraftBukkit-Patches/0016-Only-count-entities-in-chunks-being-processed-for-th.patch
similarity index 98%
rename from CraftBukkit-Patches/0017-Only-count-entities-in-chunks-being-processed-for-th.patch
rename to CraftBukkit-Patches/0016-Only-count-entities-in-chunks-being-processed-for-th.patch
index e34d4b57bb..d89c892d20 100644
--- a/CraftBukkit-Patches/0017-Only-count-entities-in-chunks-being-processed-for-th.patch
+++ b/CraftBukkit-Patches/0016-Only-count-entities-in-chunks-being-processed-for-th.patch
@@ -1,4 +1,4 @@
-From 3544f99022ed5cfe8d2c52ee75c556390fe9103b Mon Sep 17 00:00:00 2001
+From 9b80ec89a6c650410da797ad30fd6f6343d465a2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 29 Jan 2013 13:25:53 -0500
 Subject: [PATCH] Only count entities in chunks being processed for the spawn
diff --git a/CraftBukkit-Patches/0018-Detect-remove-and-warn-about-null-tile-entities.patch b/CraftBukkit-Patches/0017-Detect-remove-and-warn-about-null-tile-entities.patch
similarity index 94%
rename from CraftBukkit-Patches/0018-Detect-remove-and-warn-about-null-tile-entities.patch
rename to CraftBukkit-Patches/0017-Detect-remove-and-warn-about-null-tile-entities.patch
index 566d26f723..a402878e6f 100644
--- a/CraftBukkit-Patches/0018-Detect-remove-and-warn-about-null-tile-entities.patch
+++ b/CraftBukkit-Patches/0017-Detect-remove-and-warn-about-null-tile-entities.patch
@@ -1,4 +1,4 @@
-From 84836464019bcb8e20890088317310ae168b171b Mon Sep 17 00:00:00 2001
+From 7ef5bb91f4c0ec4a310324d37dabe63b7a660efa 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] Detect, remove and warn about null tile entities.
diff --git a/CraftBukkit-Patches/0019-Entity-Activation-Range.patch b/CraftBukkit-Patches/0018-Entity-Activation-Range.patch
similarity index 99%
rename from CraftBukkit-Patches/0019-Entity-Activation-Range.patch
rename to CraftBukkit-Patches/0018-Entity-Activation-Range.patch
index 291111cb80..3fda65b6de 100644
--- a/CraftBukkit-Patches/0019-Entity-Activation-Range.patch
+++ b/CraftBukkit-Patches/0018-Entity-Activation-Range.patch
@@ -1,4 +1,4 @@
-From 2e8b2db30d08ecec2a5af741e65a95e182f20b97 Mon Sep 17 00:00:00 2001
+From 4b5c0b2f0ce3983de116c92bdaa42c3e0002b7d6 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
diff --git a/CraftBukkit-Patches/0020-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch b/CraftBukkit-Patches/0019-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch
similarity index 99%
rename from CraftBukkit-Patches/0020-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch
rename to CraftBukkit-Patches/0019-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch
index b31c02337d..69b9338608 100644
--- a/CraftBukkit-Patches/0020-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch
+++ b/CraftBukkit-Patches/0019-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch
@@ -1,4 +1,4 @@
-From 04c9e16daf3efb4197c06628fc6566e92e1032af Mon Sep 17 00:00:00 2001
+From d8270e405d6e2043dad5fb6f4a1f36ef7c51e41c 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. Rewrite the Metrics system to be closer to the
diff --git a/CraftBukkit-Patches/0021-Watchdog-Thread.patch b/CraftBukkit-Patches/0020-Watchdog-Thread.patch
similarity index 99%
rename from CraftBukkit-Patches/0021-Watchdog-Thread.patch
rename to CraftBukkit-Patches/0020-Watchdog-Thread.patch
index c7196bee6c..654c8ef113 100644
--- a/CraftBukkit-Patches/0021-Watchdog-Thread.patch
+++ b/CraftBukkit-Patches/0020-Watchdog-Thread.patch
@@ -1,4 +1,4 @@
-From 2543e5197437caa9f4b741205fda322e7446ad60 Mon Sep 17 00:00:00 2001
+From 85e57c9394fd6836472234348869e009579eba3f 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/CraftBukkit-Patches/0022-Netty.patch b/CraftBukkit-Patches/0021-Netty.patch
similarity index 99%
rename from CraftBukkit-Patches/0022-Netty.patch
rename to CraftBukkit-Patches/0021-Netty.patch
index 658bd92af3..e623d85a30 100644
--- a/CraftBukkit-Patches/0022-Netty.patch
+++ b/CraftBukkit-Patches/0021-Netty.patch
@@ -1,4 +1,4 @@
-From da10d4e0be041953bba74bb60e7bc425a8efafd7 Mon Sep 17 00:00:00 2001
+From 751bd6f6c7d40e46a599cd8254cac0ef59ad5132 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 14 Feb 2013 17:32:20 +1100
 Subject: [PATCH] Netty
diff --git a/CraftBukkit-Patches/0023-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch b/CraftBukkit-Patches/0022-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch
similarity index 95%
rename from CraftBukkit-Patches/0023-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch
rename to CraftBukkit-Patches/0022-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch
index 30b1fe1145..5654c72b8a 100644
--- a/CraftBukkit-Patches/0023-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch
+++ b/CraftBukkit-Patches/0022-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch
@@ -1,4 +1,4 @@
-From b723bd7d9d1cfec9ebd959da02965db78de277f4 Mon Sep 17 00:00:00 2001
+From a047d8e7dc875f19d0f3ee688fe6fc5ad8193145 Mon Sep 17 00:00:00 2001
 From: EdGruberman <ed@rjump.com>
 Date: Fri, 22 Feb 2013 09:23:51 -0700
 Subject: [PATCH] Return bed location itself instead of next to bed; Fixes
diff --git a/CraftBukkit-Patches/0024-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch b/CraftBukkit-Patches/0023-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch
similarity index 96%
rename from CraftBukkit-Patches/0024-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch
rename to CraftBukkit-Patches/0023-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch
index 046012e401..6f4dbb3e2d 100644
--- a/CraftBukkit-Patches/0024-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch
+++ b/CraftBukkit-Patches/0023-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch
@@ -1,4 +1,4 @@
-From 1ab23a3c52b56cb90074ee4d9969e130cca8095b Mon Sep 17 00:00:00 2001
+From 4303e73f545b5775d7c509517c22e4603c58939b Mon Sep 17 00:00:00 2001
 From: EdGruberman <ed@rjump.com>
 Date: Tue, 12 Feb 2013 16:17:31 -0700
 Subject: [PATCH] Remove dependency on CraftPlayer.getBedSpawnLocation; Fixes
diff --git a/CraftBukkit-Patches/0025-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch b/CraftBukkit-Patches/0024-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch
similarity index 96%
rename from CraftBukkit-Patches/0025-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch
rename to CraftBukkit-Patches/0024-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch
index 40c67aad3f..69930f37b8 100644
--- a/CraftBukkit-Patches/0025-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch
+++ b/CraftBukkit-Patches/0024-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch
@@ -1,4 +1,4 @@
-From 7c950977b64654a0de7e24a32100741163c24f40 Mon Sep 17 00:00:00 2001
+From cf1b7384d76a69a1a5a634c4296c8fd8b577e79a Mon Sep 17 00:00:00 2001
 From: Yariv Livay <yarivlivay@gmail.com>
 Date: Sat, 2 Mar 2013 09:36:52 +1100
 Subject: [PATCH] BUKKIT-3661, fixed missing HangingBreakEvent when
diff --git a/CraftBukkit-Patches/0026-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch b/CraftBukkit-Patches/0025-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch
similarity index 93%
rename from CraftBukkit-Patches/0026-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch
rename to CraftBukkit-Patches/0025-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch
index 560bfb7236..65707dff95 100644
--- a/CraftBukkit-Patches/0026-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch
+++ b/CraftBukkit-Patches/0025-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch
@@ -1,4 +1,4 @@
-From e3e72524c928ed7f4092e7192564b681cffc9942 Mon Sep 17 00:00:00 2001
+From 018bb0e330b933b689c5c0b5298d7d9dc2e05e16 Mon Sep 17 00:00:00 2001
 From: Yariv Livay <yarivlivay@gmail.com>
 Date: Mon, 25 Feb 2013 22:26:36 +0200
 Subject: [PATCH] Adds BUKKIT-3667, Faux sleepers wake up normally
diff --git a/CraftBukkit-Patches/0027-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch b/CraftBukkit-Patches/0026-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch
similarity index 94%
rename from CraftBukkit-Patches/0027-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch
rename to CraftBukkit-Patches/0026-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch
index f105aa4419..d92d44ad03 100644
--- a/CraftBukkit-Patches/0027-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch
+++ b/CraftBukkit-Patches/0026-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch
@@ -1,4 +1,4 @@
-From e3e9ae6049bbf07548dec7210caccbd90a29883a Mon Sep 17 00:00:00 2001
+From d46e66fbc50efab32a73d1abcb7dffbf1e997dc1 Mon Sep 17 00:00:00 2001
 From: Yariv Livay <yarivlivay@gmail.com>
 Date: Tue, 26 Feb 2013 20:14:34 +0200
 Subject: [PATCH] BUKKIT-3668 Fix wrong block in BlockDispenseEvent when
diff --git a/CraftBukkit-Patches/0028-PlayerItemDamageEvent.patch b/CraftBukkit-Patches/0027-PlayerItemDamageEvent.patch
similarity index 97%
rename from CraftBukkit-Patches/0028-PlayerItemDamageEvent.patch
rename to CraftBukkit-Patches/0027-PlayerItemDamageEvent.patch
index 49db7a716f..f1c733949b 100644
--- a/CraftBukkit-Patches/0028-PlayerItemDamageEvent.patch
+++ b/CraftBukkit-Patches/0027-PlayerItemDamageEvent.patch
@@ -1,4 +1,4 @@
-From 04a504fe30ba197d5a30793c803fc9c7b76e854e Mon Sep 17 00:00:00 2001
+From df2a38b74c31766bf1784fc509e0fbc4b7dd7183 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/0029-Faster-UUID-for-entities.patch b/CraftBukkit-Patches/0028-Faster-UUID-for-entities.patch
similarity index 93%
rename from CraftBukkit-Patches/0029-Faster-UUID-for-entities.patch
rename to CraftBukkit-Patches/0028-Faster-UUID-for-entities.patch
index 8d00e58a2a..5715a180b1 100644
--- a/CraftBukkit-Patches/0029-Faster-UUID-for-entities.patch
+++ b/CraftBukkit-Patches/0028-Faster-UUID-for-entities.patch
@@ -1,4 +1,4 @@
-From 4142700c0a04df9c84ecaf0f0335b21007738d3c Mon Sep 17 00:00:00 2001
+From 1e3e9706d697ebe09bdd3fbcce39f16f216f48fd 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
diff --git a/CraftBukkit-Patches/0030-Prevent-NPE-in-CraftSign.patch b/CraftBukkit-Patches/0029-Prevent-NPE-in-CraftSign.patch
similarity index 96%
rename from CraftBukkit-Patches/0030-Prevent-NPE-in-CraftSign.patch
rename to CraftBukkit-Patches/0029-Prevent-NPE-in-CraftSign.patch
index afb46acbab..f87251df0c 100644
--- a/CraftBukkit-Patches/0030-Prevent-NPE-in-CraftSign.patch
+++ b/CraftBukkit-Patches/0029-Prevent-NPE-in-CraftSign.patch
@@ -1,4 +1,4 @@
-From ad179d783354fc275ce6179baa4f3aee87bce151 Mon Sep 17 00:00:00 2001
+From 8fa12a2dc27cf3f73af9301b2e20beaa5d438be9 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/0031-Stage-DataWatcher-WatchableObject.patch b/CraftBukkit-Patches/0030-Stage-DataWatcher-WatchableObject.patch
similarity index 99%
rename from CraftBukkit-Patches/0031-Stage-DataWatcher-WatchableObject.patch
rename to CraftBukkit-Patches/0030-Stage-DataWatcher-WatchableObject.patch
index 455ccc8828..f1b21768ec 100644
--- a/CraftBukkit-Patches/0031-Stage-DataWatcher-WatchableObject.patch
+++ b/CraftBukkit-Patches/0030-Stage-DataWatcher-WatchableObject.patch
@@ -1,4 +1,4 @@
-From 3116090aeb1eba119fb6d7e88b8e5ce4c00bb572 Mon Sep 17 00:00:00 2001
+From cfe8787acc0173429ec9073be61aeb073c462bb0 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 21 Mar 2013 17:00:54 +1100
 Subject: [PATCH] Stage DataWatcher & WatchableObject.
diff --git a/CraftBukkit-Patches/0032-Entity-Tracking-Ranges.patch b/CraftBukkit-Patches/0031-Entity-Tracking-Ranges.patch
similarity index 99%
rename from CraftBukkit-Patches/0032-Entity-Tracking-Ranges.patch
rename to CraftBukkit-Patches/0031-Entity-Tracking-Ranges.patch
index e37f094e5d..c0077eb0dd 100644
--- a/CraftBukkit-Patches/0032-Entity-Tracking-Ranges.patch
+++ b/CraftBukkit-Patches/0031-Entity-Tracking-Ranges.patch
@@ -1,4 +1,4 @@
-From fa5bc82c34335eb448068696234cb65abd6062cc Mon Sep 17 00:00:00 2001
+From f1841e1e5d2ff06132a265aab2bc0e16974bda55 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/0033-BungeeCord-Support.patch b/CraftBukkit-Patches/0032-BungeeCord-Support.patch
similarity index 97%
rename from CraftBukkit-Patches/0033-BungeeCord-Support.patch
rename to CraftBukkit-Patches/0032-BungeeCord-Support.patch
index 55115a9915..17d0856bfe 100644
--- a/CraftBukkit-Patches/0033-BungeeCord-Support.patch
+++ b/CraftBukkit-Patches/0032-BungeeCord-Support.patch
@@ -1,4 +1,4 @@
-From d2a26e33dd6a08ef8da132d4d60c3dfe99f4155f Mon Sep 17 00:00:00 2001
+From 8498d18a49bf1eb87dc630bb0dc18a9c8659af70 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/0034-Texture-Pack-Resolutions.patch b/CraftBukkit-Patches/0033-Texture-Pack-Resolutions.patch
similarity index 98%
rename from CraftBukkit-Patches/0034-Texture-Pack-Resolutions.patch
rename to CraftBukkit-Patches/0033-Texture-Pack-Resolutions.patch
index bb12899646..c56d2661f8 100644
--- a/CraftBukkit-Patches/0034-Texture-Pack-Resolutions.patch
+++ b/CraftBukkit-Patches/0033-Texture-Pack-Resolutions.patch
@@ -1,4 +1,4 @@
-From 19e13ebce6d8cc9e1303a1d46d8dddcfa57227c9 Mon Sep 17 00:00:00 2001
+From b317f696c36b6270a2ed2e9c57a1d08c2833a8ad Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Mar 2013 13:04:45 +1100
 Subject: [PATCH] Texture Pack Resolutions
diff --git a/CraftBukkit-Patches/0035-Limit-Custom-Map-Rendering.patch b/CraftBukkit-Patches/0034-Limit-Custom-Map-Rendering.patch
similarity index 98%
rename from CraftBukkit-Patches/0035-Limit-Custom-Map-Rendering.patch
rename to CraftBukkit-Patches/0034-Limit-Custom-Map-Rendering.patch
index 043822bb32..6aa64b8584 100644
--- a/CraftBukkit-Patches/0035-Limit-Custom-Map-Rendering.patch
+++ b/CraftBukkit-Patches/0034-Limit-Custom-Map-Rendering.patch
@@ -1,4 +1,4 @@
-From 261bd1cb05e24f975cc4234f4b123fe7fc8a0f4a Mon Sep 17 00:00:00 2001
+From ae9813ce3e68ed2d9904a7fefdceba2658653c34 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/0036-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch b/CraftBukkit-Patches/0035-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch
similarity index 95%
rename from CraftBukkit-Patches/0036-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch
rename to CraftBukkit-Patches/0035-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch
index c72d34c295..1560520c1b 100644
--- a/CraftBukkit-Patches/0036-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch
+++ b/CraftBukkit-Patches/0035-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch
@@ -1,4 +1,4 @@
-From 3f50b9cd6da196000d90c68ecf71cde67217680f Mon Sep 17 00:00:00 2001
+From a7ba4b95b993d6899c54a6c8feaf3a323f431fc0 Mon Sep 17 00:00:00 2001
 From: Hudson <hudson@mydomain.com>
 Date: Wed, 3 Apr 2013 02:16:56 -0500
 Subject: [PATCH] Revert "Throw exception for disabled plugin tasks. Fixes
diff --git a/CraftBukkit-Patches/0037-InventoryClickEvent-now-can-return-if-the-click-was-.patch b/CraftBukkit-Patches/0036-InventoryClickEvent-now-can-return-if-the-click-was-.patch
similarity index 97%
rename from CraftBukkit-Patches/0037-InventoryClickEvent-now-can-return-if-the-click-was-.patch
rename to CraftBukkit-Patches/0036-InventoryClickEvent-now-can-return-if-the-click-was-.patch
index 5a9322b662..0103bb8711 100644
--- a/CraftBukkit-Patches/0037-InventoryClickEvent-now-can-return-if-the-click-was-.patch
+++ b/CraftBukkit-Patches/0036-InventoryClickEvent-now-can-return-if-the-click-was-.patch
@@ -1,4 +1,4 @@
-From 86d1ac609f40c5005125e48b86fa2cd6b8621c77 Mon Sep 17 00:00:00 2001
+From 15ddd3d3d17362781a04ecd5a95f1e414368a463 Mon Sep 17 00:00:00 2001
 From: Tyler Blair <hidendra@griefcraft.com>
 Date: Tue, 9 Apr 2013 17:55:15 -0300
 Subject: [PATCH] InventoryClickEvent now can return if the click was a double
diff --git a/CraftBukkit-Patches/0038-Enable-Improved-ping-sending.patch b/CraftBukkit-Patches/0037-Enable-Improved-ping-sending.patch
similarity index 97%
rename from CraftBukkit-Patches/0038-Enable-Improved-ping-sending.patch
rename to CraftBukkit-Patches/0037-Enable-Improved-ping-sending.patch
index 225caf9b1b..6538e1b2d4 100644
--- a/CraftBukkit-Patches/0038-Enable-Improved-ping-sending.patch
+++ b/CraftBukkit-Patches/0037-Enable-Improved-ping-sending.patch
@@ -1,4 +1,4 @@
-From 68cc023172c4fdba4222e83807b2550be3f547ca Mon Sep 17 00:00:00 2001
+From de2605afefbe4286715c18e74e1d38ac8ed68e2f 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/CraftBukkit-Patches/0039-Prevent-handshake-spam-from-invalid-names.patch b/CraftBukkit-Patches/0038-Prevent-handshake-spam-from-invalid-names.patch
similarity index 96%
rename from CraftBukkit-Patches/0039-Prevent-handshake-spam-from-invalid-names.patch
rename to CraftBukkit-Patches/0038-Prevent-handshake-spam-from-invalid-names.patch
index 45898855db..77f16b01fd 100644
--- a/CraftBukkit-Patches/0039-Prevent-handshake-spam-from-invalid-names.patch
+++ b/CraftBukkit-Patches/0038-Prevent-handshake-spam-from-invalid-names.patch
@@ -1,4 +1,4 @@
-From 2869840ad478538331bca1e3440b41dd554cf429 Mon Sep 17 00:00:00 2001
+From bdb32d91ed3c63d9592aab483640c795828e8a6b 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] Prevent handshake spam from invalid names.
@@ -46,5 +46,5 @@ index 504bd8b..ff28a99 100644
      public static void initialize(CraftServer server, SimpleCommandMap commandMap, YamlConfiguration configuration) {
          commandMap.register("bukkit", new org.bukkit.craftbukkit.command.TicksPerSecondCommand("tps"));
 -- 
-1.7.11.msysgit.0
+1.8.2.1