From 00145f2bb638633267bc4f89e09d9ab8056674e1 Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Tue, 21 Jun 2022 19:00:11 +0200 Subject: [PATCH] chore: merge nested if blocks --- .../kotlin/app/revanced/utils/patcher/Patcher.kt | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main/kotlin/app/revanced/utils/patcher/Patcher.kt b/src/main/kotlin/app/revanced/utils/patcher/Patcher.kt index 4425fea..b78858b 100644 --- a/src/main/kotlin/app/revanced/utils/patcher/Patcher.kt +++ b/src/main/kotlin/app/revanced/utils/patcher/Patcher.kt @@ -24,13 +24,11 @@ fun Patcher.addPatchesFiltered( val prefix = "[skipped] $patchName" - val args = MainCommand.args.pArgs!! + val args = MainCommand.args.pArgs!! - if (excludePatches) { - if (args.excludedPatches.contains(patchName)) { - println("$prefix: Explicitly excluded.") - return@patch - } + if (excludePatches && args.excludedPatches.contains(patchName)) { + println("$prefix: Explicitly excluded.") + return@patch } else if (!patch.include) { println("$prefix: Implicitly excluded.") return@patch @@ -43,7 +41,7 @@ fun Patcher.addPatchesFiltered( return@patch } - if (!(args.experimental || compatiblePackages.any { it.versions.isEmpty() || it.versions.any { version -> version == packageVersion }})) { + if (!(args.experimental || compatiblePackages.any { it.versions.isEmpty() || it.versions.any { version -> version == packageVersion } })) { println("$prefix: The package version is $packageVersion and is incompatible.") return@patch }