From e8ce5a7e6c60eec3ec0a5cad9fd77384216aa95f Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Tue, 16 Oct 2018 18:27:09 +0900 Subject: [PATCH] Fix crashes when manually creating sliders --- osu.Game.Rulesets.Osu/Objects/Slider.cs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs index 844dcfb933..c33e089178 100644 --- a/osu.Game.Rulesets.Osu/Objects/Slider.cs +++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs @@ -130,7 +130,7 @@ namespace osu.Game.Rulesets.Osu.Objects { StartTime = StartTime, Position = Position, - Samples = NodeSamples[0], + Samples = getNodeSamples(0), SampleControlPoint = SampleControlPoint, IndexInCurrentCombo = IndexInCurrentCombo, ComboIndex = ComboIndex, @@ -210,11 +210,18 @@ namespace osu.Game.Rulesets.Osu.Objects Position = Position + Curve.PositionAt(repeat % 2), StackHeight = StackHeight, Scale = Scale, - Samples = new List(NodeSamples[1 + repeatIndex]) + Samples = getNodeSamples(1 + repeatIndex) }); } } + private List getNodeSamples(int nodeIndex) + { + if (nodeIndex < NodeSamples.Count) + return NodeSamples[nodeIndex]; + return Samples; + } + public override Judgement CreateJudgement() => new OsuJudgement(); } }