diff options
| author | EvilSeph <evilseph@unaligned.org> | 2011-06-10 18:34:12 -0400 |
|---|---|---|
| committer | EvilSeph <evilseph@unaligned.org> | 2011-06-10 19:59:31 -0400 |
| commit | 80770314d8b8176720c9f354fbaa22722d3eee07 (patch) | |
| tree | c0bd6afccdef5dce14b389cd43c112b9a5e24ea7 /src/main/java/net/minecraft | |
| parent | a9e7b56ef26df7dbe63e65d054b82b37e5abf046 (diff) | |
| download | craftbukkit-80770314d8b8176720c9f354fbaa22722d3eee07.tar craftbukkit-80770314d8b8176720c9f354fbaa22722d3eee07.tar.gz craftbukkit-80770314d8b8176720c9f354fbaa22722d3eee07.tar.lz craftbukkit-80770314d8b8176720c9f354fbaa22722d3eee07.tar.xz craftbukkit-80770314d8b8176720c9f354fbaa22722d3eee07.zip | |
Fixed fireball explosions not producing fire.
Diffstat (limited to 'src/main/java/net/minecraft')
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityFireball.java | 2 | ||||
| -rw-r--r-- | src/main/java/net/minecraft/server/Explosion.java | 3 |
2 files changed, 3 insertions, 2 deletions
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); |