Merge pull request #32005 from smoogipoo/fix-multi-leave-host-sound

Fix host change sounds playing when exiting multiplayer rooms

Author: peppy

osu.Game/Online/Multiplayer/MultiplayerClient.cs

@@ -51,6 +51,11 @@ public abstract partial class MultiplayerClient : Component, IMultiplayerClient,
         /// </summary>
         public event Action<MultiplayerRoomUser>? UserKicked;
 
+        /// <summary>
+        /// Invoked when the room's host is changed.
+        /// </summary>
+        public event Action<MultiplayerRoomUser?>? HostChanged;
+
         /// <summary>
         /// Invoked when a new item is added to the playlist.
         /// </summary>
@@ -531,6 +536,7 @@ Task IMultiplayerClient.HostChanged(int userId)
                 Room.Host = user;
                 APIRoom.Host = user?.User;
 
+                HostChanged?.Invoke(user);
                 RoomUpdated?.Invoke();
             }, false);
 

osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomSounds.cs

@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
@@ -20,7 +19,6 @@ public partial class MultiplayerRoomSounds : CompositeDrawable
         private Sample? userJoinedSample;
         private Sample? userLeftSample;
         private Sample? userKickedSample;
-        private MultiplayerRoomUser? host;
 
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
@@ -35,25 +33,10 @@ protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            client.RoomUpdated += onRoomUpdated;
             client.UserJoined += onUserJoined;
             client.UserLeft += onUserLeft;
             client.UserKicked += onUserKicked;
-            updateState();
-        }
-
-        private void onRoomUpdated() => Scheduler.AddOnce(updateState);
-
-        private void updateState()
-        {
-            if (EqualityComparer<MultiplayerRoomUser>.Default.Equals(host, client.Room?.Host))
-                return;
-
-            // only play sound when the host changes from an already-existing host.
-            if (host != null)
-                Scheduler.AddOnce(() => hostChangedSample?.Play());
-
-            host = client.Room?.Host;
+            client.HostChanged += onHostChanged;
         }
 
         private void onUserJoined(MultiplayerRoomUser user)
@@ -65,16 +48,22 @@ private void onUserLeft(MultiplayerRoomUser user)
         private void onUserKicked(MultiplayerRoomUser user)
             => Scheduler.AddOnce(() => userKickedSample?.Play());
 
+        private void onHostChanged(MultiplayerRoomUser? host)
+        {
+            if (host != null)
+                Scheduler.AddOnce(() => hostChangedSample?.Play());
+        }
+
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
 
             if (client.IsNotNull())
             {
-                client.RoomUpdated -= onRoomUpdated;
                 client.UserJoined -= onUserJoined;
                 client.UserLeft -= onUserLeft;
                 client.UserKicked -= onUserKicked;
+                client.HostChanged -= onHostChanged;
             }
         }
     }