From 6dae26cf1452dcad61b09f9b2f6b1e4c95b94357 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 5 Apr 2016 23:27:53 -0500 Subject: [PATCH] Use 'Paper' for our config file in timings --- Spigot-API-Patches/0003-Timings-v2.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Spigot-API-Patches/0003-Timings-v2.patch b/Spigot-API-Patches/0003-Timings-v2.patch index ce6f8fb46b..44a51906fb 100644 --- a/Spigot-API-Patches/0003-Timings-v2.patch +++ b/Spigot-API-Patches/0003-Timings-v2.patch @@ -1,4 +1,4 @@ -From 0b47a95a20c68bbc0620b0fb71ae2f5663619343 Mon Sep 17 00:00:00 2001 +From 0ec92e17d7012a63b718d6c7d816d45b4fd2a4f4 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 29 Feb 2016 18:48:17 -0600 Subject: [PATCH] Timings v2 @@ -1542,7 +1542,7 @@ index 0000000..3dba3aa +} diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java new file mode 100644 -index 0000000..09cab70 +index 0000000..17f8c6f --- /dev/null +++ b/src/main/java/co/aikar/timings/TimingsExport.java @@ -0,0 +1,373 @@ @@ -1750,7 +1750,7 @@ index 0000000..09cab70 + parent.put("config", createObject( + pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)), + pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)), -+ pair("paperspigot", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)) ++ pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)) + )); + + new TimingsExport(sender, parent, history).start();