Merge remote-tracking branch 'upstream/main'

source/funkin/game/Character.hx

@@ -396,7 +396,7 @@ class Character extends FunkinSprite implements IBeatReceiver implements IOffset
 			offset.putWeak();
 
 			if (anim.indices.length > 0)
-				animXml.set("indices", anim.indices.join(","));
+				animXml.set("indices", CoolUtil.formatNumberRange(anim.indices));
 
 			xml.addChild(animXml);
 		}

source/funkin/game/PlayState.hx

@@ -1261,7 +1261,7 @@ class PlayState extends MusicBeatState
 				if (Conductor.songPosition >= 0)
 					startSong();
 			}
-		} else {
+		} else if (FlxG.sound.music != null) {
 			var instTime = FlxG.sound.music.time;
 			var isOffsync = vocals.time != instTime || [for(strumLine in strumLines.members) strumLine.vocals.time != instTime].contains(true);
 			__vocalOffsetViolation = Math.max(0, __vocalOffsetViolation + (isOffsync ? elapsed : -elapsed / 2));