summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Essentials/src/com/earth2me/essentials/Settings.java14
-rw-r--r--Essentials/src/config.yml4
2 files changed, 4 insertions, 14 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Settings.java b/Essentials/src/com/earth2me/essentials/Settings.java
index a73022a38..2f325fcf0 100644
--- a/Essentials/src/com/earth2me/essentials/Settings.java
+++ b/Essentials/src/com/earth2me/essentials/Settings.java
@@ -50,12 +50,12 @@ public class Settings implements IConf
public String getCurrency()
{
- return config.getString("currencyName", "Coin");
+ return config.getString("currency-name", "Coin");
}
public String getCurrencyPlural()
{
- return config.getString("currencyNamePlural", "Coins");
+ return config.getString("currency-name-plural", "Coins");
}
public int getStartingBalance()
@@ -68,16 +68,6 @@ public class Settings implements IConf
return isNetherEnabled() && config.getBoolean("nether.portals-enabled", false);
}
- public String getMcslKey()
- {
- return config.getString("mcsl-key", "").replaceAll("[^a-zA-Z0-9]", "");
- }
-
- public boolean getWhitelistEnabled()
- {
- return false;
- }
-
public boolean isCommandDisabled(IEssentialsCommand cmd)
{
return isCommandDisabled(cmd.getName());
diff --git a/Essentials/src/config.yml b/Essentials/src/config.yml
index cf2848387..1a579fe1f 100644
--- a/Essentials/src/config.yml
+++ b/Essentials/src/config.yml
@@ -222,8 +222,8 @@ command-costs:
# kit-tools: 1500
#This defines the name of your currencies, in singular and plural
-currencyName: Coin
-currencyNamePlural: Coins
+currency-name: Coin
+currency-name-plural: Coins