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

Add tuinity.yml and server.properties to timings config tab

Browse Source
This commit is contained in:
William Blake Galbreath
2020-03-08 15:27:59 -05:00
parent a32448bda1
commit aefaadb08f
9 changed files with 111 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/api/0004-Host-our-own-timings.patch
View File

@@ -1,27 +1,17 @@
From 31d3ec5ad187df9a8a60c212260a729abc029703 Mon Sep 17 00:00:00 2001
From c9e3dae6773177302297c61c55d0bbbe9f1c6f9c Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Tue, 18 Feb 2020 20:38:26 -0600
Subject: [PATCH] Host our own timings
---
src/main/java/co/aikar/timings/TimingsExport.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
src/main/java/co/aikar/timings/TimingsExport.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
index 93d5a3f97..a4ae730da 100644
index b5111928d..63d21ddbc 100644
--- a/src/main/java/co/aikar/timings/TimingsExport.java
+++ b/src/main/java/co/aikar/timings/TimingsExport.java
@@ -206,7 +206,8 @@ class TimingsExport extends Thread {
parent.put("config", createObject(
pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
- pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null))
+ pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)),
+ pair("purpur", mapAsJSON(Bukkit.spigot().getPurpurConfig(), null)) // Purpur
));
new TimingsExport(listeners, parent, history).start();
@@ -283,7 +284,7 @@ class TimingsExport extends Thread {
@@ -301,7 +301,7 @@ class TimingsExport extends Thread {
String response = null;
String timingsURL = null;
try {