diff --git a/src/net/milkbowl/vault/permission/plugins/Permission_GroupManager.java b/src/net/milkbowl/vault/permission/plugins/Permission_GroupManager.java index 8b7d65c..ecf2993 100644 --- a/src/net/milkbowl/vault/permission/plugins/Permission_GroupManager.java +++ b/src/net/milkbowl/vault/permission/plugins/Permission_GroupManager.java @@ -67,11 +67,10 @@ public class Permission_GroupManager extends Permission { @EventHandler(priority = EventPriority.MONITOR) public void onPluginEnable(PluginEnableEvent event) { if (permission.groupManager == null) { - Plugin perms = plugin.getServer().getPluginManager().getPlugin("GroupManager"); - if (perms != null) { - permission.groupManager = (GroupManager) perms; + Plugin p = event.getPlugin(); + if (p.getDescription().getName().equals("GroupManager")) { + permission.groupManager = (GroupManager) p; log.info(String.format("[%s][Permission] %s hooked.", plugin.getDescription().getName(), permission.name)); - } } } diff --git a/src/net/milkbowl/vault/permission/plugins/Permission_PermissionsBukkit.java b/src/net/milkbowl/vault/permission/plugins/Permission_PermissionsBukkit.java index b5a6e09..7208246 100644 --- a/src/net/milkbowl/vault/permission/plugins/Permission_PermissionsBukkit.java +++ b/src/net/milkbowl/vault/permission/plugins/Permission_PermissionsBukkit.java @@ -61,13 +61,10 @@ public class Permission_PermissionsBukkit extends Permission { @EventHandler(priority = EventPriority.MONITOR) public void onPluginEnable(PluginEnableEvent event) { if (permission.perms == null) { - Plugin perms = plugin.getServer().getPluginManager().getPlugin("PermissionsBukkit"); - - if (perms != null) { - if (perms.isEnabled()) { - permission.perms = (PermissionsPlugin) perms; - log.info(String.format("[%s][Permission] %s hooked.", plugin.getDescription().getName(), permission.name)); - } + Plugin perms = event.getPlugin(); + if (perms.getDescription().getName().equals("PermissionsBukkit")) { + permission.perms = (PermissionsPlugin) perms; + log.info(String.format("[%s][Permission] %s hooked.", plugin.getDescription().getName(), permission.name)); } } } diff --git a/src/net/milkbowl/vault/permission/plugins/Permission_PermissionsEx.java b/src/net/milkbowl/vault/permission/plugins/Permission_PermissionsEx.java index 5cab34b..c6b5b2f 100644 --- a/src/net/milkbowl/vault/permission/plugins/Permission_PermissionsEx.java +++ b/src/net/milkbowl/vault/permission/plugins/Permission_PermissionsEx.java @@ -82,9 +82,8 @@ public class Permission_PermissionsEx extends Permission { @EventHandler(priority = EventPriority.MONITOR) public void onPluginEnable(PluginEnableEvent event) { if (permission.permission == null) { - Plugin perms = plugin.getServer().getPluginManager().getPlugin("PermissionsEx"); - - if (perms != null) { + Plugin perms = event.getPlugin(); + if (perms.getDescription().getName().equals("PermissionsEx")) { try { if (Double.valueOf(perms.getDescription().getVersion()) < 1.16) { log.info(String.format("[%s][Permission] %s below 1.16 is not compatible with Vault! Falling back to SuperPerms only mode. PLEASE UPDATE!", plugin.getDescription().getName(), name)); diff --git a/src/net/milkbowl/vault/permission/plugins/Permission_Privileges.java b/src/net/milkbowl/vault/permission/plugins/Permission_Privileges.java index 953535b..64310b6 100644 --- a/src/net/milkbowl/vault/permission/plugins/Permission_Privileges.java +++ b/src/net/milkbowl/vault/permission/plugins/Permission_Privileges.java @@ -44,9 +44,8 @@ public class Permission_Privileges extends Permission { @EventHandler(priority = EventPriority.MONITOR) public void onPluginEnable(PluginEnableEvent event) { if (permission.privs == null) { - Plugin perms = plugin.getServer().getPluginManager().getPlugin("Privileges"); - - if (perms != null) { + Plugin perms = event.getPlugin(); + if (perms.getDescription().getName().equals("Privileges")) { permission.privs = (Privileges) perms; log.info(String.format("[%s][Permission] %s hooked.", plugin.getDescription().getName(), permission.name)); } diff --git a/src/net/milkbowl/vault/permission/plugins/Permission_SimplyPerms.java b/src/net/milkbowl/vault/permission/plugins/Permission_SimplyPerms.java index 42c144a..21b4a76 100644 --- a/src/net/milkbowl/vault/permission/plugins/Permission_SimplyPerms.java +++ b/src/net/milkbowl/vault/permission/plugins/Permission_SimplyPerms.java @@ -60,9 +60,8 @@ public class Permission_SimplyPerms extends Permission{ @EventHandler(priority = EventPriority.MONITOR) public void onPluginEnable(PluginEnableEvent event) { if (permission.perms == null) { - Plugin perms = plugin.getServer().getPluginManager().getPlugin("SimplyPerms"); - - if (perms != null) { + Plugin perms = event.getPlugin(); + if (perms.getDescription().getName().equals("SimplyPerms")) { permission.perms = ((SimplyPlugin) perms).getAPI(); log.info(String.format("[%s][Permission] %s hooked.", plugin.getDescription().getName(), permission.name)); } diff --git a/src/net/milkbowl/vault/permission/plugins/Permission_Starburst.java b/src/net/milkbowl/vault/permission/plugins/Permission_Starburst.java index 45fe77c..ebc0940 100644 --- a/src/net/milkbowl/vault/permission/plugins/Permission_Starburst.java +++ b/src/net/milkbowl/vault/permission/plugins/Permission_Starburst.java @@ -61,7 +61,7 @@ public class Permission_Starburst extends Permission { public void onPluginEnable(PluginEnableEvent event) { if (perms == null) { Plugin p = event.getPlugin(); - if (p.getDescription().getName().equals("Starburst") && p.isEnabled()) { + if (p.getDescription().getName().equals("Starburst")) { perms = (StarburstPlugin) p; log.info(String.format("[%s][Permission] %s hooked.", plugin.getDescription().getName(), name)); } diff --git a/src/net/milkbowl/vault/permission/plugins/Permission_TotalPermissions.java b/src/net/milkbowl/vault/permission/plugins/Permission_TotalPermissions.java index 685f8e3..653ef4e 100644 --- a/src/net/milkbowl/vault/permission/plugins/Permission_TotalPermissions.java +++ b/src/net/milkbowl/vault/permission/plugins/Permission_TotalPermissions.java @@ -45,7 +45,7 @@ public class Permission_TotalPermissions extends Permission { @EventHandler(priority = EventPriority.MONITOR) public void onPluginEnable(PluginEnableEvent event) { - if (manager == null) { + if (manager == null || totalperms == null) { Plugin permPlugin = event.getPlugin(); if (permPlugin.getDescription().getName().equals(name)) { totalperms = (TotalPermissions) permPlugin; diff --git a/src/net/milkbowl/vault/permission/plugins/Permission_Xperms.java b/src/net/milkbowl/vault/permission/plugins/Permission_Xperms.java index ce8f683..e5454eb 100644 --- a/src/net/milkbowl/vault/permission/plugins/Permission_Xperms.java +++ b/src/net/milkbowl/vault/permission/plugins/Permission_Xperms.java @@ -63,10 +63,10 @@ public class Permission_Xperms extends Permission { } @EventHandler(priority = EventPriority.MONITOR) - public void onPluginEnable(PluginEnableEvent event) { - if(permission == null){ - Plugin perms = plugin.getServer().getPluginManager().getPlugin("Xperms"); - if(perms != null){ + public void onPluginEnable(PluginEnableEvent event) { + if (permission.perms == null) { + Plugin perms = event.getPlugin(); + if(perms.getDescription().getName().equals("Xperms")){ try{ if(Double.valueOf(perms.getDescription().getVersion()) < 1.1){ log.info(String.format("[%s] [Permission] %s Current version is not compatible with vault! Please Update!", plugin.getDescription().getName(), name)); diff --git a/src/net/milkbowl/vault/permission/plugins/Permission_bPermissions2.java b/src/net/milkbowl/vault/permission/plugins/Permission_bPermissions2.java index e0d5b23..ecd2894 100644 --- a/src/net/milkbowl/vault/permission/plugins/Permission_bPermissions2.java +++ b/src/net/milkbowl/vault/permission/plugins/Permission_bPermissions2.java @@ -62,7 +62,7 @@ public class Permission_bPermissions2 extends Permission { public void onPluginEnable(PluginEnableEvent event) { if (!hooked) { Plugin p = event.getPlugin(); - if(p.getDescription().getName().equals("bPermissions") && p.isEnabled()) { + if(p.getDescription().getName().equals("bPermissions")) { hooked = true; log.info(String.format("[%s][Permission] %s hooked.", plugin.getDescription().getName(), name)); } diff --git a/src/net/milkbowl/vault/permission/plugins/Permission_zPermissions.java b/src/net/milkbowl/vault/permission/plugins/Permission_zPermissions.java index 2a25020..0382d85 100644 --- a/src/net/milkbowl/vault/permission/plugins/Permission_zPermissions.java +++ b/src/net/milkbowl/vault/permission/plugins/Permission_zPermissions.java @@ -59,7 +59,7 @@ public class Permission_zPermissions extends Permission { @EventHandler(priority = EventPriority.MONITOR) public void onPluginEnable(PluginEnableEvent event) { - if (service == null) { + if (service == null && event.getPlugin().getDescription().getName().equals("zPermissions")) { service = plugin.getServer().getServicesManager().load(ZPermissionsService.class); if (service != null) { log.info(String.format("[%s][Permission] %s hooked.", plugin.getDescription().getName(), name));