From c306d700ced652db4cf869ef677afa1cd39ca7a1 Mon Sep 17 00:00:00 2001 From: kFor <39985355+kforbro@users.noreply.github.com> Date: Thu, 22 Jun 2023 13:25:17 +0300 Subject: [PATCH] Option to blacklist all commands (#138) * Option to blacklist all commands * blacklist all commands by default --------- Co-authored-by: William --- .../net/william278/husksync/listener/BukkitEventListener.java | 2 +- .../src/main/java/net/william278/husksync/config/Settings.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bukkit/src/main/java/net/william278/husksync/listener/BukkitEventListener.java b/bukkit/src/main/java/net/william278/husksync/listener/BukkitEventListener.java index 709ab351..29dfe62f 100644 --- a/bukkit/src/main/java/net/william278/husksync/listener/BukkitEventListener.java +++ b/bukkit/src/main/java/net/william278/husksync/listener/BukkitEventListener.java @@ -178,7 +178,7 @@ public class BukkitEventListener extends EventListener implements BukkitJoinEven String[] commandArgs = event.getMessage().substring(1).split(" "); String commandLabel = commandArgs[0].toLowerCase(Locale.ENGLISH); - if (blacklistedCommands.contains(commandLabel)) { + if (blacklistedCommands.contains("*") || blacklistedCommands.contains(commandLabel)) { event.setCancelled(cancelPlayerEvent(event.getPlayer().getUniqueId())); } } diff --git a/common/src/main/java/net/william278/husksync/config/Settings.java b/common/src/main/java/net/william278/husksync/config/Settings.java index a575a13d..873aa472 100644 --- a/common/src/main/java/net/william278/husksync/config/Settings.java +++ b/common/src/main/java/net/william278/husksync/config/Settings.java @@ -132,7 +132,7 @@ public class Settings { private Map synchronizationFeatures = SynchronizationFeature.getDefaults(); @YamlKey("synchronization.blacklisted_commands_while_locked") - private List blacklistedCommandsWhileLocked = new ArrayList<>(); + private List blacklistedCommandsWhileLocked = new ArrayList<>(List.of("*")); @YamlKey("synchronization.event_priorities") private Map synchronizationEventPriorities = EventType.getDefaults();