sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-07 16:43:52 +09:00
Code Issues Packages Projects Releases Wiki Activity

More generic catching for broken hitobject strings

Browse Source
This commit is contained in:
MillhioreF
2017-08-10 01:50:20 -05:00
parent 2e5a7374a8
commit e42c279229
1 changed files with 121 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
View File

@ -18,10 +18,10 @@ namespace osu.Game.Rulesets.Objects.Legacy
internal abstract class ConvertHitObjectParser : HitObjectParser internal abstract class ConvertHitObjectParser : HitObjectParser
{ {
public override HitObject Parse(string text) public override HitObject Parse(string text)
{
try
{ {
string[] split = text.Split(','); string[] split = text.Split(',');
if (split.Length > 11)
throw new InvalidOperationException("One or more hit objects were malformed.");
ConvertHitObjectType type = (ConvertHitObjectType)int.Parse(split[3]) & ~ConvertHitObjectType.ColourHax; ConvertHitObjectType type = (ConvertHitObjectType)int.Parse(split[3]) & ~ConvertHitObjectType.ColourHax;
bool combo = type.HasFlag(ConvertHitObjectType.NewCombo); bool combo = type.HasFlag(ConvertHitObjectType.NewCombo);
@ -164,6 +164,11 @@ namespace osu.Game.Rulesets.Objects.Legacy
return result; return result;
} }
catch (FormatException)
{
throw new FormatException("One or more hit objects were malformed.");
}
}
private void readCustomSampleBanks(string str, SampleBankInfo bankInfo) private void readCustomSampleBanks(string str, SampleBankInfo bankInfo)
{ {