2 files changed, 26 insertions, 0 deletions

diff --git a/source/Server.cpp b/source/Server.cpp
index 75ce35cb7..7af575157 100644
--- a/source/Server.cpp
+++ b/source/Server.cpp
@@ -462,6 +462,18 @@ void cServer::ExecuteConsoleCommand(const AString & a_Cmd, cCommandOutputCallbac
 		return;
 	}
 	
+	// "help" and "reload" are to be handled by MCS, so that they work no matter what
+	if (split[0] == "help")
+	{
+		PrintHelp(split, a_Output);
+		return;
+	}
+	if (split[0] == "reload")
+	{
+		cPluginManager::Get()->ReloadPlugins();
+		return;
+	}
+	
 	// There is currently no way a plugin can do these (and probably won't ever be):
 	if (split[0].compare("chunkstats") == 0)
 	{
@@ -500,9 +512,20 @@ void cServer::ExecuteConsoleCommand(const AString & a_Cmd, cCommandOutputCallbac
 
 
 
+void cServer::PrintHelp(const AStringVector & a_Split, cCommandOutputCallback & a_Output)
+{
+	// TODO
+}
+
+
+
+
+
 void cServer::BindBuiltInConsoleCommands(void)
 {
 	cPluginManager * PlgMgr = cPluginManager::Get();
+	PlgMgr->BindConsoleCommand("help", NULL, " - Shows the available commands");
+	PlgMgr->BindConsoleCommand("reload", NULL, " - Reloads all plugins");
 	PlgMgr->BindConsoleCommand("restart", NULL, " - Restarts the server cleanly");
 	PlgMgr->BindConsoleCommand("stop", NULL, " - Stops the server cleanly");
 	PlgMgr->BindConsoleCommand("chunkstats", NULL, " - Displays detailed chunk memory statistics");
diff --git a/source/Server.h b/source/Server.h
index 6742153ac..1b4848318 100644
--- a/source/Server.h
+++ b/source/Server.h
@@ -57,6 +57,9 @@ public:												// tolua_export
 	
 	/// Executes the console command, sends output through the specified callback
 	void ExecuteConsoleCommand(const AString & a_Cmd, cCommandOutputCallback & a_Output);
+	
+	/// Lists all available console commands and their helpstrings
+	void PrintHelp(const AStringVector & a_Split, cCommandOutputCallback & a_Output);
 
 	/// Binds the built-in console commands with the plugin manager
 	static void BindBuiltInConsoleCommands(void);