[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
This commit is contained in:
Automated 2021-05-22 18:42:32 -04:00
parent ee0bafc6a3
commit 1ccb29a1b4
3 changed files with 4 additions and 4 deletions

View file

@ -313,8 +313,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+import com.destroystokyo.paper.loottable.LootableBlockInventory; +import com.destroystokyo.paper.loottable.LootableBlockInventory;
import org.bukkit.DyeColor; import org.bukkit.DyeColor;
import org.bukkit.loot.Lootable; import org.bukkit.loot.Lootable;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable;
@@ -0,0 +0,0 @@ import org.jetbrains.annotations.NotNull; @@ -0,0 +0,0 @@ import org.jetbrains.annotations.Nullable;
/** /**
* Represents a captured state of a ShulkerBox. * Represents a captured state of a ShulkerBox.
*/ */

@ -1 +1 @@
Subproject commit 146a7e4bd764990c56bb326643e92eb69f24d27e Subproject commit f563167d33eac6217c94e1cdffb1bc0bfd3031c9

@ -1 +1 @@
Subproject commit d49530f9c40ebfa002fdbdd814e324a6cc9aee8a Subproject commit 9c7acb6cbe029508825711021a5ebcba3d419943