minecraft/LuckPerms
1
0
Fork 0
mirror of https://github.com/lucko/LuckPerms.git synced 2025-09-01 02:21:43 +02:00
Code Issues Releases Wiki Activity

Load configuration from env or system props (#3294)

Browse Source
This commit is contained in:
Luck
2022-04-03 15:21:18 +01:00
parent 2e0a4d71a5
commit 126631fce8
12 changed files with 366 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitConfigAdapter.java
View File

@@ -32,11 +32,9 @@ import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.YamlConfiguration;
import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
public class BukkitConfigAdapter implements ConfigurationAdapter {
private final LuckPermsPlugin plugin;
@@ -75,17 +73,6 @@ public class BukkitConfigAdapter implements ConfigurationAdapter {
return this.configuration.isSet(path) ? list : def;
}
@Override
public List<String> getKeys(String path, List<String> def) {
ConfigurationSection section = this.configuration.getConfigurationSection(path);
if (section == null) {
return def;
}
Set<String> keys = section.getKeys(false);
return keys == null ? def : new ArrayList<>(keys);
}
@Override
public Map<String, String> getStringMap(String path, Map<String, String> def) {
Map<String, String> map = new HashMap<>();

8
bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/LuckPermsVaultPermission.java
View File

@@ -34,6 +34,7 @@ import me.lucko.luckperms.common.cacheddata.type.MonitoredMetaCache;
import me.lucko.luckperms.common.cacheddata.type.PermissionCache;
import me.lucko.luckperms.common.calculator.processor.DirectProcessor;
import me.lucko.luckperms.common.config.ConfigKeys;
import me.lucko.luckperms.common.config.LuckPermsConfiguration;
import me.lucko.luckperms.common.model.Group;
import me.lucko.luckperms.common.model.HolderType;
import me.lucko.luckperms.common.model.PermissionHolder;
@@ -470,7 +471,12 @@ public class LuckPermsVaultPermission extends AbstractVaultPermission {
}
String getVaultServer() {
return this.plugin.getConfiguration().get(ConfigKeys.VAULT_SERVER);
LuckPermsConfiguration configuration = this.plugin.getConfiguration();
if (configuration.get(ConfigKeys.USE_VAULT_SERVER)) {
return configuration.get(ConfigKeys.VAULT_SERVER);
} else {
return configuration.get(ConfigKeys.SERVER);
}
}
boolean isIncludeGlobal() {