diff options
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityLightning.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityLightning.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/main/java/net/minecraft/server/EntityLightning.java b/src/main/java/net/minecraft/server/EntityLightning.java index 36923bb6..2fd88c0f 100644 --- a/src/main/java/net/minecraft/server/EntityLightning.java +++ b/src/main/java/net/minecraft/server/EntityLightning.java @@ -22,16 +22,15 @@ public class EntityLightning extends EntityWeather { super(world); - // CraftBukkit start + // CraftBukkit - Set isEffect this.isEffect = isEffect; - // CraftBukkit end this.setPositionRotation(d0, d1, d2, 0.0F, 0.0F); this.lifeTicks = 2; this.a = this.random.nextLong(); this.c = this.random.nextInt(3) + 1; - // CraftBukkit + // CraftBukkit - add "!isEffect" if (!isEffect && !world.isStatic && world.getGameRules().getBoolean("doFireTick") && (world.difficulty == EnumDifficulty.NORMAL || world.difficulty == EnumDifficulty.HARD) && world.areChunksLoaded(MathHelper.floor(d0), MathHelper.floor(d1), MathHelper.floor(d2), 10)) { int i = MathHelper.floor(d0); int j = MathHelper.floor(d1); @@ -76,7 +75,7 @@ public class EntityLightning extends EntityWeather { --this.c; this.lifeTicks = 1; this.a = this.random.nextLong(); - // CraftBukkit + // CraftBukkit - add "!isEffect" if (!isEffect && !this.world.isStatic && this.world.getGameRules().getBoolean("doFireTick") && this.world.areChunksLoaded(MathHelper.floor(this.locX), MathHelper.floor(this.locY), MathHelper.floor(this.locZ), 10)) { int i = MathHelper.floor(this.locX); int j = MathHelper.floor(this.locY); @@ -98,7 +97,7 @@ public class EntityLightning extends EntityWeather { this.world.q = 2; } else { double d0 = 3.0D; - List list = this.world.getEntities(this, AxisAlignedBB.a().a(this.locX - d0, this.locY - d0, this.locZ - d0, this.locX + d0, this.locY + 6.0D + d0, this.locZ + d0)); + List list = this.world.getEntities(this, AxisAlignedBB.a(this.locX - d0, this.locY - d0, this.locZ - d0, this.locX + d0, this.locY + 6.0D + d0, this.locZ + d0)); for (int l = 0; l < list.size(); ++l) { Entity entity = (Entity) list.get(l); |