diff --git a/core/src/mindustry/core/NetClient.java b/core/src/mindustry/core/NetClient.java index 0a4d406e76..78b68c3aff 100644 --- a/core/src/mindustry/core/NetClient.java +++ b/core/src/mindustry/core/NetClient.java @@ -161,16 +161,16 @@ public class NetClient implements ApplicationListener{ clientPacketReliable(type, contents); } - @Remote(variants = Variant.both, unreliable = true) + @Remote(variants = Variant.both, unreliable = true, called = Loc.server) public static void sound(Sound sound, float volume, float pitch, float pan){ - if(sound == null) return; + if(sound == null || headless) return; - sound.play(Mathf.clamp(volume, 0, 4f) * Core.settings.getInt("sfxvol") / 100f, pitch, pan); + sound.play(Mathf.clamp(volume, 0, 8f) * Core.settings.getInt("sfxvol") / 100f, pitch, pan, false, false); } - @Remote(variants = Variant.both, unreliable = true) + @Remote(variants = Variant.both, unreliable = true, called = Loc.server) public static void soundAt(Sound sound, float x, float y, float volume, float pitch){ - if(sound == null) return; + if(sound == null || headless) return; sound.at(x, y, pitch, Mathf.clamp(volume, 0, 4f)); } diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java index 13f78b663f..acd7f9e7d9 100644 --- a/core/src/mindustry/world/Block.java +++ b/core/src/mindustry/world/Block.java @@ -458,8 +458,7 @@ public class Block extends UnlockableContent implements Senseable{ public boolean canPlaceOn(Tile tile, Team team){ return true; } - - + public boolean canBreak(Tile tile){ return true; } diff --git a/gradle.properties b/gradle.properties index d4b35c59e2..85f821cf22 100644 --- a/gradle.properties +++ b/gradle.properties @@ -25,4 +25,4 @@ org.gradle.caching=true #used for slow jitpack builds; TODO see if this actually works org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.connectionTimeout=100000 -archash=2f2aeb72c3 +archash=0ed3a81119