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

Don't attempt to read a boolean 'value' from parent/chatmeta/meta entries in file based storage files (#1505)

Browse Source
This commit is contained in:
Luck 2019-04-18 23:14:23 +01:00
parent 364a494ac6
commit 420ec2bf1a
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/AbstractConfigurateStorage.java
View File

@ -456,8 +456,7 @@ public abstract class AbstractConfigurateStorage implements StorageImplementatio
return this.uuidCache.lookupUsername(uuid); return this.uuidCache.lookupUsername(uuid);
} }
private static NodeDataContainer readAttributes(ConfigurationNode attributes, Function<ConfigurationNode, String> permissionFunction) { private static NodeDataContainer readMetaAttributes(ConfigurationNode attributes, Function<ConfigurationNode, String> permissionFunction) {
boolean value = attributes.getNode("value").getBoolean(true);
String server = attributes.getNode("server").getString("global"); String server = attributes.getNode("server").getString("global");
String world = attributes.getNode("world").getString("global"); String world = attributes.getNode("world").getString("global");
long expiry = attributes.getNode("expiry").getLong(0L); long expiry = attributes.getNode("expiry").getLong(0L);
@ -468,7 +467,7 @@ public abstract class AbstractConfigurateStorage implements StorageImplementatio
context = ContextSetConfigurateSerializer.deserializeContextSet(contextMap).makeImmutable(); context = ContextSetConfigurateSerializer.deserializeContextSet(contextMap).makeImmutable();
} }
return NodeDataContainer.of(permissionFunction.apply(attributes), value, server, world, expiry, context); return NodeDataContainer.of(permissionFunction.apply(attributes), true, server, world, expiry, context);
} }
private static Collection<NodeDataContainer> readAttributes(ConfigurationNode attributes, String permission) { private static Collection<NodeDataContainer> readAttributes(ConfigurationNode attributes, String permission) {
@ -561,7 +560,7 @@ public abstract class AbstractConfigurateStorage implements StorageImplementatio
if (entry == null) { if (entry == null) {
continue; continue;
} }
nodes.add(readAttributes(entry.getValue(), c -> NodeFactory.groupNode(entry.getKey()))); nodes.add(readMetaAttributes(entry.getValue(), c -> NodeFactory.groupNode(entry.getKey())));
} }
} }
@ -574,7 +573,7 @@ public abstract class AbstractConfigurateStorage implements StorageImplementatio
if (entry == null) { if (entry == null) {
continue; continue;
} }
nodes.add(readAttributes(entry.getValue(), c -> NodeFactory.chatMetaNode(chatMetaType, c.getNode("priority").getInt(0), entry.getKey()))); nodes.add(readMetaAttributes(entry.getValue(), c -> NodeFactory.chatMetaNode(chatMetaType, c.getNode("priority").getInt(0), entry.getKey())));
} }
} }
} }
@ -586,7 +585,7 @@ public abstract class AbstractConfigurateStorage implements StorageImplementatio
if (entry == null) { if (entry == null) {
continue; continue;
} }
nodes.add(readAttributes(entry.getValue(), c -> NodeFactory.metaNode(entry.getKey(), c.getNode("value").getString("null")))); nodes.add(readMetaAttributes(entry.getValue(), c -> NodeFactory.metaNode(entry.getKey(), c.getNode("value").getString("null"))));
} }
} }