Merge branch 'fix/vault-perms' of https://github.com/mrlolethan/Factions into 1.6.x

This commit is contained in:
drtshock 2015-03-06 16:44:39 -07:00
commit 981822f89d

View File

@ -117,8 +117,14 @@ public class P extends MPlugin {
}
private boolean setupPermissions() {
RegisteredServiceProvider<Permission> rsp = getServer().getServicesManager().getRegistration(Permission.class);
perms = rsp.getProvider();
try {
RegisteredServiceProvider<Permission> rsp = getServer().getServicesManager().getRegistration(Permission.class);
if (rsp != null) {
perms = rsp.getProvider();
}
} catch (NoClassDefFoundError ex) {
return false;
}
return perms != null;
}