worldofcraft/LuckPerms-DBA
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Release 1.6

Browse Source
This commit is contained in:
Luck
2016-08-28 22:05:10 +01:00
Unverified
parent 6aea3b53f3
commit 57f5a7c4cd
11 changed files with 57 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sponge/src/main/java/me/lucko/luckperms/api/sponge/LuckPermsService.java
-1
View File
@@ -37,7 +37,6 @@ import org.spongepowered.api.util.Tristate;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
public class LuckPermsService implements PermissionService {
public static final String SERVER_CONTEXT = "server";
sponge/src/main/java/me/lucko/luckperms/api/sponge/LuckPermsSubject.java
+15 -8
View File
@@ -261,17 +261,16 @@ public class LuckPermsSubject implements Subject {
@Override
public boolean clearPermissions() {
// TODO re-give default nodes?
holder.getNodes().clear();
if (holder instanceof User) {
service.getPlugin().getUserManager().giveDefaultIfNeeded(((User) holder), false);
}
superClass.objectSave(holder);
return true;
}
@Override
public boolean clearPermissions(Set<Context> set) {
// TODO re-give default nodes?
Map<String, String> context = new HashMap<>();
for (Context c : set) {
context.put(c.getKey(), c.getValue());
@@ -288,6 +287,10 @@ public class LuckPermsSubject implements Subject {
}
}
if (holder instanceof User) {
service.getPlugin().getUserManager().giveDefaultIfNeeded(((User) holder), false);
}
superClass.objectSave(holder);
return work;
}
@@ -372,8 +375,6 @@ public class LuckPermsSubject implements Subject {
@Override
public boolean clearParents() {
// TODO re-give default nodes?
boolean work = false;
Iterator<Node> iterator = holder.getNodes().iterator();
@@ -386,14 +387,16 @@ public class LuckPermsSubject implements Subject {
}
}
if (holder instanceof User) {
service.getPlugin().getUserManager().giveDefaultIfNeeded(((User) holder), false);
}
superClass.objectSave(holder);
return work;
}
@Override
public boolean clearParents(Set<Context> set) {
// TODO re-give default nodes?
Map<String, String> context = new HashMap<>();
for (Context c : set) {
context.put(c.getKey(), c.getValue());
@@ -415,6 +418,10 @@ public class LuckPermsSubject implements Subject {
}
}
if (holder instanceof User) {
service.getPlugin().getUserManager().giveDefaultIfNeeded(((User) holder), false);
}
superClass.objectSave(holder);
return work;
}
sponge/src/main/java/me/lucko/luckperms/api/sponge/collections/GroupCollection.java
+2 -2
View File
@@ -24,10 +24,10 @@ package me.lucko.luckperms.api.sponge.collections;
import lombok.AllArgsConstructor;
import lombok.NonNull;
import me.lucko.luckperms.groups.GroupManager;
import me.lucko.luckperms.api.sponge.LuckPermsService;
import me.lucko.luckperms.api.sponge.simple.SimpleSubject;
import me.lucko.luckperms.api.sponge.LuckPermsSubject;
import me.lucko.luckperms.api.sponge.simple.SimpleSubject;
import me.lucko.luckperms.groups.GroupManager;
import org.spongepowered.api.service.context.Context;
import org.spongepowered.api.service.permission.PermissionService;
import org.spongepowered.api.service.permission.Subject;
sponge/src/main/java/me/lucko/luckperms/api/sponge/collections/UserCollection.java
+1 -1
View File
@@ -25,8 +25,8 @@ package me.lucko.luckperms.api.sponge.collections;
import lombok.AllArgsConstructor;
import lombok.NonNull;
import me.lucko.luckperms.api.sponge.LuckPermsService;
import me.lucko.luckperms.api.sponge.simple.SimpleSubject;
import me.lucko.luckperms.api.sponge.LuckPermsSubject;
import me.lucko.luckperms.api.sponge.simple.SimpleSubject;
import me.lucko.luckperms.users.User;
import me.lucko.luckperms.users.UserManager;
import org.spongepowered.api.service.context.Context;