Plexus/Plex
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex.git synced 2024-12-22 17:17:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Be more specific with the command blocker

Browse Source
This commit is contained in:
Telesphoreo 2022-05-25 23:10:20 -05:00
parent d785ef31c8
commit 53cd4b1306
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/main/java/dev/plex/Plex.java
View File

@ -120,7 +120,7 @@ public class Plex extends PlexPlugin implements PlexApiProvider
messages.load(); messages.load();
toggles.load(); toggles.load();
// Don't add default entries to indefinite ban file // Don't add default entries to these files
indefBans.load(false); indefBans.load(false);
commands.load(false); commands.load(false);

3
server/src/main/java/dev/plex/listener/impl/CommandListener.java
View File

@ -75,9 +75,8 @@ public class CommandListener extends PlexListener
String[] commandArgs = blockedCommand.getCommand().split(" "); String[] commandArgs = blockedCommand.getCommand().split(" ");
if (arguments.toLowerCase(Locale.ROOT).startsWith(StringUtils.join(commandArgs, " ", 1, commandArgs.length).toLowerCase(Locale.ROOT))) if (arguments.toLowerCase(Locale.ROOT).startsWith(StringUtils.join(commandArgs, " ", 1, commandArgs.length).toLowerCase(Locale.ROOT)))
{ {
PlexLog.debug("Player attempted to use a blocked command with an alias."); PlexLog.debug("Player attempted to use a blocked command with alias of normal command: " + blockedCommand.getCommand());
cmdRef.set(blockedCommand); cmdRef.set(blockedCommand);
return;
} }
} }
}); });

2
server/src/main/resources/commands.yml
View File

@ -10,7 +10,7 @@
# - The ranks are "e" for everyone, "s" for senior admin, and "a" for admin # - The ranks are "e" for everyone, "s" for senior admin, and "a" for admin
# - MATCHING MODE: The command is just the command without slashes. Optional arguments are specified as well. It also accepts full plugins via specifying the plugin name followed by a ":" (e.g. "viaversion:") # - MATCHING MODE: The command is just the command without slashes. Optional arguments are specified as well. It also accepts full plugins via specifying the plugin name followed by a ":" (e.g. "viaversion:")
# - REGEX MODE: The command is regex that matches the desired command. It matches case insensitively. # - REGEX MODE: The command is regex that matches the desired command. It matches case insensitively.
# - Finally the block message. MUST NOT CONTAIN ":". Use _ to use the default command blocked message as specified in messages.yml, or you can optionally put your own in # - Finally the block message MUST NOT CONTAIN ":". Use _ to use the default command blocked message as specified in messages.yml, or you can optionally put your own in
# #
# So these would be valid: # So these would be valid:
# - "m:e:mail sendall:You cannot send messages to everyone on the server" # - "m:e:mail sendall:You cannot send messages to everyone on the server"