aboutsummaryrefslogtreecommitdiff
path: root/launcher/minecraft/mod
diff options
context:
space:
mode:
authorRyan Cao <70191398+ryanccn@users.noreply.github.com>2022-11-19 23:59:30 +0800
committerRyan Cao <70191398+ryanccn@users.noreply.github.com>2022-11-19 23:59:30 +0800
commit1f6b8f9d2bddd73e6cfd9d430ef9e37d1910adff (patch)
tree59a3a99c2680f44128ef7da88a1a19852a944a21 /launcher/minecraft/mod
parenta33b8049238329fa97545c0b2db5bb8c2f7545c6 (diff)
downloadPrismLauncher-1f6b8f9d2bddd73e6cfd9d430ef9e37d1910adff.tar.gz
PrismLauncher-1f6b8f9d2bddd73e6cfd9d430ef9e37d1910adff.tar.bz2
PrismLauncher-1f6b8f9d2bddd73e6cfd9d430ef9e37d1910adff.zip
fix instance IDs and resource pack imports
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
Diffstat (limited to 'launcher/minecraft/mod')
-rw-r--r--launcher/minecraft/mod/tasks/LocalResourcePackParseTask.cpp2
-rw-r--r--launcher/minecraft/mod/tasks/LocalTexturePackParseTask.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/launcher/minecraft/mod/tasks/LocalResourcePackParseTask.cpp b/launcher/minecraft/mod/tasks/LocalResourcePackParseTask.cpp
index 4f87bc13..d744c535 100644
--- a/launcher/minecraft/mod/tasks/LocalResourcePackParseTask.cpp
+++ b/launcher/minecraft/mod/tasks/LocalResourcePackParseTask.cpp
@@ -152,7 +152,7 @@ bool LocalResourcePackParseTask::abort()
void LocalResourcePackParseTask::executeTask()
{
- Q_ASSERT(m_resource_pack.valid());
+ // Q_ASSERT(m_resource_pack.valid());
if (!ResourcePackUtils::process(m_resource_pack))
return;
diff --git a/launcher/minecraft/mod/tasks/LocalTexturePackParseTask.cpp b/launcher/minecraft/mod/tasks/LocalTexturePackParseTask.cpp
index bf1e308f..f23117ee 100644
--- a/launcher/minecraft/mod/tasks/LocalTexturePackParseTask.cpp
+++ b/launcher/minecraft/mod/tasks/LocalTexturePackParseTask.cpp
@@ -143,7 +143,7 @@ bool LocalTexturePackParseTask::abort()
void LocalTexturePackParseTask::executeTask()
{
- Q_ASSERT(m_texture_pack.valid());
+ // Q_ASSERT(m_texture_pack.valid());
if (!TexturePackUtils::process(m_texture_pack))
return;