From 6d4c1ba2aee43c9fdab49f83ba16c0bcdedcce78 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Mar 2021 13:35:08 +0900
Subject: [PATCH] Fix a couple of new inspections introduced in Rider EAPs

---
 osu.Game/Beatmaps/BeatmapConverter.cs             | 10 +++++-----
 osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs |  3 ---
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapConverter.cs b/osu.Game/Beatmaps/BeatmapConverter.cs
index cb0b3a8d09..b291edd19d 100644
--- a/osu.Game/Beatmaps/BeatmapConverter.cs
+++ b/osu.Game/Beatmaps/BeatmapConverter.cs
@@ -17,12 +17,12 @@ namespace osu.Game.Beatmaps
     public abstract class BeatmapConverter<T> : IBeatmapConverter
         where T : HitObject
     {
-        private event Action<HitObject, IEnumerable<HitObject>> ObjectConverted;
+        private event Action<HitObject, IEnumerable<HitObject>> objectConverted;
 
         event Action<HitObject, IEnumerable<HitObject>> IBeatmapConverter.ObjectConverted
         {
-            add => ObjectConverted += value;
-            remove => ObjectConverted -= value;
+            add => objectConverted += value;
+            remove => objectConverted -= value;
         }
 
         public IBeatmap Beatmap { get; }
@@ -92,10 +92,10 @@ namespace osu.Game.Beatmaps
 
                 var converted = ConvertHitObject(obj, beatmap, cancellationToken);
 
-                if (ObjectConverted != null)
+                if (objectConverted != null)
                 {
                     converted = converted.ToList();
-                    ObjectConverted.Invoke(obj, converted);
+                    objectConverted.Invoke(obj, converted);
                 }
 
                 foreach (var c in converted)
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index df940e8c8e..d06478b9de 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -471,9 +471,6 @@ namespace osu.Game.Beatmaps.Formats
 
         private string toLegacyCustomSampleBank(HitSampleInfo hitSampleInfo)
         {
-            if (hitSampleInfo == null)
-                return "0";
-
             if (hitSampleInfo is ConvertHitObjectParser.LegacyHitSampleInfo legacy)
                 return legacy.CustomSampleBank.ToString(CultureInfo.InvariantCulture);