Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-11-28 05:35:26 +01:00
Code Issues Projects Releases Wiki Activity

YAML/JSON batch permission defining (#337)

Browse Source
This commit is contained in:
Chris N 2017-06-22 05:41:29 -04:00 committed by Luck
parent 8e224c4a27
commit 26ce8b8ab7
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/src/main/java/me/lucko/luckperms/common/storage/backing/JSONBacking.java
View File

@ -548,7 +548,15 @@ public class JSONBacking extends FlatfileBacking {
context = NodeModel.deserializeContextSet(contexts).makeImmutable(); context = NodeModel.deserializeContextSet(contexts).makeImmutable();
} }
nodes.add(NodeModel.of(permission, value, server, world, expiry, context)); final JsonElement batchAttribute = attributes.get("permissions");
if (permission.startsWith("luckperms.batch") && batchAttribute != null && batchAttribute.isJsonArray()) {
for (JsonElement element : batchAttribute.getAsJsonArray()) {
nodes.add(NodeModel.of(element.getAsString(), value, server, world, expiry, context));
}
} else {
nodes.add(NodeModel.of(permission, value, server, world, expiry, context));
}
} }
return nodes; return nodes;

10
common/src/main/java/me/lucko/luckperms/common/storage/backing/YAMLBacking.java
View File

@ -556,7 +556,15 @@ public class YAMLBacking extends FlatfileBacking {
context = map.build(); context = map.build();
} }
nodes.add(NodeModel.of(permission, value, server, world, expiry, ImmutableContextSet.fromMultimap(context))); if (permission.startsWith("luckperms.batch") && attributes.get("permissions") instanceof List) {
final List<String> batchPerms = (List<String>) attributes.get("permissions");
for (String rawPerm : batchPerms) {
nodes.add(NodeModel.of(rawPerm, value, server, world, expiry, ImmutableContextSet.fromMultimap(context)));
}
} else {
nodes.add(NodeModel.of(permission, value, server, world, expiry, ImmutableContextSet.fromMultimap(context)));
}
} }
} }