Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-11-28 05:35:26 +01:00
Code Issues Projects Releases Wiki Activity

Display tracks relating to the group itself when the showtracks command is performed on a group

Browse Source
This commit is contained in:
Luck 2018-01-15 20:39:18 +00:00
parent ed223f0e4e
commit 7cd5eea6d3
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
common/src/main/java/me/lucko/luckperms/common/commands/impl/generic/other/HolderShowTracks.java
View File

@ -37,6 +37,7 @@ import me.lucko.luckperms.common.commands.utils.CommandUtils;
import me.lucko.luckperms.common.locale.CommandSpec; import me.lucko.luckperms.common.locale.CommandSpec;
import me.lucko.luckperms.common.locale.LocaleManager; import me.lucko.luckperms.common.locale.LocaleManager;
import me.lucko.luckperms.common.locale.Message; import me.lucko.luckperms.common.locale.Message;
import me.lucko.luckperms.common.model.Group;
import me.lucko.luckperms.common.model.PermissionHolder; import me.lucko.luckperms.common.model.PermissionHolder;
import me.lucko.luckperms.common.model.Track; import me.lucko.luckperms.common.model.Track;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
@ -68,22 +69,35 @@ public class HolderShowTracks<T extends PermissionHolder> extends SubCommand<T>
return CommandResult.LOADING_ERROR; return CommandResult.LOADING_ERROR;
} }
Set<Node> nodes = holder.getEnduringNodes().values().stream()
.filter(Node::isGroupNode)
.filter(Node::getValuePrimitive)
.filter(Node::isPermanent)
.collect(Collectors.toSet());
List<Map.Entry<Track, String>> lines = new ArrayList<>(); List<Map.Entry<Track, String>> lines = new ArrayList<>();
for (Node node : nodes) { if (holder.getType().isUser()) {
String name = node.getGroupName(); // if the holder is a user, we want to query parent groups for tracks
Set<Node> nodes = holder.getEnduringNodes().values().stream()
.filter(Node::isGroupNode)
.filter(Node::getValuePrimitive)
.filter(Node::isPermanent)
.collect(Collectors.toSet());
for (Node node : nodes) {
String groupName = node.getGroupName();
List<Track> tracks = plugin.getTrackManager().getAll().values().stream()
.filter(t -> t.containsGroup(groupName))
.collect(Collectors.toList());
for (Track t : tracks) {
lines.add(Maps.immutableEntry(t, CommandUtils.listToArrowSep(t.getGroups(), groupName) + CommandUtils.getAppendableNodeContextString(node)));
}
}
} else {
// otherwise, just lookup for the actual group
String groupName = ((Group) holder).getName();
List<Track> tracks = plugin.getTrackManager().getAll().values().stream() List<Track> tracks = plugin.getTrackManager().getAll().values().stream()
.filter(t -> t.containsGroup(name)) .filter(t -> t.containsGroup(groupName))
.collect(Collectors.toList()); .collect(Collectors.toList());
for (Track t : tracks) { for (Track t : tracks) {
lines.add(Maps.immutableEntry(t, CommandUtils.listToArrowSep(t.getGroups(), name) + CommandUtils.getAppendableNodeContextString(node))); lines.add(Maps.immutableEntry(t, CommandUtils.listToArrowSep(t.getGroups(), groupName)));
} }
} }