diff options
| author | snowleo <schneeleo@gmail.com> | 2012-10-15 20:30:52 +0200 |
|---|---|---|
| committer | snowleo <schneeleo@gmail.com> | 2012-10-15 20:30:52 +0200 |
| commit | 8dbcebda53cb96cf3e2bb119ceb232511e7bb8af (patch) | |
| tree | b1ed6aea6102e18af9c1f3375e9f766d2963adc6 | |
| parent | 28d2a9ed2e76c4ec4de1730e3dbd3793e29f88df (diff) | |
| download | Essentials-8dbcebda53cb96cf3e2bb119ceb232511e7bb8af.tar Essentials-8dbcebda53cb96cf3e2bb119ceb232511e7bb8af.tar.gz Essentials-8dbcebda53cb96cf3e2bb119ceb232511e7bb8af.tar.lz Essentials-8dbcebda53cb96cf3e2bb119ceb232511e7bb8af.tar.xz Essentials-8dbcebda53cb96cf3e2bb119ceb232511e7bb8af.zip | |
Don't call plugin manager in Settings.
3 files changed, 16 insertions, 1 deletions
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsPluginListener.java b/Essentials/src/com/earth2me/essentials/EssentialsPluginListener.java index 2ec8538ca..56cabf6cb 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsPluginListener.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsPluginListener.java @@ -20,6 +20,9 @@ public class EssentialsPluginListener implements Listener, IConf @EventHandler(priority = EventPriority.MONITOR) public void onPluginEnable(final PluginEnableEvent event) { + if (event.getPlugin().getName().equals("EssentialsChat")) { + ess.getSettings().setEssentialsChatActive(true); + } ess.getPermissionsHandler().checkPermissions(); ess.getAlternativeCommandsHandler().addPlugin(event.getPlugin()); if (!ess.getPaymentMethod().hasMethod() && ess.getPaymentMethod().setMethod(ess.getServer().getPluginManager())) @@ -31,6 +34,9 @@ public class EssentialsPluginListener implements Listener, IConf @EventHandler(priority = EventPriority.MONITOR) public void onPluginDisable(final PluginDisableEvent event) { + if (event.getPlugin().getName().equals("EssentialsChat")) { + ess.getSettings().setEssentialsChatActive(false); + } ess.getPermissionsHandler().checkPermissions(); ess.getAlternativeCommandsHandler().removePlugin(event.getPlugin()); // Check to see if the plugin thats being disabled is the one we are using diff --git a/Essentials/src/com/earth2me/essentials/ISettings.java b/Essentials/src/com/earth2me/essentials/ISettings.java index eac342d9e..fb0073c8a 100644 --- a/Essentials/src/com/earth2me/essentials/ISettings.java +++ b/Essentials/src/com/earth2me/essentials/ISettings.java @@ -181,4 +181,6 @@ public interface ISettings extends IConf double getMaxWalkSpeed(); public int getMailsPerMinute(); + + public void setEssentialsChatActive(boolean b); } diff --git a/Essentials/src/com/earth2me/essentials/Settings.java b/Essentials/src/com/earth2me/essentials/Settings.java index c0cac8dcf..ca78aca7b 100644 --- a/Essentials/src/com/earth2me/essentials/Settings.java +++ b/Essentials/src/com/earth2me/essentials/Settings.java @@ -696,6 +696,7 @@ public class Settings implements ISettings } private boolean prefixsuffixconfigured = false; private boolean addprefixsuffix = false; + private boolean essentialsChatActive = false; private boolean _addPrefixSuffix() { @@ -708,9 +709,15 @@ public class Settings implements ISettings } @Override + public void setEssentialsChatActive(boolean essentialsChatActive) + { + this.essentialsChatActive = essentialsChatActive; + } + + @Override public boolean addPrefixSuffix() { - return prefixsuffixconfigured ? addprefixsuffix : ess.getServer().getPluginManager().isPluginEnabled("EssentialsChat"); + return prefixsuffixconfigured ? addprefixsuffix : essentialsChatActive; } private boolean disablePrefix = false; |