v1.6.19.1 (Unto the Breach Hotfix 1)

2024-10-31 11:27:32 +02:00
parent c015059218
commit 26ffd2104e
28 changed files with 182 additions and 61 deletions
@@ -1290,9 +1290,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;
                }