Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop

2023-03-16 12:53:53 -03:00
parent fa6b6a590f b8a8fc8c95
commit cf88aa4c5d
14 changed files with 34 additions and 21 deletions
@@ -198,6 +198,7 @@ namespace Barotrauma
            {
                foreach (var entry in entries)
                {
+                    if (entry == null) { continue; }
                    yield return entry.HumanPrefab;
                }
            }
@@ -330,7 +331,7 @@ namespace Barotrauma
            {
                foreach (var prefab in collection)
                {
-                    if (prefab.CampaignInteractionType == interactionType)
+                    if (prefab != null && prefab.CampaignInteractionType == interactionType)
                    {
                        return true;
                    }