mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 03:35:51 +00:00
Code Releases Activity

Fixes #1196

Browse Source
This commit is contained in:
TheBusyBiscuit 2019-10-19 15:04:45 +02:00
parent fc7c4e4d81
commit c5341a6b02
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/me/mrCookieSlime/Slimefun/SlimefunGuide.java
View File

@ -264,7 +264,7 @@ public final class SlimefunGuide {
} }
private static void openMainMenu(final PlayerProfile profile, final boolean survival, final boolean book, final int selected_page) { private static void openMainMenu(final PlayerProfile profile, final boolean survival, final boolean book, final int selected_page) {
Player p = Bukkit.getPlayer(profile.getUUID()); Player p = profile.getPlayer();
if (p == null) return; if (p == null) return;
if (survival) { if (survival) {
@ -742,7 +742,7 @@ public final class SlimefunGuide {
menu.setEmptySlotsClickable(false); menu.setEmptySlotsClickable(false);
fillInv(menu, cheat); fillInv(menu, cheat);
addBackButton(menu, 1, profile, false, cheat); addBackButton(menu, 1, profile, cheat);
String searchTerm = input.toLowerCase(); String searchTerm = input.toLowerCase();
@ -805,7 +805,7 @@ public final class SlimefunGuide {
} }
} }
private static void addBackButton(ChestMenu menu, int slot, PlayerProfile profile, boolean book, boolean cheat) { private static void addBackButton(ChestMenu menu, int slot, PlayerProfile profile, boolean cheat) {
List<Object> playerHistory = profile.getGuideHistory(); List<Object> playerHistory = profile.getGuideHistory();
if (playerHistory.size() > 1) { if (playerHistory.size() > 1) {
@ -817,10 +817,12 @@ public final class SlimefunGuide {
); );
menu.addMenuClickHandler(slot, (pl, s, is, action) -> { menu.addMenuClickHandler(slot, (pl, s, is, action) -> {
if (action.isShiftClicked()) openMainMenuAsync(pl, true, false, 1); if (action.isShiftClicked()) {
openMainMenu(profile, !cheat, false, 0);
}
else { else {
Object last = getLastEntry(profile, true); Object last = getLastEntry(profile, true);
handleHistory(pl, last, book, cheat); handleHistory(pl, last, false, cheat);
} }
return false; return false;
}); });
@ -829,7 +831,7 @@ public final class SlimefunGuide {
else { else {
menu.addItem(slot, new CustomItem(new ItemStack(Material.ENCHANTED_BOOK), "&7\u21E6 Back", "", "&rLeft Click: &7Go back to Main Menu")); menu.addItem(slot, new CustomItem(new ItemStack(Material.ENCHANTED_BOOK), "&7\u21E6 Back", "", "&rLeft Click: &7Go back to Main Menu"));
menu.addMenuClickHandler(0, (pl, s, is, action) -> { menu.addMenuClickHandler(0, (pl, s, is, action) -> {
openMainMenuAsync(pl, true, book, 1); openMainMenu(profile, !cheat, false, 0);
return false; return false;
}); });
} }
@ -913,7 +915,7 @@ public final class SlimefunGuide {
PlayerProfile profile = PlayerProfile.get(p); PlayerProfile profile = PlayerProfile.get(p);
addBackButton(menu, 0, profile, book, false); addBackButton(menu, 0, profile, false);
LinkedList<Object> history = profile.getGuideHistory(); LinkedList<Object> history = profile.getGuideHistory();