diff options
| author | Erik Broes <erikbroes@grum.nl> | 2011-05-14 16:29:42 +0200 |
|---|---|---|
| committer | Erik Broes <erikbroes@grum.nl> | 2011-05-15 13:41:46 +0200 |
| commit | 309846d732849b68e382c53bf3a0d7a6dfd82579 (patch) | |
| tree | 020932a024cd2fb20895f5834a2bde7dbdfea583 /src/main/java/net/minecraft/server/EntityWeatherStorm.java | |
| parent | e54d8c33529b9495b9ca1a610dc2ff9fc5ac84b5 (diff) | |
| download | craftbukkit-309846d732849b68e382c53bf3a0d7a6dfd82579.tar craftbukkit-309846d732849b68e382c53bf3a0d7a6dfd82579.tar.gz craftbukkit-309846d732849b68e382c53bf3a0d7a6dfd82579.tar.lz craftbukkit-309846d732849b68e382c53bf3a0d7a6dfd82579.tar.xz craftbukkit-309846d732849b68e382c53bf3a0d7a6dfd82579.zip | |
Whitespace + general cleanup
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityWeatherStorm.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityWeatherStorm.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/main/java/net/minecraft/server/EntityWeatherStorm.java b/src/main/java/net/minecraft/server/EntityWeatherStorm.java index cacb06ea..b92fd4ac 100644 --- a/src/main/java/net/minecraft/server/EntityWeatherStorm.java +++ b/src/main/java/net/minecraft/server/EntityWeatherStorm.java @@ -39,9 +39,8 @@ public class EntityWeatherStorm extends EntityWeather { this.b = 2; this.a = this.random.nextLong(); this.c = this.random.nextInt(3) + 1; - // CraftBukkit start + // CraftBukkit if (!isEffect && world.spawnMonsters >= 2 && world.a(MathHelper.floor(d0), MathHelper.floor(d1), MathHelper.floor(d2), 10)) { - // CraftBukkit end int i = MathHelper.floor(d0); int j = MathHelper.floor(d1); int k = MathHelper.floor(d2); @@ -51,6 +50,7 @@ public class EntityWeatherStorm extends EntityWeather { org.bukkit.block.Block theBlock = cworld.getBlockAt(i, j, k); BlockIgniteEvent event = new BlockIgniteEvent(theBlock, IgniteCause.LIGHTNING, null); ((WorldServer) world).getServer().getPluginManager().callEvent(event); + if (!event.isCancelled()) { world.setTypeId(i, j, k, Block.FIRE.id); } @@ -112,9 +112,7 @@ public class EntityWeatherStorm extends EntityWeather { } } - // CraftBukkit start - if (!isEffect && this.b >= 0) { - // CraftBukkit end + if (this.b >= 0 && !isEffect) { // CraftBukkit double d0 = 3.0D; List list = this.world.b((Entity) this, AxisAlignedBB.b(this.locX - d0, this.locY - d0, this.locZ - d0, this.locX + d0, this.locY + 6.0D + d0, this.locZ + d0)); |