mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
2040a9ac8a
Upstream has released updates that appear to apply and compile correctly Paper Changes: 8fe5611 Fix Player#playerListName nullability annotation (#6089) 8827886 Add back linking to Adventure Javadoc (#6088) 6ea4da4 AbstractSkeleton should extend RangedEntity (#6087) a831634 add Optimize Light Engine patch (#5863) 56fd1a2 Update to Minecraft 1.17.1 (#6097) f8d6cbd Deobfuscate stacktraces in sync load info (#6103) Tuinity Changes: 5065deb Make CollisionContext initialisation lazy 388bdf5 Optimise ActivationRange#activateEntities again 2310a94 Update to 1.17.1
72 lines
3.6 KiB
Diff
72 lines
3.6 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 9d920565ff65a84b1b9a2a4777fd8bc8f07e0153..69d85e5a0a5ab9ffb682d8565aa08a4a567b68da 100644
|
|
--- a/src/main/java/co/aikar/timings/TimingsExport.java
|
|
+++ b/src/main/java/co/aikar/timings/TimingsExport.java
|
|
@@ -226,10 +226,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("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
|
|
pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)), // Tuinity - add config to timings report
|
|
- pair("tuinity", mapAsJSON(Bukkit.spigot().getTuinityConfig(), null)) // Tuinity - add config to timings report
|
|
+ pair("tuinity", mapAsJSON(Bukkit.spigot().getTuinityConfig(), null)), // Tuinity - add config to timings report
|
|
+ pair("purpur", mapAsJSON(Bukkit.spigot().getPurpurConfig(), null))
|
|
+ // Purpur end
|
|
));
|
|
|
|
new TimingsExport(listeners, parent, history).start();
|
|
@@ -270,6 +274,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();
|
|
@@ -306,7 +323,7 @@ public class TimingsExport extends Thread {
|
|
String response = null;
|
|
String timingsURL = null;
|
|
try {
|
|
- HttpURLConnection con = (HttpURLConnection) new URL("http://timings.aikar.co/post").openConnection();
|
|
+ HttpURLConnection con = (HttpURLConnection) new URL(net.pl3x.purpur.PurpurConfig.timingsUrl + "/post").openConnection(); // Purpur
|
|
con.setDoOutput(true);
|
|
String hostName = "BrokenHost";
|
|
try {
|
|
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
|
index d92812cb334b590b728afb828dae61da483d8d56..e381ff1767b1ef2275ed112c27c491a3671b5039 100644
|
|
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
|
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
|
@@ -159,4 +159,10 @@ public class PurpurConfig {
|
|
private static void messages() {
|
|
cannotRideMob = getString("settings.messages.cannot-ride-mob", cannotRideMob);
|
|
}
|
|
+
|
|
+ public static String timingsUrl = "https://timings.pl3x.net";
|
|
+ private static void timingsSettings() {
|
|
+ timingsUrl = getString("settings.timings.url", timingsUrl);
|
|
+ if (!co.aikar.timings.TimingsManager.hiddenConfigs.contains("server-ip")) co.aikar.timings.TimingsManager.hiddenConfigs.add("server-ip");
|
|
+ }
|
|
}
|