From bcbfa90f37fc118c1386d8d1310b23bf35b22a99 Mon Sep 17 00:00:00 2001
From: Ralty <78720179+Raltyro@users.noreply.github.com>
Date: Fri, 8 Aug 2025 00:38:03 +0700
Subject: [PATCH] Fix Freeplay Difficulty Inst Suffix

---
 source/funkin/backend/chart/Chart.hx |  2 --
 source/funkin/menus/FreeplayState.hx | 19 ++++++++++---------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/source/funkin/backend/chart/Chart.hx b/source/funkin/backend/chart/Chart.hx
index 2fe89801..25906921 100644
--- a/source/funkin/backend/chart/Chart.hx
+++ b/source/funkin/backend/chart/Chart.hx
@@ -84,8 +84,6 @@ class Chart {
 	}
 
 	public static function loadChartMeta(songName:String, difficulty:String = '', fromMods:Bool = true, includeMetaDifficulties:Bool = true):ChartMetaData {
-		trace(songName, difficulty, fromMods, includeMetaDifficulties);
-
 		var metaPath = Paths.file('songs/${songName}/meta.json');
 		var metaDiffPath = Paths.file('songs/${songName}/meta-${difficulty}.json');
 
diff --git a/source/funkin/menus/FreeplayState.hx b/source/funkin/menus/FreeplayState.hx
index e4199da1..4b5b9115 100644
--- a/source/funkin/menus/FreeplayState.hx
+++ b/source/funkin/menus/FreeplayState.hx
@@ -256,7 +256,7 @@ class FreeplayState extends MusicBeatState
 		#if PRELOAD_ALL
 		var dontPlaySongThisFrame = false;
 		autoplayElapsed += elapsed;
-		if (!disableAutoPlay && !songInstPlaying && (autoplayElapsed > timeUntilAutoplay || FlxG.keys.justPressed.SPACE)) {
+		if (!disableAutoPlay && !songInstPlaying && (autoplayElapsed > timeUntilAutoplay)) {
 			if (curPlayingInst != (curPlayingInst = Paths.inst(curSong.name, curSongDifficulty, curSong.instSuffix))) {
 				var streamed = false;
 				if (Options.streamedMusic) {
@@ -362,30 +362,31 @@ class FreeplayState extends MusicBeatState
 	{
 		if (change == 0 && !force) return;
 
-		var curSong = songs[curSelected];
-		var validDifficulties = curSong.difficulties.length > 0;
-		var event = event("onChangeDiff", EventManager.get(MenuChangeEvent).recycle(curDifficulty, validDifficulties ? FlxMath.wrap(curDifficulty + change, 0, curSong.difficulties.length-1) : 0, change));
+		var song = songs[curSelected];
+		var validDifficulties = song.difficulties.length > 0;
+		var event = event("onChangeDiff", EventManager.get(MenuChangeEvent).recycle(curDifficulty, validDifficulties ? FlxMath.wrap(curDifficulty + change, 0, song.difficulties.length-1) : 0, change));
 
 		if (event.cancelled) {
-			updateCurSongMeta();
+			if (force) updateCurSongMeta();
 			return;
 		}
 
+		var prevInstSuffix = curSong.instSuffix;
 		curDifficulty = event.value;
 		updateCurSongMeta();
 		updateScore();
 
 		#if PRELOAD_ALL
-		if (songs[curSelected] != curSong) {
+		if (curSong.instSuffix != prevInstSuffix) {
 			autoplayElapsed = 0;
 			songInstPlaying = false;
 		}
 		#end
 
-		if (curSong.difficulties.length > 1)
-			diffText.text = '< ${curSong.difficulties[curDifficulty].toUpperCase()} >';
+		if (song.difficulties.length > 1)
+			diffText.text = '< ${song.difficulties[curDifficulty].toUpperCase()} >';
 		else
-			diffText.text = validDifficulties ? curSong.difficulties[curDifficulty].toUpperCase() : "-";
+			diffText.text = validDifficulties ? song.difficulties[curDifficulty].toUpperCase() : "-";
 	}
 
 	function updateScore() {