(f417b026f) Fetched: Changes for playing video tutorial from local branch

2019-03-27 20:45:14 +02:00
parent e65c669eaa
commit 3f82c9a2cb
125 changed files with 1317 additions and 3166 deletions
@@ -103,6 +103,12 @@ namespace Barotrauma
            if (missionType == MissionType.Random)
            {
                allowedMissions.AddRange(MissionPrefab.List);
+#if SERVER
+                if (GameMain.Server != null)
+                {
+                    allowedMissions.RemoveAll(mission => !GameMain.Server.ServerSettings.AllowedRandomMissionTypes.Contains(mission.type));
+                }
+#endif
            }
            else if (missionType == MissionType.None)
            {
@@ -118,11 +124,6 @@ namespace Barotrauma
            {
                allowedMissions.RemoveAll(m => !m.IsAllowed(locations[0], locations[1]));
            }
-
-            if (allowedMissions.Count == 0)
-            {
-                return null;
-            }
            
            int probabilitySum = allowedMissions.Sum(m => m.Commonness);
            int randomNumber = rand.NextInt32() % probabilitySum;