sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 16:59:53 +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) foreach (var timingPoint in referenceBeatmap.Beatmap.ControlPointInfo.TimingPoints)
newBeatmap.ControlPointInfo.Add(timingPoint.Time, timingPoint.DeepClone()); newBeatmap.ControlPointInfo.Add(timingPoint.Time, timingPoint.DeepClone());
var createdBeatmapInfo = beatmapModelManager.AddDifficultyToBeatmapSet(beatmapSetInfo, newBeatmap); beatmapModelManager.AddDifficultyToBeatmapSet(beatmapSetInfo, newBeatmap);
workingBeatmapCache.Invalidate(createdBeatmapInfo.BeatmapSet); workingBeatmapCache.Invalidate(beatmapSetInfo);
return GetWorkingBeatmap(createdBeatmapInfo); return GetWorkingBeatmap(newBeatmap.BeatmapInfo);
} }
// TODO: add back support for making a copy of another difficulty // TODO: add back support for making a copy of another difficulty

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

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