RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-04-11 03:31:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make maps with storyboards decode correctly with OsuJsonDecoder

Browse Source
This commit is contained in:
smoogipoo 2017-12-07 10:37:51 +09:00
parent a8db3a9484
commit 0e3b001b13
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/Beatmaps/Formats/OsuJsonDecoder.cs
View File

@ -18,8 +18,16 @@ namespace osu.Game.Beatmaps.Formats
stream.BaseStream.Position = 0; stream.BaseStream.Position = 0;
stream.DiscardBufferedData(); stream.DiscardBufferedData();
string fullText = stream.ReadToEnd(); try
fullText.DeserializeInto(beatmap); {
string fullText = stream.ReadToEnd();
fullText.DeserializeInto(beatmap);
}
catch
{
// Temporary because storyboards are deserialized into beatmaps at the moment
// This try-catch shouldn't exist in the future
}
foreach (var hitObject in beatmap.HitObjects) foreach (var hitObject in beatmap.HitObjects)
hitObject.ApplyDefaults(beatmap.ControlPointInfo, beatmap.BeatmapInfo.BaseDifficulty); hitObject.ApplyDefaults(beatmap.ControlPointInfo, beatmap.BeatmapInfo.BaseDifficulty);