From 627de1aebd48458f62655cfd69dcefea04493227 Mon Sep 17 00:00:00 2001 From: sk89q Date: Wed, 19 Jan 2011 22:09:15 -0800 Subject: [PATCH] Changed how the player item event was handled. --- .../worldguard/bukkit/WorldGuardPlayerListener.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java b/src/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java index b38ad379..1ac5a439 100644 --- a/src/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java +++ b/src/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java @@ -117,8 +117,9 @@ public void onPlayerQuit(PlayerEvent event) { public void onPlayerItem(PlayerItemEvent event) { Player player = event.getPlayer(); Block block = event.getBlockClicked(); + ItemStack item = event.getItem(); - if (plugin.useRegions && !event.isBlock() && event.getBlockClicked() != null) { + if (plugin.useRegions && !event.isBlock() && block != null) { Vector pt = toVector(block.getRelative(event.getBlockFace())); LocalPlayer localPlayer = plugin.wrapPlayer(player); @@ -131,10 +132,11 @@ public void onPlayerItem(PlayerItemEvent event) { } } - if (block != null && plugin.blacklist != null) { + if (item != null && plugin.blacklist != null && block != null) { if (!plugin.blacklist.check( - new ItemUseBlacklistEvent(plugin.wrapPlayer(player), toVector(block), - block.getTypeId()), false, false)) { + new ItemUseBlacklistEvent(plugin.wrapPlayer(player), + toVector(block.getRelative(event.getBlockFace())), + item.getTypeId()), false, false)) { event.setCancelled(true); return; }