[Fix] detection bug

hank9999 · May 4, 2020 · a1c867b · a1c867b
1 parent 3a83058
commit a1c867b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/main/java/com/github/hank9999/keywordblock/Event/ChatEvent.java b/src/main/java/com/github/hank9999/keywordblock/Event/ChatEvent.java
@@ -50,8 +50,8 @@ public void onChat(AsyncPlayerChatEvent event) {
                     + key_text_replaceall_no.replaceAll("[^a-zA-Z]", "") + " "
                     + key_text_replaceall_no.replaceAll("[^a-zA-Z0-9]", "") + " "
                     + key_text_replaceall_no.replaceAll("[^\\u4E00-\\u9FA5]", "") + " "
-                    + key_text_c.replaceAll("[\\p{P}+~$`^=./|<>?～｀＄＾＋。、？·｜()（）＜＞￥×{}&#%@!！…*丶—【】，；‘：”“’]", "") + " "
-                    + key_text_c_no.replaceAll("[\\p{P}+~$`^=./|<>?～｀＄＾＋。、？·｜()（）＜＞￥×{}&#%@!！…*丶—【】，；‘：”“’]", "");
+                    + key_text_c.replaceAll("[\\p{P}+~$`^:=./|<>?～｀＄＾＋。、？·｜()（）＜＞￥×{}&#%@!！…*丶—【】，；‘：”“’]", "") + " "
+                    + key_text_c_no.replaceAll("[\\p{P}+:~$`^=./|<>?～｀＄＾＋。、？·｜()（）＜＞￥×{}&#%@!！…*丶—【】，；‘：”“’]", "");
 
             for (String keyword1 : KeywordBlock.plugin.getConfig().getStringList("words")) {
                 String keyword2 = keyword1.toLowerCase();
@@ -62,7 +62,7 @@ public void onChat(AsyncPlayerChatEvent event) {
                 Matcher m1 = p1.matcher(all);
                 Pattern p2 = Pattern.compile(keyword2);
                 Matcher m2 = p2.matcher(all);
-                if (m1.lookingAt() || m2.lookingAt()) {
+                if (m1.lookingAt() || m2.lookingAt() || all.contains(keyword2)) {
                     event.setCancelled(true);
                     for (String warn_message : KeywordBlock.plugin.getConfig().getStringList("message.warn.player")) {
                         player.sendMessage(Lib.color_translate(warn_message.replaceAll("%player_name%", username).replaceAll("%player_message%", text)));

diff --git a/src/main/java/com/github/hank9999/keywordblock/Event/CommandPreprocessEvent.java b/src/main/java/com/github/hank9999/keywordblock/Event/CommandPreprocessEvent.java
@@ -57,8 +57,8 @@ public void onCommands(PlayerCommandPreprocessEvent e) {
                             + key_text_replaceall_no.replaceAll("[^a-zA-Z]", "") + " "
                             + key_text_replaceall_no.replaceAll("[^a-zA-Z0-9]", "") + " "
                             + key_text_replaceall_no.replaceAll("[^\\u4E00-\\u9FA5]", "") + " "
-                            + key_text_c.replaceAll("[\\p{P}+~$`^=./|<>?～｀＄＾＋。、？·｜()（）＜＞￥×{}&#%@!！…*丶—【】，；‘：”“’]", "") + " "
-                            + key_text_c_no.replaceAll("[\\p{P}+~$`^=./|<>?～｀＄＾＋。、？·｜()（）＜＞￥×{}&#%@!！…*丶—【】，；‘：”“’]", "");
+                            + key_text_c.replaceAll("[\\p{P}+~:$`^=./|<>?～｀＄＾＋。、？·｜()（）＜＞￥×{}&#%@!！…*丶—【】，；‘：”“’]", "") + " "
+                            + key_text_c_no.replaceAll("[\\p{P}+~:$`^=./|<>?～｀＄＾＋。、？·｜()（）＜＞￥×{}&#%@!！…*丶—【】，；‘：”“’]", "");
 
                     for (String keyword1 : KeywordBlock.plugin.getConfig().getStringList("words")) {
                         String keyword2 = keyword1.toLowerCase();
@@ -69,7 +69,7 @@ public void onCommands(PlayerCommandPreprocessEvent e) {
                         Matcher m01 = p01.matcher(all);
                         Pattern p02 = Pattern.compile(keyword2);
                         Matcher m02 = p02.matcher(all);
-                        if (m01.lookingAt() || m02.lookingAt()) {
+                        if (m01.lookingAt() || m02.lookingAt() || all.contains(keyword2)) {
                             e.setCancelled(true);
                             for (String warn_message : KeywordBlock.plugin.getConfig().getStringList("message.warn.player")) {
                                 player.sendMessage(Lib.color_translate(warn_message.replaceAll("%player_name%", username).replaceAll("%player_message%", text)));