From 88b2bfa048c6477e43040afa6ab6707423a3429e Mon Sep 17 00:00:00 2001 From: Morgan Date: Wed, 31 Aug 2011 12:26:21 -0400 Subject: [PATCH 1/2] Use PluginEnableEvent instead of searching for the Plugin during onPluginEnable in P3 --- .../vault/permission/plugins/Permission_Permissions3.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/net/milkbowl/vault/permission/plugins/Permission_Permissions3.java b/src/net/milkbowl/vault/permission/plugins/Permission_Permissions3.java index 1625fc9..4a10419 100644 --- a/src/net/milkbowl/vault/permission/plugins/Permission_Permissions3.java +++ b/src/net/milkbowl/vault/permission/plugins/Permission_Permissions3.java @@ -90,10 +90,9 @@ public class Permission_Permissions3 extends Permission { public void onPluginEnable(PluginEnableEvent event) { if (permission.permission == null) { - Plugin perms = plugin.getServer().getPluginManager().getPlugin("Permissions"); - - if (perms != null) { - if (perms.isEnabled() && perms.getDescription().getVersion().startsWith("3")) { + Plugin perms = event.getPlugin(); + if(perms.getDescription().getName().equals("Permissions") && perms.getDescription().getVersion().startsWith("3")) { + if (perms.isEnabled()) { permission.permission = (Permissions) perms; log.info(String.format("[%s][Permission] %s hooked.", plugin.getDescription().getName(), permission.name)); } From 0d0cf557716cb764fd0a80ecb9e9d5c0060f0e9c Mon Sep 17 00:00:00 2001 From: Morgan Date: Wed, 31 Aug 2011 12:28:48 -0400 Subject: [PATCH 2/2] Clean up ServerListener for P3 --- .../plugins/Permission_Permissions3.java | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/src/net/milkbowl/vault/permission/plugins/Permission_Permissions3.java b/src/net/milkbowl/vault/permission/plugins/Permission_Permissions3.java index 4a10419..dfe0a46 100644 --- a/src/net/milkbowl/vault/permission/plugins/Permission_Permissions3.java +++ b/src/net/milkbowl/vault/permission/plugins/Permission_Permissions3.java @@ -49,7 +49,7 @@ public class Permission_Permissions3 extends Permission { this.plugin = plugin; pluginManager = this.plugin.getServer().getPluginManager(); - permissionServerListener = new PermissionServerListener(this); + permissionServerListener = new PermissionServerListener(); this.pluginManager.registerEvent(Type.PLUGIN_ENABLE, permissionServerListener, Priority.Monitor, plugin); this.pluginManager.registerEvent(Type.PLUGIN_DISABLE, permissionServerListener, Priority.Monitor, plugin); @@ -82,29 +82,23 @@ public class Permission_Permissions3 extends Permission { } private class PermissionServerListener extends ServerListener { - Permission_Permissions3 permission = null; - - public PermissionServerListener(Permission_Permissions3 permission) { - this.permission = permission; - } - public void onPluginEnable(PluginEnableEvent event) { - if (permission.permission == null) { + if (permission == null) { Plugin perms = event.getPlugin(); if(perms.getDescription().getName().equals("Permissions") && perms.getDescription().getVersion().startsWith("3")) { if (perms.isEnabled()) { - permission.permission = (Permissions) perms; - log.info(String.format("[%s][Permission] %s hooked.", plugin.getDescription().getName(), permission.name)); + permission = (Permissions) perms; + log.info(String.format("[%s][Permission] %s hooked.", plugin.getDescription().getName(), name)); } } } } public void onPluginDisable(PluginDisableEvent event) { - if (permission.permission != null) { + if (permission != null) { if (event.getPlugin().getDescription().getName().equals("Permissions")) { - permission.permission = null; - log.info(String.format("[%s][Permission] %s un-hooked.", plugin.getDescription().getName(), permission.name)); + permission = null; + log.info(String.format("[%s][Permission] %s un-hooked.", plugin.getDescription().getName(), name)); } } }