From 703edb5b6b211a16c442ff0bae2d26fbf3003a17 Mon Sep 17 00:00:00 2001 From: Aust1n46 Date: Sun, 23 Jan 2022 21:44:32 -0600 Subject: [PATCH] Fix tab completion bug with message and ignore commands. Update url regex pattern to include ';' and ',' --- pom.xml | 2 +- .../java/mineverse/Aust1n46/chat/command/message/Ignore.java | 2 +- .../java/mineverse/Aust1n46/chat/command/message/Message.java | 2 +- src/main/java/mineverse/Aust1n46/chat/utilities/Format.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 5e888bc..329600c 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 mineverse.Aust1n46.chat VentureChat - 3.3.0 + 3.3.1 https://bitbucket.org/Aust1n46/venturechat/src/master https://bitbucket.org/Aust1n46/venturechat/src/master diff --git a/src/main/java/mineverse/Aust1n46/chat/command/message/Ignore.java b/src/main/java/mineverse/Aust1n46/chat/command/message/Ignore.java index 01a9fb8..b3341de 100644 --- a/src/main/java/mineverse/Aust1n46/chat/command/message/Ignore.java +++ b/src/main/java/mineverse/Aust1n46/chat/command/message/Ignore.java @@ -101,6 +101,6 @@ public class Ignore extends Command { Collections.sort(completions); return completions; } - return null; + return super.tabComplete(sender, label, args); } } diff --git a/src/main/java/mineverse/Aust1n46/chat/command/message/Message.java b/src/main/java/mineverse/Aust1n46/chat/command/message/Message.java index 9a126c4..3b0abaa 100644 --- a/src/main/java/mineverse/Aust1n46/chat/command/message/Message.java +++ b/src/main/java/mineverse/Aust1n46/chat/command/message/Message.java @@ -154,7 +154,7 @@ public class Message extends Command { Collections.sort(completions); return completions; } - return null; + return super.tabComplete(sender, label, args); } private void sendBungeeCordMessage(MineverseChatPlayer mcp, String command, String[] args) { diff --git a/src/main/java/mineverse/Aust1n46/chat/utilities/Format.java b/src/main/java/mineverse/Aust1n46/chat/utilities/Format.java index c89e172..9e0de0c 100644 --- a/src/main/java/mineverse/Aust1n46/chat/utilities/Format.java +++ b/src/main/java/mineverse/Aust1n46/chat/utilities/Format.java @@ -160,7 +160,7 @@ public class Format { do { Pattern pattern = Pattern.compile( "([a-zA-Z0-9" + BUKKIT_COLOR_CODE_PREFIX + "\\-:/]+\\.[a-zA-Z/0-9" + BUKKIT_COLOR_CODE_PREFIX - + "\\-:_#]+(\\.[a-zA-Z/0-9." + BUKKIT_COLOR_CODE_PREFIX + "\\-:#\\?\\+=_]+)?)"); + + "\\-:_#]+(\\.[a-zA-Z/0-9." + BUKKIT_COLOR_CODE_PREFIX + "\\-:;,#\\?\\+=_]+)?)"); Matcher matcher = pattern.matcher(remaining); if (matcher.find()) { indexLink = matcher.start();