From 4ad8d362f70835d248fb71f274a05aceb0eaf002 Mon Sep 17 00:00:00 2001 From: Wizjany Date: Sun, 12 Jun 2011 14:36:26 -0400 Subject: [PATCH] Reverted change to use flag --- .../worldguard/bukkit/WorldGuardPlayerListener.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java index a6f3d9d4..4a474075 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java @@ -280,7 +280,8 @@ private void handleBlockLeftClick(PlayerInteractEvent event) { || type == Material.TRAP_DOOR || type == Material.NOTE_BLOCK) { if (!plugin.getGlobalRegionManager().hasBypass(player, world) - && !set.canUse(localPlayer)) { + && !set.allows(DefaultFlag.USE) + && !set.canBuild(localPlayer)) { player.sendMessage(ChatColor.DARK_RED + "You don't have permission to use that in this area."); event.setUseInteractedBlock(Result.DENY); event.setCancelled(true); @@ -417,7 +418,8 @@ private void handleBlockRightClick(PlayerInteractEvent event) { || type == Material.TRAP_DOOR || type == Material.WORKBENCH) { if (!plugin.getGlobalRegionManager().hasBypass(player, world) - && !set.canUse(localPlayer)) { + && !set.allows(DefaultFlag.USE) + && !set.canBuild(localPlayer)) { player.sendMessage(ChatColor.DARK_RED + "You don't have permission to use that in this area."); event.setUseInteractedBlock(Result.DENY); event.setCancelled(true); @@ -570,7 +572,8 @@ private void handlePhysicalInteract(PlayerInteractEvent event) { if (type == Material.STONE_PLATE || type == Material.WOOD_PLATE) { if (!plugin.getGlobalRegionManager().hasBypass(player, world) - && !set.canUse(localPlayer)) { + && !set.allows(DefaultFlag.USE) + && !set.canBuild(localPlayer)) { event.setUseInteractedBlock(Result.DENY); event.setCancelled(true); return;