Upstream/Vault
1
0
Fork 0
mirror of https://github.com/MilkBowl/Vault.git synced 2025-01-01 05:48:06 +01:00
Code Issues Projects Releases Wiki Activity

fixup permission plugin listeners.

Browse Source
This commit is contained in:
Nick Minkler 2013-09-03 15:19:25 -07:00
parent 04b24a00c0
commit db5249ba18
10 changed files with 21 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/net/milkbowl/vault/permission/plugins/Permission_GroupManager.java
View File

@ -67,11 +67,10 @@ public class Permission_GroupManager extends Permission {
@EventHandler(priority = EventPriority.MONITOR) @EventHandler(priority = EventPriority.MONITOR)
public void onPluginEnable(PluginEnableEvent event) { public void onPluginEnable(PluginEnableEvent event) {
if (permission.groupManager == null) { if (permission.groupManager == null) {
Plugin perms = plugin.getServer().getPluginManager().getPlugin("GroupManager"); Plugin p = event.getPlugin();
if (perms != null) { if (p.getDescription().getName().equals("GroupManager")) {
permission.groupManager = (GroupManager) perms; permission.groupManager = (GroupManager) p;
log.info(String.format("[%s][Permission] %s hooked.", plugin.getDescription().getName(), permission.name)); log.info(String.format("[%s][Permission] %s hooked.", plugin.getDescription().getName(), permission.name));
} }
} }
} }

11
src/net/milkbowl/vault/permission/plugins/Permission_PermissionsBukkit.java
View File

@ -61,13 +61,10 @@ public class Permission_PermissionsBukkit extends Permission {
@EventHandler(priority = EventPriority.MONITOR) @EventHandler(priority = EventPriority.MONITOR)
public void onPluginEnable(PluginEnableEvent event) { public void onPluginEnable(PluginEnableEvent event) {
if (permission.perms == null) { if (permission.perms == null) {
Plugin perms = plugin.getServer().getPluginManager().getPlugin("PermissionsBukkit"); Plugin perms = event.getPlugin();
if (perms.getDescription().getName().equals("PermissionsBukkit")) {
if (perms != null) { permission.perms = (PermissionsPlugin) perms;
if (perms.isEnabled()) { log.info(String.format("[%s][Permission] %s hooked.", plugin.getDescription().getName(), permission.name));
permission.perms = (PermissionsPlugin) perms;
log.info(String.format("[%s][Permission] %s hooked.", plugin.getDescription().getName(), permission.name));
}
} }
} }
} }

5
src/net/milkbowl/vault/permission/plugins/Permission_PermissionsEx.java
View File

@ -82,9 +82,8 @@ public class Permission_PermissionsEx extends Permission {
@EventHandler(priority = EventPriority.MONITOR) @EventHandler(priority = EventPriority.MONITOR)
public void onPluginEnable(PluginEnableEvent event) { public void onPluginEnable(PluginEnableEvent event) {
if (permission.permission == null) { if (permission.permission == null) {
Plugin perms = plugin.getServer().getPluginManager().getPlugin("PermissionsEx"); Plugin perms = event.getPlugin();
if (perms.getDescription().getName().equals("PermissionsEx")) {
if (perms != null) {
try { try {
if (Double.valueOf(perms.getDescription().getVersion()) < 1.16) { 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)); 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));

5
src/net/milkbowl/vault/permission/plugins/Permission_Privileges.java
View File

@ -44,9 +44,8 @@ public class Permission_Privileges extends Permission {
@EventHandler(priority = EventPriority.MONITOR) @EventHandler(priority = EventPriority.MONITOR)
public void onPluginEnable(PluginEnableEvent event) { public void onPluginEnable(PluginEnableEvent event) {
if (permission.privs == null) { if (permission.privs == null) {
Plugin perms = plugin.getServer().getPluginManager().getPlugin("Privileges"); Plugin perms = event.getPlugin();
if (perms.getDescription().getName().equals("Privileges")) {
if (perms != null) {
permission.privs = (Privileges) perms; permission.privs = (Privileges) perms;
log.info(String.format("[%s][Permission] %s hooked.", plugin.getDescription().getName(), permission.name)); log.info(String.format("[%s][Permission] %s hooked.", plugin.getDescription().getName(), permission.name));
} }

5
src/net/milkbowl/vault/permission/plugins/Permission_SimplyPerms.java
View File

@ -60,9 +60,8 @@ public class Permission_SimplyPerms extends Permission{
@EventHandler(priority = EventPriority.MONITOR) @EventHandler(priority = EventPriority.MONITOR)
public void onPluginEnable(PluginEnableEvent event) { public void onPluginEnable(PluginEnableEvent event) {
if (permission.perms == null) { if (permission.perms == null) {
Plugin perms = plugin.getServer().getPluginManager().getPlugin("SimplyPerms"); Plugin perms = event.getPlugin();
if (perms.getDescription().getName().equals("SimplyPerms")) {
if (perms != null) {
permission.perms = ((SimplyPlugin) perms).getAPI(); permission.perms = ((SimplyPlugin) perms).getAPI();
log.info(String.format("[%s][Permission] %s hooked.", plugin.getDescription().getName(), permission.name)); log.info(String.format("[%s][Permission] %s hooked.", plugin.getDescription().getName(), permission.name));
} }

2
src/net/milkbowl/vault/permission/plugins/Permission_Starburst.java
View File

@ -61,7 +61,7 @@ public class Permission_Starburst extends Permission {
public void onPluginEnable(PluginEnableEvent event) { public void onPluginEnable(PluginEnableEvent event) {
if (perms == null) { if (perms == null) {
Plugin p = event.getPlugin(); Plugin p = event.getPlugin();
if (p.getDescription().getName().equals("Starburst") && p.isEnabled()) { if (p.getDescription().getName().equals("Starburst")) {
perms = (StarburstPlugin) p; perms = (StarburstPlugin) p;
log.info(String.format("[%s][Permission] %s hooked.", plugin.getDescription().getName(), name)); log.info(String.format("[%s][Permission] %s hooked.", plugin.getDescription().getName(), name));
} }

2
src/net/milkbowl/vault/permission/plugins/Permission_TotalPermissions.java
View File

@ -45,7 +45,7 @@ public class Permission_TotalPermissions extends Permission {
@EventHandler(priority = EventPriority.MONITOR) @EventHandler(priority = EventPriority.MONITOR)
public void onPluginEnable(PluginEnableEvent event) { public void onPluginEnable(PluginEnableEvent event) {
if (manager == null) { if (manager == null || totalperms == null) {
Plugin permPlugin = event.getPlugin(); Plugin permPlugin = event.getPlugin();
if (permPlugin.getDescription().getName().equals(name)) { if (permPlugin.getDescription().getName().equals(name)) {
totalperms = (TotalPermissions) permPlugin; totalperms = (TotalPermissions) permPlugin;

8
src/net/milkbowl/vault/permission/plugins/Permission_Xperms.java
View File

@ -63,10 +63,10 @@ public class Permission_Xperms extends Permission {
} }
@EventHandler(priority = EventPriority.MONITOR) @EventHandler(priority = EventPriority.MONITOR)
public void onPluginEnable(PluginEnableEvent event) { public void onPluginEnable(PluginEnableEvent event) {
if(permission == null){ if (permission.perms == null) {
Plugin perms = plugin.getServer().getPluginManager().getPlugin("Xperms"); Plugin perms = event.getPlugin();
if(perms != null){ if(perms.getDescription().getName().equals("Xperms")){
try{ try{
if(Double.valueOf(perms.getDescription().getVersion()) < 1.1){ 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)); log.info(String.format("[%s] [Permission] %s Current version is not compatible with vault! Please Update!", plugin.getDescription().getName(), name));

2
src/net/milkbowl/vault/permission/plugins/Permission_bPermissions2.java
View File

@ -62,7 +62,7 @@ public class Permission_bPermissions2 extends Permission {
public void onPluginEnable(PluginEnableEvent event) { public void onPluginEnable(PluginEnableEvent event) {
if (!hooked) { if (!hooked) {
Plugin p = event.getPlugin(); Plugin p = event.getPlugin();
if(p.getDescription().getName().equals("bPermissions") && p.isEnabled()) { if(p.getDescription().getName().equals("bPermissions")) {
hooked = true; hooked = true;
log.info(String.format("[%s][Permission] %s hooked.", plugin.getDescription().getName(), name)); log.info(String.format("[%s][Permission] %s hooked.", plugin.getDescription().getName(), name));
} }

2
src/net/milkbowl/vault/permission/plugins/Permission_zPermissions.java
View File

@ -59,7 +59,7 @@ public class Permission_zPermissions extends Permission {
@EventHandler(priority = EventPriority.MONITOR) @EventHandler(priority = EventPriority.MONITOR)
public void onPluginEnable(PluginEnableEvent event) { public void onPluginEnable(PluginEnableEvent event) {
if (service == null) { if (service == null && event.getPlugin().getDescription().getName().equals("zPermissions")) {
service = plugin.getServer().getServicesManager().load(ZPermissionsService.class); service = plugin.getServer().getServicesManager().load(ZPermissionsService.class);
if (service != null) { if (service != null) {
log.info(String.format("[%s][Permission] %s hooked.", plugin.getDescription().getName(), name)); log.info(String.format("[%s][Permission] %s hooked.", plugin.getDescription().getName(), name));