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

Fix meta serialization. Resolves #41

Browse Source
This commit is contained in:
Luck
2016-11-13 11:09:57 +00:00
Unverified
parent 59c7efccb2
commit 696cd235fd
10 changed files with 62 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sponge/src/main/java/me/lucko/luckperms/sponge/migration/MigrationUtils.java
+8 -3
View File
@@ -26,6 +26,7 @@ import lombok.experimental.UtilityClass;
import me.lucko.luckperms.api.context.ContextSet;
import me.lucko.luckperms.api.context.MutableContextSet;
import me.lucko.luckperms.common.core.NodeBuilder;
import me.lucko.luckperms.common.core.NodeFactory;
import me.lucko.luckperms.common.core.PermissionHolder;
import me.lucko.luckperms.exceptions.ObjectAlreadyHasException;
import me.lucko.luckperms.sponge.service.LuckPermsService;
@@ -72,13 +73,17 @@ public class MigrationUtils {
contexts.removeAll("world");
for (Map.Entry<String, String> opt : e.getValue().entrySet()) {
if (opt.getKey().equalsIgnoreCase("prefix") || opt.getKey().equalsIgnoreCase("suffix")) {
if (opt.getKey().equalsIgnoreCase("prefix")) {
try {
holder.setPermission(new NodeBuilder(opt.getKey().toLowerCase() + ".100." + opt.getValue()).setServerRaw(server).setWorld(world).withExtraContext(contexts).setValue(true).build());
holder.setPermission(NodeFactory.makePrefixNode(100, opt.getValue()).setServerRaw(server).setWorld(world).withExtraContext(contexts).setValue(true).build());
} catch (ObjectAlreadyHasException ignored) {}
} else if (opt.getKey().equalsIgnoreCase("suffix")) {
try {
holder.setPermission(NodeFactory.makeSuffixNode(100, opt.getValue()).setServerRaw(server).setWorld(world).withExtraContext(contexts).setValue(true).build());
} catch (ObjectAlreadyHasException ignored) {}
} else {
try {
holder.setPermission(new NodeBuilder("meta." + opt.getKey() + "." + opt.getValue()).setServerRaw(server).setWorld(world).withExtraContext(contexts).setValue(true).build());
holder.setPermission(NodeFactory.makeMetaNode(opt.getKey(), opt.getValue()).setServerRaw(server).setWorld(world).withExtraContext(contexts).setValue(true).build());
} catch (ObjectAlreadyHasException ignored) {}
}
}
sponge/src/main/java/me/lucko/luckperms/sponge/service/LuckPermsSubjectData.java
+21 -20
View File
@@ -32,6 +32,7 @@ import lombok.NonNull;
import me.lucko.luckperms.api.Node;
import me.lucko.luckperms.api.context.ContextSet;
import me.lucko.luckperms.common.core.NodeBuilder;
import me.lucko.luckperms.common.core.NodeFactory;
import me.lucko.luckperms.common.core.PermissionHolder;
import me.lucko.luckperms.common.groups.Group;
import me.lucko.luckperms.common.users.User;
@@ -46,8 +47,6 @@ import org.spongepowered.api.util.Tristate;
import java.util.*;
import java.util.stream.Collectors;
import static me.lucko.luckperms.api.MetaUtils.escapeCharacters;
@SuppressWarnings({"OptionalGetWithoutIsPresent", "unused"})
@AllArgsConstructor
public class LuckPermsSubjectData implements SubjectData {
@@ -364,16 +363,15 @@ public class LuckPermsSubjectData implements SubjectData {
public Map<Set<Context>, Map<String, String>> getAllOptions() {
try (Timing ignored = service.getPlugin().getTimings().time(LPTiming.LP_SUBJECT_GET_OPTIONS)) {
Map<Set<Context>, Map<String, String>> options = new HashMap<>();
int prefixPriority = Integer.MIN_VALUE;
int suffixPriority = Integer.MIN_VALUE;
Map<Set<Context>, Integer> minPrefixPriority = new HashMap<>();
Map<Set<Context>, Integer> minSuffixPriority = new HashMap<>();
for (Node n : enduring ? holder.getNodes() : holder.getTransientNodes()) {
if (!n.getValue()) {
continue;
}
if (!n.isMeta() || !n.isPrefix() || n.isSuffix()) {
if (!n.isMeta() && !n.isPrefix() && !n.isSuffix()) {
continue;
}
@@ -389,22 +387,24 @@ public class LuckPermsSubjectData implements SubjectData {
if (!options.containsKey(contexts)) {
options.put(contexts, new HashMap<>());
minPrefixPriority.put(contexts, Integer.MIN_VALUE);
minSuffixPriority.put(contexts, Integer.MIN_VALUE);
}
if (n.isPrefix()) {
Map.Entry<Integer, String> value = n.getPrefix();
if (value.getKey() > prefixPriority) {
if (value.getKey() > minPrefixPriority.get(contexts)) {
options.get(contexts).put("prefix", value.getValue());
prefixPriority = value.getKey();
minPrefixPriority.put(contexts, value.getKey());
}
continue;
}
if (n.isSuffix()) {
Map.Entry<Integer, String> value = n.getSuffix();
if (value.getKey() > suffixPriority) {
if (value.getKey() > minSuffixPriority.get(contexts)) {
options.get(contexts).put("suffix", value.getValue());
suffixPriority = value.getKey();
minSuffixPriority.put(contexts, value.getKey());
}
continue;
}
@@ -433,20 +433,21 @@ public class LuckPermsSubjectData implements SubjectData {
try (Timing i = service.getPlugin().getTimings().time(LPTiming.LP_SUBJECT_SET_OPTION)) {
ContextSet context = LuckPermsService.convertContexts(set);
key = escapeCharacters(key);
value = escapeCharacters(value);
List<Node> toRemove = holder.getNodes().stream()
.filter(n -> n.isMeta() && n.getMeta().getKey().equals(key))
.collect(Collectors.toList());
toRemove.forEach(n -> {
try {
holder.unsetPermission(n);
} catch (ObjectLacksException ignored) {}
});
try {
if (enduring) {
holder.setPermission(new NodeBuilder("meta." + key + "." + value)
.withExtraContext(context)
.build()
);
holder.setPermission(NodeFactory.makeMetaNode(key, value).withExtraContext(context).build());
} else {
holder.setTransientPermission(new NodeBuilder("meta." + key + "." + value)
.withExtraContext(context)
.build()
);
holder.setTransientPermission(NodeFactory.makeMetaNode(key, value).withExtraContext(context).build());
}
} catch (ObjectAlreadyHasException ignored) {}
objectSave(holder);
sponge/src/main/java/me/lucko/luckperms/sponge/service/LuckPermsUserSubject.java
+3
View File
@@ -135,6 +135,8 @@ public class LuckPermsUserSubject extends LuckPermsSubject {
@Override
public Optional<String> getOption(ContextSet contexts, String s) {
try (Timing ignored = service.getPlugin().getTimings().time(LPTiming.USER_GET_OPTION)) {
service.getPlugin().getLog().warn("#getOption: " + contexts + " - " + s);
if (hasData()) {
MetaData data = user.getUserData().getMetaData(service.calculateContexts(contexts));
if (s.equalsIgnoreCase("prefix")) {
@@ -149,6 +151,7 @@ public class LuckPermsUserSubject extends LuckPermsSubject {
}
}
service.getPlugin().getLog().info(data.getMeta().toString());
if (data.getMeta().containsKey(s)) {
return Optional.of(data.getMeta().get(s));
}