h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-11 04:17:18 +08:00
Code Issues Releases Wiki Activity

Fix unable to join multiplayer rooms with many users

Browse Source
This commit is contained in:
Dan Balasescu 2025-03-04 12:34:02 +09:00
parent 963df165df
commit 3024a98658
No known key found for this signature in database
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game/Online/API/Requests/GetUsersRequest.cs
View File

@ -13,14 +13,14 @@ namespace osu.Game.Online.API.Requests
/// </summary> /// </summary>
public class GetUsersRequest : APIRequest<GetUsersResponse> public class GetUsersRequest : APIRequest<GetUsersResponse>
{ {
public readonly int[] UserIds; public const int MAX_IDS_PER_REQUEST = 50;
private const int max_ids_per_request = 50; public readonly int[] UserIds;
public GetUsersRequest(int[] userIds) public GetUsersRequest(int[] userIds)
{ {
if (userIds.Length > max_ids_per_request) if (userIds.Length > MAX_IDS_PER_REQUEST)
throw new ArgumentException($"{nameof(GetUsersRequest)} calls only support up to {max_ids_per_request} IDs at once"); throw new ArgumentException($"{nameof(GetUsersRequest)} calls only support up to {MAX_IDS_PER_REQUEST} IDs at once");
UserIds = userIds; UserIds = userIds;
} }

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

@ -815,19 +815,22 @@ namespace osu.Game.Online.Multiplayer
/// <param name="multiplayerUsers">The <see cref="MultiplayerRoomUser"/>s to populate.</param> /// <param name="multiplayerUsers">The <see cref="MultiplayerRoomUser"/>s to populate.</param>
protected async Task PopulateUsers(IEnumerable<MultiplayerRoomUser> multiplayerUsers) protected async Task PopulateUsers(IEnumerable<MultiplayerRoomUser> multiplayerUsers)
{ {
var request = new GetUsersRequest(multiplayerUsers.Select(u => u.UserID).Distinct().ToArray()); foreach (int[] userChunk in multiplayerUsers.Select(u => u.UserID).Distinct().Chunk(GetUsersRequest.MAX_IDS_PER_REQUEST))
await API.PerformAsync(request).ConfigureAwait(false);
if (request.Response == null)
return;
Dictionary<int, APIUser> users = request.Response.Users.ToDictionary(user => user.Id);
foreach (var multiplayerUser in multiplayerUsers)
{ {
if (users.TryGetValue(multiplayerUser.UserID, out var user)) var request = new GetUsersRequest(userChunk);
multiplayerUser.User = user;
await API.PerformAsync(request).ConfigureAwait(false);
if (request.Response == null)
return;
Dictionary<int, APIUser> users = request.Response.Users.ToDictionary(user => user.Id);
foreach (var multiplayerUser in multiplayerUsers)
{
if (users.TryGetValue(multiplayerUser.UserID, out var user))
multiplayerUser.User = user;
}
} }
} }