summaryrefslogtreecommitdiffstats
path: root/Essentials/src/com/earth2me/essentials/Essentials.java
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2014-05-05 14:48:25 +0100
committerKHobbits <rob@khobbits.co.uk>2014-05-05 14:48:25 +0100
commitbe6b1f7432159d2b17667a2591f4db8331dfe79b (patch)
tree16a6268634aac8e7a44112ecf339dab65b149e81 /Essentials/src/com/earth2me/essentials/Essentials.java
parent7d48b29ae447f718986a634f9eddaf20a36ff033 (diff)
downloadEssentials-be6b1f7432159d2b17667a2591f4db8331dfe79b.tar
Essentials-be6b1f7432159d2b17667a2591f4db8331dfe79b.tar.gz
Essentials-be6b1f7432159d2b17667a2591f4db8331dfe79b.tar.lz
Essentials-be6b1f7432159d2b17667a2591f4db8331dfe79b.tar.xz
Essentials-be6b1f7432159d2b17667a2591f4db8331dfe79b.zip
Better handle TL failover.
Diffstat (limited to 'Essentials/src/com/earth2me/essentials/Essentials.java')
-rw-r--r--Essentials/src/com/earth2me/essentials/Essentials.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java
index 9a5f95f57..753484300 100644
--- a/Essentials/src/com/earth2me/essentials/Essentials.java
+++ b/Essentials/src/com/earth2me/essentials/Essentials.java
@@ -129,11 +129,11 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials
}
i18n = new I18n(this);
i18n.onEnable();
+ i18n.updateLocale("en");
LOGGER.log(Level.INFO, tl("usingTempFolderForTesting"));
LOGGER.log(Level.INFO, dataFolder.toString());
this.initialize(null, server, new PluginDescriptionFile(new FileReader(new File("src" + File.separator + "plugin.yml"))), dataFolder, null, null);
settings = new Settings(this);
- i18n.updateLocale("en");
userMap = new UserMap(this);
permissionsHandler = new PermissionsHandler(this, false);
Economy.setEss(this);
@@ -649,7 +649,7 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials
@Override
public User getOfflineUser(final String name)
{
- final User user = userMap.getUser(name);
+ final User user = userMap.getUser(name);
if (user != null && user.getBase() instanceof OfflinePlayer)
{
//This code should attempt to use the last known name of a user, if Bukkit returns name as null.