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.

This commit is contained in:
Yetanotherx 2011-04-30 12:26:39 -04:00
parent b7481dbd2e
commit a665e86096

View File

@ -301,19 +301,26 @@ public void handleBlockRightClick(PlayerInteractEvent event) {
} }
if (wcfg.getBlacklist() != null) { if (wcfg.getBlacklist() != null) {
if (!wcfg.getBlacklist().check( if((block.getType() != Material.CHEST
new ItemUseBlacklistEvent(plugin.wrapPlayer(player), toVector(block), && block.getType() != Material.DISPENSER
item.getTypeId()), false, false)) { && block.getType() != Material.FURNACE
event.setCancelled(true); && block.getType() != Material.BURNING_FURNACE)) {
return; if (!wcfg.getBlacklist().check(
} new ItemUseBlacklistEvent(plugin.wrapPlayer(player), toVector(block),
item.getTypeId()), false, false)) {
if (!wcfg.getBlacklist().check( event.setCancelled(true);
new BlockInteractBlacklistEvent(plugin.wrapPlayer(player), toVector(block), return;
block.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 if ((block.getType() == Material.CHEST