Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-09-30 14:27:29 +02:00
Code Issues Projects Releases Wiki Activity

Fix non-lower-case meta lookups via the API (#2900)

Browse Source
This commit is contained in:
Luck 2021-02-19 09:43:37 +00:00
parent 3c4091018c
commit 40e8038604
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
1 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
common/src/main/java/me/lucko/luckperms/common/cacheddata/type/SimpleMetaCache.java
View File

@ -25,6 +25,7 @@
package me.lucko.luckperms.common.cacheddata.type;
import com.google.common.collect.ForwardingMap;
import com.google.common.collect.ImmutableListMultimap;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSortedMap;
@ -74,13 +75,13 @@ public class SimpleMetaCache extends UsageTracked implements CachedMetaData {
this.plugin = plugin;
this.queryOptions = queryOptions;
this.meta = Multimaps.asMap(ImmutableListMultimap.copyOf(sourceMeta.getMeta()));
Map<String, List<String>> meta = Multimaps.asMap(ImmutableListMultimap.copyOf(sourceMeta.getMeta()));
MetaValueSelector metaValueSelector = this.queryOptions.option(MetaValueSelector.KEY)
.orElseGet(() -> this.plugin.getConfiguration().get(ConfigKeys.META_VALUE_SELECTOR));
ImmutableMap.Builder<String, String> builder = ImmutableMap.builder();
for (Map.Entry<String, List<String>> e : this.meta.entrySet()) {
for (Map.Entry<String, List<String>> e : meta.entrySet()) {
if (e.getValue().isEmpty()) {
continue;
}
@ -93,6 +94,7 @@ public class SimpleMetaCache extends UsageTracked implements CachedMetaData {
builder.put(e.getKey(), selected);
}
this.flattenedMeta = builder.build();
this.meta = new LowerCaseMetaMap(meta);
this.prefixes = ImmutableSortedMap.copyOfSorted(sourceMeta.getPrefixes());
this.suffixes = ImmutableSortedMap.copyOfSorted(sourceMeta.getSuffixes());
@ -106,7 +108,7 @@ public class SimpleMetaCache extends UsageTracked implements CachedMetaData {
public String getMetaValue(String key, MetaCheckEvent.Origin origin) {
Objects.requireNonNull(key, "key");
return this.flattenedMeta.get(key);
return this.flattenedMeta.get(key.toLowerCase());
}
@Override
@ -184,4 +186,27 @@ public class SimpleMetaCache extends UsageTracked implements CachedMetaData {
return this.queryOptions;
}
private static final class LowerCaseMetaMap extends ForwardingMap<String, List<String>> {
private final Map<String, List<String>> delegate;
private LowerCaseMetaMap(Map<String, List<String>> delegate) {
this.delegate = delegate;
}
@Override
protected Map<String, List<String>> delegate() {
return this.delegate;
}
@Override
public List<String> get(Object k) {
if (k == null) {
return null;
}
String key = (String) k;
return super.get(key.toLowerCase());
}
}
}