From 4bacecd1649d684e2a2155b33c7b7dbdd616b0df Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 22 May 2021 18:42:32 -0400
Subject: [PATCH] [Auto] 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:
f563167d SPIGOT-6464: Fix ShulkerBox#getColor for undyed shulkers

CraftBukkit Changes:
9c7acb6cb SPIGOT-6464: Fix ShulkerBox#getColor for undyed shulkers
---
 Spigot-API-Patches/0036-LootTable-API.patch | 6 +++---
 work/Bukkit                                 | 2 +-
 work/CraftBukkit                            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Spigot-API-Patches/0036-LootTable-API.patch b/Spigot-API-Patches/0036-LootTable-API.patch
index 8c3b9e1807..ed6e56042d 100644
--- a/Spigot-API-Patches/0036-LootTable-API.patch
+++ b/Spigot-API-Patches/0036-LootTable-API.patch
@@ -304,7 +304,7 @@ index 58e493099810fb8d4705ecd49b4a5e1e1949b87b..7ade312f180b7e30871d3a3240c76325
 -public interface Hopper extends Container, Lootable { }
 +public interface Hopper extends Container, LootableBlockInventory { } // Paper
 diff --git a/src/main/java/org/bukkit/block/ShulkerBox.java b/src/main/java/org/bukkit/block/ShulkerBox.java
-index 2ab26605814c0745ddb0836b2b3618a5b9251ab7..172f383fea619127324fec2b043639fd0683f135 100644
+index 387b2892886e1ccb2bd928e5111fb9bd41d777ab..5dc5318b0a451937228a8a059dfec1cd9de389a6 100644
 --- a/src/main/java/org/bukkit/block/ShulkerBox.java
 +++ b/src/main/java/org/bukkit/block/ShulkerBox.java
 @@ -1,5 +1,6 @@
@@ -313,8 +313,8 @@ index 2ab26605814c0745ddb0836b2b3618a5b9251ab7..172f383fea619127324fec2b043639fd
 +import com.destroystokyo.paper.loottable.LootableBlockInventory;
  import org.bukkit.DyeColor;
  import org.bukkit.loot.Lootable;
- import org.jetbrains.annotations.NotNull;
-@@ -7,7 +8,7 @@ import org.jetbrains.annotations.NotNull;
+ import org.jetbrains.annotations.Nullable;
+@@ -7,7 +8,7 @@ import org.jetbrains.annotations.Nullable;
  /**
   * Represents a captured state of a ShulkerBox.
   */
diff --git a/work/Bukkit b/work/Bukkit
index 146a7e4bd7..f563167d33 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 146a7e4bd764990c56bb326643e92eb69f24d27e
+Subproject commit f563167d33eac6217c94e1cdffb1bc0bfd3031c9
diff --git a/work/CraftBukkit b/work/CraftBukkit
index d49530f9c4..9c7acb6cbe 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit d49530f9c40ebfa002fdbdd814e324a6cc9aee8a
+Subproject commit 9c7acb6cbe029508825711021a5ebcba3d419943