h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 13:47:38 +08:00
Code Issues Releases Wiki Activity

Safeguard method against invalid invocation

Browse Source
This commit is contained in:
Dan Balasescu 2022-03-08 22:14:58 +09:00
parent f1c40bd9ed
commit 6fd8b4d891
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
osu.Game/Rulesets/Scoring/ScoreProcessor.cs
View File

@ -7,6 +7,7 @@ using System.Diagnostics;
using System.Linq; using System.Linq;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Utils; using osu.Framework.Utils;
using osu.Game.Beatmaps;
using osu.Game.Extensions; using osu.Game.Extensions;
using osu.Game.Rulesets.Judgements; using osu.Game.Rulesets.Judgements;
using osu.Game.Rulesets.Mods; using osu.Game.Rulesets.Mods;
@ -100,6 +101,7 @@ namespace osu.Game.Rulesets.Scoring
private double rollingMaxBaseScore; private double rollingMaxBaseScore;
private double baseScore; private double baseScore;
private int basicHitObjects; private int basicHitObjects;
private bool beatmapApplied;
private readonly Dictionary<HitResult, int> scoreResultCounts = new Dictionary<HitResult, int>(); private readonly Dictionary<HitResult, int> scoreResultCounts = new Dictionary<HitResult, int>();
private readonly List<HitEvent> hitEvents = new List<HitEvent>(); private readonly List<HitEvent> hitEvents = new List<HitEvent>();
@ -135,6 +137,12 @@ namespace osu.Game.Rulesets.Scoring
}; };
} }
public override void ApplyBeatmap(IBeatmap beatmap)
{
base.ApplyBeatmap(beatmap);
beatmapApplied = true;
}
protected sealed override void ApplyResultInternal(JudgementResult result) protected sealed override void ApplyResultInternal(JudgementResult result)
{ {
result.ComboAtJudgement = Combo.Value; result.ComboAtJudgement = Combo.Value;
@ -264,6 +272,9 @@ namespace osu.Game.Rulesets.Scoring
/// <returns>The total score in the given <see cref="ScoringMode"/>.</returns> /// <returns>The total score in the given <see cref="ScoringMode"/>.</returns>
public double ComputePartialScore(ScoringMode mode, ScoreInfo scoreInfo) public double ComputePartialScore(ScoringMode mode, ScoreInfo scoreInfo)
{ {
if (!beatmapApplied)
throw new InvalidOperationException($"Cannot compute partial score without calling {nameof(ApplyBeatmap)}.");
extractFromStatistics(scoreInfo.Ruleset.CreateInstance(), extractFromStatistics(scoreInfo.Ruleset.CreateInstance(),
scoreInfo.Statistics, scoreInfo.Statistics,
out double extractedBaseScore, out double extractedBaseScore,