RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1493 from smoogipoo/rewinding-robustness 

Fix nested hit object judgements not being reverted
This commit is contained in:
Dan Balasescu 2017-11-13 19:52:14 +09:00 committed by GitHub
parent c52da05b42 e12d0c5875
commit 082e51969d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Input/Bindings/DatabasedKeyBindingInputManager.cs
View File

@ -51,7 +51,9 @@ private void load(KeyBindingStore keyBindings)
protected override void Dispose(bool isDisposing)
{
base.Dispose(isDisposing);
store.KeyBindingChanged -= ReloadMappings;
if (store != null)
store.KeyBindingChanged -= ReloadMappings;
}
protected override void ReloadMappings() => KeyBindings = store.Query(ruleset?.ID, variant).ToList();

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

@ -212,6 +212,7 @@ protected virtual void AddNested(DrawableHitObject<TObject> h)
nestedHitObjects = new List<DrawableHitObject<TObject>>();
h.OnJudgement += (d, j) => OnJudgement?.Invoke(d, j);
h.OnJudgementRemoved += (d, j) => OnJudgementRemoved?.Invoke(d, j);
nestedHitObjects.Add(h);
}

2
osu.Game/Rulesets/UI/RulesetContainer.cs
View File

@ -242,7 +242,7 @@ private void loadObjects()
OnJudgement?.Invoke(j);
};
drawableObject.OnJudgementRemoved += (d, j) => { OnJudgementRemoved?.Invoke(j); };
drawableObject.OnJudgementRemoved += (d, j) => OnJudgementRemoved?.Invoke(j);
Playfield.Add(drawableObject);
}