diff --git a/Bukkit-Patches/0001-Spigot-POM-Changes.patch b/Bukkit-Patches/0001-Spigot-POM-Changes.patch
index f655f06..878e3f3 100644
--- a/Bukkit-Patches/0001-Spigot-POM-Changes.patch
+++ b/Bukkit-Patches/0001-Spigot-POM-Changes.patch
@@ -1,11 +1,11 @@
-From e480c1604c30348befec70e418fa12b3257165d8 Mon Sep 17 00:00:00 2001
+From 7d2497da8d8225a7a90d67ca818b004bc18466da Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Wed, 30 Jan 2013 23:44:29 -0500
 Subject: [PATCH] Spigot POM Changes.
 
 ---
- pom.xml | 44 ++++++++++++--------------------------------
- 1 file changed, 12 insertions(+), 32 deletions(-)
+ pom.xml |   44 ++++++++++++--------------------------------
+ 1 files changed, 12 insertions(+), 32 deletions(-)
 
 diff --git a/pom.xml b/pom.xml
 index 2df4906..9d986fa 100644
@@ -68,5 +68,5 @@ index 2df4906..9d986fa 100644
          <plugins>
              <plugin>
 -- 
-1.8.2
+1.7.0.4
 
diff --git a/Bukkit-Patches/0002-Measure-the-duration-of-the-entire-timings-run.patch b/Bukkit-Patches/0002-Measure-the-duration-of-the-entire-timings-run.patch
index 840c8e8..723438c 100644
--- a/Bukkit-Patches/0002-Measure-the-duration-of-the-entire-timings-run.patch
+++ b/Bukkit-Patches/0002-Measure-the-duration-of-the-entire-timings-run.patch
@@ -1,12 +1,12 @@
-From 6799cb6eaa5c2f6d572ec20968f5f08d70137e04 Mon Sep 17 00:00:00 2001
+From c39140c5533222f176c6705cb1ae26aef0ef7cd9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 9 Jan 2013 16:53:45 -0500
 Subject: [PATCH] Measure the duration of the entire timings run.
 
 ---
- src/main/java/org/bukkit/command/defaults/TimingsCommand.java | 4 ++++
- src/main/java/org/bukkit/plugin/SimplePluginManager.java      | 2 ++
- 2 files changed, 6 insertions(+)
+ .../bukkit/command/defaults/TimingsCommand.java    |    4 ++++
+ .../org/bukkit/plugin/SimplePluginManager.java     |    2 ++
+ 2 files changed, 6 insertions(+), 0 deletions(-)
 
 diff --git a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
 index 29ebbe0..94cd62c 100644
@@ -41,7 +41,7 @@ index 29ebbe0..94cd62c 100644
                  if (separate) sender.sendMessage("Names written to " + names.getPath());
              } catch (IOException e) {
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 8224d29..2527e71 100644
+index 93fb4f5..f5f6941 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 @@ -23,6 +23,7 @@ import org.bukkit.Server;
@@ -61,5 +61,5 @@ index 8224d29..2527e71 100644
      }
  
 -- 
-1.8.2
+1.7.0.4
 
diff --git a/Bukkit-Patches/0003-Improved-Timings-System.patch b/Bukkit-Patches/0003-Improved-Timings-System.patch
index 4e14ff3..3ee51c4 100644
--- a/Bukkit-Patches/0003-Improved-Timings-System.patch
+++ b/Bukkit-Patches/0003-Improved-Timings-System.patch
@@ -1,4 +1,4 @@
-From 0e45136a44feead58a7f28c99c58e6c39938c0f9 Mon Sep 17 00:00:00 2001
+From 9fefede017b0a318fb123c975c54f85095be677c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 9 Jan 2013 22:18:26 -0500
 Subject: [PATCH] Improved Timings System
@@ -8,11 +8,11 @@ Tracks timings on sync events a plugin registers (Single and Repeating)
 Tracks how many ticks a timed area has caused the server to lose due to taking too long.
 Enables automatically pasting to paste.ubuntu.com so you can quickly review the results on aikar.co/timings.php
 ---
- src/main/java/org/bukkit/CustomTimingsHandler.java | 134 +++++++++++++++++++++
- .../org/bukkit/command/defaults/ReloadCommand.java |   2 +
- .../bukkit/command/defaults/TimingsCommand.java    |  90 ++++++++++++--
- .../org/bukkit/plugin/TimedRegisteredListener.java |  12 +-
- .../org/bukkit/plugin/java/JavaPluginLoader.java   |   2 +-
+ src/main/java/org/bukkit/CustomTimingsHandler.java |  134 ++++++++++++++++++++
+ .../org/bukkit/command/defaults/ReloadCommand.java |    2 +
+ .../bukkit/command/defaults/TimingsCommand.java    |   90 ++++++++++++--
+ .../org/bukkit/plugin/TimedRegisteredListener.java |   12 ++-
+ .../org/bukkit/plugin/java/JavaPluginLoader.java   |    2 +-
  5 files changed, 227 insertions(+), 13 deletions(-)
  create mode 100644 src/main/java/org/bukkit/CustomTimingsHandler.java
 
@@ -407,5 +407,5 @@ index ea30d83..d905435 100644
              } else {
                  eventSet.add(new RegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled()));
 -- 
-1.8.2
+1.7.0.4
 
diff --git a/Bukkit-Patches/0004-Add-nag-for-bad-plugins.patch b/Bukkit-Patches/0004-Add-nag-for-bad-plugins.patch
index 4627834..754de37 100644
--- a/Bukkit-Patches/0004-Add-nag-for-bad-plugins.patch
+++ b/Bukkit-Patches/0004-Add-nag-for-bad-plugins.patch
@@ -1,11 +1,11 @@
-From 767ad529f592e2721f2df2c14f533317eab3ff7c Mon Sep 17 00:00:00 2001
+From d2e1a053d9ef3a7631a44c7cca6cca67a0f8ec13 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 2 Feb 2013 16:40:42 +1100
 Subject: [PATCH] Add nag for bad plugins.
 
 ---
- src/main/java/org/bukkit/plugin/java/PluginClassLoader.java | 7 +++++++
- 1 file changed, 7 insertions(+)
+ .../org/bukkit/plugin/java/PluginClassLoader.java  |    7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
 
 diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 index 29ec3fc..a31500c 100644
@@ -26,5 +26,5 @@ index 29ec3fc..a31500c 100644
  
          if (result == null) {
 -- 
-1.8.2
+1.7.0.4
 
diff --git a/Bukkit-Patches/0005-PlayerItemDamageEvent.patch b/Bukkit-Patches/0005-PlayerItemDamageEvent.patch
index e9431c7..4ff6d01 100644
--- a/Bukkit-Patches/0005-PlayerItemDamageEvent.patch
+++ b/Bukkit-Patches/0005-PlayerItemDamageEvent.patch
@@ -1,11 +1,11 @@
-From aa48bcce71642e31b6a9447113439c885fbd560d Mon Sep 17 00:00:00 2001
+From 28a8f7cc234e1c333e35906ab008befb8eb94ea4 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] PlayerItemDamageEvent
 
 ---
- .../bukkit/event/player/PlayerItemDamageEvent.java | 54 ++++++++++++++++++++++
- 1 file changed, 54 insertions(+)
+ .../bukkit/event/player/PlayerItemDamageEvent.java |   54 ++++++++++++++++++++
+ 1 files changed, 54 insertions(+), 0 deletions(-)
  create mode 100644 src/main/java/org/bukkit/event/player/PlayerItemDamageEvent.java
 
 diff --git a/src/main/java/org/bukkit/event/player/PlayerItemDamageEvent.java b/src/main/java/org/bukkit/event/player/PlayerItemDamageEvent.java
@@ -69,5 +69,5 @@ index 0000000..38a72ab
 +    }
 +}
 -- 
-1.8.2
+1.7.0.4
 
diff --git a/Bukkit-Patches/0006-Refactor-conversions-from-LazyMetadataValue-into-abs.patch b/Bukkit-Patches/0006-Refactor-conversions-from-LazyMetadataValue-into-abs.patch
index 0015784..ea4951f 100644
--- a/Bukkit-Patches/0006-Refactor-conversions-from-LazyMetadataValue-into-abs.patch
+++ b/Bukkit-Patches/0006-Refactor-conversions-from-LazyMetadataValue-into-abs.patch
@@ -1,8 +1,7 @@
-From 0d2be83dcf857b4b29c304bfb4b5d67dde23a13c Mon Sep 17 00:00:00 2001
+From 833fa47c9a3aadc2ca8e86319d3f4a2c112f1ad7 Mon Sep 17 00:00:00 2001
 From: crast <contact@jamescrasta.com>
 Date: Sat, 16 Feb 2013 14:33:24 -0700
-Subject: [PATCH] Refactor conversions from LazyMetadataValue into abstract
- base class
+Subject: [PATCH] Refactor conversions from LazyMetadataValue into abstract base class
 
 Implementing MetadataValue interface is significant work due to having
 to provide a large amount of conversion stub method. This adds a new
@@ -11,9 +10,9 @@ optional abstract base class to aid in implementation.
 Includes comprehensive unit tests including a sample adapter class, and
 all existing metadata tests pass.
 ---
- .../org/bukkit/metadata/LazyMetadataValue.java     | 60 +----------------
- .../org/bukkit/metadata/MetadataValueAdapter.java  | 77 ++++++++++++++++++++++
- .../bukkit/metadata/MetadataValueAdapterTest.java  | 44 +++++++++++++
+ .../org/bukkit/metadata/LazyMetadataValue.java     |   60 +---------------
+ .../org/bukkit/metadata/MetadataValueAdapter.java  |   77 ++++++++++++++++++++
+ .../bukkit/metadata/MetadataValueAdapterTest.java  |   44 +++++++++++
  3 files changed, 123 insertions(+), 58 deletions(-)
  create mode 100644 src/main/java/org/bukkit/metadata/MetadataValueAdapter.java
  create mode 100644 src/test/java/org/bukkit/metadata/MetadataValueAdapterTest.java
@@ -254,5 +253,5 @@ index 0000000..5ae7df4
 +    }
 +}
 -- 
-1.8.1-rc2
+1.7.0.4
 
diff --git a/Bukkit-Patches/0007-Clean-up-whitespace.patch b/Bukkit-Patches/0007-Clean-up-whitespace.patch
index e63c72a..b200583 100644
--- a/Bukkit-Patches/0007-Clean-up-whitespace.patch
+++ b/Bukkit-Patches/0007-Clean-up-whitespace.patch
@@ -1,11 +1,11 @@
-From c072f0a7250ce40674b9bfbcf8fe52fd28b25716 Mon Sep 17 00:00:00 2001
+From e6c68983e8fc1b067e82b3d31b38ecaf66728112 Mon Sep 17 00:00:00 2001
 From: crast <contact@jamescrasta.com>
 Date: Wed, 20 Mar 2013 15:24:12 -0600
 Subject: [PATCH] Clean up whitespace.
 
 ---
- src/main/java/org/bukkit/metadata/LazyMetadataValue.java    | 1 -
- src/main/java/org/bukkit/metadata/MetadataValueAdapter.java | 6 +++---
+ .../org/bukkit/metadata/LazyMetadataValue.java     |    1 -
+ .../org/bukkit/metadata/MetadataValueAdapter.java  |    6 +++---
  2 files changed, 3 insertions(+), 4 deletions(-)
 
 diff --git a/src/main/java/org/bukkit/metadata/LazyMetadataValue.java b/src/main/java/org/bukkit/metadata/LazyMetadataValue.java
@@ -38,5 +38,5 @@ index 9ec7e61..354b6dc 100644
   *
   */
 -- 
-1.8.1-rc2
+1.7.0.4
 
diff --git a/Bukkit-Patches/0008-Substantially-more-comprehensive-unit-tests.patch b/Bukkit-Patches/0008-Substantially-more-comprehensive-unit-tests.patch
index adb55de..5daa8ce 100644
--- a/Bukkit-Patches/0008-Substantially-more-comprehensive-unit-tests.patch
+++ b/Bukkit-Patches/0008-Substantially-more-comprehensive-unit-tests.patch
@@ -1,4 +1,4 @@
-From 634c75e521140bc33af968f8b5249123eee5aebc Mon Sep 17 00:00:00 2001
+From ab04f462db66899843b02b39a05ac1db64abf85b Mon Sep 17 00:00:00 2001
 From: crast <contact@jamescrasta.com>
 Date: Wed, 20 Mar 2013 15:59:03 -0600
 Subject: [PATCH] Substantially more comprehensive unit tests.
@@ -7,8 +7,8 @@ Check all the interesting implementation details in metadatavalues
 which were never tested before, as well as making sure we document
 things thoroughly.
 ---
- .../org/bukkit/metadata/MetadataValueAdapter.java  |  2 +-
- .../bukkit/metadata/MetadataValueAdapterTest.java  | 73 +++++++++++++++++++---
+ .../org/bukkit/metadata/MetadataValueAdapter.java  |    2 +-
+ .../bukkit/metadata/MetadataValueAdapterTest.java  |   73 +++++++++++++++++---
  2 files changed, 64 insertions(+), 11 deletions(-)
 
 diff --git a/src/main/java/org/bukkit/metadata/MetadataValueAdapter.java b/src/main/java/org/bukkit/metadata/MetadataValueAdapter.java
@@ -115,5 +115,5 @@ index 5ae7df4..7d8a17f 100644
          private int internalValue = 0;
  
 -- 
-1.8.1-rc2
+1.7.0.4
 
diff --git a/Bukkit-Patches/0009-Prevent-classloader-leakage-in-metadata-system.-Fixe.patch b/Bukkit-Patches/0009-Prevent-classloader-leakage-in-metadata-system.-Fixe.patch
index aac6f6b..8b0d29b 100644
--- a/Bukkit-Patches/0009-Prevent-classloader-leakage-in-metadata-system.-Fixe.patch
+++ b/Bukkit-Patches/0009-Prevent-classloader-leakage-in-metadata-system.-Fixe.patch
@@ -1,16 +1,15 @@
-From 7080e3e4d864249328686c7d04ffba43881a36ed Mon Sep 17 00:00:00 2001
+From f9285f05593663ec59cd8df16e499e2eaa58010e Mon Sep 17 00:00:00 2001
 From: crast <contact@jamescrasta.com>
 Date: Thu, 21 Mar 2013 18:13:20 -0600
-Subject: [PATCH] Prevent classloader leakage in metadata system. Fixes
- Bukkit-3854
+Subject: [PATCH] Prevent classloader leakage in metadata system. Fixes Bukkit-3854
 
 Metadata values keep strong reference to plugins, and they're not
 cleared out when plugins are unloaded. This system adds weak reference
 logic to allow these values to fall out of scope. In addition we get
 some operations turning to O(1) "for free."
 ---
- .../org/bukkit/metadata/MetadataStoreBase.java     | 48 ++++++++--------------
- .../org/bukkit/metadata/MetadataValueAdapter.java  |  8 ++--
+ .../org/bukkit/metadata/MetadataStoreBase.java     |   48 +++++++------------
+ .../org/bukkit/metadata/MetadataValueAdapter.java  |    8 ++-
  2 files changed, 23 insertions(+), 33 deletions(-)
 
 diff --git a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
@@ -135,5 +134,5 @@ index c4b8b39..3b83380 100644
  
      public int asInt() {
 -- 
-1.8.1-rc2
+1.7.0.4
 
diff --git a/CraftBukkit-Patches/0001-POM-Changes.patch b/CraftBukkit-Patches/0001-POM-Changes.patch
index e73a0b5..07bf25c 100644
--- a/CraftBukkit-Patches/0001-POM-Changes.patch
+++ b/CraftBukkit-Patches/0001-POM-Changes.patch
@@ -1,11 +1,11 @@
-From 7962cbdf9cabf92d4f3475e5fe71c0d006e5035a Mon Sep 17 00:00:00 2001
+From a122d3c2043272d3fe2b692399aac2dcbecb6060 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 3 Feb 2013 09:44:24 +1100
 Subject: [PATCH] POM Changes.
 
 ---
- pom.xml | 61 ++++++++++++++++++++++++-------------------------------------
- 1 file changed, 24 insertions(+), 37 deletions(-)
+ pom.xml |   61 ++++++++++++++++++++++++-------------------------------------
+ 1 files changed, 24 insertions(+), 37 deletions(-)
 
 diff --git a/pom.xml b/pom.xml
 index ce239ff..8f2e071 100644
@@ -120,5 +120,5 @@ index ce239ff..8f2e071 100644
            <execution>
              <phase>package</phase>
 -- 
-1.8.2
+1.7.0.4
 
diff --git a/CraftBukkit-Patches/0002-Spigot-Changes.patch b/CraftBukkit-Patches/0002-Spigot-Changes.patch
index 02de85b..9952ace 100644
--- a/CraftBukkit-Patches/0002-Spigot-Changes.patch
+++ b/CraftBukkit-Patches/0002-Spigot-Changes.patch
@@ -1,35 +1,35 @@
-From f06fbf4660299434b863b47b71e37666062b312b Mon Sep 17 00:00:00 2001
+From 12e671af8e48ce6ae5f0ca2c87d90dee326cff55 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
 
 The set of changes which provide core Spigot functionality, which would otherwise be a mess to try and apply individually.
 ---
- .gitignore                                         |   2 +
- src/main/java/net/minecraft/server/Block.java      |  12 +++
- .../java/net/minecraft/server/BlockCactus.java     |   2 +-
- src/main/java/net/minecraft/server/BlockCrops.java |   2 +-
- src/main/java/net/minecraft/server/BlockGrass.java |   3 +-
- .../java/net/minecraft/server/BlockMushroom.java   |   2 +-
- src/main/java/net/minecraft/server/BlockMycel.java |   3 +-
- src/main/java/net/minecraft/server/BlockReed.java  |   2 +-
- .../java/net/minecraft/server/BlockSapling.java    |   2 +-
- src/main/java/net/minecraft/server/BlockStem.java  |   2 +-
- .../net/minecraft/server/ChunkRegionLoader.java    |  35 +++++--
- .../java/net/minecraft/server/ChunkSection.java    |  31 ++++--
- src/main/java/net/minecraft/server/EntityItem.java |   3 +-
- .../java/net/minecraft/server/EntitySquid.java     |   4 -
- .../net/minecraft/server/PlayerConnection.java     |  19 +++-
- src/main/java/net/minecraft/server/PlayerList.java |  10 +-
- .../net/minecraft/server/ThreadLoginVerifier.java  |  21 ++++
- src/main/java/net/minecraft/server/World.java      | 111 +++++++++++++++++----
- .../java/net/minecraft/server/WorldServer.java     |  36 ++++++-
- .../java/org/bukkit/craftbukkit/CraftServer.java   |  47 +++++----
- .../java/org/bukkit/craftbukkit/CraftWorld.java    |  71 ++++++++++++-
- src/main/java/org/bukkit/craftbukkit/Spigot.java   |  20 ++++
- .../craftbukkit/chunkio/ChunkIOProvider.java       |   2 +-
- src/main/resources/configurations/bukkit.yml       |  26 +++++
- 24 files changed, 390 insertions(+), 78 deletions(-)
+ .gitignore                                         |    2 +
+ src/main/java/net/minecraft/server/Block.java      |   12 ++
+ .../java/net/minecraft/server/BlockCactus.java     |    2 +-
+ src/main/java/net/minecraft/server/BlockCrops.java |    2 +-
+ src/main/java/net/minecraft/server/BlockGrass.java |    3 +-
+ .../java/net/minecraft/server/BlockMushroom.java   |    2 +-
+ src/main/java/net/minecraft/server/BlockMycel.java |    3 +-
+ src/main/java/net/minecraft/server/BlockReed.java  |    2 +-
+ .../java/net/minecraft/server/BlockSapling.java    |    2 +-
+ src/main/java/net/minecraft/server/BlockStem.java  |    2 +-
+ .../net/minecraft/server/ChunkRegionLoader.java    |   35 +++++--
+ .../java/net/minecraft/server/ChunkSection.java    |   31 +++++-
+ src/main/java/net/minecraft/server/EntityItem.java |    3 +-
+ .../java/net/minecraft/server/EntitySquid.java     |    4 -
+ .../net/minecraft/server/PlayerConnection.java     |   19 +++-
+ src/main/java/net/minecraft/server/PlayerList.java |   10 ++-
+ .../net/minecraft/server/ThreadLoginVerifier.java  |   21 ++++
+ src/main/java/net/minecraft/server/World.java      |  111 +++++++++++++++++---
+ .../java/net/minecraft/server/WorldServer.java     |   36 ++++++-
+ .../java/org/bukkit/craftbukkit/CraftServer.java   |   47 +++++----
+ .../java/org/bukkit/craftbukkit/CraftWorld.java    |   69 ++++++++++++
+ src/main/java/org/bukkit/craftbukkit/Spigot.java   |   20 ++++
+ .../craftbukkit/chunkio/ChunkIOProvider.java       |    2 +-
+ src/main/resources/configurations/bukkit.yml       |   26 +++++
+ 24 files changed, 389 insertions(+), 77 deletions(-)
  create mode 100644 src/main/java/org/bukkit/craftbukkit/Spigot.java
 
 diff --git a/.gitignore b/.gitignore
@@ -661,7 +661,7 @@ index 9698185..cddc890 100644
              entityhuman = (EntityHuman) this.players.get(i);
              j = MathHelper.floor(entityhuman.locX) + this.random.nextInt(11) - 5;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index a49419e..39505b2 100644
+index 13f67da..a5a0e04 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1,5 +1,7 @@
@@ -680,7 +680,7 @@ index a49419e..39505b2 100644
  
  import org.bukkit.event.block.BlockFormEvent;
  import org.bukkit.event.weather.LightningStrikeEvent;
-@@ -278,15 +281,30 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
+@@ -295,15 +298,30 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
      }
  
      protected void g() {
@@ -714,7 +714,7 @@ index a49419e..39505b2 100644
              // ChunkCoordIntPair chunkcoordintpair = (ChunkCoordIntPair) iterator.next();
              int k = chunkX * 16;
              int l = chunkZ * 16;
-@@ -384,7 +402,17 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
+@@ -401,7 +419,17 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
  
                          if (block != null && block.isTicking()) {
                              ++i;
@@ -1019,5 +1019,5 @@ index 61a95e3..bc00ad4 100644
      monsters: 70
      animals: 15
 -- 
-1.8.1-rc2
+1.7.0.4
 
diff --git a/CraftBukkit-Patches/0003-Merge-tweaks-and-configuration.patch b/CraftBukkit-Patches/0003-Merge-tweaks-and-configuration.patch
index b9da3ee..bcd67df 100644
--- a/CraftBukkit-Patches/0003-Merge-tweaks-and-configuration.patch
+++ b/CraftBukkit-Patches/0003-Merge-tweaks-and-configuration.patch
@@ -1,14 +1,14 @@
-From daf9b804fc18297c242cde1a7401e8c26f15e414 Mon Sep 17 00:00:00 2001
+From 02388be2d963563eea16a68a5583f03908f17704 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
 
 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.
 ---
- src/main/java/net/minecraft/server/EntityItem.java   | 17 +++++++++++------
- src/main/java/net/minecraft/server/World.java        | 17 +++++++++++++++++
- src/main/java/org/bukkit/craftbukkit/CraftWorld.java |  6 ++++++
- src/main/resources/configurations/bukkit.yml         |  2 ++
+ src/main/java/net/minecraft/server/EntityItem.java |   17 +++++++++++------
+ src/main/java/net/minecraft/server/World.java      |   17 +++++++++++++++++
+ .../java/org/bukkit/craftbukkit/CraftWorld.java    |    6 ++++++
+ src/main/resources/configurations/bukkit.yml       |    2 ++
  4 files changed, 36 insertions(+), 6 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
@@ -47,7 +47,7 @@ index aa8d83f..6d54e97 100644
              }
          } else {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 2f8e066..0c378e7 100644
+index cddc890..78e52d4 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -950,6 +950,23 @@ public abstract class World implements IBlockAccess {
@@ -75,7 +75,7 @@ index 2f8e066..0c378e7 100644
          if (event != null && (event.isCancelled() || entity.dead)) {
              entity.dead = true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 150d581..a445d8f 100644
+index 9da842e..a303090 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -92,6 +92,8 @@ public class CraftWorld implements World {
@@ -119,5 +119,5 @@ index bc00ad4..524c0ca 100644
          cactus-growth-modifier: 100
          melon-growth-modifier: 100
 -- 
-1.8.1-rc2
+1.7.0.4
 
diff --git a/CraftBukkit-Patches/0004-LongHash-Tweaks.patch b/CraftBukkit-Patches/0004-LongHash-Tweaks.patch
index 575d23b..d7cefe6 100644
--- a/CraftBukkit-Patches/0004-LongHash-Tweaks.patch
+++ b/CraftBukkit-Patches/0004-LongHash-Tweaks.patch
@@ -1,14 +1,14 @@
-From c114c3c71690f5c0dc640083c263062a776c92aa Mon Sep 17 00:00:00 2001
+From ae4248107c916a12bb139cfb1e00a45097dcfb02 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.
 
 This commit adds a flat array based cache to the LongHash(Set/Map) classes leading to excellent efficiency for servers where most activity is centered around the origin (0,0)
 ---
- .../java/org/bukkit/craftbukkit/util/FlatMap.java  | 34 ++++++++++++++++++++++
- .../org/bukkit/craftbukkit/util/LongHashSet.java   |  8 ++++-
- .../bukkit/craftbukkit/util/LongObjectHashMap.java |  5 ++++
- 3 files changed, 46 insertions(+), 1 deletion(-)
+ .../java/org/bukkit/craftbukkit/util/FlatMap.java  |   34 ++++++++++++++++++++
+ .../org/bukkit/craftbukkit/util/LongHashSet.java   |    8 ++++-
+ .../bukkit/craftbukkit/util/LongObjectHashMap.java |    5 +++
+ 3 files changed, 46 insertions(+), 1 deletions(-)
  create mode 100644 src/main/java/org/bukkit/craftbukkit/util/FlatMap.java
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/FlatMap.java b/src/main/java/org/bukkit/craftbukkit/util/FlatMap.java
@@ -136,5 +136,5 @@ index 01861cc..dbd33fa 100644
          long[] inner = keys[index];
          if (inner == null) {
 -- 
-1.8.1-rc2
+1.7.0.4
 
diff --git a/CraftBukkit-Patches/0005-Async-Operation-Catching.patch b/CraftBukkit-Patches/0005-Async-Operation-Catching.patch
index 60c6ebd..af2b47f 100644
--- a/CraftBukkit-Patches/0005-Async-Operation-Catching.patch
+++ b/CraftBukkit-Patches/0005-Async-Operation-Catching.patch
@@ -1,16 +1,16 @@
-From 44708c33dfbffaf6bd135f7707780ca0bc5fdfee Mon Sep 17 00:00:00 2001
+From 9ba6ff4b8b7a079bdec4c7cbe26870fe2444f562 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
 
 Catch and throw an exception when a potentially unsafe operation occurs on a thread other than the main server thread.
 ---
- src/main/java/net/minecraft/server/EntityTracker.java        | 2 ++
- src/main/java/net/minecraft/server/EntityTrackerEntry.java   | 2 ++
- src/main/java/net/minecraft/server/World.java                | 2 ++
- src/main/java/org/bukkit/craftbukkit/CraftWorld.java         | 3 +++
- src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java | 1 +
- 5 files changed, 10 insertions(+)
+ .../java/net/minecraft/server/EntityTracker.java   |    2 ++
+ .../net/minecraft/server/EntityTrackerEntry.java   |    2 ++
+ src/main/java/net/minecraft/server/World.java      |    2 ++
+ .../java/org/bukkit/craftbukkit/CraftWorld.java    |    3 +++
+ .../org/bukkit/craftbukkit/entity/CraftPlayer.java |    1 +
+ 5 files changed, 10 insertions(+), 0 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
 index 4de1273..db62084 100644
@@ -33,7 +33,7 @@ index 4de1273..db62084 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 ae9ed52..9c014ca 100644
+index 4871bd7..8aa2e88 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -286,6 +286,7 @@ public class EntityTrackerEntry {
@@ -53,7 +53,7 @@ index ae9ed52..9c014ca 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 0c378e7..4518acc 100644
+index 78e52d4..5b8cee3 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -919,6 +919,7 @@ public abstract class World implements IBlockAccess {
@@ -73,7 +73,7 @@ index 0c378e7..4518acc 100644
          if (entity instanceof EntityHuman) {
              this.players.remove(entity);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index a445d8f..1153eea 100644
+index a303090..f5e63f8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -235,6 +235,7 @@ public class CraftWorld implements World {
@@ -101,7 +101,7 @@ index a445d8f..1153eea 100644
          if (generate) {
              // Use the default variant of loadChunk when generate == true.
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 70111e7..f026c45 100644
+index d37d719..0deb4df 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -213,6 +213,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -113,5 +113,5 @@ index 70111e7..f026c45 100644
  
          getHandle().playerConnection.disconnect(message == null ? "" : message);
 -- 
-1.8.1-rc2
+1.7.0.4
 
diff --git a/CraftBukkit-Patches/0006-View-Distance.patch b/CraftBukkit-Patches/0006-View-Distance.patch
index eea7f86..9d550e1 100644
--- a/CraftBukkit-Patches/0006-View-Distance.patch
+++ b/CraftBukkit-Patches/0006-View-Distance.patch
@@ -1,14 +1,14 @@
-From 530ba24d7d28e5ade3013e820d19914d4bb89510 Mon Sep 17 00:00:00 2001
+From fdca3f0b93ab6b12e125a90328b16d0b1acb3a79 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
 
 This commit allows the user to select per world view distances, and view distances below 3. Be wary of the issues selecting a view distance of 1 or 2 may cause!
 ---
- src/main/java/net/minecraft/server/PlayerChunkMap.java | 2 +-
- src/main/java/net/minecraft/server/WorldServer.java    | 2 +-
- src/main/java/org/bukkit/craftbukkit/CraftWorld.java   | 5 +++++
- src/main/resources/configurations/bukkit.yml           | 1 +
+ .../java/net/minecraft/server/PlayerChunkMap.java  |    2 +-
+ .../java/net/minecraft/server/WorldServer.java     |    2 +-
+ .../java/org/bukkit/craftbukkit/CraftWorld.java    |    5 +++++
+ src/main/resources/configurations/bukkit.yml       |    1 +
  4 files changed, 8 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -25,7 +25,7 @@ index 0dfd190..c543bed 100644
          } else {
              this.e = i;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 39505b2..5a49b4d 100644
+index a5a0e04..f63e364 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -51,7 +51,7 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
@@ -80,5 +80,5 @@ index 524c0ca..9b85e13 100644
          random-light-updates: true
          water-creatures-per-chunk: 0
 -- 
-1.8.1-rc2
+1.7.0.4
 
diff --git a/CraftBukkit-Patches/0007-Address-BUKKIT-3286-by-firing-the-inventory-close-ev.patch b/CraftBukkit-Patches/0007-Address-BUKKIT-3286-by-firing-the-inventory-close-ev.patch
index 8ab4943..494ef60 100644
--- a/CraftBukkit-Patches/0007-Address-BUKKIT-3286-by-firing-the-inventory-close-ev.patch
+++ b/CraftBukkit-Patches/0007-Address-BUKKIT-3286-by-firing-the-inventory-close-ev.patch
@@ -1,16 +1,14 @@
-From d07d3b2724a125ba3208286bccacc3f35d5b172c Mon Sep 17 00:00:00 2001
+From a32a925ad6864721c2a21eb53d815a89d881f2b1 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
- a secondary container is closed due to the player entity being destroyed.
- This covers all edge cases such as server stop / player kick / player quit.
+Subject: [PATCH] Address BUKKIT-3286 by firing the inventory close event when a secondary container is closed due to the player entity being destroyed. This covers all edge cases such as server stop / player kick / player quit.
 
 ---
- src/main/java/net/minecraft/server/EntityHuman.java | 6 ++++++
- 1 file changed, 6 insertions(+)
+ .../java/net/minecraft/server/EntityHuman.java     |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 1f7b8ad..6f77702 100644
+index 101c2a0..76cfc2a 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -5,11 +5,13 @@ import java.util.Iterator;
@@ -39,5 +37,5 @@ index 1f7b8ad..6f77702 100644
          }
      }
 -- 
-1.8.1-rc2
+1.7.0.4
 
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
index ec5ea89..3ef333d 100644
--- 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
@@ -1,11 +1,11 @@
-From 3517624edf4a6a81a8d2c72f88aab4184c48ab22 Mon Sep 17 00:00:00 2001
+From adf49b414d6997ce4aaae6a65a3034d72e3eed53 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(+)
+ .../java/net/minecraft/server/NibbleArray.java     |   40 ++++++++++++++++++++
+ 1 files changed, 40 insertions(+), 0 deletions(-)
  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
@@ -55,5 +55,5 @@ index 0000000..5d75a54
 +    }
 +}
 -- 
-1.8.1-rc2
+1.7.0.4
 
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 3601881..55be8c8 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,19 +1,17 @@
-From e23a9931b30736363eca493eee4d6ea14dc7c0d5 Mon Sep 17 00:00:00 2001
+From 62fd1a277c1bb1539fa0321896b9f109cc7e2887 Mon Sep 17 00:00:00 2001
 From: Mike Primm <mike@primmhome.com>
 Date: Sun, 23 Dec 2012 14:46:23 -0600
-Subject: [PATCH] Implement 'lightening' of NibbleArrays - only allocate
- buffers when non-trivial value Saving from 40-45% of memory use by chunk
- section data.
+Subject: [PATCH] Implement 'lightening' of NibbleArrays - only allocate buffers when non-trivial value Saving from 40-45% of memory use by chunk section data.
 
 Finish up NibbleArray lightening work - use for Snapshots, reduce copies
 
 Fix nibble handling with NBT - arrays aren't copied by NBTByteArray
 ---
- .../net/minecraft/server/ChunkRegionLoader.java    |  10 +-
- .../java/net/minecraft/server/ChunkSection.java    |  24 ++--
- .../java/net/minecraft/server/NibbleArray.java     | 122 ++++++++++++++++++++-
- .../net/minecraft/server/Packet51MapChunk.java     |  28 +++--
- .../java/org/bukkit/craftbukkit/CraftChunk.java    |  44 +++++++-
+ .../net/minecraft/server/ChunkRegionLoader.java    |   10 +-
+ .../java/net/minecraft/server/ChunkSection.java    |   24 +++--
+ .../java/net/minecraft/server/NibbleArray.java     |  122 +++++++++++++++++++-
+ .../net/minecraft/server/Packet51MapChunk.java     |   28 +++--
+ .../java/org/bukkit/craftbukkit/CraftChunk.java    |   44 ++++++-
  5 files changed, 197 insertions(+), 31 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -313,7 +311,7 @@ index 14a6245..ee179be 100644
              }
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-index 79c3893..97b7b5b 100644
+index 79c3893..ad58bef 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 @@ -174,7 +174,18 @@ public class CraftChunk implements Chunk {
@@ -385,5 +383,5 @@ index 79c3893..97b7b5b 100644
          }
  
 -- 
-1.8.1-rc2
+1.7.0.4
 
diff --git a/CraftBukkit-Patches/0010-Add-OldChunkLoader-from-mc-dev-for-diff-visibility.patch b/CraftBukkit-Patches/0010-Add-OldChunkLoader-from-mc-dev-for-diff-visibility.patch
index 0ef8d71..de22bcb 100644
--- a/CraftBukkit-Patches/0010-Add-OldChunkLoader-from-mc-dev-for-diff-visibility.patch
+++ b/CraftBukkit-Patches/0010-Add-OldChunkLoader-from-mc-dev-for-diff-visibility.patch
@@ -1,11 +1,11 @@
-From d34c61c7f2471315cf6803636daaa3cd71f5cf0c Mon Sep 17 00:00:00 2001
+From 16e33c98d1d14e459ba90f75850bfebea6a9a260 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
 
 ---
- .../java/net/minecraft/server/OldChunkLoader.java  | 120 +++++++++++++++++++++
- 1 file changed, 120 insertions(+)
+ .../java/net/minecraft/server/OldChunkLoader.java  |  120 ++++++++++++++++++++
+ 1 files changed, 120 insertions(+), 0 deletions(-)
  create mode 100644 src/main/java/net/minecraft/server/OldChunkLoader.java
 
 diff --git a/src/main/java/net/minecraft/server/OldChunkLoader.java b/src/main/java/net/minecraft/server/OldChunkLoader.java
@@ -136,5 +136,5 @@ index 0000000..65b0b70
 +}
 \ No newline at end of file
 -- 
-1.8.1-rc2
+1.7.0.4
 
diff --git a/CraftBukkit-Patches/0011-Fix-mcRegion-to-Anvil-conversion.patch b/CraftBukkit-Patches/0011-Fix-mcRegion-to-Anvil-conversion.patch
index 8952cbd..b1665a1 100644
--- a/CraftBukkit-Patches/0011-Fix-mcRegion-to-Anvil-conversion.patch
+++ b/CraftBukkit-Patches/0011-Fix-mcRegion-to-Anvil-conversion.patch
@@ -1,11 +1,11 @@
-From e6c8fc17b4cf941744f97ff6e02f02d7b8eec95e Mon Sep 17 00:00:00 2001
+From c2ff125b200c05d07496af538552e7ff72bacbfa 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
 
 ---
- src/main/java/net/minecraft/server/OldChunkLoader.java | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
+ .../java/net/minecraft/server/OldChunkLoader.java  |    8 +++++---
+ 1 files 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
@@ -27,5 +27,5 @@ index 65b0b70..0b3bd0d 100644
              }
          }
 -- 
-1.8.1-rc2
+1.7.0.4
 
diff --git a/CraftBukkit-Patches/0012-Update-versioning-check-to-correctly-resolve-api-ver.patch b/CraftBukkit-Patches/0012-Update-versioning-check-to-correctly-resolve-api-ver.patch
index e81c228..dd07eaa 100644
--- a/CraftBukkit-Patches/0012-Update-versioning-check-to-correctly-resolve-api-ver.patch
+++ b/CraftBukkit-Patches/0012-Update-versioning-check-to-correctly-resolve-api-ver.patch
@@ -1,11 +1,11 @@
-From 35638957409ffd561484f2743949c9dcfad13b96 Mon Sep 17 00:00:00 2001
+From 54e97bc4f6af0326c9eaea5f88c52b86307d6b88 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.
 
 ---
- src/main/java/org/bukkit/craftbukkit/util/Versioning.java | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ .../org/bukkit/craftbukkit/util/Versioning.java    |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 index f905d17..9304637 100644
@@ -21,5 +21,5 @@ index f905d17..9304637 100644
  
          if (stream != null) {
 -- 
-1.8.1-rc2
+1.7.0.4
 
diff --git a/CraftBukkit-Patches/0013-Optimize-packet-used-to-unload-chunks-for-the-client.patch b/CraftBukkit-Patches/0013-Optimize-packet-used-to-unload-chunks-for-the-client.patch
index 6e89b51..af3996e 100644
--- a/CraftBukkit-Patches/0013-Optimize-packet-used-to-unload-chunks-for-the-client.patch
+++ b/CraftBukkit-Patches/0013-Optimize-packet-used-to-unload-chunks-for-the-client.patch
@@ -1,13 +1,13 @@
-From 94c486ec7cf0a346dbbfed0ab814bf73565d64d1 Mon Sep 17 00:00:00 2001
+From 4c1d324eeeb423731b0f9ba3e36aefe4e7a39de4 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
 
 At the moment telling a client to unload a chunk involves calling the entire chunk from memory, deflating it and then sending it through the pipes even though the client ignores it and based on the bitmap simply unloads the chunk, and to add the cherry on top, this is done on the main server thread.
 ---
- src/main/java/net/minecraft/server/Packet51MapChunk.java | 13 +++++++++++++
- src/main/java/net/minecraft/server/PlayerChunk.java      |  2 +-
- 2 files changed, 14 insertions(+), 1 deletion(-)
+ .../net/minecraft/server/Packet51MapChunk.java     |   13 +++++++++++++
+ .../java/net/minecraft/server/PlayerChunk.java     |    2 +-
+ 2 files changed, 14 insertions(+), 1 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Packet51MapChunk.java b/src/main/java/net/minecraft/server/Packet51MapChunk.java
 index ee179be..b51d90c 100644
@@ -52,5 +52,5 @@ index 10a43b6..20f8e8a 100644
              entityplayer.chunkCoordIntPairQueue.remove(this.location);
              if (this.b.isEmpty()) {
 -- 
-1.8.1-rc2
+1.7.0.4
 
diff --git a/CraftBukkit-Patches/0014-Skip-entity.move-if-we-are-not-moving-anywhere.patch b/CraftBukkit-Patches/0014-Skip-entity.move-if-we-are-not-moving-anywhere.patch
index ac06d9a..302fa2d 100644
--- a/CraftBukkit-Patches/0014-Skip-entity.move-if-we-are-not-moving-anywhere.patch
+++ b/CraftBukkit-Patches/0014-Skip-entity.move-if-we-are-not-moving-anywhere.patch
@@ -1,14 +1,14 @@
-From eab2bf649fc5e3e9fbefed28c560ad91cfe85e5d Mon Sep 17 00:00:00 2001
+From 17e2d92a3c6cf85d461ad1e19d06299653341f0e 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.
 
 ---
- src/main/java/net/minecraft/server/Entity.java | 1 +
- 1 file changed, 1 insertion(+)
+ src/main/java/net/minecraft/server/Entity.java |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 2e7cb43..fabe3ab 100644
+index 7890d6f..8e743ec 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -430,6 +430,7 @@ public abstract class Entity {
@@ -20,5 +20,5 @@ index 2e7cb43..fabe3ab 100644
              this.boundingBox.d(d0, d1, d2);
              this.locX = (this.boundingBox.a + this.boundingBox.d) / 2.0D;
 -- 
-1.8.1-rc2
+1.7.0.4
 
diff --git a/CraftBukkit-Patches/0015-Alternate-sync-free-but-safe-chunk-reference-cache.patch b/CraftBukkit-Patches/0015-Alternate-sync-free-but-safe-chunk-reference-cache.patch
index 6108e36..9b14068 100644
--- a/CraftBukkit-Patches/0015-Alternate-sync-free-but-safe-chunk-reference-cache.patch
+++ b/CraftBukkit-Patches/0015-Alternate-sync-free-but-safe-chunk-reference-cache.patch
@@ -1,14 +1,14 @@
-From 5058791bca4fb2b06a84d82dd5b55925675b4aa3 Mon Sep 17 00:00:00 2001
+From f56f2bd9dcc5ab48c6a3d662c8bed6556e58d820 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
 
 ---
- src/main/java/net/minecraft/server/World.java | 14 ++++++--------
- 1 file changed, 6 insertions(+), 8 deletions(-)
+ src/main/java/net/minecraft/server/World.java |   14 ++++++--------
+ 1 files changed, 6 insertions(+), 8 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 0c378e7..7862b43 100644
+index 5b8cee3..307171b 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -294,15 +294,13 @@ public abstract class World implements IBlockAccess {
@@ -34,5 +34,5 @@ index 0c378e7..7862b43 100644
      }
      // CraftBukkit end
 -- 
-1.8.1-rc2
+1.7.0.4
 
diff --git a/CraftBukkit-Patches/0016-Tick-loop-optimization-sleep-for-as-long-as-possible.patch b/CraftBukkit-Patches/0016-Tick-loop-optimization-sleep-for-as-long-as-possible.patch
index b4332fd..d6fd31a 100644
--- a/CraftBukkit-Patches/0016-Tick-loop-optimization-sleep-for-as-long-as-possible.patch
+++ b/CraftBukkit-Patches/0016-Tick-loop-optimization-sleep-for-as-long-as-possible.patch
@@ -1,12 +1,12 @@
-From 5cb573034b09dce4961f303547125845ce7f840d Mon Sep 17 00:00:00 2001
+From 53a67a707f0a466ec97a5892fd6440d221605d0d 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.
 
 ---
- .../java/net/minecraft/server/MinecraftServer.java | 50 +++++++++-------------
- src/main/java/org/bukkit/craftbukkit/Spigot.java   |  2 +
- .../craftbukkit/command/TicksPerSecondCommand.java | 35 +++++++++++++++
+ .../java/net/minecraft/server/MinecraftServer.java |   50 ++++++++------------
+ src/main/java/org/bukkit/craftbukkit/Spigot.java   |    2 +
+ .../craftbukkit/command/TicksPerSecondCommand.java |   35 ++++++++++++++
  3 files changed, 57 insertions(+), 30 deletions(-)
  create mode 100644 src/main/java/org/bukkit/craftbukkit/command/TicksPerSecondCommand.java
 
@@ -136,5 +136,5 @@ index 0000000..f114a31
 +    }
 +}
 -- 
-1.8.1-rc2
+1.7.0.4
 
diff --git a/CraftBukkit-Patches/0017-Improved-Timings-System.patch b/CraftBukkit-Patches/0017-Improved-Timings-System.patch
index b6230cc..b845376 100644
--- a/CraftBukkit-Patches/0017-Improved-Timings-System.patch
+++ b/CraftBukkit-Patches/0017-Improved-Timings-System.patch
@@ -1,21 +1,21 @@
-From 30d1e78cd481297d45e30e4ca6d772b08aaf44e3 Mon Sep 17 00:00:00 2001
+From f911a115312d4fe9347642dac63ba4714b3361fe 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
 
 Tracks nearly every point of minecraft internals and plugin events to give a good quick overview on what is causing TPS loss.
 ---
- .../net/minecraft/server/ChunkProviderServer.java  |   2 +
- src/main/java/net/minecraft/server/Entity.java     |   5 +
- .../java/net/minecraft/server/EntityLiving.java    |  10 ++
- .../java/net/minecraft/server/MinecraftServer.java |  17 +++-
- .../net/minecraft/server/PlayerConnection.java     |   5 +
- src/main/java/net/minecraft/server/TileEntity.java |   2 +
- src/main/java/net/minecraft/server/World.java      |  17 ++++
- .../java/net/minecraft/server/WorldServer.java     |   4 +
- .../java/org/bukkit/craftbukkit/SpigotTimings.java | 110 +++++++++++++++++++++
- .../bukkit/craftbukkit/scheduler/CraftTask.java    |  18 ++++
- 10 files changed, 189 insertions(+), 1 deletion(-)
+ .../net/minecraft/server/ChunkProviderServer.java  |    2 +
+ src/main/java/net/minecraft/server/Entity.java     |    5 +
+ .../java/net/minecraft/server/EntityLiving.java    |   10 ++
+ .../java/net/minecraft/server/MinecraftServer.java |   17 +++-
+ .../net/minecraft/server/PlayerConnection.java     |    5 +
+ src/main/java/net/minecraft/server/TileEntity.java |    2 +
+ src/main/java/net/minecraft/server/World.java      |   17 +++
+ .../java/net/minecraft/server/WorldServer.java     |    4 +
+ .../java/org/bukkit/craftbukkit/SpigotTimings.java |  110 ++++++++++++++++++++
+ .../bukkit/craftbukkit/scheduler/CraftTask.java    |   18 +++
+ 10 files changed, 189 insertions(+), 1 deletions(-)
  create mode 100644 src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -381,10 +381,10 @@ index 307171b..0afe88d 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 5a49b4d..e41dfba 100644
+index f63e364..0abfc35 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -169,9 +169,12 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
+@@ -186,9 +186,12 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
          // CraftBukkit start - Only call spawner if we have players online and the world allows for mobs or animals
          long time = this.worldData.getTime();
          if (this.getGameRules().getBoolean("doMobSpawning") && (this.allowMonsters || this.allowAnimals) && (this instanceof WorldServer && this.players.size() > 0)) {
@@ -397,7 +397,7 @@ index 5a49b4d..e41dfba 100644
          this.methodProfiler.c("chunkSource");
          this.chunkProvider.unloadChunks();
          int j = this.a(1.0F);
-@@ -197,6 +200,7 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
+@@ -214,6 +217,7 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
          this.Y();
  
          this.getWorld().processChunkGC(); // CraftBukkit
@@ -566,5 +566,5 @@ index 55db3ff..df134e3 100644
  
      long getPeriod() {
 -- 
-1.8.1-rc2
+1.7.0.4
 
diff --git a/CraftBukkit-Patches/0018-Add-oreobfuscator-for-Spigot.patch b/CraftBukkit-Patches/0018-Add-oreobfuscator-for-Spigot.patch
index e12d951..612b55c 100644
--- a/CraftBukkit-Patches/0018-Add-oreobfuscator-for-Spigot.patch
+++ b/CraftBukkit-Patches/0018-Add-oreobfuscator-for-Spigot.patch
@@ -1,20 +1,20 @@
-From 2f62fafb59381927864261a0c2b4cb4062cbddac Mon Sep 17 00:00:00 2001
+From 9696c811feedfc323045c56e77271795de9328c1 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.
 
 ---
- .../net/minecraft/server/EntityFallingBlock.java   |   1 +
- src/main/java/net/minecraft/server/Explosion.java  |   1 +
- .../net/minecraft/server/Packet51MapChunk.java     |   1 +
- .../net/minecraft/server/Packet56MapChunkBulk.java |  21 +++-
- .../minecraft/server/PlayerInteractManager.java    |   5 +
- .../java/org/bukkit/craftbukkit/CraftServer.java   |   7 ++
- .../java/org/bukkit/craftbukkit/CraftWorld.java    |   4 +
- src/main/java/org/bukkit/craftbukkit/Spigot.java   |   9 ++
- .../java/org/spigotmc/OrebfuscatorManager.java     | 139 +++++++++++++++++++++
- src/main/resources/configurations/bukkit.yml       |   7 ++
- 10 files changed, 194 insertions(+), 1 deletion(-)
+ .../net/minecraft/server/EntityFallingBlock.java   |    1 +
+ src/main/java/net/minecraft/server/Explosion.java  |    1 +
+ .../net/minecraft/server/Packet51MapChunk.java     |    1 +
+ .../net/minecraft/server/Packet56MapChunkBulk.java |   21 +++-
+ .../minecraft/server/PlayerInteractManager.java    |    5 +
+ .../java/org/bukkit/craftbukkit/CraftServer.java   |    7 +
+ .../java/org/bukkit/craftbukkit/CraftWorld.java    |    4 +
+ src/main/java/org/bukkit/craftbukkit/Spigot.java   |    9 ++
+ .../java/org/spigotmc/OrebfuscatorManager.java     |  139 ++++++++++++++++++++
+ src/main/resources/configurations/bukkit.yml       |    7 +
+ 10 files changed, 194 insertions(+), 1 deletions(-)
  create mode 100644 src/main/java/org/spigotmc/OrebfuscatorManager.java
 
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
@@ -350,5 +350,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.8.1-rc2
+1.7.0.4
 
diff --git a/CraftBukkit-Patches/0019-Reduce-number-of-LivingEntity-collision-checks.patch b/CraftBukkit-Patches/0019-Reduce-number-of-LivingEntity-collision-checks.patch
index be4fb1f..c32bdf1 100644
--- a/CraftBukkit-Patches/0019-Reduce-number-of-LivingEntity-collision-checks.patch
+++ b/CraftBukkit-Patches/0019-Reduce-number-of-LivingEntity-collision-checks.patch
@@ -1,11 +1,11 @@
-From e340336a4447585d29f26ed58e406e016722f471 Mon Sep 17 00:00:00 2001
+From a7074cb42a6e61500be1926ddf1af17e07f4986f 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.
 
 ---
- src/main/java/net/minecraft/server/EntityLiving.java | 8 ++++++++
- 1 file changed, 8 insertions(+)
+ .../java/net/minecraft/server/EntityLiving.java    |    8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
 index 14854ac..322e37f 100644
@@ -33,5 +33,5 @@ index 14854ac..322e37f 100644
                      this.o(entity);
                  }
 -- 
-1.8.1-rc2
+1.7.0.4
 
diff --git a/CraftBukkit-Patches/0020-Only-count-entities-in-chunks-being-processed-for-th.patch b/CraftBukkit-Patches/0020-Only-count-entities-in-chunks-being-processed-for-th.patch
index f772732..da8d71e 100644
--- a/CraftBukkit-Patches/0020-Only-count-entities-in-chunks-being-processed-for-th.patch
+++ b/CraftBukkit-Patches/0020-Only-count-entities-in-chunks-being-processed-for-th.patch
@@ -1,15 +1,14 @@
-From f4081e585e922e8a1aca85d344094e4d0e4c3639 Mon Sep 17 00:00:00 2001
+From af0142f3be262d3bbd6928557430c1a776fc7aae 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
- wave. Fixes mob spawn issues.
+Subject: [PATCH] Only count entities in chunks being processed for the spawn wave. Fixes mob spawn issues.
 
 ---
- .../java/net/minecraft/server/SpawnerCreature.java | 46 ++++++++++++++++++++--
- 1 file changed, 43 insertions(+), 3 deletions(-)
+ .../java/net/minecraft/server/SpawnerCreature.java |   46 ++++++++++++++++++-
+ 1 files changed, 43 insertions(+), 3 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index 2d1a372..de8f065 100644
+index b3e2818..6362a37 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -16,6 +16,7 @@ public final class SpawnerCreature {
@@ -105,5 +104,5 @@ index 2d1a372..de8f065 100644
                                                                      continue label110;
                                                                  }
 -- 
-1.8.1-rc2
+1.7.0.4
 
diff --git a/CraftBukkit-Patches/0021-Detect-remove-and-warn-about-null-tile-entities.patch b/CraftBukkit-Patches/0021-Detect-remove-and-warn-about-null-tile-entities.patch
index f1a1cc5..c001ba8 100644
--- a/CraftBukkit-Patches/0021-Detect-remove-and-warn-about-null-tile-entities.patch
+++ b/CraftBukkit-Patches/0021-Detect-remove-and-warn-about-null-tile-entities.patch
@@ -1,11 +1,11 @@
-From ba11a4120dd1864ccfd199f4c0e2d8a4cb5d3cc4 Mon Sep 17 00:00:00 2001
+From 90775f48e28029d31d9760dce09695840d25ea85 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.
 
 ---
- src/main/java/net/minecraft/server/World.java | 7 +++++++
- 1 file changed, 7 insertions(+)
+ src/main/java/net/minecraft/server/World.java |    7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
 index 0afe88d..c390e65 100644
@@ -26,5 +26,5 @@ index 0afe88d..c390e65 100644
              ChunkProviderServer chunkProviderServer = ((WorldServer) this).chunkProviderServer;
              if (chunkProviderServer.unloadQueue.contains(tileentity.x >> 4, tileentity.z >> 4)) {
 -- 
-1.8.1-rc2
+1.7.0.4
 
diff --git a/CraftBukkit-Patches/0022-Entity-Activation-Range.patch b/CraftBukkit-Patches/0022-Entity-Activation-Range.patch
index 3a87278..765e7fb 100644
--- a/CraftBukkit-Patches/0022-Entity-Activation-Range.patch
+++ b/CraftBukkit-Patches/0022-Entity-Activation-Range.patch
@@ -1,4 +1,4 @@
-From 5d7370768fa265d32405e2de1116047fd19a30b3 Mon Sep 17 00:00:00 2001
+From 09fc514b2c1ef37123c1a088f426d44835116d24 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
@@ -8,14 +8,14 @@ This feature gives 3 new configurable ranges that if an entity of the matching t
 This will drastically cut down on tick timings for entities that are not in range of a user to actually be "used".
 This change can have dramatic impact on gameplay if configured too low. Balance according to your servers desired gameplay.
 ---
- src/main/java/net/minecraft/server/Entity.java     |  13 +-
- .../java/net/minecraft/server/EntityArrow.java     |   2 +-
- src/main/java/net/minecraft/server/EntityItem.java |   5 +-
- src/main/java/net/minecraft/server/World.java      |  10 +-
- .../java/org/bukkit/craftbukkit/CraftWorld.java    |  15 ++
- src/main/java/org/bukkit/craftbukkit/Spigot.java   | 219 +++++++++++++++++++++
- .../java/org/bukkit/craftbukkit/SpigotTimings.java |   3 +
- src/main/resources/configurations/bukkit.yml       |   3 +
+ src/main/java/net/minecraft/server/Entity.java     |   13 +-
+ .../java/net/minecraft/server/EntityArrow.java     |    2 +-
+ src/main/java/net/minecraft/server/EntityItem.java |    5 +-
+ src/main/java/net/minecraft/server/World.java      |   10 +-
+ .../java/org/bukkit/craftbukkit/CraftWorld.java    |   15 ++
+ src/main/java/org/bukkit/craftbukkit/Spigot.java   |  219 ++++++++++++++++++++
+ .../java/org/bukkit/craftbukkit/SpigotTimings.java |    3 +
+ src/main/resources/configurations/bukkit.yml       |    3 +
  8 files changed, 264 insertions(+), 6 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
@@ -60,10 +60,10 @@ index 8feb1d3..482fecb 100644
          this.datawatcher.a(0, Byte.valueOf((byte) 0));
          this.datawatcher.a(1, Short.valueOf((short) 300));
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index 2c0f689..efda9a9 100644
+index f46c920..1699059 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
-@@ -16,7 +16,7 @@ public class EntityArrow extends Entity implements IProjectile {
+@@ -14,7 +14,7 @@ public class EntityArrow extends Entity implements IProjectile {
      private int f = -1;
      private int g = 0;
      private int h = 0;
@@ -441,5 +441,5 @@ index a63dc22..5822e41 100644
      world:
          growth-chunks-per-tick: 1000
 -- 
-1.8.1-rc2
+1.7.0.4
 
diff --git a/CraftBukkit-Patches/0023-Optimize-getTileEntities-performance.patch b/CraftBukkit-Patches/0023-Optimize-getTileEntities-performance.patch
index e24e149..940ba9e 100644
--- a/CraftBukkit-Patches/0023-Optimize-getTileEntities-performance.patch
+++ b/CraftBukkit-Patches/0023-Optimize-getTileEntities-performance.patch
@@ -1,18 +1,18 @@
-From 026e98083cbecbee32434f2fa4322469bee9f984 Mon Sep 17 00:00:00 2001
+From 2cb1eccff1aaf89feb841eddde109e2125f2003c 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
 
 Avoid traversing tile entities for every loaded chunk
 ---
- src/main/java/net/minecraft/server/WorldServer.java | 21 ++++++++++++---------
- 1 file changed, 12 insertions(+), 9 deletions(-)
+ .../java/net/minecraft/server/WorldServer.java     |   21 +++++++++++--------
+ 1 files changed, 12 insertions(+), 9 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index e41dfba..fd86899 100644
+index 0abfc35..615968f 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -658,17 +658,20 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
+@@ -675,17 +675,20 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
  
      public List getTileEntities(int i, int j, int k, int l, int i1, int j1) {
          ArrayList arraylist = new ArrayList();
@@ -43,5 +43,5 @@ index e41dfba..fd86899 100644
          return arraylist;
      }
 -- 
-1.8.1-rc2
+1.7.0.4
 
diff --git a/CraftBukkit-Patches/0024-Improved-tile-entity-lookup-for-chunk-sending.patch b/CraftBukkit-Patches/0024-Improved-tile-entity-lookup-for-chunk-sending.patch
index 98cd70c..ea85b1c 100644
--- a/CraftBukkit-Patches/0024-Improved-tile-entity-lookup-for-chunk-sending.patch
+++ b/CraftBukkit-Patches/0024-Improved-tile-entity-lookup-for-chunk-sending.patch
@@ -1,4 +1,4 @@
-From f58a44bb268cc0e7e34f09690f8e1d919ad3eb7d Mon Sep 17 00:00:00 2001
+From 1903fcd6f0963c98738afa51dc605e042653ebdf 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
@@ -6,8 +6,8 @@ Subject: [PATCH] Improved tile entity lookup for chunk sending
 Instead of scanning the entire worlds tile entities to find out what tile entities are in the chunk... just use the arraylist of tile entities we already have.
 This results in a good reduction of time spent in player ticking.
 ---
- src/main/java/net/minecraft/server/EntityPlayer.java | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
+ .../java/net/minecraft/server/EntityPlayer.java    |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
 index 14f2521..59c463c 100644
@@ -26,5 +26,5 @@ index 14f2521..59c463c 100644
              }
  
 -- 
-1.8.1-rc2
+1.7.0.4
 
diff --git a/CraftBukkit-Patches/0025-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch b/CraftBukkit-Patches/0025-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch
index cbc9a0f..ebc46a4 100644
--- a/CraftBukkit-Patches/0025-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch
+++ b/CraftBukkit-Patches/0025-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch
@@ -1,13 +1,12 @@
-From 4f393627b7062f1ce569fc1115135020921417b0 Mon Sep 17 00:00:00 2001
+From 1ed9c7ab2ad044fd4407719ac0e7c0d8b4f050ee 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
- Bukkit version.
+Subject: [PATCH] Metrics. Rewrite the Metrics system to be closer to the Bukkit version.
 
 ---
- src/main/java/org/bukkit/craftbukkit/Spigot.java |  18 +
- src/main/java/org/spigotmc/Metrics.java          | 645 +++++++++++++++++++++++
- 2 files changed, 663 insertions(+)
+ src/main/java/org/bukkit/craftbukkit/Spigot.java |   18 +
+ src/main/java/org/spigotmc/Metrics.java          |  645 ++++++++++++++++++++++
+ 2 files changed, 663 insertions(+), 0 deletions(-)
  create mode 100644 src/main/java/org/spigotmc/Metrics.java
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java
@@ -711,5 +710,5 @@ index 0000000..f1690a2
 +}
 \ No newline at end of file
 -- 
-1.8.1-rc2
+1.7.0.4
 
diff --git a/CraftBukkit-Patches/0026-Watchdog-Thread.patch b/CraftBukkit-Patches/0026-Watchdog-Thread.patch
index ed3ae09..c89e98e 100644
--- a/CraftBukkit-Patches/0026-Watchdog-Thread.patch
+++ b/CraftBukkit-Patches/0026-Watchdog-Thread.patch
@@ -1,14 +1,14 @@
-From f3e8dba9c5d88017a80d6d39bc79e22ef79cb364 Mon Sep 17 00:00:00 2001
+From 537ebc42f0bd36efe1a8c36983c5b645d65703e9 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.
 
 ---
- .../java/net/minecraft/server/MinecraftServer.java |   2 +
- src/main/java/org/bukkit/craftbukkit/Spigot.java   | 124 +++++++++++++++++----
- src/main/java/org/spigotmc/RestartCommand.java     |  23 ++++
- src/main/java/org/spigotmc/WatchdogThread.java     |  93 ++++++++++++++++
- src/main/resources/configurations/bukkit.yml       |   3 +
+ .../java/net/minecraft/server/MinecraftServer.java |    2 +
+ src/main/java/org/bukkit/craftbukkit/Spigot.java   |  124 ++++++++++++++++----
+ src/main/java/org/spigotmc/RestartCommand.java     |   23 ++++
+ src/main/java/org/spigotmc/WatchdogThread.java     |   93 +++++++++++++++
+ src/main/resources/configurations/bukkit.yml       |    3 +
  5 files changed, 223 insertions(+), 22 deletions(-)
  create mode 100644 src/main/java/org/spigotmc/RestartCommand.java
  create mode 100644 src/main/java/org/spigotmc/WatchdogThread.java
@@ -401,5 +401,5 @@ index 5822e41..a62ba24 100644
      default:
          growth-chunks-per-tick: 650
 -- 
-1.8.1-rc2
+1.7.0.4
 
diff --git a/CraftBukkit-Patches/0027-Netty.patch b/CraftBukkit-Patches/0027-Netty.patch
index 5d292b8..2cd7846 100644
--- a/CraftBukkit-Patches/0027-Netty.patch
+++ b/CraftBukkit-Patches/0027-Netty.patch
@@ -1,4 +1,4 @@
-From 02c3ccb6b9e24a0367962e7581015fc28fd5f053 Mon Sep 17 00:00:00 2001
+From 625a5680d0be28a1caa3bd65d02703a41f321a45 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
@@ -31,24 +31,24 @@ Subject: [PATCH] Netty
  slight reduction in latency. This commit is licensed under the Creative
  Commons Attribution-ShareAlike 3.0 Unported license.
 ---
- pom.xml                                            |   5 +
- .../java/net/minecraft/server/DedicatedServer.java |   8 +-
- .../java/net/minecraft/server/INetworkManager.java |  26 +++
- .../java/net/minecraft/server/NetworkManager.java  |   4 +-
- .../net/minecraft/server/Packet51MapChunk.java     |   2 +-
- .../net/minecraft/server/Packet56MapChunkBulk.java |   2 +-
- .../net/minecraft/server/PendingConnection.java    |  11 +-
- .../net/minecraft/server/ThreadCommandReader.java  |   1 +
- .../net/minecraft/server/ThreadLoginVerifier.java  |   1 +
- .../craftbukkit/scheduler/CraftScheduler.java      |   2 +-
- src/main/java/org/spigotmc/netty/CipherCodec.java  |  49 ++++
- .../org/spigotmc/netty/NettyNetworkManager.java    | 235 +++++++++++++++++++
- .../org/spigotmc/netty/NettyServerConnection.java  | 109 +++++++++
- .../org/spigotmc/netty/NettySocketAdaptor.java     | 248 +++++++++++++++++++++
- .../java/org/spigotmc/netty/PacketDecoder.java     |  64 ++++++
- .../java/org/spigotmc/netty/PacketEncoder.java     |  43 ++++
- .../java/org/spigotmc/netty/PacketListener.java    | 100 +++++++++
- src/main/java/org/spigotmc/netty/ReadState.java    |  16 ++
+ pom.xml                                            |    5 +
+ .../java/net/minecraft/server/DedicatedServer.java |    8 +-
+ .../java/net/minecraft/server/INetworkManager.java |   26 ++
+ .../java/net/minecraft/server/NetworkManager.java  |    4 +-
+ .../net/minecraft/server/Packet51MapChunk.java     |    2 +-
+ .../net/minecraft/server/Packet56MapChunkBulk.java |    2 +-
+ .../net/minecraft/server/PendingConnection.java    |   11 +-
+ .../net/minecraft/server/ThreadCommandReader.java  |    1 +
+ .../net/minecraft/server/ThreadLoginVerifier.java  |    1 +
+ .../craftbukkit/scheduler/CraftScheduler.java      |    2 +-
+ src/main/java/org/spigotmc/netty/CipherCodec.java  |   49 ++++
+ .../org/spigotmc/netty/NettyNetworkManager.java    |  235 +++++++++++++++++++
+ .../org/spigotmc/netty/NettyServerConnection.java  |  109 +++++++++
+ .../org/spigotmc/netty/NettySocketAdaptor.java     |  248 ++++++++++++++++++++
+ .../java/org/spigotmc/netty/PacketDecoder.java     |   64 +++++
+ .../java/org/spigotmc/netty/PacketEncoder.java     |   43 ++++
+ .../java/org/spigotmc/netty/PacketListener.java    |  100 ++++++++
+ src/main/java/org/spigotmc/netty/ReadState.java    |   16 ++
  18 files changed, 917 insertions(+), 9 deletions(-)
  create mode 100644 src/main/java/net/minecraft/server/INetworkManager.java
  create mode 100644 src/main/java/org/spigotmc/netty/CipherCodec.java
@@ -244,10 +244,10 @@ index c185f64..abe0b81 100644
          // CraftBukkit end
          this.pendingConnection = pendingconnection;
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 0a5c61a..35badf3 100644
+index 84dcfcc..a30f217 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-@@ -70,7 +70,7 @@ public class CraftScheduler implements BukkitScheduler {
+@@ -71,7 +71,7 @@ public class CraftScheduler implements BukkitScheduler {
       */
      private final ConcurrentHashMap<Integer, CraftTask> runners = new ConcurrentHashMap<Integer, CraftTask>();
      private volatile int currentTick = -1;
@@ -1169,5 +1169,5 @@ index 0000000..5dc3754
 +    DATA;
 +}
 -- 
-1.8.1-rc2
+1.7.0.4
 
diff --git a/CraftBukkit-Patches/0028-Enable-Improved-ping-sending.patch b/CraftBukkit-Patches/0028-Enable-Improved-ping-sending.patch
index e4709b1..a670ee4 100644
--- a/CraftBukkit-Patches/0028-Enable-Improved-ping-sending.patch
+++ b/CraftBukkit-Patches/0028-Enable-Improved-ping-sending.patch
@@ -1,13 +1,13 @@
-From e389b3a9ebc93fd9a79b82a1e30975a67b9dc4b6 Mon Sep 17 00:00:00 2001
+From bcce18e07928f79f874a5cf5dc200889bc0327cd 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
 
 ---
- src/main/java/net/minecraft/server/EntityPlayer.java |  1 +
- src/main/java/net/minecraft/server/PlayerList.java   | 16 ++++++++++++++++
- src/main/resources/configurations/bukkit.yml         |  1 +
- 3 files changed, 18 insertions(+)
+ .../java/net/minecraft/server/EntityPlayer.java    |    1 +
+ src/main/java/net/minecraft/server/PlayerList.java |   16 ++++++++++++++++
+ src/main/resources/configurations/bukkit.yml       |    1 +
+ 3 files changed, 18 insertions(+), 0 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
 index 59c463c..81ba038 100644
@@ -62,5 +62,5 @@ index a62ba24..8fa8c7a 100644
      restart-on-crash: false
      restart-script-location: /path/to/server/start.sh
 -- 
-1.8.1-rc2
+1.7.0.4
 
diff --git a/CraftBukkit-Patches/0029-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch b/CraftBukkit-Patches/0029-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch
index ad6b6b0..9feffaf 100644
--- a/CraftBukkit-Patches/0029-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch
+++ b/CraftBukkit-Patches/0029-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch
@@ -1,12 +1,11 @@
-From cb4fe4f906ec5807b92d0a4b2559e177fc5aa33d Mon Sep 17 00:00:00 2001
+From 768d209d592385a01bb859f00fa00322fb325020 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
- BUKKIT-3604
+Subject: [PATCH] Return bed location itself instead of next to bed; Fixes BUKKIT-3604
 
 ---
- .../org/bukkit/craftbukkit/entity/CraftPlayer.java | 22 ++++++++++++++++++++--
- 1 file changed, 20 insertions(+), 2 deletions(-)
+ .../org/bukkit/craftbukkit/entity/CraftPlayer.java |   22 ++++++++++++++++++-
+ 1 files changed, 20 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 index 0deb4df..8eb93c0 100644
@@ -44,5 +43,5 @@ index 0deb4df..8eb93c0 100644
          return null;
      }
 -- 
-1.8.1-rc2
+1.7.0.4
 
diff --git a/CraftBukkit-Patches/0030-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch b/CraftBukkit-Patches/0030-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch
index f008e46..652f263 100644
--- a/CraftBukkit-Patches/0030-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch
+++ b/CraftBukkit-Patches/0030-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch
@@ -1,12 +1,11 @@
-From d91a4eb8ba5fe0a504f7afda63495e7ef572b39f Mon Sep 17 00:00:00 2001
+From 6ed59638e19ee1a9234500789a38e74de0167d4e 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
- BUKKIT-3604
+Subject: [PATCH] Remove dependency on CraftPlayer.getBedSpawnLocation; Fixes BUKKIT-3604
 
 ---
- src/main/java/net/minecraft/server/PlayerList.java | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
+ src/main/java/net/minecraft/server/PlayerList.java |    9 ++++++++-
+ 1 files changed, 8 insertions(+), 1 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
 index d212080..126b177 100644
@@ -29,5 +28,5 @@ index d212080..126b177 100644
                      exit = exitWorld.getWorld().getSpawnLocation();
                  }
 -- 
-1.8.1-rc2
+1.7.0.4
 
diff --git a/CraftBukkit-Patches/0031-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch b/CraftBukkit-Patches/0031-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch
index f7ef9a1..5fc5066 100644
--- a/CraftBukkit-Patches/0031-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch
+++ b/CraftBukkit-Patches/0031-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch
@@ -1,12 +1,11 @@
-From ea2c851b4f7b59bf96ba3d2c3a5c9cd6a64eb374 Mon Sep 17 00:00:00 2001
+From d19f54095e6d64bbc7f0f9386c071118541f5f7e 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
- EntityHanging moves
+Subject: [PATCH] BUKKIT-3661, fixed missing HangingBreakEvent when EntityHanging moves
 
 ---
- src/main/java/net/minecraft/server/EntityHanging.java | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
+ .../java/net/minecraft/server/EntityHanging.java   |   15 +++++++++++++++
+ 1 files changed, 15 insertions(+), 0 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityHanging.java b/src/main/java/net/minecraft/server/EntityHanging.java
 index f697d85..1dfb02f 100644
@@ -35,5 +34,5 @@ index f697d85..1dfb02f 100644
              this.h();
          }
 -- 
-1.8.1-rc2
+1.7.0.4
 
diff --git a/CraftBukkit-Patches/0032-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch b/CraftBukkit-Patches/0032-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch
index bb3cb0c..0d28f73 100644
--- a/CraftBukkit-Patches/0032-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch
+++ b/CraftBukkit-Patches/0032-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch
@@ -1,11 +1,11 @@
-From f5248bf39f6e3b52bfcf6e820ac4129ab1cd2f78 Mon Sep 17 00:00:00 2001
+From 8683fb347217057606245806c92152829d9d6694 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
 
 ---
- src/main/java/net/minecraft/server/EntityPlayer.java | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ .../java/net/minecraft/server/EntityPlayer.java    |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
 index 81ba038..f5910a2 100644
@@ -21,5 +21,5 @@ index 81ba038..f5910a2 100644
          if (this.isSleeping()) {
              this.o().getTracker().sendPacketToEntity(this, new Packet18ArmAnimation(this, 3));
 -- 
-1.8.1-rc2
+1.7.0.4
 
diff --git a/CraftBukkit-Patches/0033-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch b/CraftBukkit-Patches/0033-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch
index ac523ef..908bdc5 100644
--- a/CraftBukkit-Patches/0033-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch
+++ b/CraftBukkit-Patches/0033-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch
@@ -1,12 +1,11 @@
-From fe1d0e9edcf6d93bbf376f8bb8c22cb653dec858 Mon Sep 17 00:00:00 2001
+From 8044a3fa502f0d94c47e6ece1e49c175c8f0ff0d 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
- filling empty bucket
+Subject: [PATCH] BUKKIT-3668 Fix wrong block in BlockDispenseEvent when filling empty bucket
 
 ---
- src/main/java/net/minecraft/server/DispenseBehaviorEmptyBucket.java | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ .../server/DispenseBehaviorEmptyBucket.java        |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/DispenseBehaviorEmptyBucket.java b/src/main/java/net/minecraft/server/DispenseBehaviorEmptyBucket.java
 index 8f7e09b..ae65526 100644
@@ -22,5 +21,5 @@ index 8f7e09b..ae65526 100644
  
          BlockDispenseEvent event = new BlockDispenseEvent(block, craftItem.clone(), new org.bukkit.util.Vector(0, 0, 0));
 -- 
-1.8.1-rc2
+1.7.0.4
 
diff --git a/CraftBukkit-Patches/0034-PlayerItemDamageEvent.patch b/CraftBukkit-Patches/0034-PlayerItemDamageEvent.patch
index a7f81ff..eb6fcb5 100644
--- a/CraftBukkit-Patches/0034-PlayerItemDamageEvent.patch
+++ b/CraftBukkit-Patches/0034-PlayerItemDamageEvent.patch
@@ -1,11 +1,11 @@
-From a015187204c0f42a84b06c1e52fa773289b34331 Mon Sep 17 00:00:00 2001
+From 54752e418a3c9ecd8f3408f94297ba76b3c9acbb 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
 
 ---
- src/main/java/net/minecraft/server/ItemStack.java | 19 +++++++++++++++++--
- 1 file changed, 17 insertions(+), 2 deletions(-)
+ src/main/java/net/minecraft/server/ItemStack.java |   19 +++++++++++++++++--
+ 1 files changed, 17 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
 index 7dc36a8..cd032ae 100644
@@ -53,5 +53,5 @@ index 7dc36a8..cd032ae 100644
                      if (entityliving instanceof EntityHuman) {
                          ((EntityHuman) entityliving).a(StatisticList.F[this.id], 1);
 -- 
-1.8.1-rc2
+1.7.0.4
 
diff --git a/CraftBukkit-Patches/0035-Faster-UUID-for-entities.patch b/CraftBukkit-Patches/0035-Faster-UUID-for-entities.patch
index a01170f..d361a62 100644
--- a/CraftBukkit-Patches/0035-Faster-UUID-for-entities.patch
+++ b/CraftBukkit-Patches/0035-Faster-UUID-for-entities.patch
@@ -1,12 +1,12 @@
-From 8f41e1d281463c438033bb26874dc50c9c660c82 Mon Sep 17 00:00:00 2001
+From fdee8c0ee2691d25a401bd66468577f9b2d51859 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
 
 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.
 ---
- src/main/java/net/minecraft/server/Entity.java | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ src/main/java/net/minecraft/server/Entity.java |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
 index 482fecb..52ecc09 100644
@@ -22,5 +22,5 @@ index 482fecb..52ecc09 100644
          this.world = world;
          this.setPosition(0.0D, 0.0D, 0.0D);
 -- 
-1.8.1-rc2
+1.7.0.4
 
diff --git a/CraftBukkit-Patches/0036-Prevent-NPE-in-CraftSign.patch b/CraftBukkit-Patches/0036-Prevent-NPE-in-CraftSign.patch
index b236550..552a12f 100644
--- a/CraftBukkit-Patches/0036-Prevent-NPE-in-CraftSign.patch
+++ b/CraftBukkit-Patches/0036-Prevent-NPE-in-CraftSign.patch
@@ -1,15 +1,15 @@
-From a7b8ea293d6a2ef96c39eac11a54113e7dd24288 Mon Sep 17 00:00:00 2001
+From 6a9329fd0687f6316cb92c898bf8ed4ed4b3550e 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
 
 This commit prevents the constructor of CraftSign throwing an NPE when it cannot get the sign tile entity. Instead it will fallback to a 4 empty lined sign, and not try to do anything to those lines on .update().
 ---
- src/main/java/org/bukkit/craftbukkit/block/CraftSign.java | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
+ .../org/bukkit/craftbukkit/block/CraftSign.java    |    8 +++++++-
+ 1 files changed, 7 insertions(+), 1 deletions(-)
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
-index 8e8a1c5..87af049 100644
+index 1647100..43c4434 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
 @@ -14,6 +14,12 @@ public class CraftSign extends CraftBlockState implements Sign {
@@ -26,8 +26,8 @@ index 8e8a1c5..87af049 100644
          System.arraycopy(sign.lines, 0, lines, 0, lines.length);
      }
 @@ -34,7 +40,7 @@ public class CraftSign extends CraftBlockState implements Sign {
-     public boolean update(boolean force) {
-         boolean result = super.update(force);
+     public boolean update(boolean force, boolean applyPhysics) {
+         boolean result = super.update(force, applyPhysics);
  
 -        if (result) {
 +        if (result && sign != null) { // Spigot, add null check
@@ -35,5 +35,5 @@ index 8e8a1c5..87af049 100644
                  if(lines[i] != null) {
                      sign.lines[i] = lines[i];
 -- 
-1.8.1-rc2
+1.7.0.4
 
diff --git a/CraftBukkit-Patches/0037-Stage-DataWatcher-WatchableObject.patch b/CraftBukkit-Patches/0037-Stage-DataWatcher-WatchableObject.patch
index 0f8215a..3a7f8b3 100644
--- a/CraftBukkit-Patches/0037-Stage-DataWatcher-WatchableObject.patch
+++ b/CraftBukkit-Patches/0037-Stage-DataWatcher-WatchableObject.patch
@@ -1,13 +1,13 @@
-From 8ab023dfa03c86b4b50d844243ba1b0cec58cd69 Mon Sep 17 00:00:00 2001
+From f8b44c25837c09e65290e4a609b351bd1ec4e36b 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.
 
 So that we may identify the exact cause of exceptions originating from these classes.
 ---
- .../java/net/minecraft/server/DataWatcher.java     | 287 +++++++++++++++++++++
- .../java/net/minecraft/server/WatchableObject.java |  44 ++++
- 2 files changed, 331 insertions(+)
+ .../java/net/minecraft/server/DataWatcher.java     |  287 ++++++++++++++++++++
+ .../java/net/minecraft/server/WatchableObject.java |   44 +++
+ 2 files changed, 331 insertions(+), 0 deletions(-)
  create mode 100644 src/main/java/net/minecraft/server/DataWatcher.java
  create mode 100644 src/main/java/net/minecraft/server/WatchableObject.java
 
@@ -355,5 +355,5 @@ index 0000000..678aa91
 +    }
 +}
 -- 
-1.8.1-rc2
+1.7.0.4
 
diff --git a/CraftBukkit-Patches/0038-Entity-Tracking-Ranges.patch b/CraftBukkit-Patches/0038-Entity-Tracking-Ranges.patch
index b5277ed..0931182 100644
--- a/CraftBukkit-Patches/0038-Entity-Tracking-Ranges.patch
+++ b/CraftBukkit-Patches/0038-Entity-Tracking-Ranges.patch
@@ -1,4 +1,4 @@
-From 971a01e5898c264e4112de9f66f53c3f77b6ed2a Mon Sep 17 00:00:00 2001
+From ff3fc702ba10ce96331bd0b3e50c582ad177936a 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
@@ -11,11 +11,11 @@ This has multiple benefits:
 3) Less lag in general - Less work for the server to do
 4) Less client lag - Not trying to render distant item frames and paintings and entities will reduce entity count on the client, which is major for shop/town worlds which may use tons of item frames.
 ---
- .../java/net/minecraft/server/EntityTracker.java   |  1 +
- .../java/org/bukkit/craftbukkit/CraftWorld.java    | 22 ++++++++++++++++++
- src/main/java/org/bukkit/craftbukkit/Spigot.java   | 26 ++++++++++++++++++++++
- src/main/resources/configurations/bukkit.yml       |  5 +++++
- 4 files changed, 54 insertions(+)
+ .../java/net/minecraft/server/EntityTracker.java   |    1 +
+ .../java/org/bukkit/craftbukkit/CraftWorld.java    |   22 ++++++++++++++++
+ src/main/java/org/bukkit/craftbukkit/Spigot.java   |   26 ++++++++++++++++++++
+ src/main/resources/configurations/bukkit.yml       |    5 ++++
+ 4 files changed, 54 insertions(+), 0 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
 index db62084..32ce51d 100644
@@ -135,5 +135,5 @@ index 8fa8c7a..35056d9 100644
      world:
          growth-chunks-per-tick: 1000
 -- 
-1.8.1-rc2
+1.7.0.4
 
diff --git a/CraftBukkit-Patches/0039-BungeeCord-Support.patch b/CraftBukkit-Patches/0039-BungeeCord-Support.patch
index 875c79b..4d9c340 100644
--- a/CraftBukkit-Patches/0039-BungeeCord-Support.patch
+++ b/CraftBukkit-Patches/0039-BungeeCord-Support.patch
@@ -1,14 +1,14 @@
-From 0919f10de72408b11f3c85ae790d510e5d20341a Mon Sep 17 00:00:00 2001
+From b2de83d4a03ce77384dee36545abce21108680df 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
 
 - Allows BungeeCord to set the players real IP address very early in the login process, so that the BungeeCord proxy IP is never even seen by a plugin.
 ---
- src/main/java/net/minecraft/server/PendingConnection.java | 13 +++++++++++++
- src/main/java/org/bukkit/craftbukkit/Spigot.java          |  2 ++
- src/main/resources/configurations/bukkit.yml              |  2 ++
- 3 files changed, 17 insertions(+)
+ .../net/minecraft/server/PendingConnection.java    |   13 +++++++++++++
+ src/main/java/org/bukkit/craftbukkit/Spigot.java   |    2 ++
+ src/main/resources/configurations/bukkit.yml       |    2 ++
+ 3 files changed, 17 insertions(+), 0 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/PendingConnection.java b/src/main/java/net/minecraft/server/PendingConnection.java
 index fcfc3d2..3448fc5 100644
@@ -33,7 +33,7 @@ index fcfc3d2..3448fc5 100644
 +    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java
-index 3bfd29b..bce217e 100644
+index e38f39c..49092c7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Spigot.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java
 @@ -23,6 +23,7 @@ public class Spigot {
@@ -66,5 +66,5 @@ index 35056d9..df8dfaa 100644
      default:
          growth-chunks-per-tick: 650
 -- 
-1.8.1-rc2
+1.7.0.4
 
diff --git a/CraftBukkit-Patches/0040-Texture-Pack-Resolutions.patch b/CraftBukkit-Patches/0040-Texture-Pack-Resolutions.patch
index 4cf9607..e6cdf32 100644
--- a/CraftBukkit-Patches/0040-Texture-Pack-Resolutions.patch
+++ b/CraftBukkit-Patches/0040-Texture-Pack-Resolutions.patch
@@ -1,14 +1,14 @@
-From bd682f09980ae91156c9f240bcaf0537d78ab207 Mon Sep 17 00:00:00 2001
+From c9c8a4745f0652ba8cd5e0f89e6ee90677036845 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
 
 Fix issues when specifiying a server texture pack URL with resolution != 16.
 ---
- src/main/java/net/minecraft/server/MinecraftServer.java      | 2 +-
- src/main/java/org/bukkit/craftbukkit/Spigot.java             | 2 ++
- src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java | 2 +-
- src/main/resources/configurations/bukkit.yml                 | 1 +
+ .../java/net/minecraft/server/MinecraftServer.java |    2 +-
+ src/main/java/org/bukkit/craftbukkit/Spigot.java   |    2 ++
+ .../org/bukkit/craftbukkit/entity/CraftPlayer.java |    2 +-
+ src/main/resources/configurations/bukkit.yml       |    1 +
  4 files changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -25,7 +25,7 @@ index 168394f..3b2d9d3 100644
  
      public abstract boolean T();
 diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java
-index bce217e..8fd635f 100644
+index 49092c7..121b5ba 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Spigot.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java
 @@ -24,6 +24,7 @@ public class Spigot {
@@ -70,5 +70,5 @@ index df8dfaa..bc0b044 100644
      default:
          growth-chunks-per-tick: 650
 -- 
-1.8.1-rc2
+1.7.0.4
 
diff --git a/CraftBukkit-Patches/0041-Entity-Tracking-Intervals.patch b/CraftBukkit-Patches/0041-Entity-Tracking-Intervals.patch
index 82fb56d..14c493d 100644
--- a/CraftBukkit-Patches/0041-Entity-Tracking-Intervals.patch
+++ b/CraftBukkit-Patches/0041-Entity-Tracking-Intervals.patch
@@ -1,12 +1,12 @@
-From 74a63a8ecb9e74b2143d1be51b97fae01c971a7b Mon Sep 17 00:00:00 2001
+From f91b8e80a9a261802238a0627a7ba13234b8280b 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
 
 Send boats at the same speed as their player to remove the illusion of lag / jerkiness.
 ---
- src/main/java/net/minecraft/server/EntityTracker.java | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ .../java/net/minecraft/server/EntityTracker.java   |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
 index 32ce51d..7cd2c26 100644
@@ -22,5 +22,5 @@ index 32ce51d..7cd2c26 100644
              this.addEntity(entity, 64, 3, true);
          } else if (entity instanceof EntityWither) {
 -- 
-1.8.1-rc2
+1.7.0.4
 
diff --git a/CraftBukkit-Patches/0042-Limit-Custom-Map-Rendering.patch b/CraftBukkit-Patches/0042-Limit-Custom-Map-Rendering.patch
index 7aedf0d..722b611 100644
--- a/CraftBukkit-Patches/0042-Limit-Custom-Map-Rendering.patch
+++ b/CraftBukkit-Patches/0042-Limit-Custom-Map-Rendering.patch
@@ -1,12 +1,12 @@
-From e7453e62d74d4fd71b90e1893ee1e815f24f920f Mon Sep 17 00:00:00 2001
+From 2d7011be015168fd80dfcedb011f92c2ddeb964e 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
 
 The default CraftBukkit render sequence for maps is ridiculously slow. By only using it when a custom renderer has been added (rarely in most cases), we can fallback to the Vanilla renderer for general usage. This leads to a much higher effiency overall, especially if no plugins are rendering such maps.
 ---
- .../net/minecraft/server/WorldMapHumanTracker.java | 24 ++++++++++++++--------
- .../org/bukkit/craftbukkit/map/CraftMapView.java   |  2 +-
+ .../net/minecraft/server/WorldMapHumanTracker.java |   24 ++++++++++++-------
+ .../org/bukkit/craftbukkit/map/CraftMapView.java   |    2 +-
  2 files changed, 16 insertions(+), 10 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/WorldMapHumanTracker.java b/src/main/java/net/minecraft/server/WorldMapHumanTracker.java
@@ -74,5 +74,5 @@ index b28d6a3..e70e4e4 100644
      protected final WorldMap worldMap;
  
 -- 
-1.8.1-rc2
+1.7.0.4
 
diff --git a/CraftBukkit-Patches/0043-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch b/CraftBukkit-Patches/0043-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch
new file mode 100644
index 0000000..7bf49c3
--- /dev/null
+++ b/CraftBukkit-Patches/0043-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch
@@ -0,0 +1,35 @@
+From 6a9fd668688a25eb082d7757d15e4f25ed2970a4 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 BUKKIT-3951"
+
+This reverts commit 052e955ed71a30516a5e9cfd76649daaba4ae7d8.
+---
+ .../craftbukkit/scheduler/CraftScheduler.java      |    4 ----
+ 1 files changed, 0 insertions(+), 4 deletions(-)
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
+index a30f217..35badf3 100644
+--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
++++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
+@@ -15,7 +15,6 @@ import java.util.concurrent.atomic.AtomicReference;
+ import java.util.logging.Level;
+ 
+ import org.apache.commons.lang.Validate;
+-import org.bukkit.plugin.IllegalPluginAccessException;
+ import org.bukkit.plugin.Plugin;
+ import org.bukkit.scheduler.BukkitScheduler;
+ import org.bukkit.scheduler.BukkitTask;
+@@ -390,9 +389,6 @@ public class CraftScheduler implements BukkitScheduler {
+     private static void validate(final Plugin plugin, final Object task) {
+         Validate.notNull(plugin, "Plugin cannot be null");
+         Validate.notNull(task, "Task cannot be null");
+-        if (!plugin.isEnabled()) {
+-            throw new IllegalPluginAccessException("Plugin attempted to register task while disabled");
+-        }
+     }
+ 
+     private int nextId() {
+-- 
+1.7.0.4
+