h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-16 15:43:18 +08:00
Code Issues Releases Wiki Activity

style fixes

Browse Source
This commit is contained in:
miterosan 2019-07-02 17:25:12 +02:00
parent 778c36c7d7
commit f1ceea8361
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
osu.Game/Rulesets/RulesetStore.cs
View File

@ -24,19 +24,17 @@ namespace osu.Game.Rulesets
addLoadedRulesets(); addLoadedRulesets();
IEnumerable<string> files = new string[0];
try try
{ {
files = Directory.GetFiles(Environment.CurrentDirectory, $"{ruleset_library_prefix}.*.dll"); string[] files = Directory.GetFiles(Environment.CurrentDirectory, $"{ruleset_library_prefix}.*.dll");
foreach (string file in files.Where(f => !Path.GetFileName(f).Contains("Tests")))
loadRulesetFromFile(file);
} }
catch (Exception e) catch (Exception e)
{ {
Logger.Error(e, $"Could not load rulesets from directory {Environment.CurrentDirectory}"); Logger.Error(e, $"Could not load rulesets from directory {Environment.CurrentDirectory}");
} }
foreach (string file in files.Where(f => !Path.GetFileName(f).Contains("Tests")))
loadRulesetFromFile(file);
} }
public RulesetStore(IDatabaseContextFactory factory) public RulesetStore(IDatabaseContextFactory factory)
@ -125,13 +123,15 @@ namespace osu.Game.Rulesets
private static void addLoadedRulesets() private static void addLoadedRulesets()
{ {
// on android the rulesets are already loaded foreach (var ruleset in AppDomain.CurrentDomain.GetAssemblies())
var loadedRulesets = AppDomain.CurrentDomain.GetAssemblies() {
.Where(assembly => assembly.GetName().Name.StartsWith(ruleset_library_prefix, StringComparison.InvariantCultureIgnoreCase)) string rulesetName = ruleset.GetName().Name;
.Where(assembly => !assembly.GetName().Name.Contains("Tests"));
if (!rulesetName.StartsWith(ruleset_library_prefix, StringComparison.InvariantCultureIgnoreCase) || ruleset.GetName().Name.Contains("Tests"))
continue;
foreach (var ruleset in loadedRulesets)
addRuleset(ruleset); addRuleset(ruleset);
}
} }
private static void loadRulesetFromFile(string file) private static void loadRulesetFromFile(string file)