h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 16:52:54 +08:00
Code Issues Releases Wiki Activity

Invoke RevertResult on parent DHO when nested DHO is reverted

Browse Source 
The behaviour described above was removed in
812a4b412a, thus henceforth
contradicting `RevertResult`'s xmldoc. As it is relied on by some
external rulesets, bring it back to unbreak them.
This commit is contained in:
Bartłomiej Dach 2023-04-11 17:59:33 +02:00
parent 0cc92ce5f9
commit db86ced4b4
No known key found for this signature in database
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -239,6 +239,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
OnNestedDrawableCreated?.Invoke(drawableNested); OnNestedDrawableCreated?.Invoke(drawableNested);
drawableNested.OnNewResult += onNewResult; drawableNested.OnNewResult += onNewResult;
drawableNested.OnRevertResult += onNestedRevertResult;
drawableNested.ApplyCustomUpdateState += onApplyCustomUpdateState; drawableNested.ApplyCustomUpdateState += onApplyCustomUpdateState;
// This is only necessary for non-pooled DHOs. For pooled DHOs, this is handled inside GetPooledDrawableRepresentation(). // This is only necessary for non-pooled DHOs. For pooled DHOs, this is handled inside GetPooledDrawableRepresentation().
@ -312,6 +313,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
foreach (var obj in nestedHitObjects) foreach (var obj in nestedHitObjects)
{ {
obj.OnNewResult -= onNewResult; obj.OnNewResult -= onNewResult;
obj.OnRevertResult -= onNestedRevertResult;
obj.ApplyCustomUpdateState -= onApplyCustomUpdateState; obj.ApplyCustomUpdateState -= onApplyCustomUpdateState;
} }
@ -376,6 +378,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
OnRevertResult?.Invoke(this, Result); OnRevertResult?.Invoke(this, Result);
} }
private void onNestedRevertResult(DrawableHitObject drawableHitObject, JudgementResult result) => OnRevertResult?.Invoke(drawableHitObject, result);
private void onApplyCustomUpdateState(DrawableHitObject drawableHitObject, ArmedState state) => ApplyCustomUpdateState?.Invoke(drawableHitObject, state); private void onApplyCustomUpdateState(DrawableHitObject drawableHitObject, ArmedState state) => ApplyCustomUpdateState?.Invoke(drawableHitObject, state);
private void onDefaultsApplied(HitObject hitObject) private void onDefaultsApplied(HitObject hitObject)