diff options
| -rw-r--r-- | launcher/minecraft/MojangVersionFormat.cpp | 6 | ||||
| -rwxr-xr-x | scripts/checkpatch.pl | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/launcher/minecraft/MojangVersionFormat.cpp b/launcher/minecraft/MojangVersionFormat.cpp index bf794eb5ab..31e2724c4a 100644 --- a/launcher/minecraft/MojangVersionFormat.cpp +++ b/launcher/minecraft/MojangVersionFormat.cpp @@ -190,9 +190,9 @@ void MojangVersionFormat::readVersionProperties(const QJsonObject &in, VersionFi out->releaseTime = timeFromS3Time(in.value("releaseTime").toString("")); out->updateTime = timeFromS3Time(in.value("time").toString("")); - if (in.contains("minimumMeshMCVersion")) + if (in.contains("minimumLauncherVersion")) { - out->minimumMeshMCVersion = requireInteger(in.value("minimumMeshMCVersion")); + out->minimumMeshMCVersion = requireInteger(in.value("minimumLauncherVersion")); if (out->minimumMeshMCVersion > CURRENT_MINIMUM_MESHMC_VERSION) { out->addProblem( @@ -267,7 +267,7 @@ void MojangVersionFormat::writeVersionProperties(const VersionFile* in, QJsonObj } if(in->minimumMeshMCVersion != -1) { - out.insert("minimumMeshMCVersion", in->minimumMeshMCVersion); + out.insert("minimumLauncherVersion", in->minimumMeshMCVersion); } writeString(out, "assets", in->assets); if(in->mojangAssetIndex && in->mojangAssetIndex->known) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index deb950b0f7..703363a787 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -4816,10 +4816,10 @@ sub check_cyclomatic_complexity { $complexity++ if $stripped =~ /\|\|/; if ($brace_depth <= 0 && $stripped =~ /}/) { - if ($complexity > 15) { + if ($complexity > 40) { report($filepath, $function_start, SEV_WARNING, 'HIGH_COMPLEXITY', - "Function '$function_name' has cyclomatic complexity of $complexity (recommended max: 15). Consider refactoring."); - } elsif ($complexity > 10) { + "Function '$function_name' has cyclomatic complexity of $complexity (recommended max: 40). Consider refactoring."); + } elsif ($complexity > 30) { report($filepath, $function_start, SEV_INFO, 'MODERATE_COMPLEXITY', "Function '$function_name' has cyclomatic complexity of $complexity (consider simplifying)"); } |