From 4fc18d35ce81dfd672ef475c47302296bff0c335 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 11 Aug 2021 16:41:59 -0400
Subject: [PATCH] #5742

---
 core/src/mindustry/audio/SoundControl.java | 7 ++++++-
 core/src/mindustry/content/Blocks.java     | 2 +-
 gradle.properties                          | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/core/src/mindustry/audio/SoundControl.java b/core/src/mindustry/audio/SoundControl.java
index 5b29b62a85..dde449ecae 100644
--- a/core/src/mindustry/audio/SoundControl.java
+++ b/core/src/mindustry/audio/SoundControl.java
@@ -130,7 +130,12 @@ public class SoundControl{
                 Core.audio.soundBus.play();
                 setupFilters();
             }else{
-                Core.audio.soundBus.replay();
+                //stopping a single audio bus stops everything else, yay!
+                Core.audio.soundBus.stop();
+                //play music bus again, as it was stopped above
+                Core.audio.musicBus.play();
+
+                Core.audio.soundBus.play();
             }
         }
 
diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index d5887013a0..b15d24ae7a 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -2033,7 +2033,7 @@ public class Blocks implements ContentList{
         payloadPropulsionTower = new PayloadMassDriver("payload-propulsion-tower"){{
             requirements(Category.units, with(Items.thorium, 300, Items.silicon, 200, Items.plastanium, 200, Items.phaseFabric, 50));
             size = 5;
-            reloadTime = 140f;
+            reloadTime = 130f;
             chargeTime = 100f;
             range = 1000f;
             maxPayloadSize = 3.5f;
diff --git a/gradle.properties b/gradle.properties
index 2917c3abef..6ce5f26d99 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,4 +11,4 @@ android.useAndroidX=true
 #used for slow jitpack builds; TODO see if this actually works
 http.socketTimeout=80000
 http.connectionTimeout=80000
-archash=40c21b302ccc1e74f4c2a37f937c88acaec99254
+archash=de1df819aae54e4023718a07dabf794da9f5a4de