chore: merge nested if blocks

This commit is contained in:
oSumAtrIX 2022-06-21 19:00:11 +02:00
parent 7dabd53109
commit 00145f2bb6
No known key found for this signature in database
GPG Key ID: A9B3094ACDB604B4

View File

@ -24,13 +24,11 @@ fun Patcher.addPatchesFiltered(
val prefix = "[skipped] $patchName" val prefix = "[skipped] $patchName"
val args = MainCommand.args.pArgs!! val args = MainCommand.args.pArgs!!
if (excludePatches) { if (excludePatches && args.excludedPatches.contains(patchName)) {
if (args.excludedPatches.contains(patchName)) { println("$prefix: Explicitly excluded.")
println("$prefix: Explicitly excluded.") return@patch
return@patch
}
} else if (!patch.include) { } else if (!patch.include) {
println("$prefix: Implicitly excluded.") println("$prefix: Implicitly excluded.")
return@patch return@patch
@ -43,7 +41,7 @@ fun Patcher.addPatchesFiltered(
return@patch 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.") println("$prefix: The package version is $packageVersion and is incompatible.")
return@patch return@patch
} }