From cdbd318bb5bad2c6941377a1d64f42f074c93df2 Mon Sep 17 00:00:00 2001 From: sunkid Date: Thu, 15 Sep 2011 11:07:40 -0700 Subject: [PATCH] Fixed missing PlayerInteractEvent call in creative mode --- .../java/net/minecraft/server/ItemInWorldManager.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/minecraft/server/ItemInWorldManager.java b/src/main/java/net/minecraft/server/ItemInWorldManager.java index dc575f4420..674f8ee9cf 100644 --- a/src/main/java/net/minecraft/server/ItemInWorldManager.java +++ b/src/main/java/net/minecraft/server/ItemInWorldManager.java @@ -82,20 +82,23 @@ public class ItemInWorldManager { public void dig(int i, int j, int k, int l) { // this.world.douseFire((EntityHuman) null, i, j, k, l); // CraftBukkit - moved down + // CraftBukkit start + PlayerInteractEvent event = CraftEventFactory.callPlayerInteractEvent(this.player, Action.LEFT_CLICK_BLOCK, i, j, k, l, this.player.inventory.getItemInHand()); + if (this.b()) { + if (event.isCancelled()) { + return; + } this.c(i, j, k); } else { this.lastDigTick = (int) (System.currentTimeMillis() / 50); // CraftBukkit int i1 = this.world.getTypeId(i, j, k); - // CraftBukkit start // Swings at air do *NOT* exist. if (i1 <= 0) { return; } - PlayerInteractEvent event = CraftEventFactory.callPlayerInteractEvent(this.player, Action.LEFT_CLICK_BLOCK, i, j, k, l, this.player.inventory.getItemInHand()); - if (event.useInteractedBlock() == Event.Result.DENY) { // If we denied a door from opening, we need to send a correcting update to the client, as it already opened the door. if (i1 == Block.WOODEN_DOOR.id) {