Cleanup lobby manager and gamplay code in regards to player states an…

…d making code more readable
BeatTogether · Apr 8, 2024 · 6ea9913 · 6ea9913
1 parent cd94865
commit 6ea9913
Show file tree

Hide file tree

Showing 6 changed files with 110 additions and 136 deletions.
diff --git a/BeatTogether.DedicatedServer.Kernel/Managers/Abstractions/ILobbyManager.cs b/BeatTogether.DedicatedServer.Kernel/Managers/Abstractions/ILobbyManager.cs
@@ -8,16 +8,16 @@ namespace BeatTogether.DedicatedServer.Kernel.Managers.Abstractions
     public interface ILobbyManager
     {
         bool AllPlayersReady { get; }
-        bool SomePlayersReady { get; }
+        bool AnyPlayersReady { get; }
         bool NoPlayersReady { get; }
 		bool AllPlayersNotWantToPlayNextLevel { get; }
-        bool DoesEveryoneOwnBeatmap { get; }
+        bool CanEveryonePlayBeatmap { get; }
         BeatmapIdentifier? SelectedBeatmap { get; }
         GameplayModifiers SelectedModifiers { get; }
         CountdownState CountDownState { get; }
         long CountdownEndTime { get; }
         GameplayModifiers EmptyModifiers {get; }
-        public bool SpectatingPlayersUpdated { get; set; }
+        public bool UpdateSpectatingPlayers { get; set; }
         public bool ForceStartSelectedBeatmap { get; set; }
 
         void Update();

diff --git a/BeatTogether.DedicatedServer.Kernel/Managers/GameplayManager.cs b/BeatTogether.DedicatedServer.Kernel/Managers/GameplayManager.cs
@@ -101,8 +101,12 @@ public async void StartSong(CancellationToken cancellationToken)
             State = GameplayManagerState.SceneLoad;
             foreach (var player in _playerRegistry.Players)//Array of players that are playing at the start
             {
-                if (!player.IsSpectating && !player.ForceLateJoin && !player.IsBackgrounded)
+                if (player.WantsToPlayNextLevel && !player.IsSpectating && !player.IsBackgrounded && !player.ForceLateJoin)
+                {
                     PlayersAtStart.Add(player.UserId);
+                }
+                //if (!player.IsSpectating && !player.ForceLateJoin && !player.IsBackgrounded)
+                //    PlayersAtStart.Add(player.UserId);
             }
 
             // Create level finished tasks (players may send these at any time during gameplay)
@@ -159,7 +163,7 @@ public async void StartSong(CancellationToken cancellationToken)
             {
                 if (_playerRegistry.TryGetPlayer(UserId, out var p))
                 {
-                    if (!p.InGameplay || p.InLobby)
+                    if (!p.InGameplay || !p.IsActive)
                         HandlePlayerLeaveGameplay(p);
                     StartDelay = Math.Max(StartDelay, p.Latency.CurrentAverage);
                 }
@@ -176,7 +180,7 @@ public async void StartSong(CancellationToken cancellationToken)
                 StartTime = SongStartTime
             }, IgnoranceChannelTypes.Reliable);
 
-            //Initiates the song start process for forced late joiners
+            //Initiates the song start process for forced late joiners - try force them to spectate if they were causing issues in countdown
             foreach(IPlayer p in _playerRegistry.Players)
             {
                 if (p.ForceLateJoin)