summaryrefslogtreecommitdiffstats
path: root/src/main/java/net
diff options
context:
space:
mode:
authorEvilSeph <evilseph@unaligned.org>2011-06-09 01:06:24 -0400
committerEvilSeph <evilseph@unaligned.org>2011-06-09 01:06:24 -0400
commit569b1d274699a1a018a217800d6df33bc9a55ec0 (patch)
tree23ac3322139b397d001e1e9dbf56cc5118964637 /src/main/java/net
parent4bdc752acd08c999fb2e8be46519033213b0c690 (diff)
downloadcraftbukkit-569b1d274699a1a018a217800d6df33bc9a55ec0.tar
craftbukkit-569b1d274699a1a018a217800d6df33bc9a55ec0.tar.gz
craftbukkit-569b1d274699a1a018a217800d6df33bc9a55ec0.tar.lz
craftbukkit-569b1d274699a1a018a217800d6df33bc9a55ec0.tar.xz
craftbukkit-569b1d274699a1a018a217800d6df33bc9a55ec0.zip
Made it possible to block punching fire out through PlayerInteract event.
Diffstat (limited to 'src/main/java/net')
-rw-r--r--src/main/java/net/minecraft/server/ItemInWorldManager.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/ItemInWorldManager.java b/src/main/java/net/minecraft/server/ItemInWorldManager.java
index be652eb4..1fd6c75e 100644
--- a/src/main/java/net/minecraft/server/ItemInWorldManager.java
+++ b/src/main/java/net/minecraft/server/ItemInWorldManager.java
@@ -51,7 +51,6 @@ public class ItemInWorldManager {
}
public void dig(int i, int j, int k, int l) {
- this.world.a((EntityHuman) null, i, j, k, l);
this.d = (int) (System.currentTimeMillis() / 50); // CraftBukkit
int i1 = this.world.getTypeId(i, j, k);
@@ -73,6 +72,8 @@ public class ItemInWorldManager {
}
} else {
Block.byId[i1].b(this.world, i, j, k, this.player);
+ // Allow fire punching to be blocked
+ this.world.a((EntityHuman) null, i, j, k, l);
}
// Handle hitting a block