Build 1.1.4.0

2023-03-31 18:40:44 +03:00
parent efba17e0ff
commit 9470edead3
483 changed files with 17487 additions and 8548 deletions
@@ -116,7 +116,7 @@ namespace Barotrauma
            {
                foreach (Entity entity in Entity.GetEntities())
                {
-                    if (targetPredicates[tag].Any(p => p(entity)))
+                    if (targetPredicates[tag].Any(p => p(entity)) && !targetsToReturn.Contains(entity))
                    {
                        targetsToReturn.Add(entity);
                    }
@@ -131,7 +131,7 @@ namespace Barotrauma
            {
                foreach (Character npc in outpostNPCs)
                {
-                    if (npc.Removed) { continue; }
+                    if (npc.Removed || targetsToReturn.Contains(npc)) { continue; }
                    targetsToReturn.Add(npc);
                }
            }