From ad01d8a45002510d62541cf415e7547c02867bb6 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 2 Jun 2024 23:13:46 +0000
Subject: [PATCH] Updated Upstream (Paper, Purpur)

Upstream has released updates that appear to apply and compile correctly

Upstream has released updates that appear to apply and compile correctly.

[Purpur Changes]
PlazmaMC/Purpur@be3a6d5: Updated Upstream (Paper)
PlazmaMC/Purpur@0cbff64: Add back Pufferfish patches
---
 gradle.properties                                   | 4 ++--
 patches/api/0001-Pufferfish-API-Changes.patch       | 2 +-
 patches/api/0002-Purpur-API-Changes.patch           | 2 +-
 patches/server/0001-Pufferfish-Server-Changes.patch | 2 +-
 patches/server/0002-Purpur-Server-Changes.patch     | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 35bf13d1a..45e7a639b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,5 +25,5 @@ pufferfishRepo = https://github.com/PlazmaMC/Pufferfish
 pufferfishBranch = ver/1.20
 usePufferfish = true
 
-paperCommit = 5d8e53d78d0089894c9552b95b7b8ad9dcc8cb6f
-purpurCommit = 7095128d494cf55d8de10bece0a05f444fda183e
+paperCommit = ac647513b2330e4c58f7c511ed79b1ad5d262be6
+purpurCommit = 0cbff64ea99f0878244431477d21d9faa14b768f
diff --git a/patches/api/0001-Pufferfish-API-Changes.patch b/patches/api/0001-Pufferfish-API-Changes.patch
index 9ad5fa55e..9e0e610b6 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: Kevin Raneri <kevin.raneri@gmail.com>
-Date: Sun, 2 Jun 2024 20:42:32 +0900
+Date: Sun, 2 Jun 2024 23:04:51 +0000
 Subject: [PATCH] Pufferfish API Changes
 
 Pufferfish
diff --git a/patches/api/0002-Purpur-API-Changes.patch b/patches/api/0002-Purpur-API-Changes.patch
index b90e11cb6..4ae983213 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: granny <contact@granny.dev>
-Date: Sun, 2 Jun 2024 20:43:53 +0900
+Date: Sun, 2 Jun 2024 23:06:07 +0000
 Subject: [PATCH] Purpur API Changes
 
 PurpurMC
diff --git a/patches/server/0001-Pufferfish-Server-Changes.patch b/patches/server/0001-Pufferfish-Server-Changes.patch
index 0ebc0b247..6cea6fd85 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: Kevin Raneri <kevin.raneri@gmail.com>
-Date: Sun, 2 Jun 2024 20:43:58 +0900
+Date: Sun, 2 Jun 2024 23:06:13 +0000
 Subject: [PATCH] Pufferfish Server Changes
 
 Pufferfish
diff --git a/patches/server/0002-Purpur-Server-Changes.patch b/patches/server/0002-Purpur-Server-Changes.patch
index b64ad4df5..163b309ae 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: granny <contact@granny.dev>
-Date: Sun, 2 Jun 2024 20:43:59 +0900
+Date: Sun, 2 Jun 2024 23:06:15 +0000
 Subject: [PATCH] Purpur Server Changes
 
 PurpurMC