Merge remote-tracking branch 'origin/master'

2024-02-04 19:09:42 -05:00
parent 602bb93f1e 9093c92b07
commit 8d36c7710c
2 changed files with 2 additions and 5 deletions
--- a/core/src/mindustry/mod/ContentParser.java
+++ b/core/src/mindustry/mod/ContentParser.java
@@ -271,8 +271,9 @@ public class ContentParser{
            return new Vec3(data.getFloat("x", 0f), data.getFloat("y", 0f), data.getFloat("z", 0f));
        });
        put(Sound.class, (type, data) -> {
-            var field = fieldOpt(Sounds.class, data);
+            if(data.isArray()) return new RandomSound(parser.readValue(Sound[].class, data));

+            var field = fieldOpt(Sounds.class, data);
            return field != null ? field : Vars.tree.loadSound(data.asString());
        });
        put(Music.class, (type, data) -> {