RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-02-17 10:57:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix replay handler nullref crashes

Browse Source
This commit is contained in:
Dean Herbert 2019-03-31 01:33:56 +09:00
parent 6738bd54c0
commit 5d91c3bcfc
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Rulesets.Osu/Replays/OsuFramedReplayInputHandler.cs
View File

@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Osu.Replays
{ {
} }
protected override bool IsImportant(OsuReplayFrame frame) => frame?.Actions.Any() ?? false; protected override bool IsImportant(OsuReplayFrame frame) => frame.Actions.Any();
protected Vector2? Position protected Vector2? Position
{ {

25
osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
View File

@ -3,6 +3,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using JetBrains.Annotations;
using osu.Framework.Input.StateChanges; using osu.Framework.Input.StateChanges;
using osu.Game.Input.Handlers; using osu.Game.Input.Handlers;
using osu.Game.Replays; using osu.Game.Replays;
@ -87,14 +88,24 @@ namespace osu.Game.Rulesets.Replays
protected bool HasFrames => Frames.Count > 0; protected bool HasFrames => Frames.Count > 0;
private bool inImportantSection => private bool inImportantSection
HasFrames && FrameAccuratePlayback && {
//a button is in a pressed state get
IsImportant(currentDirection > 0 ? CurrentFrame : NextFrame) && {
//the next frame is within an allowable time span if (!HasFrames || !FrameAccuratePlayback)
Math.Abs(CurrentTime - NextFrame?.Time ?? 0) <= AllowedImportantTimeSpan; return false;
protected virtual bool IsImportant(TFrame frame) => false; var checkFrame = currentDirection > 0 ? CurrentFrame : NextFrame;
if (checkFrame == null)
return false;
return IsImportant(currentDirection > 0 ? CurrentFrame : NextFrame) && //a button is in a pressed state
Math.Abs(CurrentTime - NextFrame?.Time ?? 0) <= AllowedImportantTimeSpan; //the next frame is within an allowable time span
}
}
protected virtual bool IsImportant([NotNull] TFrame frame) => false;
/// <summary> /// <summary>
/// Update the current frame based on an incoming time value. /// Update the current frame based on an incoming time value.