diff --git a/CraftBukkit-Patches/0009-Merge-tweaks-and-configuration.patch b/CraftBukkit-Patches/0008-Merge-tweaks-and-configuration.patch
similarity index 97%
rename from CraftBukkit-Patches/0009-Merge-tweaks-and-configuration.patch
rename to CraftBukkit-Patches/0008-Merge-tweaks-and-configuration.patch
index 5525af9a83..407804b917 100644
--- a/CraftBukkit-Patches/0009-Merge-tweaks-and-configuration.patch
+++ b/CraftBukkit-Patches/0008-Merge-tweaks-and-configuration.patch
@@ -1,4 +1,4 @@
-From af4f6f0e5a7e04567950f4f4f95572c7c96184ca Mon Sep 17 00:00:00 2001
+From 6117d1cfc54f4e894a7607003baa1c54cb3ba9bd 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
@@ -41,7 +41,7 @@ index bbcf674..08b9ac8 100644
              }
          } else {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 8b07d84..97b991b 100644
+index 53ab411..d90d5a4 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -934,6 +934,23 @@ public abstract class World implements IBlockAccess {
diff --git a/CraftBukkit-Patches/0008-More-Efficient-GetCubes.patch b/CraftBukkit-Patches/0008-More-Efficient-GetCubes.patch
deleted file mode 100644
index 9383f14a23..0000000000
--- a/CraftBukkit-Patches/0008-More-Efficient-GetCubes.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 7c6711b2f0781e7837623f639eaede10f38952a7 Mon Sep 17 00:00:00 2001
-From: md_5 <md_5@live.com.au>
-Date: Tue, 11 Jun 2013 12:17:37 +1000
-Subject: [PATCH] More Efficient GetCubes
-
-
-diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 53ab411..8b07d84 100644
---- a/src/main/java/net/minecraft/server/World.java
-+++ b/src/main/java/net/minecraft/server/World.java
-@@ -1022,23 +1022,42 @@ public abstract class World implements IBlockAccess {
-         int i1 = MathHelper.floor(axisalignedbb.c);
-         int j1 = MathHelper.floor(axisalignedbb.f + 1.0D);
- 
--        for (int k1 = i; k1 < j; ++k1) {
--            for (int l1 = i1; l1 < j1; ++l1) {
--                if (this.isLoaded(k1, 64, l1)) {
--                    for (int i2 = k - 1; i2 < l; ++i2) {
--                        Block block;
--
--                        if (k1 >= -30000000 && k1 < 30000000 && l1 >= -30000000 && l1 < 30000000) {
--                            block = this.getType(k1, i2, l1);
--                        } else {
--                            block = Blocks.STONE;
-+        // Spigot start
-+        int ystart = ( ( k - 1 ) < 0 ) ? 0 : ( k - 1 );
-+        for ( int chunkx = ( i >> 4 ); chunkx <= ( ( j - 1 ) >> 4 ); chunkx++ )
-+        {
-+            int cx = chunkx << 4;
-+            for ( int chunkz = ( i1 >> 4 ); chunkz <= ( ( j1 - 1 ) >> 4 ); chunkz++ )
-+            {
-+                if ( !this.isChunkLoaded( chunkx, chunkz ) )
-+                {
-+                    continue;
-+                }
-+                int cz = chunkz << 4;
-+                Chunk chunk = this.getChunkAt( chunkx, chunkz );
-+                // Compute ranges within chunk
-+                int xstart = ( i < cx ) ? cx : i;
-+                int xend = ( j < ( cx + 16 ) ) ? j : ( cx + 16 );
-+                int zstart = ( i1 < cz ) ? cz : i1;
-+                int zend = ( j1 < ( cz + 16 ) ) ? j1 : ( cz + 16 );
-+                // Loop through blocks within chunk
-+                for ( int x = xstart; x < xend; x++ )
-+                {
-+                    for ( int z = zstart; z < zend; z++ )
-+                    {
-+                        for ( int y = ystart; y < l; y++ )
-+                        {
-+                            Block block = chunk.getType(x - cx, y, z - cz );
-+                            if ( block != null )
-+                            {
-+                                block.a( this, x, y, z, axisalignedbb, this.M, entity );
-+                            }
-                         }
--
--                        block.a(this, k1, i2, l1, axisalignedbb, this.M, entity);
-                     }
-                 }
-             }
-         }
-+        // Spigot end
- 
-         double d0 = 0.25D;
-         List list = this.getEntities(entity, axisalignedbb.grow(d0, d0, d0));
--- 
-1.8.3.2
-
diff --git a/CraftBukkit-Patches/0010-LongHash-Tweaks.patch b/CraftBukkit-Patches/0009-LongHash-Tweaks.patch
similarity index 99%
rename from CraftBukkit-Patches/0010-LongHash-Tweaks.patch
rename to CraftBukkit-Patches/0009-LongHash-Tweaks.patch
index 03e105a6fb..d56b16f3a5 100644
--- a/CraftBukkit-Patches/0010-LongHash-Tweaks.patch
+++ b/CraftBukkit-Patches/0009-LongHash-Tweaks.patch
@@ -1,4 +1,4 @@
-From 78255c9512516c665d4f93bf0b984d479cf5b824 Mon Sep 17 00:00:00 2001
+From 47bd527ed32a447831c4fe2feeaf11e28f00e960 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 17:13:47 +1000
 Subject: [PATCH] LongHash Tweaks
diff --git a/CraftBukkit-Patches/0011-Async-Operation-Catching.patch b/CraftBukkit-Patches/0010-Async-Operation-Catching.patch
similarity index 96%
rename from CraftBukkit-Patches/0011-Async-Operation-Catching.patch
rename to CraftBukkit-Patches/0010-Async-Operation-Catching.patch
index 7ce9b30e91..79ab4f5992 100644
--- a/CraftBukkit-Patches/0011-Async-Operation-Catching.patch
+++ b/CraftBukkit-Patches/0010-Async-Operation-Catching.patch
@@ -1,4 +1,4 @@
-From 0f5ec7aa26d818aa3a78f920c75ecf28c4e6b7b5 Mon Sep 17 00:00:00 2001
+From ced3cd552e738dec0752a8355dad90b30a73e986 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
@@ -66,7 +66,7 @@ index 9f818cf..8052ea6 100644
              this.trackedPlayers.remove(entityplayer);
              entityplayer.removeQueue.add(Integer.valueOf(this.tracker.getId()));
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 97b991b..aca2455 100644
+index d90d5a4..1381660 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -903,6 +903,7 @@ public abstract class World implements IBlockAccess {
@@ -85,7 +85,7 @@ index 97b991b..aca2455 100644
          entity.die();
          if (entity instanceof EntityHuman) {
              this.players.remove(entity);
-@@ -2397,6 +2399,7 @@ public abstract class World implements IBlockAccess {
+@@ -2378,6 +2380,7 @@ public abstract class World implements IBlockAccess {
      }
  
      public void a(List list) {
@@ -94,7 +94,7 @@ index 97b991b..aca2455 100644
          // this.entityList.addAll(list);
          Entity entity = null;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 5938b37..0f21e89 100644
+index c16413a..468a4e1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -159,6 +159,7 @@ public class CraftWorld implements World {
@@ -122,7 +122,7 @@ index 5938b37..0f21e89 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 9add7bf..0b8b324 100644
+index 83f51ab..ef74879 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -230,6 +230,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/CraftBukkit-Patches/0012-View-Distance.patch b/CraftBukkit-Patches/0011-View-Distance.patch
similarity index 97%
rename from CraftBukkit-Patches/0012-View-Distance.patch
rename to CraftBukkit-Patches/0011-View-Distance.patch
index 26c2027843..facbb20e18 100644
--- a/CraftBukkit-Patches/0012-View-Distance.patch
+++ b/CraftBukkit-Patches/0011-View-Distance.patch
@@ -1,4 +1,4 @@
-From a6ea8e41020b8091fcb339406511328536f7ea51 Mon Sep 17 00:00:00 2001
+From 4ddb7d7d8e92f0f4a333d80a3e3ced37b409bb4b 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/0013-Compressed-Nibble-Arrays.patch b/CraftBukkit-Patches/0012-Compressed-Nibble-Arrays.patch
similarity index 99%
rename from CraftBukkit-Patches/0013-Compressed-Nibble-Arrays.patch
rename to CraftBukkit-Patches/0012-Compressed-Nibble-Arrays.patch
index 7ea7cb9fcc..ba822d04a4 100644
--- a/CraftBukkit-Patches/0013-Compressed-Nibble-Arrays.patch
+++ b/CraftBukkit-Patches/0012-Compressed-Nibble-Arrays.patch
@@ -1,4 +1,4 @@
-From cb6a4e3598f76edb4743ae4041a135b7913793bc Mon Sep 17 00:00:00 2001
+From 4017c1c6dcc7eff0b93bec0de5f21279ebc29471 Mon Sep 17 00:00:00 2001
 From: Mike Primm <mike@primmhome.com>
 Date: Sun, 13 Jan 2013 03:49:07 -0800
 Subject: [PATCH] Compressed Nibble Arrays
diff --git a/CraftBukkit-Patches/0014-Sync-Free-Chunk-Reference-Cache.patch b/CraftBukkit-Patches/0013-Sync-Free-Chunk-Reference-Cache.patch
similarity index 94%
rename from CraftBukkit-Patches/0014-Sync-Free-Chunk-Reference-Cache.patch
rename to CraftBukkit-Patches/0013-Sync-Free-Chunk-Reference-Cache.patch
index a1a1095303..9bbd69c108 100644
--- a/CraftBukkit-Patches/0014-Sync-Free-Chunk-Reference-Cache.patch
+++ b/CraftBukkit-Patches/0013-Sync-Free-Chunk-Reference-Cache.patch
@@ -1,11 +1,11 @@
-From 90c7728aa37e43c8710c2821790405763d9bd92e Mon Sep 17 00:00:00 2001
+From 78a32c982fa003401ef5b2bd3c0746786d6dec3b Mon Sep 17 00:00:00 2001
 From: Mike Primm <mike@primmhome.com>
 Date: Wed, 16 Jan 2013 15:27:22 -0600
 Subject: [PATCH] Sync Free Chunk Reference Cache
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index aca2455..e580460 100644
+index 1381660..00c2a18 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -292,20 +292,18 @@ public abstract class World implements IBlockAccess {
diff --git a/CraftBukkit-Patches/0015-Highly-Optimized-Tick-Loop.patch b/CraftBukkit-Patches/0014-Highly-Optimized-Tick-Loop.patch
similarity index 98%
rename from CraftBukkit-Patches/0015-Highly-Optimized-Tick-Loop.patch
rename to CraftBukkit-Patches/0014-Highly-Optimized-Tick-Loop.patch
index d895a973f4..a47a6c2a98 100644
--- a/CraftBukkit-Patches/0015-Highly-Optimized-Tick-Loop.patch
+++ b/CraftBukkit-Patches/0014-Highly-Optimized-Tick-Loop.patch
@@ -1,11 +1,11 @@
-From afcc9e6c55d58da7b8234625b6257c8edcf78bc6 Mon Sep 17 00:00:00 2001
+From 00045f375cae8ca1e74ef10254c6827b095ecdb3 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 3 Feb 2013 12:28:17 +1100
 Subject: [PATCH] Highly Optimized Tick Loop
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c78e47b..ce2aaf4 100644
+index 6a01982..0966b4b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -101,6 +101,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
diff --git a/CraftBukkit-Patches/0016-Improved-Timings-System.patch b/CraftBukkit-Patches/0015-Improved-Timings-System.patch
similarity index 97%
rename from CraftBukkit-Patches/0016-Improved-Timings-System.patch
rename to CraftBukkit-Patches/0015-Improved-Timings-System.patch
index d4a3742de3..78630056c7 100644
--- a/CraftBukkit-Patches/0016-Improved-Timings-System.patch
+++ b/CraftBukkit-Patches/0015-Improved-Timings-System.patch
@@ -1,4 +1,4 @@
-From a8b402c382f45af96c4cb9be1c4679f8275ce338 Mon Sep 17 00:00:00 2001
+From 67aa884a8f52483111b5a4e2c3327d4163750602 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
@@ -198,7 +198,7 @@ index 811f1a4..3de32fe 100644
      private static Map i = new HashMap();
      private static Map j = new HashMap();
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index e580460..5cfcc6c 100644
+index 00c2a18..f1bf467 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -14,6 +14,7 @@ import java.util.concurrent.Callable;
@@ -226,7 +226,7 @@ index e580460..5cfcc6c 100644
      }
  
      protected abstract IChunkProvider j();
-@@ -1249,6 +1253,7 @@ public abstract class World implements IBlockAccess {
+@@ -1230,6 +1234,7 @@ public abstract class World implements IBlockAccess {
          this.f.clear();
          this.methodProfiler.c("regular");
  
@@ -234,7 +234,7 @@ index e580460..5cfcc6c 100644
          for (i = 0; i < this.entityList.size(); ++i) {
              entity = (Entity) this.entityList.get(i);
  
-@@ -1271,7 +1276,9 @@ public abstract class World implements IBlockAccess {
+@@ -1252,7 +1257,9 @@ public abstract class World implements IBlockAccess {
              this.methodProfiler.a("tick");
              if (!entity.dead) {
                  try {
@@ -244,7 +244,7 @@ index e580460..5cfcc6c 100644
                  } catch (Throwable throwable1) {
                      crashreport = CrashReport.a(throwable1, "Ticking entity");
                      crashreportsystemdetails = crashreport.a("Entity being ticked");
-@@ -1296,7 +1303,9 @@ public abstract class World implements IBlockAccess {
+@@ -1277,7 +1284,9 @@ public abstract class World implements IBlockAccess {
              this.methodProfiler.b();
          }
  
@@ -254,7 +254,7 @@ index e580460..5cfcc6c 100644
          this.N = true;
          Iterator iterator = this.tileEntityList.iterator();
  
-@@ -1311,8 +1320,11 @@ public abstract class World implements IBlockAccess {
+@@ -1292,8 +1301,11 @@ public abstract class World implements IBlockAccess {
  
              if (!tileentity.r() && tileentity.o() && this.isLoaded(tileentity.x, tileentity.y, tileentity.z)) {
                  try {
@@ -266,7 +266,7 @@ index e580460..5cfcc6c 100644
                      crashreport = CrashReport.a(throwable2, "Ticking block entity");
                      crashreportsystemdetails = crashreport.a("Block entity being ticked");
                      tileentity.a(crashreportsystemdetails);
-@@ -1332,6 +1344,8 @@ public abstract class World implements IBlockAccess {
+@@ -1313,6 +1325,8 @@ public abstract class World implements IBlockAccess {
              }
          }
  
@@ -275,7 +275,7 @@ index e580460..5cfcc6c 100644
          this.N = false;
          if (!this.b.isEmpty()) {
              this.tileEntityList.removeAll(this.b);
-@@ -1370,6 +1384,7 @@ public abstract class World implements IBlockAccess {
+@@ -1351,6 +1365,7 @@ public abstract class World implements IBlockAccess {
              this.a.clear();
          }
  
@@ -283,7 +283,7 @@ index e580460..5cfcc6c 100644
          this.methodProfiler.b();
          this.methodProfiler.b();
      }
-@@ -1392,6 +1407,7 @@ public abstract class World implements IBlockAccess {
+@@ -1373,6 +1388,7 @@ public abstract class World implements IBlockAccess {
          byte b0 = 32;
  
          if (!flag || this.b(i - b0, 0, j - b0, i + b0, 0, j + b0)) {
@@ -291,7 +291,7 @@ index e580460..5cfcc6c 100644
              entity.T = entity.locX;
              entity.U = entity.locY;
              entity.V = entity.locZ;
-@@ -1453,6 +1469,7 @@ public abstract class World implements IBlockAccess {
+@@ -1434,6 +1450,7 @@ public abstract class World implements IBlockAccess {
                      entity.passenger = null;
                  }
              }
diff --git a/CraftBukkit-Patches/0017-Fix-Mob-Spawning-Relative-to-View-Distance.patch b/CraftBukkit-Patches/0016-Fix-Mob-Spawning-Relative-to-View-Distance.patch
similarity index 99%
rename from CraftBukkit-Patches/0017-Fix-Mob-Spawning-Relative-to-View-Distance.patch
rename to CraftBukkit-Patches/0016-Fix-Mob-Spawning-Relative-to-View-Distance.patch
index 6eeaccc130..8bcc1eba74 100644
--- a/CraftBukkit-Patches/0017-Fix-Mob-Spawning-Relative-to-View-Distance.patch
+++ b/CraftBukkit-Patches/0016-Fix-Mob-Spawning-Relative-to-View-Distance.patch
@@ -1,4 +1,4 @@
-From a50a9504115d90dfa6ea3de353605b725356e219 Mon Sep 17 00:00:00 2001
+From 77f77b800a6ffb71e6cf952e2f114b17c3e562f4 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 17:29:54 +1000
 Subject: [PATCH] Fix Mob Spawning Relative to View Distance
diff --git a/CraftBukkit-Patches/0018-Handle-Null-Tile-Entities.patch b/CraftBukkit-Patches/0017-Handle-Null-Tile-Entities.patch
similarity index 86%
rename from CraftBukkit-Patches/0018-Handle-Null-Tile-Entities.patch
rename to CraftBukkit-Patches/0017-Handle-Null-Tile-Entities.patch
index a3badea0d8..664a5d2746 100644
--- a/CraftBukkit-Patches/0018-Handle-Null-Tile-Entities.patch
+++ b/CraftBukkit-Patches/0017-Handle-Null-Tile-Entities.patch
@@ -1,14 +1,14 @@
-From de5e98722f7b1da2c59104c7e729b1d0167cf8d2 Mon Sep 17 00:00:00 2001
+From a40b31d7074454fdd9e176af05cc760906b7b264 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 3 Feb 2013 09:20:19 +1100
 Subject: [PATCH] Handle Null Tile Entities
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 5cfcc6c..59122b3 100644
+index f1bf467..5a368a0 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1311,6 +1311,13 @@ public abstract class World implements IBlockAccess {
+@@ -1292,6 +1292,13 @@ public abstract class World implements IBlockAccess {
  
          while (iterator.hasNext()) {
              TileEntity tileentity = (TileEntity) iterator.next();
diff --git a/CraftBukkit-Patches/0019-Entity-Activation-Range.patch b/CraftBukkit-Patches/0018-Entity-Activation-Range.patch
similarity index 98%
rename from CraftBukkit-Patches/0019-Entity-Activation-Range.patch
rename to CraftBukkit-Patches/0018-Entity-Activation-Range.patch
index 912d88d697..e2a30de123 100644
--- a/CraftBukkit-Patches/0019-Entity-Activation-Range.patch
+++ b/CraftBukkit-Patches/0018-Entity-Activation-Range.patch
@@ -1,4 +1,4 @@
-From d3d107b5eb4aeba6af1c9a12ecf4c1e9555bc345 Mon Sep 17 00:00:00 2001
+From f703353afd10357543bc579d91070a3e92496aea 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
@@ -9,7 +9,7 @@ This will drastically cut down on tick timings for entities that are not in rang
 This change can have dramatic impact on gameplay if configured too low. Balance according to your servers desired gameplay.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 0c1350e..4d573e6 100644
+index 3d6aeff..3e3d935 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -88,7 +88,7 @@ public abstract class Entity {
@@ -98,7 +98,7 @@ index 4b3e5dd..3fd3de9 100644
      public int shake;
      public Entity shooter;
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 75b1ec1..a61001d 100644
+index 7211da8..d06ec7b 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -78,6 +78,13 @@ public abstract class EntityLiving extends Entity {
@@ -116,10 +116,10 @@ index 75b1ec1..a61001d 100644
      public EntityLiving(World world) {
          super(world);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 59122b3..5b201af 100644
+index 5a368a0..2cc9005 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1253,6 +1253,7 @@ public abstract class World implements IBlockAccess {
+@@ -1234,6 +1234,7 @@ public abstract class World implements IBlockAccess {
          this.f.clear();
          this.methodProfiler.c("regular");
  
@@ -127,7 +127,7 @@ index 59122b3..5b201af 100644
          timings.entityTick.startTiming(); // Spigot
          for (i = 0; i < this.entityList.size(); ++i) {
              entity = (Entity) this.entityList.get(i);
-@@ -1413,7 +1414,11 @@ public abstract class World implements IBlockAccess {
+@@ -1394,7 +1395,11 @@ public abstract class World implements IBlockAccess {
          int j = MathHelper.floor(entity.locZ);
          byte b0 = 32;
  
diff --git a/CraftBukkit-Patches/0020-Metrics.patch b/CraftBukkit-Patches/0019-Metrics.patch
similarity index 99%
rename from CraftBukkit-Patches/0020-Metrics.patch
rename to CraftBukkit-Patches/0019-Metrics.patch
index bca53cd8cc..f2acdce9c3 100644
--- a/CraftBukkit-Patches/0020-Metrics.patch
+++ b/CraftBukkit-Patches/0019-Metrics.patch
@@ -1,4 +1,4 @@
-From 49a2a0e5778e2a7cf9a8758b87ea42a23e6a20e1 Mon Sep 17 00:00:00 2001
+From 0c0ad717ccf5b2eadcd450fcd8b88011bec309a3 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
@@ -657,7 +657,7 @@ index 0000000..f1690a2
 +}
 \ No newline at end of file
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index a4f47f5..31e708c 100644
+index 1b0e1bf..0043690 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -36,6 +36,7 @@ public class SpigotConfig
diff --git a/CraftBukkit-Patches/0021-PlayerItemDamageEvent.patch b/CraftBukkit-Patches/0020-PlayerItemDamageEvent.patch
similarity index 97%
rename from CraftBukkit-Patches/0021-PlayerItemDamageEvent.patch
rename to CraftBukkit-Patches/0020-PlayerItemDamageEvent.patch
index a8205c7bd3..cc0371f981 100644
--- a/CraftBukkit-Patches/0021-PlayerItemDamageEvent.patch
+++ b/CraftBukkit-Patches/0020-PlayerItemDamageEvent.patch
@@ -1,4 +1,4 @@
-From 798537c091b6cf69a3d872445d1ec08327214179 Mon Sep 17 00:00:00 2001
+From c530ebb6e1c7bd61e041cfd3ecc5f40382603bcb 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/0022-Faster-UUID-for-entities.patch b/CraftBukkit-Patches/0021-Faster-UUID-for-entities.patch
similarity index 91%
rename from CraftBukkit-Patches/0022-Faster-UUID-for-entities.patch
rename to CraftBukkit-Patches/0021-Faster-UUID-for-entities.patch
index b8d6082481..65495c942a 100644
--- a/CraftBukkit-Patches/0022-Faster-UUID-for-entities.patch
+++ b/CraftBukkit-Patches/0021-Faster-UUID-for-entities.patch
@@ -1,4 +1,4 @@
-From 2a4096821e7e43cfc9eae481b34d56abd1738c05 Mon Sep 17 00:00:00 2001
+From 02758d5711800b769860b2c9a759216b93e99ed3 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 17 Mar 2013 19:02:50 +1100
 Subject: [PATCH] Faster UUID for entities
@@ -6,7 +6,7 @@ Subject: [PATCH] Faster UUID for entities
 It is overkill to create a new SecureRandom on each entity create and then use it to make a new Entity ID for every entity instance created. Instead we will just use a pseudo random UUID based off the random instance we already have.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 4d573e6..6ccba9f 100644
+index 3e3d935..a3a8750 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -138,7 +138,7 @@ public abstract class Entity {
diff --git a/CraftBukkit-Patches/0023-Prevent-NPE-in-CraftSign.patch b/CraftBukkit-Patches/0022-Prevent-NPE-in-CraftSign.patch
similarity index 96%
rename from CraftBukkit-Patches/0023-Prevent-NPE-in-CraftSign.patch
rename to CraftBukkit-Patches/0022-Prevent-NPE-in-CraftSign.patch
index 0ec5570c7e..76e7913ccd 100644
--- a/CraftBukkit-Patches/0023-Prevent-NPE-in-CraftSign.patch
+++ b/CraftBukkit-Patches/0022-Prevent-NPE-in-CraftSign.patch
@@ -1,4 +1,4 @@
-From fbffdd786e69da9fa784b0a7a5f17ef9cdad9364 Mon Sep 17 00:00:00 2001
+From 88c06061a50cc78e4ae257cbf9c720fc574c639d 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/0024-Entity-Tracking-Ranges.patch b/CraftBukkit-Patches/0023-Entity-Tracking-Ranges.patch
similarity index 98%
rename from CraftBukkit-Patches/0024-Entity-Tracking-Ranges.patch
rename to CraftBukkit-Patches/0023-Entity-Tracking-Ranges.patch
index 23553657ca..f11ce7434b 100644
--- a/CraftBukkit-Patches/0024-Entity-Tracking-Ranges.patch
+++ b/CraftBukkit-Patches/0023-Entity-Tracking-Ranges.patch
@@ -1,4 +1,4 @@
-From d0d3a306c90d16d0823144156cb439690acd8f6b Mon Sep 17 00:00:00 2001
+From 723a29a9f8ab6121ab7a9059b67155bc10104131 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/0025-Limit-Custom-Map-Rendering.patch b/CraftBukkit-Patches/0024-Limit-Custom-Map-Rendering.patch
similarity index 98%
rename from CraftBukkit-Patches/0025-Limit-Custom-Map-Rendering.patch
rename to CraftBukkit-Patches/0024-Limit-Custom-Map-Rendering.patch
index 60980c565d..8305548dc1 100644
--- a/CraftBukkit-Patches/0025-Limit-Custom-Map-Rendering.patch
+++ b/CraftBukkit-Patches/0024-Limit-Custom-Map-Rendering.patch
@@ -1,4 +1,4 @@
-From 8eca8e635aa5c86ab619ac974fac6fbcb004e348 Mon Sep 17 00:00:00 2001
+From aa591c34dadb378e4318e196c9db52d9bfaa077a 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/0026-Enable-Improved-Ping-Sending.patch b/CraftBukkit-Patches/0025-Enable-Improved-Ping-Sending.patch
similarity index 95%
rename from CraftBukkit-Patches/0026-Enable-Improved-Ping-Sending.patch
rename to CraftBukkit-Patches/0025-Enable-Improved-Ping-Sending.patch
index 757067a3a6..9ee2100c2f 100644
--- a/CraftBukkit-Patches/0026-Enable-Improved-Ping-Sending.patch
+++ b/CraftBukkit-Patches/0025-Enable-Improved-Ping-Sending.patch
@@ -1,11 +1,11 @@
-From c653a8aa3f0502140e17e409a2c2846f3209da79 Mon Sep 17 00:00:00 2001
+From 508dce05202b02816679fb912f33df0a93a9ae41 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 24 Feb 2013 20:45:20 +1100
 Subject: [PATCH] Enable Improved Ping Sending
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 42fa9e0..af08d2f 100644
+index 1dee8b2..4945955 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -62,6 +62,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/CraftBukkit-Patches/0027-Thread-Naming-and-Tweaks.patch b/CraftBukkit-Patches/0026-Thread-Naming-and-Tweaks.patch
similarity index 95%
rename from CraftBukkit-Patches/0027-Thread-Naming-and-Tweaks.patch
rename to CraftBukkit-Patches/0026-Thread-Naming-and-Tweaks.patch
index 994fba865f..898e9c45c3 100644
--- a/CraftBukkit-Patches/0027-Thread-Naming-and-Tweaks.patch
+++ b/CraftBukkit-Patches/0026-Thread-Naming-and-Tweaks.patch
@@ -1,4 +1,4 @@
-From 0dfc9d0708a3ced454a6c6ee303187cd8bb28319 Mon Sep 17 00:00:00 2001
+From bef5189452713a09993d5ab2bdafc97964e51e8e Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 23 Apr 2013 11:50:27 +1000
 Subject: [PATCH] Thread Naming and Tweaks
diff --git a/CraftBukkit-Patches/0028-Close-Unloaded-Save-Files.patch b/CraftBukkit-Patches/0027-Close-Unloaded-Save-Files.patch
similarity index 96%
rename from CraftBukkit-Patches/0028-Close-Unloaded-Save-Files.patch
rename to CraftBukkit-Patches/0027-Close-Unloaded-Save-Files.patch
index e81276c86a..29c9dee27e 100644
--- a/CraftBukkit-Patches/0028-Close-Unloaded-Save-Files.patch
+++ b/CraftBukkit-Patches/0027-Close-Unloaded-Save-Files.patch
@@ -1,4 +1,4 @@
-From 8dec60c77bd9ad594db0d39064694e622bb533ac Mon Sep 17 00:00:00 2001
+From ee8de91603d37f6cfb9df50c1bdc025ed8aac3d3 Mon Sep 17 00:00:00 2001
 From: Antony Riley <antony@cyberiantiger.org>
 Date: Wed, 27 Mar 2013 01:41:54 +0200
 Subject: [PATCH] Close Unloaded Save Files
@@ -18,7 +18,7 @@ index 900ed68..829f4a3 100644
      public static synchronized RegionFile a(File file1, int i, int j) {
          File file2 = new File(file1, "region");
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 93e1782..13c1bbe 100644
+index 244c727..0ab3255 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -41,6 +41,8 @@ import net.minecraft.server.MinecraftServer;
diff --git a/CraftBukkit-Patches/0029-Remove-o-Option.patch b/CraftBukkit-Patches/0028-Remove-o-Option.patch
similarity index 92%
rename from CraftBukkit-Patches/0029-Remove-o-Option.patch
rename to CraftBukkit-Patches/0028-Remove-o-Option.patch
index 24f67e3492..472187fc4e 100644
--- a/CraftBukkit-Patches/0029-Remove-o-Option.patch
+++ b/CraftBukkit-Patches/0028-Remove-o-Option.patch
@@ -1,4 +1,4 @@
-From c39c39a928eda29e6f9d7d63aa7a757d95f1b2f6 Mon Sep 17 00:00:00 2001
+From 3084bb2817b2f31d495fa8f8a1b47551e6b32ebf Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 19 May 2013 18:29:48 +1000
 Subject: [PATCH] Remove -o Option
diff --git a/CraftBukkit-Patches/0030-Recipe-Deconstruction.patch b/CraftBukkit-Patches/0029-Recipe-Deconstruction.patch
similarity index 97%
rename from CraftBukkit-Patches/0030-Recipe-Deconstruction.patch
rename to CraftBukkit-Patches/0029-Recipe-Deconstruction.patch
index 18d3b20f85..f19aecfa14 100644
--- a/CraftBukkit-Patches/0030-Recipe-Deconstruction.patch
+++ b/CraftBukkit-Patches/0029-Recipe-Deconstruction.patch
@@ -1,4 +1,4 @@
-From 183462949271882897bf6ddc87b7e0eb6caf086a Mon Sep 17 00:00:00 2001
+From 820bfcae3d6b21b1e8b0f1298885d59838e072fe Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 1 Jun 2013 16:34:38 +1000
 Subject: [PATCH] Recipe Deconstruction
diff --git a/CraftBukkit-Patches/0031-Implement-Arrow-API.patch b/CraftBukkit-Patches/0030-Implement-Arrow-API.patch
similarity index 93%
rename from CraftBukkit-Patches/0031-Implement-Arrow-API.patch
rename to CraftBukkit-Patches/0030-Implement-Arrow-API.patch
index 228537b0cb..300e4b454f 100644
--- a/CraftBukkit-Patches/0031-Implement-Arrow-API.patch
+++ b/CraftBukkit-Patches/0030-Implement-Arrow-API.patch
@@ -1,4 +1,4 @@
-From de3c226618c36c14f88d66d70dc21ec3e4bf1822 Mon Sep 17 00:00:00 2001
+From 28a28bb1183276cc77eacc0c17ef5988dab17b0d Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 15:16:05 +1000
 Subject: [PATCH] Implement Arrow API
diff --git a/CraftBukkit-Patches/0032-Hopper-Cooldowns.patch b/CraftBukkit-Patches/0031-Hopper-Cooldowns.patch
similarity index 98%
rename from CraftBukkit-Patches/0032-Hopper-Cooldowns.patch
rename to CraftBukkit-Patches/0031-Hopper-Cooldowns.patch
index 8e11210673..6b62d88542 100644
--- a/CraftBukkit-Patches/0032-Hopper-Cooldowns.patch
+++ b/CraftBukkit-Patches/0031-Hopper-Cooldowns.patch
@@ -1,4 +1,4 @@
-From 3259be7f9a8eeb25f1a11bb78cdef5417153da69 Mon Sep 17 00:00:00 2001
+From c9f04ca3489752262a5c59fa13385f09e331ce81 Mon Sep 17 00:00:00 2001
 From: erocs <github@erocs.org>
 Date: Sun, 8 Sep 2013 12:06:15 -0700
 Subject: [PATCH] Hopper Cooldowns
diff --git a/CraftBukkit-Patches/0033-Prevent-Shutdown-Hang.patch b/CraftBukkit-Patches/0032-Prevent-Shutdown-Hang.patch
similarity index 95%
rename from CraftBukkit-Patches/0033-Prevent-Shutdown-Hang.patch
rename to CraftBukkit-Patches/0032-Prevent-Shutdown-Hang.patch
index 6a3ee032ee..e581acbeb2 100644
--- a/CraftBukkit-Patches/0033-Prevent-Shutdown-Hang.patch
+++ b/CraftBukkit-Patches/0032-Prevent-Shutdown-Hang.patch
@@ -1,4 +1,4 @@
-From 29af0b68516d438e933cfba482a4423b1d5d0c17 Mon Sep 17 00:00:00 2001
+From 64b5d80043764c4018da50f724e6a4db78828c03 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 11 Jun 2013 11:54:32 +1000
 Subject: [PATCH] Prevent Shutdown Hang
diff --git a/CraftBukkit-Patches/0034-Implement-SpawnerSpawnEvent.patch b/CraftBukkit-Patches/0033-Implement-SpawnerSpawnEvent.patch
similarity index 98%
rename from CraftBukkit-Patches/0034-Implement-SpawnerSpawnEvent.patch
rename to CraftBukkit-Patches/0033-Implement-SpawnerSpawnEvent.patch
index ddd4cdaabe..d5b5be911b 100644
--- a/CraftBukkit-Patches/0034-Implement-SpawnerSpawnEvent.patch
+++ b/CraftBukkit-Patches/0033-Implement-SpawnerSpawnEvent.patch
@@ -1,4 +1,4 @@
-From 6b89cb3671a2e4da0b334867136326b4ff98e0f7 Mon Sep 17 00:00:00 2001
+From 454beaba6139be7b6f789ccef11ba7b979bf76a2 Mon Sep 17 00:00:00 2001
 From: Andy Shulman <andy.shulman@hotmail.com>
 Date: Mon, 15 Apr 2013 20:06:37 -0500
 Subject: [PATCH] Implement SpawnerSpawnEvent.
@@ -63,7 +63,7 @@ index 67c3397..bb6b3d5 100644
  
          return entity;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 902aa88..a994264 100644
+index a654a3e..f100884 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -35,6 +35,7 @@ import org.bukkit.Server;
diff --git a/CraftBukkit-Patches/0035-Firework-Meta-Crash-Fix.patch b/CraftBukkit-Patches/0034-Firework-Meta-Crash-Fix.patch
similarity index 94%
rename from CraftBukkit-Patches/0035-Firework-Meta-Crash-Fix.patch
rename to CraftBukkit-Patches/0034-Firework-Meta-Crash-Fix.patch
index 6113ff8c27..bb53196cb1 100644
--- a/CraftBukkit-Patches/0035-Firework-Meta-Crash-Fix.patch
+++ b/CraftBukkit-Patches/0034-Firework-Meta-Crash-Fix.patch
@@ -1,4 +1,4 @@
-From 04efb5156adbb4ee0fc54ce69f405e5357129935 Mon Sep 17 00:00:00 2001
+From b239041862d977ea423040d0df74202effd4c5af Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 15 Jun 2013 21:34:48 +1000
 Subject: [PATCH] Firework Meta Crash Fix
diff --git a/CraftBukkit-Patches/0036-Do-Not-Search-for-Offline-Players.patch b/CraftBukkit-Patches/0035-Do-Not-Search-for-Offline-Players.patch
similarity index 93%
rename from CraftBukkit-Patches/0036-Do-Not-Search-for-Offline-Players.patch
rename to CraftBukkit-Patches/0035-Do-Not-Search-for-Offline-Players.patch
index c77757f944..13f435bdd9 100644
--- a/CraftBukkit-Patches/0036-Do-Not-Search-for-Offline-Players.patch
+++ b/CraftBukkit-Patches/0035-Do-Not-Search-for-Offline-Players.patch
@@ -1,4 +1,4 @@
-From bdd39983c171f385d1df7048105b9685b49d27f5 Mon Sep 17 00:00:00 2001
+From 38a7193d5cb9b6765a6ba793c7c6eb49c20b20a6 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 16 Jun 2013 08:20:26 +1000
 Subject: [PATCH] Do Not Search for Offline Players
diff --git a/CraftBukkit-Patches/0037-Allow-Disabling-of-Command-Logging.patch b/CraftBukkit-Patches/0036-Allow-Disabling-of-Command-Logging.patch
similarity index 96%
rename from CraftBukkit-Patches/0037-Allow-Disabling-of-Command-Logging.patch
rename to CraftBukkit-Patches/0036-Allow-Disabling-of-Command-Logging.patch
index e9dda1183b..33faf48f2e 100644
--- a/CraftBukkit-Patches/0037-Allow-Disabling-of-Command-Logging.patch
+++ b/CraftBukkit-Patches/0036-Allow-Disabling-of-Command-Logging.patch
@@ -1,4 +1,4 @@
-From 8cfeba1ddf246c3db3ed85cb7c2115c6c1417c02 Mon Sep 17 00:00:00 2001
+From 249f0877f660340f3afefe483a6c2c5f546ab721 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 18:01:29 +1000
 Subject: [PATCH] Allow Disabling of Command Logging
diff --git a/CraftBukkit-Patches/0038-Allow-Disabling-of-Command-TabComplete.patch b/CraftBukkit-Patches/0037-Allow-Disabling-of-Command-TabComplete.patch
similarity index 95%
rename from CraftBukkit-Patches/0038-Allow-Disabling-of-Command-TabComplete.patch
rename to CraftBukkit-Patches/0037-Allow-Disabling-of-Command-TabComplete.patch
index 3c1f955f9c..bee90ccaca 100644
--- a/CraftBukkit-Patches/0038-Allow-Disabling-of-Command-TabComplete.patch
+++ b/CraftBukkit-Patches/0037-Allow-Disabling-of-Command-TabComplete.patch
@@ -1,4 +1,4 @@
-From e11e68c3e8cc31ae9a98bf793fe1da82646c37ae Mon Sep 17 00:00:00 2001
+From 6aa34bd1ad851735520b469695f03a1994a7c2be Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 18:05:54 +1000
 Subject: [PATCH] Allow Disabling of Command TabComplete
diff --git a/CraftBukkit-Patches/0039-Configurable-Messages.patch b/CraftBukkit-Patches/0038-Configurable-Messages.patch
similarity index 97%
rename from CraftBukkit-Patches/0039-Configurable-Messages.patch
rename to CraftBukkit-Patches/0038-Configurable-Messages.patch
index bcf88289cf..c4b55b6a9a 100644
--- a/CraftBukkit-Patches/0039-Configurable-Messages.patch
+++ b/CraftBukkit-Patches/0038-Configurable-Messages.patch
@@ -1,4 +1,4 @@
-From 8e53003721108a451c7af13e8f4c28df0446943c Mon Sep 17 00:00:00 2001
+From 10a0e39c13eff0e451cd4d144037078a6851c783 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 19:21:58 +1000
 Subject: [PATCH] Configurable Messages
@@ -45,7 +45,7 @@ index 1725bba..5174602 100644
              }
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index abe05dc..be43d4b 100644
+index 4d77259..5cd6f7d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -547,11 +547,7 @@ public final class CraftServer implements Server {
@@ -62,7 +62,7 @@ index abe05dc..be43d4b 100644
          return false;
      }
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 21dc8c7..7c07142 100644
+index dd842c6..6d0a08e 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -12,6 +12,7 @@ import java.util.Map;
diff --git a/CraftBukkit-Patches/0040-Allow-Disabling-of-Random-Lighting-Updates.patch b/CraftBukkit-Patches/0039-Allow-Disabling-of-Random-Lighting-Updates.patch
similarity index 92%
rename from CraftBukkit-Patches/0040-Allow-Disabling-of-Random-Lighting-Updates.patch
rename to CraftBukkit-Patches/0039-Allow-Disabling-of-Random-Lighting-Updates.patch
index a57aa2b9dd..099ec7be58 100644
--- a/CraftBukkit-Patches/0040-Allow-Disabling-of-Random-Lighting-Updates.patch
+++ b/CraftBukkit-Patches/0039-Allow-Disabling-of-Random-Lighting-Updates.patch
@@ -1,4 +1,4 @@
-From a7666aa6f9f5b02c97af2d14d74728f63cab8dfa Mon Sep 17 00:00:00 2001
+From 3d01e9989ffbcbffe694ef398533b212fa04c11d Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 22 Jun 2013 16:12:02 +1000
 Subject: [PATCH] Allow Disabling of Random Lighting Updates
@@ -18,10 +18,10 @@ index 3bcca91..efe7ca5 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 5b201af..6ed8e56 100644
+index 2cc9005..0b6b681 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -2043,7 +2043,7 @@ public abstract class World implements IBlockAccess {
+@@ -2024,7 +2024,7 @@ public abstract class World implements IBlockAccess {
          }
  
          this.methodProfiler.a("playerCheckLight");
diff --git a/CraftBukkit-Patches/0041-Make-AnvilInventory.getItem-use-both-containers.-Fix.patch b/CraftBukkit-Patches/0040-Make-AnvilInventory.getItem-use-both-containers.-Fix.patch
similarity index 97%
rename from CraftBukkit-Patches/0041-Make-AnvilInventory.getItem-use-both-containers.-Fix.patch
rename to CraftBukkit-Patches/0040-Make-AnvilInventory.getItem-use-both-containers.-Fix.patch
index 03fb7343b2..9507d8aa00 100644
--- a/CraftBukkit-Patches/0041-Make-AnvilInventory.getItem-use-both-containers.-Fix.patch
+++ b/CraftBukkit-Patches/0040-Make-AnvilInventory.getItem-use-both-containers.-Fix.patch
@@ -1,4 +1,4 @@
-From ef5c9f927cb2341466cc30264f53e087856bd31b Mon Sep 17 00:00:00 2001
+From e77a472314397933ec067e409257e386c26be32c Mon Sep 17 00:00:00 2001
 From: Andre LeBlanc <andre@norcode.com>
 Date: Sat, 6 Apr 2013 12:00:31 -0400
 Subject: [PATCH] Make AnvilInventory.getItem() use both containers. Fixes
diff --git a/CraftBukkit-Patches/0042-Properly-Close-Inventories.patch b/CraftBukkit-Patches/0041-Properly-Close-Inventories.patch
similarity index 97%
rename from CraftBukkit-Patches/0042-Properly-Close-Inventories.patch
rename to CraftBukkit-Patches/0041-Properly-Close-Inventories.patch
index 6047081950..89cd3bdb49 100644
--- a/CraftBukkit-Patches/0042-Properly-Close-Inventories.patch
+++ b/CraftBukkit-Patches/0041-Properly-Close-Inventories.patch
@@ -1,4 +1,4 @@
-From 7e52e67df82bd2d4376cb31ba475cc8e2fb8d89f Mon Sep 17 00:00:00 2001
+From 9040fcec49683449480a882231b846a099491a1f Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 27 Jun 2013 17:26:09 +1000
 Subject: [PATCH] Properly Close Inventories
diff --git a/CraftBukkit-Patches/0043-Disallow-Interaction-With-Self.patch b/CraftBukkit-Patches/0042-Disallow-Interaction-With-Self.patch
similarity index 93%
rename from CraftBukkit-Patches/0043-Disallow-Interaction-With-Self.patch
rename to CraftBukkit-Patches/0042-Disallow-Interaction-With-Self.patch
index 23afeaecdf..7aff3e7d44 100644
--- a/CraftBukkit-Patches/0043-Disallow-Interaction-With-Self.patch
+++ b/CraftBukkit-Patches/0042-Disallow-Interaction-With-Self.patch
@@ -1,4 +1,4 @@
-From 5412db4240e439381eca27ff3cf47c2c961e587b Mon Sep 17 00:00:00 2001
+From 69b265cf9b6035669c60bfe63e1852ea49bb5cde Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 28 Jun 2013 19:52:54 +1000
 Subject: [PATCH] Disallow Interaction With Self
diff --git a/CraftBukkit-Patches/0044-Lower-Chunk-Compression.patch b/CraftBukkit-Patches/0043-Lower-Chunk-Compression.patch
similarity index 96%
rename from CraftBukkit-Patches/0044-Lower-Chunk-Compression.patch
rename to CraftBukkit-Patches/0043-Lower-Chunk-Compression.patch
index 80d5268e9d..8cd589b7cd 100644
--- a/CraftBukkit-Patches/0044-Lower-Chunk-Compression.patch
+++ b/CraftBukkit-Patches/0043-Lower-Chunk-Compression.patch
@@ -1,4 +1,4 @@
-From 06d1ce1c482f579482fe230b4c41fa7cb33973e3 Mon Sep 17 00:00:00 2001
+From 43faa281f12d753491d3e813982337d85065672e Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 2 Jul 2013 09:07:54 +1000
 Subject: [PATCH] Lower Chunk Compression
diff --git a/CraftBukkit-Patches/0045-Entity-Mount-and-Dismount-Events.patch b/CraftBukkit-Patches/0044-Entity-Mount-and-Dismount-Events.patch
similarity index 96%
rename from CraftBukkit-Patches/0045-Entity-Mount-and-Dismount-Events.patch
rename to CraftBukkit-Patches/0044-Entity-Mount-and-Dismount-Events.patch
index f5eeb1d03e..7416db9b8a 100644
--- a/CraftBukkit-Patches/0045-Entity-Mount-and-Dismount-Events.patch
+++ b/CraftBukkit-Patches/0044-Entity-Mount-and-Dismount-Events.patch
@@ -1,11 +1,11 @@
-From da427d15e35d48c153f18db70c3161ce6188b7c5 Mon Sep 17 00:00:00 2001
+From 5b313403b3ffb70d26a12424cdda0c8e51daa6c7 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 2 Jul 2013 20:32:49 +1000
 Subject: [PATCH] Entity Mount and Dismount Events
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 6ccba9f..b18d34b 100644
+index a3a8750..9ef9f88 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1451,6 +1451,7 @@ public abstract class Entity {
diff --git a/CraftBukkit-Patches/0046-Prevent-Ghost-Players-Caused-by-Plugins.patch b/CraftBukkit-Patches/0045-Prevent-Ghost-Players-Caused-by-Plugins.patch
similarity index 94%
rename from CraftBukkit-Patches/0046-Prevent-Ghost-Players-Caused-by-Plugins.patch
rename to CraftBukkit-Patches/0045-Prevent-Ghost-Players-Caused-by-Plugins.patch
index 5b4deeef5f..b8066d02e6 100644
--- a/CraftBukkit-Patches/0046-Prevent-Ghost-Players-Caused-by-Plugins.patch
+++ b/CraftBukkit-Patches/0045-Prevent-Ghost-Players-Caused-by-Plugins.patch
@@ -1,4 +1,4 @@
-From 673ed9f4513675fe1c471831a561659af443cf5e Mon Sep 17 00:00:00 2001
+From 66b224ee5c8e7c4101d150d0343eb4b4922b4216 Mon Sep 17 00:00:00 2001
 From: Alex Ciuba <alexciuba@gmail.com>
 Date: Tue, 11 Jun 2013 15:23:03 -0400
 Subject: [PATCH] Prevent Ghost Players Caused by Plugins
diff --git a/CraftBukkit-Patches/0047-Entity-ticking-chunk-caching.patch b/CraftBukkit-Patches/0046-Entity-ticking-chunk-caching.patch
similarity index 89%
rename from CraftBukkit-Patches/0047-Entity-ticking-chunk-caching.patch
rename to CraftBukkit-Patches/0046-Entity-ticking-chunk-caching.patch
index 2d2c751884..5411598b95 100644
--- a/CraftBukkit-Patches/0047-Entity-ticking-chunk-caching.patch
+++ b/CraftBukkit-Patches/0046-Entity-ticking-chunk-caching.patch
@@ -1,4 +1,4 @@
-From 5332b6d382ae1701491ee3753989710d61364ce2 Mon Sep 17 00:00:00 2001
+From be6fe9effd62617726e175f8bfd2227a83c2a59a Mon Sep 17 00:00:00 2001
 From: Ammar Askar <ammar@ammaraskar.com>
 Date: Tue, 16 Jul 2013 03:32:32 +0500
 Subject: [PATCH] Entity ticking chunk caching
@@ -6,10 +6,10 @@ Subject: [PATCH] Entity ticking chunk caching
 Cache known loaded chunks so we avoid making a potentially expensive contains call for every single entity in exchange for some simple arithmetic. Best case scenario, this cuts down contains call to once per chunk, worst case it adds on some simple arithmetic operations
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 6ed8e56..7cded7b 100644
+index 0b6b681..13ca7fa 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1198,6 +1198,7 @@ public abstract class World implements IBlockAccess {
+@@ -1179,6 +1179,7 @@ public abstract class World implements IBlockAccess {
          CrashReport crashreport;
          CrashReportSystemDetails crashreportsystemdetails;
  
@@ -17,7 +17,7 @@ index 6ed8e56..7cded7b 100644
          for (i = 0; i < this.i.size(); ++i) {
              entity = (Entity) this.i.get(i);
              // CraftBukkit start - Fixed an NPE, don't process entities in chunks queued for unload
-@@ -1206,10 +1207,15 @@ public abstract class World implements IBlockAccess {
+@@ -1187,10 +1188,15 @@ public abstract class World implements IBlockAccess {
              }
  
              ChunkProviderServer chunkProviderServer = ((WorldServer) this).chunkProviderServer;
@@ -35,7 +35,7 @@ index 6ed8e56..7cded7b 100644
  
              try {
                  ++entity.ticksLived;
-@@ -1230,6 +1236,7 @@ public abstract class World implements IBlockAccess {
+@@ -1211,6 +1217,7 @@ public abstract class World implements IBlockAccess {
                  this.i.remove(i--);
              }
          }
@@ -43,7 +43,7 @@ index 6ed8e56..7cded7b 100644
  
          this.methodProfiler.c("remove");
          this.entityList.removeAll(this.f);
-@@ -1260,10 +1267,15 @@ public abstract class World implements IBlockAccess {
+@@ -1241,10 +1248,15 @@ public abstract class World implements IBlockAccess {
  
              // CraftBukkit start - Don't tick entities in chunks queued for unload
              ChunkProviderServer chunkProviderServer = ((WorldServer) this).chunkProviderServer;
diff --git a/CraftBukkit-Patches/0048-Plug-World-Unload-Memory-Leak.patch b/CraftBukkit-Patches/0047-Plug-World-Unload-Memory-Leak.patch
similarity index 92%
rename from CraftBukkit-Patches/0048-Plug-World-Unload-Memory-Leak.patch
rename to CraftBukkit-Patches/0047-Plug-World-Unload-Memory-Leak.patch
index 309a7ccc02..0ffb1d1a1e 100644
--- a/CraftBukkit-Patches/0048-Plug-World-Unload-Memory-Leak.patch
+++ b/CraftBukkit-Patches/0047-Plug-World-Unload-Memory-Leak.patch
@@ -1,4 +1,4 @@
-From 5d75fc19fab70571cd9f4bbbbb7dd09ed20d33ee Mon Sep 17 00:00:00 2001
+From 5b98e72c08dd604fb41226e0b46b2e5fc183b48e Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 3 Aug 2013 19:02:59 +1000
 Subject: [PATCH] Plug World Unload Memory Leak
diff --git a/CraftBukkit-Patches/0049-Player-Collision-API.patch b/CraftBukkit-Patches/0048-Player-Collision-API.patch
similarity index 97%
rename from CraftBukkit-Patches/0049-Player-Collision-API.patch
rename to CraftBukkit-Patches/0048-Player-Collision-API.patch
index 263167517b..16f9f2336a 100644
--- a/CraftBukkit-Patches/0049-Player-Collision-API.patch
+++ b/CraftBukkit-Patches/0048-Player-Collision-API.patch
@@ -1,4 +1,4 @@
-From 01cc08c693743327d8425587add6ca59ff6fcc17 Mon Sep 17 00:00:00 2001
+From 68334afca622af9d677803abc524354578d9080d Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 3 Aug 2013 19:27:07 +1000
 Subject: [PATCH] Player Collision API
@@ -31,7 +31,7 @@ index d06ec7b..35b2f75 100644
                  Entity entity = (Entity) list.get(i);
  
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index af08d2f..d910e8a 100644
+index 4945955..ab39926 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -64,6 +64,21 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/CraftBukkit-Patches/0050-Fully-Disable-Snooper-When-Not-Required.patch b/CraftBukkit-Patches/0049-Fully-Disable-Snooper-When-Not-Required.patch
similarity index 91%
rename from CraftBukkit-Patches/0050-Fully-Disable-Snooper-When-Not-Required.patch
rename to CraftBukkit-Patches/0049-Fully-Disable-Snooper-When-Not-Required.patch
index b93200728d..abb61a051d 100644
--- a/CraftBukkit-Patches/0050-Fully-Disable-Snooper-When-Not-Required.patch
+++ b/CraftBukkit-Patches/0049-Fully-Disable-Snooper-When-Not-Required.patch
@@ -1,11 +1,11 @@
-From fff6a6489c3af67f69c2eee46967df7fb809d3c1 Mon Sep 17 00:00:00 2001
+From 438d4bd728376285ad5aeaec80c5d3847d5fedd4 Mon Sep 17 00:00:00 2001
 From: agentk20 <agentkid20@gmail.com>
 Date: Sat, 3 Aug 2013 19:28:48 +1000
 Subject: [PATCH] Fully Disable Snooper When Not Required
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 453e508..76bbf83 100644
+index d740620..cfb7922 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -555,11 +555,11 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
diff --git a/CraftBukkit-Patches/0051-Add-Getter-for-Entity-Invulnerability.patch b/CraftBukkit-Patches/0050-Add-Getter-for-Entity-Invulnerability.patch
similarity index 92%
rename from CraftBukkit-Patches/0051-Add-Getter-for-Entity-Invulnerability.patch
rename to CraftBukkit-Patches/0050-Add-Getter-for-Entity-Invulnerability.patch
index 993bd253ab..c672d61792 100644
--- a/CraftBukkit-Patches/0051-Add-Getter-for-Entity-Invulnerability.patch
+++ b/CraftBukkit-Patches/0050-Add-Getter-for-Entity-Invulnerability.patch
@@ -1,4 +1,4 @@
-From 7f5a1162b0c6e5aa7f09eee83fe338d0bbc2bd5c Mon Sep 17 00:00:00 2001
+From e02558310e82bca892d4265957729c1b699429eb Mon Sep 17 00:00:00 2001
 From: DerFlash <bte@freenet.de>
 Date: Sat, 3 Aug 2013 19:53:48 +1000
 Subject: [PATCH] Add Getter for Entity Invulnerability
diff --git a/CraftBukkit-Patches/0052-Guard-entity-list.patch b/CraftBukkit-Patches/0051-Guard-entity-list.patch
similarity index 91%
rename from CraftBukkit-Patches/0052-Guard-entity-list.patch
rename to CraftBukkit-Patches/0051-Guard-entity-list.patch
index 3067ec375d..03da998f3a 100644
--- a/CraftBukkit-Patches/0052-Guard-entity-list.patch
+++ b/CraftBukkit-Patches/0051-Guard-entity-list.patch
@@ -1,11 +1,11 @@
-From 56244d1e05fdd71631bfbab9f0962f6658ab7658 Mon Sep 17 00:00:00 2001
+From f0939f62fe3bf4860dc5380e3346ee5cb0dfe649 Mon Sep 17 00:00:00 2001
 From: Ammar Askar <ammar@ammaraskar.com>
 Date: Sat, 3 Aug 2013 21:42:00 +0500
 Subject: [PATCH] Guard entity list
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 7cded7b..b990081 100644
+index 13ca7fa..5b0875d 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -30,7 +30,25 @@ import org.bukkit.event.weather.ThunderChangeEvent;
@@ -43,7 +43,7 @@ index 7cded7b..b990081 100644
      protected final gnu.trove.map.hash.TLongShortHashMap chunkTickList;
      protected float growthOdds = 100;
      protected float modifiedOdds = 100;
-@@ -1262,6 +1281,7 @@ public abstract class World implements IBlockAccess {
+@@ -1243,6 +1262,7 @@ public abstract class World implements IBlockAccess {
  
          org.spigotmc.ActivationRange.activateEntities(this); // Spigot
          timings.entityTick.startTiming(); // Spigot
@@ -51,7 +51,7 @@ index 7cded7b..b990081 100644
          for (i = 0; i < this.entityList.size(); ++i) {
              entity = (Entity) this.entityList.get(i);
  
-@@ -1309,12 +1329,15 @@ public abstract class World implements IBlockAccess {
+@@ -1290,12 +1310,15 @@ public abstract class World implements IBlockAccess {
                      this.getChunkAt(j, k).b(entity);
                  }
  
diff --git a/CraftBukkit-Patches/0053-Cap-Minimum-Player-Speed.patch b/CraftBukkit-Patches/0052-Cap-Minimum-Player-Speed.patch
similarity index 94%
rename from CraftBukkit-Patches/0053-Cap-Minimum-Player-Speed.patch
rename to CraftBukkit-Patches/0052-Cap-Minimum-Player-Speed.patch
index 4136d61a8e..52e941d394 100644
--- a/CraftBukkit-Patches/0053-Cap-Minimum-Player-Speed.patch
+++ b/CraftBukkit-Patches/0052-Cap-Minimum-Player-Speed.patch
@@ -1,4 +1,4 @@
-From 6bb008fdb2d32afe9c09041be54fdf42c5869f85 Mon Sep 17 00:00:00 2001
+From 77212e3c7b4c7ac40f09231b50f500a97c351a71 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Mon, 5 Aug 2013 20:17:20 +1000
 Subject: [PATCH] Cap Minimum Player Speed
diff --git a/CraftBukkit-Patches/0054-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch b/CraftBukkit-Patches/0053-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch
similarity index 94%
rename from CraftBukkit-Patches/0054-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch
rename to CraftBukkit-Patches/0053-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch
index 65a9c737ec..3d93a3feae 100644
--- a/CraftBukkit-Patches/0054-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch
+++ b/CraftBukkit-Patches/0053-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch
@@ -1,4 +1,4 @@
-From bf0918a306f1d0fb0199f5636fe5ce2576dec92f Mon Sep 17 00:00:00 2001
+From c40442d67561f047f72332d4006ad488bc64701a Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 14 Sep 2013 10:16:38 +1000
 Subject: [PATCH] Update Inventory and Health for PlayerConsumeItemEvent
diff --git a/CraftBukkit-Patches/0055-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch b/CraftBukkit-Patches/0054-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch
similarity index 96%
rename from CraftBukkit-Patches/0055-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch
rename to CraftBukkit-Patches/0054-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch
index e1c2fb8698..a6e840e0eb 100644
--- a/CraftBukkit-Patches/0055-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch
+++ b/CraftBukkit-Patches/0054-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch
@@ -1,4 +1,4 @@
-From 9c945d99d4348f0203ed0b71fa65ddfe73034beb Mon Sep 17 00:00:00 2001
+From 766dc7b92b54c2daede6c4ddfd50e4501293c9e6 Mon Sep 17 00:00:00 2001
 From: BlackHole <black-hole@live.com>
 Date: Tue, 16 Jul 2013 22:34:50 +0200
 Subject: [PATCH] Call EntityChangeBlockEvent for Fire Arrows hitting TNT
diff --git a/CraftBukkit-Patches/0056-Allow-Disabling-of-1.6.3-Structure-Saving.patch b/CraftBukkit-Patches/0055-Allow-Disabling-of-1.6.3-Structure-Saving.patch
similarity index 97%
rename from CraftBukkit-Patches/0056-Allow-Disabling-of-1.6.3-Structure-Saving.patch
rename to CraftBukkit-Patches/0055-Allow-Disabling-of-1.6.3-Structure-Saving.patch
index d091454853..41b00cef61 100644
--- a/CraftBukkit-Patches/0056-Allow-Disabling-of-1.6.3-Structure-Saving.patch
+++ b/CraftBukkit-Patches/0055-Allow-Disabling-of-1.6.3-Structure-Saving.patch
@@ -1,4 +1,4 @@
-From 5028a69b31c0c137f07b7370bc3909863114d2ec Mon Sep 17 00:00:00 2001
+From 21b153776a02cb6931e8186f666a3bb52567f0ea Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 21 Sep 2013 12:33:09 +1000
 Subject: [PATCH] Allow Disabling of 1.6.3 Structure Saving
diff --git a/CraftBukkit-Patches/0057-Item-Despawn-Rate.patch b/CraftBukkit-Patches/0056-Item-Despawn-Rate.patch
similarity index 96%
rename from CraftBukkit-Patches/0057-Item-Despawn-Rate.patch
rename to CraftBukkit-Patches/0056-Item-Despawn-Rate.patch
index e667b573cc..fde8605f47 100644
--- a/CraftBukkit-Patches/0057-Item-Despawn-Rate.patch
+++ b/CraftBukkit-Patches/0056-Item-Despawn-Rate.patch
@@ -1,4 +1,4 @@
-From dd97988482153593f5788d10eeb33aa044814843 Mon Sep 17 00:00:00 2001
+From dd603179f1246321346cd3394a2fb2a6f762e92a Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 22 Sep 2013 19:10:53 +1000
 Subject: [PATCH] Item Despawn Rate
diff --git a/CraftBukkit-Patches/0058-Don-t-Special-Case-X-Move-Value.patch b/CraftBukkit-Patches/0057-Don-t-Special-Case-X-Move-Value.patch
similarity index 96%
rename from CraftBukkit-Patches/0058-Don-t-Special-Case-X-Move-Value.patch
rename to CraftBukkit-Patches/0057-Don-t-Special-Case-X-Move-Value.patch
index 83d66aafdf..a17c1206d9 100644
--- a/CraftBukkit-Patches/0058-Don-t-Special-Case-X-Move-Value.patch
+++ b/CraftBukkit-Patches/0057-Don-t-Special-Case-X-Move-Value.patch
@@ -1,4 +1,4 @@
-From 093e002fed03cfc3e4b51441d197a4467eca5d39 Mon Sep 17 00:00:00 2001
+From 8a7f776a29346183920d5c6d926e6a8f668fb7eb Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 6 Oct 2013 17:36:28 +1100
 Subject: [PATCH] Don't Special Case X Move Value
diff --git a/CraftBukkit-Patches/0059-Implement-respawn-API.patch b/CraftBukkit-Patches/0058-Implement-respawn-API.patch
similarity index 93%
rename from CraftBukkit-Patches/0059-Implement-respawn-API.patch
rename to CraftBukkit-Patches/0058-Implement-respawn-API.patch
index 06926b9e8b..31f5fa2b02 100644
--- a/CraftBukkit-Patches/0059-Implement-respawn-API.patch
+++ b/CraftBukkit-Patches/0058-Implement-respawn-API.patch
@@ -1,4 +1,4 @@
-From 92f128db2aab392e895f99a9be5986a5a403f96e Mon Sep 17 00:00:00 2001
+From b1261bb08a438cebd8333b7e3bb2f3ce5ef0799e Mon Sep 17 00:00:00 2001
 From: ninja- <xninja@openmailbox.org>
 Date: Tue, 8 Oct 2013 14:34:49 +0200
 Subject: [PATCH] Implement respawn API.
diff --git a/CraftBukkit-Patches/0060-Fix-BrewingStands-Removing-NBT-Potions.patch b/CraftBukkit-Patches/0059-Fix-BrewingStands-Removing-NBT-Potions.patch
similarity index 95%
rename from CraftBukkit-Patches/0060-Fix-BrewingStands-Removing-NBT-Potions.patch
rename to CraftBukkit-Patches/0059-Fix-BrewingStands-Removing-NBT-Potions.patch
index 0ec5f1594a..8eb6ca8a11 100644
--- a/CraftBukkit-Patches/0060-Fix-BrewingStands-Removing-NBT-Potions.patch
+++ b/CraftBukkit-Patches/0059-Fix-BrewingStands-Removing-NBT-Potions.patch
@@ -1,4 +1,4 @@
-From af1c05469d9f3f6033f8da3e476be4cf2a5ba957 Mon Sep 17 00:00:00 2001
+From 2fc45636b3b51d8e824d805e3649226a033819b5 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Wed, 9 Oct 2013 18:20:05 +1100
 Subject: [PATCH] Fix BrewingStands Removing NBT / Potions
diff --git a/CraftBukkit-Patches/0061-Arrow-Despawn-Rate.patch b/CraftBukkit-Patches/0060-Arrow-Despawn-Rate.patch
similarity index 95%
rename from CraftBukkit-Patches/0061-Arrow-Despawn-Rate.patch
rename to CraftBukkit-Patches/0060-Arrow-Despawn-Rate.patch
index e09322c27a..d174135ab5 100644
--- a/CraftBukkit-Patches/0061-Arrow-Despawn-Rate.patch
+++ b/CraftBukkit-Patches/0060-Arrow-Despawn-Rate.patch
@@ -1,4 +1,4 @@
-From 25863dd229b23ef3052c3373fc8af4d94a1a3c76 Mon Sep 17 00:00:00 2001
+From af94c6183ce68494f41d7ebe8eba02d4d17d686c Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Mon, 14 Oct 2013 19:20:10 +1100
 Subject: [PATCH] Arrow Despawn Rate
diff --git a/CraftBukkit-Patches/0062-Watchdog-Thread.patch b/CraftBukkit-Patches/0061-Watchdog-Thread.patch
similarity index 99%
rename from CraftBukkit-Patches/0062-Watchdog-Thread.patch
rename to CraftBukkit-Patches/0061-Watchdog-Thread.patch
index 910eeedbef..17fe65439b 100644
--- a/CraftBukkit-Patches/0062-Watchdog-Thread.patch
+++ b/CraftBukkit-Patches/0061-Watchdog-Thread.patch
@@ -1,11 +1,11 @@
-From f8af28a8dd18b38f17b93bc2d40262d0856333f8 Mon Sep 17 00:00:00 2001
+From 89b6aa601e2a99d4a0a0e4535ef544de9ae42494 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Feb 2013 12:33:20 +1100
 Subject: [PATCH] Watchdog Thread.
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 76bbf83..59c76d8 100644
+index cfb7922..1f057b1 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -446,6 +446,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
diff --git a/CraftBukkit-Patches/0063-Fix-packed-ice-generation.patch b/CraftBukkit-Patches/0062-Fix-packed-ice-generation.patch
similarity index 97%
rename from CraftBukkit-Patches/0063-Fix-packed-ice-generation.patch
rename to CraftBukkit-Patches/0062-Fix-packed-ice-generation.patch
index 6208db32b5..7b109edaec 100644
--- a/CraftBukkit-Patches/0063-Fix-packed-ice-generation.patch
+++ b/CraftBukkit-Patches/0062-Fix-packed-ice-generation.patch
@@ -1,4 +1,4 @@
-From d3254c1364eb10e749503c673657cb1219c6bc76 Mon Sep 17 00:00:00 2001
+From 7a08f52e0b95a83beb8dc690c18afe1cc6dc5cba Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 1 Dec 2013 17:52:14 +1100
 Subject: [PATCH] Fix packed ice generation
diff --git a/CraftBukkit-Patches/0064-BungeeCord-Support.patch b/CraftBukkit-Patches/0063-BungeeCord-Support.patch
similarity index 98%
rename from CraftBukkit-Patches/0064-BungeeCord-Support.patch
rename to CraftBukkit-Patches/0063-BungeeCord-Support.patch
index feb50b41f7..3ead05aec8 100644
--- a/CraftBukkit-Patches/0064-BungeeCord-Support.patch
+++ b/CraftBukkit-Patches/0063-BungeeCord-Support.patch
@@ -1,4 +1,4 @@
-From 6db94f8d995eb97196a6f8569ca80fc719ae9344 Mon Sep 17 00:00:00 2001
+From cdb861b8b7bd28a5d8b649917a86fa4cbd0cccd9 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 1 Dec 2013 18:18:41 +1100
 Subject: [PATCH] BungeeCord Support
diff --git a/CraftBukkit-Patches/0065-Clear-Flower-Pot-on-Drop.patch b/CraftBukkit-Patches/0064-Clear-Flower-Pot-on-Drop.patch
similarity index 94%
rename from CraftBukkit-Patches/0065-Clear-Flower-Pot-on-Drop.patch
rename to CraftBukkit-Patches/0064-Clear-Flower-Pot-on-Drop.patch
index 41097d41b8..68ea94b15b 100644
--- a/CraftBukkit-Patches/0065-Clear-Flower-Pot-on-Drop.patch
+++ b/CraftBukkit-Patches/0064-Clear-Flower-Pot-on-Drop.patch
@@ -1,4 +1,4 @@
-From 9d9ad7d243e38c0a8bde75cc1ea23e41b6e670eb Mon Sep 17 00:00:00 2001
+From 6d318acacaca44a9cbd161cd6724f3cd6d91fa73 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 3 Dec 2013 11:07:48 +1100
 Subject: [PATCH] Clear Flower Pot on Drop
diff --git a/CraftBukkit-Patches/0066-Fix-some-chunks-not-being-sent-to-the-client.patch b/CraftBukkit-Patches/0065-Fix-some-chunks-not-being-sent-to-the-client.patch
similarity index 95%
rename from CraftBukkit-Patches/0066-Fix-some-chunks-not-being-sent-to-the-client.patch
rename to CraftBukkit-Patches/0065-Fix-some-chunks-not-being-sent-to-the-client.patch
index 6027da0dfb..7aac8c9ada 100644
--- a/CraftBukkit-Patches/0066-Fix-some-chunks-not-being-sent-to-the-client.patch
+++ b/CraftBukkit-Patches/0065-Fix-some-chunks-not-being-sent-to-the-client.patch
@@ -1,4 +1,4 @@
-From 09713737e4c6dcf0100eb9f26cd17084ca17241d Mon Sep 17 00:00:00 2001
+From a6bce00ef49f371e22716ebe132a85289598d553 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Mon, 2 Dec 2013 23:42:09 +0000
 Subject: [PATCH] Fix some chunks not being sent to the client
diff --git a/CraftBukkit-Patches/0067-Fix-Broken-Async-Chat.patch b/CraftBukkit-Patches/0066-Fix-Broken-Async-Chat.patch
similarity index 95%
rename from CraftBukkit-Patches/0067-Fix-Broken-Async-Chat.patch
rename to CraftBukkit-Patches/0066-Fix-Broken-Async-Chat.patch
index 95b744d025..4ea50467d2 100644
--- a/CraftBukkit-Patches/0067-Fix-Broken-Async-Chat.patch
+++ b/CraftBukkit-Patches/0066-Fix-Broken-Async-Chat.patch
@@ -1,4 +1,4 @@
-From d70115f8cd2d134b29976ff51d65a706f0a70987 Mon Sep 17 00:00:00 2001
+From 0c9b65576d73d56f370e354823614f4169a692c3 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 5 Dec 2013 13:55:53 +1100
 Subject: [PATCH] Fix Broken Async Chat
diff --git a/CraftBukkit-Patches/0068-Allow-Teleportation-of-Vehicles-and-Passengers.patch b/CraftBukkit-Patches/0067-Allow-Teleportation-of-Vehicles-and-Passengers.patch
similarity index 95%
rename from CraftBukkit-Patches/0068-Allow-Teleportation-of-Vehicles-and-Passengers.patch
rename to CraftBukkit-Patches/0067-Allow-Teleportation-of-Vehicles-and-Passengers.patch
index 2bcb761e8e..618172b36c 100644
--- a/CraftBukkit-Patches/0068-Allow-Teleportation-of-Vehicles-and-Passengers.patch
+++ b/CraftBukkit-Patches/0067-Allow-Teleportation-of-Vehicles-and-Passengers.patch
@@ -1,4 +1,4 @@
-From a23c1013b53d3e115cdab33db3fc24a302c0d64c Mon Sep 17 00:00:00 2001
+From 1315e025f9551a083447eec06b8c579d276af77b Mon Sep 17 00:00:00 2001
 From: ItsHarry <info@itsjerryandharry.com>
 Date: Thu, 5 Dec 2013 21:58:11 +0100
 Subject: [PATCH] Allow Teleportation of Vehicles and Passengers
diff --git a/CraftBukkit-Patches/0069-Remove-OS-X-Special-Chars-from-Signs.patch b/CraftBukkit-Patches/0068-Remove-OS-X-Special-Chars-from-Signs.patch
similarity index 93%
rename from CraftBukkit-Patches/0069-Remove-OS-X-Special-Chars-from-Signs.patch
rename to CraftBukkit-Patches/0068-Remove-OS-X-Special-Chars-from-Signs.patch
index 1772f03965..ae0515d8f3 100644
--- a/CraftBukkit-Patches/0069-Remove-OS-X-Special-Chars-from-Signs.patch
+++ b/CraftBukkit-Patches/0068-Remove-OS-X-Special-Chars-from-Signs.patch
@@ -1,4 +1,4 @@
-From ad5cf11f5529307cc933d4e2b6dda2fd65863b97 Mon Sep 17 00:00:00 2001
+From 3bf7534db49e538787ec84cc0fabd79bd691a2c3 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 8 Dec 2013 16:52:42 +1100
 Subject: [PATCH] Remove OS X Special Chars from Signs
diff --git a/CraftBukkit-Patches/0070-Orebfuscator.patch b/CraftBukkit-Patches/0069-Orebfuscator.patch
similarity index 99%
rename from CraftBukkit-Patches/0070-Orebfuscator.patch
rename to CraftBukkit-Patches/0069-Orebfuscator.patch
index 1a8afcc6d3..e0975031a9 100644
--- a/CraftBukkit-Patches/0070-Orebfuscator.patch
+++ b/CraftBukkit-Patches/0069-Orebfuscator.patch
@@ -1,4 +1,4 @@
-From c977f4ada044f1ded8e76c87842685a5e9ca2e74 Mon Sep 17 00:00:00 2001
+From 3068714888bdbb28a4ca608d156df6ef9db8827e Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 16 May 2013 18:51:05 +1000
 Subject: [PATCH] Orebfuscator
@@ -115,7 +115,7 @@ index bceba7b..c963fac 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index b990081..04f5ed1 100644
+index 5b0875d..1aca7f6 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -490,6 +490,7 @@ public abstract class World implements IBlockAccess {
diff --git a/CraftBukkit-Patches/0071-Optimize-DataWatcher.patch b/CraftBukkit-Patches/0070-Optimize-DataWatcher.patch
similarity index 98%
rename from CraftBukkit-Patches/0071-Optimize-DataWatcher.patch
rename to CraftBukkit-Patches/0070-Optimize-DataWatcher.patch
index ae28b03640..52bb548b4a 100644
--- a/CraftBukkit-Patches/0071-Optimize-DataWatcher.patch
+++ b/CraftBukkit-Patches/0070-Optimize-DataWatcher.patch
@@ -1,4 +1,4 @@
-From 4a0048bc9fa3f7e07b3e8ec59bdce542d5f6b122 Mon Sep 17 00:00:00 2001
+From f99145bc8ce6b6271eb785d89f13e9b3d0ba47c5 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 13 Dec 2013 11:45:47 +1100
 Subject: [PATCH] Optimize DataWatcher
diff --git a/CraftBukkit-Patches/0072-Allow-Disabling-Zombie-Villager-Aggression.patch b/CraftBukkit-Patches/0071-Allow-Disabling-Zombie-Villager-Aggression.patch
similarity index 97%
rename from CraftBukkit-Patches/0072-Allow-Disabling-Zombie-Villager-Aggression.patch
rename to CraftBukkit-Patches/0071-Allow-Disabling-Zombie-Villager-Aggression.patch
index 7fce703c28..9a6fe4c407 100644
--- a/CraftBukkit-Patches/0072-Allow-Disabling-Zombie-Villager-Aggression.patch
+++ b/CraftBukkit-Patches/0071-Allow-Disabling-Zombie-Villager-Aggression.patch
@@ -1,4 +1,4 @@
-From 3adae0f79ff46955ce6e1caf525a94c92dde8cc4 Mon Sep 17 00:00:00 2001
+From 6b13883ffdd352eebd155c6d05c6ed7c3fa37c2f Mon Sep 17 00:00:00 2001
 From: Dylan Xaldin <Puremin0rez515@gmail.com>
 Date: Thu, 12 Dec 2013 18:05:03 -0600
 Subject: [PATCH] Allow Disabling Zombie Villager Aggression
diff --git a/CraftBukkit-Patches/0073-Configurable-Amount-of-Netty-Threads.patch b/CraftBukkit-Patches/0072-Configurable-Amount-of-Netty-Threads.patch
similarity index 96%
rename from CraftBukkit-Patches/0073-Configurable-Amount-of-Netty-Threads.patch
rename to CraftBukkit-Patches/0072-Configurable-Amount-of-Netty-Threads.patch
index d4705d05d6..e68607516c 100644
--- a/CraftBukkit-Patches/0073-Configurable-Amount-of-Netty-Threads.patch
+++ b/CraftBukkit-Patches/0072-Configurable-Amount-of-Netty-Threads.patch
@@ -1,4 +1,4 @@
-From 87ecb585f9009d2ab81a48c4c4411db12d78abb8 Mon Sep 17 00:00:00 2001
+From f90fa8326368b3ccd386b6a12ba643f0e8e34fcd Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 13 Dec 2013 11:58:58 +1100
 Subject: [PATCH] Configurable Amount of Netty Threads
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Amount of Netty Threads
 This brings back the option that the Spigot version of netty saw. By default Netty will try and use cores*2 threads, however if running multiple servers on the same machine, this can be too many threads. Additionally some people have 16 core servers. If 32 Netty threads are allowed in this setup, then the lock contention, and thus blocking between threads becomes much greater, leading to decreased performance.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 59c76d8..00b7435 100644
+index 1f057b1..eee0119 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -51,7 +51,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
diff --git a/CraftBukkit-Patches/0074-Prevent-Mineshaft-Saving.patch b/CraftBukkit-Patches/0073-Prevent-Mineshaft-Saving.patch
similarity index 93%
rename from CraftBukkit-Patches/0074-Prevent-Mineshaft-Saving.patch
rename to CraftBukkit-Patches/0073-Prevent-Mineshaft-Saving.patch
index 7b90e23004..8efe762326 100644
--- a/CraftBukkit-Patches/0074-Prevent-Mineshaft-Saving.patch
+++ b/CraftBukkit-Patches/0073-Prevent-Mineshaft-Saving.patch
@@ -1,4 +1,4 @@
-From a2b9457c769ca326b05f739a2a8b0efa98f217ad Mon Sep 17 00:00:00 2001
+From d46c3a0d4bc6fa47ebd5730fb727ba5e219e5a15 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 13 Dec 2013 15:21:02 +1100
 Subject: [PATCH] Prevent Mineshaft Saving
diff --git a/CraftBukkit-Patches/0075-Add-VanillaCommand-Wrapper-to-Support-New-Commands.patch b/CraftBukkit-Patches/0074-Add-VanillaCommand-Wrapper-to-Support-New-Commands.patch
similarity index 99%
rename from CraftBukkit-Patches/0075-Add-VanillaCommand-Wrapper-to-Support-New-Commands.patch
rename to CraftBukkit-Patches/0074-Add-VanillaCommand-Wrapper-to-Support-New-Commands.patch
index a6a5663a7d..0f5e829c85 100644
--- a/CraftBukkit-Patches/0075-Add-VanillaCommand-Wrapper-to-Support-New-Commands.patch
+++ b/CraftBukkit-Patches/0074-Add-VanillaCommand-Wrapper-to-Support-New-Commands.patch
@@ -1,4 +1,4 @@
-From b889d097a6084e131b56d547b18d3e2f64d89fd8 Mon Sep 17 00:00:00 2001
+From b38f4afbdf46e734be406a03249a7388b223bae7 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Wed, 18 Dec 2013 10:32:15 +1100
 Subject: [PATCH] Add VanillaCommand Wrapper to Support New Commands
diff --git a/CraftBukkit-Patches/0076-Fire-PreLogin-Events-in-Offline-Mode.patch b/CraftBukkit-Patches/0075-Fire-PreLogin-Events-in-Offline-Mode.patch
similarity index 98%
rename from CraftBukkit-Patches/0076-Fire-PreLogin-Events-in-Offline-Mode.patch
rename to CraftBukkit-Patches/0075-Fire-PreLogin-Events-in-Offline-Mode.patch
index 44cb1e5afb..87661c0c1a 100644
--- a/CraftBukkit-Patches/0076-Fire-PreLogin-Events-in-Offline-Mode.patch
+++ b/CraftBukkit-Patches/0075-Fire-PreLogin-Events-in-Offline-Mode.patch
@@ -1,4 +1,4 @@
-From 95fd9533e07c9c6adf85d46a8bbd527d06f5c366 Mon Sep 17 00:00:00 2001
+From 5a3992ffafbf04a0fbb871b51d845cd14f070ec0 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 18 Dec 2013 13:32:10 +1100
 Subject: [PATCH] Fire PreLogin Events in Offline Mode
diff --git a/CraftBukkit-Patches/0077-Log-Cause-of-Unexpected-Exceptions.patch b/CraftBukkit-Patches/0076-Log-Cause-of-Unexpected-Exceptions.patch
similarity index 90%
rename from CraftBukkit-Patches/0077-Log-Cause-of-Unexpected-Exceptions.patch
rename to CraftBukkit-Patches/0076-Log-Cause-of-Unexpected-Exceptions.patch
index c68ef68c54..d13183387f 100644
--- a/CraftBukkit-Patches/0077-Log-Cause-of-Unexpected-Exceptions.patch
+++ b/CraftBukkit-Patches/0076-Log-Cause-of-Unexpected-Exceptions.patch
@@ -1,11 +1,11 @@
-From a19a14311abaf6f155946cee826afd88b63c9ac8 Mon Sep 17 00:00:00 2001
+From 832ac75e2e0fc5371db065ebd237e61646ac636e Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 18 Dec 2013 13:39:14 +1100
 Subject: [PATCH] Log Cause of Unexpected Exceptions
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 00b7435..5375787 100644
+index eee0119..868061b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -454,6 +454,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
diff --git a/CraftBukkit-Patches/0078-Remove-Bukkit-URL-Clicking.patch b/CraftBukkit-Patches/0077-Remove-Bukkit-URL-Clicking.patch
similarity index 98%
rename from CraftBukkit-Patches/0078-Remove-Bukkit-URL-Clicking.patch
rename to CraftBukkit-Patches/0077-Remove-Bukkit-URL-Clicking.patch
index 8b2c3daaaf..b24ba77196 100644
--- a/CraftBukkit-Patches/0078-Remove-Bukkit-URL-Clicking.patch
+++ b/CraftBukkit-Patches/0077-Remove-Bukkit-URL-Clicking.patch
@@ -1,4 +1,4 @@
-From c885097ad616281a32bda406764809b460e1e175 Mon Sep 17 00:00:00 2001
+From 710564f77ec4de65b7064579b76cfdcc3d49ec53 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 18 Dec 2013 20:39:24 +1100
 Subject: [PATCH] Remove Bukkit URL Clicking
diff --git a/CraftBukkit-Patches/0079-Fix-links-in-chat.patch b/CraftBukkit-Patches/0078-Fix-links-in-chat.patch
similarity index 98%
rename from CraftBukkit-Patches/0079-Fix-links-in-chat.patch
rename to CraftBukkit-Patches/0078-Fix-links-in-chat.patch
index 38d1d28f15..102592d5b2 100644
--- a/CraftBukkit-Patches/0079-Fix-links-in-chat.patch
+++ b/CraftBukkit-Patches/0078-Fix-links-in-chat.patch
@@ -1,4 +1,4 @@
-From a63d30df718add61b1e688de90e0dbda0849941b Mon Sep 17 00:00:00 2001
+From 5ad9b20df6175c93ea54bd2961d30ab256b25235 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <purggames@gmail.com>
 Date: Sun, 1 Dec 2013 10:33:55 +0000
 Subject: [PATCH] Fix links in chat
diff --git a/CraftBukkit-Patches/0080-Particle-API.patch b/CraftBukkit-Patches/0079-Particle-API.patch
similarity index 98%
rename from CraftBukkit-Patches/0080-Particle-API.patch
rename to CraftBukkit-Patches/0079-Particle-API.patch
index a5d54dd592..78da407bb7 100644
--- a/CraftBukkit-Patches/0080-Particle-API.patch
+++ b/CraftBukkit-Patches/0079-Particle-API.patch
@@ -1,4 +1,4 @@
-From 32ffb237761043754856d12c91292461653e4108 Mon Sep 17 00:00:00 2001
+From 02ea30c4573133af4814749e42c3af57d7a35530 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Fri, 20 Dec 2013 21:36:06 +0000
 Subject: [PATCH] Particle API
@@ -117,5 +117,5 @@ index 468a4e1..c90dd54 100644
  
      public Spigot spigot()
 -- 
-1.8.4.msysgit.0
+1.8.3.2
 
diff --git a/CraftBukkit-Patches/0081-Force-Load-Chunks-for-Biome-Decoration.patch b/CraftBukkit-Patches/0080-Force-Load-Chunks-for-Biome-Decoration.patch
similarity index 95%
rename from CraftBukkit-Patches/0081-Force-Load-Chunks-for-Biome-Decoration.patch
rename to CraftBukkit-Patches/0080-Force-Load-Chunks-for-Biome-Decoration.patch
index 09c21232f0..85fd95a208 100644
--- a/CraftBukkit-Patches/0081-Force-Load-Chunks-for-Biome-Decoration.patch
+++ b/CraftBukkit-Patches/0080-Force-Load-Chunks-for-Biome-Decoration.patch
@@ -1,4 +1,4 @@
-From f67e97185382ed3e7cbfea25039c58dffb61486c Mon Sep 17 00:00:00 2001
+From 06442e81b39007aff69a813571ec4fbf60f1ac6d Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 21 Dec 2013 20:08:26 +1100
 Subject: [PATCH] Force Load Chunks for Biome Decoration
diff --git a/CraftBukkit-Patches/0082-Save-ticks-lived-to-nbttag.patch b/CraftBukkit-Patches/0081-Save-ticks-lived-to-nbttag.patch
similarity index 95%
rename from CraftBukkit-Patches/0082-Save-ticks-lived-to-nbttag.patch
rename to CraftBukkit-Patches/0081-Save-ticks-lived-to-nbttag.patch
index f868235664..d3c2fa870f 100644
--- a/CraftBukkit-Patches/0082-Save-ticks-lived-to-nbttag.patch
+++ b/CraftBukkit-Patches/0081-Save-ticks-lived-to-nbttag.patch
@@ -1,4 +1,4 @@
-From 1d70dfe1e584b4cb3cc34f6dea763962bb239869 Mon Sep 17 00:00:00 2001
+From d14e8feb5dac1d571188f31735eb6c15d06d93d0 Mon Sep 17 00:00:00 2001
 From: DerFlash <bte@freenet.de>
 Date: Tue, 9 Jul 2013 00:11:12 +0200
 Subject: [PATCH] Save ticks lived to nbttag