From 79724e80181bc94d3f4aab2da3d1c1adeb072da8 Mon Sep 17 00:00:00 2001 From: MrTheMake Date: Wed, 2 Aug 2017 16:05:09 +0200 Subject: [PATCH 1/2] Fix OsuLegacyDecoder's parser being NULL if no ruleset was specified --- osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs b/osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs index 4c540fa8cf..e1e1e40f37 100644 --- a/osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs +++ b/osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs @@ -456,6 +456,11 @@ namespace osu.Game.Beatmaps.Formats handleColours(beatmap, line, ref hasCustomColours); break; case Section.HitObjects: + + // If the ruleset wasn't specified, assume the osu!standard ruleset. + if(parser == null) + parser = new Rulesets.Objects.Legacy.Osu.ConvertHitObjectParser(); + var obj = parser.Parse(line); if (obj != null) From be3c7ec5f81643a8c4e82f56e012e37138a7def0 Mon Sep 17 00:00:00 2001 From: MrTheMake Date: Wed, 2 Aug 2017 16:17:33 +0200 Subject: [PATCH 2/2] Added missing space --- osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs b/osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs index e1e1e40f37..433c23284f 100644 --- a/osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs +++ b/osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs @@ -458,7 +458,7 @@ namespace osu.Game.Beatmaps.Formats case Section.HitObjects: // If the ruleset wasn't specified, assume the osu!standard ruleset. - if(parser == null) + if (parser == null) parser = new Rulesets.Objects.Legacy.Osu.ConvertHitObjectParser(); var obj = parser.Parse(line);