From 4cdb51f38985713e622647420f8ab3b3f0d98bf9 Mon Sep 17 00:00:00 2001 From: Xujiayao Date: Mon, 28 Oct 2024 22:35:31 +0800 Subject: [PATCH] Revert excludedCommands regex MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 3dd2575c6e69b8dad4a1b322bc159694ed7dafca. Revert "修改正则表达式，同时新增默认排除 /teammsg 和 /tm" This reverts commit 144f85458275053b67c200bbac8e347f75571630. --- src/main/java/com/xujiayao/discord_mc_chat/Config.java | 2 +- .../discord_mc_chat/minecraft/MinecraftEventListener.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/xujiayao/discord_mc_chat/Config.java b/src/main/java/com/xujiayao/discord_mc_chat/Config.java index 871ebcec..e5a831f4 100644 --- a/src/main/java/com/xujiayao/discord_mc_chat/Config.java +++ b/src/main/java/com/xujiayao/discord_mc_chat/Config.java @@ -66,7 +66,7 @@ public static class Generic { public boolean shutdownImmediately = false; - public List excludedCommands = List.of("\\/msg ([^@].*)", "\\/tell ([^@].*)", "\\/tellraw ([^@].*)", "\\/w ([^@].*)", "\\/teammsg (.*)", "\\/tm (.*)"); + public List excludedCommands = List.of("/msg", "/tell", "/tellraw", "/w"); public List adminsIds = new ArrayList<>(); } diff --git a/src/main/java/com/xujiayao/discord_mc_chat/minecraft/MinecraftEventListener.java b/src/main/java/com/xujiayao/discord_mc_chat/minecraft/MinecraftEventListener.java index ea35067b..ad6a2831 100644 --- a/src/main/java/com/xujiayao/discord_mc_chat/minecraft/MinecraftEventListener.java +++ b/src/main/java/com/xujiayao/discord_mc_chat/minecraft/MinecraftEventListener.java @@ -186,7 +186,7 @@ public static void init() { MinecraftEvents.PLAYER_COMMAND.register((player, command) -> { if (CONFIG.generic.broadcastPlayerCommandExecution) { for (String excludedCommand : CONFIG.generic.excludedCommands) { - if (command.matches(excludedCommand)) { + if (command.startsWith(excludedCommand + " ")) { return; } }