Plexus/Plex
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex.git synced 2025-06-30 23:36:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge master branch and add ayunami's delimiter code, with of course, credit to him added in the code, and fix a bug

Browse Source
This commit is contained in:
Taah
2022-04-10 00:25:14 -07:00
parent 09bc47f3fb
commit 9f7ac310d9
8 changed files with 30 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/dev/plex/services/impl/CommandBlockerService.java
View File

@ -27,14 +27,18 @@ public class CommandBlockerService extends AbstractService
{
BLOCKED_COMMANDS.clear();
PlexLog.debug("RUNNING COMMAND BLOCKING SERVICE");
plugin.commands.getStringList("commands").forEach(s -> {
plugin.commands.getStringList("commands").forEach(s ->
{
BlockedCommand command = new BlockedCommand();
String[] args = s.split(";");
int lastDelim = s.lastIndexOf(':');
String cmdWithoutMsg = s.substring(0, lastDelim);
String[] args = cmdWithoutMsg.split(":", 3); // Delimiter code by ayunami
if (s.toLowerCase(Locale.ROOT).startsWith("r"))
{
command.setRequiredLevel(args[1]);
command.setRegex(args[2]);
command.setMessage(StringUtils.join(args, ";", 3, args.length));
command.setMessage(s.substring(lastDelim + 1));
PlexLog.debug("=Found regex blocked=");
PlexLog.debug(" Regex: " + command.getRegex());
PlexLog.debug(" Message: " + command.getMessage());
@ -43,7 +47,7 @@ public class CommandBlockerService extends AbstractService
{
command.setRequiredLevel(args[1]);
command.setCommand(args[2]);
command.setMessage(StringUtils.join(args, ";", 3, args.length));
command.setMessage(s.substring(lastDelim + 1));
Command cmd = plugin.getServer().getCommandMap().getCommand(command.getCommand().split(" ")[0]);
if (cmd == null)
{
@ -59,6 +63,10 @@ public class CommandBlockerService extends AbstractService
PlexLog.debug(" Aliases: " + Arrays.toString(command.getCommandAliases().toArray(new String[0])));
PlexLog.debug("====================");
}
if (command.getMessage().equalsIgnoreCase("_"))
{
command.setMessage("This command is blocked.");
}
BLOCKED_COMMANDS.add(command);
});
}