Merge remote-tracking branch 'upstream/master' into develop

2024-10-28 10:10:02 -03:00
parent 0daaaf9fca 7eac44ea7d
commit d906066425
47 changed files with 246 additions and 125 deletions
@@ -5735,13 +5735,17 @@ namespace Barotrauma
            return sameRoomHulls.Contains(character.CurrentHull);
        }

+        /// <summary>
+        /// Returns all friendly crew members that are alive.
+        /// Filters out pets and characters that don't have <see cref="CharacterInfo"/>.
+        /// </summary>
        public static IEnumerable<Character> GetFriendlyCrew(Character character)
        {
            if (character is null)
            {
                return Enumerable.Empty<Character>();
            }
-            return CharacterList.Where(c => HumanAIController.IsFriendly(character, c, onlySameTeam: true) && !c.IsDead);
+            return CharacterList.Where(c => c.Info != null && !c.IsDead && !c.IsPet && HumanAIController.IsFriendly(character, c, onlySameTeam: true));
        }

        public bool HasRecipeForItem(Identifier recipeIdentifier)