From c3c005c947e8595dcf9a8fa765ffad41c22099c7 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Thu, 28 May 2020 12:22:45 +0100 Subject: [PATCH] Updated Upstream (Bukkit/CraftBukkit) (Fixes #3443) 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: d6db2839 #497: Add Material#getCraftingRemainingItem() to get item left behind after crafting 1c2eaf96 SPIGOT-5748: Add instant effect potion break to the Effect enum CraftBukkit Changes: aae46f82 #665: Add test for Material#getCraftingRemainingItem() cfeef75c SPIGOT-5749: ItemMeta serializing to YAML not saving black colour code eb1b19d9 SPIGOT-5748: Add instant effect potion break to the Effect enum --- work/Bukkit | 2 +- work/CraftBukkit | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/work/Bukkit b/work/Bukkit index ffc8e4caa4..d6db283966 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit ffc8e4caa484af8f3e4ec2647e546ec0f2b6e95f +Subproject commit d6db283966d16725450e506b1d43be39a2173426 diff --git a/work/CraftBukkit b/work/CraftBukkit index d07a78b1f3..aae46f82ea 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit d07a78b1f3aa79945600e5e07d5a457909480b40 +Subproject commit aae46f82eab8ae0bd855d94209083df2144818e4