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

merge some patches & re-enable timings

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

22
patches/server/0003-Change-Airplane-defaults-closer-to-vanilla.patch
View File

@@ -4,6 +4,28 @@ Date: Wed, 18 Aug 2021 13:53:37 -0500
Subject: [PATCH] Change Airplane defaults closer to vanilla
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index cba14fd282d1294eba4581336c5e438484df76f9..5b4000d1f63e2b028e7a4450dcd084eb507f7f91 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -202,7 +202,7 @@ public class PaperConfig {
public static String timingsServerName;
private static void timings() {
boolean timings = getBoolean("timings.enabled", true);
- // Airplane start
+ /* // Airplane start // Purpur start
boolean reallyEnableTimings = getBoolean("timings.really-enabled", false);
if (timings && !reallyEnableTimings) {
Bukkit.getLogger().log(Level.WARNING, "[Airplane] To improve performance, timings have been disabled by default");
@@ -210,7 +210,7 @@ public class PaperConfig {
Bukkit.getLogger().log(Level.WARNING, "[Airplane] If you would like to disable this message, either set timings.really-enabled to true or timings.enabled to false.");
}
timings = reallyEnableTimings;
- // Airplane end
+ // Airplane end */ // Purpur end
boolean verboseTimings = getBoolean("timings.verbose", true);
TimingsManager.url = getString("timings.url", "https://timings.aikar.co/");
if (!TimingsManager.url.endsWith("/")) {
diff --git a/src/main/java/gg/airplane/AirplaneConfig.java b/src/main/java/gg/airplane/AirplaneConfig.java
index 2b654e6adfe331a5fa68c1aea7d6d6cea1f3567d..0f4cb1644d32c4411cda3cf7ee5faea91a9ab205 100644
--- a/src/main/java/gg/airplane/AirplaneConfig.java