Fix possible nullref exceptions

This commit is contained in:
smoogipoo 2017-12-21 23:02:46 +09:00
parent 790aa8be2a
commit ac1d27e925
4 changed files with 10 additions and 5 deletions

View File

@ -130,6 +130,7 @@ namespace osu.Game.Rulesets.Catch.Objects
}); });
} }
if (controlPointInfo != null && difficulty != null)
ticks.ForEach(t => t.ApplyDefaults(controlPointInfo, difficulty)); ticks.ForEach(t => t.ApplyDefaults(controlPointInfo, difficulty));
return ticks; return ticks;

View File

@ -101,6 +101,7 @@ namespace osu.Game.Rulesets.Mania.Objects
Column = Column Column = Column
}; };
if (controlPointInfo != null && difficulty != null)
tick.ApplyDefaults(controlPointInfo, difficulty); tick.ApplyDefaults(controlPointInfo, difficulty);
ret.Add(tick); ret.Add(tick);

View File

@ -146,6 +146,7 @@ namespace osu.Game.Rulesets.Osu.Objects
})) }))
}; };
if (controlPointInfo != null && difficulty != null)
ret.ApplyDefaults(controlPointInfo, difficulty); ret.ApplyDefaults(controlPointInfo, difficulty);
yield return ret; yield return ret;
@ -178,6 +179,7 @@ namespace osu.Game.Rulesets.Osu.Objects
ComboColour = ComboColour, ComboColour = ComboColour,
}; };
if (controlPointInfo != null && difficulty != null)
ret.ApplyDefaults(controlPointInfo, difficulty); ret.ApplyDefaults(controlPointInfo, difficulty);
yield return ret; yield return ret;

View File

@ -96,6 +96,7 @@ namespace osu.Game.Rulesets.Taiko.Objects
})) }))
}; };
if (controlPointInfo != null && difficulty != null)
tick.ApplyDefaults(controlPointInfo, difficulty); tick.ApplyDefaults(controlPointInfo, difficulty);
ret.Add(tick); ret.Add(tick);