summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2014-12-21 15:31:20 +0100
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2014-12-21 15:31:20 +0100
commit0d6672bf5d976f86f2746a120acd3c19c9d4c8a2 (patch)
treea87a18f33cc8fd07be5357801e90731079bcdab5 /src
parentMerge pull request #1682 from Masy98/entities (diff)
downloadcuberite-0d6672bf5d976f86f2746a120acd3c19c9d4c8a2.tar
cuberite-0d6672bf5d976f86f2746a120acd3c19c9d4c8a2.tar.gz
cuberite-0d6672bf5d976f86f2746a120acd3c19c9d4c8a2.tar.bz2
cuberite-0d6672bf5d976f86f2746a120acd3c19c9d4c8a2.tar.lz
cuberite-0d6672bf5d976f86f2746a120acd3c19c9d4c8a2.tar.xz
cuberite-0d6672bf5d976f86f2746a120acd3c19c9d4c8a2.tar.zst
cuberite-0d6672bf5d976f86f2746a120acd3c19c9d4c8a2.zip
Diffstat (limited to '')
-rw-r--r--src/Root.cpp15
-rw-r--r--src/Root.h4
2 files changed, 14 insertions, 5 deletions
diff --git a/src/Root.cpp b/src/Root.cpp
index 9f8ffeeff..9725502ee 100644
--- a/src/Root.cpp
+++ b/src/Root.cpp
@@ -135,8 +135,9 @@ void cRoot::Start(void)
}
LOG("Starting server...");
+ m_MojangAPI = new cMojangAPI;
bool ShouldAuthenticate = IniFile.GetValueSetB("Authentication", "Authenticate", true);
- m_MojangAPI.Start(IniFile, ShouldAuthenticate); // Mojang API needs to be started before plugins, so that plugins may use it for DB upgrades on server init
+ m_MojangAPI->Start(IniFile, ShouldAuthenticate); // Mojang API needs to be started before plugins, so that plugins may use it for DB upgrades on server init
if (!m_Server->InitServer(IniFile, ShouldAuthenticate))
{
IniFile.WriteFile("settings.ini");
@@ -149,7 +150,7 @@ void cRoot::Start(void)
LOGD("Loading settings...");
m_RankManager.reset(new cRankManager());
- m_RankManager->Initialize(m_MojangAPI);
+ m_RankManager->Initialize(*m_MojangAPI);
m_CraftingRecipes = new cCraftingRecipes;
m_FurnaceRecipe = new cFurnaceRecipe();
@@ -196,7 +197,7 @@ void cRoot::Start(void)
}
#endif
- LOG("Startup complete, took %ld ms!", static_cast<long int>(std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::steady_clock::now() - BeginTime).count()));
+ LOG("Startup complete, took %ldms!", static_cast<long int>(std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::steady_clock::now() - BeginTime).count()));
#ifdef _WIN32
EnableMenuItem(hmenu, SC_CLOSE, MF_ENABLED); // Re-enable close button
#endif
@@ -213,21 +214,28 @@ void cRoot::Start(void)
// Stop the server:
m_WebAdmin->Stop();
+
LOG("Shutting down server...");
m_Server->Shutdown();
+ delete m_MojangAPI; m_MojangAPI = nullptr;
+
LOGD("Shutting down deadlock detector...");
dd.Stop();
+
LOGD("Stopping world threads...");
StopWorlds();
+
LOGD("Stopping authenticator...");
m_Authenticator.Stop();
LOGD("Freeing MonsterConfig...");
delete m_MonsterConfig; m_MonsterConfig = nullptr;
delete m_WebAdmin; m_WebAdmin = nullptr;
+
LOGD("Unloading recipes...");
delete m_FurnaceRecipe; m_FurnaceRecipe = nullptr;
delete m_CraftingRecipes; m_CraftingRecipes = nullptr;
+
LOGD("Unloading worlds...");
UnloadWorlds();
@@ -238,6 +246,7 @@ void cRoot::Start(void)
LOG("Cleaning up...");
delete m_Server; m_Server = nullptr;
+
LOG("Shutdown successful!");
}
diff --git a/src/Root.h b/src/Root.h
index 2c512a5df..fdaf444bd 100644
--- a/src/Root.h
+++ b/src/Root.h
@@ -86,7 +86,7 @@ public:
cWebAdmin * GetWebAdmin (void) { return m_WebAdmin; } // tolua_export
cPluginManager * GetPluginManager (void) { return m_PluginManager; } // tolua_export
cAuthenticator & GetAuthenticator (void) { return m_Authenticator; }
- cMojangAPI & GetMojangAPI (void) { return m_MojangAPI; }
+ cMojangAPI & GetMojangAPI (void) { return *m_MojangAPI; }
cRankManager * GetRankManager (void) { return m_RankManager.get(); }
/** Queues a console command for execution through the cServer class.
@@ -191,7 +191,7 @@ private:
cWebAdmin * m_WebAdmin;
cPluginManager * m_PluginManager;
cAuthenticator m_Authenticator;
- cMojangAPI m_MojangAPI;
+ cMojangAPI * m_MojangAPI;
std::unique_ptr<cRankManager> m_RankManager;