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

Make #getPlayerGroups return global too

Browse Source
This commit is contained in:
Luck 2016-08-29 21:35:11 +01:00
parent 3c83c578eb
commit 659baaf5fb
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bukkit/src/main/java/me/lucko/luckperms/api/vault/VaultPermissionHook.java
View File

@ -195,7 +195,7 @@ public class VaultPermissionHook extends Permission {
public String[] getPlayerGroups(String world, @NonNull String player) { public String[] getPlayerGroups(String world, @NonNull String player) {
final User user = plugin.getUserManager().get(player); final User user = plugin.getUserManager().get(player);
return (user == null) ? new String[0] : return (user == null) ? new String[0] :
world != null && !world.equals("") ? user.getLocalGroups("global", world).toArray(new String[0]) : world != null && !world.equals("") ? user.getGroups("global", world, true).toArray(new String[0]) :
user.getGroupNames().toArray(new String[0]); user.getGroupNames().toArray(new String[0]);
} }

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

@ -325,7 +325,7 @@ public abstract class User extends PermissionHolder implements Identifiable<UUID
* @param includeGlobal Whether to include global groups * @param includeGlobal Whether to include global groups
* @return a {@link List} of group names * @return a {@link List} of group names
*/ */
private 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
Map<String, Boolean> perms = exportNodes(server, world, null, includeGlobal, true, null); Map<String, Boolean> perms = exportNodes(server, world, null, includeGlobal, true, null);
return perms.keySet().stream() return perms.keySet().stream()