From 1e282432c90397d976164da3f9e03b99876199da Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 17 Aug 2021 09:40:25 +0900
Subject: [PATCH] Fix password in a better way

---
 osu.Game/Screens/OnlinePlay/Components/RoomManager.cs          | 3 ++-
 .../Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Components/RoomManager.cs b/osu.Game/Screens/OnlinePlay/Components/RoomManager.cs
index 43bf3a2ce5..3b6c1c8be0 100644
--- a/osu.Game/Screens/OnlinePlay/Components/RoomManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/RoomManager.cs
@@ -60,7 +60,8 @@ namespace osu.Game.Screens.OnlinePlay.Components
                 AddOrUpdateRoom(result);
                 room.CopyFrom(result); // Also copy back to the source model, since this is likely to have been stored elsewhere.
 
-                onSuccess?.Invoke(result);
+                // The server may not contain all properties (such as password), so invoke success with the given room.
+                onSuccess?.Invoke(room);
             };
 
             req.Failure += exception =>
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
index 776307e20e..2d94b2328d 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         private MultiplayerClient multiplayerClient { get; set; }
 
         public override void CreateRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
-            => base.CreateRoom(room, r => joinMultiplayerRoom(r, room.Password.Value, onSuccess, onError), onError);
+            => base.CreateRoom(room, r => joinMultiplayerRoom(r, r.Password.Value, onSuccess, onError), onError);
 
         public override void JoinRoom(Room room, string password = null, Action<Room> onSuccess = null, Action<string> onError = null)
         {