Join queue despaghettification

NitroxClient/Communication/MultiplayerSession/ConnectionState/SessionReserved.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using NitroxClient.Communication.Abstract;
 using NitroxModel.Packets;
 

NitroxClient/Communication/MultiplayerSession/MultiplayerSessionManager.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using NitroxClient.Communication.Abstract;
@@ -77,26 +77,13 @@ public void ProcessSessionPolicy(MultiplayerSessionPolicy policy)
 
         public void RequestSessionReservation(PlayerSettings playerSettings, AuthenticationContext authenticationContext)
         {
-            // If a reservation has already been sent (in which case the client is enqueued in the join queue)
-            if (CurrentState.CurrentStage == MultiplayerSessionConnectionStage.AWAITING_SESSION_RESERVATION)
-            {
-                Log.InGame(Language.main.Get("Nitrox_Waiting"));
-                return;
-            }
-
             PlayerSettings = playerSettings;
             AuthenticationContext = authenticationContext;
             CurrentState.NegotiateReservationAsync(this);
         }
 
         public void ProcessReservationResponsePacket(MultiplayerSessionReservation reservation)
         {
-            if (reservation.ReservationState == MultiplayerSessionReservationState.ENQUEUED_IN_JOIN_QUEUE)
-            {
-                Log.InGame(Language.main.Get("Nitrox_Waiting"));
-                return;
-            }
-
             Reservation = reservation;
             CurrentState.NegotiateReservationAsync(this);
         }

NitroxClient/Communication/Packets/Processors/InitialPlayerSyncProcessor.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using NitroxClient.Communication.Abstract;
@@ -31,6 +31,7 @@ public InitialPlayerSyncProcessor(IPacketSender packetSender, IEnumerable<Initia
         public override void Process(InitialPlayerSync packet)
         {
             this.packet = packet;
+            Multiplayer.Main.InsideJoinQueue = false;
             loadingMultiplayerWaitItem = WaitScreen.Add(Language.main.Get("Nitrox_SyncingWorld"));
             cumulativeProcessorsRan = 0;
             Multiplayer.Main.StartCoroutine(ProcessInitialSyncPacket(this, null));

NitroxClient/Communication/Packets/Processors/PlayerSyncTimeoutProcessor.cs

@@ -0,0 +1,22 @@
+using System.Collections;
+using NitroxClient.Communication.Packets.Processors.Abstract;
+using NitroxClient.MonoBehaviours;
+using NitroxModel.Packets;
+using UnityEngine;
+
+namespace NitroxClient.Communication.Packets.Processors;
+
+public class PlayerSyncTimeoutProcessor : ClientPacketProcessor<PlayerSyncTimeout>
+{
+    public override void Process(PlayerSyncTimeout packet)
+    {
+        Multiplayer.Main.StartCoroutine(TimeoutRoutine());
+    }
+
+    private IEnumerator TimeoutRoutine()
+    {
+        Log.InGame("Error: Initial sync timeout, closing game");
+        yield return new WaitForSecondsRealtime(5);
+        IngameMenu.main.QuitGame(false);
+    }
+}

NitroxClient/MonoBehaviours/Multiplayer.cs

@@ -31,6 +31,7 @@ public class Multiplayer : MonoBehaviour
         private GameLogic.Terrain terrain;
 
         public bool InitialSyncCompleted { get; set; }
+        public bool InsideJoinQueue { get; set; }
 
         /// <summary>
         ///     True if multiplayer is loaded and client is connected to a server.
@@ -101,6 +102,11 @@ public static IEnumerator LoadAsync()
             yield return Main.StartCoroutine(Main.StartSession());
             WaitScreen.Remove(item);
 
+            WaitScreen.ManualWaitItem joinQueueItem = WaitScreen.Add(Language.main.Get("Nitrox_Waiting"));
+            Main.InsideJoinQueue = true;
+            yield return new WaitUntil(() => !Main.InsideJoinQueue);
+            WaitScreen.Remove(joinQueueItem);
+
             yield return new WaitUntil(() => Main.InitialSyncCompleted);
 
             SetLoadingComplete();

NitroxModel/MultiplayerSession/MultiplayerSessionReservationState.cs

@@ -23,11 +23,8 @@ public enum MultiplayerSessionReservationState
         [Description("The server is using hardcore gamemode, player is dead.")]
         HARDCORE_PLAYER_DEAD = 1 << 4,
 
-        [Description("Another user is currently joining the server.")]
-        ENQUEUED_IN_JOIN_QUEUE = 1 << 5,
-
         [Description("The player name is invalid, It must not contain any space or doubtful characters\n Allowed characters : A-Z a-z 0-9 _ . -\nLength : [3, 25]")]
-        INCORRECT_USERNAME = 1 << 6
+        INCORRECT_USERNAME = 1 << 5
     }
 
     public static class MultiplayerSessionReservationStateExtensions

NitroxModel/Packets/PlayerSyncTimeout.cs

@@ -0,0 +1,3 @@
+namespace NitroxModel.Packets;
+
+public class PlayerSyncTimeout : Packet { }

NitroxServer/Communication/Packets/PacketHandler.cs

@@ -1,4 +1,5 @@
-using System;
+using System;
+using System.Linq;
 using System.Collections.Generic;
 using NitroxModel.Core;
 using NitroxModel.Packets;
@@ -25,13 +26,13 @@ public PacketHandler(PlayerManager playerManager, DefaultServerPacketProcessor p
         public void Process(Packet packet, NitroxConnection connection)
         {
             Player player = playerManager.GetPlayer(connection);
-            if (player == null)
+            if (player != null)
             {
-                ProcessUnauthenticated(packet, connection);
+                ProcessAuthenticated(packet, player);
             }
-            else
+            else if (!playerManager.GetQueuedPlayers().Contains(connection))
             {
-                ProcessAuthenticated(packet, player);
+                ProcessUnauthenticated(packet, connection);
             }
         }
 

NitroxServer/Communication/Packets/Processors/PlayerJoiningMultiplayerSessionProcessor.cs

@@ -1,126 +1,21 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Numerics;
-using NitroxModel.DataStructures;
-using NitroxModel.DataStructures.GameLogic;
-using NitroxModel.DataStructures.GameLogic.Entities;
-using NitroxModel.DataStructures.Unity;
-using NitroxModel.DataStructures.Util;
-using NitroxModel.MultiplayerSession;
 using NitroxModel.Packets;
 using NitroxServer.Communication.Packets.Processors.Abstract;
 using NitroxServer.GameLogic;
-using NitroxServer.GameLogic.Entities;
-using NitroxServer.Serialization.World;
 
 namespace NitroxServer.Communication.Packets.Processors
 {
     public class PlayerJoiningMultiplayerSessionProcessor : UnauthenticatedPacketProcessor<PlayerJoiningMultiplayerSession>
     {
         private readonly PlayerManager playerManager;
-        private readonly ScheduleKeeper scheduleKeeper;
-        private readonly StoryManager storyManager;
-        private readonly World world;
-        private readonly EntityRegistry entityRegistry;
 
-        public PlayerJoiningMultiplayerSessionProcessor(ScheduleKeeper scheduleKeeper, StoryManager storyManager, PlayerManager playerManager, World world, EntityRegistry entityRegistry)
+        public PlayerJoiningMultiplayerSessionProcessor(PlayerManager playerManager)
         {
-            this.scheduleKeeper = scheduleKeeper;
-            this.storyManager = storyManager;
             this.playerManager = playerManager;
-            this.world = world;
-            this.entityRegistry = entityRegistry;
         }
 
         public override void Process(PlayerJoiningMultiplayerSession packet, NitroxConnection connection)
         {
-            Player player = playerManager.PlayerConnected(connection, packet.ReservationKey, out bool wasBrandNewPlayer);
-            NitroxId assignedEscapePodId = world.EscapePodManager.AssignPlayerToEscapePod(player.Id, out Optional<EscapePodWorldEntity> newlyCreatedEscapePod);
-
-            if (newlyCreatedEscapePod.HasValue)
-            {
-                CellEntities spawnNewEscapePod = new(newlyCreatedEscapePod.Value);
-                playerManager.SendPacketToOtherPlayers(spawnNewEscapePod, player);
-            }
-
-            List<EquippedItemData> equippedItems = player.GetEquipment();
-            List<NitroxTechType> techTypes = equippedItems.Select(equippedItem => equippedItem.TechType).ToList();
-
-            PlayerJoinedMultiplayerSession playerJoinedPacket = new(player.PlayerContext, player.SubRootId, techTypes);
-            playerManager.SendPacketToOtherPlayers(playerJoinedPacket, player);
-
-            // Make players on localhost admin by default.
-            if (IPAddress.IsLoopback(connection.Endpoint.Address))
-            {
-                player.Permissions = Perms.ADMIN;
-            }
-
-            List<NitroxId> simulations = world.EntitySimulation.AssignGlobalRootEntities(player).ToList();
-
-            if (wasBrandNewPlayer)
-            {
-                SetupPlayerEntity(player);
-            }
-            else
-            {
-                RespawnExistingEntity(player);
-            }
-
-            InitialPlayerSync initialPlayerSync = new(player.GameObjectId,
-                wasBrandNewPlayer,
-                assignedEscapePodId,
-                equippedItems,
-                world.BaseManager.GetBasePiecesForNewlyConnectedPlayer(),
-                world.InventoryManager.GetAllStorageSlotItems(),
-                player.UsedItems,
-                player.QuickSlotsBindingIds,
-                world.GameData.PDAState.GetInitialPDAData(),
-                world.GameData.StoryGoals.GetInitialStoryGoalData(scheduleKeeper, player),
-                player.Position,
-                player.Rotation,
-                player.SubRootId,
-                player.Stats,
-                GetOtherPlayers(player),
-                world.WorldEntityManager.GetGlobalRootEntities(),
-                simulations,
-                world.GameMode,
-                player.Permissions,
-                new(new(player.PingInstancePreferences), player.PinnedRecipePreferences.ToList()),
-                storyManager.GetTimeData()
-            );
-
-            player.SendPacket(initialPlayerSync);
-        }
-
-        private IEnumerable<PlayerContext> GetOtherPlayers(Player player)
-        {
-            return playerManager.GetConnectedPlayers().Where(p => p != player)
-                                                      .Select(p => p.PlayerContext);
-        }
-
-        private void SetupPlayerEntity(Player player)
-        {
-            NitroxTransform transform = new(player.Position, player.Rotation, NitroxVector3.One);
-
-            PlayerWorldEntity playerEntity = new PlayerWorldEntity(transform, 0, null, false, null, true, player.GameObjectId, NitroxTechType.None, null, null, new List<Entity>());
-            entityRegistry.AddEntity(playerEntity);
-            world.WorldEntityManager.TrackEntityInTheWorld(playerEntity);
-            playerManager.SendPacketToOtherPlayers(new CellEntities(playerEntity), player);
-        }
-
-        private void RespawnExistingEntity(Player player)
-        {
-            Optional<Entity> playerEntity = entityRegistry.GetEntityById(player.PlayerContext.PlayerNitroxId);
-
-            if (playerEntity.HasValue)
-            {
-                playerManager.SendPacketToOtherPlayers(new CellEntities(playerEntity.Value, true), player);
-            }
-            else
-            {
-                Log.Error($"Unable to find player entity for {player.Name}");
-            }
+            playerManager.AddToJoinQueue(connection, packet.ReservationKey);
         }
     }
 }

NitroxServer/Communication/Packets/Processors/PlayerSyncFinishedProcessor.cs

@@ -21,7 +21,7 @@ public override void Process(PlayerSyncFinished packet, Player player)
                 Server.Instance.ResumeServer();
             }
 
-            playerManager.FinishProcessingReservation(player);
+            playerManager.SyncFinishedCallback?.Invoke();
         }
     }
 }