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 2012-08-08 06:42:28 -07:00
parent 1414610edd a4a5427628
commit e797ba912e
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/net/milkbowl/vault/chat/plugins/Chat_Permissions3.java
View File

@ -220,7 +220,7 @@ public class Chat_Permissions3 extends Chat {
@Override
public String getGroupPrefix(String world, String group) {
return this.getGroupPrefix(world, group);
return this.perms.getGroupPrefix(world, group);
}
@Override
@ -230,7 +230,7 @@ public class Chat_Permissions3 extends Chat {
@Override
public String getGroupSuffix(String world, String group) {
return this.getGroupSuffix(world, group);
return this.perms.getGroupSuffix(world, group);
}
@Override

2
src/net/milkbowl/vault/economy/plugins/Economy_AEco.java
View File

@ -142,7 +142,7 @@ public class Economy_AEco implements Economy {
@EventHandler(priority = EventPriority.MONITOR)
public void onPluginDisable(PluginDisableEvent event) {
if (economy.economy != null) {
if (event.getPlugin().getDescription().getName().equals("3co")) {
if (event.getPlugin().getDescription().getName().equals("AEco")) {
economy.economy = null;
log.info(String.format("[%s][Economy] %s unhooked.", plugin.getDescription().getName(), economy.name));
}

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

@ -45,7 +45,7 @@ public class Permission_PermissionsBukkit extends Permission {
if (perms == null) {
Plugin perms = plugin.getServer().getPluginManager().getPlugin("PermissionsBukkit");
if (perms != null) {
perms = (PermissionsPlugin) perms;
this.perms = (PermissionsPlugin) perms;
log.info(String.format("[%s][Permission] %s hooked.", plugin.getDescription().getName(), name));
}
}

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

@ -148,8 +148,8 @@ public class Permission_SimplyPerms extends Permission{
public boolean groupRemove(String world, String group, String permission) {
permission = permission.toLowerCase();
if (world != null) {
this.perms.removeGroupPermission(group, world, permission);
permission = world + ":" + permission;
this.perms.removeGroupPermission(group, world, permission);
} else {
this.perms.removeGroupPermission(group, permission);
}

4
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) {
if (perms == null) {
Plugin p = event.getPlugin();
if (p.getDescription().getName().equals("bPermissions") && p.isEnabled()) {
if (p.getDescription().getName().equals("Starburst") && p.isEnabled()) {
perms = (StarburstPlugin) p;
log.info(String.format("[%s][Permission] %s hooked.", plugin.getDescription().getName(), name));
}
@ -71,7 +71,7 @@ public class Permission_Starburst extends Permission {
@EventHandler(priority = EventPriority.MONITOR)
public void onPluginDisable(PluginDisableEvent event) {
if (perms != null) {
if (event.getPlugin().getDescription().getName().equals("bPermissions")) {
if (event.getPlugin().getDescription().getName().equals("Starburst")) {
perms = null;
log.info(String.format("[%s][Permission] %s un-hooked.", plugin.getDescription().getName(), name));
}