diff --git a/CraftBukkit-Patches/0024-Netty.patch b/CraftBukkit-Patches/0023-Netty.patch
similarity index 99%
rename from CraftBukkit-Patches/0024-Netty.patch
rename to CraftBukkit-Patches/0023-Netty.patch
index c7cb7b7f6..701b9b987 100644
--- a/CraftBukkit-Patches/0024-Netty.patch
+++ b/CraftBukkit-Patches/0023-Netty.patch
@@ -1,4 +1,4 @@
-From d4c1e16d482be2abb1bf40a1afeb6f958fca4b84 Mon Sep 17 00:00:00 2001
+From d7703ce7f9edfb6f80761546feb3658809bd75e8 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 2 Jul 2013 09:06:29 +1000
 Subject: [PATCH] Netty
@@ -160,7 +160,7 @@ index 2a96168..6ffc927 100644
              this.b = true;
          } catch (Exception exception) {
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 8499c7f..e5a09b3 100644
+index 8ef108d..637fcf2 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -6,6 +6,8 @@ import java.io.IOException;
@@ -172,9 +172,9 @@ index 8499c7f..e5a09b3 100644
  import java.util.HashMap;
  import java.util.List;
  import java.util.Map;
-@@ -154,4 +156,62 @@ public class SpigotConfig
-         commands.put( "restart", new RestartCommand( "restart" ) );
-         WatchdogThread.doStart( timeoutTime, restartOnCrash );
+@@ -142,4 +144,62 @@ public class SpigotConfig
+     {
+         commands.put( "tps", new TicksPerSecondCommand( "tps" ) );
      }
 +
 +    public static class Listener
diff --git a/CraftBukkit-Patches/0025-PlayerItemDamageEvent.patch b/CraftBukkit-Patches/0024-PlayerItemDamageEvent.patch
similarity index 97%
rename from CraftBukkit-Patches/0025-PlayerItemDamageEvent.patch
rename to CraftBukkit-Patches/0024-PlayerItemDamageEvent.patch
index f1d813044..e09e04a7a 100644
--- a/CraftBukkit-Patches/0025-PlayerItemDamageEvent.patch
+++ b/CraftBukkit-Patches/0024-PlayerItemDamageEvent.patch
@@ -1,4 +1,4 @@
-From b9aa8fd32c77972fef5c23f0bae3cee24e821e2c Mon Sep 17 00:00:00 2001
+From 70e523db2b07a95427820829af2c9b025585dbd6 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/0026-Faster-UUID-for-entities.patch b/CraftBukkit-Patches/0025-Faster-UUID-for-entities.patch
similarity index 91%
rename from CraftBukkit-Patches/0026-Faster-UUID-for-entities.patch
rename to CraftBukkit-Patches/0025-Faster-UUID-for-entities.patch
index 412d6653c..781646853 100644
--- a/CraftBukkit-Patches/0026-Faster-UUID-for-entities.patch
+++ b/CraftBukkit-Patches/0025-Faster-UUID-for-entities.patch
@@ -1,4 +1,4 @@
-From 7037c64aaf24c9f00e85103e34312652e09cb091 Mon Sep 17 00:00:00 2001
+From 8266b2fa8f23a47ae4120d7eb37f466539187269 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 4a769ed..d4bd4ed 100644
+index 4183297..852dfd3 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -132,7 +132,7 @@ public abstract class Entity {
diff --git a/CraftBukkit-Patches/0027-Prevent-NPE-in-CraftSign.patch b/CraftBukkit-Patches/0026-Prevent-NPE-in-CraftSign.patch
similarity index 96%
rename from CraftBukkit-Patches/0027-Prevent-NPE-in-CraftSign.patch
rename to CraftBukkit-Patches/0026-Prevent-NPE-in-CraftSign.patch
index f3f25748d..0a8b9fdb7 100644
--- a/CraftBukkit-Patches/0027-Prevent-NPE-in-CraftSign.patch
+++ b/CraftBukkit-Patches/0026-Prevent-NPE-in-CraftSign.patch
@@ -1,4 +1,4 @@
-From 958dd4fae14a9cb51416e08d6a30f658a62265d2 Mon Sep 17 00:00:00 2001
+From 08668583e7fe45e2cae6330d4a69861300fb3740 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/0028-Entity-Tracking-Ranges.patch b/CraftBukkit-Patches/0027-Entity-Tracking-Ranges.patch
similarity index 98%
rename from CraftBukkit-Patches/0028-Entity-Tracking-Ranges.patch
rename to CraftBukkit-Patches/0027-Entity-Tracking-Ranges.patch
index 02cb7f551..d2281dd22 100644
--- a/CraftBukkit-Patches/0028-Entity-Tracking-Ranges.patch
+++ b/CraftBukkit-Patches/0027-Entity-Tracking-Ranges.patch
@@ -1,4 +1,4 @@
-From f60e231ba77aaf5929d124c1d1e67e3d5d2329a7 Mon Sep 17 00:00:00 2001
+From 85d83e03d344fff2a6ef62a657ab250ed1375583 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
@@ -12,7 +12,7 @@ This has multiple benefits:
 4) Less client lag - Not trying to render distant item frames and paintings and entities will reduce entity count on the client, which is major for shop/town worlds which may use tons of item frames.
 
 diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
-index 7f23f71..7bb153c 100644
+index ebbef6a..e833454 100644
 --- a/src/main/java/net/minecraft/server/EntityTracker.java
 +++ b/src/main/java/net/minecraft/server/EntityTracker.java
 @@ -88,6 +88,7 @@ public class EntityTracker {
diff --git a/CraftBukkit-Patches/0029-BungeeCord-Support.patch b/CraftBukkit-Patches/0028-BungeeCord-Support.patch
similarity index 97%
rename from CraftBukkit-Patches/0029-BungeeCord-Support.patch
rename to CraftBukkit-Patches/0028-BungeeCord-Support.patch
index a4b1dc7fe..7f2549955 100644
--- a/CraftBukkit-Patches/0029-BungeeCord-Support.patch
+++ b/CraftBukkit-Patches/0028-BungeeCord-Support.patch
@@ -1,4 +1,4 @@
-From 79f9e280ee27db93df6aa9911cd3fa09f9e93c0b Mon Sep 17 00:00:00 2001
+From ab31e3b5708f623c6a83b08c12b8505fe40e6e02 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Mar 2013 11:15:11 +1100
 Subject: [PATCH] BungeeCord Support
@@ -75,7 +75,7 @@ index 20be022..e242f7d 100644
  
      public Player.Spigot spigot()
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index e5a09b3..a598954 100644
+index 637fcf2..92cfac6 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -7,6 +7,7 @@ import java.lang.reflect.InvocationTargetException;
@@ -86,7 +86,7 @@ index e5a09b3..a598954 100644
  import java.util.Collections;
  import java.util.HashMap;
  import java.util.List;
-@@ -214,4 +215,14 @@ public class SpigotConfig
+@@ -202,4 +203,14 @@ public class SpigotConfig
  
          nettyThreads = getInt( "settings.netty-threads", 3 );
      }
diff --git a/CraftBukkit-Patches/0030-Limit-Custom-Map-Rendering.patch b/CraftBukkit-Patches/0029-Limit-Custom-Map-Rendering.patch
similarity index 98%
rename from CraftBukkit-Patches/0030-Limit-Custom-Map-Rendering.patch
rename to CraftBukkit-Patches/0029-Limit-Custom-Map-Rendering.patch
index e1926eb6d..0c118af37 100644
--- a/CraftBukkit-Patches/0030-Limit-Custom-Map-Rendering.patch
+++ b/CraftBukkit-Patches/0029-Limit-Custom-Map-Rendering.patch
@@ -1,4 +1,4 @@
-From fd8e7a05c6826d07b7f98b8c2e7eba5d2dbbb935 Mon Sep 17 00:00:00 2001
+From 6d55041a2fa334f514a7bc01c7c41c160fecfe1b 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/0031-Enable-Improved-Ping-Sending.patch b/CraftBukkit-Patches/0030-Enable-Improved-Ping-Sending.patch
similarity index 97%
rename from CraftBukkit-Patches/0031-Enable-Improved-Ping-Sending.patch
rename to CraftBukkit-Patches/0030-Enable-Improved-Ping-Sending.patch
index 783f4b9ad..7e286f80a 100644
--- a/CraftBukkit-Patches/0031-Enable-Improved-Ping-Sending.patch
+++ b/CraftBukkit-Patches/0030-Enable-Improved-Ping-Sending.patch
@@ -1,4 +1,4 @@
-From 28a5c1180a8392cb0c4b5686cee3e605311beb35 Mon Sep 17 00:00:00 2001
+From a87ea76cdfdaefe17fd09b8639cbc35d13e97293 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 24 Feb 2013 20:45:20 +1100
 Subject: [PATCH] Enable Improved Ping Sending
diff --git a/CraftBukkit-Patches/0032-Filter-Invalid-Names.patch b/CraftBukkit-Patches/0031-Filter-Invalid-Names.patch
similarity index 95%
rename from CraftBukkit-Patches/0032-Filter-Invalid-Names.patch
rename to CraftBukkit-Patches/0031-Filter-Invalid-Names.patch
index 33a2153cb..8a010d8b7 100644
--- a/CraftBukkit-Patches/0032-Filter-Invalid-Names.patch
+++ b/CraftBukkit-Patches/0031-Filter-Invalid-Names.patch
@@ -1,4 +1,4 @@
-From af158b963d4d6ed7fd45b5dd918ce3364ec07f7c Mon Sep 17 00:00:00 2001
+From 915d36b2eadd6373c1e671d1f1ca90eb4bac08ad Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 25 Jul 2013 17:06:02 +1000
 Subject: [PATCH] Filter Invalid Names
diff --git a/CraftBukkit-Patches/0033-Thread-Naming-and-Tweaks.patch b/CraftBukkit-Patches/0032-Thread-Naming-and-Tweaks.patch
similarity index 97%
rename from CraftBukkit-Patches/0033-Thread-Naming-and-Tweaks.patch
rename to CraftBukkit-Patches/0032-Thread-Naming-and-Tweaks.patch
index d66d6b187..fdb1bf73f 100644
--- a/CraftBukkit-Patches/0033-Thread-Naming-and-Tweaks.patch
+++ b/CraftBukkit-Patches/0032-Thread-Naming-and-Tweaks.patch
@@ -1,4 +1,4 @@
-From a621a7f48c384ee6ec697abe87822fd4ad4bd6c5 Mon Sep 17 00:00:00 2001
+From 6e2f5a24eec742f5d23f95aaf2808d3e9f300a7f 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Thread Naming and Tweaks
 Removes the sleep forever thread and adds useful names for debugging to all staged thread files.
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index fa02974..a534bbd 100644
+index 4759f6a..32f0e75 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -34,7 +34,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
diff --git a/CraftBukkit-Patches/0034-Close-Unloaded-Save-Files.patch b/CraftBukkit-Patches/0033-Close-Unloaded-Save-Files.patch
similarity index 96%
rename from CraftBukkit-Patches/0034-Close-Unloaded-Save-Files.patch
rename to CraftBukkit-Patches/0033-Close-Unloaded-Save-Files.patch
index 4a2e59ece..b136a6119 100644
--- a/CraftBukkit-Patches/0034-Close-Unloaded-Save-Files.patch
+++ b/CraftBukkit-Patches/0033-Close-Unloaded-Save-Files.patch
@@ -1,4 +1,4 @@
-From a6d2fbd57b8702a43a660b1360d0c3f442c02816 Mon Sep 17 00:00:00 2001
+From 6bb9f5d2f82fe045480d9ba164325e2205e28344 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 44af717..e65c752 100644
+index acd5b42..84ff542 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -37,6 +37,8 @@ import net.minecraft.server.MinecraftServer;
diff --git a/CraftBukkit-Patches/0035-Improve-NextTickList-Performance.patch b/CraftBukkit-Patches/0034-Improve-NextTickList-Performance.patch
similarity index 99%
rename from CraftBukkit-Patches/0035-Improve-NextTickList-Performance.patch
rename to CraftBukkit-Patches/0034-Improve-NextTickList-Performance.patch
index d905e6a2b..0bf1b3745 100644
--- a/CraftBukkit-Patches/0035-Improve-NextTickList-Performance.patch
+++ b/CraftBukkit-Patches/0034-Improve-NextTickList-Performance.patch
@@ -1,4 +1,4 @@
-From d608b1e2af6bc1d8e853aff5c466138653bb7ef2 Mon Sep 17 00:00:00 2001
+From 271f0e350784d53e752a939d5fba64d6e90d3402 Mon Sep 17 00:00:00 2001
 From: Mike Primm <mike@primmhome.com>
 Date: Wed, 24 Apr 2013 01:43:33 -0500
 Subject: [PATCH] Improve NextTickList Performance
@@ -20,7 +20,7 @@ index acf8838..1e3e0f8 100644
  
      public NextTickListEntry a(long i) {
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index db0345d..1f864a2 100644
+index c1239f1..588c630 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -25,8 +25,8 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
diff --git a/CraftBukkit-Patches/0036-Remove-o-Option.patch b/CraftBukkit-Patches/0035-Remove-o-Option.patch
similarity index 92%
rename from CraftBukkit-Patches/0036-Remove-o-Option.patch
rename to CraftBukkit-Patches/0035-Remove-o-Option.patch
index a7646e1ff..52b53914e 100644
--- a/CraftBukkit-Patches/0036-Remove-o-Option.patch
+++ b/CraftBukkit-Patches/0035-Remove-o-Option.patch
@@ -1,4 +1,4 @@
-From 42ff63133d4fb993c1242d0db04e02c23dd9f3a9 Mon Sep 17 00:00:00 2001
+From fe47ab3364fde7609ad22c4e98ca6fb713b243cf 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/0037-Recipe-Deconstruction.patch b/CraftBukkit-Patches/0036-Recipe-Deconstruction.patch
similarity index 97%
rename from CraftBukkit-Patches/0037-Recipe-Deconstruction.patch
rename to CraftBukkit-Patches/0036-Recipe-Deconstruction.patch
index 500b03463..7ef0168b9 100644
--- a/CraftBukkit-Patches/0037-Recipe-Deconstruction.patch
+++ b/CraftBukkit-Patches/0036-Recipe-Deconstruction.patch
@@ -1,4 +1,4 @@
-From 7ba25a1242facf33a7617b62a35823d88d7e2942 Mon Sep 17 00:00:00 2001
+From e3c6863c014cf05fd149bf2ab25491117164fb8a 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/0038-Implement-Arrow-API.patch b/CraftBukkit-Patches/0037-Implement-Arrow-API.patch
similarity index 93%
rename from CraftBukkit-Patches/0038-Implement-Arrow-API.patch
rename to CraftBukkit-Patches/0037-Implement-Arrow-API.patch
index 2e351570d..417ea9555 100644
--- a/CraftBukkit-Patches/0038-Implement-Arrow-API.patch
+++ b/CraftBukkit-Patches/0037-Implement-Arrow-API.patch
@@ -1,4 +1,4 @@
-From 93a420b1b2fa6da25a0f38fca8dcba69f2e39365 Mon Sep 17 00:00:00 2001
+From de25dbdf3ecc440ee522364a9f535af596ca15c6 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/0039-Particle-API.patch b/CraftBukkit-Patches/0038-Particle-API.patch
similarity index 99%
rename from CraftBukkit-Patches/0039-Particle-API.patch
rename to CraftBukkit-Patches/0038-Particle-API.patch
index a63abc760..68807bd97 100644
--- a/CraftBukkit-Patches/0039-Particle-API.patch
+++ b/CraftBukkit-Patches/0038-Particle-API.patch
@@ -1,4 +1,4 @@
-From 922b5a63c71b56026841350a392f429942414d0b Mon Sep 17 00:00:00 2001
+From 044ddcbc15cf82f9b460c57e0efb56cb02071b7d Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 16:14:30 +1000
 Subject: [PATCH] Particle API
diff --git a/CraftBukkit-Patches/0040-Hopper-Cooldowns.patch b/CraftBukkit-Patches/0039-Hopper-Cooldowns.patch
similarity index 98%
rename from CraftBukkit-Patches/0040-Hopper-Cooldowns.patch
rename to CraftBukkit-Patches/0039-Hopper-Cooldowns.patch
index da7fbd998..f1ef536fe 100644
--- a/CraftBukkit-Patches/0040-Hopper-Cooldowns.patch
+++ b/CraftBukkit-Patches/0039-Hopper-Cooldowns.patch
@@ -1,4 +1,4 @@
-From 5eb857158aa0a6114412d88e26a3434b2b556d7e Mon Sep 17 00:00:00 2001
+From 43d0965a4e505944e32e156b6a0e39baeb82ebd5 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/0041-Prevent-Shutdown-Hang.patch b/CraftBukkit-Patches/0040-Prevent-Shutdown-Hang.patch
similarity index 94%
rename from CraftBukkit-Patches/0041-Prevent-Shutdown-Hang.patch
rename to CraftBukkit-Patches/0040-Prevent-Shutdown-Hang.patch
index 300d78722..818207959 100644
--- a/CraftBukkit-Patches/0041-Prevent-Shutdown-Hang.patch
+++ b/CraftBukkit-Patches/0040-Prevent-Shutdown-Hang.patch
@@ -1,4 +1,4 @@
-From 0dc0c332b02bfa4d76bc029e89a6c59f28b13198 Mon Sep 17 00:00:00 2001
+From 9bc27c7532f54fe34ead4dbb2940c3724639d5e0 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/0042-Implement-SpawnerSpawnEvent.patch b/CraftBukkit-Patches/0041-Implement-SpawnerSpawnEvent.patch
similarity index 98%
rename from CraftBukkit-Patches/0042-Implement-SpawnerSpawnEvent.patch
rename to CraftBukkit-Patches/0041-Implement-SpawnerSpawnEvent.patch
index 6ece3bdb0..aa93f49fb 100644
--- a/CraftBukkit-Patches/0042-Implement-SpawnerSpawnEvent.patch
+++ b/CraftBukkit-Patches/0041-Implement-SpawnerSpawnEvent.patch
@@ -1,4 +1,4 @@
-From 5007d731040f3c02b189a979c40c961f27e3e16b Mon Sep 17 00:00:00 2001
+From 572345b8ef0a594cd823a4b2c7e3228974047eab 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.
diff --git a/CraftBukkit-Patches/0043-Firework-Meta-Crash-Fix.patch b/CraftBukkit-Patches/0042-Firework-Meta-Crash-Fix.patch
similarity index 94%
rename from CraftBukkit-Patches/0043-Firework-Meta-Crash-Fix.patch
rename to CraftBukkit-Patches/0042-Firework-Meta-Crash-Fix.patch
index 8229eb8f5..c3dead276 100644
--- a/CraftBukkit-Patches/0043-Firework-Meta-Crash-Fix.patch
+++ b/CraftBukkit-Patches/0042-Firework-Meta-Crash-Fix.patch
@@ -1,4 +1,4 @@
-From 8ab517d12c2b337416c664f3760130263bbcf0dd Mon Sep 17 00:00:00 2001
+From d77eee29901ec8045af7dd5bd945c0ee6b70a6ef 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/0044-Do-Not-Search-for-Offline-Players.patch b/CraftBukkit-Patches/0043-Do-Not-Search-for-Offline-Players.patch
similarity index 93%
rename from CraftBukkit-Patches/0044-Do-Not-Search-for-Offline-Players.patch
rename to CraftBukkit-Patches/0043-Do-Not-Search-for-Offline-Players.patch
index 63baeebb1..17aeab8a8 100644
--- a/CraftBukkit-Patches/0044-Do-Not-Search-for-Offline-Players.patch
+++ b/CraftBukkit-Patches/0043-Do-Not-Search-for-Offline-Players.patch
@@ -1,4 +1,4 @@
-From ba298d9ef487cec55284286782d87dcba11a9f05 Mon Sep 17 00:00:00 2001
+From e7b329f9c5dc0009be2358d1548b8018997dbd87 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/0045-Enable-Foreign-Language-Signs.patch b/CraftBukkit-Patches/0044-Enable-Foreign-Language-Signs.patch
similarity index 93%
rename from CraftBukkit-Patches/0045-Enable-Foreign-Language-Signs.patch
rename to CraftBukkit-Patches/0044-Enable-Foreign-Language-Signs.patch
index 163bedc6b..607290a8e 100644
--- a/CraftBukkit-Patches/0045-Enable-Foreign-Language-Signs.patch
+++ b/CraftBukkit-Patches/0044-Enable-Foreign-Language-Signs.patch
@@ -1,4 +1,4 @@
-From 7397a685fe0b5034c6d10f2759092803aeed0443 Mon Sep 17 00:00:00 2001
+From 76a5762754c4dcce4f4c84e15ebb5d706a4f055a Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 17:53:03 +1000
 Subject: [PATCH] Enable Foreign Language Signs
diff --git a/CraftBukkit-Patches/0046-Spam-Filter-Exclusions.patch b/CraftBukkit-Patches/0045-Spam-Filter-Exclusions.patch
similarity index 93%
rename from CraftBukkit-Patches/0046-Spam-Filter-Exclusions.patch
rename to CraftBukkit-Patches/0045-Spam-Filter-Exclusions.patch
index 2faeb8d65..a09c49e1c 100644
--- a/CraftBukkit-Patches/0046-Spam-Filter-Exclusions.patch
+++ b/CraftBukkit-Patches/0045-Spam-Filter-Exclusions.patch
@@ -1,4 +1,4 @@
-From 6d6b2f23bb555609d07998469e3c6b3c85b8c463 Mon Sep 17 00:00:00 2001
+From 67f688671ac381a57dc702ea91878bf6f56473f1 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 17:59:22 +1000
 Subject: [PATCH] Spam Filter Exclusions
@@ -28,10 +28,10 @@ index 3437f98..fd6995d 100644
                          Waitable waitable = new Waitable() {
                              @Override
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index a598954..710d12c 100644
+index 92cfac6..86e3680 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
-@@ -225,4 +225,13 @@ public class SpigotConfig
+@@ -213,4 +213,13 @@ public class SpigotConfig
          bungeeAddresses = getList( "settings.bungeecord-addresses", bungeeAddresses );
          bungee = getBoolean( "settings.bungeecord", true );
      }
diff --git a/CraftBukkit-Patches/0047-Allow-Disabling-of-Command-Logging.patch b/CraftBukkit-Patches/0046-Allow-Disabling-of-Command-Logging.patch
similarity index 91%
rename from CraftBukkit-Patches/0047-Allow-Disabling-of-Command-Logging.patch
rename to CraftBukkit-Patches/0046-Allow-Disabling-of-Command-Logging.patch
index 84bee5557..5b0deb0ee 100644
--- a/CraftBukkit-Patches/0047-Allow-Disabling-of-Command-Logging.patch
+++ b/CraftBukkit-Patches/0046-Allow-Disabling-of-Command-Logging.patch
@@ -1,4 +1,4 @@
-From 7c64c6398ff05841f10215cdf719539dd258d358 Mon Sep 17 00:00:00 2001
+From 912bce0a32246db9bbe1624ed6f69d9188d9fd4e 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
@@ -23,10 +23,10 @@ index fd6995d..3c03d5a 100644
                  org.bukkit.craftbukkit.SpigotTimings.playerCommandTimer.stopTiming(); // Spigot
                  return;
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 710d12c..a1fb71f 100644
+index 86e3680..babedc0 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
-@@ -234,4 +234,10 @@ public class SpigotConfig
+@@ -222,4 +222,10 @@ public class SpigotConfig
              "/skill"
          } ) );
      }
diff --git a/CraftBukkit-Patches/0048-Allow-Disabling-of-Command-TabComplete.patch b/CraftBukkit-Patches/0047-Allow-Disabling-of-Command-TabComplete.patch
similarity index 91%
rename from CraftBukkit-Patches/0048-Allow-Disabling-of-Command-TabComplete.patch
rename to CraftBukkit-Patches/0047-Allow-Disabling-of-Command-TabComplete.patch
index 34860bd3f..e3160aaa5 100644
--- a/CraftBukkit-Patches/0048-Allow-Disabling-of-Command-TabComplete.patch
+++ b/CraftBukkit-Patches/0047-Allow-Disabling-of-Command-TabComplete.patch
@@ -1,4 +1,4 @@
-From 31f79e7e3a92d88ec1e3290104c71311d20b5d93 Mon Sep 17 00:00:00 2001
+From 249bf6de8ad4cb9037433ba6a12028857243a994 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
@@ -18,10 +18,10 @@ index c127f2a..0fa69ea 100644
              player.sendMessage(ChatColor.RED + "An internal error occurred while attempting to tab-complete this command");
              getLogger().log(Level.SEVERE, "Exception when " + player.getName() + " attempted to tab complete " + message, ex);
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index a1fb71f..85369ed 100644
+index babedc0..e146926 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
-@@ -240,4 +240,10 @@ public class SpigotConfig
+@@ -228,4 +228,10 @@ public class SpigotConfig
      {
          logCommands = getBoolean( "commands.log", true );
      }
diff --git a/CraftBukkit-Patches/0049-Configurable-Messages.patch b/CraftBukkit-Patches/0048-Configurable-Messages.patch
similarity index 97%
rename from CraftBukkit-Patches/0049-Configurable-Messages.patch
rename to CraftBukkit-Patches/0048-Configurable-Messages.patch
index 7ee43ec9e..da95f7bdf 100644
--- a/CraftBukkit-Patches/0049-Configurable-Messages.patch
+++ b/CraftBukkit-Patches/0048-Configurable-Messages.patch
@@ -1,4 +1,4 @@
-From 3038b2cfba13c9f0bad651f6097d123ab7b02da7 Mon Sep 17 00:00:00 2001
+From 5a1596d67176919fc09426d001bbf75e50ce8269 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
@@ -60,7 +60,7 @@ index 0fa69ea..404a626 100644
          return false;
      }
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 85369ed..53c66fc 100644
+index e146926..1d9d3c9 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -15,6 +15,7 @@ import java.util.Map;
@@ -71,7 +71,7 @@ index 85369ed..53c66fc 100644
  import org.bukkit.command.Command;
  import org.bukkit.configuration.file.YamlConfiguration;
  import org.bukkit.craftbukkit.command.TicksPerSecondCommand;
-@@ -246,4 +247,22 @@ public class SpigotConfig
+@@ -234,4 +235,22 @@ public class SpigotConfig
      {
          tabComplete = getBoolean( "commands.tab-complete", true );
      }
diff --git a/CraftBukkit-Patches/0050-Allow-Disabling-of-Random-Lighting-Updates.patch b/CraftBukkit-Patches/0049-Allow-Disabling-of-Random-Lighting-Updates.patch
similarity index 94%
rename from CraftBukkit-Patches/0050-Allow-Disabling-of-Random-Lighting-Updates.patch
rename to CraftBukkit-Patches/0049-Allow-Disabling-of-Random-Lighting-Updates.patch
index fc449a837..53efd9f34 100644
--- a/CraftBukkit-Patches/0050-Allow-Disabling-of-Random-Lighting-Updates.patch
+++ b/CraftBukkit-Patches/0049-Allow-Disabling-of-Random-Lighting-Updates.patch
@@ -1,11 +1,11 @@
-From fd3eff3029737a3cd8ef22f73e64402a412f3119 Mon Sep 17 00:00:00 2001
+From fedd7e005c23bce7405ae6ae8360ea9177ff6537 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 211127b..8bd7876 100644
+index 51a8d58..84ee535 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -2103,7 +2103,7 @@ public abstract class World implements IBlockAccess {
diff --git a/CraftBukkit-Patches/0051-Add-Log-Filtering.patch b/CraftBukkit-Patches/0050-Add-Log-Filtering.patch
similarity index 94%
rename from CraftBukkit-Patches/0051-Add-Log-Filtering.patch
rename to CraftBukkit-Patches/0050-Add-Log-Filtering.patch
index bb2369bc6..4cec3021b 100644
--- a/CraftBukkit-Patches/0051-Add-Log-Filtering.patch
+++ b/CraftBukkit-Patches/0050-Add-Log-Filtering.patch
@@ -1,4 +1,4 @@
-From afad711eee092e4bb80ae47517977f66e2d4aaef Mon Sep 17 00:00:00 2001
+From 65315609f8f437e29da1a66df0633b050b789b11 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
@@ -35,7 +35,7 @@ index 0000000..aa7e9ab
 +    }
 +}
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 53c66fc..296c581 100644
+index 1d9d3c9..8d8bc97 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -13,6 +13,8 @@ import java.util.HashMap;
@@ -47,7 +47,7 @@ index 53c66fc..296c581 100644
  import net.minecraft.server.MinecraftServer;
  import org.bukkit.Bukkit;
  import org.bukkit.ChatColor;
-@@ -265,4 +267,27 @@ public class SpigotConfig
+@@ -253,4 +255,27 @@ public class SpigotConfig
          outdatedClientMessage = transform( getString( "messages.outdated-client", "Outdated client!" ) );
          outdatedServerMessage = transform( getString( "messages.outdated-server", "Outdated server!" ) );
      }
diff --git a/CraftBukkit-Patches/0052-Make-AnvilInventory.getItem-use-both-containers.-Fix.patch b/CraftBukkit-Patches/0051-Make-AnvilInventory.getItem-use-both-containers.-Fix.patch
similarity index 97%
rename from CraftBukkit-Patches/0052-Make-AnvilInventory.getItem-use-both-containers.-Fix.patch
rename to CraftBukkit-Patches/0051-Make-AnvilInventory.getItem-use-both-containers.-Fix.patch
index e162858a2..63a3eddd9 100644
--- a/CraftBukkit-Patches/0052-Make-AnvilInventory.getItem-use-both-containers.-Fix.patch
+++ b/CraftBukkit-Patches/0051-Make-AnvilInventory.getItem-use-both-containers.-Fix.patch
@@ -1,4 +1,4 @@
-From f9097217bea43bfd7fa6ee74b96f9c9a7d006a6e Mon Sep 17 00:00:00 2001
+From d3b7ead5953c0cb7389eb15001a2386092eba4ee 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/0053-Always-Fire-PreLoginEvent.patch b/CraftBukkit-Patches/0052-Always-Fire-PreLoginEvent.patch
similarity index 98%
rename from CraftBukkit-Patches/0053-Always-Fire-PreLoginEvent.patch
rename to CraftBukkit-Patches/0052-Always-Fire-PreLoginEvent.patch
index 8df57aa1d..f125ec2f1 100644
--- a/CraftBukkit-Patches/0053-Always-Fire-PreLoginEvent.patch
+++ b/CraftBukkit-Patches/0052-Always-Fire-PreLoginEvent.patch
@@ -1,4 +1,4 @@
-From edf843cfae42c688f7003f0aeb4aacd081d0ac0a Mon Sep 17 00:00:00 2001
+From 508049cfb6f0192e44667d9c2594cf7211cfa3db Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 25 Jun 2013 18:09:26 +1000
 Subject: [PATCH] Always Fire PreLoginEvent
diff --git a/CraftBukkit-Patches/0054-Properly-Close-Inventories.patch b/CraftBukkit-Patches/0053-Properly-Close-Inventories.patch
similarity index 96%
rename from CraftBukkit-Patches/0054-Properly-Close-Inventories.patch
rename to CraftBukkit-Patches/0053-Properly-Close-Inventories.patch
index 5cb32d868..2828f596e 100644
--- a/CraftBukkit-Patches/0054-Properly-Close-Inventories.patch
+++ b/CraftBukkit-Patches/0053-Properly-Close-Inventories.patch
@@ -1,4 +1,4 @@
-From 24d31e902cd21b4851964186fefa7f4b6ded271e Mon Sep 17 00:00:00 2001
+From 1139ef1777c64479f0664e4b3bbe5842a6dacb34 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Properly Close Inventories
 Properly close inventories when unloading and switching worlds.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index c353b29..dc20587 100644
+index 8665ef2..8c98f3e 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -704,6 +704,15 @@ public class Chunk {
diff --git a/CraftBukkit-Patches/0055-Disallow-Interaction-With-Self.patch b/CraftBukkit-Patches/0054-Disallow-Interaction-With-Self.patch
similarity index 93%
rename from CraftBukkit-Patches/0055-Disallow-Interaction-With-Self.patch
rename to CraftBukkit-Patches/0054-Disallow-Interaction-With-Self.patch
index 6d7db9a14..77aa824c1 100644
--- a/CraftBukkit-Patches/0055-Disallow-Interaction-With-Self.patch
+++ b/CraftBukkit-Patches/0054-Disallow-Interaction-With-Self.patch
@@ -1,4 +1,4 @@
-From 8d414631b4347cfcf8ac81810462f80147f1a8d2 Mon Sep 17 00:00:00 2001
+From dc55945b5c2fd28d17722ca421f6537adb422d8f 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/0056-Lower-Chunk-Compression.patch b/CraftBukkit-Patches/0055-Lower-Chunk-Compression.patch
similarity index 95%
rename from CraftBukkit-Patches/0056-Lower-Chunk-Compression.patch
rename to CraftBukkit-Patches/0055-Lower-Chunk-Compression.patch
index c490901a9..10cf8c2dd 100644
--- a/CraftBukkit-Patches/0056-Lower-Chunk-Compression.patch
+++ b/CraftBukkit-Patches/0055-Lower-Chunk-Compression.patch
@@ -1,4 +1,4 @@
-From 765fe6a0c96ce22e609bff4ad366faf54812396f Mon Sep 17 00:00:00 2001
+From 32e80b7320273f138bec13031eb9151c776cf3af 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/0057-Entity-Mount-and-Dismount-Events.patch b/CraftBukkit-Patches/0056-Entity-Mount-and-Dismount-Events.patch
similarity index 95%
rename from CraftBukkit-Patches/0057-Entity-Mount-and-Dismount-Events.patch
rename to CraftBukkit-Patches/0056-Entity-Mount-and-Dismount-Events.patch
index 826cee4ce..4faeb6f4e 100644
--- a/CraftBukkit-Patches/0057-Entity-Mount-and-Dismount-Events.patch
+++ b/CraftBukkit-Patches/0056-Entity-Mount-and-Dismount-Events.patch
@@ -1,11 +1,11 @@
-From b77192c2e8533c8be00f0beeb661b62849c35110 Mon Sep 17 00:00:00 2001
+From b4fb566fcfe84a9048824e187c3881e87108f8e7 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 fe856fc..60c2221 100644
+index 852dfd3..92d7dc4 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1427,6 +1427,7 @@ public abstract class Entity {
@@ -35,7 +35,7 @@ index fe856fc..60c2221 100644
              if (this.vehicle != null) {
                  this.vehicle.passenger = null;
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index e1a3ca1..adb27d8 100644
+index e4fe770..8c5a8ba 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -304,6 +304,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
diff --git a/CraftBukkit-Patches/0058-Colour-Console-Messages.patch b/CraftBukkit-Patches/0057-Colour-Console-Messages.patch
similarity index 81%
rename from CraftBukkit-Patches/0058-Colour-Console-Messages.patch
rename to CraftBukkit-Patches/0057-Colour-Console-Messages.patch
index af66198cd..d6f39b932 100644
--- a/CraftBukkit-Patches/0058-Colour-Console-Messages.patch
+++ b/CraftBukkit-Patches/0057-Colour-Console-Messages.patch
@@ -1,14 +1,14 @@
-From 3e3ad5a9e5de8bd5cd84d5d478c0b8ac8b2b7333 Mon Sep 17 00:00:00 2001
+From 101c4c46597d7dfd482177fe22ddc0ef7df9d6b5 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 4 Jul 2013 10:11:46 +1000
 Subject: [PATCH] Colour Console Messages
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e5b8391..e8e3c9e 100644
+index dec46bd..c0dfdb5 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -919,7 +919,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
+@@ -917,7 +917,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
      }
  
      public void sendMessage(ChatMessage chatmessage) {
diff --git a/CraftBukkit-Patches/0059-Properly-Consume-Bonemeal-in-Dispensers.patch b/CraftBukkit-Patches/0058-Properly-Consume-Bonemeal-in-Dispensers.patch
similarity index 97%
rename from CraftBukkit-Patches/0059-Properly-Consume-Bonemeal-in-Dispensers.patch
rename to CraftBukkit-Patches/0058-Properly-Consume-Bonemeal-in-Dispensers.patch
index 820fead1d..27731e019 100644
--- a/CraftBukkit-Patches/0059-Properly-Consume-Bonemeal-in-Dispensers.patch
+++ b/CraftBukkit-Patches/0058-Properly-Consume-Bonemeal-in-Dispensers.patch
@@ -1,4 +1,4 @@
-From 43da205a1bc25ac30b44a6367b7d7f35ebe90818 Mon Sep 17 00:00:00 2001
+From 0b8dd5fe77226811be5a3e1e49b4f6c09c584c78 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/0060-Prevent-Ghost-Players-Caused-by-Plugins.patch b/CraftBukkit-Patches/0059-Prevent-Ghost-Players-Caused-by-Plugins.patch
similarity index 94%
rename from CraftBukkit-Patches/0060-Prevent-Ghost-Players-Caused-by-Plugins.patch
rename to CraftBukkit-Patches/0059-Prevent-Ghost-Players-Caused-by-Plugins.patch
index c8380e0c1..632e68d79 100644
--- a/CraftBukkit-Patches/0060-Prevent-Ghost-Players-Caused-by-Plugins.patch
+++ b/CraftBukkit-Patches/0059-Prevent-Ghost-Players-Caused-by-Plugins.patch
@@ -1,4 +1,4 @@
-From 3d38cee38e3984d42237d7353b000051be2be0c6 Mon Sep 17 00:00:00 2001
+From db5688a7eb8b6133a1ea28ecf0d59523a6fd56c4 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/0061-Entity-ticking-chunk-caching.patch b/CraftBukkit-Patches/0060-Entity-ticking-chunk-caching.patch
similarity index 97%
rename from CraftBukkit-Patches/0061-Entity-ticking-chunk-caching.patch
rename to CraftBukkit-Patches/0060-Entity-ticking-chunk-caching.patch
index ee4e21e6f..70eac2b95 100644
--- a/CraftBukkit-Patches/0061-Entity-ticking-chunk-caching.patch
+++ b/CraftBukkit-Patches/0060-Entity-ticking-chunk-caching.patch
@@ -1,4 +1,4 @@
-From ea70179245470f2baf92f73a45c87e36e654edbc Mon Sep 17 00:00:00 2001
+From 7ea326c5cf11a4802e87a958617034c2f48b9e0a 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,7 +6,7 @@ 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 8bd7876..ba1c1ca 100644
+index 84ee535..06759cd 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1221,6 +1221,7 @@ public abstract class World implements IBlockAccess {
diff --git a/CraftBukkit-Patches/0062-Plug-World-Unload-Memory-Leak.patch b/CraftBukkit-Patches/0061-Plug-World-Unload-Memory-Leak.patch
similarity index 92%
rename from CraftBukkit-Patches/0062-Plug-World-Unload-Memory-Leak.patch
rename to CraftBukkit-Patches/0061-Plug-World-Unload-Memory-Leak.patch
index 964ad6a22..d926cf037 100644
--- a/CraftBukkit-Patches/0062-Plug-World-Unload-Memory-Leak.patch
+++ b/CraftBukkit-Patches/0061-Plug-World-Unload-Memory-Leak.patch
@@ -1,4 +1,4 @@
-From e5bd78ed743866ec5f4f420dd52958e0f282c92e Mon Sep 17 00:00:00 2001
+From 8454656a6b1eaff2ac3e95b1104f2b196a0c2b13 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/0063-Player-Collision-API.patch b/CraftBukkit-Patches/0062-Player-Collision-API.patch
similarity index 98%
rename from CraftBukkit-Patches/0063-Player-Collision-API.patch
rename to CraftBukkit-Patches/0062-Player-Collision-API.patch
index 0af3de8d7..6e8ca2ebe 100644
--- a/CraftBukkit-Patches/0063-Player-Collision-API.patch
+++ b/CraftBukkit-Patches/0062-Player-Collision-API.patch
@@ -1,4 +1,4 @@
-From 36ad0071b43b9043ad4f0490d4ea33b2f2706d65 Mon Sep 17 00:00:00 2001
+From 4800f114024eadb7b30fcb894ce1348f3bd42359 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/0064-Fully-Disable-Snooper-When-Not-Required.patch b/CraftBukkit-Patches/0063-Fully-Disable-Snooper-When-Not-Required.patch
similarity index 84%
rename from CraftBukkit-Patches/0064-Fully-Disable-Snooper-When-Not-Required.patch
rename to CraftBukkit-Patches/0063-Fully-Disable-Snooper-When-Not-Required.patch
index 2f8931bb1..ac70cf4af 100644
--- a/CraftBukkit-Patches/0064-Fully-Disable-Snooper-When-Not-Required.patch
+++ b/CraftBukkit-Patches/0063-Fully-Disable-Snooper-When-Not-Required.patch
@@ -1,14 +1,14 @@
-From 7b6f20a1b6e3ed59aeb5e458a9c9ff676fbb2df2 Mon Sep 17 00:00:00 2001
+From 0a366cc0e18159db488f1245e5ebf1b12b714351 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 e8e3c9e..4a72f2c 100644
+index c0dfdb5..5a153de 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -500,11 +500,11 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
+@@ -498,11 +498,11 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
          this.I = Packet.p;
          this.methodProfiler.b();
          this.methodProfiler.a("snooper");
diff --git a/CraftBukkit-Patches/0065-Add-Getter-for-Entity-Invulnerability.patch b/CraftBukkit-Patches/0064-Add-Getter-for-Entity-Invulnerability.patch
similarity index 92%
rename from CraftBukkit-Patches/0065-Add-Getter-for-Entity-Invulnerability.patch
rename to CraftBukkit-Patches/0064-Add-Getter-for-Entity-Invulnerability.patch
index b3fdde1a6..fca181fd7 100644
--- a/CraftBukkit-Patches/0065-Add-Getter-for-Entity-Invulnerability.patch
+++ b/CraftBukkit-Patches/0064-Add-Getter-for-Entity-Invulnerability.patch
@@ -1,4 +1,4 @@
-From 8a9ef0403468ad7597e4b0e70ae3a61a18bf88b0 Mon Sep 17 00:00:00 2001
+From ff0cd39627b4395a87f4190d6f9844530de8b189 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/0066-Guard-entity-list.patch b/CraftBukkit-Patches/0065-Guard-entity-list.patch
similarity index 96%
rename from CraftBukkit-Patches/0066-Guard-entity-list.patch
rename to CraftBukkit-Patches/0065-Guard-entity-list.patch
index c574e960d..2b3e336ad 100644
--- a/CraftBukkit-Patches/0066-Guard-entity-list.patch
+++ b/CraftBukkit-Patches/0065-Guard-entity-list.patch
@@ -1,11 +1,11 @@
-From 284f5650477cb3ccaedd228fbaa6439e8a8e8bd9 Mon Sep 17 00:00:00 2001
+From ab3165faa242ad961f1cd19308a9ef51c7cc8ac9 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 ba1c1ca..c03e274 100644
+index 06759cd..cb21133 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;
diff --git a/CraftBukkit-Patches/0067-Cap-Minimum-Player-Speed.patch b/CraftBukkit-Patches/0066-Cap-Minimum-Player-Speed.patch
similarity index 92%
rename from CraftBukkit-Patches/0067-Cap-Minimum-Player-Speed.patch
rename to CraftBukkit-Patches/0066-Cap-Minimum-Player-Speed.patch
index ff6cc53f3..0f6a713ad 100644
--- a/CraftBukkit-Patches/0067-Cap-Minimum-Player-Speed.patch
+++ b/CraftBukkit-Patches/0066-Cap-Minimum-Player-Speed.patch
@@ -1,11 +1,11 @@
-From d11fddbdd62a2be3e66fc9623661403ffcd17faf Mon Sep 17 00:00:00 2001
+From 9d02a6efdc53c838fd41d6c354f9dbd235c59b11 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/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 654c3c9..6ee31d9 100644
+index e7ea9b4..33674b1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -952,7 +952,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/CraftBukkit-Patches/0068-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch b/CraftBukkit-Patches/0067-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch
similarity index 94%
rename from CraftBukkit-Patches/0068-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch
rename to CraftBukkit-Patches/0067-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch
index de0e5ebdf..821ec758f 100644
--- a/CraftBukkit-Patches/0068-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch
+++ b/CraftBukkit-Patches/0067-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch
@@ -1,4 +1,4 @@
-From 2a1df2a53ded142a68685920c5a738696c186543 Mon Sep 17 00:00:00 2001
+From e967122cbe41d627ea98e32d55f321212e57b26b 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/0069-Nerf-Zombie-Lag-Issues.patch b/CraftBukkit-Patches/0068-Nerf-Zombie-Lag-Issues.patch
similarity index 98%
rename from CraftBukkit-Patches/0069-Nerf-Zombie-Lag-Issues.patch
rename to CraftBukkit-Patches/0068-Nerf-Zombie-Lag-Issues.patch
index afa50b6b6..e57230b20 100644
--- a/CraftBukkit-Patches/0069-Nerf-Zombie-Lag-Issues.patch
+++ b/CraftBukkit-Patches/0068-Nerf-Zombie-Lag-Issues.patch
@@ -1,4 +1,4 @@
-From f0fcf1cdd831dea90719d24c8f8f48ea18c14863 Mon Sep 17 00:00:00 2001
+From a23ad3d71fd60b003ddeef47a6a98758a99280aa Mon Sep 17 00:00:00 2001
 From: Dylan Xaldin <Puremin0rez515@gmail.com>
 Date: Sat, 14 Sep 2013 11:02:34 +1000
 Subject: [PATCH] Nerf Zombie Lag Issues
diff --git a/CraftBukkit-Patches/0070-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch b/CraftBukkit-Patches/0069-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch
similarity index 96%
rename from CraftBukkit-Patches/0070-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch
rename to CraftBukkit-Patches/0069-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch
index 1588e2215..24d90d281 100644
--- a/CraftBukkit-Patches/0070-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch
+++ b/CraftBukkit-Patches/0069-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch
@@ -1,4 +1,4 @@
-From 5c0b8ad4ee0045477c67c6d6e37ae77bffaf4972 Mon Sep 17 00:00:00 2001
+From 8e379c60ac61ac1a226407eaf6bcfe97e0165501 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/0071-Allow-Disabling-of-1.6.3-Structure-Saving.patch b/CraftBukkit-Patches/0070-Allow-Disabling-of-1.6.3-Structure-Saving.patch
similarity index 97%
rename from CraftBukkit-Patches/0071-Allow-Disabling-of-1.6.3-Structure-Saving.patch
rename to CraftBukkit-Patches/0070-Allow-Disabling-of-1.6.3-Structure-Saving.patch
index 34ee3010f..b33d14f4d 100644
--- a/CraftBukkit-Patches/0071-Allow-Disabling-of-1.6.3-Structure-Saving.patch
+++ b/CraftBukkit-Patches/0070-Allow-Disabling-of-1.6.3-Structure-Saving.patch
@@ -1,4 +1,4 @@
-From 7463a7f6ab3c97b4b4f5a7b4b6f2acbe5de1d091 Mon Sep 17 00:00:00 2001
+From 43abae864c7a6003f326e1c8649102e9695fff3c 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/0072-Item-Despawn-Rate.patch b/CraftBukkit-Patches/0071-Item-Despawn-Rate.patch
similarity index 95%
rename from CraftBukkit-Patches/0072-Item-Despawn-Rate.patch
rename to CraftBukkit-Patches/0071-Item-Despawn-Rate.patch
index 5bb09e0d0..33eea810e 100644
--- a/CraftBukkit-Patches/0072-Item-Despawn-Rate.patch
+++ b/CraftBukkit-Patches/0071-Item-Despawn-Rate.patch
@@ -1,4 +1,4 @@
-From 249bb1fac815a77925401bfdf3c05d96f78df47c Mon Sep 17 00:00:00 2001
+From cbe7a0b1db676b84316ecb88540df21103b43529 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/0073-Fix-clearing-potion-effects-on-respawn-missed-rename.patch b/CraftBukkit-Patches/0072-Fix-clearing-potion-effects-on-respawn-missed-rename.patch
similarity index 92%
rename from CraftBukkit-Patches/0073-Fix-clearing-potion-effects-on-respawn-missed-rename.patch
rename to CraftBukkit-Patches/0072-Fix-clearing-potion-effects-on-respawn-missed-rename.patch
index f60fdfd0c..499bc9593 100644
--- a/CraftBukkit-Patches/0073-Fix-clearing-potion-effects-on-respawn-missed-rename.patch
+++ b/CraftBukkit-Patches/0072-Fix-clearing-potion-effects-on-respawn-missed-rename.patch
@@ -1,4 +1,4 @@
-From 1119047fd58285bfcb93716e2a53f418a82323bf Mon Sep 17 00:00:00 2001
+From f5c73385759005fc5622de0d33926a931e883125 Mon Sep 17 00:00:00 2001
 From: mrapple <tony@oc.tc>
 Date: Tue, 1 Oct 2013 21:10:50 -0500
 Subject: [PATCH] Fix clearing potion effects on respawn -- missed rename
diff --git a/CraftBukkit-Patches/0074-Don-t-Special-Case-X-Move-Value.patch b/CraftBukkit-Patches/0073-Don-t-Special-Case-X-Move-Value.patch
similarity index 96%
rename from CraftBukkit-Patches/0074-Don-t-Special-Case-X-Move-Value.patch
rename to CraftBukkit-Patches/0073-Don-t-Special-Case-X-Move-Value.patch
index f8d472cca..65b6c9a07 100644
--- a/CraftBukkit-Patches/0074-Don-t-Special-Case-X-Move-Value.patch
+++ b/CraftBukkit-Patches/0073-Don-t-Special-Case-X-Move-Value.patch
@@ -1,4 +1,4 @@
-From 84cf8a6a6899e1915dbbd49ec862018ed4749871 Mon Sep 17 00:00:00 2001
+From 490c0a6236569702b6804ce60ad5833615302f58 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/0075-Implement-respawn-API.patch b/CraftBukkit-Patches/0074-Implement-respawn-API.patch
similarity index 93%
rename from CraftBukkit-Patches/0075-Implement-respawn-API.patch
rename to CraftBukkit-Patches/0074-Implement-respawn-API.patch
index cc6996827..1551fa67d 100644
--- a/CraftBukkit-Patches/0075-Implement-respawn-API.patch
+++ b/CraftBukkit-Patches/0074-Implement-respawn-API.patch
@@ -1,4 +1,4 @@
-From 2fafbcfb32166ba0814f976c91e48cf435047a7d Mon Sep 17 00:00:00 2001
+From 6912aa737396aa58002642e475abb6f7daad090a 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/0076-Fix-BrewingStands-Removing-NBT-Potions.patch b/CraftBukkit-Patches/0075-Fix-BrewingStands-Removing-NBT-Potions.patch
similarity index 95%
rename from CraftBukkit-Patches/0076-Fix-BrewingStands-Removing-NBT-Potions.patch
rename to CraftBukkit-Patches/0075-Fix-BrewingStands-Removing-NBT-Potions.patch
index e9351d4db..7ffbdfdba 100644
--- a/CraftBukkit-Patches/0076-Fix-BrewingStands-Removing-NBT-Potions.patch
+++ b/CraftBukkit-Patches/0075-Fix-BrewingStands-Removing-NBT-Potions.patch
@@ -1,4 +1,4 @@
-From 82db8f98979f0c9970b19711f5a939b6f07a67a8 Mon Sep 17 00:00:00 2001
+From 9a97b720c5e71939cb458b9f09c83a6446d1fd04 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/0077-Arrow-Despawn-Rate.patch b/CraftBukkit-Patches/0076-Arrow-Despawn-Rate.patch
similarity index 95%
rename from CraftBukkit-Patches/0077-Arrow-Despawn-Rate.patch
rename to CraftBukkit-Patches/0076-Arrow-Despawn-Rate.patch
index 8691f04de..bbf615d47 100644
--- a/CraftBukkit-Patches/0077-Arrow-Despawn-Rate.patch
+++ b/CraftBukkit-Patches/0076-Arrow-Despawn-Rate.patch
@@ -1,4 +1,4 @@
-From 42fc954cc9b9706d694685af7da82dfd4827c1d1 Mon Sep 17 00:00:00 2001
+From f994c1f9c7f866dbc9defa92651248d01c324d8f 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/0023-Watchdog-Thread.patch b/CraftBukkit-Patches/0077-Watchdog-Thread.patch
similarity index 95%
rename from CraftBukkit-Patches/0023-Watchdog-Thread.patch
rename to CraftBukkit-Patches/0077-Watchdog-Thread.patch
index 15f295a67..f6c0d4fab 100644
--- a/CraftBukkit-Patches/0023-Watchdog-Thread.patch
+++ b/CraftBukkit-Patches/0077-Watchdog-Thread.patch
@@ -1,11 +1,11 @@
-From 22fdbcbba3215c1503482e5281205314fc6b9a21 Mon Sep 17 00:00:00 2001
+From d58927bfbd44ebba7f3fd4e55bfe75cac76110f6 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 dec46bd..aeac6e9 100644
+index 5a153de..fb8bc87 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -415,6 +415,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -26,7 +26,7 @@ index dec46bd..aeac6e9 100644
              } catch (Throwable throwable1) {
 diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java
 new file mode 100644
-index 0000000..c8125c2
+index 0000000..3ca7a46
 --- /dev/null
 +++ b/src/main/java/org/spigotmc/RestartCommand.java
 @@ -0,0 +1,111 @@
@@ -73,7 +73,7 @@ index 0000000..c8125c2
 +                // Kick all players
 +                for ( EntityPlayer p : (List< EntityPlayer>) MinecraftServer.getServer().getPlayerList().players )
 +                {
-+                    p.playerConnection.networkManager.queue( new Packet255KickDisconnect( "Server is restarting" ) );
++                    p.playerConnection.networkManager.queue( new Packet255KickDisconnect( SpigotConfig.restartMessage ) );
 +                    p.playerConnection.networkManager.d();
 +                }
 +                // Give the socket a chance to send the packets
@@ -142,22 +142,24 @@ index 0000000..c8125c2
 +    }
 +}
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 8ef108d..8499c7f 100644
+index 8d8bc97..6c0a14d 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
-@@ -142,4 +142,16 @@ public class SpigotConfig
-     {
-         commands.put( "tps", new TicksPerSecondCommand( "tps" ) );
+@@ -278,4 +278,18 @@ public class SpigotConfig
+ 
+         Bukkit.getLogger().setFilter( new LogFilter() );
      }
 +
 +    public static int timeoutTime = 60;
 +    public static boolean restartOnCrash = true;
 +    public static String restartScript = "./start.sh";
++    public static String restartMessage;
 +    private static void watchdog()
 +    {
 +        timeoutTime = getInt( "settings.timeout-time", timeoutTime );
 +        restartOnCrash = getBoolean( "settings.restart-on-crash", restartOnCrash );
 +        restartScript = getString( "settings.restart-script", restartScript );
++        restartMessage = transform( getString( "messages.restart", "Server is restarting" ) );
 +        commands.put( "restart", new RestartCommand( "restart" ) );
 +        WatchdogThread.doStart( timeoutTime, restartOnCrash );
 +    }