sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 08:49:59 +09:00
Code Issues Packages Projects Releases Wiki Activity

Remove return type from AddDifficultyToBeatmapSet

Browse Source 
Also removes a pointless realm encapsulation.
This commit is contained in:
Dean Herbert
2022-02-03 19:39:24 +09:00
parent ad47649d1c
commit bef0a2da21
2 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Beatmaps/BeatmapManager.cs
View File

@ -128,10 +128,10 @@ namespace osu.Game.Beatmaps
foreach (var timingPoint in referenceBeatmap.Beatmap.ControlPointInfo.TimingPoints)
newBeatmap.ControlPointInfo.Add(timingPoint.Time, timingPoint.DeepClone());
var createdBeatmapInfo = beatmapModelManager.AddDifficultyToBeatmapSet(beatmapSetInfo, newBeatmap);
beatmapModelManager.AddDifficultyToBeatmapSet(beatmapSetInfo, newBeatmap);
workingBeatmapCache.Invalidate(createdBeatmapInfo.BeatmapSet);
return GetWorkingBeatmap(createdBeatmapInfo);
workingBeatmapCache.Invalidate(beatmapSetInfo);
return GetWorkingBeatmap(newBeatmap.BeatmapInfo);
}
// TODO: add back support for making a copy of another difficulty

7
osu.Game/Beatmaps/BeatmapModelManager.cs
View File

@ -93,9 +93,7 @@ namespace osu.Game.Beatmaps
/// <summary>
/// Add a new difficulty to the beatmap set represented by the provided <see cref="BeatmapSetInfo"/>.
/// </summary>
public BeatmapInfo AddDifficultyToBeatmapSet(BeatmapSetInfo beatmapSetInfo, Beatmap beatmap)
{
return Realm.Run(realm =>
public void AddDifficultyToBeatmapSet(BeatmapSetInfo beatmapSetInfo, Beatmap beatmap)
{
var beatmapInfo = beatmap.BeatmapInfo;
@ -103,9 +101,6 @@ namespace osu.Game.Beatmaps
beatmapInfo.BeatmapSet = beatmapSetInfo;
Save(beatmapInfo, beatmap);
return beatmapInfo.Detach();
});
}
private static string getFilename(BeatmapInfo beatmapInfo)