From 20bdc049da2dbcda0a1597acb2aa5e51d5a9a880 Mon Sep 17 00:00:00 2001 From: Automated Date: Wed, 1 Jul 2020 19:41:58 -0400 Subject: [PATCH] [Auto] Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears 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: 1cb03826 SPIGOT-5900: Re-order Material enum entries to match Minecraft's order fdd705db #507: Add hasDiscoveredRecipe() and getDiscoveredRecipes() CraftBukkit Changes: 551e770f5 SPIGOT-5900: Add test for the order of Material enum entries 8297676c2 #682: Add hasDiscoveredRecipe() and getDiscoveredRecipes() --- Spigot-API-Patches/Material-API-additions.patch | 2 +- work/Bukkit | 2 +- work/CraftBukkit | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Spigot-API-Patches/Material-API-additions.patch b/Spigot-API-Patches/Material-API-additions.patch index 9e108ac767..30f9e1562e 100644 --- a/Spigot-API-Patches/Material-API-additions.patch +++ b/Spigot-API-Patches/Material-API-additions.patch @@ -15,7 +15,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 +@SuppressWarnings({"DeprecatedIsStillUsed", "deprecation"}) // Paper public enum Material implements Keyed { // - ACACIA_BOAT(27326, 1), + AIR(9648, 0), @@ -0,0 +0,0 @@ public enum Material implements Keyed { } } diff --git a/work/Bukkit b/work/Bukkit index 6ff65c824a..1cb03826eb 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 6ff65c824ad8dc9ba9228999800a0d7010904893 +Subproject commit 1cb03826ebde4ef887519ce37b0a2a341494a183 diff --git a/work/CraftBukkit b/work/CraftBukkit index d9bd43b060..551e770f5f 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit d9bd43b060322ad72af3008669878ee5d6cc2cc0 +Subproject commit 551e770f5f981053885e2e1a043b4ecb54a80aef