Merge branch 'master' into fix-placement-default-application

This commit is contained in:
Dan Balasescu
2020-05-25 14:17:28 +09:00
committed by GitHub
17 changed files with 429 additions and 33 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