Upstream/Vault
1
0
Fork 0
mirror of https://github.com/MilkBowl/Vault.git synced 2024-11-27 13:07:23 +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-08-25 08:56:41 -07:00
commit e067542691
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/net/milkbowl/vault/permission/plugins/Permission_bPermissions2.java
View File

@ -21,6 +21,8 @@ import java.util.Set;
import net.milkbowl.vault.permission.Permission; import net.milkbowl.vault.permission.Permission;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
@ -89,6 +91,30 @@ public class Permission_bPermissions2 extends Permission {
} }
@Override @Override
public boolean has(Player player, String permission) {
return playerHas(player.getWorld().getName(), player.getName(), permission);
}
@Override
public boolean has(String world, String player, String permission) {
return playerHas(world, player, permission);
}
@Override
public boolean has(CommandSender sender, String permission) {
if(sender instanceof Player) {
Player player = (Player) sender;
return has(player, permission);
}
return sender.hasPermission(permission);
}
@Override
public boolean has(org.bukkit.World world, String player, String permission) {
return playerHas(world.getName(), player, permission);
}
@Override
public boolean playerHas(String world, String player, String permission) { public boolean playerHas(String world, String player, String permission) {
return ApiLayer.hasPermission(world, CalculableType.USER, player, permission); return ApiLayer.hasPermission(world, CalculableType.USER, player, permission);
} }