diff options
author | Travis Watkins <amaranth@ubuntu.com> | 2014-07-15 18:27:27 -0500 |
---|---|---|
committer | Travis Watkins <amaranth@ubuntu.com> | 2014-07-15 21:28:10 -0500 |
commit | 594d7cb8c91943eeb0f2508a4e7b2c128d310f09 (patch) | |
tree | a0d604a31d6102c5527fd2898e641c42256f6523 /src/main/java/net/minecraft/server/EntityLightning.java | |
parent | c7398b9fdf058dc99c5a4c84838245a5d3699e59 (diff) | |
download | craftbukkit-594d7cb8c91943eeb0f2508a4e7b2c128d310f09.tar craftbukkit-594d7cb8c91943eeb0f2508a4e7b2c128d310f09.tar.gz craftbukkit-594d7cb8c91943eeb0f2508a4e7b2c128d310f09.tar.lz craftbukkit-594d7cb8c91943eeb0f2508a4e7b2c128d310f09.tar.xz craftbukkit-594d7cb8c91943eeb0f2508a4e7b2c128d310f09.zip |
Don't confuse client with sound coordinates outside view distance.
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityLightning.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntityLightning.java | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/EntityLightning.java b/src/main/java/net/minecraft/server/EntityLightning.java index 2fd88c0f..66402a05 100644 --- a/src/main/java/net/minecraft/server/EntityLightning.java +++ b/src/main/java/net/minecraft/server/EntityLightning.java @@ -63,7 +63,24 @@ public class EntityLightning extends EntityWeather { public void h() { super.h(); if (this.lifeTicks == 2) { - this.world.makeSound(this.locX, this.locY, this.locZ, "ambient.weather.thunder", 10000.0F, 0.8F + this.random.nextFloat() * 0.2F); + // CraftBukkit start - Use relative location for far away sounds + //this.world.makeSound(this.locX, this.locY, this.locZ, "ambient.weather.thunder", 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>) this.world.players) { + 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("ambient.weather.thunder", relativeX, this.locY, relativeZ, 10000.0F, pitch)); + } else { + player.playerConnection.sendPacket(new PacketPlayOutNamedSoundEffect("ambient.weather.thunder", this.locX, this.locY, this.locZ, 10000.0F, pitch)); + } + } + // CraftBukkit end this.world.makeSound(this.locX, this.locY, this.locZ, "random.explode", 2.0F, 0.5F + this.random.nextFloat() * 0.2F); } |