Skip to content

Commit 7fe6133

Browse files
committed
fix: if you type /bp now, the latest applied filters are still there (menu doesn't reset anymore)
1 parent 4c38875 commit 7fe6133

3 files changed

Lines changed: 19 additions & 8 deletions

File tree

src/main/java/net/buildtheearth/modules/ModuleHandler.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,17 @@ public void registerModule(Module module) {
4545
* @param modules {@link Module}
4646
*/
4747
public void registerModules(Module @NotNull ... modules) {
48+
List<?> disabled = BuildTeamTools.getInstance().getConfig().getList(ConfigPaths.DISABLED_MODULES);
49+
if (disabled == null) disabled = new ArrayList<>();
50+
4851
for (Module m : modules) {
49-
if (!Objects.requireNonNull(BuildTeamTools.getInstance().getConfig().getList(ConfigPaths.DISABLED_MODULES)).contains(m.getModuleName())) {
52+
if (!disabled.contains(m.getModuleName())) {
5053
registerModule(m);
5154
}
5255
}
5356
}
5457

58+
5559
/**
5660
* Enables a specific module
5761
*

src/main/java/net/buildtheearth/modules/miscellaneous/blockpalettegui/BlockPaletteCommand.java

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,17 @@ public boolean onCommand(CommandSender sender,
3535
sender.sendMessage("This command can only be used by players.");
3636
return true;
3737
}
38+
3839
Player player = (Player) sender;
3940

40-
// /bp or /bp menu ⇒ default filters + open block menu
41-
if (args.length == 0
42-
|| (args.length == 1 && args[0].equalsIgnoreCase("menu"))) {
41+
// /bp ⇒ open block menu with remembered filters (do NOT reset to "color")
42+
if (args.length == 0) {
43+
blockPalletManager.openBlockMenu(player);
44+
return true;
45+
}
46+
47+
// /bp menu ⇒ reset to default filters + open block menu
48+
if (args.length == 1 && args[0].equalsIgnoreCase("menu")) {
4349
blockPalletManager.setPlayerFiltersAndOpen(player);
4450
return true;
4551
}
@@ -61,7 +67,8 @@ public boolean onCommand(CommandSender sender,
6167
}
6268

6369
// invalid usage ⇒ show help
64-
sender.sendMessage("§cUsage: §7/bp menu\n"
70+
sender.sendMessage("§cUsage: §7/bp\n"
71+
+ "§c or §7/bp menu\n"
6572
+ "§c or §7/bp filter\n"
6673
+ "§c or §7/bp filter <filter1> <filter2> …");
6774
return true;

src/main/resources/plugin.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ commands:
4141
plotsystemterra:
4242
description: Sends info about the plugin
4343
usage: /plotsystemterra
44-
blockpalette:
44+
bp:
4545
description: Opens the block palette menu.
46-
usage: /blockpalette [filter|menu|filter <filter1> <filter2> ...]
47-
aliases: [bp, blocks]
46+
usage: /bp [filter|menu|filter <filter1> <filter2> ...]
47+
aliases: [blockpalette, blocks]
4848
permission: blockpalette.use
4949
buildteam:
5050
description: Sends the player to the specified BuildTeam

0 commit comments

Comments
 (0)