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

Fix nullrefs

Browse Source
This commit is contained in:
smoogipoo 2019-02-18 14:47:31 +09:00
parent 8eba94e8c9
commit e02ae927b3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
View File

@ -3,6 +3,7 @@
using System; using System;
using osu.Game.Rulesets.Catch.Difficulty.Preprocessing; using osu.Game.Rulesets.Catch.Difficulty.Preprocessing;
using osu.Game.Rulesets.Catch.Objects;
using osu.Game.Rulesets.Catch.UI; using osu.Game.Rulesets.Catch.UI;
using osu.Game.Rulesets.Difficulty.Preprocessing; using osu.Game.Rulesets.Difficulty.Preprocessing;
using osu.Game.Rulesets.Difficulty.Skills; using osu.Game.Rulesets.Difficulty.Skills;
@ -23,7 +24,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Skills
protected override double StrainValueOf(DifficultyHitObject current) protected override double StrainValueOf(DifficultyHitObject current)
{ {
var catchCurrent = (CatchDifficultyHitObject)current; var catchCurrent = (CatchDifficultyHitObject)current;
var catchPrevious = (CatchDifficultyHitObject)Previous[0]; var catchPrevious = Previous.Count > 0 ? (CatchDifficultyHitObject)Previous[0] : null;
var sqrtStrain = Math.Sqrt(catchCurrent.StrainTime); var sqrtStrain = Math.Sqrt(catchCurrent.StrainTime);
@ -33,7 +34,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Skills
if (Math.Abs(catchCurrent.MovementDistance) > 0.1) if (Math.Abs(catchCurrent.MovementDistance) > 0.1)
{ {
if (catchPrevious.MovementDistance > 0.1 && Math.Sign(catchCurrent.MovementDistance) != Math.Sign(catchPrevious.MovementDistance)) if (catchPrevious != null && catchPrevious.MovementDistance > 0.1 && Math.Sign(catchCurrent.MovementDistance) != Math.Sign(catchPrevious.MovementDistance))
{ {
double bonusFactor = Math.Min(absolute_player_positioning_error, Math.Abs(catchCurrent.MovementDistance)) / absolute_player_positioning_error; double bonusFactor = Math.Min(absolute_player_positioning_error, Math.Abs(catchCurrent.MovementDistance)) / absolute_player_positioning_error;
@ -49,7 +50,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Skills
} }
// Bonus for "almost" hyperdashes at corner points // Bonus for "almost" hyperdashes at corner points
if (catchPrevious.BaseObject.DistanceToHyperDash <= 10.0f / CatchPlayfield.BASE_WIDTH) if (catchPrevious?.BaseObject is Fruit && catchPrevious.BaseObject.DistanceToHyperDash <= 10.0f / CatchPlayfield.BASE_WIDTH)
{ {
if (!catchPrevious.BaseObject.HyperDash) if (!catchPrevious.BaseObject.HyperDash)
bonus += 1.0; bonus += 1.0;