From 5141b7fe10b6e8e50aef22b88d09860a4c7c6077 Mon Sep 17 00:00:00 2001 From: Erik Broes Date: Thu, 24 Mar 2011 22:50:12 +0100 Subject: Fix wrong useItemInHand setting --- src/main/java/org/bukkit/event/player/PlayerInteractEvent.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/main/java/org/bukkit/event/player/PlayerInteractEvent.java b/src/main/java/org/bukkit/event/player/PlayerInteractEvent.java index c3a1f498..dcb8b941 100644 --- a/src/main/java/org/bukkit/event/player/PlayerInteractEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerInteractEvent.java @@ -30,7 +30,7 @@ public class PlayerInteractEvent extends PlayerEvent implements Cancellable { this.blockClicked = clickedBlock; this.blockFace = clickedFace; - useItemInHand = item == null ? Result.DENY : Result.DEFAULT; + useItemInHand = Result.DEFAULT; useClickedBlock = clickedBlock == null ? Result.DENY : Result.ALLOW; } @@ -65,6 +65,7 @@ public class PlayerInteractEvent extends PlayerEvent implements Cancellable { */ public void setCancelled(boolean cancel) { setUseInteractedBlock(cancel ? Result.DENY : useInteractedBlock() == Result.DENY ? Result.DEFAULT : useInteractedBlock()); + setUseItemInHand(cancel ? Result.DENY : useItemInHand() == Result.DENY ? Result.DEFAULT : useItemInHand()); } /** -- cgit v1.2.3