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

Optimize context set manipulation

Browse Source
This commit is contained in:
Luck
2018-12-06 14:02:41 +00:00
Unverified
parent 7b5917660c
commit b7ff0824b9
6 changed files with 57 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiConfiguration.java
+4 -4
View File
@@ -52,22 +52,22 @@ public class ApiConfiguration implements LPConfiguration {
@Override
public boolean getIncludeGlobalPerms() {
return this.handle.get(ConfigKeys.LOOKUP_SETTINGS).contains(LookupSetting.INCLUDE_NODES_SET_WITHOUT_SERVER);
return this.handle.get(ConfigKeys.GLOBAL_CONTEXTS).hasSetting(LookupSetting.INCLUDE_NODES_SET_WITHOUT_SERVER);
}
@Override
public boolean getIncludeGlobalWorldPerms() {
return this.handle.get(ConfigKeys.LOOKUP_SETTINGS).contains(LookupSetting.INCLUDE_NODES_SET_WITHOUT_WORLD);
return this.handle.get(ConfigKeys.GLOBAL_CONTEXTS).hasSetting(LookupSetting.INCLUDE_NODES_SET_WITHOUT_WORLD);
}
@Override
public boolean getApplyGlobalGroups() {
return this.handle.get(ConfigKeys.LOOKUP_SETTINGS).contains(LookupSetting.APPLY_PARENTS_SET_WITHOUT_SERVER);
return this.handle.get(ConfigKeys.GLOBAL_CONTEXTS).hasSetting(LookupSetting.APPLY_PARENTS_SET_WITHOUT_SERVER);
}
@Override
public boolean getApplyGlobalWorldGroups() {
return this.handle.get(ConfigKeys.LOOKUP_SETTINGS).contains(LookupSetting.APPLY_PARENTS_SET_WITHOUT_WORLD);
return this.handle.get(ConfigKeys.GLOBAL_CONTEXTS).hasSetting(LookupSetting.APPLY_PARENTS_SET_WITHOUT_WORLD);
}
@Override
common/src/main/java/me/lucko/luckperms/common/config/ConfigKeys.java
+4 -6
View File
@@ -29,7 +29,6 @@ import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import me.lucko.luckperms.api.Contexts;
import me.lucko.luckperms.api.LookupSetting;
import me.lucko.luckperms.api.TemporaryMergeBehaviour;
import me.lucko.luckperms.api.context.ContextSet;
import me.lucko.luckperms.api.metastacking.DuplicateRemovalFunction;
@@ -52,7 +51,6 @@ import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.EnumMap;
import java.util.EnumSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -99,10 +97,10 @@ public final class ConfigKeys {
}));
/**
* The lookup settings for contexts (care should be taken to not mutate this method)
* The default global contexts instance
*/
public static final ConfigKey<EnumSet<LookupSetting>> LOOKUP_SETTINGS = customKey(c -> {
return EnumSet.copyOf(Contexts.of(
public static final ConfigKey<Contexts> GLOBAL_CONTEXTS = customKey(c -> {
return Contexts.of(
ContextSet.empty(),
c.getBoolean("include-global", true),
c.getBoolean("include-global-world", true),
@@ -110,7 +108,7 @@ public final class ConfigKeys {
c.getBoolean("apply-global-groups", true),
c.getBoolean("apply-global-world-groups", true),
false
).getSettings());
);
});
/**
common/src/main/java/me/lucko/luckperms/common/context/ContextManager.java
+1 -1
View File
@@ -146,7 +146,7 @@ public abstract class ContextManager<T> {
* @return a contexts instance
*/
public Contexts formContexts(ImmutableContextSet contextSet) {
return Contexts.of(contextSet, this.plugin.getConfiguration().get(ConfigKeys.LOOKUP_SETTINGS));
return this.plugin.getConfiguration().get(ConfigKeys.GLOBAL_CONTEXTS).setContexts(contextSet);
}
/**