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

Reset environment metadata if it is unreadable

Browse Source
This commit is contained in:
numzero 2022-04-07 22:38:18 +03:00 committed by Maksim
parent 11abe53d2b
commit 745b858bae
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/server.cpp
View File

@ -482,7 +482,13 @@ void Server::init()
// Register us to receive map edit events // Register us to receive map edit events
servermap->addEventReceiver(this); servermap->addEventReceiver(this);
m_env->loadMeta(); try {
m_env->loadMeta();
} catch (SerializationError &e) {
warningstream << "Environment metadata is corrupted: " << e.what() << std::endl;
warningstream << "Loading the default instead" << std::endl;
m_env->loadDefaultMeta();
}
// Those settings can be overwritten in world.mt, they are // Those settings can be overwritten in world.mt, they are
// intended to be cached after environment loading. // intended to be cached after environment loading.

2
src/serverenvironment.h
View File

@ -368,13 +368,13 @@ public:
const bool isCompatPlayerModel(const std::string &model_name); const bool isCompatPlayerModel(const std::string &model_name);
inline bool getCompatSendOriginalModel() { return m_compat_send_original_model; } inline bool getCompatSendOriginalModel() { return m_compat_send_original_model; }
private:
/** /**
* called if env_meta.txt doesn't exist (e.g. new world) * called if env_meta.txt doesn't exist (e.g. new world)
*/ */
void loadDefaultMeta(); void loadDefaultMeta();
private:
static PlayerDatabase *openPlayerDatabase(const std::string &name, static PlayerDatabase *openPlayerDatabase(const std::string &name,
const std::string &savedir, const Settings &conf); const std::string &savedir, const Settings &conf);
static AuthDatabase *openAuthDatabase(const std::string &name, static AuthDatabase *openAuthDatabase(const std::string &name,