From e4e6c9ccc6f51c3d3bcb38a3ba8a1cb41625b6a9 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@Gmail.com>
Date: Fri, 4 Mar 2022 17:54:24 -0600
Subject: [PATCH] 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
---
 gradle.properties                                   | 2 +-
 patches/server/0001-Pufferfish-Server-Changes.patch | 4 ++--
 patches/server/0008-Timings-stuff.patch             | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 5ecc802e9..6fcd250fb 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 group = org.purpurmc.purpur
 version = 1.18.2-R0.1-SNAPSHOT
 
-paperCommit = 63aa4d33194cae156d1bed840868336cda6bc52b
+paperCommit = 42a9c3789d6f71b9641b7de5812656ef9281ba52
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/server/0001-Pufferfish-Server-Changes.patch b/patches/server/0001-Pufferfish-Server-Changes.patch
index 691dfd071..a92bcb6ed 100644
--- a/patches/server/0001-Pufferfish-Server-Changes.patch
+++ b/patches/server/0001-Pufferfish-Server-Changes.patch
@@ -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);
diff --git a/patches/server/0008-Timings-stuff.patch b/patches/server/0008-Timings-stuff.patch
index b6c70450f..a8ff81ea7 100644
--- a/patches/server/0008-Timings-stuff.patch
+++ b/patches/server/0008-Timings-stuff.patch
@@ -47,10 +47,10 @@ index d3bb2a3ead944a89330bbced6812df73d174d061..aa906caf51d81b26a5565a92ea24fb79
  
          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 499d5d5a35323571571911969cc9bac3b90cec99..107809776c08a005fa3f0346e42c9d92e753c411 100644
+index b59d521a4bf81ff45a70cb386bc14f9c0be56f20..ab045c0d6c24a246b436e14dc96e441897b9c87e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -243,6 +243,12 @@ public class PaperConfig {
+@@ -252,6 +252,12 @@ public class PaperConfig {
          // Pufferfish end
          boolean verboseTimings = getBoolean("timings.verbose", true);
          TimingsManager.url = getString("timings.url", "https://timings.aikar.co/");