Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2025-01-16 13:21:32 +01:00
Code Issues Projects Releases Wiki Activity

Optimize parent resolution in info commands (#3309)

Browse Source
This commit is contained in:
Sxtanna 2022-02-09 15:15:18 -05:00 committed by GitHub
parent b13a74c61e
commit d45d9a295b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
common/src/main/java/me/lucko/luckperms/common/commands/group/GroupInfo.java
View File

@ -42,6 +42,7 @@ import net.luckperms.api.node.Node;
import net.luckperms.api.node.types.InheritanceNode; import net.luckperms.api.node.types.InheritanceNode;
import net.luckperms.api.query.QueryOptions; import net.luckperms.api.query.QueryOptions;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -60,26 +61,23 @@ public class GroupInfo extends ChildCommand<Group> {
Message.GROUP_INFO_GENERAL.send(sender, target.getName(), target.getPlainDisplayName(), target.getWeight()); Message.GROUP_INFO_GENERAL.send(sender, target.getName(), target.getPlainDisplayName(), target.getWeight());
List<InheritanceNode> parents = target.normalData().inheritanceAsSortedSet().stream() Map<Boolean, List<InheritanceNode>> parents = target.normalData().inheritanceAsSortedSet().stream()
.filter(Node::getValue) .filter(Node::getValue)
.filter(n -> !n.hasExpiry()) .collect(Collectors.groupingBy(Node::hasExpiry, Collectors.toList()));
.collect(Collectors.toList());
List<InheritanceNode> tempParents = target.normalData().inheritanceAsSortedSet().stream() List<InheritanceNode> temporaryParents = parents.getOrDefault(true, Collections.emptyList());
.filter(Node::getValue) List<InheritanceNode> permanentParents = parents.getOrDefault(false, Collections.emptyList());
.filter(Node::hasExpiry)
.collect(Collectors.toList());
if (!parents.isEmpty()) { if (!permanentParents.isEmpty()) {
Message.INFO_PARENT_HEADER.send(sender); Message.INFO_PARENT_HEADER.send(sender);
for (InheritanceNode node : parents) { for (InheritanceNode node : permanentParents) {
Message.INFO_PARENT_NODE_ENTRY.send(sender, node); Message.INFO_PARENT_NODE_ENTRY.send(sender, node);
} }
} }
if (!tempParents.isEmpty()) { if (!temporaryParents.isEmpty()) {
Message.INFO_TEMP_PARENT_HEADER.send(sender); Message.INFO_TEMP_PARENT_HEADER.send(sender);
for (InheritanceNode node : tempParents) { for (InheritanceNode node : temporaryParents) {
Message.INFO_PARENT_TEMPORARY_NODE_ENTRY.send(sender, node); Message.INFO_PARENT_TEMPORARY_NODE_ENTRY.send(sender, node);
} }
} }

20
common/src/main/java/me/lucko/luckperms/common/commands/user/UserInfo.java
View File

@ -44,6 +44,7 @@ import net.luckperms.api.node.Node;
import net.luckperms.api.node.types.InheritanceNode; import net.luckperms.api.node.types.InheritanceNode;
import net.luckperms.api.query.QueryOptions; import net.luckperms.api.query.QueryOptions;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -67,26 +68,23 @@ public class UserInfo extends ChildCommand<User> {
plugin.getBootstrap().isPlayerOnline(target.getUniqueId()) plugin.getBootstrap().isPlayerOnline(target.getUniqueId())
); );
List<InheritanceNode> parents = target.normalData().inheritanceAsSortedSet().stream() Map<Boolean, List<InheritanceNode>> parents = target.normalData().inheritanceAsSortedSet().stream()
.filter(Node::getValue) .filter(Node::getValue)
.filter(n -> !n.hasExpiry()) .collect(Collectors.groupingBy(Node::hasExpiry, Collectors.toList()));
.collect(Collectors.toList());
List<InheritanceNode> tempParents = target.normalData().inheritanceAsSortedSet().stream() List<InheritanceNode> temporaryParents = parents.getOrDefault(true, Collections.emptyList());
.filter(Node::getValue) List<InheritanceNode> permanentParents = parents.getOrDefault(false, Collections.emptyList());
.filter(Node::hasExpiry)
.collect(Collectors.toList());
if (!parents.isEmpty()) { if (!permanentParents.isEmpty()) {
Message.INFO_PARENT_HEADER.send(sender); Message.INFO_PARENT_HEADER.send(sender);
for (InheritanceNode node : parents) { for (InheritanceNode node : permanentParents) {
Message.INFO_PARENT_NODE_ENTRY.send(sender, node); Message.INFO_PARENT_NODE_ENTRY.send(sender, node);
} }
} }
if (!tempParents.isEmpty()) { if (!temporaryParents.isEmpty()) {
Message.INFO_TEMP_PARENT_HEADER.send(sender); Message.INFO_TEMP_PARENT_HEADER.send(sender);
for (InheritanceNode node : tempParents) { for (InheritanceNode node : temporaryParents) {
Message.INFO_PARENT_TEMPORARY_NODE_ENTRY.send(sender, node); Message.INFO_PARENT_TEMPORARY_NODE_ENTRY.send(sender, node);
} }
} }