From 5888f2bb792fd723af5a1440caa0ad936e76ecd1 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 7 Jan 2020 22:05:48 +0000 Subject: [PATCH] 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: 34f6e645 Add example to WorldCreator.generatorSettings documentation. CraftBukkit Changes: b98e2def SPIGOT-5502: Fix command block successcount being set to return value rather than actual count 2fd79645 SPIGOT-5500: Lectern cannot be replaced using /setblock and other commands --- work/Bukkit | 2 +- work/CraftBukkit | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/work/Bukkit b/work/Bukkit index 5d4de46e4a..34f6e645a9 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 5d4de46e4a28f2ba7d4f3c693a680941c9574dfa +Subproject commit 34f6e645a9edd0cacc3bd5811da801ecae771403 diff --git a/work/CraftBukkit b/work/CraftBukkit index c727dc2a8c..b98e2defcb 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit c727dc2a8c741bc21ecf703158adf27f78931169 +Subproject commit b98e2defcb4037874c2bc37e6b049e5ab5f8d8af