diff options
| author | KHobbits <rob@khobbits.co.uk> | 2011-11-29 16:16:45 +0000 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2011-11-29 16:16:45 +0000 |
| commit | cdbae1631dfd4e9cd71aa030260bbc43b75ad94e (patch) | |
| tree | 2c7e4a87f436446204a4a7f41829da9d77e11cf7 | |
| parent | 414d6b79e97ee41c94ad789a7c4aefd8bcbe5ea8 (diff) | |
| download | Essentials-cdbae1631dfd4e9cd71aa030260bbc43b75ad94e.tar Essentials-cdbae1631dfd4e9cd71aa030260bbc43b75ad94e.tar.gz Essentials-cdbae1631dfd4e9cd71aa030260bbc43b75ad94e.tar.lz Essentials-cdbae1631dfd4e9cd71aa030260bbc43b75ad94e.tar.xz Essentials-cdbae1631dfd4e9cd71aa030260bbc43b75ad94e.zip | |
Settings Cleanup.
4 files changed, 5 insertions, 8 deletions
diff --git a/Essentials/src/com/earth2me/essentials/I18n.java b/Essentials/src/com/earth2me/essentials/I18n.java index d3ffe5f76..4e2b033e6 100644 --- a/Essentials/src/com/earth2me/essentials/I18n.java +++ b/Essentials/src/com/earth2me/essentials/I18n.java @@ -69,6 +69,9 @@ public class I18n public static String _(final String string, final Object... objects) { + if (instance == null) { + return ""; + } if (objects.length == 0) { return instance.translate(string); diff --git a/Essentials/src/com/earth2me/essentials/ISettings.java b/Essentials/src/com/earth2me/essentials/ISettings.java index ed76ef325..1b71f30e4 100644 --- a/Essentials/src/com/earth2me/essentials/ISettings.java +++ b/Essentials/src/com/earth2me/essentials/ISettings.java @@ -59,8 +59,6 @@ public interface ISettings extends IConf String getProtectString(final String configName); - boolean getReclaimSetting(); - boolean getRespawnAtHome(); List getMultipleHomes(); diff --git a/Essentials/src/com/earth2me/essentials/Settings.java b/Essentials/src/com/earth2me/essentials/Settings.java index aa6bb6cef..961b0b9b6 100644 --- a/Essentials/src/com/earth2me/essentials/Settings.java +++ b/Essentials/src/com/earth2me/essentials/Settings.java @@ -244,12 +244,6 @@ public class Settings implements ISettings } @Override - public boolean getReclaimSetting() - { - return config.getBoolean("reclaim-onlogout", false); - } - - @Override public int getSpawnMobLimit() { return config.getInt("spawnmob-limit", 10); diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandenchant.java b/Essentials/src/com/earth2me/essentials/commands/Commandenchant.java index 6b028a634..3ef886347 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandenchant.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandenchant.java @@ -67,6 +67,8 @@ public class Commandenchant extends EssentialsCommand super("enchant"); } + + //TODO: Implement charge costs: final Trade charge = new Trade("enchant-" + enchantmentName, ess); @Override protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception { |