Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 17:07:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Preliminary update to 1.17.1

Browse Source
This commit is contained in:
William Blake Galbreath
2021-07-06 16:25:46 -05:00
parent 89c9c902b1
commit 471d6bf4c1
202 changed files with 994 additions and 20192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
patches/server/0007-Timings-stuff.patch
View File

@@ -5,10 +5,10 @@ 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..33263af33b4355e5079fadfcfae77d038aebd2c4 100644
index 2ff4d4921e2076abf415bd3c8f5173ecd6222168..dd9efe48006d060397ef3932afa3665f89ea99b3 100644
--- a/src/main/java/co/aikar/timings/TimingsExport.java
+++ b/src/main/java/co/aikar/timings/TimingsExport.java
@@ -226,10 +226,15 @@ public class TimingsExport extends Thread {
@@ -226,9 +226,14 @@ public class TimingsExport extends Thread {
// Information on the users Config
parent.put("config", createObject(
@@ -17,15 +17,14 @@ index 9d920565ff65a84b1b9a2a4777fd8bc8f07e0153..33263af33b4355e5079fadfcfae77d03
+ pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), 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("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null))
+ pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)), // Tuinity - add config to timings report
+ pair("purpur", mapAsJSON(Bukkit.spigot().getPurpurConfig(), null))
+ // Purpur end
));
new TimingsExport(listeners, parent, history).start();
@@ -270,6 +275,19 @@ public class TimingsExport extends Thread {
@@ -269,6 +274,19 @@ public class TimingsExport extends Thread {
return timingsCost;
}
@@ -45,7 +44,7 @@ index 9d920565ff65a84b1b9a2a4777fd8bc8f07e0153..33263af33b4355e5079fadfcfae77d03
private static JSONObject mapAsJSON(ConfigurationSection config, String parentKey) {
JSONObject object = new JSONObject();
@@ -306,7 +324,7 @@ public class TimingsExport extends Thread {
@@ -305,7 +323,7 @@ public class TimingsExport extends Thread {
String response = null;
String timingsURL = null;
try {
@@ -55,7 +54,7 @@ index 9d920565ff65a84b1b9a2a4777fd8bc8f07e0153..33263af33b4355e5079fadfcfae77d03
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 f7c46b8173d30192853c875675a1ed0f59170b34..d2d602eda6f2899f809c31aa1082540e1c7855b9 100644
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 {