diff options
author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-02-09 01:14:42 +0100 |
---|---|---|
committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-02-09 01:14:42 +0100 |
commit | 9d1c9097e3a62f11cce94d1807c16a310eba6c2c (patch) | |
tree | f186174dd8567c9f0d43969a19782d8fdb2fb2ed /src/Root.cpp | |
parent | Merge branch 'master' into playerimprovements (diff) | |
parent | Merge pull request #656 from mc-server/ReloadGroups (diff) | |
download | cuberite-9d1c9097e3a62f11cce94d1807c16a310eba6c2c.tar cuberite-9d1c9097e3a62f11cce94d1807c16a310eba6c2c.tar.gz cuberite-9d1c9097e3a62f11cce94d1807c16a310eba6c2c.tar.bz2 cuberite-9d1c9097e3a62f11cce94d1807c16a310eba6c2c.tar.lz cuberite-9d1c9097e3a62f11cce94d1807c16a310eba6c2c.tar.xz cuberite-9d1c9097e3a62f11cce94d1807c16a310eba6c2c.tar.zst cuberite-9d1c9097e3a62f11cce94d1807c16a310eba6c2c.zip |
Diffstat (limited to '')
-rw-r--r-- | src/Root.cpp | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/Root.cpp b/src/Root.cpp index 3e1898c42..749fbd288 100644 --- a/src/Root.cpp +++ b/src/Root.cpp @@ -132,7 +132,7 @@ void cRoot::Start(void) LOGWARN("Regenerating settings.ini, all settings will be reset"); IniFile.AddHeaderComment(" This is the main server configuration"); IniFile.AddHeaderComment(" Most of the settings here can be configured using the webadmin interface, if enabled in webadmin.ini"); - IniFile.AddHeaderComment(" See: http://www.mc-server.org/wiki/doku.php?id=configure:settings.ini for further configuration help"); + IniFile.AddHeaderComment(" See: http://wiki.mc-server.org/doku.php?id=configure:settings.ini for further configuration help"); } m_PrimaryServerVersion = IniFile.GetValueI("Server", "PrimaryServerVersion", 0); @@ -219,16 +219,14 @@ void cRoot::Start(void) delete m_InputThread; m_InputThread = NULL; #endif - // Deallocate stuffs + // Stop the server: + m_WebAdmin->Stop(); LOG("Shutting down server..."); m_Server->Shutdown(); - LOGD("Shutting down deadlock detector..."); dd.Stop(); - LOGD("Stopping world threads..."); StopWorlds(); - LOGD("Stopping authenticator..."); m_Authenticator.Stop(); @@ -536,6 +534,15 @@ void cRoot::SaveAllChunks(void) +void cRoot::ReloadGroups(void) +{ + m_GroupManager->LoadGroups(); +} + + + + + void cRoot::LoopWorldsAndBroadcastChat(const AString & a_Message, ChatPrefixCodes a_ChatPrefix) { for (WorldMap::iterator itr = m_WorldsByName.begin(), end = m_WorldsByName.end(); itr != end; ++itr) |