v1.6.17.0 (Unto the Breach update)

2024-10-22 17:29:04 +03:00
parent e74b3cdb17
commit 6e6c17e100
417 changed files with 17166 additions and 5870 deletions
@@ -39,14 +39,7 @@ namespace Barotrauma

        public void CheckConditionals()
        {
-            if (Target == null)
-            {
-                IsActive = false;
-            }
-            else
-            {
-                IsActive = LogicalOperator == PropertyConditional.LogicalOperatorType.And ? conditionals.All(c => c.Matches(Target)) : conditionals.Any(c => c.Matches(Target));
-            }
+            IsActive = Target != null && PropertyConditional.CheckConditionals(Target, conditionals, LogicalOperator);
        }
    }
 }