Fix crash when null sound processed by SoundHandler

asanetargoss · Oct 13, 2019 · 826c54e · 826c54e
1 parent fa6ccdd
commit 826c54e
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/main/java/mchorse/metamorph/entity/SoundHandler.java b/src/main/java/mchorse/metamorph/entity/SoundHandler.java
@@ -69,8 +69,18 @@ public void onPlaySound(PlaySoundAtEntityEvent event)
         {
             return;
         }
+
+        SoundEvent sound = event.getSound();
+        if (sound == null) {
+            // Sounds can be null, apparently
+            return;
+        }
+        ResourceLocation soundResource = sound.getRegistryName();
+        if (soundResource == null) {
+            return;
+        }
+        String soundType = soundResource.getResourcePath();
 
-        String soundType = event.getSound().getRegistryName().getResourcePath();
         if (soundType.endsWith(".hurt"))
         {
             SoundEvent newSound = morph.getHurtSound(player, morphing.getLastDamageSource());