From 0ffcd0b94c0c8df93c8a03a265acd2b68e7aa6ae Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 7 Feb 2020 20:21:45 -0500
Subject: [PATCH] Fixed #1507 / Fixed #1504

---
 core/src/mindustry/game/MusicControl.java                 | 8 +++++++-
 .../src/mindustry/world/blocks/distribution/Junction.java | 1 -
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/core/src/mindustry/game/MusicControl.java b/core/src/mindustry/game/MusicControl.java
index 26a44876ac..2e60c53689 100644
--- a/core/src/mindustry/game/MusicControl.java
+++ b/core/src/mindustry/game/MusicControl.java
@@ -100,6 +100,8 @@ public class MusicControl{
     /** Plays and fades in a music track. This must be called every frame.
      * If something is already playing, fades out that track and fades in this new music.*/
     private void play(@Nullable Music music){
+        if(!shouldPlay()) return;
+
         //update volume of current track
         if(current != null){
             current.setVolume(fade * Core.settings.getInt("musicvol") / 100f);
@@ -143,7 +145,7 @@ public class MusicControl{
 
     /** Plays a music track once and only once. If something is already playing, does nothing.*/
     private void playOnce(Music music){
-        if(current != null || music == null) return; //do not interrupt already-playing tracks
+        if(current != null || music == null || !shouldPlay()) return; //do not interrupt already-playing tracks
 
         //save last random track played to prevent duplicates
         lastRandomPlayed = music;
@@ -162,6 +164,10 @@ public class MusicControl{
         current.play();
     }
 
+    private boolean shouldPlay(){
+        return Core.settings.getInt("musicvol") > 0;
+    }
+
     /** Fades out the current track, unless it has already been silenced. */
     private void silence(){
         play(null);
diff --git a/core/src/mindustry/world/blocks/distribution/Junction.java b/core/src/mindustry/world/blocks/distribution/Junction.java
index 99c22057e1..b1c2dd2b7d 100644
--- a/core/src/mindustry/world/blocks/distribution/Junction.java
+++ b/core/src/mindustry/world/blocks/distribution/Junction.java
@@ -24,7 +24,6 @@ public class Junction extends Block{
         super(name);
         update = true;
         solid = true;
-        instantTransfer = true;
         group = BlockGroup.transportation;
         unloadable = false;
         entityType = JunctionEntity::new;