From 028780d4e124f3b3c81e9c0a28308b577e102f68 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <blake.galbreath@gmail.com>
Date: Thu, 21 Jul 2022 23:20:03 -0500
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@c6313e6 [ci skip] Update WSL docs in CONTRIBUTING (#7836)
PaperMC/Paper@d0e7fa4 Updated Upstream (Bukkit) (#8158)
---
 gradle.properties                             | 2 +-
 patches/api/0001-Pufferfish-API-Changes.patch | 8 ++++----
 patches/api/0047-Spark-Profiler.patch         | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 296c8c6f7..ed7e2d758 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 group = org.purpurmc.purpur
 version = 1.19-R0.1-SNAPSHOT
 
-paperCommit = 73dca00ba533809521e254b844c9fa2342c09bd0
+paperCommit = d0e7fa4dc95adf25d01736194a389e768250537f
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/api/0001-Pufferfish-API-Changes.patch b/patches/api/0001-Pufferfish-API-Changes.patch
index c7c73e46e..1794faadb 100644
--- a/patches/api/0001-Pufferfish-API-Changes.patch
+++ b/patches/api/0001-Pufferfish-API-Changes.patch
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 0660174a8c543b3e8ef317cfabcda88a6a53d844..fa06125f095bd099d595ddb3cb5871d90ae1ccf7 100644
+index e950bce5047552bdd3f5664eb24ce290b0a06225..10716b2c866631badb99b1fb79b66c62b117b038 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -41,6 +41,7 @@ dependencies {
@@ -426,10 +426,10 @@ index 8e6ad6ffb6918742d47b58d6cb1ad646d5e3df5f..331adbaf782c00d801a36c0c9551451a
      }
  
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 5270e43c629fe63f42691d10c6f77dc1cc987457..6aba652af2b2f054ad22c77e4e59f0ed3eddc685 100644
+index 1c9d0a81d581d0e6a8b2551a2cb9ed5e18bb2991..e42a2d631fd7eaa455132e0cf64c9be7707dadb9 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-@@ -622,7 +622,9 @@ public final class SimplePluginManager implements PluginManager {
+@@ -623,7 +623,9 @@ public final class SimplePluginManager implements PluginManager {
  
      // Paper start
      private void handlePluginException(String msg, Throwable ex, Plugin plugin) {
@@ -439,7 +439,7 @@ index 5270e43c629fe63f42691d10c6f77dc1cc987457..6aba652af2b2f054ad22c77e4e59f0ed
          callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerPluginEnableDisableException(msg, ex, plugin)));
      }
      // Paper end
-@@ -681,9 +683,11 @@ public final class SimplePluginManager implements PluginManager {
+@@ -682,9 +684,11 @@ public final class SimplePluginManager implements PluginManager {
                              ));
                  }
              } catch (Throwable ex) {
diff --git a/patches/api/0047-Spark-Profiler.patch b/patches/api/0047-Spark-Profiler.patch
index eba94c582..7949e7d11 100644
--- a/patches/api/0047-Spark-Profiler.patch
+++ b/patches/api/0047-Spark-Profiler.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Spark Profiler
 
 
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index aed2209b66f11a0d03473cf19437f3da0e9e573a..e46c3cb737d644d167b4426b29bb4ade0c24e74e 100644
+index e42a2d631fd7eaa455132e0cf64c9be7707dadb9..cc67217ff6003c83f10c6eeb7d4a2205cb0129c4 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-@@ -164,6 +164,12 @@ public final class SimplePluginManager implements PluginManager {
+@@ -165,6 +165,12 @@ public final class SimplePluginManager implements PluginManager {
                  server.getLogger().log(Level.SEVERE, "Could not load '" + file.getPath() + "' in folder '" + file.getParentFile().getPath() + "'", ex); // Paper
                  continue;
              }