mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 08:27:43 +01:00
a21f907ced
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paperr@41263d9 [ci skip] Update paperweight to 1.3.4 PaperMC/Paperr@3109dd8 Updated Upstream (Bukkit/CraftBukkit) (#7428) PaperMC/Paperr@17eb884 Use a CHM for StructureTemplate.Pallete cache PaperMC/Paperr@f79c0da Updated Upstream (Bukkit/CraftBukkit) PaperMC/Paperr@2121aed Rebuild patches Pufferfish Changes: pufferfish-gg/Pufferfishr@9aa81a5 Update Upstream (Paper) pufferfish-gg/Pufferfishr@809bd9f Update Upstream (Paper) pufferfish-gg/Pufferfishr@f053fd3 Update Upstream (Paper) pufferfish-gg/Pufferfishr@5bf8730 Update Upstream (Paper) pufferfish-gg/Pufferfishr@c4a780f Update Upstream (Paper) pufferfish-gg/Pufferfishr@99a590b Fix lightning pufferfish-gg/Pufferfishr@3e75ff0 Updated Upstream (Paper) pufferfish-gg/Pufferfishr@110966e Updated Upstream (Paper) pufferfish-gg/Pufferfishr@b6b58c4 Update Upstream (Paper misc-perf branch)
66 lines
3.3 KiB
Diff
66 lines
3.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
|
Date: Fri, 5 Jun 2020 21:30:19 -0500
|
|
Subject: [PATCH] Timings stuff
|
|
|
|
|
|
diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
|
|
index d3bb2a3ead944a89330bbced6812df73d174d061..aa906caf51d81b26a5565a92ea24fb79c920a73a 100644
|
|
--- a/src/main/java/co/aikar/timings/TimingsExport.java
|
|
+++ b/src/main/java/co/aikar/timings/TimingsExport.java
|
|
@@ -229,10 +229,14 @@ public class TimingsExport extends Thread {
|
|
// Information on the users Config
|
|
|
|
parent.put("config", createObject(
|
|
- pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
|
|
+ // Purpur start
|
|
+ pair("server.properties", mapAsJSON(Bukkit.spigot().getServerProperties())),
|
|
pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
|
|
- pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)), // Pufferfish
|
|
- pair("pufferfish", mapAsJSON(gg.pufferfish.pufferfish.PufferfishConfig.getConfigCopy(), null)) // Pufferfish
|
|
+ pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
|
|
+ pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)),
|
|
+ pair("pufferfish", mapAsJSON(gg.pufferfish.pufferfish.PufferfishConfig.getConfigCopy(), null)), // Pufferfish
|
|
+ pair("purpur", mapAsJSON(Bukkit.spigot().getPurpurConfig(), null))
|
|
+ // Purpur end
|
|
));
|
|
|
|
new TimingsExport(listeners, parent, history).start();
|
|
@@ -273,6 +277,19 @@ public class TimingsExport extends Thread {
|
|
return timingsCost;
|
|
}
|
|
|
|
+ // Purpur start
|
|
+ private static JSONObject mapAsJSON(java.util.Properties properties) {
|
|
+ JSONObject object = new JSONObject();
|
|
+ for (String key : properties.stringPropertyNames()) {
|
|
+ if (key.startsWith("rcon") || key.startsWith("query") || key.equals("level-seed") || TimingsManager.hiddenConfigs.contains(key)) {
|
|
+ continue;
|
|
+ }
|
|
+ object.put(key, valAsJSON(properties.get(key), key));
|
|
+ }
|
|
+ return object;
|
|
+ }
|
|
+ // Purpur end
|
|
+
|
|
private static JSONObject mapAsJSON(ConfigurationSection config, String parentKey) {
|
|
|
|
JSONObject object = new JSONObject();
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
|
index 499d5d5a35323571571911969cc9bac3b90cec99..107809776c08a005fa3f0346e42c9d92e753c411 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
|
@@ -243,6 +243,12 @@ public class PaperConfig {
|
|
// Pufferfish end
|
|
boolean verboseTimings = getBoolean("timings.verbose", true);
|
|
TimingsManager.url = getString("timings.url", "https://timings.aikar.co/");
|
|
+ // Purpur start
|
|
+ if (org.purpurmc.purpur.PurpurConfig.version < 23 && TimingsManager.url.contains("timings.pl3x.net")) {
|
|
+ set("timings.url", "https://timings.aikar.co/");
|
|
+ TimingsManager.url = "https://timings.aikar.co/";
|
|
+ }
|
|
+ // Purpur end
|
|
if (!TimingsManager.url.endsWith("/")) {
|
|
TimingsManager.url += "/";
|
|
}
|