diff options
| author | Aikar <[email protected]> | 2021-05-22 18:42:32 -0400 |
|---|---|---|
| committer | Aikar <[email protected]> | 2021-05-22 18:42:32 -0400 |
| commit | 4bacecd1649d684e2a2155b33c7b7dbdd616b0df (patch) | |
| tree | 9d02100856800a1e041ef7ae23b110c17a5b06f6 | |
| parent | 1f28e6eeb2d105aaa704e3cee864f5e5a6afa58c (diff) | |
| download | Paper-4bacecd1649d684e2a2155b33c7b7dbdd616b0df.tar.gz Paper-4bacecd1649d684e2a2155b33c7b7dbdd616b0df.zip | |
[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
| -rw-r--r-- | Spigot-API-Patches/0036-LootTable-API.patch | 6 | ||||
| m--------- | work/Bukkit | 0 | ||||
| m--------- | work/CraftBukkit | 0 |
3 files changed, 3 insertions, 3 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 -Subproject 146a7e4bd764990c56bb326643e92eb69f24d27 +Subproject f563167d33eac6217c94e1cdffb1bc0bfd3031c diff --git a/work/CraftBukkit b/work/CraftBukkit -Subproject d49530f9c40ebfa002fdbdd814e324a6cc9aee8 +Subproject 9c7acb6cbe029508825711021a5ebcba3d41994 |