From 88112801eba65f5602bc8f5fe16d8c61390f3d79 Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Tue, 10 Nov 2020 18:56:09 +0900 Subject: [PATCH] Remove result storage from hitobject --- osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 6 ------ osu.Game/Rulesets/Objects/HitObject.cs | 6 ------ 2 files changed, 12 deletions(-) diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs index 77c4ea42df..7a4e136553 100644 --- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs +++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs @@ -166,16 +166,10 @@ namespace osu.Game.Rulesets.Objects.Drawables HitObject = hitObject ?? throw new InvalidOperationException($"Cannot apply a null {nameof(HitObject)}."); - // Copy any existing result from the hitobject (required for rewind / judgement revert). - Result = HitObject.Result; - // Ensure this DHO has a result. Result ??= CreateResult(HitObject.CreateJudgement()) ?? throw new InvalidOperationException($"{GetType().ReadableName()} must provide a {nameof(JudgementResult)} through {nameof(CreateResult)}."); - // Ensure the hitobject has a result. - HitObject.Result = Result; - foreach (var h in HitObject.NestedHitObjects) { var drawableNested = CreateNestedHitObject(h) ?? throw new InvalidOperationException($"{nameof(CreateNestedHitObject)} returned null for {h.GetType().ReadableName()}."); diff --git a/osu.Game/Rulesets/Objects/HitObject.cs b/osu.Game/Rulesets/Objects/HitObject.cs index 9ef3ff9c4a..826d411822 100644 --- a/osu.Game/Rulesets/Objects/HitObject.cs +++ b/osu.Game/Rulesets/Objects/HitObject.cs @@ -12,7 +12,6 @@ using osu.Game.Audio; using osu.Game.Beatmaps; using osu.Game.Beatmaps.ControlPoints; using osu.Game.Rulesets.Judgements; -using osu.Game.Rulesets.Objects.Drawables; using osu.Game.Rulesets.Objects.Types; using osu.Game.Rulesets.Scoring; @@ -169,11 +168,6 @@ namespace osu.Game.Rulesets.Objects /// [NotNull] protected virtual HitWindows CreateHitWindows() => new HitWindows(); - - /// - /// The result this was judged with. Used internally for rewinding within . - /// - internal JudgementResult Result; } public static class HitObjectExtensions