Use TryGetValue wherever possible

Rider says so.
peppy · Nov 22, 2024 · c844d65 · c844d65
1 parent 479ff7e
commit c844d65
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
@@ -164,10 +164,10 @@ public override Drawable GetDrawableComponent(ISkinComponentLookup lookup)
 
         private Drawable getResult(HitResult result)
         {
-            if (!hit_result_mapping.ContainsKey(result))
+            if (!hit_result_mapping.TryGetValue(result, out var value))
                 return null;
 
-            string filename = this.GetManiaSkinConfig<string>(hit_result_mapping[result])?.Value
+            string filename = this.GetManiaSkinConfig<string>(value)?.Value
                               ?? default_hit_result_skin_filenames[result];
 
             var animation = this.GetAnimation(filename, true, true, frameLength: 1000 / 20d);

diff --git a/osu.Game/Overlays/Chat/ChannelList/ChannelList.cs b/osu.Game/Overlays/Chat/ChannelList/ChannelList.cs
@@ -120,10 +120,9 @@ public void AddChannel(Channel channel)
 
         public void RemoveChannel(Channel channel)
         {
-            if (!channelMap.ContainsKey(channel))
+            if (!channelMap.TryGetValue(channel, out var item))
                 return;
 
-            ChannelListItem item = channelMap[channel];
             FillFlowContainer<ChannelListItem> flow = getFlowForChannel(channel);
 
             channelMap.Remove(channel);
@@ -134,10 +133,10 @@ public void RemoveChannel(Channel channel)
 
         public ChannelListItem GetItem(Channel channel)
         {
-            if (!channelMap.ContainsKey(channel))
+            if (!channelMap.TryGetValue(channel, out var item))
                 throw new ArgumentOutOfRangeException();
 
-            return channelMap[channel];
+            return item;
         }
 
         public void ScrollChannelIntoView(Channel channel) => scroll.ScrollIntoView(GetItem(channel));

diff --git a/osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs b/osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs
@@ -78,12 +78,12 @@ public void SendStartPlay(int userId, int beatmapId, APIMod[]? mods = null)
         /// <param name="state">The spectator state to end play with.</param>
         public void SendEndPlay(int userId, SpectatedUserState state = SpectatedUserState.Quit)
         {
-            if (!userBeatmapDictionary.ContainsKey(userId))
+            if (!userBeatmapDictionary.TryGetValue(userId, out int value))
                 return;
 
             ((ISpectatorClient)this).UserFinishedPlaying(userId, new SpectatorState
             {
-                BeatmapID = userBeatmapDictionary[userId],
+                BeatmapID = value,
                 RulesetID = 0,
                 Mods = userModsDictionary[userId],
                 State = state