merge some patches & re-enable timings

This commit is contained in:
Ben Kerllenevich
2021-08-20 17:41:02 -04:00
parent d918b4f0c6
commit 6e1ad89162
54 changed files with 75 additions and 64 deletions

View File

@@ -47,12 +47,12 @@ index 4cd8116fd623fbc9e175986526d3ae51a72b76e0..0e86ceb4d70c45835c9d1c6ca0908fdd
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 a189ad563e6072cf34e47fa66e3638b9fa577c61..caed8d2a39260b2c06b0cdac865f178e3074e7ef 100644
index b294fa10dc0fa804b94757eaa3becb104f20565a..aed391418d867e79d7236a3a3d8de54cb35807b1 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -217,7 +217,7 @@ public class PaperConfig {
timings = reallyEnableTimings;
// Airplane end
// Airplane end */ // Purpur end
boolean verboseTimings = getBoolean("timings.verbose", true);
- TimingsManager.url = getString("timings.url", "https://timings.aikar.co/");
+ TimingsManager.url = getString("timings.url", "https://timings.pl3x.net/");