diff options
| author | Mattes D <github@xoft.cz> | 2017-01-18 10:51:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-18 10:51:17 +0100 |
| commit | 0256daa7ca98bab7482581dad39f66d570030874 (patch) | |
| tree | de9232cbf239800ea1e7a71cf52086509a9472ea /src/Root.cpp | |
| parent | Updated Github label links (#3543) (diff) | |
| parent | DeadlockDetect now lists some tracked CS's stats. (diff) | |
| download | cuberite-0256daa7ca98bab7482581dad39f66d570030874.tar cuberite-0256daa7ca98bab7482581dad39f66d570030874.tar.gz cuberite-0256daa7ca98bab7482581dad39f66d570030874.tar.bz2 cuberite-0256daa7ca98bab7482581dad39f66d570030874.tar.lz cuberite-0256daa7ca98bab7482581dad39f66d570030874.tar.xz cuberite-0256daa7ca98bab7482581dad39f66d570030874.tar.zst cuberite-0256daa7ca98bab7482581dad39f66d570030874.zip | |
Diffstat (limited to 'src/Root.cpp')
| -rw-r--r-- | src/Root.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/Root.cpp b/src/Root.cpp index 8390cac7b..37fbf125f 100644 --- a/src/Root.cpp +++ b/src/Root.cpp @@ -182,7 +182,7 @@ void cRoot::Start(std::unique_ptr<cSettingsRepositoryInterface> a_OverridesRepo) LoadWorlds(*settingsRepo, IsNewIniFile); LOGD("Loading plugin manager..."); - m_PluginManager = new cPluginManager(); + m_PluginManager = new cPluginManager(dd); m_PluginManager->ReloadPluginsNow(*settingsRepo); LOGD("Loading MonsterConfig..."); @@ -193,7 +193,7 @@ void cRoot::Start(std::unique_ptr<cSettingsRepositoryInterface> a_OverridesRepo) m_Authenticator.Start(*settingsRepo); LOGD("Starting worlds..."); - StartWorlds(); + StartWorlds(dd); if (settingsRepo->GetValueSetB("DeadlockDetect", "Enabled", true)) { @@ -248,7 +248,7 @@ void cRoot::Start(std::unique_ptr<cSettingsRepositoryInterface> a_OverridesRepo) dd.Stop(); LOGD("Stopping world threads..."); - StopWorlds(); + StopWorlds(dd); LOGD("Stopping authenticator..."); m_Authenticator.Stop(); @@ -486,11 +486,11 @@ void cRoot::LoadWorlds(cSettingsRepositoryInterface & a_Settings, bool a_IsNewIn -void cRoot::StartWorlds(void) +void cRoot::StartWorlds(cDeadlockDetect & a_DeadlockDetect) { for (WorldMap::iterator itr = m_WorldsByName.begin(); itr != m_WorldsByName.end(); ++itr) { - itr->second->Start(); + itr->second->Start(a_DeadlockDetect); itr->second->InitializeSpawn(); m_PluginManager->CallHookWorldStarted(*itr->second); } @@ -500,11 +500,11 @@ void cRoot::StartWorlds(void) -void cRoot::StopWorlds(void) +void cRoot::StopWorlds(cDeadlockDetect & a_DeadlockDetect) { for (WorldMap::iterator itr = m_WorldsByName.begin(); itr != m_WorldsByName.end(); ++itr) { - itr->second->Stop(); + itr->second->Stop(a_DeadlockDetect); } } |