From 03cf27d8f09a72ca66cb68566752d53fef9a4779 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/Convert-project-to-Gradle.patch | 2 +-
 patches/server/Setup-Gradle-project.patch   | 2 +-
 work/Bukkit                                 | 2 +-
 work/CraftBukkit                            | 2 +-
 work/Spigot                                 | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/patches/api/Convert-project-to-Gradle.patch b/patches/api/Convert-project-to-Gradle.patch
index 28399a5ce0..e4881c2ef2 100644
--- a/patches/api/Convert-project-to-Gradle.patch
+++ b/patches/api/Convert-project-to-Gradle.patch
@@ -135,7 +135,7 @@ index 0000000000000000000000000000000000000000..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/Setup-Gradle-project.patch b/patches/server/Setup-Gradle-project.patch
index 673a3df99b..674c91c632 100644
--- a/patches/server/Setup-Gradle-project.patch
+++ b/patches/server/Setup-Gradle-project.patch
@@ -184,7 +184,7 @@ index 0000000000000000000000000000000000000000..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