From 1ccb29a1b4bb8db48b1f7ffa134ba1123885a806 Mon Sep 17 00:00:00 2001 From: Automated 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/LootTable-API.patch | 4 ++-- work/Bukkit | 2 +- work/CraftBukkit | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Spigot-API-Patches/LootTable-API.patch b/Spigot-API-Patches/LootTable-API.patch index 26e3f8397a..32bf01cd0d 100644 --- a/Spigot-API-Patches/LootTable-API.patch +++ b/Spigot-API-Patches/LootTable-API.patch @@ -313,8 +313,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 +import com.destroystokyo.paper.loottable.LootableBlockInventory; import org.bukkit.DyeColor; import org.bukkit.loot.Lootable; - import org.jetbrains.annotations.NotNull; -@@ -0,0 +0,0 @@ import org.jetbrains.annotations.NotNull; + import org.jetbrains.annotations.Nullable; +@@ -0,0 +0,0 @@ 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