Fix antag selection for sponsor

13lackHawk · Mar 28, 2024 · 31f955d · 31f955d
1 parent 7a9d03b
commit 31f955d
Showing 1 changed file with 8 additions and 14 deletions.
diff --git a/Content.Server/Antag/AntagSelectionSystem.cs b/Content.Server/Antag/AntagSelectionSystem.cs
@@ -207,16 +207,6 @@ public List<EntityUid> ChooseAntags(int count, params List<EntityUid>[] eligible
                 playerList.Remove(chosenPlayer);
             }
 
-            // A-13 No Thief-Agents system v5 start
-            var allPlayers = _playerSystem.Sessions.ToList();
-            foreach (var player in allPlayers)
-                if (HasComp<ThiefCheckComponent>(player.AttachedEntity))
-                {
-                    Logger.InfoS("ANTAG", "Skipping player cuz he is already a thief.");
-                    continue;
-                }
-            // A-13  No Thief-Agents system v5 end
-
             //If we have reached the desired number of players, skip
             if (chosenPlayers.Count >= count)
                 continue;
@@ -275,7 +265,7 @@ public List<ICommonSession> ChooseAntags(int count, params List<ICommonSession>[
             var allPlayers = _playerSystem.Sessions.ToList();
             foreach (var player in allPlayers)
             {
-                if (_sponsorsManager.TryGetInfo(player.UserId, out var sponsor) && sponsor.ExtraSlots == 7) // Cringe check until Tehnox update our service
+                if (_sponsorsManager.TryGetInfo(player.UserId, out var sponsor) && sponsor.ExtraSlots >= 7) //Checker
                 {
                     sponsorPrefList.Add(player);
                 }
@@ -284,12 +274,16 @@ public List<ICommonSession> ChooseAntags(int count, params List<ICommonSession>[
             while (sponsorPrefList.Count > 0 && count > 0)
             {
                 var player = RobustRandom.PickAndTake(sponsorPrefList);
-                eligiblePlayerLists.Remove(player);
+                playerList.Remove(player);
                 chosenPlayers.Add(player);
                 count -= 1;
-                Logger.InfoS("sponsor", "Selected a sponsor antag!");
+                Logger.InfoS("SPONSOR", "Selected a sponsor antag!");
+            }
+            // If we have reached the desired number of players, exit the loop
+            if (chosenPlayers.Count >= count)
+            {
+                break;
             }
-            if (count == 0) return chosenPlayers;
             // A-13 SponsorAntag end
 
             //If we have reached the desired number of players, skip