summaryrefslogtreecommitdiffstats
path: root/Essentials/src/com/earth2me/essentials/Essentials.java
diff options
context:
space:
mode:
Diffstat (limited to 'Essentials/src/com/earth2me/essentials/Essentials.java')
-rw-r--r--Essentials/src/com/earth2me/essentials/Essentials.java32
1 files changed, 6 insertions, 26 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java
index 4a1562eaf..7f85ab2c3 100644
--- a/Essentials/src/com/earth2me/essentials/Essentials.java
+++ b/Essentials/src/com/earth2me/essentials/Essentials.java
@@ -143,32 +143,7 @@ public class Essentials extends JavaPlugin implements IEssentials
LOGGER.log(Level.INFO, Util.i18n("bukkitFormatChanged"));
}
- final Plugin permissionsPlugin = pm.getPlugin("Permissions");
-
- if (permissionsPlugin != null)
- {
- if (permissionsPlugin.getDescription().getVersion().charAt(0) == '3')
- {
- this.permissionsHandler = new Permissions3Handler(permissionsPlugin);
- }
- else
- {
- this.permissionsHandler = new Permissions2Handler(permissionsPlugin);
- }
- }
- else
- {
- if (this.getSettings().useBukkitPermissions())
- {
- this.permissionsHandler = new BukkitPermissionsHandler();
- }
- else
- {
- this.permissionsHandler = new ConfigPermissionsHandler(this);
- }
- }
-
- final ServerListener serverListener = new EssentialsPluginListener(paymentMethod);
+ final ServerListener serverListener = new EssentialsPluginListener(this);
pm.registerEvent(Type.PLUGIN_ENABLE, serverListener, Priority.Low, this);
pm.registerEvent(Type.PLUGIN_DISABLE, serverListener, Priority.Low, this);
@@ -663,6 +638,11 @@ public class Essentials extends JavaPlugin implements IEssentials
{
return permissionsHandler;
}
+
+ public void setPermissionsHandler(IPermissionsHandler handler)
+ {
+ this.permissionsHandler = handler;
+ }
public BanWorkaround getBans()
{