mirror of
https://github.com/luanti-org/luanti.git
synced 2026-01-03 03:35:20 +01:00
Use std::mutex for the env lock (instead of ordered_mutex) (#16739)
This is helpful with multiple emerge threads.
This commit is contained in:
@@ -474,7 +474,7 @@ public:
|
|||||||
EnvAutoLock(Server *server): m_lock(server->m_env_mutex) {}
|
EnvAutoLock(Server *server): m_lock(server->m_env_mutex) {}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
std::lock_guard<ordered_mutex> m_lock;
|
std::lock_guard<std::mutex> m_lock;
|
||||||
};
|
};
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
@@ -662,7 +662,7 @@ private:
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
// Environment mutex (envlock)
|
// Environment mutex (envlock)
|
||||||
ordered_mutex m_env_mutex;
|
std::mutex m_env_mutex;
|
||||||
|
|
||||||
// World directory
|
// World directory
|
||||||
std::string m_path_world;
|
std::string m_path_world;
|
||||||
|
|||||||
Reference in New Issue
Block a user