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

Fix NPE in LuckPermsSubjectData - closes #115

Browse Source
This commit is contained in:
Luck 2017-01-05 18:27:58 +00:00
parent a71e040c6d
commit a0f8ba9afb
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
1 changed files with 25 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
sponge/src/main/java/me/lucko/luckperms/sponge/service/LuckPermsSubjectData.java
View File

@ -86,7 +86,7 @@ public class LuckPermsSubjectData implements LPSubjectData {
@Override @Override
public Map<ImmutableContextSet, Map<String, Boolean>> getPermissions() { public Map<ImmutableContextSet, Map<String, Boolean>> getPermissions() {
try (Timing ignored = service.getPlugin().getTimings().time(LPTiming.LP_SUBJECT_GET_PERMISSIONS)) { try (Timing ignored = service.getPlugin().getTimings().time(LPTiming.LP_SUBJECT_GET_PERMISSIONS)) {
Map<ContextSet, Map<String, Boolean>> perms = new HashMap<>(); Map<ImmutableContextSet, Map<String, Boolean>> perms = new HashMap<>();
for (Node n : enduring ? holder.getNodes() : holder.getTransientNodes()) { for (Node n : enduring ? holder.getNodes() : holder.getTransientNodes()) {
MutableContextSet contexts = MutableContextSet.fromSet(n.getContexts()); MutableContextSet contexts = MutableContextSet.fromSet(n.getContexts());
@ -99,16 +99,12 @@ public class LuckPermsSubjectData implements LPSubjectData {
contexts.add(new Context(Context.WORLD_KEY, n.getWorld().get())); contexts.add(new Context(Context.WORLD_KEY, n.getWorld().get()));
} }
if (!perms.containsKey(contexts)) { perms.computeIfAbsent(contexts.makeImmutable(), cs -> new HashMap<>()).put(n.getPermission(), n.getValue());
perms.put(contexts.makeImmutable(), new HashMap<>());
}
perms.get(contexts).put(n.getPermission(), n.getValue());
} }
ImmutableMap.Builder<ImmutableContextSet, Map<String, Boolean>> map = ImmutableMap.builder(); ImmutableMap.Builder<ImmutableContextSet, Map<String, Boolean>> map = ImmutableMap.builder();
for (Map.Entry<ContextSet, Map<String, Boolean>> e : perms.entrySet()) { for (Map.Entry<ImmutableContextSet, Map<String, Boolean>> e : perms.entrySet()) {
map.put(e.getKey().makeImmutable(), ImmutableMap.copyOf(e.getValue())); map.put(e.getKey(), ImmutableMap.copyOf(e.getValue()));
} }
return map.build(); return map.build();
} }
@ -233,11 +229,7 @@ public class LuckPermsSubjectData implements LPSubjectData {
contexts.add(new Context(Context.WORLD_KEY, n.getWorld().get())); contexts.add(new Context(Context.WORLD_KEY, n.getWorld().get()));
} }
if (!parents.containsKey(contexts)) { parents.computeIfAbsent(contexts.makeImmutable(), cs -> new HashSet<>()).add(service.getGroupSubjects().get(n.getGroupName()).toReference());
parents.put(contexts.makeImmutable(), new HashSet<>());
}
parents.get(contexts).add(service.getGroupSubjects().get(n.getGroupName()).toReference());
} }
ImmutableMap.Builder<ImmutableContextSet, Set<SubjectReference>> map = ImmutableMap.builder(); ImmutableMap.Builder<ImmutableContextSet, Set<SubjectReference>> map = ImmutableMap.builder();
@ -374,9 +366,9 @@ public class LuckPermsSubjectData implements LPSubjectData {
@Override @Override
public Map<ImmutableContextSet, Map<String, String>> getOptions() { public Map<ImmutableContextSet, Map<String, String>> getOptions() {
try (Timing ignored = service.getPlugin().getTimings().time(LPTiming.LP_SUBJECT_GET_OPTIONS)) { try (Timing ignored = service.getPlugin().getTimings().time(LPTiming.LP_SUBJECT_GET_OPTIONS)) {
Map<ContextSet, Map<String, String>> options = new HashMap<>(); Map<ImmutableContextSet, Map<String, String>> options = new HashMap<>();
Map<ContextSet, Integer> minPrefixPriority = new HashMap<>(); Map<ImmutableContextSet, Integer> minPrefixPriority = new HashMap<>();
Map<ContextSet, Integer> minSuffixPriority = new HashMap<>(); Map<ImmutableContextSet, Integer> minSuffixPriority = new HashMap<>();
for (Node n : enduring ? holder.getNodes() : holder.getTransientNodes()) { for (Node n : enduring ? holder.getNodes() : holder.getTransientNodes()) {
if (!n.getValue()) { if (!n.getValue()) {
@ -397,39 +389,41 @@ public class LuckPermsSubjectData implements LPSubjectData {
contexts.add(new Context(Context.WORLD_KEY, n.getWorld().get())); contexts.add(new Context(Context.WORLD_KEY, n.getWorld().get()));
} }
if (!options.containsKey(contexts)) { ImmutableContextSet immutableContexts = contexts.makeImmutable();
options.put(contexts, new HashMap<>());
minPrefixPriority.put(contexts, Integer.MIN_VALUE); if (!options.containsKey(immutableContexts)) {
minSuffixPriority.put(contexts, Integer.MIN_VALUE); options.put(immutableContexts, new HashMap<>());
minPrefixPriority.put(immutableContexts, Integer.MIN_VALUE);
minSuffixPriority.put(immutableContexts, Integer.MIN_VALUE);
} }
if (n.isPrefix()) { if (n.isPrefix()) {
Map.Entry<Integer, String> value = n.getPrefix(); Map.Entry<Integer, String> value = n.getPrefix();
if (value.getKey() > minPrefixPriority.get(contexts)) { if (value.getKey() > minPrefixPriority.get(immutableContexts)) {
options.get(contexts).put("prefix", value.getValue()); options.get(immutableContexts).put("prefix", value.getValue());
minPrefixPriority.put(contexts, value.getKey()); minPrefixPriority.put(immutableContexts, value.getKey());
} }
continue; continue;
} }
if (n.isSuffix()) { if (n.isSuffix()) {
Map.Entry<Integer, String> value = n.getSuffix(); Map.Entry<Integer, String> value = n.getSuffix();
if (value.getKey() > minSuffixPriority.get(contexts)) { if (value.getKey() > minSuffixPriority.get(immutableContexts)) {
options.get(contexts).put("suffix", value.getValue()); options.get(immutableContexts).put("suffix", value.getValue());
minSuffixPriority.put(contexts, value.getKey()); minSuffixPriority.put(immutableContexts, value.getKey());
} }
continue; continue;
} }
if (n.isMeta()) { if (n.isMeta()) {
Map.Entry<String, String> meta = n.getMeta(); Map.Entry<String, String> meta = n.getMeta();
options.get(contexts).put(meta.getKey(), meta.getValue()); options.get(immutableContexts).put(meta.getKey(), meta.getValue());
} }
} }
ImmutableMap.Builder<ImmutableContextSet, Map<String, String>> map = ImmutableMap.builder(); ImmutableMap.Builder<ImmutableContextSet, Map<String, String>> map = ImmutableMap.builder();
for (Map.Entry<ContextSet, Map<String, String>> e : options.entrySet()) { for (Map.Entry<ImmutableContextSet, Map<String, String>> e : options.entrySet()) {
map.put(e.getKey().makeImmutable(), ImmutableMap.copyOf(e.getValue())); map.put(e.getKey(), ImmutableMap.copyOf(e.getValue()));
} }
return map.build(); return map.build();
} }
@ -455,8 +449,7 @@ public class LuckPermsSubjectData implements LPSubjectData {
} else { } else {
holder.setTransientPermission(NodeFactory.makeMetaNode(key, value).withExtraContext(context).build()); holder.setTransientPermission(NodeFactory.makeMetaNode(key, value).withExtraContext(context).build());
} }
} catch (ObjectAlreadyHasException ignored) { } catch (ObjectAlreadyHasException ignored) {}
}
objectSave(holder); objectSave(holder);
return true; return true;
} }
@ -512,8 +505,7 @@ public class LuckPermsSubjectData implements LPSubjectData {
} else { } else {
holder.unsetTransientPermission(n); holder.unsetTransientPermission(n);
} }
} catch (ObjectLacksException ignored) { } catch (ObjectLacksException ignored) {}
}
}); });
objectSave(holder); objectSave(holder);