84 Zeilen
4.4 KiB
Diff
84 Zeilen
4.4 KiB
Diff
--- a/net/minecraft/server/EntityLightning.java
|
|
+++ b/net/minecraft/server/EntityLightning.java
|
|
@@ -5,6 +5,8 @@
|
|
import java.util.List;
|
|
import javax.annotation.Nullable;
|
|
|
|
+import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit
|
|
+
|
|
public class EntityLightning extends Entity {
|
|
|
|
private int lifeTicks;
|
|
@@ -13,9 +15,11 @@
|
|
private final boolean e;
|
|
@Nullable
|
|
private EntityPlayer f;
|
|
+ public boolean isEffect; // CraftBukkit
|
|
|
|
public EntityLightning(World world, double d0, double d1, double d2, boolean flag) {
|
|
super(EntityTypes.LIGHTNING_BOLT, world);
|
|
+ this.isEffect = flag; // CraftBukkit
|
|
this.ac = true;
|
|
this.setPositionRotation(d0, d1, d2, 0.0F, 0.0F);
|
|
this.lifeTicks = 2;
|
|
@@ -43,7 +47,24 @@
|
|
public void tick() {
|
|
super.tick();
|
|
if (this.lifeTicks == 2) {
|
|
- this.world.playSound((EntityHuman) null, this.locX(), this.locY(), this.locZ(), SoundEffects.ENTITY_LIGHTNING_BOLT_THUNDER, SoundCategory.WEATHER, 10000.0F, 0.8F + this.random.nextFloat() * 0.2F);
|
|
+ // CraftBukkit start - Use relative location for far away sounds
|
|
+ // this.world.playSound((EntityHuman) null, this.locX(), this.locY(), this.locZ(), SoundEffects.ENTITY_LIGHTNING_BOLT_THUNDER, SoundCategory.WEATHER, 10000.0F, 0.8F + this.random.nextFloat() * 0.2F);
|
|
+ float pitch = 0.8F + this.random.nextFloat() * 0.2F;
|
|
+ int viewDistance = ((WorldServer) this.world).getServer().getViewDistance() * 16;
|
|
+ for (EntityPlayer player : (List<EntityPlayer>) (List) this.world.getPlayers()) {
|
|
+ double deltaX = this.locX() - player.locX();
|
|
+ double deltaZ = this.locZ() - player.locZ();
|
|
+ double distanceSquared = deltaX * deltaX + deltaZ * deltaZ;
|
|
+ if (distanceSquared > viewDistance * viewDistance) {
|
|
+ double deltaLength = Math.sqrt(distanceSquared);
|
|
+ double relativeX = player.locX() + (deltaX / deltaLength) * viewDistance;
|
|
+ double relativeZ = player.locZ() + (deltaZ / deltaLength) * viewDistance;
|
|
+ player.playerConnection.sendPacket(new PacketPlayOutNamedSoundEffect(SoundEffects.ENTITY_LIGHTNING_BOLT_THUNDER, SoundCategory.WEATHER, relativeX, this.locY(), relativeZ, 10000.0F, pitch));
|
|
+ } else {
|
|
+ player.playerConnection.sendPacket(new PacketPlayOutNamedSoundEffect(SoundEffects.ENTITY_LIGHTNING_BOLT_THUNDER, SoundCategory.WEATHER, this.locX(), this.locY(), this.locZ(), 10000.0F, pitch));
|
|
+ }
|
|
+ }
|
|
+ // CraftBukkit end
|
|
this.world.playSound((EntityHuman) null, this.locX(), this.locY(), this.locZ(), SoundEffects.ENTITY_LIGHTNING_BOLT_IMPACT, SoundCategory.WEATHER, 2.0F, 0.5F + this.random.nextFloat() * 0.2F);
|
|
}
|
|
|
|
@@ -59,7 +80,7 @@
|
|
}
|
|
}
|
|
|
|
- if (this.lifeTicks >= 0) {
|
|
+ if (this.lifeTicks >= 0 && !this.isEffect) { // CraftBukkit - add !this.isEffect
|
|
if (this.world.isClientSide) {
|
|
this.world.c(2);
|
|
} else if (!this.e) {
|
|
@@ -87,14 +108,22 @@
|
|
BlockPosition blockposition = new BlockPosition(this);
|
|
|
|
if (this.world.getType(blockposition).isAir() && iblockdata.canPlace(this.world, blockposition)) {
|
|
- this.world.setTypeUpdate(blockposition, iblockdata);
|
|
+ // CraftBukkit start - add "!isEffect"
|
|
+ if (!isEffect && !CraftEventFactory.callBlockIgniteEvent(world, blockposition, this).isCancelled()) {
|
|
+ this.world.setTypeUpdate(blockposition, iblockdata);
|
|
+ }
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
for (int j = 0; j < i; ++j) {
|
|
BlockPosition blockposition1 = blockposition.b(this.random.nextInt(3) - 1, this.random.nextInt(3) - 1, this.random.nextInt(3) - 1);
|
|
|
|
if (this.world.getType(blockposition1).isAir() && iblockdata.canPlace(this.world, blockposition1)) {
|
|
- this.world.setTypeUpdate(blockposition1, iblockdata);
|
|
+ // CraftBukkit start - add "!isEffect"
|
|
+ if (!isEffect && !CraftEventFactory.callBlockIgniteEvent(world, blockposition1, this).isCancelled()) {
|
|
+ this.world.setTypeUpdate(blockposition1, iblockdata);
|
|
+ }
|
|
+ // CraftBukkit end
|
|
}
|
|
}
|
|
|