Merge remote-tracking branch 'upstream/master' into develop

2024-10-31 06:31:11 -03:00
parent 6ab0e7bee4 b0d57eb26d
commit 9e9ac6cd32
29 changed files with 183 additions and 62 deletions
@@ -1302,9 +1302,17 @@ namespace Barotrauma.Networking
                    {
                        mpCampaign.SendCrewState();
                    }
-                    else if (GameMain.GameSession.GameMode is PvPMode && c.TeamID == CharacterTeamType.None)
+                    else if (GameMain.GameSession.GameMode is PvPMode)
                    {
-                        AssignClientToPvpTeamMidgame(c);
+                        if (c.TeamID == CharacterTeamType.None)
+                        {
+                            AssignClientToPvpTeamMidgame(c);
+                        }
+                    }
+                    else
+                    {
+                        //everyone's in team 1 in non-pvp game modes
+                        c.TeamID = CharacterTeamType.Team1;
                    }
                    c.InGame = true;
                }