Unstable 1.8.4.0

2025-03-12 12:56:27 +00:00
parent a4c3e868e4
commit a4a3427e4e
627 changed files with 29860 additions and 10018 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);
        }
    }
 }