minenux/minetest-engine-multicraft2
1
0
Fork 0
Code Releases Activity

Don't crash on mod directories without init.lua

Browse Source
This commit is contained in:
luk3yx 2023-05-21 21:19:39 +12:00 committed by mckaygerhard
parent 46c24e6c47
commit 371c3d3115
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/server/mods.cpp
View File

@ -76,9 +76,22 @@ void ServerModManager::loadMods(ServerScripting *script)
// This is behind a setting since getMemoryUsageKB calls // This is behind a setting since getMemoryUsageKB calls
// collectgarbage() first which will slow down load times. // collectgarbage() first which will slow down load times.
if (log_mem) { size_t old_usage = log_mem ? script->getMemoryUsageKB() : 0;
size_t old_usage = script->getMemoryUsageKB();
try {
script->loadMod(script_path, mod.name); script->loadMod(script_path, mod.name);
} catch (ModError &e) {
// Only re-throw the error if the file exists
// The PathExists check is done here since init.lua is expected to
// exist so checking it first would just waste time
if (fs::PathExists(script_path))
throw;
errorstream << "Ignoring invalid mod directory: " << e.what() << std::endl;
continue;
}
if (log_mem) {
size_t new_usage = script->getMemoryUsageKB(); size_t new_usage = script->getMemoryUsageKB();
actionstream << "Mod \"" << mod.name << "\" loaded, "; actionstream << "Mod \"" << mod.name << "\" loaded, ";
if (new_usage >= old_usage) if (new_usage >= old_usage)
@ -86,9 +99,8 @@ void ServerModManager::loadMods(ServerScripting *script)
else else
actionstream << "somehow freeing " << (old_usage - new_usage); actionstream << "somehow freeing " << (old_usage - new_usage);
actionstream << "KB of memory" << std::endl; actionstream << "KB of memory" << std::endl;
} else {
script->loadMod(script_path, mod.name);
} }
infostream << "Mod \"" << mod.name << "\" loaded after " infostream << "Mod \"" << mod.name << "\" loaded after "
<< (porting::getTimeMs() - t) << " ms" << std::endl; << (porting::getTimeMs() - t) << " ms" << std::endl;
} }