Merge pull request #13774 from LumpBloom7/fix-incorrect-first-window

Fix nested HitWindows not being considered if parent HitWindow is empty
This commit is contained in:
Dan Balasescu
2021-07-05 13:54:00 +09:00
committed by GitHub
2 changed files with 129 additions and 6 deletions

View File

@ -489,15 +489,15 @@ namespace osu.Game.Rulesets.UI
{
get
{
foreach (var h in Objects)
foreach (var hitObject in Objects)
{
if (h.HitWindows.WindowFor(HitResult.Miss) > 0)
return h.HitWindows;
if (hitObject.HitWindows.WindowFor(HitResult.Miss) > 0)
return hitObject.HitWindows;
foreach (var n in h.NestedHitObjects)
foreach (var nested in hitObject.NestedHitObjects)
{
if (h.HitWindows.WindowFor(HitResult.Miss) > 0)
return n.HitWindows;
if (nested.HitWindows.WindowFor(HitResult.Miss) > 0)
return nested.HitWindows;
}
}