Prepare for 1.6 release
This commit is contained in:
@@ -46,7 +46,6 @@ public class InfoCommand extends SingleMainCommand {
|
||||
plugin.getVersion(),
|
||||
plugin.getDatastore().getName(),
|
||||
c.getServer(),
|
||||
c.getDefaultGroupName(),
|
||||
c.getSyncTime(),
|
||||
formatBoolean(c.getIncludeGlobalPerms()),
|
||||
formatBoolean(c.getOnlineMode()),
|
||||
|
||||
@@ -125,7 +125,6 @@ public enum Message {
|
||||
PREFIX + "&6Running &bLuckPerms v%s&6 by &bLuck&6." + "\n" +
|
||||
PREFIX + "&f-> &eStorage Method: &6%s" + "\n" +
|
||||
PREFIX + "&f-> &eServer Name: &6%s" + "\n" +
|
||||
PREFIX + "&f-> &eDefault Group: &6%s" + "\n" +
|
||||
PREFIX + "&f-> &eSync Interval: &6%s minutes" + "\n" +
|
||||
PREFIX + "&f-> &eInclude Global Perms: &6%s" + "\n" +
|
||||
PREFIX + "&f-> &eOnline Mode: &6%s" + "\n" +
|
||||
|
||||
@@ -50,13 +50,6 @@ public abstract class LPConfiguration<T extends LuckPermsPlugin> {
|
||||
defaultServerName + "' (the default)");
|
||||
set("server", defaultServerName);
|
||||
}
|
||||
|
||||
if (Patterns.NON_ALPHA_NUMERIC.matcher(getDefaultGroupName()).find()) {
|
||||
plugin.getLog().severe("Default group defined in config.yml contains invalid characters. Group names can " +
|
||||
"only contain alphanumeric characters.\nDefined default group name '" + getDefaultGroupName() +
|
||||
"' will be replaced with 'default' (the default)");
|
||||
set("default-group", "default");
|
||||
}
|
||||
}
|
||||
|
||||
protected abstract void init();
|
||||
@@ -73,12 +66,20 @@ public abstract class LPConfiguration<T extends LuckPermsPlugin> {
|
||||
return getInt("data.sync-minutes", 3);
|
||||
}
|
||||
|
||||
/**
|
||||
* As of 1.6, this value is a constant
|
||||
* @return the default group node
|
||||
*/
|
||||
public String getDefaultGroupNode() {
|
||||
return "group." + getDefaultGroupName();
|
||||
return "group.default";
|
||||
}
|
||||
|
||||
/**
|
||||
* As of 1.6, this value is a constant
|
||||
* @return the name of the default group
|
||||
*/
|
||||
public String getDefaultGroupName() {
|
||||
return getString("default-group", "default");
|
||||
return "default";
|
||||
}
|
||||
|
||||
public boolean getIncludeGlobalPerms() {
|
||||
|
||||
@@ -85,7 +85,7 @@ public abstract class PermissionHolder {
|
||||
permissions.addAll(nodes);
|
||||
permissions.addAll(transientNodes);
|
||||
|
||||
Iterator<Node> iterator = permissions.descendingIterator(); // TODO check this
|
||||
Iterator<Node> iterator = permissions.descendingIterator();
|
||||
while (iterator.hasNext()) {
|
||||
Node entry = iterator.next();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user