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

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

@ -63,7 +63,7 @@ public class EventListener implements Listener {
plugin.unSitPlayer(player); plugin.unSitPlayer(player);
} }
} }
@EventHandler @EventHandler
public void onPlayerInteract(PlayerInteractEvent event) { public void onPlayerInteract(PlayerInteractEvent event) {
Player player = event.getPlayer(); Player player = event.getPlayer();
@ -79,9 +79,9 @@ public class EventListener implements Listener {
Block block = event.getClickedBlock(); Block block = event.getClickedBlock();
if (sitAllowed(player, block)) if (sitAllowed(player, block))
{ {
event.setCancelled(true);
Location sitLocation = getSitLocation(block, player.getLocation().getYaw()); Location sitLocation = getSitLocation(block, player.getLocation().getYaw());
sitPlayer(player, sitLocation); sitPlayer(player, sitLocation);
event.setCancelled(true);
} }
} }
} }
@ -114,15 +114,18 @@ public class EventListener implements Listener {
continue; continue;
} }
} }
if (blockOkay || if (
( player.hasPermission("chairs.sit." + block.getTypeId() + ":" + block.getData()) ||
player.hasPermission("chairs.sit." + block.getTypeId() + ":" + block.getData()) || player.hasPermission("chairs.sit." + block.getType().toString() + ":" + block.getData()) ||
player.hasPermission("chairs.sit." + block.getType().toString() + ":" + block.getData()) || player.hasPermission("chairs.sit." + block.getTypeId()) ||
player.hasPermission("chairs.sit." + block.getTypeId()) || player.hasPermission("chairs.sit." + block.getType().toString())
player.hasPermission("chairs.sit." + block.getType().toString()) ) {
) blockOkay = true;
) { }
if (blockOkay) {
System.out.println("block is okay");
if (block.getState().getData() instanceof Stairs) { if (block.getState().getData() instanceof Stairs) {
stairs = (Stairs) block.getState().getData(); stairs = (Stairs) block.getState().getData();
} else if (block.getState().getData() instanceof Step) { } else if (block.getState().getData() instanceof Step) {