Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-30 03:25:47 -05:00
Code Issues Projects Releases Packages Wiki Activity

Migrator fixes

Browse source
This commit is contained in:
EliteMasterEric 2023-06-10 03:59:25 -04:00
parent 6f846751c7
commit b847212375
2 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
source/funkin/play/song/SongMigrator.hx
View file

@ -108,23 +108,6 @@ class SongMigrator
trace('Migrating song metadata from FNF Legacy.'); trace('Migrating song metadata from FNF Legacy.');
var songData:FNFLegacy = cast jsonData; var songData:FNFLegacy = cast jsonData;
// Some cleanup
if (Std.isOfType(jsonData.song.notes, Array))
{
jsonData.song.notes = haxe.ds.Either.Left(jsonData.song.notes);
}
else
{
jsonData.song.notes = haxe.ds.Either.Right(jsonData.song.notes);
}
if (Std.isOfType(jsonData.song.speed, Float))
{
jsonData.song.speed = haxe.ds.Either.Left(jsonData.song.speed);
}
else
{
jsonData.song.speed = haxe.ds.Either.Right(jsonData.song.speed);
}
var songMetadata:SongMetadata = new SongMetadata('Import', 'Kawai Sprite', 'default'); var songMetadata:SongMetadata = new SongMetadata('Import', 'Kawai Sprite', 'default');

11
source/funkin/util/SerializerUtil.hx
View file

@ -44,7 +44,16 @@ class SerializerUtil
*/ */
public static function fromJSONBytes(input:Bytes):Dynamic public static function fromJSONBytes(input:Bytes):Dynamic
{ {
return Json.parse(input.toString()); try
{
return Json.parse(input.toString());
}
catch (e:Dynamic)
{
trace('An error occurred while parsing JSON from byte data');
trace(e);
return null;
}
} }
/** /**