Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-09-30 07:37:31 +02:00
Code Issues Projects Releases Wiki Activity

Ignore sneaking when checking the events.

Browse Source
This commit is contained in:
sk89q 2014-08-25 00:29:37 -07:00
parent 992e53856d
commit b52a6bd6d6
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java
View File

@ -329,20 +329,17 @@ public void onPlayerInteract(PlayerInteractEvent event) {
case LEFT_CLICK_BLOCK: case LEFT_CLICK_BLOCK:
placed = clicked.getRelative(event.getBlockFace()); placed = clicked.getRelative(event.getBlockFace());
// As of MC ~1.6, sneaking blocks the use of blocks with right click // Only fire events for blocks that are modified when right clicked
if (!player.isSneaking() || event.getAction() == Action.LEFT_CLICK_BLOCK) { if (isBlockModifiedOnClick(clicked.getType()) || (item != null && isItemAppliedToBlock(item.getType(), clicked.getType()))) {
// Only fire events for blocks that are modified when right clicked if (Events.fireAndTestCancel(new UseBlockEvent(event, cause, clicked))) {
if (isBlockModifiedOnClick(clicked.getType()) || (item != null && isItemAppliedToBlock(item.getType(), clicked.getType()))) { event.setUseInteractedBlock(Result.DENY);
if (Events.fireAndTestCancel(new UseBlockEvent(event, cause, clicked))) { }
event.setUseInteractedBlock(Result.DENY);
}
// Handle connected blocks (i.e. beds, chests) // Handle connected blocks (i.e. beds, chests)
for (Block connected : Blocks.getConnected(clicked)) { for (Block connected : Blocks.getConnected(clicked)) {
if (Events.fireAndTestCancel(new UseBlockEvent(event, create(event.getPlayer()), connected))) { if (Events.fireAndTestCancel(new UseBlockEvent(event, create(event.getPlayer()), connected))) {
event.setUseInteractedBlock(Result.DENY); event.setUseInteractedBlock(Result.DENY);
break; break;
}
} }
} }
} }