From 302a059bf8511750d13d66e880bb5947b5044553 Mon Sep 17 00:00:00 2001 From: Nameless Date: Tue, 11 Feb 2020 15:51:10 +0800 Subject: [PATCH 1/2] Fixed can't back in setting opened by command --- src/main/java/me/mrCookieSlime/Slimefun/SlimefunGuide.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/me/mrCookieSlime/Slimefun/SlimefunGuide.java b/src/main/java/me/mrCookieSlime/Slimefun/SlimefunGuide.java index 48d969a70..1905b5c21 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/SlimefunGuide.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/SlimefunGuide.java @@ -64,6 +64,9 @@ public final class SlimefunGuide { } else if (SlimefunManager.isItemSimilar(guide, getItem(SlimefunGuideLayout.CHEAT_SHEET), true)) { openGuide(p, SlimefunGuideLayout.CHEAT_SHEET); + } else { + // When using /sf cheat or /sf open_guide, ItemStack is null. + openGuide(p, SlimefunGuideLayout.CHEST); } } From aa5253fa45cbfce8994d38ccd7c75bfc27144fb9 Mon Sep 17 00:00:00 2001 From: TheBusyBot Date: Tue, 11 Feb 2020 20:16:53 +0000 Subject: [PATCH 2/2] [CI skip] Updated Changelog --- CHANGELOG.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c83655625..7ac5e2e76 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,22 +4,23 @@ - [Release Candidate 6 (TBD)](#release-candidate-6-tbd) - [Changes](#changes) + - [Fixes](#fixes) - [Release Candidate 5 (09 Feb 2020)](#release-candidate-5-09-feb-2020) - [Additions](#additions) - [Changes](#changes-1) - - [Fixes](#fixes) + - [Fixes](#fixes-1) - [Release Candidate 4 (06 Jan 2020)](#release-candidate-4-06-jan-2020) - [Additions](#additions-1) - [Changes](#changes-2) - - [Fixes](#fixes-1) + - [Fixes](#fixes-2) - [Release Candidate 3 (21 Nov 2019)](#release-candidate-3-21-nov-2019) - [Additions](#additions-2) - [Changes](#changes-3) - - [Fixes](#fixes-2) + - [Fixes](#fixes-3) - [Release Candidate 2 (29 Sep 2019)](#release-candidate-2-29-sep-2019) - [Additions](#additions-3) - [Changes](#changes-4) - - [Fixes](#fixes-3) + - [Fixes](#fixes-4) - [Release Candidate 1 (26 Sep 2019)](#release-candidate-1-26-sep-2019)