Upstream
/
Vault
mirror of https://github.com/MilkBowl/Vault.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://Sleaker@github.com/MilkBowl/Vault.git

This commit is contained in:
Sleaker 2011-09-18 01:19:57 -07:00
parent 7dfc283e47 0d0cf55771
commit 9a9f0e3a75
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/net/milkbowl/vault/permission/plugins/Permission_Permissions3.java
View File

@ -50,7 +50,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);
@ -83,30 +83,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) {
Plugin perms = plugin.getServer().getPluginManager().getPlugin("Permissions");
if (perms != null) {
if (perms.isEnabled() && perms.getDescription().getVersion().startsWith("3")) {
permission.permission = (Permissions) perms;
log.info(String.format("[%s][Permission] %s hooked.", plugin.getDescription().getName(), permission.name));
if (permission == null) {
Plugin perms = event.getPlugin();
if(perms.getDescription().getName().equals("Permissions") && perms.getDescription().getVersion().startsWith("3")) {
if (perms.isEnabled()) {
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));
}
}
}
@ -346,4 +339,4 @@ public class Permission_Permissions3 extends Permission {
return false;
}
}
}
}