server/mangos
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More thread-safety checks.

Browse Source
This commit is contained in:
H0zen 2016-03-25 20:05:47 +02:00
parent d011a70e97
commit 21dc241950
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/game/WorldHandlers/ScriptMgr.cpp
View File

@ -748,12 +748,17 @@ void ScriptMgr::LoadScripts(DBScriptType type)
void ScriptMgr::LoadDbScripts(DBScriptType t) void ScriptMgr::LoadDbScripts(DBScriptType t)
{ {
std::set<uint32> eventIds; // Store possible event ids std::set<uint32> eventIds; // Store possible event ids
if (t == DBS_ON_EVENT) if (t == DBS_ON_EVENT)
CollectPossibleEventIds(eventIds); CollectPossibleEventIds(eventIds);
LoadScripts(t); {
ACE_GUARD(ACE_Thread_Mutex, _g, m_lock)
LoadScripts(t);
}
ScriptChainMap& scm = m_dbScripts[t]; ScriptChainMap& scm = m_dbScripts[t];
for (ScriptChainMap::const_iterator itr = scm.begin(); itr != scm.end(); ++itr) for (ScriptChainMap::const_iterator itr = scm.begin(); itr != scm.end(); ++itr)