From cc1d8984dab38162de30b4c7ccdeab116360395b Mon Sep 17 00:00:00 2001 From: Luck Date: Sun, 30 Aug 2020 09:13:59 +0100 Subject: [PATCH] Config option for registering brigadier command list data --- .../main/java/me/lucko/luckperms/bukkit/LPBukkitPlugin.java | 2 +- bukkit/src/main/resources/config.yml | 3 +++ .../java/me/lucko/luckperms/common/config/ConfigKeys.java | 5 +++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitPlugin.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitPlugin.java index d53f086bb..6a05a7eea 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitPlugin.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitPlugin.java @@ -158,7 +158,7 @@ public class LPBukkitPlugin extends AbstractLuckPermsPlugin { this.commandManager.register(); // setup brigadier - if (isBrigadierSupported()) { + if (isBrigadierSupported() && getConfiguration().get(ConfigKeys.REGISTER_COMMAND_LIST_DATA)) { try { LuckPermsBrigadier.register(this, command); } catch (Exception e) { diff --git a/bukkit/src/main/resources/config.yml b/bukkit/src/main/resources/config.yml index 9ec0d5a97..9be87e685 100644 --- a/bukkit/src/main/resources/config.yml +++ b/bukkit/src/main/resources/config.yml @@ -626,6 +626,9 @@ prevent-primary-group-removal: false # If LuckPerms should update the list of commands sent to the client when permissions are changed. update-client-command-list: true +# If LuckPerms should attempt to register "Brigadier" command list data for its commands. +register-command-list-data: true + # If LuckPerms should attempt to resolve Vanilla command target selectors for LP commands. # See here for more info: https://minecraft.gamepedia.com/Commands#Target_selectors resolve-command-selectors: false diff --git a/common/src/main/java/me/lucko/luckperms/common/config/ConfigKeys.java b/common/src/main/java/me/lucko/luckperms/common/config/ConfigKeys.java index 6c8aad5d6..bd7a7fc37 100644 --- a/common/src/main/java/me/lucko/luckperms/common/config/ConfigKeys.java +++ b/common/src/main/java/me/lucko/luckperms/common/config/ConfigKeys.java @@ -154,6 +154,11 @@ public final class ConfigKeys { */ public static final ConfigKey UPDATE_CLIENT_COMMAND_LIST = notReloadable(booleanKey("update-client-command-list", true)); + /** + * If LuckPerms should attempt to register "Brigadier" command list data for its commands. + */ + public static final ConfigKey REGISTER_COMMAND_LIST_DATA = notReloadable(booleanKey("register-command-list-data", true)); + /** * If LuckPerms should attempt to resolve Vanilla command target selectors for LP commands. */