From d0d9d7027790bd5fce3c8dd68d587c5fdf680e4b Mon Sep 17 00:00:00 2001 From: fankesyooni Date: Sun, 11 Sep 2022 21:52:30 +0800 Subject: [PATCH] Fix logical problem in Conditions in UtilsFactory --- .../com/highcapable/yukihookapi/hook/utils/UtilsFactory.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/utils/UtilsFactory.kt b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/utils/UtilsFactory.kt index 358728db..1e1ded28 100644 --- a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/utils/UtilsFactory.kt +++ b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/utils/UtilsFactory.kt @@ -142,7 +142,7 @@ internal class Conditions(internal var value: T) { /** 全部判断条件数组 (与) */ private val andConditions = ArrayList() - /** 全部判断条件数组 (与成立 - 非忽略) */ + /** 全部判断条件数组 (或) */ private val optConditions = ArrayList() /** @@ -154,7 +154,7 @@ internal class Conditions(internal var value: T) { } /** - * 添加与 (and) 条件 (可选) + * 添加或 (or) 条件 * @param value 条件值 */ internal fun opt(value: Boolean) { @@ -177,7 +177,7 @@ internal class Conditions(internal var value: T) { * @return [Boolean] */ private val result by lazy { - optConditions.takeIf { it.isNotEmpty() }?.any { it.not() }?.not() == true || + optConditions.takeIf { it.isNotEmpty() }?.any { it } == true || andConditions.takeIf { it.isNotEmpty() }?.any { it.not() }?.not() == true }