Anvilcraft/aether-legacy
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

#158 - Music now plays in the aether

Browse source
This commit is contained in:
Kino 2017-08-04 18:34:16 -04:00
parent 339f01b1b0
commit d082aca623
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/com/legacy/aether/client/audio/AetherMusicHandler.java
View file

@ -47,7 +47,7 @@ public class AetherMusicHandler
if (category == SoundCategory.MUSIC)
{
if (this.musicTicker.playingMusic())
if (!sound.getSoundLocation().toString().contains("aether_legacy") && this.musicTicker.playingMusic())
{
event.setResultSound(null);
@ -56,6 +56,7 @@ public class AetherMusicHandler
}
else if (category == SoundCategory.RECORDS)
{
this.musicTicker.stopMusic();
this.mc.getSoundHandler().stopSounds();
return;

1
src/main/java/com/legacy/aether/client/audio/music/AetherMusicTicker.java
View file

@ -17,6 +17,7 @@ import com.legacy.aether.common.registry.sounds.SoundsAether;
@SideOnly(Side.CLIENT)
public class AetherMusicTicker implements ITickable
{
private final Random rand = new Random();
private final Minecraft mc;
private ISound currentMusic;