From cadf65501bc4ce03cab808dd39ff53e783b84d90 Mon Sep 17 00:00:00 2001 From: Byteflux <byte@byteflux.net> Date: Thu, 24 Mar 2016 23:46:53 -0700 Subject: [PATCH] Fix timings config being removed by another patch --- ...figurable-Chunk-IO-Thread-Base-Count.patch | 40 ------------------- 1 file changed, 40 deletions(-) diff --git a/Spigot-Server-Patches/Configurable-Chunk-IO-Thread-Base-Count.patch b/Spigot-Server-Patches/Configurable-Chunk-IO-Thread-Base-Count.patch index 09a4def695..fcaa61ca64 100644 --- a/Spigot-Server-Patches/Configurable-Chunk-IO-Thread-Base-Count.patch +++ b/Spigot-Server-Patches/Configurable-Chunk-IO-Thread-Base-Count.patch @@ -8,46 +8,6 @@ diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/j index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java -@@ -0,0 +0,0 @@ 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); @@ -0,0 +0,0 @@ public class PaperConfig { Bukkit.getLogger().log(Level.INFO, "Disabling player interaction limiter, your server may be more vulnerable to malicious users"); }