From dc9b853f3a2968ebbeb3697cdf1615d88176f636 Mon Sep 17 00:00:00 2001
From: Apehum <apehumchik@gmail.com>
Date: Wed, 23 Feb 2022 22:32:31 +0800
Subject: [PATCH] Upstream (Purpur)

---
 gradle.properties                         | 2 +-
 patches/server/0002-Matter-Branding.patch | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index b853450..87285b8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,7 +3,7 @@ version = 1.18-R0.1-SNAPSHOT
 
 mcVersion = 1.18.1
 packageVersion = 1_18_R1
-purpurRef = cfe8efe1f0b3b1e1d86236c8d9368a783473696e
+purpurRef = 52228a11c1140b4ef7c704de6d50e42e3f1edcce
 
 org.gradle.jvmargs=-Xmx2G
 
diff --git a/patches/server/0002-Matter-Branding.patch b/patches/server/0002-Matter-Branding.patch
index ad4dbc4..9c129d5 100644
--- a/patches/server/0002-Matter-Branding.patch
+++ b/patches/server/0002-Matter-Branding.patch
@@ -41,7 +41,7 @@ index 8c3c68465197fafc14849dc38a572e309931e2a2..a6d857b907ecc261a7684a1446b735b9
                  .completer(new ConsoleCommandCompleter(this.server))
                  .option(LineReader.Option.COMPLETE_IN_WORD, true);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4f4d35a988e11a19ecdc4ed1215743be0737c1e0..2c81d72573643224083416eae68f3413752198e4 100644
+index 79d1e922db61d6bb2c42a6f5aad9291dd55f44d3..6f31289b02aaf320c0cb1d92e1dcb8e945c77ba1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -251,7 +251,7 @@ import javax.annotation.Nullable; // Paper
@@ -88,10 +88,10 @@ index 99597258e8e88cd9e2c901c4ac3ff7faeeabee2b..350fcb92af9068a6b059684d80a441be
  
          if (stream != null) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index a001a09ea5fd0934eba81a5ee23b0c51c569d2fb..b2fe6239a5be07f4c371a4e6ddb1ff9528a19cc1 100644
+index 659e93fb24124318367e5b4d0b144ca1443950e9..e09c56470bf005243d0a0a829681baf88e3de260 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -233,7 +233,7 @@ public class PurpurConfig {
+@@ -235,7 +235,7 @@ public class PurpurConfig {
          if (!TimingsManager.hiddenConfigs.contains("settings.seed")) TimingsManager.hiddenConfigs.add("settings.seed");
      }