From 3d358e57fffe1392dae3f7071e8b30e0d00f41ea Mon Sep 17 00:00:00 2001 From: Luck Date: Sat, 9 May 2020 19:16:17 +0100 Subject: [PATCH] Fix group listmembers command behaviour with the default group (#2088) --- .../common/command/CommandManager.java | 1 - .../commands/group/GroupListMembers.java | 18 +++++++++++++++++- .../common/locale/message/Message.java | 1 + 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/me/lucko/luckperms/common/command/CommandManager.java b/common/src/main/java/me/lucko/luckperms/common/command/CommandManager.java index e6868409b..5821c45a4 100644 --- a/common/src/main/java/me/lucko/luckperms/common/command/CommandManager.java +++ b/common/src/main/java/me/lucko/luckperms/common/command/CommandManager.java @@ -303,7 +303,6 @@ public class CommandManager { replaceArgs(args, 3, arg -> arg.equals("i") ? "info" : null); } } - } } } diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/group/GroupListMembers.java b/common/src/main/java/me/lucko/luckperms/common/commands/group/GroupListMembers.java index 4ffcbeff1..a359637f8 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/group/GroupListMembers.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/group/GroupListMembers.java @@ -40,6 +40,8 @@ import me.lucko.luckperms.common.locale.command.CommandSpec; import me.lucko.luckperms.common.locale.message.Message; import me.lucko.luckperms.common.model.Group; import me.lucko.luckperms.common.model.HolderType; +import me.lucko.luckperms.common.model.User; +import me.lucko.luckperms.common.model.manager.group.GroupManager; import me.lucko.luckperms.common.node.comparator.NodeEntryComparator; import me.lucko.luckperms.common.node.factory.NodeCommandFactory; import me.lucko.luckperms.common.node.matcher.ConstraintNodeMatcher; @@ -80,7 +82,8 @@ public class GroupListMembers extends ChildCommand { return CommandResult.NO_PERMISSION; } - ConstraintNodeMatcher matcher = StandardNodeMatchers.key(Inheritance.builder(group.getName()).build()); + InheritanceNode node = Inheritance.builder(group.getName()).build(); + ConstraintNodeMatcher matcher = StandardNodeMatchers.key(node); int page = ArgumentParser.parseIntOrElse(0, args, 1); Message.SEARCH_SEARCHING_MEMBERS.send(sender, group.getName()); @@ -89,6 +92,19 @@ public class GroupListMembers extends ChildCommand { .filter(n -> n.getNode().getValue()) .collect(Collectors.toList()); + // special handling for default group + if (group.getName().equals(GroupManager.DEFAULT_GROUP_NAME)) { + // include all non-saved online players in the results + for (User user : plugin.getUserManager().getAll().values()) { + if (!plugin.getUserManager().shouldSave(user)) { + matchedUsers.add(NodeEntry.of(user.getUniqueId(), node)); + } + } + + // send a warning message about this behaviour + Message.SEARCH_RESULT_GROUP_DEFAULT.send(sender); + } + List> matchedGroups = plugin.getStorage().getGroupsWithPermission(matcher).join().stream() .filter(n -> n.getNode().getValue()) .collect(Collectors.toList()); diff --git a/common/src/main/java/me/lucko/luckperms/common/locale/message/Message.java b/common/src/main/java/me/lucko/luckperms/common/locale/message/Message.java index 3abd69234..f0313639e 100644 --- a/common/src/main/java/me/lucko/luckperms/common/locale/message/Message.java +++ b/common/src/main/java/me/lucko/luckperms/common/locale/message/Message.java @@ -147,6 +147,7 @@ public enum Message { SEARCH_SEARCHING("&aSearching for users and groups with &bpermissions {}&a...", true), SEARCH_SEARCHING_MEMBERS("&aSearching for users and groups who inherit from &b{}&a...", true), + SEARCH_RESULT_GROUP_DEFAULT("&7Note: when searching for members of the default group, offline players with no other permissions will not be shown!", true), SEARCH_RESULT("&aFound &b{}&a entries from &b{}&a users and &b{}&a groups.", true), SEARCH_SHOWING_USERS("&bShowing user entries: &7(page &f{}&7 of &f{}&7 - &f{}&7 entries)", true),