From e068628a9f2c66ba9dca5875ce8604db01e82bdb Mon Sep 17 00:00:00 2001
From: granny <granny@purpurmc.org>
Date: Sun, 24 Sep 2023 16:42:20 -0700
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@3cf03fc Fix/update wiki (#9758)
PaperMC/Paper@298c478 Fix tests that broke during the junit 5 update (#9757)
---
 gradle.properties                 | 2 +-
 patches/server/0001-Rebrand.patch | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 947a619dc..c37ac5929 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
 version = 1.20.2-R0.1-SNAPSHOT
 
 mcVersion = 1.20.2
-paperCommit = 5cbce366b28af1ace0b61db5afbe7dcebab7a6b0
+paperCommit = 298c47857ba33c6d2e42ece4e85b3ed4143298e8
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/server/0001-Rebrand.patch b/patches/server/0001-Rebrand.patch
index 8d9415867..d75937634 100644
--- a/patches/server/0001-Rebrand.patch
+++ b/patches/server/0001-Rebrand.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index f1ade7432ae6fae1bceb90f975448ab43543942f..6b2cbb566dfdc2bc751a0870594b1499df7ea797 100644
+index 683159586641dd9aa42ae96fa51602469755723f..ffee77918e7390c810010e057d088c2967d1e7b0 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -13,8 +13,12 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
@@ -43,7 +43,7 @@ index f1ade7432ae6fae1bceb90f975448ab43543942f..6b2cbb566dfdc2bc751a0870594b1499
              "Implementation-Vendor" to date, // Paper
              "Specification-Title" to "Bukkit",
              "Specification-Version" to project.version,
-@@ -149,7 +157,7 @@ fun TaskContainer.registerRunTask(
+@@ -156,7 +164,7 @@ fun TaskContainer.registerRunTask(
      name: String,
      block: JavaExec.() -> Unit
  ): TaskProvider<JavaExec> = register<JavaExec>(name) {