RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-03-05 10:58:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Properly annotate method to allow null

Browse Source
This commit is contained in:
Dan Balasescu 2022-06-20 16:52:01 +09:00
parent ca287d0936
commit 16281f4a48
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Beatmaps/ControlPoints/ControlPoint.cs
View File

@ -28,7 +28,7 @@ namespace osu.Game.Beatmaps.ControlPoints
/// </summary> /// </summary>
/// <param name="existing">An existing control point to compare with.</param> /// <param name="existing">An existing control point to compare with.</param>
/// <returns>Whether this <see cref="ControlPoint"/> is redundant when placed alongside <paramref name="existing"/>.</returns> /// <returns>Whether this <see cref="ControlPoint"/> is redundant when placed alongside <paramref name="existing"/>.</returns>
public abstract bool IsRedundant(ControlPoint existing); public abstract bool IsRedundant(ControlPoint? existing);
/// <summary> /// <summary>
/// Create an unbound copy of this control point. /// Create an unbound copy of this control point.

2
osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
View File

@ -40,7 +40,7 @@ namespace osu.Game.Beatmaps.ControlPoints
set => SliderVelocityBindable.Value = value; set => SliderVelocityBindable.Value = value;
} }
public override bool IsRedundant(ControlPoint existing) public override bool IsRedundant(ControlPoint? existing)
=> existing is DifficultyControlPoint existingDifficulty => existing is DifficultyControlPoint existingDifficulty
&& SliderVelocity == existingDifficulty.SliderVelocity; && SliderVelocity == existingDifficulty.SliderVelocity;

2
osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs
View File

@ -67,7 +67,7 @@ namespace osu.Game.Beatmaps.ControlPoints
set => KiaiModeBindable.Value = value; set => KiaiModeBindable.Value = value;
} }
public override bool IsRedundant(ControlPoint existing) public override bool IsRedundant(ControlPoint? existing)
=> !OmitFirstBarLine => !OmitFirstBarLine
&& existing is EffectControlPoint existingEffect && existing is EffectControlPoint existingEffect
&& KiaiMode == existingEffect.KiaiMode && KiaiMode == existingEffect.KiaiMode

2
osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
View File

@ -72,7 +72,7 @@ namespace osu.Game.Beatmaps.ControlPoints
public virtual HitSampleInfo ApplyTo(HitSampleInfo hitSampleInfo) public virtual HitSampleInfo ApplyTo(HitSampleInfo hitSampleInfo)
=> hitSampleInfo.With(newBank: hitSampleInfo.Bank ?? SampleBank, newVolume: hitSampleInfo.Volume > 0 ? hitSampleInfo.Volume : SampleVolume); => hitSampleInfo.With(newBank: hitSampleInfo.Bank ?? SampleBank, newVolume: hitSampleInfo.Volume > 0 ? hitSampleInfo.Volume : SampleVolume);
public override bool IsRedundant(ControlPoint existing) public override bool IsRedundant(ControlPoint? existing)
=> existing is SampleControlPoint existingSample => existing is SampleControlPoint existingSample
&& SampleBank == existingSample.SampleBank && SampleBank == existingSample.SampleBank
&& SampleVolume == existingSample.SampleVolume; && SampleVolume == existingSample.SampleVolume;

2
osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
View File

@ -69,7 +69,7 @@ namespace osu.Game.Beatmaps.ControlPoints
public double BPM => 60000 / BeatLength; public double BPM => 60000 / BeatLength;
// Timing points are never redundant as they can change the time signature. // Timing points are never redundant as they can change the time signature.
public override bool IsRedundant(ControlPoint existing) => false; public override bool IsRedundant(ControlPoint? existing) => false;
public override void CopyFrom(ControlPoint other) public override void CopyFrom(ControlPoint other)
{ {

2
osu.Game/Beatmaps/Formats/LegacyDecoder.cs
View File

@ -213,7 +213,7 @@ namespace osu.Game.Beatmaps.Formats
return baseInfo; return baseInfo;
} }
public override bool IsRedundant(ControlPoint existing) public override bool IsRedundant(ControlPoint? existing)
=> base.IsRedundant(existing) => base.IsRedundant(existing)
&& existing is LegacySampleControlPoint existingSample && existing is LegacySampleControlPoint existingSample
&& CustomSampleBank == existingSample.CustomSampleBank; && CustomSampleBank == existingSample.CustomSampleBank;