RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-02-12 08:07:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2200 from HoLLy-HaCKeR/fix-legacyid-check

Browse Source 
Fix check against LegacyID for non-default rulesets
This commit is contained in:
Dean Herbert 2018-03-12 09:06:53 +09:00 committed by GitHub
commit 7bf38eb1ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,7 +63,7 @@ namespace osu.Game.Rulesets
var instances = loaded_assemblies.Values.Select(r => (Ruleset)Activator.CreateInstance(r, (RulesetInfo)null)).ToList(); var instances = loaded_assemblies.Values.Select(r => (Ruleset)Activator.CreateInstance(r, (RulesetInfo)null)).ToList();
//add all legacy modes in correct order //add all legacy modes in correct order
foreach (var r in instances.Where(r => r.LegacyID >= 0).OrderBy(r => r.LegacyID)) foreach (var r in instances.Where(r => r.LegacyID != null).OrderBy(r => r.LegacyID))
{ {
if (context.RulesetInfo.SingleOrDefault(rsi => rsi.ID == r.RulesetInfo.ID) == null) if (context.RulesetInfo.SingleOrDefault(rsi => rsi.ID == r.RulesetInfo.ID) == null)
context.RulesetInfo.Add(r.RulesetInfo); context.RulesetInfo.Add(r.RulesetInfo);
@ -72,7 +72,7 @@ namespace osu.Game.Rulesets
context.SaveChanges(); context.SaveChanges();
//add any other modes //add any other modes
foreach (var r in instances.Where(r => r.LegacyID < 0)) foreach (var r in instances.Where(r => r.LegacyID == null))
if (context.RulesetInfo.FirstOrDefault(ri => ri.InstantiationInfo == r.RulesetInfo.InstantiationInfo) == null) if (context.RulesetInfo.FirstOrDefault(ri => ri.InstantiationInfo == r.RulesetInfo.InstantiationInfo) == null)
context.RulesetInfo.Add(r.RulesetInfo); context.RulesetInfo.Add(r.RulesetInfo);

2
osu.Game/Tests/Visual/TestCasePerformancePoints.cs
View File

@ -128,7 +128,7 @@ namespace osu.Game.Tests.Visual
private void load(BeatmapManager beatmaps) private void load(BeatmapManager beatmaps)
{ {
var sets = beatmaps.GetAllUsableBeatmapSets(); var sets = beatmaps.GetAllUsableBeatmapSets();
var allBeatmaps = sets.SelectMany(s => s.Beatmaps).Where(b => ruleset.LegacyID < 0 || b.RulesetID == ruleset.LegacyID); var allBeatmaps = sets.SelectMany(s => s.Beatmaps).Where(b => ruleset.LegacyID == null || b.RulesetID == ruleset.LegacyID);
allBeatmaps.ForEach(b => beatmapDisplays.Add(new BeatmapDisplay(b))); allBeatmaps.ForEach(b => beatmapDisplays.Add(new BeatmapDisplay(b)));
} }