Merge remote-tracking branch 'origin/sound-dev' into sound-dev

# Conflicts:
#	protocolize-world/src/main/java/de/exceptionflug/protocolize/world/Sound.java
#	protocolize-world/src/main/java/de/exceptionflug/protocolize/world/packet/NamedSoundEffect.java

Author: Exceptionflug

protocolize-world/src/main/java/de/exceptionflug/protocolize/world/Sound.java

@@ -677,20 +677,13 @@ public enum Sound {
 	public static Sound getSound(final String sound, final int protocolVersion) {
 		for(final Sound s : values()) {
 			final String soundName = s.getSoundName(protocolVersion);
-			if(soundName == null)
-				continue;
-			if(soundName.equals(sound)) {
-				for(final SoundMapping mapping : s.mappings) {
-					if(mapping.getProtocolVersionRangeStart() <= protocolVersion && mapping.getProtocolVersionRangeEnd() >= protocolVersion) {
-						return s;
-					}
-				}
-			}
+			if(soundName != null && soundName.equals(sound))
+				return s;
 		}
 		return null;
 	}
 
-	public String getSoundName(final int protocolVersion) {
+    public String getSoundName(final int protocolVersion) {
 		for(final SoundMapping mapping : mappings) {
 			if(mapping.getProtocolVersionRangeStart() <= protocolVersion && mapping.getProtocolVersionRangeEnd() >= protocolVersion) {
 				return mapping.getSoundName();

protocolize-world/src/main/java/de/exceptionflug/protocolize/world/packet/NamedSoundEffect.java

@@ -49,14 +49,15 @@ public Sound getSoundObject() {
         return soundObject;
     }
 
-    public void setSound(final Sound sound) {
-        soundObject = sound;
-    }
 
     public void setSound(final String sound) {
         this.sound = sound;
     }
 
+    public void setSound(final Sound soundObject) {
+        this.soundObject = soundObject;
+    }
+
     public SoundCategory getCategory() {
         return category;
     }