diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/group/GroupInfo.java b/common/src/main/java/me/lucko/luckperms/common/commands/group/GroupInfo.java index 213fd587e..d3f2d3598 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/group/GroupInfo.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/group/GroupInfo.java @@ -42,6 +42,7 @@ import net.luckperms.api.node.Node; import net.luckperms.api.node.types.InheritanceNode; import net.luckperms.api.query.QueryOptions; +import java.util.Collections; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -60,26 +61,23 @@ public class GroupInfo extends ChildCommand { Message.GROUP_INFO_GENERAL.send(sender, target.getName(), target.getPlainDisplayName(), target.getWeight()); - List parents = target.normalData().inheritanceAsSortedSet().stream() + Map> parents = target.normalData().inheritanceAsSortedSet().stream() .filter(Node::getValue) - .filter(n -> !n.hasExpiry()) - .collect(Collectors.toList()); + .collect(Collectors.groupingBy(Node::hasExpiry, Collectors.toList())); - List tempParents = target.normalData().inheritanceAsSortedSet().stream() - .filter(Node::getValue) - .filter(Node::hasExpiry) - .collect(Collectors.toList()); + List temporaryParents = parents.getOrDefault(true, Collections.emptyList()); + List permanentParents = parents.getOrDefault(false, Collections.emptyList()); - if (!parents.isEmpty()) { + if (!permanentParents.isEmpty()) { Message.INFO_PARENT_HEADER.send(sender); - for (InheritanceNode node : parents) { + for (InheritanceNode node : permanentParents) { Message.INFO_PARENT_NODE_ENTRY.send(sender, node); } } - if (!tempParents.isEmpty()) { + if (!temporaryParents.isEmpty()) { Message.INFO_TEMP_PARENT_HEADER.send(sender); - for (InheritanceNode node : tempParents) { + for (InheritanceNode node : temporaryParents) { Message.INFO_PARENT_TEMPORARY_NODE_ENTRY.send(sender, node); } } diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/user/UserInfo.java b/common/src/main/java/me/lucko/luckperms/common/commands/user/UserInfo.java index 5b20cf8ae..068f4e6b7 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/user/UserInfo.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/user/UserInfo.java @@ -44,6 +44,7 @@ import net.luckperms.api.node.Node; import net.luckperms.api.node.types.InheritanceNode; import net.luckperms.api.query.QueryOptions; +import java.util.Collections; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -67,26 +68,23 @@ public class UserInfo extends ChildCommand { plugin.getBootstrap().isPlayerOnline(target.getUniqueId()) ); - List parents = target.normalData().inheritanceAsSortedSet().stream() + Map> parents = target.normalData().inheritanceAsSortedSet().stream() .filter(Node::getValue) - .filter(n -> !n.hasExpiry()) - .collect(Collectors.toList()); + .collect(Collectors.groupingBy(Node::hasExpiry, Collectors.toList())); - List tempParents = target.normalData().inheritanceAsSortedSet().stream() - .filter(Node::getValue) - .filter(Node::hasExpiry) - .collect(Collectors.toList()); + List temporaryParents = parents.getOrDefault(true, Collections.emptyList()); + List permanentParents = parents.getOrDefault(false, Collections.emptyList()); - if (!parents.isEmpty()) { + if (!permanentParents.isEmpty()) { Message.INFO_PARENT_HEADER.send(sender); - for (InheritanceNode node : parents) { + for (InheritanceNode node : permanentParents) { Message.INFO_PARENT_NODE_ENTRY.send(sender, node); } } - if (!tempParents.isEmpty()) { + if (!temporaryParents.isEmpty()) { Message.INFO_TEMP_PARENT_HEADER.send(sender); - for (InheritanceNode node : tempParents) { + for (InheritanceNode node : temporaryParents) { Message.INFO_PARENT_TEMPORARY_NODE_ENTRY.send(sender, node); } }