(4e7f7d0a7) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-03-27 13:52:38 +02:00
parent 8d42f777db
commit eada5e222a
5 changed files with 17 additions and 5 deletions
@@ -118,8 +118,13 @@ 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 probabilitySum = allowedMissions.Sum(m => m.Commonness);
            int randomNumber = rand.NextInt32() % probabilitySum;
            foreach (MissionPrefab missionPrefab in allowedMissions)
            {