From c51e8f2f5487f493a1b26f49dc205e8b2df2661c Mon Sep 17 00:00:00 2001 From: Bukkit/Spigot Date: Thu, 24 Mar 2011 22:50:12 +0100 Subject: [PATCH] Fix wrong useItemInHand setting By: Erik Broes --- .../main/java/org/bukkit/event/player/PlayerInteractEvent.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/paper-api/src/main/java/org/bukkit/event/player/PlayerInteractEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerInteractEvent.java index c3a1f498aa..dcb8b941bb 100644 --- a/paper-api/src/main/java/org/bukkit/event/player/PlayerInteractEvent.java +++ b/paper-api/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()); } /**