From 13d0b40adf7b88a2b9e7a53696a94d008dc8a23c Mon Sep 17 00:00:00 2001
From: Apehum <apehumchik@gmail.com>
Date: Fri, 2 Dec 2022 22:49:27 +0800
Subject: [PATCH] Upstream (Pufferfish)

---
 build.gradle.kts                          |  2 +-
 gradle.properties                         |  2 +-
 patches/server/0002-Matter-Branding.patch | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 1055bcc..52bda17 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     java
     id("com.github.johnrengelman.shadow") version "7.1.2" apply false
-    id("io.papermc.paperweight.patcher") version "1.3.8"
+    id("io.papermc.paperweight.patcher") version "1.3.9"
 }
 
 repositories {
diff --git a/gradle.properties b/gradle.properties
index 8c8637c..66959ed 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group=su.plo.matter
 
 version=1.19.2-R0.1-SNAPSHOT
 mcVersion=1.19.2
-pufferfishRef=dda277afae92068b2b462e498ae819fbdcd3962b
+pufferfishRef=5e6e1adeaeea640f097b826ca092130991e52d47
 
 org.gradle.jvmargs=-Xmx2G
 
diff --git a/patches/server/0002-Matter-Branding.patch b/patches/server/0002-Matter-Branding.patch
index 90155d9..b61ff2f 100644
--- a/patches/server/0002-Matter-Branding.patch
+++ b/patches/server/0002-Matter-Branding.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Matter Branding
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index f0d22a733e3b97fb959cd566fb6c93c6d5681e16..99dc2449e8e86e474b5f008151afce2e080819f5 100644
+index 5b43f5c27ce903c53cbce245477fbdefdc88733f..47dd7583d833ee877145350c4ba6d5a18a0cff0c 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -9,7 +9,7 @@ plugins {
+@@ -7,7 +7,7 @@ plugins {
  }
  
  dependencies {
@@ -17,7 +17,7 @@ index f0d22a733e3b97fb959cd566fb6c93c6d5681e16..99dc2449e8e86e474b5f008151afce2e
      // Pufferfish start
      implementation("io.papermc.paper:paper-mojangapi:1.19.2-R0.1-SNAPSHOT") {
          exclude("io.papermc.paper", "paper-api")
-@@ -84,7 +84,7 @@ tasks.jar {
+@@ -82,7 +82,7 @@ tasks.jar {
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",
@@ -40,7 +40,7 @@ index c5d5648f4ca603ef2b1df723b58f9caf4dd3c722..0132e6ab29ab64d74abae2b2a06a80ab
                  .completer(new ConsoleCommandCompleter(this.server))
                  .option(LineReader.Option.COMPLETE_IN_WORD, true);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index af9da39dffda01325af2ab3dd8b5e1efb18e013a..25b1faf6221bfebef2971f05ffa4d32e00ef0905 100644
+index 3cadf20891888b56ac70798d581d6a044a98c0a3..6e78262826ca430b30f1ec487a298390f59cd441 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1656,7 +1656,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -53,7 +53,7 @@ index af9da39dffda01325af2ab3dd8b5e1efb18e013a..25b1faf6221bfebef2971f05ffa4d32e
  
      public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6783ac95f43d70a1511c2577fc9d2e74ea704101..6a5e884e81595fa555f0f57163cc1fe1e11e4f71 100644
+index ce8afc699918e9f4b121508fc3532b07ccb4f52f..e26bdb6968d6368c1f28fdd9fd92c9f4047d10ba 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -249,7 +249,7 @@ import javax.annotation.Nullable; // Paper