From 83189d1f07dc21af413f74f48e38c52082d6d005 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 17 Mar 2022 06:24:55 +0300
Subject: [PATCH] Revert "Update mod instantiaton utility method to no longer
 check for validity"

This reverts commit 1a04260807bfaf54675e753b4a0b7561d7349fad.
---
 osu.Game/Utils/ModUtils.cs | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Utils/ModUtils.cs b/osu.Game/Utils/ModUtils.cs
index bccb706842..d5ea74c404 100644
--- a/osu.Game/Utils/ModUtils.cs
+++ b/osu.Game/Utils/ModUtils.cs
@@ -153,17 +153,31 @@ namespace osu.Game.Utils
         }
 
         /// <summary>
-        /// Returns an instantiated list of all proposed mods on a given ruleset.
+        /// Verifies all proposed mods are valid for a given ruleset and returns instantiated <see cref="Mod"/>s for further processing.
         /// </summary>
-        /// <param name="ruleset">The ruleset to instantiate mods.</param>
+        /// <param name="ruleset">The ruleset to verify mods against.</param>
         /// <param name="proposedMods">The proposed mods.</param>
-        /// <param name="mods">Mods instantiated from <paramref name="proposedMods"/> on the given <paramref name="ruleset"/>.</param>
-        public static void InstantiateModsForRuleset(Ruleset ruleset, IEnumerable<APIMod> proposedMods, out List<Mod> mods)
+        /// <param name="valid">Mods instantiated from <paramref name="proposedMods"/> which were valid for the given <paramref name="ruleset"/>.</param>
+        /// <returns>Whether all <paramref name="proposedMods"/> were valid for the given <paramref name="ruleset"/>.</returns>
+        public static bool InstantiateValidModsForRuleset(Ruleset ruleset, IEnumerable<APIMod> proposedMods, out List<Mod> valid)
         {
-            mods = new List<Mod>();
+            valid = new List<Mod>();
+            bool proposedWereValid = true;
 
             foreach (var apiMod in proposedMods)
-                mods.Add(apiMod.ToMod(ruleset));
+            {
+                try
+                {
+                    // will throw if invalid
+                    valid.Add(apiMod.ToMod(ruleset));
+                }
+                catch
+                {
+                    proposedWereValid = false;
+                }
+            }
+
+            return proposedWereValid;
         }
     }
 }