From ff72782888e6061b9fc3c1a9034a1892eaaf2fba Mon Sep 17 00:00:00 2001
From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
Date: Thu, 7 Dec 2023 15:14:35 -0500
Subject: [PATCH] Updated Upstream (Bukkit/CraftBukkit/Spigot)

Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
cdfe62e4 Update to Minecraft 1.20.4

CraftBukkit Changes:
51eea725f Update to Minecraft 1.20.4

Spigot Changes:
ce0f71e4 Update to Minecraft 1.20.4
---
 patches/api/0001-Convert-project-to-Gradle.patch | 4 ++--
 patches/server/0001-Setup-Gradle-project.patch   | 4 ++--
 work/Bukkit                                      | 2 +-
 work/CraftBukkit                                 | 2 +-
 work/Spigot                                      | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/patches/api/0001-Convert-project-to-Gradle.patch b/patches/api/0001-Convert-project-to-Gradle.patch
index 540f4d353b..562225e974 100644
--- a/patches/api/0001-Convert-project-to-Gradle.patch
+++ b/patches/api/0001-Convert-project-to-Gradle.patch
@@ -124,7 +124,7 @@ index 0000000000000000000000000000000000000000..41e77b687df6480adf8f5e21daad105d
 +}
 diff --git a/pom.xml b/pom.xml
 deleted file mode 100644
-index 061d8bcc258d8f1936462a9f92e9d4f7617e716f..0000000000000000000000000000000000000000
+index 6a2befb4a0172e2208775887a7ebe25ed8ba5e4c..0000000000000000000000000000000000000000
 --- a/pom.xml
 +++ /dev/null
 @@ -1,278 +0,0 @@
@@ -135,7 +135,7 @@ index 061d8bcc258d8f1936462a9f92e9d4f7617e716f..00000000000000000000000000000000
 -
 -    <groupId>org.spigotmc</groupId>
 -    <artifactId>spigot-api</artifactId>
--    <version>1.20.3-R0.1-SNAPSHOT</version>
+-    <version>1.20.4-R0.1-SNAPSHOT</version>
 -    <packaging>jar</packaging>
 -
 -    <name>Spigot-API</name>
diff --git a/patches/server/0001-Setup-Gradle-project.patch b/patches/server/0001-Setup-Gradle-project.patch
index fb57ad384b..da7bebccdf 100644
--- a/patches/server/0001-Setup-Gradle-project.patch
+++ b/patches/server/0001-Setup-Gradle-project.patch
@@ -174,7 +174,7 @@ index 0000000000000000000000000000000000000000..126d8c232de267d6d5639647fcda3b34
 +}
 diff --git a/pom.xml b/pom.xml
 deleted file mode 100644
-index 6ebce22b21550442716de605149e9d9eb6bee481..0000000000000000000000000000000000000000
+index bd92ee304f9ab0fcc80d4456ca34a3e026e1b97f..0000000000000000000000000000000000000000
 --- a/pom.xml
 +++ /dev/null
 @@ -1,602 +0,0 @@
@@ -184,7 +184,7 @@ index 6ebce22b21550442716de605149e9d9eb6bee481..00000000000000000000000000000000
 -    <groupId>org.spigotmc</groupId>
 -    <artifactId>spigot</artifactId>
 -    <packaging>jar</packaging>
--    <version>1.20.3-R0.1-SNAPSHOT</version>
+-    <version>1.20.4-R0.1-SNAPSHOT</version>
 -    <name>Spigot</name>
 -    <url>https://www.spigotmc.org/</url>
 -
diff --git a/work/Bukkit b/work/Bukkit
index 9a294519b0..cdfe62e472 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 9a294519b082385a41711eed78797c6b7f3c2476
+Subproject commit cdfe62e472085016a8225f356eec9efede9d8b5a
diff --git a/work/CraftBukkit b/work/CraftBukkit
index c9cb085517..51eea725f7 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit c9cb085517dd8a0042a53bf376664397209b1852
+Subproject commit 51eea725f7b2b683ce04c7d2aeb76705086d78e6
diff --git a/work/Spigot b/work/Spigot
index 9d728858d2..ce0f71e427 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 9d728858d26d780a91aa8e3541bcfda9de7f76dc
+Subproject commit ce0f71e4276e911707a258a968371f06f8718aca