sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-24 23:17:25 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix post-merge breakage

Browse Source
This commit is contained in:
Dean Herbert 2017-05-11 17:16:01 +09:00
parent bc54b3c85f
commit 6fd95e0c52
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
View File

@ -34,11 +34,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
public TJudgement Judgement; public TJudgement Judgement;
/// <summary>
/// Whether this hit object has been judged.
/// </summary>
public virtual bool Judged => (Judgement?.Result ?? HitResult.None) != HitResult.None;
protected abstract TJudgement CreateJudgement(); protected abstract TJudgement CreateJudgement();
protected abstract void UpdateState(ArmedState state); protected abstract void UpdateState(ArmedState state);
@ -82,7 +77,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
/// <summary> /// <summary>
/// Whether this hit object and all of its nested hit objects have been judged. /// Whether this hit object and all of its nested hit objects have been judged.
/// </summary> /// </summary>
public sealed override bool Judged => base.Judged && (NestedHitObjects?.All(h => h.Judged) ?? true); public bool Judged => (Judgement?.Result ?? HitResult.None) != HitResult.None && (NestedHitObjects?.All(h => h.Judged) ?? true);
protected DrawableHitObject(TObject hitObject) protected DrawableHitObject(TObject hitObject)
{ {