(913ed2ce9) Merge remote-tracking branch 'origin/dev' into enemy-ai

2019-03-26 14:07:11 +02:00
parent 14832e2040
commit 4b3e78b566
11 changed files with 167 additions and 45 deletions
@@ -103,12 +103,6 @@ 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)
            {