From a665e860969cb352a7ece23118a47509b207854a Mon Sep 17 00:00:00 2001 From: Yetanotherx Date: Sat, 30 Apr 2011 12:26:39 -0400 Subject: [PATCH] Don't deny placing a blacklisted item if the block clicked is a chest. People often complain that "i was just trying to open my chest" when they were holding water. --- .../bukkit/WorldGuardPlayerListener.java | 31 ++++++++++++------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/src/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java b/src/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java index c6fe8b84..b7b95a53 100644 --- a/src/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java +++ b/src/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java @@ -301,19 +301,26 @@ public void handleBlockRightClick(PlayerInteractEvent event) { } if (wcfg.getBlacklist() != null) { - if (!wcfg.getBlacklist().check( - new ItemUseBlacklistEvent(plugin.wrapPlayer(player), toVector(block), - item.getTypeId()), false, false)) { - event.setCancelled(true); - return; - } - - if (!wcfg.getBlacklist().check( - new BlockInteractBlacklistEvent(plugin.wrapPlayer(player), toVector(block), - block.getTypeId()), false, false)) { - event.setCancelled(true); - return; + if((block.getType() != Material.CHEST + && block.getType() != Material.DISPENSER + && block.getType() != Material.FURNACE + && block.getType() != Material.BURNING_FURNACE)) { + if (!wcfg.getBlacklist().check( + new ItemUseBlacklistEvent(plugin.wrapPlayer(player), toVector(block), + item.getTypeId()), false, false)) { + event.setCancelled(true); + return; + } + + if (!wcfg.getBlacklist().check( + new BlockInteractBlacklistEvent(plugin.wrapPlayer(player), toVector(block), + block.getTypeId()), false, false)) { + event.setCancelled(true); + return; + } + } + } if ((block.getType() == Material.CHEST