summaryrefslogtreecommitdiffstats
path: root/Essentials2Compat
diff options
context:
space:
mode:
authordrtshock <thensler@wisc.edu>2013-05-02 22:19:28 -0500
committerdrtshock <thensler@wisc.edu>2013-05-02 22:19:28 -0500
commit3ff12f6bf52268b228aadbfbe634ca9ab0c135b6 (patch)
tree73ffe436673beeadd1768d36e137091a8f9fbffb /Essentials2Compat
parentf326d0ad0c22836fd0905b69303e9731ad268fe8 (diff)
downloadEssentials-3ff12f6bf52268b228aadbfbe634ca9ab0c135b6.tar
Essentials-3ff12f6bf52268b228aadbfbe634ca9ab0c135b6.tar.gz
Essentials-3ff12f6bf52268b228aadbfbe634ca9ab0c135b6.tar.lz
Essentials-3ff12f6bf52268b228aadbfbe634ca9ab0c135b6.tar.xz
Essentials-3ff12f6bf52268b228aadbfbe634ca9ab0c135b6.zip
More logging!
Diffstat (limited to 'Essentials2Compat')
-rw-r--r--Essentials2Compat/src/com/earth2me/essentials/Essentials.java6
-rw-r--r--Essentials2Compat/src/com/earth2me/essentials/Settings.java9
2 files changed, 7 insertions, 8 deletions
diff --git a/Essentials2Compat/src/com/earth2me/essentials/Essentials.java b/Essentials2Compat/src/com/earth2me/essentials/Essentials.java
index c22730f3d..ee9ce0f6b 100644
--- a/Essentials2Compat/src/com/earth2me/essentials/Essentials.java
+++ b/Essentials2Compat/src/com/earth2me/essentials/Essentials.java
@@ -15,12 +15,12 @@ public class Essentials extends JavaPlugin
@Override
public void onEnable()
{
- Bukkit.getLogger().info("You can remove this compatibility plugin, when all plugins are updated to Essentials-3");
+ IPlugin plugin = (IPlugin)getServer().getPluginManager().getPlugin("Essentials-3");
+ ess = plugin.getEssentials();
+ ess.getLogger().info("You can remove this compatibility plugin, when all plugins are updated to Essentials-3");
//TODO: Update files to new 3.0 format
//TODO: Move Eco Api here
//TODO: write update methods for itemmeta
- IPlugin plugin = (IPlugin)getServer().getPluginManager().getPlugin("Essentials-3");
- ess = plugin.getEssentials();
updateSettings();
updateUserfiles();
}
diff --git a/Essentials2Compat/src/com/earth2me/essentials/Settings.java b/Essentials2Compat/src/com/earth2me/essentials/Settings.java
index 40ed1918c..95006b831 100644
--- a/Essentials2Compat/src/com/earth2me/essentials/Settings.java
+++ b/Essentials2Compat/src/com/earth2me/essentials/Settings.java
@@ -17,7 +17,6 @@ import org.bukkit.inventory.ItemStack;
public final class Settings implements ISettings
{
private final EssentialsConf config;
- private final static Logger logger = Logger.getLogger("Minecraft");
private final IEssentials ess;
private boolean metricsEnabled = true;
@@ -418,7 +417,7 @@ public final class Settings implements ISettings
final List<Integer> epItemSpwn = new ArrayList<Integer>();
if (ess.getItemDb() == null)
{
- logger.log(Level.FINE, "Aborting ItemSpawnBL read, itemDB not yet loaded.");
+ ess.getLogger().log(Level.FINE, "Aborting ItemSpawnBL read, itemDB not yet loaded.");
return epItemSpwn;
}
for (String itemName : config.getString("item-spawn-blacklist", "").split(","))
@@ -435,7 +434,7 @@ public final class Settings implements ISettings
}
catch (Exception ex)
{
- logger.log(Level.SEVERE, _("§4Unknown item {0} in {1} list.", itemName, "item-spawn-blacklist"));
+ ess.getLogger().log(Level.SEVERE, _("§4Unknown item {0} in {1} list.", itemName, "item-spawn-blacklist"));
}
}
return epItemSpwn;
@@ -471,7 +470,7 @@ public final class Settings implements ISettings
}
catch (Exception ex)
{
- logger.log(Level.SEVERE, _("§4Unknown item {0} in {1} list.", signName, "enabledSigns"));
+ ess.getLogger().log(Level.SEVERE, _("§4Unknown item {0} in {1} list.", signName, "enabledSigns"));
continue;
}
signsEnabled = true;
@@ -565,7 +564,7 @@ public final class Settings implements ISettings
}
catch (Exception ex)
{
- logger.log(Level.SEVERE, _("§4Unknown item {0} in {1} list.", itemName, configName));
+ ess.getLogger().log(Level.SEVERE, _("§4Unknown item {0} in {1} list.", itemName, configName));
}
}
return list;