update to bukkit 1.7.9-R0.1-SNAPSHOT for building. add placeholder UUID

methods in Permission layer.
This commit is contained in:
Nick Minkler 2014-05-02 20:39:00 -07:00
parent b75d0ef290
commit 24f2b98eba
3 changed files with 165 additions and 2 deletions

Binary file not shown.

View File

@ -14,7 +14,7 @@ Vault currently supports the following: Permissions 3, PEX, GroupManager, bPerms
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<bukkitVersion>1.7.2-R0.3</bukkitVersion>
<bukkitVersion>1.7.9-R0.1-SNAPSHOT</bukkitVersion>
<mainClass>net.milkbowl.vault.Vault</mainClass>
</properties>

View File

@ -15,8 +15,10 @@
*/
package net.milkbowl.vault.permission;
import java.util.UUID;
import java.util.logging.Logger;
import org.bukkit.Bukkit;
import org.bukkit.World;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
@ -138,6 +140,21 @@ public abstract class Permission {
return playerHas(world.getName(), player, permission);
}
/**
* Checks if player has a permission node.
*
* @param world World Object
* @param playerId UUID of the player
* @param permission Permission node
* @return Success or Failure
*/
public boolean playerHas(World world, UUID playerId, String permission) {
if (world == null) {
return has((String) null, Bukkit.getOfflinePlayer(playerId).getName(), permission);
}
return has(world.getName(), Bukkit.getOfflinePlayer(playerId).getName(), permission);
}
/**
* Checks if player has a permission node.
* @param player Player Object
@ -177,6 +194,23 @@ public abstract class Permission {
return playerAdd(world.getName(), player, permission);
}
/**
* Add permission to a player.
* Supports NULL value for World if the permission system registered supports global permissions.
* But May return odd values if the servers registered permission system does not have a global permission store.
*
* @param world World Object
* @param playerId UUId of the player
* @param permission Permission node
* @return Success or Failure
*/
public boolean playerAdd(World world, UUID playerId, String permission) {
if (world == null) {
return playerAdd((String) null, Bukkit.getOfflinePlayer(playerId).getName(), permission);
}
return playerAdd(world.getName(), Bukkit.getOfflinePlayer(playerId).getName(), permission);
}
/**
* Add permission to a player ONLY for the world the player is currently on.
* This is a world-specific operation, if you want to add global permission you must explicitly use NULL for the world.
@ -207,6 +241,23 @@ public abstract class Permission {
return playerAddTransient(p, permission);
}
/**
* Add transient permission to a player.
* This implementation can be used by any subclass which implements a "pure" superperms plugin, i.e.
* one that only needs the built-in Bukkit API to add transient permissions to a player.
*
* @param UUID playerId
* @param permission Permission node
* @return Success or Failure
*/
public boolean playerAddTransient(UUID playerId, String permission) throws UnsupportedOperationException {
Player p = plugin.getServer().getPlayer(playerId);
if (p == null) {
throw new UnsupportedOperationException(getName() + " does not support offline player transient permissions!");
}
return playerAddTransient(p, permission);
}
/**
* Add transient permission to a player.
* This operation adds a world-unspecific permission onto the player object in bukkit via Bukkit's permission interface.
@ -229,6 +280,18 @@ public abstract class Permission {
return true;
}
/**
* Adds a world specific transient permission to the player - ONLY WORKS IN PEX/P3 - otherwise it defaults to GLOBAL!
*
* @param worldName
* @param playerId
* @param permission
* @return Success or Failure
*/
public boolean playerAddTransient(String worldName, UUID playerId, String permission) {
return playerAddTransient(playerId, permission);
}
/**
* Adds a world specific transient permission to the player - ONLY WORKS IN PEX/P3 - otherwise it defaults to GLOBAL!
* @param worldName
@ -270,6 +333,17 @@ public abstract class Permission {
return playerRemoveTransient(p, permission);
}
/**
* Removes a world specific transient permission from the player - Only works in PEX/P3 - otherwise it defaults to Global!
* @param worldName
* @param playerId
* @param permission
* @return Success or Failure
*/
public boolean playerRemoveTransient(String worldName, UUID playerId, String permission) {
return playerRemoveTransient(playerId, permission);
}
/**
* Removes a world specific transient permission from the player - Only works in PEX/P3 - otherwise it defaults to Global!
* @param worldName
@ -337,6 +411,18 @@ public abstract class Permission {
return playerRemoveTransient(p, permission);
}
/**
* Remove transient permission from a player.
*
* @param UUID playerId
* @param permission Permission node
* @return Success or Failure
*/
public boolean playerRemoveTransient(UUID playerId, String permission) {
return playerRemoveTransient(Bukkit.getPlayer(playerId), permission);
}
/**
* Remove transient permission from a player.
*
@ -473,6 +559,23 @@ public abstract class Permission {
return playerInGroup(world.getName(), player, group);
}
/**
* Check if player is member of a group.
* Supports NULL value for World if the permission system registered supports global permissions.
* But May return odd values if the servers registered permission system does not have a global permission store.
*
* @param world World Object
* @param playerId UUID
* @param group Group name
* @return Success or Failure
*/
public boolean playerInGroup(World world, UUID playerId, String group) {
if (world == null) {
return playerInGroup((String) null, Bukkit.getOfflinePlayer(playerId).getName(), group);
}
return playerInGroup(world.getName(), Bukkit.getOfflinePlayer(playerId).getName(), group);
}
/**
* Check if player is member of a group.
* This method will ONLY check groups for which the player is in that are defined for the current world.
@ -515,6 +618,23 @@ public abstract class Permission {
return playerAddGroup(world.getName(), player, group);
}
/**
* Add player to a group.
* Supports NULL value for World if the permission system registered supports global permissions.
* But May return odd values if the servers registered permission system does not have a global permission store.
*
* @param world World Object
* @param playerId UUID
* @param group Group name
* @return Success or Failure
*/
public boolean playerAddGroup(World world, UUID playerId, String group) {
if (world == null) {
return playerAddGroup((String) null, Bukkit.getOfflinePlayer(playerId).getName(), group);
}
return playerAddGroup(world.getName(), Bukkit.getOfflinePlayer(playerId).getName(), group);
}
/**
* Add player to a group.
* This will add a player to the group on the current World. This may return odd results if the permission system
@ -557,6 +677,23 @@ public abstract class Permission {
return playerRemoveGroup(world.getName(), player, group);
}
/**
* Remove player from a group.
* Supports NULL value for World if the permission system registered supports global permissions.
* But May return odd values if the servers registered permission system does not have a global permission store.
*
* @param world World Object
* @param playerId UUID
* @param group Group name
* @return Success or Failure
*/
public boolean playerRemoveGroup(World world, UUID playerId, String group) {
if (world == null) {
return playerRemoveGroup((String) null, Bukkit.getOfflinePlayer(playerId).getName(), group);
}
return playerRemoveGroup(world.getName(), Bukkit.getOfflinePlayer(playerId).getName(), group);
}
/**
* Remove player from a group.
* This will add a player to the group on the current World. This may return odd results if the permission system
@ -597,6 +734,19 @@ public abstract class Permission {
return getPlayerGroups(world.getName(), player);
}
/**
* Gets the list of groups that this player has
* Supports NULL value for World if the permission system registered supports global permissions.
* But May return odd values if the servers registered permission system does not have a global permission store.
*
* @param world World Object
* @param playerId UUID
* @return Array of groups
*/
public String[] getPlayerGroups(World world, UUID playerId) {
return getPlayerGroups(world, Bukkit.getOfflinePlayer(playerId).getName());
}
/**
* Returns a list of world-specific groups that this player is currently in. May return unexpected results if
* you are looking for global groups, or if the registered permission system does not support world-specific groups.
@ -635,6 +785,19 @@ public abstract class Permission {
return getPrimaryGroup(world.getName(), player);
}
/**
* Gets players primary group
* Supports NULL value for World if the permission system registered supports global permissions.
* But May return odd values if the servers registered permission system does not have a global permission store.
*
* @param world World Object
* @param player Player name
* @return Players primary group
*/
public String getPrimaryGroup(World world, UUID playerId) {
return getPrimaryGroup(world, Bukkit.getOfflinePlayer(playerId).getName());
}
/**
* Get players primary group
* @param player Player Object