Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-10-31 07:51:05 +01:00
Code Issues Projects Releases Wiki Activity

Ensure users are a member of their primary group (#506)

Browse Source
This commit is contained in:
Luck 2017-10-16 18:53:02 +01:00
parent 74069af309
commit 04d5310c04
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
1 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
common/src/main/java/me/lucko/luckperms/common/managers/GenericUserManager.java
View File

@ -28,6 +28,7 @@ package me.lucko.luckperms.common.managers;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import me.lucko.luckperms.api.Node; import me.lucko.luckperms.api.Node;
import me.lucko.luckperms.common.config.ConfigKeys;
import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.model.User;
import me.lucko.luckperms.common.node.NodeFactory; import me.lucko.luckperms.common.node.NodeFactory;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin; import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
@ -120,8 +121,32 @@ public class GenericUserManager extends AbstractManager<UserIdentifier, User> im
} }
public static boolean giveDefaultIfNeeded(User user, boolean save, LuckPermsPlugin plugin) { public static boolean giveDefaultIfNeeded(User user, boolean save, LuckPermsPlugin plugin) {
boolean hasGroup = false; boolean work = false;
// check that they are actually a member of their primary group, otherwise remove it
if (plugin.getConfiguration().get(ConfigKeys.PRIMARY_GROUP_CALCULATION_METHOD).equals("stored")) {
String pg = user.getPrimaryGroup().getValue();
boolean has = false;
for (Node node : user.getEnduringNodes().values()) {
if (node.hasSpecificContext()) {
continue;
}
if (node.isGroupNode() && node.getGroupName().equalsIgnoreCase(pg)) {
has = true;
break;
}
}
if (!has) {
user.getPrimaryGroup().setStoredValue("default");
work = true;
}
}
// check that all users are member of at least one group
boolean hasGroup = false;
if (user.getPrimaryGroup().getStoredValue().isPresent()) { if (user.getPrimaryGroup().getStoredValue().isPresent()) {
for (Node node : user.getEnduringNodes().values()) { for (Node node : user.getEnduringNodes().values()) {
if (node.hasSpecificContext()) { if (node.hasSpecificContext()) {
@ -135,18 +160,17 @@ public class GenericUserManager extends AbstractManager<UserIdentifier, User> im
} }
} }
if (hasGroup) { if (!hasGroup) {
return false; user.getPrimaryGroup().setStoredValue("default");
user.setPermission(NodeFactory.make("group.default"));
work = true;
} }
user.getPrimaryGroup().setStoredValue("default"); if (work && save) {
user.setPermission(NodeFactory.make("group.default"));
if (save) {
plugin.getStorage().saveUser(user); plugin.getStorage().saveUser(user);
} }
return true; return work;
} }
/** /**