From cd161c51c546404bfcd847410e90a24f81e7384d Mon Sep 17 00:00:00 2001
From: Josh Roy <10731363+JRoy@users.noreply.github.com>
Date: Tue, 23 Nov 2021 16:11:33 -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:
ea30a299 Add docs in ServerListPingEvent based on changes from 1.18

CraftBukkit Changes:
03f249f0 Generate bootstrap jar separately
3b214b5a SPIGOT-6803: Fix ServerPing not using the new logic for show players in 1.18

Spigot Changes:
c07753b0 Rebuild patches
---
 .../server/Implement-extended-PaperServerListPingEvent.patch    | 2 +-
 patches/server/Setup-Gradle-project.patch                       | 2 +-
 work/BuildData                                                  | 2 +-
 work/Bukkit                                                     | 2 +-
 work/CraftBukkit                                                | 2 +-
 work/Spigot                                                     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/patches/server/Implement-extended-PaperServerListPingEvent.patch b/patches/server/Implement-extended-PaperServerListPingEvent.patch
index adf79980ef..eebb992b67 100644
--- a/patches/server/Implement-extended-PaperServerListPingEvent.patch
+++ b/patches/server/Implement-extended-PaperServerListPingEvent.patch
@@ -223,7 +223,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +            // Paper start - Replace everything
 +            /*
              // CraftBukkit start
-             // this.networkManager.sendPacket(new PacketStatusOutServerInfo(this.minecraftServer.getServerPing()));
+             // this.connection.send(new PacketStatusOutServerInfo(this.server.getStatus()));
              final Object[] players = this.server.getPlayerList().players.toArray();
 @@ -0,0 +0,0 @@ public class ServerStatusPacketListenerImpl implements ServerStatusPacketListene
  
diff --git a/patches/server/Setup-Gradle-project.patch b/patches/server/Setup-Gradle-project.patch
index 788c186fb8..5014753f55 100644
--- a/patches/server/Setup-Gradle-project.patch
+++ b/patches/server/Setup-Gradle-project.patch
@@ -568,7 +568,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -                            <goal>single</goal>
 -                        </goals>
 -                        <configuration>
--                            <appendAssemblyId>false</appendAssemblyId>
 -                            <archive>
 -                                <manifest>
 -                                    <addDefaultEntries>false</addDefaultEntries>
@@ -577,6 +576,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -                                    <Main-Class>org.bukkit.craftbukkit.bootstrap.Main</Main-Class>
 -                                </manifestEntries>
 -                            </archive>
+-                            <attach>false</attach>
 -                            <descriptors>
 -                                <descriptor>${project.basedir}/src/assembly/bootstrap.xml</descriptor>
 -                            </descriptors>
diff --git a/work/BuildData b/work/BuildData
index b364c062bb..8581e449a3 160000
--- a/work/BuildData
+++ b/work/BuildData
@@ -1 +1 @@
-Subproject commit b364c062bb9b9534c0dd34c7a46f3f1acbfb195d
+Subproject commit 8581e449a3490934f8bfa8b36d45842393dc8a20
diff --git a/work/Bukkit b/work/Bukkit
index 07a055315c..ea30a299e9 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 07a055315ce10d9e6134b9367443ddeeda501236
+Subproject commit ea30a299e948f5545b0ad042bd8e11716aeaa7f2
diff --git a/work/CraftBukkit b/work/CraftBukkit
index dd02403be2..03f249f098 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit dd02403be2ea957207939f1eec83cd2753d95bbc
+Subproject commit 03f249f09854e409a231d5e2024cef635d652b79
diff --git a/work/Spigot b/work/Spigot
index d5de734690..c07753b057 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit d5de734690f9745e2c8968cf5369664ff0f53af9
+Subproject commit c07753b057d92ef6c0f9ad8e8446f51bcc37604d