From a741d91aed91f338ffecd3a4596b551c8804b52e Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 25 Jan 2021 14:57:35 +0100
Subject: [PATCH] use null propragtor for Ruleset.Value and rulset instead of
 null checks

---
 .../Components/TournamentModDisplay.cs              | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tournament/Components/TournamentModDisplay.cs b/osu.Game.Tournament/Components/TournamentModDisplay.cs
index e91c27345e..369a58858e 100644
--- a/osu.Game.Tournament/Components/TournamentModDisplay.cs
+++ b/osu.Game.Tournament/Components/TournamentModDisplay.cs
@@ -18,14 +18,11 @@ public class TournamentModDisplay : CompositeDrawable
     {
         public string ModAcronym;
 
-        [Resolved]
-        private LadderInfo ladderInfo { get; set; }
-
         [Resolved]
         private RulesetStore rulesets { get; set; }
 
         [BackgroundDependencyLoader]
-        private void load(TextureStore textures)
+        private void load(TextureStore textures, LadderInfo ladderInfo)
         {
             var texture = textures.Get($"mods/{ModAcronym}");
 
@@ -42,12 +39,8 @@ private void load(TextureStore textures)
             }
             else
             {
-                var ruleset = rulesets.AvailableRulesets.FirstOrDefault(r => r == ladderInfo.Ruleset.Value);
-
-                if (ruleset == null)
-                    return;
-
-                var modIcon = ruleset.CreateInstance().GetAllMods().FirstOrDefault(mod => mod.Acronym == ModAcronym);
+                var ruleset = rulesets.GetRuleset(ladderInfo.Ruleset.Value?.ID ?? 0);
+                var modIcon = ruleset?.CreateInstance().GetAllMods().FirstOrDefault(mod => mod.Acronym == ModAcronym);
 
                 if (modIcon == null)
                     return;