1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-15 19:42:56 +08:00

Merge branch 'master' into combo-colour-independence

This commit is contained in:
Dan Balasescu 2020-02-20 16:17:12 +09:00 committed by GitHub
commit 6759310d2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -34,9 +34,14 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
foreach (var obj in Beatmap.HitObjects.OfType<CatchHitObject>())
{
obj.IndexInBeatmap = index++;
obj.IndexInBeatmap = index;
foreach (var nested in obj.NestedHitObjects.OfType<CatchHitObject>())
nested.IndexInBeatmap = index;
if (obj.LastInCombo && obj.NestedHitObjects.LastOrDefault() is IHasComboInformation lastNested)
lastNested.LastInCombo = true;
index++;
}
}