PandacubeFr/ChairsReloaded
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move additional permission check

Browse Source
This commit is contained in:
Shevchik 2013-09-30 13:01:20 +04:00
parent e86a0ccbae
commit b420e44ff8
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/com/cnaude/chairs/EventListener.java
View File

@ -79,9 +79,9 @@ public class EventListener implements Listener {
Block block = event.getClickedBlock();
if (sitAllowed(player, block))
{
event.setCancelled(true);
Location sitLocation = getSitLocation(block, player.getLocation().getYaw());
sitPlayer(player, sitLocation);
event.setCancelled(true);
}
}
}
@ -114,14 +114,17 @@ public class EventListener implements Listener {
continue;
}
}
if (blockOkay ||
(
player.hasPermission("chairs.sit." + block.getTypeId() + ":" + block.getData()) ||
player.hasPermission("chairs.sit." + block.getType().toString() + ":" + block.getData()) ||
player.hasPermission("chairs.sit." + block.getTypeId()) ||
player.hasPermission("chairs.sit." + block.getType().toString())
)
) {
if (
player.hasPermission("chairs.sit." + block.getTypeId() + ":" + block.getData()) ||
player.hasPermission("chairs.sit." + block.getType().toString() + ":" + block.getData()) ||
player.hasPermission("chairs.sit." + block.getTypeId()) ||
player.hasPermission("chairs.sit." + block.getType().toString())
) {
blockOkay = true;
}
if (blockOkay) {
System.out.println("block is okay");
if (block.getState().getData() instanceof Stairs) {
stairs = (Stairs) block.getState().getData();