sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 08:49:59 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-dho-lifetimes-via-judgements' into fix-barline-lifetimes

Browse Source
This commit is contained in:
Dean Herbert
2020-02-23 14:30:23 +09:00
parent 0e29d3c4a2 401bf1c928
commit be08e69862
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,12 +99,9 @@ namespace osu.Game.Rulesets.Objects.Drawables
{ {
var judgement = HitObject.CreateJudgement(); var judgement = HitObject.CreateJudgement();
if (judgement != null) Result = CreateResult(judgement);
{ if (Result == null)
Result = CreateResult(judgement); throw new InvalidOperationException($"{GetType().ReadableName()} must provide a {nameof(JudgementResult)} through {nameof(CreateResult)}.");
if (Result == null)
throw new InvalidOperationException($"{GetType().ReadableName()} must provide a {nameof(JudgementResult)} through {nameof(CreateResult)}.");
}
loadSamples(); loadSamples();
} }

2
osu.Game/Rulesets/Scoring/JudgementProcessor.cs
View File

@ -125,8 +125,6 @@ namespace osu.Game.Rulesets.Scoring
simulate(nested); simulate(nested);
var judgement = obj.CreateJudgement(); var judgement = obj.CreateJudgement();
if (judgement == null)
return;
var result = CreateResult(obj, judgement); var result = CreateResult(obj, judgement);
if (result == null) if (result == null)