Mirror von
https://github.com/IntellectualSites/FastAsyncWorldEdit.git
synchronisiert 2024-11-05 19:10:07 +01:00
Removed the allow-extra-data-values option.
This reverts parts of e477141
.
Data values could never go past 15 anyway,
making the option pointless and misleading.
Dieser Commit ist enthalten in:
Ursprung
a8f4013cbb
Commit
3acc82e97b
@ -110,7 +110,6 @@ public abstract class LocalConfiguration {
|
|||||||
public boolean showFirstUseVersion = true;
|
public boolean showFirstUseVersion = true;
|
||||||
public int butcherDefaultRadius = -1;
|
public int butcherDefaultRadius = -1;
|
||||||
public int butcherMaxRadius = -1;
|
public int butcherMaxRadius = -1;
|
||||||
public boolean allowExtraDataValues = false;
|
|
||||||
public boolean allowSymlinks = false;
|
public boolean allowSymlinks = false;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -436,7 +436,7 @@ public class WorldEdit {
|
|||||||
// Parse the block data (optional)
|
// Parse the block data (optional)
|
||||||
try {
|
try {
|
||||||
data = (typeAndData.length > 1 && typeAndData[1].length() > 0) ? Integer.parseInt(typeAndData[1]) : (allowNoData ? -1 : 0);
|
data = (typeAndData.length > 1 && typeAndData[1].length() > 0) ? Integer.parseInt(typeAndData[1]) : (allowNoData ? -1 : 0);
|
||||||
if ((data > 15 && !config.allowExtraDataValues) || (data < 0 && !(allAllowed && data == -1))) {
|
if (data > 15 || (data < 0 && !(allAllowed && data == -1))) {
|
||||||
data = 0;
|
data = 0;
|
||||||
}
|
}
|
||||||
} catch (NumberFormatException e) {
|
} catch (NumberFormatException e) {
|
||||||
|
@ -106,7 +106,6 @@ public class PropertiesConfiguration extends LocalConfiguration {
|
|||||||
scriptsDir = getString("craftscript-dir", scriptsDir);
|
scriptsDir = getString("craftscript-dir", scriptsDir);
|
||||||
butcherDefaultRadius = getInt("butcher-default-radius", butcherDefaultRadius);
|
butcherDefaultRadius = getInt("butcher-default-radius", butcherDefaultRadius);
|
||||||
butcherMaxRadius = getInt("butcher-max-radius", butcherMaxRadius);
|
butcherMaxRadius = getInt("butcher-max-radius", butcherMaxRadius);
|
||||||
allowExtraDataValues = getBool("allow-extra-data-values", allowExtraDataValues);
|
|
||||||
allowSymlinks = getBool("allow-symbolic-links", allowSymlinks);
|
allowSymlinks = getBool("allow-symbolic-links", allowSymlinks);
|
||||||
|
|
||||||
LocalSession.MAX_HISTORY_SIZE = Math.max(15, getInt("history-size", 15));
|
LocalSession.MAX_HISTORY_SIZE = Math.max(15, getInt("history-size", 15));
|
||||||
|
@ -79,9 +79,6 @@ public class YAMLConfiguration extends LocalConfiguration {
|
|||||||
disallowedBlocks = new HashSet<Integer>(config.getIntList("limits.disallowed-blocks", null));
|
disallowedBlocks = new HashSet<Integer>(config.getIntList("limits.disallowed-blocks", null));
|
||||||
allowedDataCycleBlocks = new HashSet<Integer>(config.getIntList("limits.allowed-data-cycle-blocks", null));
|
allowedDataCycleBlocks = new HashSet<Integer>(config.getIntList("limits.allowed-data-cycle-blocks", null));
|
||||||
|
|
||||||
allowExtraDataValues = config.getBoolean("limits.allow-extra-data-values", false);
|
|
||||||
|
|
||||||
|
|
||||||
registerHelp = config.getBoolean("register-help", true);
|
registerHelp = config.getBoolean("register-help", true);
|
||||||
logCommands = config.getBoolean("logging.log-commands", logCommands);
|
logCommands = config.getBoolean("logging.log-commands", logCommands);
|
||||||
logFile = config.getString("logging.file", logFile);
|
logFile = config.getString("logging.file", logFile);
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren