From 8499388b77c64dbca71eded067aea12d51e9f443 Mon Sep 17 00:00:00 2001
From: AlphaKR93 <alphakr93@outlook.com>
Date: Thu, 11 Aug 2022 09:50:52 +0900
Subject: [PATCH] Updated Upstream (Paper & Purpur)

---
 gradle.properties                               | 2 +-
 patches/server/0002-Purpur-Server-Changes.patch | 8 ++++----
 upstream-data                                   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 8cf8abd..341f4b5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 group = net.prismarineteam.prismarine
 version = 1.19.2-R0.1-SNAPSHOT
 
-paperCommit = e6f8284125dc98a64025edd6ac11899ca8e7f3e5
+paperCommit = 2a74071bcb9d633f3cddccd974b1e926e37ed326
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/server/0002-Purpur-Server-Changes.patch b/patches/server/0002-Purpur-Server-Changes.patch
index eb6f4ff..7389890 100644
--- a/patches/server/0002-Purpur-Server-Changes.patch
+++ b/patches/server/0002-Purpur-Server-Changes.patch
@@ -497,7 +497,7 @@ index dd0143f319d4adef8834c513af34b1cce7a94a84..c2f32e65b44c60395661fb9f6eb8939a
          if (this.source.acceptsSuccess() && !this.silent) {
              this.source.sendSystemMessage(message);
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 135b341e5b975fc542f66ef9c52e29f4c6dd4a53..4bf5efd39938db79bba660efc2969022e8057abd 100644
+index 7c96f7fc5997761426a0c62cad0cab5cc668f282..eb4dac2239592d680ef31edf47f1ab660299762d 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
 @@ -137,7 +137,7 @@ public class Commands {
@@ -543,7 +543,7 @@ index 135b341e5b975fc542f66ef9c52e29f4c6dd4a53..4bf5efd39938db79bba660efc2969022
          }
  
          return b0;
-@@ -414,6 +420,7 @@ public class Commands {
+@@ -415,6 +421,7 @@ public class Commands {
      }
  
      private void runSync(ServerPlayer player, Collection<String> bukkit, RootCommandNode<SharedSuggestionProvider> rootcommandnode) {
@@ -551,7 +551,7 @@ index 135b341e5b975fc542f66ef9c52e29f4c6dd4a53..4bf5efd39938db79bba660efc2969022
          // Paper end - Async command map building
          new com.destroystokyo.paper.event.brigadier.AsyncPlayerSendCommandsEvent<CommandSourceStack>(player.getBukkitEntity(), (RootCommandNode) rootcommandnode, false).callEvent(); // Paper
          PlayerCommandSendEvent event = new PlayerCommandSendEvent(player.getBukkitEntity(), new LinkedHashSet<>(bukkit));
-@@ -426,6 +433,7 @@ public class Commands {
+@@ -427,6 +434,7 @@ public class Commands {
              }
          }
          // CraftBukkit end
@@ -20101,7 +20101,7 @@ index ae05f526f9ec70a2992ef3ee66b7f57eca2351fc..b010d7398c657367651fc576af5b0514
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 743b6e51817ffa1b7e602b1ac82eb1017841b691..6cc714d4044926a84feb5c084f2d15db1c29b21e 100644
+index 067d64ce06f626ce90b3ccf608d98f3c64fce335..284624683d0e593bc7996fa90a6eee2b6a22ad9e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -442,10 +442,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/upstream-data b/upstream-data
index eea41c4..3d77c33 100644
--- a/upstream-data
+++ b/upstream-data
@@ -1,2 +1,2 @@
-purpur = 1d0cc1ba2a5f962398649fbecc2f4c9d0563fae8
+purpur = c8a5344a14f65362814f46c45b57379685b7fe88
 pufferfish = 4882a952ea5fcb12cf6f8f164a8010fc2f85a25c