Revert "testing mid game join"

This reverts commit 0f0130b.

Author: Licho1

Shared/LobbyClient/DedicatedServer.cs

@@ -102,27 +102,16 @@ public override string ToString()
         }
 
         /// <summary>
-        ///     Adds user dynamically to running game as a spectator.
+        ///     Adds user dynamically to running game - for security reasons add his script
         /// </summary>
         public void AddUser(string name, string scriptPassword, User user)
-        {
-            AddUser(name, scriptPassword, user, isSpectator: true, teamNumber: null);
-        }
-
-        /// <summary>
-        ///     Adds user dynamically to running game, optionally as a non-spectator on a specific team.
-        /// </summary>
-        public void AddUser(string name, string scriptPassword, User user, bool isSpectator, int? teamNumber)
         {
             if (IsRunning)
             {
-                if (!isSpectator && teamNumber.HasValue)
-                    talker.SendText($"/adduser {name} {scriptPassword} 0 {teamNumber.Value}");
-                else
-                    talker.SendText($"/adduser {name} {scriptPassword}");
-
+                talker.SendText($"/adduser {name} {scriptPassword}");
                 if (user != null) talker.SendText($"SPRINGIE:User {new MidGameJoinUser(user)}");
             }
+            
         }
 
         public event EventHandler<SpringBattleContext> BattleStarted = (sender, args) => { };

Shared/LobbyClient/ScriptGenerator.cs

@@ -120,31 +120,6 @@ static void GeneratePlayerSection(StringBuilder script, SpringBattleContext setu
                 teamNum++;
             }
 
-            // Preallocate empty team slots for mid-game player joins.
-            // These teams exist in the script from frame 0 but start inactive (no player assigned).
-            // The engine activates them when a mid-game joiner is assigned via /adduser.
-            var slotsPerAlly = setup.LobbyStartContext.MidGameSlotsPerAllyTeam;
-            if (slotsPerAlly > 0)
-            {
-                var allyTeamsInUse = setup.LobbyStartContext.Players
-                    .Where(x => !x.IsSpectator)
-                    .Select(x => x.AllyID)
-                    .Union(setup.LobbyStartContext.Bots.Select(x => x.AllyID))
-                    .Distinct()
-                    .OrderBy(x => x)
-                    .ToList();
-
-                // Use first real player as TeamLeader for the placeholder teams (engine requires a valid leader)
-                var leaderUserNum = 0;
-                foreach (var allyId in allyTeamsInUse)
-                {
-                    for (var s = 0; s < slotsPerAlly; s++)
-                    {
-                        ScriptAddTeam(script, teamNum, leaderUserNum, allyId);
-                        teamNum++;
-                    }
-                }
-            }
 
             // ALLIANCES AND START BOXES
             var startboxes = new StringBuilder();

Shared/LobbyClient/Spring.SpringBattleContext.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -12,11 +11,6 @@ public class SpringBattleContext
         public List<BattlePlayerResult> ActualPlayers = new List<BattlePlayerResult>();
         public List<string> PlayersUnreadyOnStart = new List<string>();
 
-        /// <summary>
-        /// Pool of preallocated team numbers available for mid-game player joins, keyed by ally team ID.
-        /// </summary>
-        public ConcurrentDictionary<int, ConcurrentQueue<int>> MidGameTeamSlots = new ConcurrentDictionary<int, ConcurrentQueue<int>>();
-
         public int Duration;
         public string EngineBattleID;
 
@@ -99,34 +93,6 @@ public void SetForHosting(LobbyHostingContext startContext,
                             IsIngameReady = false,
                             IsIngame = false,
                         }).ToList();
-
-            // Build pool of preallocated team slots for mid-game joins
-            var slotsPerAlly = startContext.MidGameSlotsPerAllyTeam;
-            if (slotsPerAlly > 0)
-            {
-                // Count how many real teams were generated (non-spectator players + bots)
-                var realTeamCount = startContext.Players.Count(x => !x.IsSpectator) + startContext.Bots.Count;
-
-                var allyTeamsInUse = startContext.Players
-                    .Where(x => !x.IsSpectator)
-                    .Select(x => x.AllyID)
-                    .Union(startContext.Bots.Select(x => x.AllyID))
-                    .Distinct()
-                    .OrderBy(x => x)
-                    .ToList();
-
-                var teamNum = realTeamCount;
-                foreach (var allyId in allyTeamsInUse)
-                {
-                    var queue = new ConcurrentQueue<int>();
-                    for (var s = 0; s < slotsPerAlly; s++)
-                    {
-                        queue.Enqueue(teamNum);
-                        teamNum++;
-                    }
-                    MidGameTeamSlots[allyId] = queue;
-                }
-            }
         }
 
 

Shared/PlasmaShared/ISpringieService/LobbyHostingContext.cs

@@ -21,12 +21,6 @@ public class LobbyHostingContext
         public Dictionary<string,Dictionary<string,string>> UserParameters = new Dictionary<string, Dictionary<string, string>>();
         public int BattleID { get; set; }
 
-        /// <summary>
-        /// Number of extra team slots to preallocate per ally team for mid-game player joins.
-        /// These teams exist in the start script but have no player assigned initially.
-        /// </summary>
-        public int MidGameSlotsPerAllyTeam { get; set; }
-
         public void ApplyBalance(BalanceTeamsResult balance)
         {
             if (balance.DeleteBots) Bots.Clear();

ZkLobbyServer/ServerBattle.cs

@@ -167,21 +167,6 @@ public string GenerateClientScriptPassword(string name)
             return Hash.HashString(battleInstanceGuid + name).ToString();
         }
 
-        /// <summary>
-        /// Tries to claim a preallocated team slot for a mid-game joiner on the given ally team.
-        /// Returns the team number if a slot is available, null otherwise.
-        /// </summary>
-        private int? TryClaimMidGameTeamSlot(int allyTeamId)
-        {
-            if (spring?.Context?.MidGameTeamSlots != null &&
-                spring.Context.MidGameTeamSlots.TryGetValue(allyTeamId, out var queue) &&
-                queue.TryDequeue(out var teamNum))
-            {
-                return teamNum;
-            }
-            return null;
-        }
-
         public void Dispose()
         {
             spring.UnsubscribeEvents(this);
@@ -364,28 +349,11 @@ public virtual async Task ProcessPlayerJoin(ConnectedUser user, string joinPassw
 
             if (spring.IsRunning)
             {
-                // Try to assign a preallocated mid-game team slot if available
-                int? midGameTeam = null;
-                if (!ubs.IsSpectator)
-                {
-                    midGameTeam = TryClaimMidGameTeamSlot(ubs.AllyNumber);
-                    if (midGameTeam == null)
-                        ubs.IsSpectator = true; // no slot available, force spectator
-                }
-
-                spring.AddUser(ubs.Name, ubs.ScriptPassword, ubs.LobbyUser, ubs.IsSpectator, midGameTeam);
-
-                if (midGameTeam.HasValue)
-                {
-                    await SayBattle($"Game is in progress — {ubs.Name} is joining as a player on team {midGameTeam.Value}.");
-                }
-                else
-                {
-                    var started = DateTime.UtcNow.Subtract(spring.IngameStartTime ?? RunningSince ?? DateTime.UtcNow);
-                    started = new TimeSpan((int)started.TotalHours, started.Minutes, started.Seconds);
-                    await SayBattle($"THIS GAME IS CURRENTLY IN PROGRESS, PLEASE WAIT UNTIL IT ENDS! Running for {started}", ubs.Name);
-                    await SayBattle("If you say !notify, I will message you when the current game ends.", ubs.Name);
-                }
+                spring.AddUser(ubs.Name, ubs.ScriptPassword, ubs.LobbyUser);
+                var started = DateTime.UtcNow.Subtract(spring.IngameStartTime ?? RunningSince ?? DateTime.UtcNow);
+                started = new TimeSpan((int)started.TotalHours, started.Minutes, started.Seconds);
+                await SayBattle($"THIS GAME IS CURRENTLY IN PROGRESS, PLEASE WAIT UNTIL IT ENDS! Running for {started}", ubs.Name);
+                await SayBattle("If you say !notify, I will message you when the current game ends.", ubs.Name);
             }
 
             try
@@ -438,34 +406,22 @@ public async Task RequestConnectSpring(ConnectedUser conus, string joinPassword)
             UserBattleStatus ubs;
 
             startGameStatus = spring.LobbyStartContext.Players.FirstOrDefault(x => x.Name == conus.Name);
-
+            
             if (!Users.TryGetValue(conus.Name, out ubs) && !(IsInGame && startGameStatus != null))
                 if (IsPassworded && (Password != joinPassword))
                 {
                     await conus.Respond("Invalid password");
                     return;
                 }
-
-            var isSpectator = startGameStatus?.IsSpectator != false;
-
-            // For mid-game joins of users not in the original player list, try to assign a team slot
-            int? midGameTeam = null;
-            if (isSpectator && startGameStatus == null && Users.TryGetValue(conus.Name, out ubs) && !ubs.IsSpectator)
-            {
-                midGameTeam = TryClaimMidGameTeamSlot(ubs.AllyNumber);
-                if (midGameTeam.HasValue)
-                    isSpectator = false;
-            }
-
             var pwd = GenerateClientScriptPassword(conus.Name);
-            spring.AddUser(conus.Name, pwd, conus.User, isSpectator, midGameTeam);
+            spring.AddUser(conus.Name, pwd, conus.User);
 
             if (spring.Context.LobbyStartContext.Players.Any(x => x.Name == conus.Name) && conus.MyBattle != this)
             {
                 await ProcessPlayerJoin(conus, joinPassword);
             }
 
-            await conus.SendCommand(GetConnectSpringStructure(pwd, isSpectator));
+            await conus.SendCommand(GetConnectSpringStructure(pwd, startGameStatus?.IsSpectator != false));
         }