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

Fix Server triggering wrong errors if environment init fails

Browse Source
This commit is contained in:
sfan5 2020-05-07 21:39:04 +02:00
parent 4f9ccd89b3
commit 650168cada
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/serverenvironment.cpp
View File

@ -624,6 +624,9 @@ PlayerSAO *ServerEnvironment::loadPlayer(RemotePlayer *player, bool *new_player,
void ServerEnvironment::saveMeta() void ServerEnvironment::saveMeta()
{ {
if (!m_meta_loaded)
return;
std::string path = m_path_world + DIR_DELIM "env_meta.txt"; std::string path = m_path_world + DIR_DELIM "env_meta.txt";
// Open file and serialize // Open file and serialize
@ -650,6 +653,9 @@ void ServerEnvironment::saveMeta()
void ServerEnvironment::loadMeta() void ServerEnvironment::loadMeta()
{ {
SANITY_CHECK(!m_meta_loaded);
m_meta_loaded = true;
// If file doesn't exist, load default environment metadata // If file doesn't exist, load default environment metadata
if (!fs::PathExists(m_path_world + DIR_DELIM "env_meta.txt")) { if (!fs::PathExists(m_path_world + DIR_DELIM "env_meta.txt")) {
infostream << "ServerEnvironment: Loading default environment metadata" infostream << "ServerEnvironment: Loading default environment metadata"

2
src/serverenvironment.h
View File

@ -440,6 +440,8 @@ private:
IntervalLimiter m_active_blocks_management_interval; IntervalLimiter m_active_blocks_management_interval;
IntervalLimiter m_active_block_modifier_interval; IntervalLimiter m_active_block_modifier_interval;
IntervalLimiter m_active_blocks_nodemetadata_interval; IntervalLimiter m_active_blocks_nodemetadata_interval;
// Whether the variables below have been read from file yet
bool m_meta_loaded = false;
// Time from the beginning of the game in seconds. // Time from the beginning of the game in seconds.
// Incremented in step(). // Incremented in step().
u32 m_game_time = 0; u32 m_game_time = 0;