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

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@4797e3a Dont reassign the hiddenConfigs field in TimingsManager (#7951)
PaperMC/Paper@3690440 Update paperweight to 1.3.7
PaperMC/Paper@90050ff Update Adventure to 4.11.0 and implement ComponentLogger (#7937)
This commit is contained in:
BillyGalbreath
2022-06-12 16:38:55 -05:00
parent c466dcac30
commit 398d5b9243
5 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
patches/server/0201-Structure-seed-options.patch
View File

@@ -4,19 +4,6 @@ Date: Thu, 1 Jul 2021 19:25:05 -0500
Subject: [PATCH] Structure seed options
diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
index 8f109e667f09d58f6bc7ce1a8b44e8e70d191579..b5482024a0430582d4e9ee4995b508aa4a4a7605 100644
--- a/src/main/java/co/aikar/timings/MinecraftTimings.java
+++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
@@ -171,7 +171,7 @@ public final class MinecraftTimings {
if (!config.hiddenConfigEntries.contains("proxies.velocity.secret")) {
config.hiddenConfigEntries.add("proxies.velocity.secret");
}
- TimingsManager.hiddenConfigs = config.hiddenConfigEntries;
+ TimingsManager.hiddenConfigs.addAll(config.hiddenConfigEntries); // Purpur
co.aikar.timings.Timings.setVerboseTimingsEnabled(config.verbose);
co.aikar.timings.Timings.setTimingsEnabled(config.enabled);
co.aikar.timings.Timings.setHistoryInterval(config.historyInterval * 20);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 12c8cd424668c2167c071b48d0c1f689ca363513..b2604ae34c141ce69b3e1df72543aa942a9c9f0e 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java