Fix Sound Event Crash the Game if it null

MrScautHD · Jan 12, 2022 · 6b54279 · 6b54279
1 parent d2bafcb
commit 6b54279
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/main/java/net/mrscauthd/beyond_earth/entity/renderer/lander/LanderModel.java b/src/main/java/net/mrscauthd/beyond_earth/entity/renderer/lander/LanderModel.java
@@ -156,6 +156,7 @@ public static LayerDefinition createBodyLayer() {
 
     @Override
     public void setupAnim(T entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch) {
+
     }
 
     @Override

diff --git a/src/main/java/net/mrscauthd/beyond_earth/events/Events.java b/src/main/java/net/mrscauthd/beyond_earth/events/Events.java
@@ -300,9 +300,9 @@ public static void interact(PlayerInteractEvent.EntityInteract event) {
     @OnlyIn(Dist.CLIENT)
     @SubscribeEvent
     public static void SpaceSounds(PlaySoundEvent event) {
-        if (Minecraft.getInstance().player != null && Minecraft.getInstance().player.level != null && Methods.checkSound(event.getSound().getSource()) && Methods.isSpaceWorldWithoutOxygen(Minecraft.getInstance().player.level)) {
+        if (event.getSound() != null) {
+            if (Minecraft.getInstance().player != null && Minecraft.getInstance().player.level != null && Methods.checkSound(event.getSound().getSource()) && Methods.isSpaceWorldWithoutOxygen(Minecraft.getInstance().player.level)) {
 
-            if (event.getSound() != null) {
                 if (!(event.getSound() instanceof TickableSoundInstance)) {
                     event.setSound(new SpaceSoundSystem(event.getSound()));