RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove workarounds for CreateRoomRequest shortcomings

This commit is contained in:
smoogipoo 2020-02-27 16:40:56 +09:00
parent 7c0e823b95
commit 3f5c4633bc
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Online/Multiplayer/PlaylistItem.cs
View File

@ -65,9 +65,7 @@ public PlaylistItem()
public void MapObjects(BeatmapManager beatmaps, RulesetStore rulesets)
{
// If we don't have an api beatmap, the request occurred as a result of room creation, so we can query the local beatmap instead
// Todo: Is this a bug? Room creation only returns the beatmap ID
Beatmap.Value = apiBeatmap == null ? beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == BeatmapID) : apiBeatmap.ToBeatmap(rulesets);
Beatmap.Value = apiBeatmap.ToBeatmap(rulesets);
Ruleset.Value = rulesets.GetRuleset(RulesetID);
Ruleset rulesetInstance = Ruleset.Value.CreateInstance();

9
osu.Game/Online/Multiplayer/Room.cs
View File

@ -118,15 +118,6 @@ public void CopyFrom(Room other)
if (DateTimeOffset.Now >= EndDate.Value)
Status.Value = new RoomStatusEnded();
// transfer local beatmaps across to ensure we have Metadata available (CreateRoomRequest does not give us metadata as expected)
foreach (var item in other.Playlist)
{
var localItem = Playlist.FirstOrDefault(i => i.BeatmapID == item.BeatmapID);
if (localItem != null)
item.Beatmap.Value.Metadata = localItem.Beatmap.Value.Metadata;
}
if (!Playlist.SequenceEqual(other.Playlist))
{
Playlist.Clear();