mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2024-07-01 01:23:30 +00:00
Code Issues Releases Wiki Activity

Merge pull request #258 from Wojbie/Speaker-volume-fix

Browse Source 
Speaker max hearable range limit
This commit is contained in:
Daniel Ratcliffe 2017-05-18 22:32:38 +01:00 committed by GitHub
commit 6d590cee3b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/dan200/computercraft/shared/peripheral/speaker/SpeakerPeripheral.java
View File

@ -168,7 +168,7 @@ private synchronized Object[] playNote(Object[] arguments, ILuaContext context)
}
// If the resource location for note block notes changes, this method call will need to be updated
Object[] returnValue = playSound(new Object[] {"block.note." + arguments[0], volume, Math.pow(2d, (pitch - 12) / 12d)}, context, true);
Object[] returnValue = playSound(new Object[] {"block.note." + arguments[0], Math.min(volume,3f) , Math.pow(2d, (pitch - 12) / 12d)}, context, true);
if (returnValue[0] instanceof Boolean && (Boolean) returnValue[0])
{
@ -238,7 +238,7 @@ private synchronized Object[] playSound(Object[] arguments, ILuaContext context,
@Nullable
@Override
public Object[] execute() throws LuaException {
world.playSound( null, pos, SoundEvent.REGISTRY.getObject( resource ), SoundCategory.RECORDS, vol, soundPitch );
world.playSound( null, pos, SoundEvent.REGISTRY.getObject( resource ), SoundCategory.RECORDS, Math.min(vol,3f), soundPitch );
return null;
}