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

Merge remote-tracking branch 'upstream/master' into toolbar-rulesets-refactor

Browse Source
This commit is contained in:
Andrei Zavatski
2019-06-17 23:12:55 +03:00
parent e5a6d920cd 0d4c6d2cbc
commit cecbcd21b2
53 changed files with 702 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -167,6 +167,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
{
OnRevertResult?.Invoke(this, Result);
Result.TimeOffset = 0;
Result.Type = HitResult.None;
State.Value = ArmedState.Idle;
}
@ -243,6 +244,10 @@ namespace osu.Game.Rulesets.Objects.Drawables
/// <returns>Whether a scoring result has occurred from this <see cref="DrawableHitObject"/> or any nested <see cref="DrawableHitObject"/>.</returns>
protected bool UpdateResult(bool userTriggered)
{
// It's possible for input to get into a bad state when rewinding gameplay, so results should not be processed
if (Time.Elapsed < 0)
return false;
judgementOccurred = false;
if (AllJudged)