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

Fix a possible NPE case -- getPlayerInfo () in PBukkit can return null when the user is not defined.

Browse Source
This commit is contained in:
Tyler Blair 2012-03-21 18:51:48 -03:00
parent 9d50820b8c
commit d95d5f21d1
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 org.bukkit.plugin.Plugin;
import com.platymuus.bukkit.permissions.Group; import com.platymuus.bukkit.permissions.Group;
import com.platymuus.bukkit.permissions.PermissionInfo;
import com.platymuus.bukkit.permissions.PermissionsPlugin; import com.platymuus.bukkit.permissions.PermissionsPlugin;
public class Permission_PermissionsBukkit extends Permission { public class Permission_PermissionsBukkit extends Permission {
@ -189,7 +190,8 @@ public class Permission_PermissionsBukkit extends Permission {
@Override @Override
public String[] getPlayerGroups(String world, String player) { public String[] getPlayerGroups(String world, String player) {
List<String> groupList = new ArrayList<String>(); 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()) { for (Group group : perms.getPlayerInfo(player).getGroups()) {
if (group.getInfo().getWorlds().contains(world)) { if (group.getInfo().getWorlds().contains(world)) {
groupList.add(group.getName()); groupList.add(group.getName());
@ -197,8 +199,10 @@ public class Permission_PermissionsBukkit extends Permission {
} }
return groupList.toArray(new String[0]); return groupList.toArray(new String[0]);
} }
for (Group group : perms.getPlayerInfo(player).getGroups()) { if (info != null) {
groupList.add(group.getName()); for (Group group : info.getGroups()) {
groupList.add(group.getName());
}
} }
return groupList.toArray(new String[0]); return groupList.toArray(new String[0]);
} }