Add the spigot.yml into the timings paste

This allows for tools like @aikar's timings site to produce suggestions
based on the users config

Bukkit-Patches/0002-Spigot-Timings.patch

@@ -1,4 +1,4 @@
-From c6cc65fa8a88292307fde549d297ee85df1a004c Mon Sep 17 00:00:00 2001
+From 96a0f82578677644e39e778482c983a41930140f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 2 Jun 2013 10:42:57 +1000
 Subject: [PATCH] Spigot Timings
@@ -8,7 +8,7 @@ Adds performance tracking timings all around the Minecraft Server, and improves
 Plugins can track their own timings with CustomTimingsHandler
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 1eaf92d..7b25817 100644
+index 1eaf92d..cc071c6 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -301,6 +301,7 @@ public final class Bukkit {
@@ -19,6 +19,36 @@ index 1eaf92d..7b25817 100644
      }
  
      /**
+@@ -747,4 +748,9 @@ public final class Bukkit {
+     public static UnsafeValues getUnsafe() {
+         return server.getUnsafe();
+     }
++
++    public static Server.Spigot spigot()
++    {
++        return server.spigot();
++    }
+ }
+diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
+index e14e9f1..573b33b 100644
+--- a/src/main/java/org/bukkit/Server.java
++++ b/src/main/java/org/bukkit/Server.java
+@@ -916,4 +916,15 @@ public interface Server extends PluginMessageRecipient {
+      */
+     @Deprecated
+     UnsafeValues getUnsafe();
++
++    public class Spigot
++    {
++
++        public org.bukkit.configuration.file.YamlConfiguration getConfig()
++        {
++            throw new UnsupportedOperationException( "Not supported yet." );
++        }
++    }
++
++    Spigot spigot();
+ }
 diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
 index 87c33d9..31e4f66 100644
 --- a/src/main/java/org/bukkit/command/Command.java
@@ -68,10 +98,10 @@ index d75380c..f15b95d 100644
          }
  
 diff --git a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
-index 05cfcb0..22926d6 100644
+index 05cfcb0..7907021 100644
 --- a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
 +++ b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
-@@ -19,23 +19,97 @@ import org.bukkit.util.StringUtil;
+@@ -19,23 +19,101 @@ import org.bukkit.util.StringUtil;
  
  import com.google.common.collect.ImmutableList;
  
@@ -142,6 +172,10 @@ index 05cfcb0..22926d6 100644
 +                CustomTimingsHandler.printTimings(fileTimings);
 +                fileTimings.println( "Sample time " + sampleTime + " (" + sampleTime / 1E9 + "s)" );
 +
++                fileTimings.println( "<spigotConfig>" );
++                fileTimings.println( Bukkit.spigot().getConfig().saveToString() );
++                fileTimings.println( "</spigotConfig>" );
++
 +                if ( paste )
 +                {
 +                    new PasteThread( sender, bout ).start();
@@ -173,7 +207,7 @@ index 05cfcb0..22926d6 100644
          if (!sender.getServer().getPluginManager().useTimings()) {
              sender.sendMessage("Please enable timings by setting \"settings.plugin-profiling\" to true in bukkit.yml");
              return true;
-@@ -118,4 +192,55 @@ public class TimingsCommand extends BukkitCommand {
+@@ -118,4 +196,55 @@ public class TimingsCommand extends BukkitCommand {
          }
          return ImmutableList.of();
      }

CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch

@@ -1,10 +1,29 @@
-From 09cb6fa84b37e70dd017ccd4cba1b4eac2f0593b Mon Sep 17 00:00:00 2001
+From c3f529b0c38959cca79017feac7bd3d312b647aa Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 15:10:56 +1000
 Subject: [PATCH] Skeleton API Implementations
 
 This contains the basic, empty implementations for some Spigot-API extensions. They are included early in the patching progress so that compilation will still succeed midway despite the APIs only being provided by subsequent patches.
 
+diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+index eb0b342..1fb4eeb 100644
+--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
++++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+@@ -1768,4 +1768,14 @@ public final class CraftServer implements Server {
+     public UnsafeValues getUnsafe() {
+         return CraftMagicNumbers.INSTANCE;
+     }
++
++    private final Spigot spigot = new Spigot()
++    {
++
++    };
++
++    public Spigot spigot()
++    {
++        return spigot;
++    }
+ }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 index f4dec5b..7112c77 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java

CraftBukkit-Patches/0005-Spigot-Configuration.patch

@@ -1,4 +1,4 @@
-From 4906155574f53e70823a78b75df68df0b7819026 Mon Sep 17 00:00:00 2001
+From 590b9e6daca8420d6d7f3baae9380f553408bb28 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 7 Jul 2013 09:32:53 +1000
 Subject: [PATCH] Spigot Configuration
@@ -55,7 +55,7 @@ index 08c506c..12c613c 100644
          this.world = new CraftWorld((WorldServer) this, gen, env);
          this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index eb0b342..d997b48 100644
+index 1fb4eeb..9d45f34 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -323,8 +323,10 @@ public final class CraftServer implements Server {
@@ -96,7 +96,7 @@ index eb0b342..d997b48 100644
          int pollCount = 0;
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
 new file mode 100644
-index 0000000..bc84059
+index 0000000..8ae9862
 --- /dev/null
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -0,0 +1,138 @@
@@ -134,7 +134,7 @@ index 0000000..bc84059
 +            + "IRC: #spigot @ irc.spi.gt ( http://www.spigotmc.org/pages/irc/ )\n"
 +            + "Forums: http://www.spigotmc.org/\n";
 +    /*========================================================================*/
-+    static YamlConfiguration config;
++    public static YamlConfiguration config;
 +    static int version;
 +    static Map<String, Command> commands;
 +    /*========================================================================*/

CraftBukkit-Patches/0013-Spigot-Timings.patch

@@ -1,4 +1,4 @@
-From 1aa4498454d99ecd879c2f7e0885e396bb79af40 Mon Sep 17 00:00:00 2001
+From 6dc58e160c5b62dc3c5d6f1bb40678a44fcac26d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 10 Jan 2013 00:18:11 -0500
 Subject: [PATCH] Spigot Timings
@@ -364,7 +364,7 @@ index 998de35..0a15416 100644
          this.methodProfiler.b();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index c240020..9596da2 100644
+index 3a98439..69004ea 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -941,6 +941,8 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -574,6 +574,22 @@ index 8f25a15..d93eb8b 100644
      }
  
      public BiomeMeta a(EnumCreatureType enumcreaturetype, int i, int j, int k) {
+diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+index 9d45f34..01de2fd 100644
+--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
++++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+@@ -1778,6 +1778,11 @@ public final class CraftServer implements Server {
+     private final Spigot spigot = new Spigot()
+     {
+ 
++        @Override
++        public YamlConfiguration getConfig()
++        {
++            return org.spigotmc.SpigotConfig.config;
++        }
+     };
+ 
+     public Spigot spigot()
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 index c76c3d3..28aa997 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java