From 430209b0ec928af620ff6f7329b80f494f6efa09 Mon Sep 17 00:00:00 2001 From: Aust1n46 Date: Sun, 3 Apr 2022 15:47:38 -0500 Subject: [PATCH] Port bug fix for tab completion and link pattern. --- .../java/venture/Aust1n46/chat/controllers/commands/Ignore.java | 2 +- .../venture/Aust1n46/chat/controllers/commands/Message.java | 2 +- .../venture/Aust1n46/chat/service/VentureChatFormatService.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/venture/Aust1n46/chat/controllers/commands/Ignore.java b/src/main/java/venture/Aust1n46/chat/controllers/commands/Ignore.java index f466882..c53a612 100644 --- a/src/main/java/venture/Aust1n46/chat/controllers/commands/Ignore.java +++ b/src/main/java/venture/Aust1n46/chat/controllers/commands/Ignore.java @@ -109,6 +109,6 @@ public class Ignore extends PlayerCommand { Collections.sort(completions); return completions; } - return null; + return super.tabComplete(sender, alias, args); } } diff --git a/src/main/java/venture/Aust1n46/chat/controllers/commands/Message.java b/src/main/java/venture/Aust1n46/chat/controllers/commands/Message.java index 696027a..ceafb54 100644 --- a/src/main/java/venture/Aust1n46/chat/controllers/commands/Message.java +++ b/src/main/java/venture/Aust1n46/chat/controllers/commands/Message.java @@ -166,7 +166,7 @@ public class Message extends PlayerCommand { Collections.sort(completions); return completions; } - return null; + return super.tabComplete(sender, alias, args); } private void sendBungeeCordMessage(VentureChatPlayer mcp, String command, String[] args) { diff --git a/src/main/java/venture/Aust1n46/chat/service/VentureChatFormatService.java b/src/main/java/venture/Aust1n46/chat/service/VentureChatFormatService.java index bbb3ed5..34cc94f 100644 --- a/src/main/java/venture/Aust1n46/chat/service/VentureChatFormatService.java +++ b/src/main/java/venture/Aust1n46/chat/service/VentureChatFormatService.java @@ -159,7 +159,7 @@ public class VentureChatFormatService { 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();