2 files changed, 53 insertions, 48 deletions

diff --git a/src/Root.cpp b/src/Root.cpp
index c3c880e73..b28e7c894 100644
--- a/src/Root.cpp
+++ b/src/Root.cpp
@@ -72,7 +72,7 @@ cRoot::~cRoot()
 void cRoot::InputThread(cRoot & a_Params)
 {
 	cLogCommandOutputCallback Output;
-	
+
 	while (!cRoot::m_ShouldStop && !a_Params.m_bRestart && !m_TerminateEventRaised && std::cin.good())
 	{
 		AString Command;
@@ -105,12 +105,12 @@ void cRoot::Start(std::unique_ptr<cSettingsRepositoryInterface> overridesRepo)
 	HMENU hmenu = GetSystemMenu(hwnd, FALSE);
 	EnableMenuItem(hmenu, SC_CLOSE, MF_GRAYED);  // Disable close button when starting up; it causes problems with our CTRL-CLOSE handling
 	#endif
-	
+
 	cLogger::cListener * consoleLogListener = MakeConsoleListener();
 	cLogger::cListener * fileLogListener = new cFileListener();
 	cLogger::GetInstance().AttachListener(consoleLogListener);
 	cLogger::GetInstance().AttachListener(fileLogListener);
-	
+
 	LOG("--- Started Log ---\n");
 
 	#ifdef BUILD_ID
@@ -162,30 +162,30 @@ void cRoot::Start(std::unique_ptr<cSettingsRepositoryInterface> overridesRepo)
 		m_RankManager->Initialize(*m_MojangAPI);
 		m_CraftingRecipes = new cCraftingRecipes;
 		m_FurnaceRecipe   = new cFurnaceRecipe();
-		
+
 		LOGD("Loading worlds...");
 		LoadWorlds(*settingsRepo);
 
 		LOGD("Loading plugin manager...");
 		m_PluginManager = new cPluginManager();
 		m_PluginManager->ReloadPluginsNow(*settingsRepo);
-		
+
 		LOGD("Loading MonsterConfig...");
 		m_MonsterConfig = new cMonsterConfig;
 
 		// This sets stuff in motion
 		LOGD("Starting Authenticator...");
 		m_Authenticator.Start(*settingsRepo);
-		
+
 		LOGD("Starting worlds...");
 		StartWorlds();
-		
+
 		if (settingsRepo->GetValueSetB("DeadlockDetect", "Enabled", true))
 		{
 			LOGD("Starting deadlock detector...");
 			dd.Start(settingsRepo->GetValueSetI("DeadlockDetect", "IntervalSec", 20));
 		}
-		
+
 		settingsRepo->Flush();
 
 		LOGD("Finalising startup...");
@@ -207,6 +207,10 @@ void cRoot::Start(std::unique_ptr<cSettingsRepositoryInterface> overridesRepo)
 			#endif
 
 			LOG("Startup complete, took %ldms!", static_cast<long int>(std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::steady_clock::now() - BeginTime).count()));
+
+			// Save the current time
+			m_StartTime = std::chrono::steady_clock::now();
+
 			#ifdef _WIN32
 			EnableMenuItem(hmenu, SC_CLOSE, MF_ENABLED);  // Re-enable close button
 			#endif
@@ -253,7 +257,7 @@ void cRoot::Start(std::unique_ptr<cSettingsRepositoryInterface> overridesRepo)
 
 		LOGD("Unloading worlds...");
 		UnloadWorlds();
-		
+
 		LOGD("Stopping plugin manager...");
 		delete m_PluginManager; m_PluginManager = nullptr;
 
@@ -264,9 +268,9 @@ void cRoot::Start(std::unique_ptr<cSettingsRepositoryInterface> overridesRepo)
 
 		LOG("Shutdown successful!");
 	}
-	
+
 	LOG("--- Stopped Log ---");
-	
+
 	cLogger::GetInstance().DetachListener(consoleLogListener);
 	delete consoleLogListener;
 	cLogger::GetInstance().DetachListener(fileLogListener);
@@ -299,7 +303,7 @@ void cRoot::LoadWorlds(cSettingsRepositoryInterface & a_Settings)
 	{
 		return;
 	}
-	
+
 	bool FoundAdditionalWorlds = false;
 	for (auto WorldNameValue : Worlds)
 	{
@@ -850,7 +854,3 @@ int cRoot::GetFurnaceFuelBurnTime(const cItem & a_Fuel)
 	cFurnaceRecipe * FR = Get()->GetFurnaceRecipe();
 	return FR->GetBurnTime(a_Fuel);
 }
-
-
-
-
diff --git a/src/Root.h b/src/Root.h
index 2b30afaff..ab820427f 100644
--- a/src/Root.h
+++ b/src/Root.h
@@ -70,22 +70,31 @@ public:
 	a_OverworldName should be set for non-overworld dimensions if one wishes that world to link back to an overworld via portals
 	*/
 	cWorld * CreateAndInitializeWorld(const AString & a_WorldName, eDimension a_Dimension = dimOverworld, const AString & a_OverworldName = "");
+
+	/** Returns the up time of the server in seconds */
+	int GetServerUpTime(void)
+	{
+		return static_cast<int>(std::chrono::duration_cast<std::chrono::seconds>(std::chrono::steady_clock::now() - m_StartTime).count());
+	}
 	// tolua_end
-	
+
 	/// Calls the callback for each world; returns true if the callback didn't abort (return true)
 	bool ForEachWorld(cWorldListCallback & a_Callback);  // >> Exported in ManualBindings <<
-	
+
 	/// Writes chunkstats, for each world and totals, to the output callback
 	void LogChunkStats(cCommandOutputCallback & a_Output);
-	
+
 	cMonsterConfig * GetMonsterConfig(void) { return m_MonsterConfig; }
 
 	cCraftingRecipes * GetCraftingRecipes(void) { return m_CraftingRecipes; }  // tolua_export
 	cFurnaceRecipe *   GetFurnaceRecipe  (void) { return m_FurnaceRecipe; }    // Exported in ManualBindings.cpp with quite a different signature
-	
+
 	/// Returns the number of ticks for how long the item would fuel a furnace. Returns zero if not a fuel
 	static int GetFurnaceFuelBurnTime(const cItem & a_Fuel);  // tolua_export
-	
+
+	/** The current time where the startup of the server has been completed */
+	std::chrono::steady_clock::time_point m_StartTime;
+
 	cWebAdmin *        GetWebAdmin       (void) { return m_WebAdmin; }         // tolua_export
 	cPluginManager *   GetPluginManager  (void) { return m_PluginManager; }    // tolua_export
 	cAuthenticator &   GetAuthenticator  (void) { return m_Authenticator; }
@@ -98,32 +107,32 @@ public:
 	"stop" and "restart" commands have special handling.
 	*/
 	void QueueExecuteConsoleCommand(const AString & a_Cmd, cCommandOutputCallback & a_Output);
-	
+
 	/** Queues a console command for execution through the cServer class.
 	The command will be executed in the tick thread
 	The command's output will be sent to console
 	"stop" and "restart" commands have special handling.
 	*/
 	void QueueExecuteConsoleCommand(const AString & a_Cmd);  // tolua_export
-	
+
 	/// Executes a console command through the cServer class; does special handling for "stop" and "restart".
 	void ExecuteConsoleCommand(const AString & a_Cmd, cCommandOutputCallback & a_Output);
-	
+
 	/// Kicks the user, no matter in what world they are. Used from cAuthenticator
 	void KickUser(int a_ClientID, const AString & a_Reason);
-	
+
 	/// Called by cAuthenticator to auth the specified user
 	void AuthenticateUser(int a_ClientID, const AString & a_Name, const AString & a_UUID, const Json::Value & a_Properties);
-	
+
 	/// Executes commands queued in the command queue
 	void TickCommands(void);
 
 	/// Returns the number of chunks loaded
 	int GetTotalChunkCount(void);  // tolua_export
-	
+
 	/// Saves all chunks in all worlds
 	void SaveAllChunks(void);  // tolua_export
-	
+
 	/// Calls the callback for each player in all worlds
 	bool ForEachPlayer(cPlayerListCallback & a_Callback);  // >> EXPORTED IN MANUALBINDINGS <<
 
@@ -132,12 +141,12 @@ public:
 
 	/** Finds the player over his uuid and calls the callback */
 	bool DoWithPlayerByUUID(const AString & a_PlayerUUID, cPlayerListCallback & a_Callback);  // >> EXPORTED IN MANUALBINDINGS <<
-	
+
 	/** Finds the player using it's complete username and calls the callback */
 	bool DoWithPlayer(const AString & a_PlayerName, cPlayerListCallback & a_Callback);
-	
+
 	// tolua_begin
-	
+
 	/// Sends a chat message to all connected clients (in all worlds)
 	void BroadcastChat       (const AString & a_Message, eMessageType a_ChatPrefix = mtCustom);
 	void BroadcastChat       (const cCompositeChat & a_Message);
@@ -149,18 +158,18 @@ public:
 	void BroadcastChatLeave  (const AString & a_Message) { BroadcastChat(a_Message, mtLeave); }
 	void BroadcastChatSuccess(const AString & a_Message) { BroadcastChat(a_Message, mtSuccess); }
 	void BroadcastChatWarning(const AString & a_Message) { BroadcastChat(a_Message, mtWarning); }
-	
+
 	/// Returns the textual description of the protocol version: 49 -> "1.4.4". Provided specifically for Lua API
 	static AString GetProtocolVersionTextFromInt(int a_ProtocolVersionNum);
-	
+
 	/// Returns the amount of virtual RAM used, in KiB. Returns a negative number on error
 	static int GetVirtualRAMUsage(void);
-	
+
 	/// Returns the amount of virtual RAM used, in KiB. Returns a negative number on error
 	static int GetPhysicalRAMUsage(void);
-	
+
 	// tolua_end
-	
+
 private:
 	class cCommand
 	{
@@ -170,17 +179,17 @@ private:
 			m_Output(a_Output)
 		{
 		}
-		
+
 		AString m_Command;
 		cCommandOutputCallback * m_Output;
 	} ;
-	
+
 	typedef std::map<AString, cWorld *> WorldMap;
 	typedef std::vector<cCommand> cCommandQueue;
 
 	cWorld * m_pDefaultWorld;
 	WorldMap m_WorldsByName;
-	
+
 	cCriticalSection m_CSPendingCommands;
 	cCommandQueue    m_PendingCommands;
 
@@ -206,24 +215,20 @@ private:
 
 	/// Loads the worlds from settings.ini, creates the worldmap
 	void LoadWorlds(cSettingsRepositoryInterface & a_Settings);
-	
+
 	/// Starts each world's life
 	void StartWorlds(void);
-	
+
 	/// Stops each world's threads, so that it's safe to unload them
 	void StopWorlds(void);
-	
+
 	/// Unloads all worlds from memory
 	void UnloadWorlds(void);
-	
+
 	/// Does the actual work of executing a command
 	void DoExecuteConsoleCommand(const AString & a_Cmd);
-	
+
 	static cRoot * s_Root;
 
 	static void InputThread(cRoot & a_Params);
 };  // tolua_export
-
-
-
-