Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-11-08 11:59:43 +01:00
Code Issues Projects Releases Wiki Activity

Fixed 1.8 chests not being blocked and future-proofed some other things.

Browse Source
This commit is contained in:
Wizjany 2011-09-21 15:29:45 -04:00
parent a1427e7743
commit b884787377
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java
View File

@ -460,6 +460,8 @@ private void handleBlockLeftClick(PlayerInteractEvent event) {
new BlockBreakBlacklistEvent(plugin.wrapPlayer(player), new BlockBreakBlacklistEvent(plugin.wrapPlayer(player),
toVector(event.getClickedBlock()), toVector(event.getClickedBlock()),
event.getClickedBlock().getTypeId()), false, false)) { event.getClickedBlock().getTypeId()), false, false)) {
event.setUseInteractedBlock(Result.DENY);
event.setUseItemInHand(Result.DENY);
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
@ -590,6 +592,7 @@ private void handleBlockRightClick(PlayerInteractEvent event) {
&& !set.allows(DefaultFlag.CHEST_ACCESS) && !set.allows(DefaultFlag.CHEST_ACCESS)
&& !set.canBuild(localPlayer)) { && !set.canBuild(localPlayer)) {
player.sendMessage(ChatColor.DARK_RED + "You don't have permission to open that in this area."); player.sendMessage(ChatColor.DARK_RED + "You don't have permission to open that in this area.");
event.setUseInteractedBlock(Result.DENY);
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
@ -630,6 +633,7 @@ private void handleBlockRightClick(PlayerInteractEvent event) {
&& !set.canBuild(localPlayer) && !set.canBuild(localPlayer)
&& !set.allows(DefaultFlag.PLACE_VEHICLE)) { && !set.allows(DefaultFlag.PLACE_VEHICLE)) {
player.sendMessage(ChatColor.DARK_RED + "You don't have permission to place vehicles here."); player.sendMessage(ChatColor.DARK_RED + "You don't have permission to place vehicles here.");
event.setUseItemInHand(Result.DENY);
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
@ -640,6 +644,7 @@ private void handleBlockRightClick(PlayerInteractEvent event) {
&& !set.canBuild(localPlayer) && !set.canBuild(localPlayer)
&& !set.allows(DefaultFlag.PLACE_VEHICLE)) { && !set.allows(DefaultFlag.PLACE_VEHICLE)) {
player.sendMessage(ChatColor.DARK_RED + "You don't have permission to place vehicles here."); player.sendMessage(ChatColor.DARK_RED + "You don't have permission to place vehicles here.");
event.setUseItemInHand(Result.DENY);
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
@ -677,6 +682,7 @@ private void handleBlockRightClick(PlayerInteractEvent event) {
if (wcfg.isChestProtected(block, player)) { if (wcfg.isChestProtected(block, player)) {
player.sendMessage(ChatColor.DARK_RED + "The chest is protected."); player.sendMessage(ChatColor.DARK_RED + "The chest is protected.");
event.setUseInteractedBlock(Result.DENY);
event.setCancelled(true); event.setCancelled(true);
return; return;
} }