Fix timings config being removed by another patch

Spigot-Server-Patches/0052-Configurable-Chunk-IO-Thread-Base-Count.patch

@@ -1,54 +1,14 @@
-From f1b0c0d63bc065df7b20543cc458e6df0df2b4c5 Mon Sep 17 00:00:00 2001
+From 55de85f3cfa0c878dfd3e4e488152930021e3184 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 2 Mar 2016 23:46:57 -0600
 Subject: [PATCH] Configurable Chunk IO Thread Base Count
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index f0ed051..67b9714 100644
+index f0ed051..e55ff98 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -124,39 +124,6 @@ public class PaperConfig {
+@@ -164,4 +164,9 @@ public class PaperConfig {
-         return config.getString(path, config.getString(path));
-     }
- 
--    private static void timings() {
--        boolean timings = getBoolean("timings.enabled", true);
--        boolean verboseTimings = getBoolean("timings.verbose", true);
--        TimingsManager.privacy = getBoolean("timings.server-name-privacy", false);
--        TimingsManager.hiddenConfigs = getList("timings.hidden-config-entries", Lists.newArrayList("database", "settings.bungeecord-addresses"));
--        int timingHistoryInterval = getInt("timings.history-interval", 300);
--        int timingHistoryLength = getInt("timings.history-length", 3600);
--
--
--        Timings.setVerboseTimingsEnabled(verboseTimings);
--        Timings.setTimingsEnabled(timings);
--        Timings.setHistoryInterval(timingHistoryInterval * 20);
--        Timings.setHistoryLength(timingHistoryLength * 20);
--
--        Bukkit.getLogger().log(Level.INFO, "Spigot Timings: " + timings +
--                " - Verbose: " + verboseTimings +
--                " - Interval: " + timeSummary(Timings.getHistoryInterval() / 20) +
--                " - Length: " + timeSummary(Timings.getHistoryLength() / 20));
--    }
--
--    protected static String timeSummary(int seconds) {
--        String time = "";
--        if (seconds > 60 * 60) {
--            time += TimeUnit.SECONDS.toHours(seconds) + "h";
--            seconds /= 60;
--        }
--
--        if (seconds > 0) {
--            time += TimeUnit.SECONDS.toMinutes(seconds) + "m";
--        }
--        return time;
--    }
--
-     public static boolean useInteractLimiter;
-     private static void useInteractLimiter() {
-         useInteractLimiter = getBoolean("settings.limit-player-interactions", true);
-@@ -164,4 +131,9 @@ public class PaperConfig {
              Bukkit.getLogger().log(Level.INFO, "Disabling player interaction limiter, your server may be more vulnerable to malicious users");
          }
      }

Spigot-Server-Patches/0082-Chunk-save-queue-improvements.patch

@@ -1,4 +1,4 @@
-From 468ede0382e42b9ed146a62d190ce1f77665e0a2 Mon Sep 17 00:00:00 2001
+From 14049623e6f66a86995dc945509711473321c5ca Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 4 Mar 2016 18:18:37 -0600
 Subject: [PATCH] Chunk save queue improvements
@@ -26,10 +26,10 @@ Then finally, Sleeping will by default be removed, but due to known issues with
 But if sleeps are to remain enabled, we at least lower the sleep interval so it doesn't have as much negative impact.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 67b9714..a30f437 100644
+index e55ff98..2a391d5 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -136,4 +136,10 @@ public class PaperConfig {
+@@ -169,4 +169,10 @@ public class PaperConfig {
      public static void chunkLoadThreads() {
          minChunkLoadThreads = Math.min(6, getInt("settings.min-chunk-load-threads", 2)); // Keep people from doing stupid things with max of 6
      }

Spigot-Server-Patches/0084-Default-loading-permissions.yml-before-plugins.patch

@@ -1,4 +1,4 @@
-From 82b009493bc17fab9bd4c752d04b78a0f3e334cb Mon Sep 17 00:00:00 2001
+From 3c4e51d4560057b99af2c388f27cfdac4c6637c2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 13:17:38 -0400
 Subject: [PATCH] Default loading permissions.yml before plugins
@@ -16,10 +16,10 @@ modify that. Under the previous logic, plugins were unable (cleanly) override pe
 A config option has been added for those who depend on the previous behavior, but I don't expect that.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index a30f437..fe616a6 100644
+index 2a391d5..2db9fc0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -142,4 +142,9 @@ public class PaperConfig {
+@@ -175,4 +175,9 @@ public class PaperConfig {
          enableFileIOThreadSleep = getBoolean("settings.sleep-between-chunk-saves", false);
          if (enableFileIOThreadSleep) Bukkit.getLogger().info("Enabled sleeping between chunk saves, beware of memory issues");
      }

Spigot-Server-Patches/0096-Set-health-before-death-event.patch

@@ -1,14 +1,14 @@
-From be41ec24766b914db7a7f984e7fde0ec90380ab4 Mon Sep 17 00:00:00 2001
+From 4f72aa405c25932dca93d306af28c96a343bfd0a Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 19 Jul 2015 16:51:38 -0400
 Subject: [PATCH] Set health before death event
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index fe616a6..d37805f 100644
+index 2db9fc0..5a9e032 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -147,4 +147,9 @@ public class PaperConfig {
+@@ -180,4 +180,9 @@ public class PaperConfig {
      private static void loadPermsBeforePlugins() {
          loadPermsBeforePlugins = getBoolean("settings.load-permissions-yml-before-plugins", true);
      }