Migrate PaperSpigot to Timings version 2

Spigot-API-Patches/0014-Require-Java-8.patch

@@ -1,11 +1,11 @@
-From 9bdea46a67a9a7779a451416f32af354373289dc Mon Sep 17 00:00:00 2001
+From 1075d256ef7221d811991952a51e5a16b3773ca4 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 8 Jan 2016 23:50:25 -0600
 Subject: [PATCH] Require Java 8
 
 
 diff --git a/pom.xml b/pom.xml
-index 3ccfabb..7dd0adb 100644
+index bc6964d..2c43d25 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -19,8 +19,9 @@
@@ -20,7 +20,7 @@ index 3ccfabb..7dd0adb 100644
          <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
      </properties>
  
-@@ -136,26 +137,6 @@
+@@ -129,26 +130,6 @@
                  </dependencies>
              </plugin>
              <plugin>

Spigot-Server-Patches/0002-PaperSpigot-config-files.patch

@@ -1,11 +1,11 @@
-From 173dc14f7675fadf49fe31bc7e790ec5369c046a Mon Sep 17 00:00:00 2001
+From d27df4714c775e383f7388373b4dac6aea181526 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 28 May 2015 00:08:15 -0500
 Subject: [PATCH] PaperSpigot config files
 
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 8dd4ef1..6dfb161 100644
+index c30867d..45cea14 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -177,6 +177,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -20,7 +20,7 @@ index 8dd4ef1..6dfb161 100644
              DedicatedServer.LOGGER.info("Generating keypair");
              this.a(MinecraftEncryption.b());
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 0271b19..822ddeb 100644
+index eca86db8..bb46799 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -161,6 +161,8 @@ public abstract class World implements IBlockAccess {
@@ -41,7 +41,7 @@ index 0271b19..822ddeb 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 f57c785..5ce0d50 100644
+index 2759425..019f7a9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -688,6 +688,7 @@ public final class CraftServer implements Server {
@@ -88,7 +88,7 @@ index 337aa29..c936219 100644
  
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java
 new file mode 100644
-index 0000000..006ca37
+index 0000000..a08688f
 --- /dev/null
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java
 @@ -0,0 +1,141 @@
@@ -123,7 +123,7 @@ index 0000000..006ca37
 +            + "\n"
 +            + "IRC: #paperspigot @ irc.spi.gt ( http://irc.spi.gt/iris/?channels=PaperSpigot )\n";
 +    /*========================================================================*/
-+    static YamlConfiguration config;
++    public static YamlConfiguration config;
 +    static int version;
 +    static Map<String, Command> commands;
 +    /*========================================================================*/
@@ -317,5 +317,5 @@ index 0000000..146324a
 +    }
 +}
 -- 
-2.4.6.windows.1
+2.7.0