Upstream/Vault
1
0
Fork 0
mirror of https://github.com/MilkBowl/Vault.git synced 2024-12-29 12:28:35 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Sleaker 2012-03-22 14:40:55 -07:00
commit 6f31f02766
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,6 +30,7 @@ import org.bukkit.event.server.PluginEnableEvent;
import org.bukkit.plugin.Plugin;
import com.platymuus.bukkit.permissions.Group;
import com.platymuus.bukkit.permissions.PermissionInfo;
import com.platymuus.bukkit.permissions.PermissionsPlugin;
public class Permission_PermissionsBukkit extends Permission {
@ -189,7 +190,8 @@ public class Permission_PermissionsBukkit extends Permission {
@Override
public String[] getPlayerGroups(String world, String player) {
List<String> groupList = new ArrayList<String>();
if (world != null && perms.getPlayerInfo(player) != null) {
PermissionInfo info = perms.getPlayerInfo(player);
if (world != null && info != null) {
for (Group group : perms.getPlayerInfo(player).getGroups()) {
if (group.getInfo().getWorlds().contains(world)) {
groupList.add(group.getName());
@ -197,8 +199,10 @@ public class Permission_PermissionsBukkit extends Permission {
}
return groupList.toArray(new String[0]);
}
for (Group group : perms.getPlayerInfo(player).getGroups()) {
groupList.add(group.getName());
if (info != null) {
for (Group group : info.getGroups()) {
groupList.add(group.getName());
}
}
return groupList.toArray(new String[0]);
}