From 80770314d8b8176720c9f354fbaa22722d3eee07 Mon Sep 17 00:00:00 2001 From: EvilSeph Date: Fri, 10 Jun 2011 18:34:12 -0400 Subject: Fixed fireball explosions not producing fire. --- src/main/java/net/minecraft/server/EntityFireball.java | 2 +- src/main/java/net/minecraft/server/Explosion.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src/main') diff --git a/src/main/java/net/minecraft/server/EntityFireball.java b/src/main/java/net/minecraft/server/EntityFireball.java index c8f0de09..145d2d1c 100644 --- a/src/main/java/net/minecraft/server/EntityFireball.java +++ b/src/main/java/net/minecraft/server/EntityFireball.java @@ -151,7 +151,7 @@ public class EntityFireball extends Entity { CraftServer server = ((WorldServer) this.world).getServer(); - ExplosionPrimeEvent event = new ExplosionPrimeEvent(CraftEntity.getEntity(server, this), 1.0F, false); + ExplosionPrimeEvent event = new ExplosionPrimeEvent(CraftEntity.getEntity(server, this), 1.0F, true); server.getPluginManager().callEvent(event); if (!event.isCancelled()) { // give 'this' instead of (Entity) null so we know what causes the damage diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java index d7adddff..6566ca5a 100644 --- a/src/main/java/net/minecraft/server/Explosion.java +++ b/src/main/java/net/minecraft/server/Explosion.java @@ -239,7 +239,8 @@ public class Explosion { this.world.a("smoke", d0, d1, d2, d3, d4, d5); } - if (i1 > 0) { + // CraftBukkit - stop explosions from putting out fire + if (i1 > 0 && i1 != Block.FIRE.id) { // CraftBukkit Block.byId[i1].dropNaturally(this.world, j, k, l, this.world.getData(j, k, l), event.getYield()); this.world.setTypeId(j, k, l, 0); -- cgit v1.2.3