h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-27 12:42:54 +08:00
Code Issues Releases Wiki Activity

Fix taiko nullrefing

Browse Source
This commit is contained in:
smoogipoo 2019-02-14 14:06:48 +09:00
parent 25d85b6eb4
commit cb17cbcdc4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Rulesets.Taiko/Difficulty/Skills/Strain.cs
View File

@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
double addition = 1; double addition = 1;
// We get an extra addition if we are not a slider or spinner // We get an extra addition if we are not a slider or spinner
if (Previous[0].BaseObject is Hit && current.BaseObject is Hit && current.BaseObject.StartTime - Previous[0].BaseObject.StartTime < 1000) if (current.LastObject is Hit && current.BaseObject is Hit && current.DeltaTime < 1000)
{ {
if (hasRhythmChange(current)) if (hasRhythmChange(current))
addition += 1; addition += 1;
@ -47,7 +47,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
private bool hasRhythmChange(DifficultyHitObject current) private bool hasRhythmChange(DifficultyHitObject current)
{ {
// We don't want a division by zero if some random mapper decides to put two HitObjects at the same time. // We don't want a division by zero if some random mapper decides to put two HitObjects at the same time.
if (current.DeltaTime == 0 || Previous[0].DeltaTime == 0) if (current.DeltaTime == 0 || Previous.Count == 0 || Previous[0].DeltaTime == 0)
return false; return false;
double timeElapsedRatio = Math.Max(Previous[0].DeltaTime / current.DeltaTime, current.DeltaTime / Previous[0].DeltaTime); double timeElapsedRatio = Math.Max(Previous[0].DeltaTime / current.DeltaTime, current.DeltaTime / Previous[0].DeltaTime);