From ac1d27e925e80f95d939bf30d72faa563afe5a29 Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Thu, 21 Dec 2017 23:02:46 +0900 Subject: [PATCH] Fix possible nullref exceptions --- osu.Game.Rulesets.Catch/Objects/JuiceStream.cs | 3 ++- osu.Game.Rulesets.Mania/Objects/HoldNote.cs | 3 ++- osu.Game.Rulesets.Osu/Objects/Slider.cs | 6 ++++-- osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs | 3 ++- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs index 4de8cd897f..b0540b2a4d 100644 --- a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs +++ b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs @@ -130,7 +130,8 @@ namespace osu.Game.Rulesets.Catch.Objects }); } - ticks.ForEach(t => t.ApplyDefaults(controlPointInfo, difficulty)); + if (controlPointInfo != null && difficulty != null) + ticks.ForEach(t => t.ApplyDefaults(controlPointInfo, difficulty)); return ticks; } diff --git a/osu.Game.Rulesets.Mania/Objects/HoldNote.cs b/osu.Game.Rulesets.Mania/Objects/HoldNote.cs index 2b68dcf62c..2a62eaa2ef 100644 --- a/osu.Game.Rulesets.Mania/Objects/HoldNote.cs +++ b/osu.Game.Rulesets.Mania/Objects/HoldNote.cs @@ -101,7 +101,8 @@ namespace osu.Game.Rulesets.Mania.Objects Column = Column }; - tick.ApplyDefaults(controlPointInfo, difficulty); + if (controlPointInfo != null && difficulty != null) + tick.ApplyDefaults(controlPointInfo, difficulty); ret.Add(tick); } diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs index 5449466f2e..af50667d42 100644 --- a/osu.Game.Rulesets.Osu/Objects/Slider.cs +++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs @@ -146,7 +146,8 @@ namespace osu.Game.Rulesets.Osu.Objects })) }; - ret.ApplyDefaults(controlPointInfo, difficulty); + if (controlPointInfo != null && difficulty != null) + ret.ApplyDefaults(controlPointInfo, difficulty); yield return ret; } @@ -178,7 +179,8 @@ namespace osu.Game.Rulesets.Osu.Objects ComboColour = ComboColour, }; - ret.ApplyDefaults(controlPointInfo, difficulty); + if (controlPointInfo != null && difficulty != null) + ret.ApplyDefaults(controlPointInfo, difficulty); yield return ret; } diff --git a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs index a2503b8060..ff20a16c7b 100644 --- a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs +++ b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs @@ -96,7 +96,8 @@ namespace osu.Game.Rulesets.Taiko.Objects })) }; - tick.ApplyDefaults(controlPointInfo, difficulty); + if (controlPointInfo != null && difficulty != null) + tick.ApplyDefaults(controlPointInfo, difficulty); ret.Add(tick); first = false;