From f5b1669094da1dd207e6f28fd392ac0f4332c5e1 Mon Sep 17 00:00:00 2001
From: Spigot <noreply+git-spigot@papermc.io>
Date: Wed, 10 Apr 2013 14:06:41 +1000
Subject: [PATCH] Fix patches.

By: md_5 <md_5@live.com.au>
---
 ...bility.patch => 0002-mc-dev-imports.patch} | 62 ++++++++++++++++---
 ...hanges.patch => 0003-Spigot-Changes.patch} |  2 +-
 ...0004-Merge-tweaks-and-configuration.patch} |  2 +-
 ...weaks.patch => 0005-LongHash-Tweaks.patch} |  2 +-
 ...ch => 0006-Async-Operation-Catching.patch} |  2 +-
 ...istance.patch => 0007-View-Distance.patch} |  2 +-
 ...86-by-firing-the-inventory-close-ev.patch} |  2 +-
 ...rray-from-mc-dev-for-diff-visibility.patch | 59 ------------------
 ...10-Fix-mcRegion-to-Anvil-conversion.patch} |  4 +-
 ...-check-to-correctly-resolve-api-ver.patch} |  2 +-
 ...sed-to-unload-chunks-for-the-client.patch} |  2 +-
 ....move-if-we-are-not-moving-anywhere.patch} |  2 +-
 ...free-but-safe-chunk-reference-cache.patch} |  2 +-
 ...ation-sleep-for-as-long-as-possible.patch} |  2 +-
 ...tch => 0016-Improved-Timings-System.patch} |  2 +-
 ...> 0017-Add-oreobfuscator-for-Spigot.patch} |  6 +-
 ...er-of-LivingEntity-collision-checks.patch} |  2 +-
 ...es-in-chunks-being-processed-for-th.patch} |  2 +-
 ...e-and-warn-about-null-tile-entities.patch} |  2 +-
 ...tch => 0021-Entity-Activation-Range.patch} |  2 +-
 ...ptimize-getTileEntities-performance.patch} |  2 +-
 ...ile-entity-lookup-for-chunk-sending.patch} |  2 +-
 ...the-Metrics-system-to-be-closer-to-.patch} |  2 +-
 ...hread.patch => 0025-Watchdog-Thread.patch} |  2 +-
 .../{0027-Netty.patch => 0026-Netty.patch}    |  2 +-
 ...> 0027-Enable-Improved-ping-sending.patch} |  2 +-
 ...on-itself-instead-of-next-to-bed-Fi.patch} |  2 +-
 ...-on-CraftPlayer.getBedSpawnLocation.patch} |  2 +-
 ...-missing-HangingBreakEvent-when-Ent.patch} |  2 +-
 ...3667-Faux-sleepers-wake-up-normally.patch} |  2 +-
 ...rong-block-in-BlockDispenseEvent-wh.patch} |  2 +-
 ...patch => 0033-PlayerItemDamageEvent.patch} |  2 +-
 ...ch => 0034-Faster-UUID-for-entities.patch} |  2 +-
 ...ch => 0035-Prevent-NPE-in-CraftSign.patch} |  2 +-
 ...6-Stage-DataWatcher-WatchableObject.patch} |  2 +-
 ...atch => 0037-Entity-Tracking-Ranges.patch} |  2 +-
 ...rt.patch => 0038-BungeeCord-Support.patch} |  2 +-
 ...ch => 0039-Texture-Pack-Resolutions.patch} |  2 +-
 ...h => 0040-Entity-Tracking-Intervals.patch} |  2 +-
 ... => 0041-Limit-Custom-Map-Rendering.patch} |  2 +-
 ...ption-for-disabled-plugin-tasks.-Fi.patch} |  2 +-
 ...upe-fix.patch => 0043-Boat-dupe-fix.patch} |  4 +-
 42 files changed, 99 insertions(+), 110 deletions(-)
 rename CraftBukkit-Patches/{0010-Add-OldChunkLoader-from-mc-dev-for-diff-visibility.patch => 0002-mc-dev-imports.patch} (76%)
 rename CraftBukkit-Patches/{0002-Spigot-Changes.patch => 0003-Spigot-Changes.patch} (99%)
 rename CraftBukkit-Patches/{0003-Merge-tweaks-and-configuration.patch => 0004-Merge-tweaks-and-configuration.patch} (99%)
 rename CraftBukkit-Patches/{0004-LongHash-Tweaks.patch => 0005-LongHash-Tweaks.patch} (98%)
 rename CraftBukkit-Patches/{0005-Async-Operation-Catching.patch => 0006-Async-Operation-Catching.patch} (98%)
 rename CraftBukkit-Patches/{0006-View-Distance.patch => 0007-View-Distance.patch} (98%)
 rename CraftBukkit-Patches/{0007-Address-BUKKIT-3286-by-firing-the-inventory-close-ev.patch => 0008-Address-BUKKIT-3286-by-firing-the-inventory-close-ev.patch} (96%)
 delete mode 100644 CraftBukkit-Patches/0008-Include-NibbleArray-from-mc-dev-for-diff-visibility.patch
 rename CraftBukkit-Patches/{0011-Fix-mcRegion-to-Anvil-conversion.patch => 0010-Fix-mcRegion-to-Anvil-conversion.patch} (93%)
 rename CraftBukkit-Patches/{0012-Update-versioning-check-to-correctly-resolve-api-ver.patch => 0011-Update-versioning-check-to-correctly-resolve-api-ver.patch} (94%)
 rename CraftBukkit-Patches/{0013-Optimize-packet-used-to-unload-chunks-for-the-client.patch => 0012-Optimize-packet-used-to-unload-chunks-for-the-client.patch} (97%)
 rename CraftBukkit-Patches/{0014-Skip-entity.move-if-we-are-not-moving-anywhere.patch => 0013-Skip-entity.move-if-we-are-not-moving-anywhere.patch} (92%)
 rename CraftBukkit-Patches/{0015-Alternate-sync-free-but-safe-chunk-reference-cache.patch => 0014-Alternate-sync-free-but-safe-chunk-reference-cache.patch} (95%)
 rename CraftBukkit-Patches/{0016-Tick-loop-optimization-sleep-for-as-long-as-possible.patch => 0015-Tick-loop-optimization-sleep-for-as-long-as-possible.patch} (98%)
 rename CraftBukkit-Patches/{0017-Improved-Timings-System.patch => 0016-Improved-Timings-System.patch} (99%)
 rename CraftBukkit-Patches/{0018-Add-oreobfuscator-for-Spigot.patch => 0017-Add-oreobfuscator-for-Spigot.patch} (99%)
 rename CraftBukkit-Patches/{0019-Reduce-number-of-LivingEntity-collision-checks.patch => 0018-Reduce-number-of-LivingEntity-collision-checks.patch} (95%)
 rename CraftBukkit-Patches/{0020-Only-count-entities-in-chunks-being-processed-for-th.patch => 0019-Only-count-entities-in-chunks-being-processed-for-th.patch} (98%)
 rename CraftBukkit-Patches/{0021-Detect-remove-and-warn-about-null-tile-entities.patch => 0020-Detect-remove-and-warn-about-null-tile-entities.patch} (95%)
 rename CraftBukkit-Patches/{0022-Entity-Activation-Range.patch => 0021-Entity-Activation-Range.patch} (99%)
 rename CraftBukkit-Patches/{0023-Optimize-getTileEntities-performance.patch => 0022-Optimize-getTileEntities-performance.patch} (96%)
 rename CraftBukkit-Patches/{0024-Improved-tile-entity-lookup-for-chunk-sending.patch => 0023-Improved-tile-entity-lookup-for-chunk-sending.patch} (96%)
 rename CraftBukkit-Patches/{0025-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch => 0024-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch} (99%)
 rename CraftBukkit-Patches/{0026-Watchdog-Thread.patch => 0025-Watchdog-Thread.patch} (99%)
 rename CraftBukkit-Patches/{0027-Netty.patch => 0026-Netty.patch} (99%)
 rename CraftBukkit-Patches/{0028-Enable-Improved-ping-sending.patch => 0027-Enable-Improved-ping-sending.patch} (97%)
 rename CraftBukkit-Patches/{0029-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch => 0028-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch} (96%)
 rename CraftBukkit-Patches/{0030-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch => 0029-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch} (96%)
 rename CraftBukkit-Patches/{0031-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch => 0030-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch} (96%)
 rename CraftBukkit-Patches/{0032-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch => 0031-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch} (94%)
 rename CraftBukkit-Patches/{0033-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch => 0032-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch} (94%)
 rename CraftBukkit-Patches/{0034-PlayerItemDamageEvent.patch => 0033-PlayerItemDamageEvent.patch} (97%)
 rename CraftBukkit-Patches/{0035-Faster-UUID-for-entities.patch => 0034-Faster-UUID-for-entities.patch} (94%)
 rename CraftBukkit-Patches/{0036-Prevent-NPE-in-CraftSign.patch => 0035-Prevent-NPE-in-CraftSign.patch} (96%)
 rename CraftBukkit-Patches/{0037-Stage-DataWatcher-WatchableObject.patch => 0036-Stage-DataWatcher-WatchableObject.patch} (99%)
 rename CraftBukkit-Patches/{0038-Entity-Tracking-Ranges.patch => 0037-Entity-Tracking-Ranges.patch} (99%)
 rename CraftBukkit-Patches/{0039-BungeeCord-Support.patch => 0038-BungeeCord-Support.patch} (97%)
 rename CraftBukkit-Patches/{0040-Texture-Pack-Resolutions.patch => 0039-Texture-Pack-Resolutions.patch} (98%)
 rename CraftBukkit-Patches/{0041-Entity-Tracking-Intervals.patch => 0040-Entity-Tracking-Intervals.patch} (94%)
 rename CraftBukkit-Patches/{0042-Limit-Custom-Map-Rendering.patch => 0041-Limit-Custom-Map-Rendering.patch} (98%)
 rename CraftBukkit-Patches/{0043-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch => 0042-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch} (95%)
 rename CraftBukkit-Patches/{0044-Boat-dupe-fix.patch => 0043-Boat-dupe-fix.patch} (93%)

diff --git a/CraftBukkit-Patches/0010-Add-OldChunkLoader-from-mc-dev-for-diff-visibility.patch b/CraftBukkit-Patches/0002-mc-dev-imports.patch
similarity index 76%
rename from CraftBukkit-Patches/0010-Add-OldChunkLoader-from-mc-dev-for-diff-visibility.patch
rename to CraftBukkit-Patches/0002-mc-dev-imports.patch
index bf311c2ed6..9b5296e485 100644
--- a/CraftBukkit-Patches/0010-Add-OldChunkLoader-from-mc-dev-for-diff-visibility.patch
+++ b/CraftBukkit-Patches/0002-mc-dev-imports.patch
@@ -1,16 +1,65 @@
-From 602142733870a1f674deb1e40b4318be9cd36479 Mon Sep 17 00:00:00 2001
-From: Agaricus <agaricusb@yahoo.com>
-Date: Sun, 13 Jan 2013 03:41:38 -0800
-Subject: [PATCH] Add OldChunkLoader from mc-dev for diff visibility
+From 0252b7ffef6ff353b9c4c54d9e53a8b452c2ac47 Mon Sep 17 00:00:00 2001
+From: md_5 <md_5@live.com.au>
+Date: Wed, 10 Apr 2013 13:52:52 +1000
+Subject: [PATCH] mc-dev imports
 
+ 2 files changed, 160 insertions(+)
 ---
+ .../java/net/minecraft/server/NibbleArray.java     |  40 +++++++
  .../java/net/minecraft/server/OldChunkLoader.java  | 120 +++++++++++++++++++++
- 1 file changed, 120 insertions(+)
+ 2 files changed, 160 insertions(+)
+ create mode 100644 src/main/java/net/minecraft/server/NibbleArray.java
  create mode 100644 src/main/java/net/minecraft/server/OldChunkLoader.java
 
+diff --git a/src/main/java/net/minecraft/server/NibbleArray.java b/src/main/java/net/minecraft/server/NibbleArray.java
+new file mode 100644
+index 0000000..5d75a54
+--- /dev/null
++++ b/src/main/java/net/minecraft/server/NibbleArray.java
+@@ -0,0 +1,40 @@
++package net.minecraft.server;
++
++public class NibbleArray {
++
++    public final byte[] a;
++    private final int b;
++    private final int c;
++
++    public NibbleArray(int i, int j) {
++        this.a = new byte[i >> 1];
++        this.b = j;
++        this.c = j + 4;
++    }
++
++    public NibbleArray(byte[] abyte, int i) {
++        this.a = abyte;
++        this.b = i;
++        this.c = i + 4;
++    }
++
++    public int a(int i, int j, int k) {
++        int l = j << this.c | k << this.b | i;
++        int i1 = l >> 1;
++        int j1 = l & 1;
++
++        return j1 == 0 ? this.a[i1] & 15 : this.a[i1] >> 4 & 15;
++    }
++
++    public void a(int i, int j, int k, int l) {
++        int i1 = j << this.c | k << this.b | i;
++        int j1 = i1 >> 1;
++        int k1 = i1 & 1;
++
++        if (k1 == 0) {
++            this.a[j1] = (byte) (this.a[j1] & 240 | l & 15);
++        } else {
++            this.a[j1] = (byte) (this.a[j1] & 15 | (l & 15) << 4);
++        }
++    }
++}
 diff --git a/src/main/java/net/minecraft/server/OldChunkLoader.java b/src/main/java/net/minecraft/server/OldChunkLoader.java
 new file mode 100644
-index 0000000..65b0b70
+index 0000000..53c1cb5
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/OldChunkLoader.java
 @@ -0,0 +1,120 @@
@@ -134,7 +183,6 @@ index 0000000..65b0b70
 +        }
 +    }
 +}
-\ No newline at end of file
 -- 
 1.8.2.1
 
diff --git a/CraftBukkit-Patches/0002-Spigot-Changes.patch b/CraftBukkit-Patches/0003-Spigot-Changes.patch
similarity index 99%
rename from CraftBukkit-Patches/0002-Spigot-Changes.patch
rename to CraftBukkit-Patches/0003-Spigot-Changes.patch
index bfbc9a176f..144a0cb5aa 100644
--- a/CraftBukkit-Patches/0002-Spigot-Changes.patch
+++ b/CraftBukkit-Patches/0003-Spigot-Changes.patch
@@ -1,4 +1,4 @@
-From 44e3b478f6aeb4b9298b06599679448608345ff0 Mon Sep 17 00:00:00 2001
+From 2853b69264cbea6a20328a2220c72ffa517d03c0 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
diff --git a/CraftBukkit-Patches/0003-Merge-tweaks-and-configuration.patch b/CraftBukkit-Patches/0004-Merge-tweaks-and-configuration.patch
similarity index 99%
rename from CraftBukkit-Patches/0003-Merge-tweaks-and-configuration.patch
rename to CraftBukkit-Patches/0004-Merge-tweaks-and-configuration.patch
index c318e994f2..906104d18f 100644
--- a/CraftBukkit-Patches/0003-Merge-tweaks-and-configuration.patch
+++ b/CraftBukkit-Patches/0004-Merge-tweaks-and-configuration.patch
@@ -1,4 +1,4 @@
-From 7cdbe04118599b614a616171d51f4dee54ffd0e5 Mon Sep 17 00:00:00 2001
+From 5e01bfb87ed1cf7b5277fcc508726a4871ea62ac 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
diff --git a/CraftBukkit-Patches/0004-LongHash-Tweaks.patch b/CraftBukkit-Patches/0005-LongHash-Tweaks.patch
similarity index 98%
rename from CraftBukkit-Patches/0004-LongHash-Tweaks.patch
rename to CraftBukkit-Patches/0005-LongHash-Tweaks.patch
index a080abf607..786c15c715 100644
--- a/CraftBukkit-Patches/0004-LongHash-Tweaks.patch
+++ b/CraftBukkit-Patches/0005-LongHash-Tweaks.patch
@@ -1,4 +1,4 @@
-From 58a5ac2f759380063702db6ea9c2e6d5dac41bd4 Mon Sep 17 00:00:00 2001
+From 03b486fc7abc3ecea870b646c13a2a5797ea4796 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Mar 2013 09:29:43 +1100
 Subject: [PATCH] LongHash Tweaks.
diff --git a/CraftBukkit-Patches/0005-Async-Operation-Catching.patch b/CraftBukkit-Patches/0006-Async-Operation-Catching.patch
similarity index 98%
rename from CraftBukkit-Patches/0005-Async-Operation-Catching.patch
rename to CraftBukkit-Patches/0006-Async-Operation-Catching.patch
index c2af7bf729..69e080e22c 100644
--- a/CraftBukkit-Patches/0005-Async-Operation-Catching.patch
+++ b/CraftBukkit-Patches/0006-Async-Operation-Catching.patch
@@ -1,4 +1,4 @@
-From b2dfa37cd8758766e20a5060df024e6eff41ec39 Mon Sep 17 00:00:00 2001
+From 7cf90500080ff81fe958afe6a7b612b6bf681532 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
diff --git a/CraftBukkit-Patches/0006-View-Distance.patch b/CraftBukkit-Patches/0007-View-Distance.patch
similarity index 98%
rename from CraftBukkit-Patches/0006-View-Distance.patch
rename to CraftBukkit-Patches/0007-View-Distance.patch
index d186a63fbb..b2be54a00c 100644
--- a/CraftBukkit-Patches/0006-View-Distance.patch
+++ b/CraftBukkit-Patches/0007-View-Distance.patch
@@ -1,4 +1,4 @@
-From 2d00479f5aad1da9809b642a58168103b3766c67 Mon Sep 17 00:00:00 2001
+From 52a7e6fa033f6c9337814d23cd5c92a1ce231bf1 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
diff --git a/CraftBukkit-Patches/0007-Address-BUKKIT-3286-by-firing-the-inventory-close-ev.patch b/CraftBukkit-Patches/0008-Address-BUKKIT-3286-by-firing-the-inventory-close-ev.patch
similarity index 96%
rename from CraftBukkit-Patches/0007-Address-BUKKIT-3286-by-firing-the-inventory-close-ev.patch
rename to CraftBukkit-Patches/0008-Address-BUKKIT-3286-by-firing-the-inventory-close-ev.patch
index d41057d852..cd50107e3b 100644
--- a/CraftBukkit-Patches/0007-Address-BUKKIT-3286-by-firing-the-inventory-close-ev.patch
+++ b/CraftBukkit-Patches/0008-Address-BUKKIT-3286-by-firing-the-inventory-close-ev.patch
@@ -1,4 +1,4 @@
-From c4475a155503a8287d1059127faa05576ca6540b Mon Sep 17 00:00:00 2001
+From 88282823288a27cc62a55eebf277c7fc5f249f41 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@bigpond.com>
 Date: Sun, 23 Dec 2012 17:09:40 +1100
 Subject: [PATCH] Address BUKKIT-3286 by firing the inventory close event when
diff --git a/CraftBukkit-Patches/0008-Include-NibbleArray-from-mc-dev-for-diff-visibility.patch b/CraftBukkit-Patches/0008-Include-NibbleArray-from-mc-dev-for-diff-visibility.patch
deleted file mode 100644
index a8dc4e40d4..0000000000
--- a/CraftBukkit-Patches/0008-Include-NibbleArray-from-mc-dev-for-diff-visibility.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From aeb91819bcc99160f5de896ed0094ba0f0dd05d8 Mon Sep 17 00:00:00 2001
-From: Mike Primm <mike@primmhome.com>
-Date: Fri, 14 Dec 2012 21:51:06 -0600
-Subject: [PATCH] Include NibbleArray from mc-dev for diff visibility
-
----
- .../java/net/minecraft/server/NibbleArray.java     | 40 ++++++++++++++++++++++
- 1 file changed, 40 insertions(+)
- create mode 100644 src/main/java/net/minecraft/server/NibbleArray.java
-
-diff --git a/src/main/java/net/minecraft/server/NibbleArray.java b/src/main/java/net/minecraft/server/NibbleArray.java
-new file mode 100644
-index 0000000..5d75a54
---- /dev/null
-+++ b/src/main/java/net/minecraft/server/NibbleArray.java
-@@ -0,0 +1,40 @@
-+package net.minecraft.server;
-+
-+public class NibbleArray {
-+
-+    public final byte[] a;
-+    private final int b;
-+    private final int c;
-+
-+    public NibbleArray(int i, int j) {
-+        this.a = new byte[i >> 1];
-+        this.b = j;
-+        this.c = j + 4;
-+    }
-+
-+    public NibbleArray(byte[] abyte, int i) {
-+        this.a = abyte;
-+        this.b = i;
-+        this.c = i + 4;
-+    }
-+
-+    public int a(int i, int j, int k) {
-+        int l = j << this.c | k << this.b | i;
-+        int i1 = l >> 1;
-+        int j1 = l & 1;
-+
-+        return j1 == 0 ? this.a[i1] & 15 : this.a[i1] >> 4 & 15;
-+    }
-+
-+    public void a(int i, int j, int k, int l) {
-+        int i1 = j << this.c | k << this.b | i;
-+        int j1 = i1 >> 1;
-+        int k1 = i1 & 1;
-+
-+        if (k1 == 0) {
-+            this.a[j1] = (byte) (this.a[j1] & 240 | l & 15);
-+        } else {
-+            this.a[j1] = (byte) (this.a[j1] & 15 | (l & 15) << 4);
-+        }
-+    }
-+}
--- 
-1.8.2.1
-
diff --git a/CraftBukkit-Patches/0011-Fix-mcRegion-to-Anvil-conversion.patch b/CraftBukkit-Patches/0010-Fix-mcRegion-to-Anvil-conversion.patch
similarity index 93%
rename from CraftBukkit-Patches/0011-Fix-mcRegion-to-Anvil-conversion.patch
rename to CraftBukkit-Patches/0010-Fix-mcRegion-to-Anvil-conversion.patch
index 4deb847db7..03fe8e0630 100644
--- a/CraftBukkit-Patches/0011-Fix-mcRegion-to-Anvil-conversion.patch
+++ b/CraftBukkit-Patches/0010-Fix-mcRegion-to-Anvil-conversion.patch
@@ -1,4 +1,4 @@
-From c0766b26f9c09da34b9ccdd79d971746376df495 Mon Sep 17 00:00:00 2001
+From 049772527f3ab878bb0ac13939184229c3f46e6c 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
@@ -8,7 +8,7 @@ Subject: [PATCH] Fix mcRegion-to-Anvil conversion
  1 file changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/OldChunkLoader.java b/src/main/java/net/minecraft/server/OldChunkLoader.java
-index 65b0b70..0b3bd0d 100644
+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 {
diff --git a/CraftBukkit-Patches/0012-Update-versioning-check-to-correctly-resolve-api-ver.patch b/CraftBukkit-Patches/0011-Update-versioning-check-to-correctly-resolve-api-ver.patch
similarity index 94%
rename from CraftBukkit-Patches/0012-Update-versioning-check-to-correctly-resolve-api-ver.patch
rename to CraftBukkit-Patches/0011-Update-versioning-check-to-correctly-resolve-api-ver.patch
index f32e16d0a2..8a39e675a8 100644
--- a/CraftBukkit-Patches/0012-Update-versioning-check-to-correctly-resolve-api-ver.patch
+++ b/CraftBukkit-Patches/0011-Update-versioning-check-to-correctly-resolve-api-ver.patch
@@ -1,4 +1,4 @@
-From 8f7d3dfeffad6861164302cbaa3cdadce69852fd Mon Sep 17 00:00:00 2001
+From 1ec84fa256384b8396ea6ec9ad82b016ab30a155 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/0013-Optimize-packet-used-to-unload-chunks-for-the-client.patch b/CraftBukkit-Patches/0012-Optimize-packet-used-to-unload-chunks-for-the-client.patch
similarity index 97%
rename from CraftBukkit-Patches/0013-Optimize-packet-used-to-unload-chunks-for-the-client.patch
rename to CraftBukkit-Patches/0012-Optimize-packet-used-to-unload-chunks-for-the-client.patch
index b637f97251..0017056a08 100644
--- a/CraftBukkit-Patches/0013-Optimize-packet-used-to-unload-chunks-for-the-client.patch
+++ b/CraftBukkit-Patches/0012-Optimize-packet-used-to-unload-chunks-for-the-client.patch
@@ -1,4 +1,4 @@
-From 7aeceff7af9f541d67165c8046dd1291dd205382 Mon Sep 17 00:00:00 2001
+From 4466ad548b5ab288d65a39030f9766725a46b3cd 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/0014-Skip-entity.move-if-we-are-not-moving-anywhere.patch b/CraftBukkit-Patches/0013-Skip-entity.move-if-we-are-not-moving-anywhere.patch
similarity index 92%
rename from CraftBukkit-Patches/0014-Skip-entity.move-if-we-are-not-moving-anywhere.patch
rename to CraftBukkit-Patches/0013-Skip-entity.move-if-we-are-not-moving-anywhere.patch
index cd04f4be6e..100ea3087e 100644
--- a/CraftBukkit-Patches/0014-Skip-entity.move-if-we-are-not-moving-anywhere.patch
+++ b/CraftBukkit-Patches/0013-Skip-entity.move-if-we-are-not-moving-anywhere.patch
@@ -1,4 +1,4 @@
-From 37f83e684584fbd91f6442386ab26e2a54c0a9f3 Mon Sep 17 00:00:00 2001
+From 460f7249412d2a51f500ed8e307e2e3596a03759 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 19 Jan 2013 01:11:30 -0500
 Subject: [PATCH] Skip entity.move() if we are not moving anywhere.
diff --git a/CraftBukkit-Patches/0015-Alternate-sync-free-but-safe-chunk-reference-cache.patch b/CraftBukkit-Patches/0014-Alternate-sync-free-but-safe-chunk-reference-cache.patch
similarity index 95%
rename from CraftBukkit-Patches/0015-Alternate-sync-free-but-safe-chunk-reference-cache.patch
rename to CraftBukkit-Patches/0014-Alternate-sync-free-but-safe-chunk-reference-cache.patch
index 24645dd9a3..55910e2932 100644
--- a/CraftBukkit-Patches/0015-Alternate-sync-free-but-safe-chunk-reference-cache.patch
+++ b/CraftBukkit-Patches/0014-Alternate-sync-free-but-safe-chunk-reference-cache.patch
@@ -1,4 +1,4 @@
-From ade3d3ab314377309d14ead913ec506ee99abd05 Mon Sep 17 00:00:00 2001
+From 2338cb87b1abac89c21f2f9bbcfe19177e92e90c 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/0016-Tick-loop-optimization-sleep-for-as-long-as-possible.patch b/CraftBukkit-Patches/0015-Tick-loop-optimization-sleep-for-as-long-as-possible.patch
similarity index 98%
rename from CraftBukkit-Patches/0016-Tick-loop-optimization-sleep-for-as-long-as-possible.patch
rename to CraftBukkit-Patches/0015-Tick-loop-optimization-sleep-for-as-long-as-possible.patch
index 5b71afa24f..52c582b42f 100644
--- a/CraftBukkit-Patches/0016-Tick-loop-optimization-sleep-for-as-long-as-possible.patch
+++ b/CraftBukkit-Patches/0015-Tick-loop-optimization-sleep-for-as-long-as-possible.patch
@@ -1,4 +1,4 @@
-From aa816997677b3a1b8d7f2d754f05859c2de92372 Mon Sep 17 00:00:00 2001
+From 855c2ff526d476e0b59359e209d673e67fe363cf 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/0017-Improved-Timings-System.patch b/CraftBukkit-Patches/0016-Improved-Timings-System.patch
similarity index 99%
rename from CraftBukkit-Patches/0017-Improved-Timings-System.patch
rename to CraftBukkit-Patches/0016-Improved-Timings-System.patch
index 897ecf0ffa..0e45806e91 100644
--- a/CraftBukkit-Patches/0017-Improved-Timings-System.patch
+++ b/CraftBukkit-Patches/0016-Improved-Timings-System.patch
@@ -1,4 +1,4 @@
-From 90d50fe2bd2b0db517e5b30d6e1f0924fb13bb7a Mon Sep 17 00:00:00 2001
+From 0769dc792bdf91ab5f41213501df138fdbc0c0e7 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/0018-Add-oreobfuscator-for-Spigot.patch b/CraftBukkit-Patches/0017-Add-oreobfuscator-for-Spigot.patch
similarity index 99%
rename from CraftBukkit-Patches/0018-Add-oreobfuscator-for-Spigot.patch
rename to CraftBukkit-Patches/0017-Add-oreobfuscator-for-Spigot.patch
index fc3fa80e97..53b8ff273e 100644
--- a/CraftBukkit-Patches/0018-Add-oreobfuscator-for-Spigot.patch
+++ b/CraftBukkit-Patches/0017-Add-oreobfuscator-for-Spigot.patch
@@ -1,4 +1,4 @@
-From a8140d06696c7ec1a53ba9e43ea93ce4c835ad19 Mon Sep 17 00:00:00 2001
+From f289fb8aaddc2a4864b4f8e934310cd11caeff69 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.
@@ -164,7 +164,7 @@ index 91bed16..8af36ca 100644
  
          if (false) { // Never trigger
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d5bd340..2e49f5c 100644
+index e7c3a0c..9f2be37 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -163,6 +163,13 @@ public final class CraftServer implements Server {
@@ -398,5 +398,5 @@ index 9b85e13..a63dc22 100644
 +       - world_the_end
 +    blocks: [1, 5, 14, 15, 16, 21, 48, 49, 54, 56, 73, 74, 82, 129, 130]
 -- 
-1.7.11.msysgit.0
+1.8.2.1
 
diff --git a/CraftBukkit-Patches/0019-Reduce-number-of-LivingEntity-collision-checks.patch b/CraftBukkit-Patches/0018-Reduce-number-of-LivingEntity-collision-checks.patch
similarity index 95%
rename from CraftBukkit-Patches/0019-Reduce-number-of-LivingEntity-collision-checks.patch
rename to CraftBukkit-Patches/0018-Reduce-number-of-LivingEntity-collision-checks.patch
index 8c6dee3eaf..15bed992dd 100644
--- a/CraftBukkit-Patches/0019-Reduce-number-of-LivingEntity-collision-checks.patch
+++ b/CraftBukkit-Patches/0018-Reduce-number-of-LivingEntity-collision-checks.patch
@@ -1,4 +1,4 @@
-From 16dace4c2615d56f9bf5d7147701ef03782784ce Mon Sep 17 00:00:00 2001
+From 3a0a265c91648ce4e8d45db8a762d94f7c42c86f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Jan 2013 19:31:14 -0500
 Subject: [PATCH] Reduce number of LivingEntity collision checks.
diff --git a/CraftBukkit-Patches/0020-Only-count-entities-in-chunks-being-processed-for-th.patch b/CraftBukkit-Patches/0019-Only-count-entities-in-chunks-being-processed-for-th.patch
similarity index 98%
rename from CraftBukkit-Patches/0020-Only-count-entities-in-chunks-being-processed-for-th.patch
rename to CraftBukkit-Patches/0019-Only-count-entities-in-chunks-being-processed-for-th.patch
index b353b92f05..1e303deb58 100644
--- a/CraftBukkit-Patches/0020-Only-count-entities-in-chunks-being-processed-for-th.patch
+++ b/CraftBukkit-Patches/0019-Only-count-entities-in-chunks-being-processed-for-th.patch
@@ -1,4 +1,4 @@
-From 53a0398ca0dffd1b12427235bc489394e1b0c7a1 Mon Sep 17 00:00:00 2001
+From fd62940cec88d33e07b78585f2c5deb264758669 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/0021-Detect-remove-and-warn-about-null-tile-entities.patch b/CraftBukkit-Patches/0020-Detect-remove-and-warn-about-null-tile-entities.patch
similarity index 95%
rename from CraftBukkit-Patches/0021-Detect-remove-and-warn-about-null-tile-entities.patch
rename to CraftBukkit-Patches/0020-Detect-remove-and-warn-about-null-tile-entities.patch
index 67c99438cb..9ca1819c43 100644
--- a/CraftBukkit-Patches/0021-Detect-remove-and-warn-about-null-tile-entities.patch
+++ b/CraftBukkit-Patches/0020-Detect-remove-and-warn-about-null-tile-entities.patch
@@ -1,4 +1,4 @@
-From 52005cd2ae3ed48a244cca27a962460445927c3a Mon Sep 17 00:00:00 2001
+From beebf944f3e9a21c0e2678e393d3206070d75261 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/0022-Entity-Activation-Range.patch b/CraftBukkit-Patches/0021-Entity-Activation-Range.patch
similarity index 99%
rename from CraftBukkit-Patches/0022-Entity-Activation-Range.patch
rename to CraftBukkit-Patches/0021-Entity-Activation-Range.patch
index 7ce7b3a4c9..0d6ad6a411 100644
--- a/CraftBukkit-Patches/0022-Entity-Activation-Range.patch
+++ b/CraftBukkit-Patches/0021-Entity-Activation-Range.patch
@@ -1,4 +1,4 @@
-From 7bfa98d5f818738e6adf49abf8bc407cf9b845ce Mon Sep 17 00:00:00 2001
+From a3f44a9f8e92d0fea010f437e5c949fda218fac9 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/0023-Optimize-getTileEntities-performance.patch b/CraftBukkit-Patches/0022-Optimize-getTileEntities-performance.patch
similarity index 96%
rename from CraftBukkit-Patches/0023-Optimize-getTileEntities-performance.patch
rename to CraftBukkit-Patches/0022-Optimize-getTileEntities-performance.patch
index 6acb388e0e..5021e2dc38 100644
--- a/CraftBukkit-Patches/0023-Optimize-getTileEntities-performance.patch
+++ b/CraftBukkit-Patches/0022-Optimize-getTileEntities-performance.patch
@@ -1,4 +1,4 @@
-From 2eccb6337392a0b22ad424e333eb27d9f8e4258f Mon Sep 17 00:00:00 2001
+From 78db1b3041b718fe4b343c4f31934713e9d47759 Mon Sep 17 00:00:00 2001
 From: Mike Primm <mike@primmhome.com>
 Date: Wed, 20 Feb 2013 23:07:53 -0500
 Subject: [PATCH] Optimize getTileEntities performance
diff --git a/CraftBukkit-Patches/0024-Improved-tile-entity-lookup-for-chunk-sending.patch b/CraftBukkit-Patches/0023-Improved-tile-entity-lookup-for-chunk-sending.patch
similarity index 96%
rename from CraftBukkit-Patches/0024-Improved-tile-entity-lookup-for-chunk-sending.patch
rename to CraftBukkit-Patches/0023-Improved-tile-entity-lookup-for-chunk-sending.patch
index 7084b2edc6..a2ba8ee117 100644
--- a/CraftBukkit-Patches/0024-Improved-tile-entity-lookup-for-chunk-sending.patch
+++ b/CraftBukkit-Patches/0023-Improved-tile-entity-lookup-for-chunk-sending.patch
@@ -1,4 +1,4 @@
-From b4cd08b3d500ed538ddffbfc5c6254f20d47f7f5 Mon Sep 17 00:00:00 2001
+From 783430598f8aad57eccc92ccd75fc54926cf2e4a Mon Sep 17 00:00:00 2001
 From: shakytom <tom.roberts00@gmail.com>
 Date: Wed, 20 Feb 2013 22:34:38 -0500
 Subject: [PATCH] Improved tile entity lookup for chunk sending
diff --git a/CraftBukkit-Patches/0025-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch b/CraftBukkit-Patches/0024-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch
similarity index 99%
rename from CraftBukkit-Patches/0025-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch
rename to CraftBukkit-Patches/0024-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch
index 9741a22f45..db9c389327 100644
--- a/CraftBukkit-Patches/0025-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch
+++ b/CraftBukkit-Patches/0024-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch
@@ -1,4 +1,4 @@
-From 46ec0fb4245d8d49bf692585f2e7acc17344548e Mon Sep 17 00:00:00 2001
+From b470bfa02c986436da0d3d91888c3983a0ce6523 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/0026-Watchdog-Thread.patch b/CraftBukkit-Patches/0025-Watchdog-Thread.patch
similarity index 99%
rename from CraftBukkit-Patches/0026-Watchdog-Thread.patch
rename to CraftBukkit-Patches/0025-Watchdog-Thread.patch
index e613686f31..89174412f4 100644
--- a/CraftBukkit-Patches/0026-Watchdog-Thread.patch
+++ b/CraftBukkit-Patches/0025-Watchdog-Thread.patch
@@ -1,4 +1,4 @@
-From ed80e4532dcea20ec8dbe4bd8773f768c9532a7e Mon Sep 17 00:00:00 2001
+From 4372dc651d7320403d3080cc3b381122b14ccf68 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/0027-Netty.patch b/CraftBukkit-Patches/0026-Netty.patch
similarity index 99%
rename from CraftBukkit-Patches/0027-Netty.patch
rename to CraftBukkit-Patches/0026-Netty.patch
index de264dab5f..75920acced 100644
--- a/CraftBukkit-Patches/0027-Netty.patch
+++ b/CraftBukkit-Patches/0026-Netty.patch
@@ -1,4 +1,4 @@
-From 53c8a1e1b7aa88229c34a7bf248dce34abf28579 Mon Sep 17 00:00:00 2001
+From e39b946281f9075dbc5fbca03699a88069717b68 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/0028-Enable-Improved-ping-sending.patch b/CraftBukkit-Patches/0027-Enable-Improved-ping-sending.patch
similarity index 97%
rename from CraftBukkit-Patches/0028-Enable-Improved-ping-sending.patch
rename to CraftBukkit-Patches/0027-Enable-Improved-ping-sending.patch
index eae404fde3..434bc497c7 100644
--- a/CraftBukkit-Patches/0028-Enable-Improved-ping-sending.patch
+++ b/CraftBukkit-Patches/0027-Enable-Improved-ping-sending.patch
@@ -1,4 +1,4 @@
-From afdb25739da5d3df806d709e4628736fac6a519a Mon Sep 17 00:00:00 2001
+From 3ac9bc9e8f157872fff48338807a29ae2a2093e3 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/0029-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch b/CraftBukkit-Patches/0028-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch
similarity index 96%
rename from CraftBukkit-Patches/0029-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch
rename to CraftBukkit-Patches/0028-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch
index 9fd1834c68..ec9ded8e34 100644
--- a/CraftBukkit-Patches/0029-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch
+++ b/CraftBukkit-Patches/0028-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch
@@ -1,4 +1,4 @@
-From 0a55f29b08d6720b563cec891f68714e943839d4 Mon Sep 17 00:00:00 2001
+From a9fdf1fb10b2929099a0801a16b7e2afdd084077 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/0030-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch b/CraftBukkit-Patches/0029-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch
similarity index 96%
rename from CraftBukkit-Patches/0030-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch
rename to CraftBukkit-Patches/0029-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch
index 17bae1e4c9..62b62aa473 100644
--- a/CraftBukkit-Patches/0030-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch
+++ b/CraftBukkit-Patches/0029-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch
@@ -1,4 +1,4 @@
-From f35ee6c9101a78d09ec18b6cd5f122d613354776 Mon Sep 17 00:00:00 2001
+From df26ba7e91b1fb951e4649f579812acf537b225d 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/0031-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch b/CraftBukkit-Patches/0030-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch
similarity index 96%
rename from CraftBukkit-Patches/0031-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch
rename to CraftBukkit-Patches/0030-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch
index bb70dbd622..0b9d17cc26 100644
--- a/CraftBukkit-Patches/0031-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch
+++ b/CraftBukkit-Patches/0030-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch
@@ -1,4 +1,4 @@
-From c99e4572ef7c0e1e2aba94f4446e8c7e3778b113 Mon Sep 17 00:00:00 2001
+From 0e94cb04fd0f2a6c99cf935a76238ea755bc42a1 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/0032-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch b/CraftBukkit-Patches/0031-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch
similarity index 94%
rename from CraftBukkit-Patches/0032-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch
rename to CraftBukkit-Patches/0031-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch
index 49d8595d40..18b5f557e6 100644
--- a/CraftBukkit-Patches/0032-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch
+++ b/CraftBukkit-Patches/0031-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch
@@ -1,4 +1,4 @@
-From 11d2989ca3bad19e2fd8989c7c5f4d6845ceae99 Mon Sep 17 00:00:00 2001
+From a8a242d91159293255e7554f55c4a8dd038915f4 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/0033-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch b/CraftBukkit-Patches/0032-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch
similarity index 94%
rename from CraftBukkit-Patches/0033-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch
rename to CraftBukkit-Patches/0032-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch
index 7399dd4f6c..0c37eb1c07 100644
--- a/CraftBukkit-Patches/0033-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch
+++ b/CraftBukkit-Patches/0032-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch
@@ -1,4 +1,4 @@
-From 7e3bf20b26af96ca522dff934750dddaccb3334a Mon Sep 17 00:00:00 2001
+From eddd098c9ca459d6be96a9ba9f419973947c9483 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/0034-PlayerItemDamageEvent.patch b/CraftBukkit-Patches/0033-PlayerItemDamageEvent.patch
similarity index 97%
rename from CraftBukkit-Patches/0034-PlayerItemDamageEvent.patch
rename to CraftBukkit-Patches/0033-PlayerItemDamageEvent.patch
index db78d0510e..1d16ba66ee 100644
--- a/CraftBukkit-Patches/0034-PlayerItemDamageEvent.patch
+++ b/CraftBukkit-Patches/0033-PlayerItemDamageEvent.patch
@@ -1,4 +1,4 @@
-From 622c39c692e56421f98113564f517d44a8ecdb63 Mon Sep 17 00:00:00 2001
+From 2989643c7c29bdd67a68d0285c7a7269dcef703d 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/0035-Faster-UUID-for-entities.patch b/CraftBukkit-Patches/0034-Faster-UUID-for-entities.patch
similarity index 94%
rename from CraftBukkit-Patches/0035-Faster-UUID-for-entities.patch
rename to CraftBukkit-Patches/0034-Faster-UUID-for-entities.patch
index 7b8e5ea443..ded820797c 100644
--- a/CraftBukkit-Patches/0035-Faster-UUID-for-entities.patch
+++ b/CraftBukkit-Patches/0034-Faster-UUID-for-entities.patch
@@ -1,4 +1,4 @@
-From ab9322e5ec2898b4039451af370078343072b1c6 Mon Sep 17 00:00:00 2001
+From 8946198a7009f0a3f35c0a4d6c049b83a4b4bf21 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/0036-Prevent-NPE-in-CraftSign.patch b/CraftBukkit-Patches/0035-Prevent-NPE-in-CraftSign.patch
similarity index 96%
rename from CraftBukkit-Patches/0036-Prevent-NPE-in-CraftSign.patch
rename to CraftBukkit-Patches/0035-Prevent-NPE-in-CraftSign.patch
index 517ce16c1f..b63ceace75 100644
--- a/CraftBukkit-Patches/0036-Prevent-NPE-in-CraftSign.patch
+++ b/CraftBukkit-Patches/0035-Prevent-NPE-in-CraftSign.patch
@@ -1,4 +1,4 @@
-From c5482476ab6be812fbf52521e09ce0a199aab63a Mon Sep 17 00:00:00 2001
+From 94e7104419f58583786b4b0d894fa642c05f68f3 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/0037-Stage-DataWatcher-WatchableObject.patch b/CraftBukkit-Patches/0036-Stage-DataWatcher-WatchableObject.patch
similarity index 99%
rename from CraftBukkit-Patches/0037-Stage-DataWatcher-WatchableObject.patch
rename to CraftBukkit-Patches/0036-Stage-DataWatcher-WatchableObject.patch
index 369a844275..094fd3884c 100644
--- a/CraftBukkit-Patches/0037-Stage-DataWatcher-WatchableObject.patch
+++ b/CraftBukkit-Patches/0036-Stage-DataWatcher-WatchableObject.patch
@@ -1,4 +1,4 @@
-From 4273e8e22cd80e2b30dd56579ba9e3e210eda449 Mon Sep 17 00:00:00 2001
+From 2b04a672e68b9f131c384964788e80b4d5344b17 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/0038-Entity-Tracking-Ranges.patch b/CraftBukkit-Patches/0037-Entity-Tracking-Ranges.patch
similarity index 99%
rename from CraftBukkit-Patches/0038-Entity-Tracking-Ranges.patch
rename to CraftBukkit-Patches/0037-Entity-Tracking-Ranges.patch
index ce0a7ef80a..e9c731f7a6 100644
--- a/CraftBukkit-Patches/0038-Entity-Tracking-Ranges.patch
+++ b/CraftBukkit-Patches/0037-Entity-Tracking-Ranges.patch
@@ -1,4 +1,4 @@
-From d06dd0edec0615add8d3ab9497970c32b79e9391 Mon Sep 17 00:00:00 2001
+From 9c8bc24c6b42dfee69e63cc54936e014ab0811a5 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/0039-BungeeCord-Support.patch b/CraftBukkit-Patches/0038-BungeeCord-Support.patch
similarity index 97%
rename from CraftBukkit-Patches/0039-BungeeCord-Support.patch
rename to CraftBukkit-Patches/0038-BungeeCord-Support.patch
index 644349d282..f2967fba73 100644
--- a/CraftBukkit-Patches/0039-BungeeCord-Support.patch
+++ b/CraftBukkit-Patches/0038-BungeeCord-Support.patch
@@ -1,4 +1,4 @@
-From 7b3cbd9f58a64e4f2f3e3138660c35ae16e06113 Mon Sep 17 00:00:00 2001
+From bcbd1c101a4551ad61f50a7251c9720976558389 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/0040-Texture-Pack-Resolutions.patch b/CraftBukkit-Patches/0039-Texture-Pack-Resolutions.patch
similarity index 98%
rename from CraftBukkit-Patches/0040-Texture-Pack-Resolutions.patch
rename to CraftBukkit-Patches/0039-Texture-Pack-Resolutions.patch
index f26561874a..8d9030d82f 100644
--- a/CraftBukkit-Patches/0040-Texture-Pack-Resolutions.patch
+++ b/CraftBukkit-Patches/0039-Texture-Pack-Resolutions.patch
@@ -1,4 +1,4 @@
-From 7c7fc1b2b48f008dd2ad6f2bc0ba304a9cf10503 Mon Sep 17 00:00:00 2001
+From 3b6a61f47c2b784c95ddfd425b9e316501b197f2 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/0041-Entity-Tracking-Intervals.patch b/CraftBukkit-Patches/0040-Entity-Tracking-Intervals.patch
similarity index 94%
rename from CraftBukkit-Patches/0041-Entity-Tracking-Intervals.patch
rename to CraftBukkit-Patches/0040-Entity-Tracking-Intervals.patch
index 1a8473875b..395fbac585 100644
--- a/CraftBukkit-Patches/0041-Entity-Tracking-Intervals.patch
+++ b/CraftBukkit-Patches/0040-Entity-Tracking-Intervals.patch
@@ -1,4 +1,4 @@
-From 2dc83cca06e50e828e836669e711c67fa4f09716 Mon Sep 17 00:00:00 2001
+From 2667f7b024551bd022ac65e8aa51c54987d82a37 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Mar 2013 13:31:23 +1100
 Subject: [PATCH] Entity Tracking Intervals
diff --git a/CraftBukkit-Patches/0042-Limit-Custom-Map-Rendering.patch b/CraftBukkit-Patches/0041-Limit-Custom-Map-Rendering.patch
similarity index 98%
rename from CraftBukkit-Patches/0042-Limit-Custom-Map-Rendering.patch
rename to CraftBukkit-Patches/0041-Limit-Custom-Map-Rendering.patch
index 6f2491da2b..1939831c6f 100644
--- a/CraftBukkit-Patches/0042-Limit-Custom-Map-Rendering.patch
+++ b/CraftBukkit-Patches/0041-Limit-Custom-Map-Rendering.patch
@@ -1,4 +1,4 @@
-From eb50818c3f874a1d1241d1e8a23b974057e37a0b Mon Sep 17 00:00:00 2001
+From be05138f3a265c2cd9cf7a659ad80eadfda26327 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/0043-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch b/CraftBukkit-Patches/0042-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch
similarity index 95%
rename from CraftBukkit-Patches/0043-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch
rename to CraftBukkit-Patches/0042-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch
index b77aabd00b..c458d98704 100644
--- a/CraftBukkit-Patches/0043-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch
+++ b/CraftBukkit-Patches/0042-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch
@@ -1,4 +1,4 @@
-From 5ba72ebebf67d85199b5238967da9f785eaca07b Mon Sep 17 00:00:00 2001
+From 50417be2c7a2ff1441f6b9ea0c64cd3434077307 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/0044-Boat-dupe-fix.patch b/CraftBukkit-Patches/0043-Boat-dupe-fix.patch
similarity index 93%
rename from CraftBukkit-Patches/0044-Boat-dupe-fix.patch
rename to CraftBukkit-Patches/0043-Boat-dupe-fix.patch
index 331fa599a2..78acfbccb1 100644
--- a/CraftBukkit-Patches/0044-Boat-dupe-fix.patch
+++ b/CraftBukkit-Patches/0043-Boat-dupe-fix.patch
@@ -1,4 +1,4 @@
-From dd262b67dd4a781a72db65f1be65e80c103fa042 Mon Sep 17 00:00:00 2001
+From 77faf8b96acde1a57bbb78ee1fed086af6ef2066 Mon Sep 17 00:00:00 2001
 From: Benjamin James Harrison-Sims <tehrainbowguy@gmail.com>
 Date: Fri, 5 Apr 2013 18:13:35 +0100
 Subject: [PATCH] Boat dupe fix.
@@ -21,5 +21,5 @@ index 8839a45..953e86c 100644
                      Vehicle vehicle = (Vehicle) this.getBukkitEntity();
                      VehicleDestroyEvent destroyEvent = new VehicleDestroyEvent(vehicle, null);
 -- 
-1.8.2
+1.8.2.1