diff --git a/CraftBukkit-Patches/0042-Allow-Disabling-of-Random-Lighting-Updates.patch b/CraftBukkit-Patches/0042-Allow-Disabling-of-Random-Lighting-Updates.patch
index 8008549a19..e7263d5070 100644
--- a/CraftBukkit-Patches/0042-Allow-Disabling-of-Random-Lighting-Updates.patch
+++ b/CraftBukkit-Patches/0042-Allow-Disabling-of-Random-Lighting-Updates.patch
@@ -1,14 +1,14 @@
-From d2104b9150b700f8c3d3155eda9b7d422a4b9404 Mon Sep 17 00:00:00 2001
+From 72ce396497d7ca73587cbf0af00823612b2565f4 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 22 Jun 2013 16:12:02 +1000
 Subject: [PATCH] Allow Disabling of Random Lighting Updates
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f53e51d..3f4e2d5 100644
+index 3108628..baa5d55 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -2045,7 +2045,7 @@ public abstract class World implements IBlockAccess {
+@@ -2037,7 +2037,7 @@ public abstract class World implements IBlockAccess {
          }
  
          this.methodProfiler.a("playerCheckLight");
diff --git a/CraftBukkit-Patches/0043-Add-Log-Filtering.patch b/CraftBukkit-Patches/0043-Add-Log-Filtering.patch
deleted file mode 100644
index 16926f0e26..0000000000
--- a/CraftBukkit-Patches/0043-Add-Log-Filtering.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From b2abcc850b4c50b043f8ef3548ea3c82e839050a Mon Sep 17 00:00:00 2001
-From: md_5 <md_5@live.com.au>
-Date: Sat, 22 Jun 2013 16:40:11 +1000
-Subject: [PATCH] Add Log Filtering
-
-
-diff --git a/src/main/java/org/spigotmc/LogFilter.java b/src/main/java/org/spigotmc/LogFilter.java
-new file mode 100644
-index 0000000..aa7e9ab
---- /dev/null
-+++ b/src/main/java/org/spigotmc/LogFilter.java
-@@ -0,0 +1,24 @@
-+package org.spigotmc;
-+
-+import java.util.logging.Filter;
-+import java.util.logging.LogRecord;
-+import java.util.regex.Pattern;
-+
-+public class LogFilter implements Filter
-+{
-+
-+    public boolean isLoggable(LogRecord record)
-+    {
-+        if ( record.getMessage() != null )
-+        {
-+            for ( Pattern pattern : SpigotConfig.logFilters )
-+            {
-+                if ( pattern.matcher( record.getMessage() ).matches() )
-+                {
-+                    return false;
-+                }
-+            }
-+        }
-+        return true;
-+    }
-+}
-diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index a3ddb99..e65978b 100644
---- a/src/main/java/org/spigotmc/SpigotConfig.java
-+++ b/src/main/java/org/spigotmc/SpigotConfig.java
-@@ -10,6 +10,8 @@ import java.util.HashMap;
- import java.util.List;
- import java.util.Map;
- import java.util.logging.Level;
-+import java.util.regex.Pattern;
-+import java.util.regex.PatternSyntaxException;
- import net.minecraft.server.MinecraftServer;
- import org.bukkit.Bukkit;
- import org.bukkit.ChatColor;
-@@ -167,4 +169,27 @@ public class SpigotConfig
-         outdatedClientMessage = transform( getString( "messages.outdated-client", "Outdated client!" ) );
-         outdatedServerMessage = transform( getString( "messages.outdated-server", "Outdated server!" ) );
-     }
-+
-+    public static List<Pattern> logFilters;
-+    private static void filters()
-+    {
-+        List<String> def = Arrays.asList( new String[]
-+        {
-+            "^(.*)(/login)(.*)$"
-+        } );
-+        logFilters = new ArrayList<Pattern>();
-+
-+        for ( String regex : (List<String>) getList( "settings.log-filters", def ) )
-+        {
-+            try
-+            {
-+                logFilters.add( Pattern.compile( regex ) );
-+            } catch ( PatternSyntaxException ex )
-+            {
-+                Bukkit.getLogger().log( Level.WARNING, "Supplied filter " + regex + " is invalid, ignoring!", ex );
-+            }
-+        }
-+
-+        Bukkit.getLogger().setFilter( new LogFilter() );
-+    }
- }
--- 
-1.8.3.2
-
diff --git a/CraftBukkit-Patches/0044-Make-AnvilInventory.getItem-use-both-containers.-Fix.patch b/CraftBukkit-Patches/0043-Make-AnvilInventory.getItem-use-both-containers.-Fix.patch
similarity index 97%
rename from CraftBukkit-Patches/0044-Make-AnvilInventory.getItem-use-both-containers.-Fix.patch
rename to CraftBukkit-Patches/0043-Make-AnvilInventory.getItem-use-both-containers.-Fix.patch
index 2e53eb7ef9..a25b164a5a 100644
--- a/CraftBukkit-Patches/0044-Make-AnvilInventory.getItem-use-both-containers.-Fix.patch
+++ b/CraftBukkit-Patches/0043-Make-AnvilInventory.getItem-use-both-containers.-Fix.patch
@@ -1,4 +1,4 @@
-From c0e37b19f9d11820289d0edb5624d493fca0c55b Mon Sep 17 00:00:00 2001
+From b3807b02eb0bfe85f417fd342dc93f9c3d3203fb 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/0045-Properly-Close-Inventories.patch b/CraftBukkit-Patches/0044-Properly-Close-Inventories.patch
similarity index 97%
rename from CraftBukkit-Patches/0045-Properly-Close-Inventories.patch
rename to CraftBukkit-Patches/0044-Properly-Close-Inventories.patch
index f1d6bf7e7a..ed791fa6ce 100644
--- a/CraftBukkit-Patches/0045-Properly-Close-Inventories.patch
+++ b/CraftBukkit-Patches/0044-Properly-Close-Inventories.patch
@@ -1,4 +1,4 @@
-From 345300a113335095d65efe3e842bbd3cf716895f Mon Sep 17 00:00:00 2001
+From 294dbdd3f2228baf157b1ac52d8934e97f5718e4 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/0046-Disallow-Interaction-With-Self.patch b/CraftBukkit-Patches/0045-Disallow-Interaction-With-Self.patch
similarity index 93%
rename from CraftBukkit-Patches/0046-Disallow-Interaction-With-Self.patch
rename to CraftBukkit-Patches/0045-Disallow-Interaction-With-Self.patch
index 8753d0e409..9560ddbd74 100644
--- a/CraftBukkit-Patches/0046-Disallow-Interaction-With-Self.patch
+++ b/CraftBukkit-Patches/0045-Disallow-Interaction-With-Self.patch
@@ -1,4 +1,4 @@
-From 8a8e127c2db46ac38c3aa1b576ec93f9c5274473 Mon Sep 17 00:00:00 2001
+From 9c8c93301cd83e61d774e2cda6b641f5c7e9ed8b 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/0047-Lower-Chunk-Compression.patch b/CraftBukkit-Patches/0046-Lower-Chunk-Compression.patch
similarity index 93%
rename from CraftBukkit-Patches/0047-Lower-Chunk-Compression.patch
rename to CraftBukkit-Patches/0046-Lower-Chunk-Compression.patch
index 7e7fa09082..56ab2147d2 100644
--- a/CraftBukkit-Patches/0047-Lower-Chunk-Compression.patch
+++ b/CraftBukkit-Patches/0046-Lower-Chunk-Compression.patch
@@ -1,4 +1,4 @@
-From aafc4ddbcafdae73c8e3eb9caf5740f324d48b62 Mon Sep 17 00:00:00 2001
+From 466df5e17f27655c88c8047ac2ffa10f2b3a1998 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/0048-Entity-Mount-and-Dismount-Events.patch b/CraftBukkit-Patches/0047-Entity-Mount-and-Dismount-Events.patch
similarity index 97%
rename from CraftBukkit-Patches/0048-Entity-Mount-and-Dismount-Events.patch
rename to CraftBukkit-Patches/0047-Entity-Mount-and-Dismount-Events.patch
index 5721dd271b..86351ae15c 100644
--- a/CraftBukkit-Patches/0048-Entity-Mount-and-Dismount-Events.patch
+++ b/CraftBukkit-Patches/0047-Entity-Mount-and-Dismount-Events.patch
@@ -1,4 +1,4 @@
-From 3ba92e1abcd9685e94f0d708d0124df9557277a6 Mon Sep 17 00:00:00 2001
+From 28412c787ebb06f93444f4764fd519b9b57f63aa Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 2 Jul 2013 20:32:49 +1000
 Subject: [PATCH] Entity Mount and Dismount Events
diff --git a/CraftBukkit-Patches/0049-Properly-Consume-Bonemeal-in-Dispensers.patch b/CraftBukkit-Patches/0048-Properly-Consume-Bonemeal-in-Dispensers.patch
similarity index 97%
rename from CraftBukkit-Patches/0049-Properly-Consume-Bonemeal-in-Dispensers.patch
rename to CraftBukkit-Patches/0048-Properly-Consume-Bonemeal-in-Dispensers.patch
index 2360f5a52a..2390392efc 100644
--- a/CraftBukkit-Patches/0049-Properly-Consume-Bonemeal-in-Dispensers.patch
+++ b/CraftBukkit-Patches/0048-Properly-Consume-Bonemeal-in-Dispensers.patch
@@ -1,4 +1,4 @@
-From ce6c551ec78c1733ade8eed48a279371a004ee3a Mon Sep 17 00:00:00 2001
+From 258a4e400cba9446117963f1041db424617430a9 Mon Sep 17 00:00:00 2001
 From: Alex Ciuba <alexciuba@gmail.com>
 Date: Mon, 10 Jun 2013 16:04:38 -0400
 Subject: [PATCH] Properly Consume Bonemeal in Dispensers
diff --git a/CraftBukkit-Patches/0050-Prevent-Ghost-Players-Caused-by-Plugins.patch b/CraftBukkit-Patches/0049-Prevent-Ghost-Players-Caused-by-Plugins.patch
similarity index 91%
rename from CraftBukkit-Patches/0050-Prevent-Ghost-Players-Caused-by-Plugins.patch
rename to CraftBukkit-Patches/0049-Prevent-Ghost-Players-Caused-by-Plugins.patch
index 8be84587bb..6fbc893cf0 100644
--- a/CraftBukkit-Patches/0050-Prevent-Ghost-Players-Caused-by-Plugins.patch
+++ b/CraftBukkit-Patches/0049-Prevent-Ghost-Players-Caused-by-Plugins.patch
@@ -1,4 +1,4 @@
-From 091244bc49de615628a6f3c70b50af9a30b3e1ef Mon Sep 17 00:00:00 2001
+From 19204e7a95da55b334559e9abeaa24e8ef728c44 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent Ghost Players Caused by Plugins
 Check if the player is still connected after firing event. Fixes BUKKIT-4327
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 3ddf3ae..7497560 100644
+index b10b9a7..c8186e6 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -467,6 +467,9 @@ public abstract class PlayerList {
diff --git a/CraftBukkit-Patches/0051-Entity-ticking-chunk-caching.patch b/CraftBukkit-Patches/0050-Entity-ticking-chunk-caching.patch
similarity index 89%
rename from CraftBukkit-Patches/0051-Entity-ticking-chunk-caching.patch
rename to CraftBukkit-Patches/0050-Entity-ticking-chunk-caching.patch
index 5082727c52..6282541151 100644
--- a/CraftBukkit-Patches/0051-Entity-ticking-chunk-caching.patch
+++ b/CraftBukkit-Patches/0050-Entity-ticking-chunk-caching.patch
@@ -1,4 +1,4 @@
-From 409b4a97107927b2825494d918cb57180710d9f1 Mon Sep 17 00:00:00 2001
+From 5b3d0a1d348968d282f6bfcc67dac9f47f2d74d6 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 3f4e2d5..35537c6 100644
+index baa5d55..c4978f6 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1200,6 +1200,7 @@ public abstract class World implements IBlockAccess {
+@@ -1192,6 +1192,7 @@ public abstract class World implements IBlockAccess {
          CrashReport crashreport;
          CrashReportSystemDetails crashreportsystemdetails;
  
@@ -17,7 +17,7 @@ index 3f4e2d5..35537c6 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
-@@ -1208,10 +1209,15 @@ public abstract class World implements IBlockAccess {
+@@ -1200,10 +1201,15 @@ public abstract class World implements IBlockAccess {
              }
  
              ChunkProviderServer chunkProviderServer = ((WorldServer) this).chunkProviderServer;
@@ -35,7 +35,7 @@ index 3f4e2d5..35537c6 100644
  
              try {
                  ++entity.ticksLived;
-@@ -1232,6 +1238,7 @@ public abstract class World implements IBlockAccess {
+@@ -1224,6 +1230,7 @@ public abstract class World implements IBlockAccess {
                  this.i.remove(i--);
              }
          }
@@ -43,7 +43,7 @@ index 3f4e2d5..35537c6 100644
  
          this.methodProfiler.c("remove");
          this.entityList.removeAll(this.f);
-@@ -1262,10 +1269,15 @@ public abstract class World implements IBlockAccess {
+@@ -1254,10 +1261,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/0052-Plug-World-Unload-Memory-Leak.patch b/CraftBukkit-Patches/0051-Plug-World-Unload-Memory-Leak.patch
similarity index 92%
rename from CraftBukkit-Patches/0052-Plug-World-Unload-Memory-Leak.patch
rename to CraftBukkit-Patches/0051-Plug-World-Unload-Memory-Leak.patch
index 7f8f7303f2..06f6ab73ad 100644
--- a/CraftBukkit-Patches/0052-Plug-World-Unload-Memory-Leak.patch
+++ b/CraftBukkit-Patches/0051-Plug-World-Unload-Memory-Leak.patch
@@ -1,4 +1,4 @@
-From 3d5b88405fa9bac3f3c128fc373bb65b577c23ca Mon Sep 17 00:00:00 2001
+From 86251fc0c7c4f783fdec8c41ebc3c65ee45f3b54 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/0053-Player-Collision-API.patch b/CraftBukkit-Patches/0052-Player-Collision-API.patch
similarity index 98%
rename from CraftBukkit-Patches/0053-Player-Collision-API.patch
rename to CraftBukkit-Patches/0052-Player-Collision-API.patch
index 8dee223197..43b948b743 100644
--- a/CraftBukkit-Patches/0053-Player-Collision-API.patch
+++ b/CraftBukkit-Patches/0052-Player-Collision-API.patch
@@ -1,4 +1,4 @@
-From 905390073f7d65f8c0963b5fed4e1cd85daa458d Mon Sep 17 00:00:00 2001
+From 7c62ad80df53048515179a7866b5918f8cd3f519 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
diff --git a/CraftBukkit-Patches/0054-Fully-Disable-Snooper-When-Not-Required.patch b/CraftBukkit-Patches/0053-Fully-Disable-Snooper-When-Not-Required.patch
similarity index 93%
rename from CraftBukkit-Patches/0054-Fully-Disable-Snooper-When-Not-Required.patch
rename to CraftBukkit-Patches/0053-Fully-Disable-Snooper-When-Not-Required.patch
index 7d651878e0..30816ec6e2 100644
--- a/CraftBukkit-Patches/0054-Fully-Disable-Snooper-When-Not-Required.patch
+++ b/CraftBukkit-Patches/0053-Fully-Disable-Snooper-When-Not-Required.patch
@@ -1,4 +1,4 @@
-From 102e1936c0748aa6f3ead6c5afd487cb77db2cde Mon Sep 17 00:00:00 2001
+From 96127508ec8eb9667c597c6f57ddf6654c6b8493 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/CraftBukkit-Patches/0055-Add-Getter-for-Entity-Invulnerability.patch b/CraftBukkit-Patches/0054-Add-Getter-for-Entity-Invulnerability.patch
similarity index 92%
rename from CraftBukkit-Patches/0055-Add-Getter-for-Entity-Invulnerability.patch
rename to CraftBukkit-Patches/0054-Add-Getter-for-Entity-Invulnerability.patch
index 8e4ac64d55..e226c507fa 100644
--- a/CraftBukkit-Patches/0055-Add-Getter-for-Entity-Invulnerability.patch
+++ b/CraftBukkit-Patches/0054-Add-Getter-for-Entity-Invulnerability.patch
@@ -1,4 +1,4 @@
-From dabdf5b931a35d41f2f843a35f8c3d9545892221 Mon Sep 17 00:00:00 2001
+From e11e6b35bb919489ebce6f3d47c3b62602f67b79 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/0056-Guard-entity-list.patch b/CraftBukkit-Patches/0055-Guard-entity-list.patch
similarity index 91%
rename from CraftBukkit-Patches/0056-Guard-entity-list.patch
rename to CraftBukkit-Patches/0055-Guard-entity-list.patch
index 454cc7bc7c..f85ee6aa85 100644
--- a/CraftBukkit-Patches/0056-Guard-entity-list.patch
+++ b/CraftBukkit-Patches/0055-Guard-entity-list.patch
@@ -1,11 +1,11 @@
-From e4739307ff133e2aead015ce083a58f2d3463d7e Mon Sep 17 00:00:00 2001
+From 8163e0485f3d3373199dd4eb02376cc1a3ee638d 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 35537c6..ede8912 100644
+index c4978f6..81534e3 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -29,7 +29,25 @@ import org.bukkit.event.weather.ThunderChangeEvent;
@@ -43,7 +43,7 @@ index 35537c6..ede8912 100644
      protected final gnu.trove.map.hash.TLongShortHashMap chunkTickList;
      protected float growthOdds = 100;
      protected float modifiedOdds = 100;
-@@ -1264,6 +1283,7 @@ public abstract class World implements IBlockAccess {
+@@ -1256,6 +1275,7 @@ public abstract class World implements IBlockAccess {
  
          org.spigotmc.ActivationRange.activateEntities(this); // Spigot
          timings.entityTick.startTiming(); // Spigot
@@ -51,7 +51,7 @@ index 35537c6..ede8912 100644
          for (i = 0; i < this.entityList.size(); ++i) {
              entity = (Entity) this.entityList.get(i);
  
-@@ -1311,12 +1331,15 @@ public abstract class World implements IBlockAccess {
+@@ -1303,12 +1323,15 @@ public abstract class World implements IBlockAccess {
                      this.getChunkAt(j, k).b(entity);
                  }
  
diff --git a/CraftBukkit-Patches/0057-Cap-Minimum-Player-Speed.patch b/CraftBukkit-Patches/0056-Cap-Minimum-Player-Speed.patch
similarity index 94%
rename from CraftBukkit-Patches/0057-Cap-Minimum-Player-Speed.patch
rename to CraftBukkit-Patches/0056-Cap-Minimum-Player-Speed.patch
index 1ff9e88331..6e0ca1bb86 100644
--- a/CraftBukkit-Patches/0057-Cap-Minimum-Player-Speed.patch
+++ b/CraftBukkit-Patches/0056-Cap-Minimum-Player-Speed.patch
@@ -1,4 +1,4 @@
-From a9e2039b9c817fd82bf8796da1b344dbeceb6475 Mon Sep 17 00:00:00 2001
+From 2815b8afc356ab223268c37757c4614ca9de3e0a 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/0058-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch b/CraftBukkit-Patches/0057-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch
similarity index 94%
rename from CraftBukkit-Patches/0058-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch
rename to CraftBukkit-Patches/0057-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch
index d786913ec4..4f3e040d13 100644
--- a/CraftBukkit-Patches/0058-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch
+++ b/CraftBukkit-Patches/0057-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch
@@ -1,4 +1,4 @@
-From e7b9d56645ff0e83b26e9e6621ffe96001288c4e Mon Sep 17 00:00:00 2001
+From c30f609a87e5e223b4119072f2f62f2b3d03b060 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/0059-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch b/CraftBukkit-Patches/0058-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch
similarity index 96%
rename from CraftBukkit-Patches/0059-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch
rename to CraftBukkit-Patches/0058-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch
index 08cae8a515..22fba1ddcd 100644
--- a/CraftBukkit-Patches/0059-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch
+++ b/CraftBukkit-Patches/0058-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch
@@ -1,4 +1,4 @@
-From 019b3e2bd9fce74bce6fec040c7f85073d5842a2 Mon Sep 17 00:00:00 2001
+From d50e13b301a56c8cc19761f7265d571a37dceb19 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/0060-Allow-Disabling-of-1.6.3-Structure-Saving.patch b/CraftBukkit-Patches/0059-Allow-Disabling-of-1.6.3-Structure-Saving.patch
similarity index 97%
rename from CraftBukkit-Patches/0060-Allow-Disabling-of-1.6.3-Structure-Saving.patch
rename to CraftBukkit-Patches/0059-Allow-Disabling-of-1.6.3-Structure-Saving.patch
index d2b80f4dc6..cdb26c3124 100644
--- a/CraftBukkit-Patches/0060-Allow-Disabling-of-1.6.3-Structure-Saving.patch
+++ b/CraftBukkit-Patches/0059-Allow-Disabling-of-1.6.3-Structure-Saving.patch
@@ -1,4 +1,4 @@
-From 35c24fa363d24102afd5b9ebb087ebba6e1e845a Mon Sep 17 00:00:00 2001
+From 44206ecad7d17dab148dd456cbecc4fa8e8ac9e8 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/0061-Item-Despawn-Rate.patch b/CraftBukkit-Patches/0060-Item-Despawn-Rate.patch
similarity index 96%
rename from CraftBukkit-Patches/0061-Item-Despawn-Rate.patch
rename to CraftBukkit-Patches/0060-Item-Despawn-Rate.patch
index 73187c75f3..b31b01a07d 100644
--- a/CraftBukkit-Patches/0061-Item-Despawn-Rate.patch
+++ b/CraftBukkit-Patches/0060-Item-Despawn-Rate.patch
@@ -1,4 +1,4 @@
-From 888b4be4d4d65a9dae6c04f31efe23d1c136c00d Mon Sep 17 00:00:00 2001
+From 6bb2e93f0496b72218398255140567089146abf2 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/0062-Don-t-Special-Case-X-Move-Value.patch b/CraftBukkit-Patches/0061-Don-t-Special-Case-X-Move-Value.patch
similarity index 96%
rename from CraftBukkit-Patches/0062-Don-t-Special-Case-X-Move-Value.patch
rename to CraftBukkit-Patches/0061-Don-t-Special-Case-X-Move-Value.patch
index 564cc47bca..023574fbc8 100644
--- a/CraftBukkit-Patches/0062-Don-t-Special-Case-X-Move-Value.patch
+++ b/CraftBukkit-Patches/0061-Don-t-Special-Case-X-Move-Value.patch
@@ -1,4 +1,4 @@
-From 1e90d6dd86ba54a7fd68631543d9f40764aa5d41 Mon Sep 17 00:00:00 2001
+From 4588bde585de197c010bca41d1c2a0e2fa32f07e 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/0063-Implement-respawn-API.patch b/CraftBukkit-Patches/0062-Implement-respawn-API.patch
similarity index 93%
rename from CraftBukkit-Patches/0063-Implement-respawn-API.patch
rename to CraftBukkit-Patches/0062-Implement-respawn-API.patch
index 28b058c942..0b59b75410 100644
--- a/CraftBukkit-Patches/0063-Implement-respawn-API.patch
+++ b/CraftBukkit-Patches/0062-Implement-respawn-API.patch
@@ -1,4 +1,4 @@
-From 542bb89a252992890ee1c363339e05c3416f292b Mon Sep 17 00:00:00 2001
+From 9ec229ca5ae594d9aef1a8df8bb350c133a18f42 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/0064-Fix-BrewingStands-Removing-NBT-Potions.patch b/CraftBukkit-Patches/0063-Fix-BrewingStands-Removing-NBT-Potions.patch
similarity index 92%
rename from CraftBukkit-Patches/0064-Fix-BrewingStands-Removing-NBT-Potions.patch
rename to CraftBukkit-Patches/0063-Fix-BrewingStands-Removing-NBT-Potions.patch
index 1f3ea0f4fd..2445ea7397 100644
--- a/CraftBukkit-Patches/0064-Fix-BrewingStands-Removing-NBT-Potions.patch
+++ b/CraftBukkit-Patches/0063-Fix-BrewingStands-Removing-NBT-Potions.patch
@@ -1,11 +1,11 @@
-From 06b934ee352dad1b2b6e8c3a3d3c794b85dab4b8 Mon Sep 17 00:00:00 2001
+From 55c9dabeb041909496b921d693d0feba3bd4f060 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/src/main/java/net/minecraft/server/BlockBrewingStand.java b/src/main/java/net/minecraft/server/BlockBrewingStand.java
-index 270b2cb..308207a 100644
+index 3287d77..eabea5a 100644
 --- a/src/main/java/net/minecraft/server/BlockBrewingStand.java
 +++ b/src/main/java/net/minecraft/server/BlockBrewingStand.java
 @@ -86,7 +86,13 @@ public class BlockBrewingStand extends BlockContainer {
diff --git a/CraftBukkit-Patches/0065-Arrow-Despawn-Rate.patch b/CraftBukkit-Patches/0064-Arrow-Despawn-Rate.patch
similarity index 95%
rename from CraftBukkit-Patches/0065-Arrow-Despawn-Rate.patch
rename to CraftBukkit-Patches/0064-Arrow-Despawn-Rate.patch
index b54418ba10..a6858317c6 100644
--- a/CraftBukkit-Patches/0065-Arrow-Despawn-Rate.patch
+++ b/CraftBukkit-Patches/0064-Arrow-Despawn-Rate.patch
@@ -1,4 +1,4 @@
-From 7fe7946cf5bfa020ff811aff91c7046f8e50f536 Mon Sep 17 00:00:00 2001
+From 62038f4721687ef20cce1b52a5ea0eb0cccf7291 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/0066-Watchdog-Thread.patch b/CraftBukkit-Patches/0065-Watchdog-Thread.patch
similarity index 96%
rename from CraftBukkit-Patches/0066-Watchdog-Thread.patch
rename to CraftBukkit-Patches/0065-Watchdog-Thread.patch
index 4e78c332d8..8ac42badca 100644
--- a/CraftBukkit-Patches/0066-Watchdog-Thread.patch
+++ b/CraftBukkit-Patches/0065-Watchdog-Thread.patch
@@ -1,4 +1,4 @@
-From d53c57c05f88c08c5cc27eb9fa227f4dccfce3f3 Mon Sep 17 00:00:00 2001
+From 1065d7a11aacc532a428121fc5002c730efc6f4d 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.
@@ -142,12 +142,12 @@ index 0000000..3ca7a46
 +    }
 +}
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index e65978b..94a1e3b 100644
+index a3ddb99..98217ac 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
-@@ -192,4 +192,18 @@ public class SpigotConfig
- 
-         Bukkit.getLogger().setFilter( new LogFilter() );
+@@ -167,4 +167,18 @@ public class SpigotConfig
+         outdatedClientMessage = transform( getString( "messages.outdated-client", "Outdated client!" ) );
+         outdatedServerMessage = transform( getString( "messages.outdated-server", "Outdated server!" ) );
      }
 +
 +    public static int timeoutTime = 60;