StartTeam

Lan2Play · Nov 2, 2023 · 27ef48b · 27ef48b
1 parent ab934d7
commit 27ef48b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 14 deletions.
diff --git a/PugSharp.Match/Match.cs b/PugSharp.Match/Match.cs
@@ -268,21 +268,13 @@ private void SetSelectedTeamSite()
 
         if (_CurrentMatchTeamToVote!.Team == Team.Terrorist)
         {
-            _MatchInfo.StartTeam1 = _TeamVotes.MaxBy(m => m.Votes.Count)!.Name;
+            _MatchInfo.StartTeam1 = _TeamVotes.MaxBy(m => m.Votes.Count)!.Name.Equals("T") ? Team.Terrorist : Team.CounterTerrorist;
             _Logger.LogInformation("StartTeam is {team}", _MatchInfo.StartTeam1);
-            if (_MatchInfo.StartTeam1.Equals("CT", StringComparison.OrdinalIgnoreCase))
-            {
-                _MatchCallback.SwapTeams();
-            }
         }
         else
         {
-            _MatchInfo.StartTeam1 = _TeamVotes.MinBy(m => m.Votes.Count)!.Name;
+            _MatchInfo.StartTeam1 = _TeamVotes.MinBy(m => m.Votes.Count)!.Name.Equals("T") ? Team.Terrorist : Team.CounterTerrorist;
             _Logger.LogInformation("StartTeam is {team}", _MatchInfo.StartTeam1);
-            if (_MatchInfo.StartTeam1.Equals("T", StringComparison.OrdinalIgnoreCase))
-            {
-                _MatchCallback.SwapTeams();
-            }
         }
 
         _MatchCallback.SendMessage($"{_CurrentMatchTeamToVote!.Team} selected {_MatchInfo.StartTeam1} as startside!");
@@ -438,6 +430,7 @@ public void SetPlayerDisconnected(IPlayer player)
             return;
         }
 
+        // TODO Error when Player was not ready
         var matchPlayer = GetMatchPlayer(player.SteamID);
         TryFireState(MatchCommand.DisconnectPlayer);
 
@@ -492,11 +485,11 @@ public Team GetPlayerTeam(ulong steamID)
     {
         if (Config.Team1.Players.ContainsKey(steamID))
         {
-            return Team.Terrorist;
+            return _MatchInfo.StartTeam1 ?? Team.Terrorist;
         }
         else if (Config.Team2.Players.ContainsKey(steamID))
         {
-            return Team.CounterTerrorist;
+            return _MatchInfo.StartTeam1 == Team.CounterTerrorist ? Team.Terrorist : Team.CounterTerrorist;
         }
 
         return Team.None;

diff --git a/PugSharp.Match/MatchInfo.cs b/PugSharp.Match/MatchInfo.cs
@@ -1,7 +1,9 @@
-namespace PugSharp.Match;
+using PugSharp.Match.Contract;
+
+namespace PugSharp.Match;
 
 public class MatchInfo
 {
     public string SelectedMap { get; set; }
-    public string StartTeam1 { get; set; }
+    public Team? StartTeam1 { get; set; }
 }