Merge branch 'mania-distance-snap-grid' into editor-clock-cache

This commit is contained in:
Dean Herbert
2020-05-22 16:44:02 +09:00
10 changed files with 341 additions and 5 deletions

View File

@ -257,7 +257,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
}
}
if (state.Value != ArmedState.Idle && LifetimeEnd == double.MaxValue || HitObject.HitWindows == null)
if (LifetimeEnd == double.MaxValue && (state.Value != ArmedState.Idle || HitObject.HitWindows == null))
Expire();
// apply any custom state overrides