From 59bc56b30eceaa0a95c62f37767428d7fd251a05 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 12 Mar 2023 05:54:43 +0000
Subject: [PATCH] Updated Upstream (Purpur)

Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@890a9d7 inline Component import
---
 .upstream-data                                      | 2 +-
 patches/api/0001-Pufferfish-API-Changes.patch       | 2 +-
 patches/api/0002-Purpur-API-Changes.patch           | 8 ++++----
 patches/server/0001-Pufferfish-Server-Changes.patch | 2 +-
 patches/server/0002-Purpur-Server-Changes.patch     | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.upstream-data b/.upstream-data
index 3dd18b8..e4704b1 100644
--- a/.upstream-data
+++ b/.upstream-data
@@ -1,2 +1,2 @@
-purpurCommit = 235d5075a1eb9d733acbd88e19724b0662f6d7c1
+purpurCommit = 890a9d7e4bbfec740da80b0b16f8bedcef31d351
 pufferfishCommit = 52307ae220ad5a9a01ac4e273b921f3cbb097de5
diff --git a/patches/api/0001-Pufferfish-API-Changes.patch b/patches/api/0001-Pufferfish-API-Changes.patch
index 9d76745..304d3a6 100644
--- a/patches/api/0001-Pufferfish-API-Changes.patch
+++ b/patches/api/0001-Pufferfish-API-Changes.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <dev@alpha93.kr>
-Date: Sun, 12 Mar 2023 05:31:17 +0000
+Date: Sun, 12 Mar 2023 05:50:00 +0000
 Subject: [PATCH] Pufferfish API Changes
 
 Original: Kevin Raneri <kevin.raneri@gmail.com>
diff --git a/patches/api/0002-Purpur-API-Changes.patch b/patches/api/0002-Purpur-API-Changes.patch
index 9cbd905..68149fd 100644
--- a/patches/api/0002-Purpur-API-Changes.patch
+++ b/patches/api/0002-Purpur-API-Changes.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <dev@alpha93.kr>
-Date: Sun, 12 Mar 2023 05:33:21 +0000
+Date: Sun, 12 Mar 2023 05:51:48 +0000
 Subject: [PATCH] Purpur API Changes
 
 Original: PurpurMC
@@ -1155,7 +1155,7 @@ index bc84b892cae5fe7019a3ad481e9da79956efa1fe..48eb5b00c460cccde29d327cef1d63fc
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index fd890d0a3a2c92ad821ade7711191bdb0e3e3624..b9a924058f99c24db499dbb97373514d1f2ea174 100644
+index fd890d0a3a2c92ad821ade7711191bdb0e3e3624..9c03265a9e932b3c9b5f0f7ffb4c9e9094f813ec 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -2969,4 +2969,139 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1286,7 +1286,7 @@ index fd890d0a3a2c92ad821ade7711191bdb0e3e3624..b9a924058f99c24db499dbb97373514d
 +     *
 +     * @param message The death message to show the player
 +     */
-+    void sendDeathScreen(@NotNull Component message);
++    void sendDeathScreen(@NotNull net.kyori.adventure.text.Component message);
 +
 +    /**
 +     * Sends a player the death screen with a specified death message,
@@ -1295,7 +1295,7 @@ index fd890d0a3a2c92ad821ade7711191bdb0e3e3624..b9a924058f99c24db499dbb97373514d
 +     * @param message The death message to show the player
 +     * @param killer The entity that killed the player
 +     */
-+    void sendDeathScreen(@NotNull Component message, @Nullable Entity killer);
++    void sendDeathScreen(@NotNull net.kyori.adventure.text.Component message, @Nullable Entity killer);
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/entity/Snowman.java b/src/main/java/org/bukkit/entity/Snowman.java
diff --git a/patches/server/0001-Pufferfish-Server-Changes.patch b/patches/server/0001-Pufferfish-Server-Changes.patch
index de175b8..3e2780f 100644
--- a/patches/server/0001-Pufferfish-Server-Changes.patch
+++ b/patches/server/0001-Pufferfish-Server-Changes.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <dev@alpha93.kr>
-Date: Sun, 12 Mar 2023 05:31:17 +0000
+Date: Sun, 12 Mar 2023 05:50:00 +0000
 Subject: [PATCH] Pufferfish Server Changes
 
 Original: Kevin Raneri <kevin.raneri@gmail.com>
diff --git a/patches/server/0002-Purpur-Server-Changes.patch b/patches/server/0002-Purpur-Server-Changes.patch
index e72ef52..db713be 100644
--- a/patches/server/0002-Purpur-Server-Changes.patch
+++ b/patches/server/0002-Purpur-Server-Changes.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <dev@alpha93.kr>
-Date: Sun, 12 Mar 2023 05:33:21 +0000
+Date: Sun, 12 Mar 2023 05:51:48 +0000
 Subject: [PATCH] Purpur Server Changes
 
 Original: PurpurMC