diff options
| author | Erik Broes <erikbroes@grum.nl> | 2011-06-12 00:02:58 +0200 |
|---|---|---|
| committer | Erik Broes <erikbroes@grum.nl> | 2011-06-12 00:30:52 +0200 |
| commit | 96b1b8a10cec88c724b83541aed6f87b188f5e14 (patch) | |
| tree | 7058be20c6adb15cad2c823784b04340b1b1e44f /src/main/java/net/minecraft/server/EntityFireball.java | |
| parent | 938db4de2d86d8cc05c258eeae2c43ef428588f3 (diff) | |
| download | craftbukkit-96b1b8a10cec88c724b83541aed6f87b188f5e14.tar craftbukkit-96b1b8a10cec88c724b83541aed6f87b188f5e14.tar.gz craftbukkit-96b1b8a10cec88c724b83541aed6f87b188f5e14.tar.lz craftbukkit-96b1b8a10cec88c724b83541aed6f87b188f5e14.tar.xz craftbukkit-96b1b8a10cec88c724b83541aed6f87b188f5e14.zip | |
Generic cleanup
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityFireball.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityFireball.java | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/main/java/net/minecraft/server/EntityFireball.java b/src/main/java/net/minecraft/server/EntityFireball.java index 145d2d1c..3b63884c 100644 --- a/src/main/java/net/minecraft/server/EntityFireball.java +++ b/src/main/java/net/minecraft/server/EntityFireball.java @@ -149,16 +149,17 @@ public class EntityFireball extends Entity { } } - CraftServer server = ((WorldServer) this.world).getServer(); - - 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 - this.world.createExplosion(this, this.locX, this.locY, this.locZ, event.getRadius(), event.getFire()); - this.die(); - } - // CraftBukkit end + CraftServer server = ((WorldServer) this.world).getServer(); + + 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 + this.world.createExplosion(this, this.locX, this.locY, this.locZ, event.getRadius(), event.getFire()); + this.die(); + } + // CraftBukkit end } // this.die() // # CraftBukkit |