Rework EntityExplodeEvent. Fixes BUKKIT-4140. Adds BUKKIT-4141

2013-04-24 03:03:38 -05:00
parent 708b0e6ae1
commit 83c3aa188b
3 changed files with 24 additions and 22 deletions
--- 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);
                    }