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

Permission handling bugfixes: 

- Permission#playerRemoveTransient(Player, String) was calling
playerRemove(String, String, String) instead of
playerRemoveTransient(String, String, String)

- Avoid NPE in PermissionsBukkit plugin when adding/removing transient
permissions.  Also use unsetPermission() when removing transient perms
rather than getPermissions().remove(...).  This may need to be done for
other permissions provider plugins too - I've only tested with
PermissionsBukkit so far.
This commit is contained in:
Des Herriott 2011-11-02 11:28:35 +00:00
parent f2b03a99bb
commit ee40fda9c8
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/milkbowl/vault/permission/Permission.java
View File

@ -213,7 +213,7 @@ public abstract class Permission {
* @return Success or Failure
*/
public boolean playerRemoveTransient(Player player, String permission) {
return playerRemove(player.getWorld().getName(), player.getName(), permission);
return playerRemoveTransient(player.getWorld().getName(), player.getName(), permission);
}
/**

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

@ -52,7 +52,7 @@ public class Permission_PermissionsBukkit extends Permission {
log.info(String.format("[%s][Permission] %s hooked.", plugin.getDescription().getName(), name));
}
}
if (mChat == null) {
Plugin chat = plugin.getServer().getPluginManager().getPlugin("mChat");
if (chat != null) {
@ -62,7 +62,6 @@ public class Permission_PermissionsBukkit extends Permission {
}
}
private class PermissionServerListener extends ServerListener {
Permission_PermissionsBukkit permission = null;
@ -133,7 +132,7 @@ public class Permission_PermissionsBukkit extends Permission {
if (world != null) {
permission = world + ":" + permission;
}
return plugin.getServer().dispatchCommand(ccs, "permission player setperm " + player + " " + permission + " true");
return plugin.getServer().dispatchCommand(ccs, "permissions player setperm " + player + " " + permission + " true");
}
@Override
@ -142,17 +141,17 @@ public class Permission_PermissionsBukkit extends Permission {
if (p == null) {
throw new UnsupportedOperationException(getName() + " does not support offline player transient permissions!");
}
for (PermissionAttachmentInfo paInfo : p.getEffectivePermissions()) {
if (paInfo.getAttachment().getPlugin().equals(plugin)) {
if (paInfo.getAttachment() != null && paInfo.getAttachment().getPlugin().equals(plugin)) {
paInfo.getAttachment().setPermission(permission, true);
return true;
}
}
PermissionAttachment attach = p.addAttachment(plugin);
attach.setPermission(permission, true);
return true;
}
@ -161,7 +160,7 @@ public class Permission_PermissionsBukkit extends Permission {
if (world != null) {
permission = world + ":" + permission;
}
return plugin.getServer().dispatchCommand(ccs, "permission player unsetperm " + player + " " + permission);
return plugin.getServer().dispatchCommand(ccs, "permissions player unsetperm " + player + " " + permission);
}
@Override
@ -171,8 +170,9 @@ public class Permission_PermissionsBukkit extends Permission {
throw new UnsupportedOperationException(getName() + " does not support offline player transient permissions!");
}
for (PermissionAttachmentInfo paInfo : p.getEffectivePermissions()) {
if (paInfo.getAttachment().getPlugin().equals(plugin)) {
return paInfo.getAttachment().getPermissions().remove(permission);
if (paInfo.getAttachment() != null && paInfo.getAttachment().getPlugin().equals(plugin)) {
paInfo.getAttachment().unsetPermission(permission);
return true;
}
}
return false;
@ -197,7 +197,7 @@ public class Permission_PermissionsBukkit extends Permission {
if (world != null) {
permission = world + ":" + permission;
}
return plugin.getServer().dispatchCommand(ccs, "permission group setperm " + group + " " + permission + " true");
return plugin.getServer().dispatchCommand(ccs, "permissions group setperm " + group + " " + permission + " true");
}
@Override
@ -205,7 +205,7 @@ public class Permission_PermissionsBukkit extends Permission {
if (world != null) {
permission = world + ":" + permission;
}
return plugin.getServer().dispatchCommand(ccs, "permission group unsetperm " + group + " " + permission);
return plugin.getServer().dispatchCommand(ccs, "permissions group unsetperm " + group + " " + permission);
}
@Override
@ -226,7 +226,7 @@ public class Permission_PermissionsBukkit extends Permission {
if (world != null) {
throw new UnsupportedOperationException(getName() + " does not support world based groups.");
}
return plugin.getServer().dispatchCommand(ccs, "permission player addgroup " + group + " " + player);
return plugin.getServer().dispatchCommand(ccs, "permissions player addgroup " + group + " " + player);
}
@Override
@ -234,9 +234,9 @@ public class Permission_PermissionsBukkit extends Permission {
if (world != null) {
throw new UnsupportedOperationException(getName() + " does not support world based groups.");
}
return plugin.getServer().dispatchCommand(ccs, "permission player removegroup " + group + " " + player);
return plugin.getServer().dispatchCommand(ccs, "permissions player removegroup " + group + " " + player);
}
@Override
public String[] getPlayerGroups(String world, String player) {
List<String> groupList = new ArrayList<String>();
@ -270,7 +270,7 @@ public class Permission_PermissionsBukkit extends Permission {
for (Group group : perms.getAllGroups()) {
groupNames.add(group.getName());
}
return groupNames.toArray(new String[0]);
}
}