summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/Explosion.java
diff options
context:
space:
mode:
authorWesley Wolfe <weswolf@aol.com>2013-04-24 03:03:38 -0500
committerWesley Wolfe <weswolf@aol.com>2013-04-24 03:03:38 -0500
commit83c3aa188bbde405f584f7b66e4fe5cab90aff35 (patch)
tree82989bb58a863d2aacc2785319f1d99472863ca4 /src/main/java/net/minecraft/server/Explosion.java
parent708b0e6ae1fc3b545fc423ebe5eb9cdb67be7efb (diff)
downloadcraftbukkit-83c3aa188bbde405f584f7b66e4fe5cab90aff35.tar
craftbukkit-83c3aa188bbde405f584f7b66e4fe5cab90aff35.tar.gz
craftbukkit-83c3aa188bbde405f584f7b66e4fe5cab90aff35.tar.lz
craftbukkit-83c3aa188bbde405f584f7b66e4fe5cab90aff35.tar.xz
craftbukkit-83c3aa188bbde405f584f7b66e4fe5cab90aff35.zip
Rework EntityExplodeEvent. Fixes BUKKIT-4140. Adds BUKKIT-4141
Diffstat (limited to 'src/main/java/net/minecraft/server/Explosion.java')
-rw-r--r--src/main/java/net/minecraft/server/Explosion.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
index b43953a0..ef220c1f 100644
--- a/src/main/java/net/minecraft/server/Explosion.java
+++ b/src/main/java/net/minecraft/server/Explosion.java
@@ -262,13 +262,11 @@ public class Explosion {
this.world.addParticle("smoke", d0, d1, d2, d3, d4, d5);
}
-
- // CraftBukkit - stop explosions from putting out fire
- if (l > 0 && l != Block.FIRE.id) {
+ if (l > 0) {
Block block = Block.byId[l];
if (block.a(this)) {
- // CraftBukkit
+ // CraftBukkit - add yield
block.dropNaturally(this.world, i, j, k, this.world.getData(i, j, k), event.getYield(), 0);
}