h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-21 14:47:25 +08:00
Code Issues Releases Wiki Activity

Merge pull request #12014 from peppy/fix-eap7-inspections

Browse Source 
Fix a couple of new inspections introduced in Rider EAPs
This commit is contained in:
Dean Herbert 2021-03-15 14:26:36 +09:00 committed by GitHub
commit 712e7bc7bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/Beatmaps/BeatmapConverter.cs
View File

@ -17,12 +17,12 @@ namespace osu.Game.Beatmaps
public abstract class BeatmapConverter<T> : IBeatmapConverter public abstract class BeatmapConverter<T> : IBeatmapConverter
where T : HitObject where T : HitObject
{ {
private event Action<HitObject, IEnumerable<HitObject>> ObjectConverted; private event Action<HitObject, IEnumerable<HitObject>> objectConverted;
event Action<HitObject, IEnumerable<HitObject>> IBeatmapConverter.ObjectConverted event Action<HitObject, IEnumerable<HitObject>> IBeatmapConverter.ObjectConverted
{ {
add => ObjectConverted += value; add => objectConverted += value;
remove => ObjectConverted -= value; remove => objectConverted -= value;
} }
public IBeatmap Beatmap { get; } public IBeatmap Beatmap { get; }
@ -92,10 +92,10 @@ namespace osu.Game.Beatmaps
var converted = ConvertHitObject(obj, beatmap, cancellationToken); var converted = ConvertHitObject(obj, beatmap, cancellationToken);
if (ObjectConverted != null) if (objectConverted != null)
{ {
converted = converted.ToList(); converted = converted.ToList();
ObjectConverted.Invoke(obj, converted); objectConverted.Invoke(obj, converted);
} }
foreach (var c in converted) foreach (var c in converted)

3
osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
View File

@ -471,9 +471,6 @@ namespace osu.Game.Beatmaps.Formats
private string toLegacyCustomSampleBank(HitSampleInfo hitSampleInfo) private string toLegacyCustomSampleBank(HitSampleInfo hitSampleInfo)
{ {
if (hitSampleInfo == null)
return "0";
if (hitSampleInfo is ConvertHitObjectParser.LegacyHitSampleInfo legacy) if (hitSampleInfo is ConvertHitObjectParser.LegacyHitSampleInfo legacy)
return legacy.CustomSampleBank.ToString(CultureInfo.InvariantCulture); return legacy.CustomSampleBank.ToString(CultureInfo.InvariantCulture);