summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/Explosion.java
diff options
context:
space:
mode:
authorYariv Livay <yarivlivay@gmail.com>2013-03-17 22:46:48 +0200
committerTravis Watkins <amaranth@ubuntu.com>2013-03-18 12:47:01 -0500
commita7a5f273e3765a819f7d2ac71b4be4dbd28f9db4 (patch)
treecc24b480e39c5346abb8d6c6632b318bb6cba23c /src/main/java/net/minecraft/server/Explosion.java
parent2e6cfdb3cc9147d49c050dbd21a6ae37c3a916dd (diff)
downloadcraftbukkit-a7a5f273e3765a819f7d2ac71b4be4dbd28f9db4.tar
craftbukkit-a7a5f273e3765a819f7d2ac71b4be4dbd28f9db4.tar.gz
craftbukkit-a7a5f273e3765a819f7d2ac71b4be4dbd28f9db4.tar.lz
craftbukkit-a7a5f273e3765a819f7d2ac71b4be4dbd28f9db4.tar.xz
craftbukkit-a7a5f273e3765a819f7d2ac71b4be4dbd28f9db4.zip
Implement new cause versions of BlockIgniteEvent. Addresses BUKKIT-3609, BUKKIT-3656, BUKKIT-3657
Diffstat (limited to 'src/main/java/net/minecraft/server/Explosion.java')
-rw-r--r--src/main/java/net/minecraft/server/Explosion.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
index aa3ae585..50646cef 100644
--- a/src/main/java/net/minecraft/server/Explosion.java
+++ b/src/main/java/net/minecraft/server/Explosion.java
@@ -290,7 +290,10 @@ public class Explosion {
int i1 = this.world.getTypeId(i, j - 1, k);
if (l == 0 && Block.s[i1] && this.j.nextInt(3) == 0) {
- this.world.setTypeIdUpdate(i, j, k, Block.FIRE.id);
+ // CraftBukkit start - ignition by explosion.
+ if (!org.bukkit.craftbukkit.event.CraftEventFactory.callBlockIgniteEvent(this.world, i, j, k, this).isCancelled()) {
+ this.world.setTypeIdUpdate(i, j, k, Block.FIRE.id);
+ } // CraftBukkit end
}
}
}