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

Add back playing users list

Browse Source
This commit is contained in:
Dan Balasescu
2022-02-02 23:19:43 +09:00
parent fcbba3d948
commit 81a22dbd29
2 changed files with 45 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
osu.Game/Online/Spectator/SpectatorClient.cs
View File

@ -35,16 +35,28 @@ namespace osu.Game.Online.Spectator
/// </summary>
public abstract IBindable<bool> IsConnected { get; }
/// <summary>
/// The states of all users currently being watched.
/// </summary>
public IBindableDictionary<int, SpectatorState> WatchingUserStates => watchingUserStates;
/// <summary>
/// A global list of all players currently playing.
/// </summary>
public IBindableList<int> PlayingUsers => playingUsers;
/// <summary>
/// All users currently being watched.
/// </summary>
private readonly List<int> watchingUsers = new List<int>();
public IBindableDictionary<int, SpectatorState> WatchingUserStates => watchingUserStates;
private readonly BindableDictionary<int, SpectatorState> watchingUserStates = new BindableDictionary<int, SpectatorState>();
private readonly BindableList<int> playingUsers = new BindableList<int>();
private readonly SpectatorState currentState = new SpectatorState();
private IBeatmap? currentBeatmap;
private Score? currentScore;
private readonly SpectatorState currentState = new SpectatorState();
/// <summary>
/// Whether the local user is playing.
/// </summary>
@ -85,7 +97,10 @@ namespace osu.Game.Online.Spectator
BeginPlayingInternal(currentState);
}
else
{
watchingUserStates.Clear();
playingUsers.Clear();
}
}), true);
}
@ -93,8 +108,12 @@ namespace osu.Game.Online.Spectator
{
Schedule(() =>
{
if (!playingUsers.Contains(userId))
playingUsers.Add(userId);
if (watchingUsers.Contains(userId))
watchingUserStates[userId] = state;
OnUserBeganPlaying?.Invoke(userId, state);
});
@ -105,8 +124,11 @@ namespace osu.Game.Online.Spectator
{
Schedule(() =>
{
playingUsers.Remove(userId);
if (watchingUsers.Contains(userId))
watchingUserStates[userId] = state;
OnUserFinishedPlaying?.Invoke(userId, state);
});