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

stripped out bPerms2 API it's completely non-functional.

This commit is contained in:
Sleaker 2012-01-31 13:52:51 -08:00
parent ab07eefde2
commit 3437dcfcaf
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/net/milkbowl/vault/Vault.java
View File

@ -34,7 +34,6 @@ import net.milkbowl.vault.chat.plugins.Chat_Permissions3;
import net.milkbowl.vault.chat.plugins.Chat_PermissionsEx;
import net.milkbowl.vault.chat.plugins.Chat_Towny;
import net.milkbowl.vault.chat.plugins.Chat_bPermissions;
import net.milkbowl.vault.chat.plugins.Chat_bPermissions2;
import net.milkbowl.vault.chat.plugins.Chat_iChat;
import net.milkbowl.vault.chat.plugins.Chat_mChat;
import net.milkbowl.vault.economy.Economy;
@ -59,7 +58,6 @@ import net.milkbowl.vault.permission.plugins.Permission_PermissionsEx;
import net.milkbowl.vault.permission.plugins.Permission_Starburst;
import net.milkbowl.vault.permission.plugins.Permission_SuperPerms;
import net.milkbowl.vault.permission.plugins.Permission_bPermissions;
import net.milkbowl.vault.permission.plugins.Permission_bPermissions2;
import net.milkbowl.vault.permission.plugins.Permission_zPermissions;
import org.bukkit.command.Command;
@ -154,15 +152,16 @@ public class Vault extends JavaPlugin {
//try loading bPermssions 2
if (packageExists(new String[] {"de.bananaco.permissions.info.InfoReader"})) {
if (packageExists(new String[] {"de.bananaco.bpermissions.api.ApiLayer"})) {
/* bPerms2 APILayer is not working at the moment
* if (packageExists(new String[] {"de.bananaco.bpermissions.api.ApiLayer"})) {
Chat bPerms = new Chat_bPermissions2(this, perms);
sm.register(Chat.class, bPerms, this, ServicePriority.High);
log.info(String.format("[%s][Chat] bPermissions2 found: %s", getDescription().getName(), bPerms.isEnabled() ? "Loaded" : "Waiting"));
} else {
} else { */
Chat bPerms = new Chat_bPermissions(this, perms);
sm.register(Chat.class, bPerms, this, ServicePriority.Normal);
log.info(String.format("[%s][Chat] bPermissions found: %s", getDescription().getName(), bPerms.isEnabled() ? "Loaded" : "Waiting"));
}
//}
}
// Try to load GroupManager
@ -321,14 +320,15 @@ public class Vault extends JavaPlugin {
sm.register(Permission.class, pPerms, this, ServicePriority.Highest);
log.info(String.format("[%s][Permission] PermissionsBukkit found: %s", getDescription().getName(), pPerms.isEnabled() ? "Loaded" : "Waiting"));
}
/*
//try loading bPermissions2
if (packageExists(new String[] {"de.bananaco.bpermissions.api.WorldManager"})) {
Permission bPerms = new Permission_bPermissions2(this);
sm.register(Permission.class, bPerms, this, ServicePriority.Highest);
log.info(String.format("[%s][Chat] bPermissions found: %s", getDescription().getName(), bPerms.isEnabled() ? "Loaded" : "Waiting"));
}
*/
//Try to load zPermission
if (packageExists(new String[] {"org.tyrannyofheaven.bukkit.zPermissions"})) {
Permission zPerms = new Permission_zPermissions(this);