From c72a03b5587a9df6efe9149298e98ab0aed05550 Mon Sep 17 00:00:00 2001 From: CannibalVox Date: Tue, 10 Mar 2015 04:03:45 -0500 Subject: [PATCH] Fixed limbo music --- .../StevenDimDoors/mod_pocketDim/EventHookContainer.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/EventHookContainer.java b/src/main/java/StevenDimDoors/mod_pocketDim/EventHookContainer.java index d2875db..e693738 100644 --- a/src/main/java/StevenDimDoors/mod_pocketDim/EventHookContainer.java +++ b/src/main/java/StevenDimDoors/mod_pocketDim/EventHookContainer.java @@ -87,7 +87,7 @@ public class EventHookContainer public void onSoundEffectResult(PlaySoundEvent17 event) { ResourceLocation playingSound = event.sound.getPositionedSoundLocation(); - if (playingSound != null && playingSound.getResourceDomain().equals("minecraft") && playingSound.getResourcePath().equals("music.game")) { + if (playingSound != null && playingSound.getResourceDomain().equals("minecraft") && (playingSound.getResourcePath().equals("music.game") || playingSound.getResourcePath().equals("music.game.creative"))) { if (FMLClientHandler.instance().getClient().thePlayer.worldObj.provider.dimensionId == mod_pocketDim.properties.LimboDimensionID) { ResourceLocation sound = new ResourceLocation(mod_pocketDim.modid + ":creepy"); @@ -145,11 +145,8 @@ public class EventHookContainer PocketManager.load(); } - if (FMLClientHandler.instance().getClient().thePlayer == null) - return; - - if (FMLClientHandler.instance().getClient().thePlayer.worldObj.provider.dimensionId == mod_pocketDim.properties.LimboDimensionID && - !Minecraft.getMinecraft().getSoundHandler().isSoundPlaying(limboMusic)) { + if (event.world.provider.dimensionId == mod_pocketDim.properties.LimboDimensionID && + event.world.isRemote && !Minecraft.getMinecraft().getSoundHandler().isSoundPlaying(limboMusic)) { Minecraft.getMinecraft().getSoundHandler().playSound(limboMusic); } }