aboutsummaryrefslogtreecommitdiff
path: root/launcher/minecraft/mod/ResourcePack.cpp
diff options
context:
space:
mode:
authorRachel Powers <508861+Ryex@users.noreply.github.com>2023-07-31 22:26:20 -0700
committerGitHub <noreply@github.com>2023-07-31 22:26:20 -0700
commit2d1197f59f824a3093ad71b9ee3466bd5e2825c8 (patch)
tree368a2ba5ab9a6ae9f3b3fd0841ea5ee1d0283add /launcher/minecraft/mod/ResourcePack.cpp
parentb47993b736ba40a75b5b63290f9d7b5911f8150e (diff)
parent9137721e8e5b44f2338a36874a393435cbc6daa3 (diff)
downloadPrismLauncher-2d1197f59f824a3093ad71b9ee3466bd5e2825c8.tar.gz
PrismLauncher-2d1197f59f824a3093ad71b9ee3466bd5e2825c8.tar.bz2
PrismLauncher-2d1197f59f824a3093ad71b9ee3466bd5e2825c8.zip
Merge branch 'develop' into refactor/net-split-headers-to-proxy-class
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
Diffstat (limited to 'launcher/minecraft/mod/ResourcePack.cpp')
-rw-r--r--launcher/minecraft/mod/ResourcePack.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/launcher/minecraft/mod/ResourcePack.cpp b/launcher/minecraft/mod/ResourcePack.cpp
index e06c1ac1..6d5978d4 100644
--- a/launcher/minecraft/mod/ResourcePack.cpp
+++ b/launcher/minecraft/mod/ResourcePack.cpp
@@ -102,6 +102,7 @@ std::pair<int, bool> ResourcePack::compare(const Resource& other, SortType type)
auto res = Resource::compare(other, type);
if (res.first != 0)
return res;
+ break;
}
case SortType::PACK_FORMAT: {
auto this_ver = packFormat();
@@ -111,6 +112,7 @@ std::pair<int, bool> ResourcePack::compare(const Resource& other, SortType type)
return { 1, type == SortType::PACK_FORMAT };
if (this_ver < other_ver)
return { -1, type == SortType::PACK_FORMAT };
+ break;
}
}
return { 0, false };