h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-05-26 00:50:16 +08:00
Code Issues Releases Wiki Activity

Fix possible nullref exceptions

Browse Source
This commit is contained in:
smoogipoo
2017-12-21 23:02:46 +09:00
Unverified
parent 790aa8be2a
commit ac1d27e925
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
+2 -1
View File
@@ -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;
}
osu.Game.Rulesets.Mania/Objects/HoldNote.cs
+2 -1
View File
@@ -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);
}
osu.Game.Rulesets.Osu/Objects/Slider.cs
+4 -2
View File
@@ -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;
}
osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
+2 -1
View File
@@ -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;