diff options
| author | Erik Broes <erikbroes@grum.nl> | 2011-03-24 22:50:12 +0100 |
|---|---|---|
| committer | Erik Broes <erikbroes@grum.nl> | 2011-03-24 22:50:12 +0100 |
| commit | 5141b7fe10b6e8e50aef22b88d09860a4c7c6077 (patch) | |
| tree | c96c299f38e5e1283866bed810a0263e77613575 /src | |
| parent | 2916cba6318f104c9da0abf7232f9464ea111385 (diff) | |
| download | bukkit-5141b7fe10b6e8e50aef22b88d09860a4c7c6077.tar bukkit-5141b7fe10b6e8e50aef22b88d09860a4c7c6077.tar.gz bukkit-5141b7fe10b6e8e50aef22b88d09860a4c7c6077.tar.lz bukkit-5141b7fe10b6e8e50aef22b88d09860a4c7c6077.tar.xz bukkit-5141b7fe10b6e8e50aef22b88d09860a4c7c6077.zip | |
Fix wrong useItemInHand setting
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/org/bukkit/event/player/PlayerInteractEvent.java | 3 |
1 files changed, 2 insertions, 1 deletions
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()); } /** |