diff --git a/src/main/java/com/flansmod/common/guns/ItemGun.java b/src/main/java/com/flansmod/common/guns/ItemGun.java index 99e252138..414e010f0 100644 --- a/src/main/java/com/flansmod/common/guns/ItemGun.java +++ b/src/main/java/com/flansmod/common/guns/ItemGun.java @@ -637,7 +637,7 @@ public void playShotSound(World world, Vector3f position, Boolean silenced) { // Play shot sounds if(soundDelay <= 0 && type.shootSound != null) { - PacketPlaySound.sendSoundPacket(position.x, position.y, position.z, FlansMod.soundRange, world.provider.getDimension(), type.shootSound, silenced); + PacketPlaySound.sendSoundPacket(position.x, position.y, position.z, silenced ? (FlansMod.soundRange*0.75F) : FlansMod.soundRange, world.provider.getDimension(), type.shootSound, silenced); soundDelay = type.idleSoundLength; } } diff --git a/src/main/java/com/flansmod/common/network/PacketPlaySound.java b/src/main/java/com/flansmod/common/network/PacketPlaySound.java index 8f0e2d319..4d25e1c0d 100644 --- a/src/main/java/com/flansmod/common/network/PacketPlaySound.java +++ b/src/main/java/com/flansmod/common/network/PacketPlaySound.java @@ -29,14 +29,14 @@ public PacketPlaySound() { } - public static void sendSoundPacket(double x, double y, double z, double range, int dimension, String s, boolean distort) + public static void sendSoundPacket(double x, double y, double z, double range, int dimension, String s, boolean silenced) { - sendSoundPacket(x, y, z, range, dimension, s, distort, false); + sendSoundPacket(x, y, z, range, dimension, s, silenced, false); } - public static void sendSoundPacket(double x, double y, double z, double range, int dimension, String s, boolean distort, boolean silenced) + public static void sendSoundPacket(double x, double y, double z, double range, int dimension, String s, boolean silenced, boolean distort) { - FlansMod.getPacketHandler().sendToAllAround(new PacketPlaySound(x, y, z, s, distort, silenced), x, y, z, (float)range, dimension); + FlansMod.getPacketHandler().sendToAllAround(new PacketPlaySound(x, y, z, s, silenced, distort), x, y, z, (float)range, dimension); } public PacketPlaySound(double x, double y, double z, String s) @@ -44,19 +44,19 @@ public PacketPlaySound(double x, double y, double z, String s) this(x, y, z, s, false); } - public PacketPlaySound(double x, double y, double z, String s, boolean distort) + public PacketPlaySound(double x, double y, double z, String s, boolean silenced) { - this(x, y, z, s, distort, false); + this(x, y, z, s, silenced, false); } - public PacketPlaySound(double x, double y, double z, String s, boolean distort, boolean silenced) + public PacketPlaySound(double x, double y, double z, String s, boolean silenced, boolean distort) { posX = (float)x; posY = (float)y; posZ = (float)z; sound = s; - this.distort = distort; this.silenced = silenced; + this.distort = distort; Matrix2f audioMatrix = Matrix2f.generateAudioMatrix(x, y, z); hash = audioMatrix.coords.hash;