Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2025-02-04 14:31:40 +01:00
Code Issues Projects Releases Wiki Activity

Check event cancellation before playing deny effect for bucket events.

Browse Source
This commit is contained in:
Wizjany 2015-04-05 15:44:43 -04:00
parent a907eb2348
commit 8d7d32a2d2
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -430,8 +430,10 @@ public void onPlayerBucketEmpty(PlayerBucketEmptyEvent event) {
Events.fireToCancel(event, new PlaceBlockEvent(event, create(player), blockAffected.getLocation(), blockMaterial).setAllowed(allowed));
Events.fireToCancel(event, new UseItemEvent(event, create(player), player.getWorld(), item).setAllowed(allowed));
if (event.isCancelled()) {
playDenyEffect(event.getPlayer(), blockAffected.getLocation().add(0.5, 0.5, 0.5));
}
}
@EventHandler(ignoreCancelled = true)
public void onPlayerBucketFill(PlayerBucketFillEvent event) {
@ -448,7 +450,9 @@ public void onPlayerBucketFill(PlayerBucketFillEvent event) {
Events.fireToCancel(event, new BreakBlockEvent(event, create(player), blockAffected).setAllowed(allowed));
Events.fireToCancel(event, new UseItemEvent(event, create(player), player.getWorld(), item).setAllowed(allowed));
playDenyEffect(event.getPlayer(), blockAffected.getLocation().add(0.5, 1, 0.5));
if (event.isCancelled()) {
playDenyEffect(event.getPlayer(), blockAffected.getLocation().add(0.5, 0.5, 0.5));
}
}
// TODO: Handle EntityPortalEnterEvent