h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-13 19:52:55 +08:00
Code Issues Releases Wiki Activity

Move result creation to load(), add exceptions

Browse Source
This commit is contained in:
smoogipoo 2018-08-06 11:07:05 +09:00
parent b35817c877
commit 754f3c8621
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,6 +6,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Configuration; using osu.Framework.Configuration;
using osu.Framework.Extensions.TypeExtensions;
using osu.Game.Audio; using osu.Game.Audio;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Rulesets.Judgements; using osu.Game.Rulesets.Judgements;
@ -70,7 +71,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
/// <summary> /// <summary>
/// The scoring result of this <see cref="DrawableHitObject"/>. /// The scoring result of this <see cref="DrawableHitObject"/>.
/// </summary> /// </summary>
public readonly JudgementResult Result; public JudgementResult Result { get; private set; }
private bool judgementOccurred; private bool judgementOccurred;
@ -87,14 +88,19 @@ namespace osu.Game.Rulesets.Objects.Drawables
protected DrawableHitObject(HitObject hitObject) protected DrawableHitObject(HitObject hitObject)
{ {
HitObject = hitObject; HitObject = hitObject;
if (hitObject.Judgement != null)
Result = CreateJudgementResult(hitObject.Judgement);
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load() private void load()
{ {
if (HitObject.Judgement != null)
{
Result = CreateJudgementResult(HitObject.Judgement);
if (Result == null)
throw new InvalidOperationException($"{GetType().ReadableName()} must provide a {nameof(JudgementResult)} through {nameof(CreateJudgementResult)}.");
}
var samples = GetSamples().ToArray(); var samples = GetSamples().ToArray();
if (samples.Any()) if (samples.Any())
@ -188,6 +194,9 @@ namespace osu.Game.Rulesets.Objects.Drawables
{ {
application?.Invoke(Result); application?.Invoke(Result);
if (!Result.HasResult)
throw new InvalidOperationException($"{GetType().ReadableName()} applied a {nameof(JudgementResult)} but did not update {nameof(JudgementResult.Type)}.");
judgementOccurred = true; 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