Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@0ee6dda Add javadoc linking for adventure-text-minimessage (#7538)
PaperMC/Paper@b6616c8 Fix falling block spawn methods
PaperMC/Paper@6d47843 replace bungeecord-chat dependency with deprecated version (#7539)
PaperMC/Paper@42a9c37 Move Adventure patch up
This commit is contained in:
BillyGalbreath
2022-03-04 17:54:24 -06:00
parent c4451ae6cd
commit e4e6c9ccc6
3 changed files with 5 additions and 5 deletions

View File

@@ -111,10 +111,10 @@ index 218f5bafeed8551b55b91c7fccaf6935c8b631ca..f2fe6ea3719ff8b2913b7a3a939d7a5b
metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
Map<String, Map<String, Integer>> map = new HashMap<>();
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index a7ebf6d9f79ce50a90c3c903563e00a10607f9f2..0b51ae930df9009fc02f11d831cdceb984194876 100644
index 2becc9a274eddb1a01655f24f54d5cf72470580d..b59d521a4bf81ff45a70cb386bc14f9c0be56f20 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -232,6 +232,15 @@ public class PaperConfig {
@@ -241,6 +241,15 @@ public class PaperConfig {
public static String timingsServerName;
private static void timings() {
boolean timings = getBoolean("timings.enabled", true);