Azimkin/Bukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wrong useItemInHand setting

Browse Source
This commit is contained in:
Erik Broes 2011-03-24 22:50:12 +01:00
parent 2916cba631
commit 5141b7fe10
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/bukkit/event/player/PlayerInteractEvent.java
View File

@ -30,7 +30,7 @@ public class PlayerInteractEvent extends PlayerEvent implements Cancellable {
this.blockClicked = clickedBlock; this.blockClicked = clickedBlock;
this.blockFace = clickedFace; this.blockFace = clickedFace;
useItemInHand = item == null ? Result.DENY : Result.DEFAULT; useItemInHand = Result.DEFAULT;
useClickedBlock = clickedBlock == null ? Result.DENY : Result.ALLOW; useClickedBlock = clickedBlock == null ? Result.DENY : Result.ALLOW;
} }
@ -65,6 +65,7 @@ public class PlayerInteractEvent extends PlayerEvent implements Cancellable {
*/ */
public void setCancelled(boolean cancel) { public void setCancelled(boolean cancel) {
setUseInteractedBlock(cancel ? Result.DENY : useInteractedBlock() == Result.DENY ? Result.DEFAULT : useInteractedBlock()); setUseInteractedBlock(cancel ? Result.DENY : useInteractedBlock() == Result.DENY ? Result.DEFAULT : useInteractedBlock());
setUseItemInHand(cancel ? Result.DENY : useItemInHand() == Result.DENY ? Result.DEFAULT : useItemInHand());
} }
/** /**