From 40c1b8f71ef4cf56f6688494eca85b0caf7864ae Mon Sep 17 00:00:00 2001
From: Kino <jose33201@hotmail.com>
Date: Tue, 20 Dec 2016 20:42:54 -0500
Subject: [PATCH] :fire: The music

---
 .../aether/client/audio/AetherMusicHandler.java      | 12 +++++++-----
 src/main/resources/assets/aether_legacy/sounds.json  |  6 +++---
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/legacy/aether/client/audio/AetherMusicHandler.java b/src/main/java/com/legacy/aether/client/audio/AetherMusicHandler.java
index 2fffac9..dd85922 100644
--- a/src/main/java/com/legacy/aether/client/audio/AetherMusicHandler.java
+++ b/src/main/java/com/legacy/aether/client/audio/AetherMusicHandler.java
@@ -36,9 +36,9 @@ public class AetherMusicHandler
 		{
 			if (this.mc.thePlayer != null)
 			{
-				if (event.getSound().getSoundLocation() == this.mc.getAmbientMusicType().getMusicLocation().getSoundName() && this.mc.thePlayer.dimension == AetherConfig.getAetherDimensionID())
+				if (this.mc.thePlayer.dimension == AetherConfig.getAetherDimensionID())
 				{
-					if (!this.isAetherSongPlaying(event.getSound()))
+					if (event.getSound().getSoundLocation() == this.mc.getAmbientMusicType().getMusicLocation().getSoundName() && !this.isAetherSongPlaying(event.getSound()))
 					{
 						int songNum = this.random.nextInt(4);
 
@@ -46,10 +46,12 @@ public class AetherMusicHandler
 
 		        		return;
 					}
+					else
+					{
+						event.setResultSound(null);
 
-					event.setResultSound(null);
-
-					return;
+						return;
+					}
 				}
 			}
 		}
diff --git a/src/main/resources/assets/aether_legacy/sounds.json b/src/main/resources/assets/aether_legacy/sounds.json
index d1c41e0..15df380 100644
--- a/src/main/resources/assets/aether_legacy/sounds.json
+++ b/src/main/resources/assets/aether_legacy/sounds.json
@@ -72,7 +72,7 @@
 	]
   },
   "achievement": {
-  	"category": "music",
+  	"category": "player",
 	"sounds": [
 	  {
 	    "name": "aether_legacy:achievement/achievement_gen",
@@ -81,7 +81,7 @@
 	]
   },
   "achievement_silver": {
-  	"category": "music",
+  	"category": "player",
 	"sounds": [
 	  {
 	    "name": "aether_legacy:achievement/achievement_silver",
@@ -90,7 +90,7 @@
 	]
   },
   "achievement_bronze": {
-  	"category": "music",
+  	"category": "player",
 	"sounds": [
 	  {
 	    "name": "aether_legacy:achievement/achievement_bronze",