mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-19 19:25:48 +00:00
Code Releases Activity

[CI skip] Updated changelog

Browse Source 
Also fixed MultiCategory not respecting guide main page index.
This commit is contained in:
TheBusyBiscuit 2021-04-30 12:51:22 +02:00
parent e609e9e0ae
commit 5f1aeecdbf
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -49,6 +49,7 @@
* Fixed #2977
* Fixed #2999
* Fixed #2593
* Fixed #2937
## Release Candidate 22 (18 Apr 2021)
https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#22

7
src/main/java/io/github/thebusybiscuit/slimefun4/core/categories/MultiCategory.java
View File

@ -14,6 +14,7 @@ import org.bukkit.inventory.ItemStack;
import io.github.thebusybiscuit.cscorelib2.item.CustomItem;
import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile;
import io.github.thebusybiscuit.slimefun4.core.guide.GuideHistory;
import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuide;
import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuideMode;
import io.github.thebusybiscuit.slimefun4.implementation.SlimefunPlugin;
@ -74,8 +75,10 @@ public class MultiCategory extends FlexCategory {
@ParametersAreNonnullByDefault
private void openGuide(Player p, PlayerProfile profile, SlimefunGuideMode mode, int page) {
GuideHistory history = profile.getGuideHistory();
if (mode == SlimefunGuideMode.SURVIVAL_MODE) {
profile.getGuideHistory().add(this, page);
history.add(this, page);
}
ChestMenu menu = new ChestMenu(SlimefunPlugin.getLocalization().getMessage(p, "guide.title.main"));
@ -87,7 +90,7 @@ public class MultiCategory extends FlexCategory {
menu.addItem(1, new CustomItem(ChestMenuUtils.getBackButton(p, "", ChatColor.GRAY + SlimefunPlugin.getLocalization().getMessage(p, "guide.back.guide"))));
menu.addMenuClickHandler(1, (pl, s, is, action) -> {
SlimefunGuide.openMainMenu(profile, mode, 1);
SlimefunGuide.openMainMenu(profile, mode, history.getMainMenuPage());
return false;
});

2
src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/GuideHistory.java
View File

@ -56,7 +56,7 @@ public class GuideHistory {
*/
public void setMainMenuPage(int page) {
Validate.isTrue(page >= 1, "page must be greater than 0!");
mainMenuPage = page;
}