cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-03-22 01:49:21 +00:00
Code Issues Releases Wiki Activity

I'm so done with this stupid bug

Browse source 
Eric wuz here!
This commit is contained in:
Lasercar 2025-03-16 16:38:46 +10:00 committed by Eric
parent 3667c51c1e
commit e83b88d320
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
source/funkin/play/PlayState.hx
View file

@ -918,8 +918,12 @@ class PlayState extends MusicBeatSubState
Conductor.instance.update(Conductor.instance.songPosition + elapsed * 1000, false); // Normal conductor update.
// Fallback in case music's onComplete function doesn't get called.
if (FlxG.sound.music.time >= (FlxG.sound.music.endTime ?? FlxG.sound.music.length) && mayPauseGame) endSong(skipEndingTransition);
// If, after updating the conductor, the instrumental has finished, end the song immediately.
// This helps prevent a major bug where the level suddenly loops back to the start or middle.
if (Conductor.instance.songPosition >= (FlxG.sound.music.endTime ?? FlxG.sound.music.length))
{
if (mayPauseGame) endSong(skipEndingTransition);
}
}
var androidPause:Bool = false;
@ -2062,7 +2066,7 @@ class PlayState extends MusicBeatSubState
}
FlxG.sound.music.onComplete = function() {
endSong(skipEndingTransition);
if (mayPauseGame) endSong(skipEndingTransition);
};
// A negative instrumental offset means the song skips the first few milliseconds of the track.
// This just gets added into the startTimestamp behavior so we don't need to do anything extra.