From cde4fad61027010d411e444b25ac0d111db16dce Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Thu, 12 Oct 2023 17:55:14 +0900 Subject: [PATCH] Simplify `async` lookup logic in `Invited` handling --- osu.Game/Online/Multiplayer/MultiplayerClient.cs | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs index 8b4c38a152..6ba7953c8d 100644 --- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs +++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs @@ -11,7 +11,6 @@ using Newtonsoft.Json; using osu.Framework.Allocation; using osu.Framework.Bindables; using osu.Framework.Development; -using osu.Framework.Extensions; using osu.Framework.Graphics; using osu.Framework.Logging; using osu.Game.Database; @@ -447,13 +446,8 @@ namespace osu.Game.Online.Multiplayer async Task IMultiplayerClient.Invited(int invitedBy, long roomID, string password) { - var loadUserTask = userLookupCache.GetUserAsync(invitedBy); - var loadRoomTask = lookupRoom(roomID); - - await Task.WhenAll(loadUserTask, loadRoomTask).ConfigureAwait(false); - - APIUser? apiUser = loadUserTask.GetResultSafely(); - Room? apiRoom = loadRoomTask.GetResultSafely(); + APIUser? apiUser = await userLookupCache.GetUserAsync(invitedBy); + Room? apiRoom = await lookupRoom(roomID); if (apiUser == null || apiRoom == null) return;