apex/DimDoors
1
1
Fork 0
Code Issues 26 Pull Requests Actions Packages Projects Releases Wiki Activity

Various Updates #144

Merged
SenseiKiwi merged 28 commits from master into master 2014-03-24 18:45:47 +00:00
Conversation 0 Commits 28 Files Changed 56 +20 -15
1 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d1a2476a4e - Show all commits

35
src/main/java/StevenDimDoors/mod_pocketDim/EventHookContainer.java
View File

@@ -218,24 +218,29 @@ public class EventHookContainer
public void playMusicForDim(World world) public void playMusicForDim(World world)
{ {
if(world.isRemote) if (world.isRemote)
{ {
SoundManager sndManager = FMLClientHandler.instance().getClient().sndManager; SoundManager sndManager = FMLClientHandler.instance().getClient().sndManager;
if(world.provider instanceof LimboProvider) // SenseiKiwi: I've added the following check as a quick fix for a reported crash.
{ // This needs to work without a hitch or we have to stop trying to replace the background music...
sndManager.sndSystem.stop("BgMusic"); if (sndManager != null && sndManager.sndSystem != null)
SoundPoolEntry soundPoolEntry = sndManager.soundPoolSounds.getRandomSoundFromSoundPool(mod_pocketDim.modid+":creepy"); {
if(soundPoolEntry!=null) if (world.provider instanceof LimboProvider)
{ {
sndManager.sndSystem.backgroundMusic("LimboMusic", soundPoolEntry.getSoundUrl(), soundPoolEntry.getSoundName(), false); sndManager.sndSystem.stop("BgMusic");
sndManager.sndSystem.play("LimboMusic"); SoundPoolEntry soundPoolEntry = sndManager.soundPoolSounds.getRandomSoundFromSoundPool(mod_pocketDim.modid+":creepy");
} if (soundPoolEntry != null)
} {
else if(!(world.provider instanceof LimboProvider)) sndManager.sndSystem.backgroundMusic("LimboMusic", soundPoolEntry.getSoundUrl(), soundPoolEntry.getSoundName(), false);
{ sndManager.sndSystem.play("LimboMusic");
sndManager.sndSystem.stop("LimboMusic"); }
} }
else if (!(world.provider instanceof LimboProvider))
{
sndManager.sndSystem.stop("LimboMusic");
}
}
} }
} }
} }