h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-16 15:03:12 +08:00
Code Issues Releases Wiki Activity

Remove judgementOccurred from DrawableHitObject (#5986)

Browse Source 
Remove judgementOccurred from DrawableHitObject

Co-authored-by: Dean Herbert <pe@ppy.sh>
This commit is contained in:
Dean Herbert 2019-09-06 15:42:37 +09:00 committed by GitHub
commit 4a1c90a048
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,8 +76,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
/// </summary> /// </summary>
public JudgementResult Result { get; private set; } public JudgementResult Result { get; private set; }
private bool judgementOccurred;
public override bool RemoveWhenNotAlive => false; public override bool RemoveWhenNotAlive => false;
public override bool RemoveCompletedTransforms => false; public override bool RemoveCompletedTransforms => false;
protected override bool RequiresChildrenUpdate => true; protected override bool RequiresChildrenUpdate => true;
@ -346,8 +344,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
if (!Result.HasResult) if (!Result.HasResult)
throw new InvalidOperationException($"{GetType().ReadableName()} applied a {nameof(JudgementResult)} but did not update {nameof(JudgementResult.Type)}."); throw new InvalidOperationException($"{GetType().ReadableName()} applied a {nameof(JudgementResult)} but did not update {nameof(JudgementResult.Type)}.");
judgementOccurred = true;
// Ensure that the judgement is given a valid time offset, because this may not get set by the caller // Ensure that the judgement is given a valid time offset, because this may not get set by the caller
var endTime = (HitObject as IHasEndTime)?.EndTime ?? HitObject.StartTime; var endTime = (HitObject as IHasEndTime)?.EndTime ?? HitObject.StartTime;
Result.TimeOffset = Time.Current - endTime; Result.TimeOffset = Time.Current - endTime;
@ -380,21 +376,13 @@ namespace osu.Game.Rulesets.Objects.Drawables
if (Time.Elapsed < 0) if (Time.Elapsed < 0)
return false; return false;
judgementOccurred = false; if (Judged)
if (AllJudged)
return false; return false;
foreach (var d in NestedHitObjects)
judgementOccurred |= d.UpdateResult(userTriggered);
if (judgementOccurred || Judged)
return judgementOccurred;
var endTime = (HitObject as IHasEndTime)?.EndTime ?? HitObject.StartTime; var endTime = (HitObject as IHasEndTime)?.EndTime ?? HitObject.StartTime;
CheckForResult(userTriggered, Time.Current - endTime); CheckForResult(userTriggered, Time.Current - endTime);
return judgementOccurred; return Judged;
} }
/// <summary> /// <summary>