Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-11-30 22:53:27 +01:00
Code Issues Projects Releases Wiki Activity

getGroup methods should not include inherited groups

Browse Source
This commit is contained in:
Luck 2016-08-29 22:03:10 +01:00
parent 75858c1555
commit 4b67913eee
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/src/main/java/me/lucko/luckperms/groups/Group.java
View File

@ -26,6 +26,7 @@ import lombok.EqualsAndHashCode;
import lombok.Getter; import lombok.Getter;
import lombok.ToString; import lombok.ToString;
import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.LuckPermsPlugin;
import me.lucko.luckperms.api.Node;
import me.lucko.luckperms.api.event.events.GroupAddEvent; import me.lucko.luckperms.api.event.events.GroupAddEvent;
import me.lucko.luckperms.api.implementation.internal.GroupLink; import me.lucko.luckperms.api.implementation.internal.GroupLink;
import me.lucko.luckperms.api.implementation.internal.PermissionHolderLink; import me.lucko.luckperms.api.implementation.internal.PermissionHolderLink;
@ -321,10 +322,11 @@ public class Group extends PermissionHolder implements Identifiable<String> {
*/ */
private List<String> getGroups(String server, String world, boolean includeGlobal) { private List<String> getGroups(String server, String world, boolean includeGlobal) {
// Call super #getPermissions method, and just sort through those // Call super #getPermissions method, and just sort through those
Map<String, Boolean> perms = exportNodes(server, world, null, includeGlobal, true, null); return getNodes().stream()
return perms.keySet().stream() .filter(n -> n.shouldApplyOnWorld(world, includeGlobal, true))
.filter(s -> Patterns.GROUP_MATCH.matcher(s).matches()) .filter(n -> n.shouldApplyOnServer(server, includeGlobal, true))
.map(s -> Patterns.DOT.split(s, 2)[1]) .filter(Node::isGroupNode)
.map(Node::getGroupName)
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
} }

4
common/src/main/java/me/lucko/luckperms/users/User.java
View File

@ -329,7 +329,9 @@ public abstract class User extends PermissionHolder implements Identifiable<UUID
*/ */
public List<String> getGroups(String server, String world, boolean includeGlobal) { public List<String> getGroups(String server, String world, boolean includeGlobal) {
// Call super #getPermissions method, and just sort through those // Call super #getPermissions method, and just sort through those
return getAllNodesFiltered(server, world, Collections.emptyMap(), includeGlobal, true).stream() return getNodes().stream()
.filter(n -> n.shouldApplyOnWorld(world, includeGlobal, true))
.filter(n -> n.shouldApplyOnServer(server, includeGlobal, true))
.filter(Node::isGroupNode) .filter(Node::isGroupNode)
.map(Node::getGroupName) .map(Node::getGroupName)
.collect(Collectors.toList()); .collect(Collectors.toList());