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

Merge branch 'master' into multi-queueing-modes

Browse Source
This commit is contained in:
smoogipoo
2021-11-08 19:19:50 +09:00
parent aee0f39c80 f79c9e7f7e
commit c716051530
288 changed files with 2214 additions and 1694 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Online/Multiplayer/MultiplayerClient.cs
View File

@ -21,8 +21,8 @@ using osu.Game.Online.Rooms;
using osu.Game.Online.Rooms.RoomStatuses;
using osu.Game.Rulesets;
using osu.Game.Rulesets.Mods;
using osu.Game.Users;
using osu.Game.Utils;
using APIUser = osu.Game.Online.API.Requests.Responses.APIUser;
namespace osu.Game.Online.Multiplayer
{
@ -387,7 +387,7 @@ namespace osu.Game.Online.Multiplayer
{
Debug.Assert(APIRoom != null);
APIRoom.RecentParticipants.Add(user.User ?? new User
APIRoom.RecentParticipants.Add(user.User ?? new APIUser
{
Id = user.UserID,
Username = "[Unresolved]"
@ -660,7 +660,7 @@ namespace osu.Game.Online.Multiplayer
}
/// <summary>
/// Populates the <see cref="User"/> for a given <see cref="MultiplayerRoomUser"/>.
/// Populates the <see cref="APIUser"/> for a given <see cref="MultiplayerRoomUser"/>.
/// </summary>
/// <param name="multiplayerUser">The <see cref="MultiplayerRoomUser"/> to populate.</param>
protected async Task PopulateUser(MultiplayerRoomUser multiplayerUser) => multiplayerUser.User ??= await userLookupCache.GetUserAsync(multiplayerUser.UserID).ConfigureAwait(false);