cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-29 02:04:28 +00:00
Code Issues Releases Wiki Activity

Fix to crash in freeplay (swapped two args oops!)

Browse source
This commit is contained in:
EliteMasterEric 2023-09-18 20:02:17 -04:00
parent b56768d9b5
commit 06269e95fd
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/funkin/data/song/SongRegistry.hx
View file

@ -242,7 +242,7 @@ class SongRegistry extends BaseRegistry<Song, SongMetadata>
public function fetchEntryChartVersion(id:String, variation:String = ''):Null<thx.semver.Version>
{
var entryStr:String = loadEntryChartFile(id, variation).contents;
var entryStr:Null<String> = loadEntryChartFile(id, variation)?.contents;
var entryVersion:thx.semver.Version = VersionUtil.getVersionFromJSON(entryStr);
return entryVersion;
}

2
source/funkin/play/song/Song.hx
View file

@ -207,7 +207,7 @@ class Song implements IPlayStateScriptedClass implements IRegistryEntry<SongMeta
{
var version:Null<thx.semver.Version> = SongRegistry.instance.fetchEntryChartVersion(id, variation);
if (version == null) continue;
var chart:Null<SongChartData> = SongRegistry.instance.parseEntryChartDataWithMigration(id, version, variation);
var chart:Null<SongChartData> = SongRegistry.instance.parseEntryChartDataWithMigration(id, variation, version);
if (chart == null) continue;
applyChartData(chart, variation);
}

1
source/funkin/ui/debug/charting/ChartEditorState.hx
View file

@ -2848,6 +2848,7 @@ class ChartEditorState extends HaxeUIState
// If this gets too big, something needs to be optimized somewhere! -Eric
FlxG.watch.addQuick("tapNotesRendered", renderedNotes.members.length);
FlxG.watch.addQuick("holdNotesRendered", renderedHoldNotes.members.length);
FlxG.watch.addQuick("eventsRendered", renderedEvents.members.length);
}
function buildSelectionSquare():FlxSprite