BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Safety check the map's blocksize (#12895)

Browse Source
This commit is contained in:
lhofhansl 2022-10-27 19:31:42 -07:00 committed by GitHub
parent 88820cd31c
commit 9aaed75eea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/content/subgames.cpp
View File

@ -390,6 +390,8 @@ void loadGameConfAndInitWorld(const std::string &path, const std::string &name,
conf.set("mod_storage_backend", "sqlite3"); conf.set("mod_storage_backend", "sqlite3");
conf.setBool("creative_mode", g_settings->getBool("creative_mode")); conf.setBool("creative_mode", g_settings->getBool("creative_mode"));
conf.setBool("enable_damage", g_settings->getBool("enable_damage")); conf.setBool("enable_damage", g_settings->getBool("enable_damage"));
if (MAP_BLOCKSIZE != 16)
conf.set("blocksize", std::to_string(MAP_BLOCKSIZE));
if (!conf.updateConfigFile(worldmt_path.c_str())) { if (!conf.updateConfigFile(worldmt_path.c_str())) {
throw BaseException("Failed to update the config file"); throw BaseException("Failed to update the config file");

7
src/serverenvironment.cpp
View File

@ -420,6 +420,13 @@ void ServerEnvironment::init()
// If we open world.mt read the backend configurations. // If we open world.mt read the backend configurations.
if (succeeded) { if (succeeded) {
// Check that the world's blocksize matches the compiled MAP_BLOCKSIZE
u16 blocksize = 16;
conf.getU16NoEx("blocksize", blocksize);
if (blocksize != MAP_BLOCKSIZE) {
throw BaseException(std::string("The map's blocksize is not supported."));
}
// Read those values before setting defaults // Read those values before setting defaults
bool player_backend_exists = conf.exists("player_backend"); bool player_backend_exists = conf.exists("player_backend");
bool auth_backend_exists = conf.exists("auth_backend"); bool auth_backend_exists = conf.exists("auth_backend");