worldofcraft/LuckPerms-DBA
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Send more appropriate message when no users/groups match the editor type (#1096)

Browse Source
This commit is contained in:
Luck 2018-07-13 17:51:21 -07:00
parent fa2d9357b8
commit 7540a6eb70
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/src/main/java/me/lucko/luckperms/common/commands/misc/EditorCommand.java
View File

@ -87,6 +87,11 @@ public class EditorCommand extends SingleCommand {
.forEach(holders::add); .forEach(holders::add);
} }
if (holders.isEmpty()) {
Message.EDITOR_NO_MATCH.send(sender);
return CommandResult.STATE_ERROR;
}
// remove holders which the sender doesn't have perms to view // remove holders which the sender doesn't have perms to view
holders.removeIf(holder -> ArgumentPermissions.checkViewPerms(plugin, sender, getPermission().get(), holder)); holders.removeIf(holder -> ArgumentPermissions.checkViewPerms(plugin, sender, getPermission().get(), holder));

1
common/src/main/java/me/lucko/luckperms/common/locale/message/Message.java
View File

@ -158,6 +158,7 @@ public enum Message {
APPLY_EDITS_DIFF_ADDED("&a+ &f{}", false), APPLY_EDITS_DIFF_ADDED("&a+ &f{}", false),
APPLY_EDITS_DIFF_REMOVED("&c- &f{}", false), APPLY_EDITS_DIFF_REMOVED("&c- &f{}", false),
EDITOR_NO_MATCH("&cUnable to open editor. No objects matched the desired type.", true),
EDITOR_START("&7Preparing a new editor session. Please wait...", true), EDITOR_START("&7Preparing a new editor session. Please wait...", true),
EDITOR_UPLOAD_FAILURE("&cUnable to upload permission data to the editor.", true), EDITOR_UPLOAD_FAILURE("&cUnable to upload permission data to the editor.", true),
EDITOR_URL("&aClick the link below to open the editor:", true), EDITOR_URL("&aClick the link below to open the editor:", true),