From 7b8e0c3acfd9e50cba28daf643fc4635a3f00997 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <jahnke.nassim@gmail.com>
Date: Sat, 19 Feb 2022 13:50:20 +0100
Subject: [PATCH] Updated Upstream (Bukkit/CraftBukkit)

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:
6fac07eb SPIGOT-6935: Make Arrow color nullable
abbc5c55 PR-730: Added a checkstyle rule to check for missing package declarations.
97157b12 PR-730: Added missing declaration of the org.bukkit.profile package.
9dcee1dc PR-727: Fix typo in StriderTemperatureChangeEvent javadocs

CraftBukkit Changes:
1e87776a SPIGOT-6935: Make Arrow color nullable
---
 patches/api/0001-Convert-project-to-Gradle.patch | 5 +++--
 work/Bukkit                                      | 2 +-
 work/CraftBukkit                                 | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/patches/api/0001-Convert-project-to-Gradle.patch b/patches/api/0001-Convert-project-to-Gradle.patch
index 53ca02cec..c17159863 100644
--- a/patches/api/0001-Convert-project-to-Gradle.patch
+++ b/patches/api/0001-Convert-project-to-Gradle.patch
@@ -99,10 +99,10 @@ index 0000000000000000000000000000000000000000..c76bfbcfbe034700bdbd9396643cfca6
 +}
 diff --git a/pom.xml b/pom.xml
 deleted file mode 100644
-index 9c130bf7fe7ec4b6b5d4f4c30cdbe6dc75b0f9a0..0000000000000000000000000000000000000000
+index 2bd4a47e18c0fb798d52d204a4315a889b0e64b4..0000000000000000000000000000000000000000
 --- a/pom.xml
 +++ /dev/null
-@@ -1,262 +0,0 @@
+@@ -1,263 +0,0 @@
 -
 -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 -         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -330,6 +330,7 @@ index 9c130bf7fe7ec4b6b5d4f4c30cdbe6dc75b0f9a0..00000000000000000000000000000000
 -                        </executions>
 -                        <configuration>
 -                            <configLocation>checkstyle.xml</configLocation>
+-                            <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
 -                            <includeTestSourceDirectory>true</includeTestSourceDirectory>
 -                        </configuration>
 -                        <dependencies>
diff --git a/work/Bukkit b/work/Bukkit
index 8d8180320..6fac07ebf 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 8d8180320a17a60f563127fea77549ba420462c2
+Subproject commit 6fac07ebfb9c836546d4fe10772a32cfb8357149
diff --git a/work/CraftBukkit b/work/CraftBukkit
index c0326c284..1e87776ac 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit c0326c2840e9f91d6109c1f364c69b4053a787dc
+Subproject commit 1e87776acbb1f1c63fd9a5917b44eb2e7f1283a2