Unstable 0.1400.0.0

2021-05-11 15:47:47 +03:00
parent 3f324b14e8
commit 92f0264af2
247 changed files with 8238 additions and 1911 deletions
@@ -353,9 +353,14 @@ namespace Barotrauma
                    }
                }
            }
-            if (GameMode is PvPMode && Submarine.MainSubs[1] == null)
+
+            if (Submarine.MainSubs[1] == null)
            {
-                Submarine.MainSubs[1] = new Submarine(SubmarineInfo, true);
+                var enemySubmarineInfo = GameMode is PvPMode ? SubmarineInfo : GameMode.Missions.FirstOrDefault(m => m.EnemySubmarineInfo != null)?.EnemySubmarineInfo;
+                if (enemySubmarineInfo != null)
+                {
+                    Submarine.MainSubs[1] = new Submarine(enemySubmarineInfo, true);
+                }
            }

            if (GameMain.NetworkMember?.ServerSettings?.LockAllDefaultWires ?? false)