10 files changed, 70 insertions, 48 deletions

diff --git a/source/CraftingRecipes.cpp b/source/CraftingRecipes.cpp
index 13a8ac1e0..9dc471781 100644
--- a/source/CraftingRecipes.cpp
+++ b/source/CraftingRecipes.cpp
@@ -310,7 +310,7 @@ void cCraftingRecipes::GetRecipe(const cPlayer * a_Player, const cCraftingGrid &
 
 void cCraftingRecipes::LoadRecipes(void)
 {
-	LOG("-- Loading crafting recipes from crafting.txt --");
+	LOGD("Loading crafting recipes from crafting.txt...");
 	ClearRecipes();
 	
 	// Load the crafting.txt file:
@@ -338,7 +338,7 @@ void cCraftingRecipes::LoadRecipes(void)
 		}
 		AddRecipeLine(LineNum, Recipe);
 	}  // for itr - Split[]
-	LOG("-- %d crafting recipes loaded from crafting.txt --", m_Recipes.size());
+	LOG("Loaded %d crafting recipes", m_Recipes.size());
 }
 
 
diff --git a/source/Entities/Entity.h b/source/Entities/Entity.h
index a2c99d2a0..c7c362b40 100644
--- a/source/Entities/Entity.h
+++ b/source/Entities/Entity.h
@@ -234,16 +234,16 @@ public:
 	/// Returns the curently equipped weapon; empty item if none
 	virtual cItem GetEquippedWeapon(void) const { return cItem(); }
 	
-	/// Returns the currently equipped helmet; empty item if nonte
+	/// Returns the currently equipped helmet; empty item if none
 	virtual cItem GetEquippedHelmet(void) const { return cItem(); }
 	
-	/// Returns the currently equipped chestplate; empty item if nonte
+	/// Returns the currently equipped chestplate; empty item if none
 	virtual cItem GetEquippedChestplate(void) const { return cItem(); }
 
-	/// Returns the currently equipped leggings; empty item if nonte
+	/// Returns the currently equipped leggings; empty item if none
 	virtual cItem GetEquippedLeggings(void) const { return cItem(); }
 	
-	/// Returns the currently equipped boots; empty item if nonte
+	/// Returns the currently equipped boots; empty item if none
 	virtual cItem GetEquippedBoots(void) const { return cItem(); }
 
 	/// Called when the health drops below zero. a_Killer may be NULL (environmental damage)
diff --git a/source/FurnaceRecipe.cpp b/source/FurnaceRecipe.cpp
index 8b1ee09a2..2e2276981 100644
--- a/source/FurnaceRecipe.cpp
+++ b/source/FurnaceRecipe.cpp
@@ -51,7 +51,7 @@ cFurnaceRecipe::~cFurnaceRecipe()
 void cFurnaceRecipe::ReloadRecipes(void)
 {
 	ClearRecipes();
-	LOG("-- Loading furnace recipes --");
+	LOGD("Loading furnace recipes...");
 
 	std::ifstream f;
 	char a_File[] = "furnace.txt";
@@ -175,7 +175,7 @@ void cFurnaceRecipe::ReloadRecipes(void)
 	{
 		LOGERROR("ERROR: FurnaceRecipe, syntax error" );
 	}
-	LOG("Got %u furnace recipes, and %u fuels.", m_pState->Recipes.size(), m_pState->Fuel.size());
+	LOG("Loaded %u furnace recipes and %u fuels", m_pState->Recipes.size(), m_pState->Fuel.size());
 }
 
 
diff --git a/source/Generating/ComposableGenerator.cpp b/source/Generating/ComposableGenerator.cpp
index 0852f559e..e2a8df11b 100644
--- a/source/Generating/ComposableGenerator.cpp
+++ b/source/Generating/ComposableGenerator.cpp
@@ -294,7 +294,7 @@ void cComposableGenerator::InitHeightGen(cIniFile & a_IniFile)
 			);
 			CacheSize = 4;
 		}
-		LOGINFO("Using a cache for Heightgen of size %d.", CacheSize);
+		LOGD("Using a cache for Heightgen of size %d.", CacheSize);
 		m_UnderlyingHeightGen = m_HeightGen;
 		m_HeightGen = new cHeiGenCache(m_UnderlyingHeightGen, CacheSize);
 	}
diff --git a/source/GroupManager.cpp b/source/GroupManager.cpp
index cef32dd58..b79fde9dc 100644
--- a/source/GroupManager.cpp
+++ b/source/GroupManager.cpp
@@ -43,7 +43,7 @@ cGroupManager::~cGroupManager()
 cGroupManager::cGroupManager()
 	: m_pState( new sGroupManagerState )
 {
-	LOG("-- Loading Groups --");
+	LOGD("-- Loading Groups --");
 	cIniFile IniFile("groups.ini");
 	if (!IniFile.ReadFile())
 	{
@@ -57,7 +57,7 @@ cGroupManager::cGroupManager()
 		std::string KeyName = IniFile.GetKeyName( i );
 		cGroup* Group = GetGroup( KeyName.c_str() );
 
-		LOG("Loading group: %s", KeyName.c_str() );
+		LOGD("Loading group: %s", KeyName.c_str() );
 
 		Group->SetName( KeyName );
 		char Color = IniFile.GetValue( KeyName, "Color", "-" )[0];
@@ -73,7 +73,6 @@ cGroupManager::cGroupManager()
 			for( unsigned int i = 0; i < Split.size(); i++)
 			{
 				Group->AddCommand( Split[i] );
-				//LOG("%s", Split[i].c_str() );
 			}
 		}
 
@@ -84,7 +83,6 @@ cGroupManager::cGroupManager()
 			for( unsigned int i = 0; i < Split.size(); i++)
 			{
 				Group->AddPermission( Split[i] );
-				//LOGINFO("Permission: %s", Split[i].c_str() );
 			}
 		}
 
@@ -98,7 +96,7 @@ cGroupManager::cGroupManager()
 			}
 		}
 	}
-	LOG("-- Groups Successfully Loaded --");
+	LOGD("-- Groups Successfully Loaded --");
 }
 
 
diff --git a/source/PluginManager.cpp b/source/PluginManager.cpp
index 68cb6e40b..eb347968a 100644
--- a/source/PluginManager.cpp
+++ b/source/PluginManager.cpp
@@ -95,7 +95,7 @@ void cPluginManager::FindPlugins(void)
 
 void cPluginManager::ReloadPluginsNow(void)
 {
-	LOG("Loading plugins");
+	LOG("-- Loading Plugins --");
 	m_bReloadPlugins = false;
 	UnloadPluginsNow();
 
@@ -135,11 +135,15 @@ void cPluginManager::ReloadPluginsNow(void)
 
 	if (GetNumPlugins() == 0)
 	{
-		LOG("No plugins loaded");
+		LOG("-- No Plugins Loaded --");
+	}
+	else if ((GetNumPlugins() > 1) || (GetNumPlugins() == 0))
+	{
+		LOG("-- Loaded %i Plugins --", GetNumPlugins());
 	}
 	else
 	{
-		LOG("Loaded %i plugin(s)", GetNumPlugins());
+		LOG("-- Loaded 1 Plugin --");
 	}
 }
 
diff --git a/source/Root.cpp b/source/Root.cpp
index 3933535f1..abe153b30 100644
--- a/source/Root.cpp
+++ b/source/Root.cpp
@@ -17,6 +17,7 @@
 #include "Protocol/ProtocolRecognizer.h"  // for protocol version constants
 #include "CommandOutput.h"
 #include "DeadlockDetect.h"
+#include "OSSupport/Timer.h"
 
 #include "../iniFile/iniFile.h"
 
@@ -91,6 +92,10 @@ void cRoot::InputThread(void * a_Params)
 
 void cRoot::Start(void)
 {
+	cTimer Time;
+
+	long long mseconds = Time.GetNowTime();
+
 	cDeadlockDetect dd;
 	delete m_Log;
 	m_Log = new cMCLogger();
@@ -125,7 +130,7 @@ void cRoot::Start(void)
 		LOG("Starting server...");
 		if (!m_Server->InitServer(IniFile))
 		{
-			LOGERROR("Failed to start server, shutting down.");
+			LOGERROR("Failure starting server, aborting...");
 			return;
 		}
 		IniFile.WriteFile();
@@ -138,45 +143,49 @@ void cRoot::Start(void)
 
 		if (WebIniFile.GetValueB("WebAdmin", "Enabled", false))
 		{
-			LOG("Creating WebAdmin...");
+			LOGD("Creating WebAdmin...");
 			m_WebAdmin = new cWebAdmin(8080);
 		}
 
-		LOG("Loading settings...");
+		LOGD("Loading settings...");
 		m_GroupManager    = new cGroupManager();
 		m_CraftingRecipes = new cCraftingRecipes;
 		m_FurnaceRecipe   = new cFurnaceRecipe();
 		
-		LOG("Loading worlds...");
+		LOGD("Loading worlds...");
 		LoadWorlds();
 
-		LOG("Loading plugin manager...");
+		LOGD("Loading plugin manager...");
 		m_PluginManager = new cPluginManager();
 		m_PluginManager->ReloadPluginsNow();
 		
-		LOG("Loading MonsterConfig...");
+		LOGD("Loading MonsterConfig...");
 		m_MonsterConfig = new cMonsterConfig;
 
 		// This sets stuff in motion
-		LOG("Starting Authenticator...");
+		LOGD("Starting Authenticator...");
 		m_Authenticator.Start();
 		
-		LOG("Starting worlds...");
+		LOGD("Starting worlds...");
 		StartWorlds();
 		
-		LOG("Starting deadlock detector...");
+		LOGD("Starting deadlock detector...");
 		dd.Start();
 		
-		LOG("Starting server...");
+		LOGD("Finalising startup...");
 		m_Server->Start();
 
 		#if !defined(ANDROID_NDK)
-		LOG("Starting InputThread...");
+		LOGD("Starting InputThread...");
 		m_InputThread = new cThread( InputThread, this, "cRoot::InputThread" );
 		m_InputThread->Start( false );	// We should NOT wait? Otherwise we canīt stop the server from other threads than the input thread
 		#endif
 
-		LOG("Initialization done, server running now.");
+		long long finishmseconds = Time.GetNowTime();
+		finishmseconds -= mseconds;
+
+		LOG("Startup complete, took %i ms!", finishmseconds);
+
 		while (!m_bStop && !m_bRestart)  // These are modified by external threads
 		{
 			cSleep::MilliSleep(1000);
@@ -190,37 +199,37 @@ void cRoot::Start(void)
 		LOG("Shutting down server...");
 		m_Server->Shutdown();
 		
-		LOG("Shutting down deadlock detector...");
+		LOGD("Shutting down deadlock detector...");
 		dd.Stop();
 		
-		LOG("Stopping world threads...");
+		LOGD("Stopping world threads...");
 		StopWorlds();
 		
-		LOG("Stopping authenticator...");
+		LOGD("Stopping authenticator...");
 		m_Authenticator.Stop();
 
-		LOG("Freeing MonsterConfig...");
+		LOGD("Freeing MonsterConfig...");
 		delete m_MonsterConfig; m_MonsterConfig = NULL;
-		LOG("Stopping WebAdmin...");
+		LOGD("Stopping WebAdmin...");
 		delete m_WebAdmin; m_WebAdmin = NULL;
-		LOG("Unloading recipes...");
+		LOGD("Unloading recipes...");
 		delete m_FurnaceRecipe;   m_FurnaceRecipe = NULL;
 		delete m_CraftingRecipes; m_CraftingRecipes = NULL;
-		LOG("Forgetting groups...");
+		LOGD("Forgetting groups...");
 		delete m_GroupManager; m_GroupManager = 0;
-		LOG("Unloading worlds...");
+		LOGD("Unloading worlds...");
 		UnloadWorlds();
 		
-		LOG("Stopping plugin manager...");
+		LOGD("Stopping plugin manager...");
 		delete m_PluginManager; m_PluginManager = NULL;
 
 		cItemHandler::Deinit();
 		cBlockHandler::Deinit();
 
-		LOG("Destroying server...");
+		LOG("Cleaning up...");
 		//delete HeartBeat; HeartBeat = 0;
 		delete m_Server; m_Server = 0;
-		LOG("Shutdown done.");
+		LOG("Shutdown successful!");
 	}
 
 	delete m_Log; m_Log = 0;
diff --git a/source/Server.cpp b/source/Server.cpp
index e73580e79..879bfae5a 100644
--- a/source/Server.cpp
+++ b/source/Server.cpp
@@ -206,7 +206,6 @@ bool cServer::InitServer(cIniFile & a_SettingsIni)
 		return false;
 	}
 
-	LOG("Starting up server.");
 	LOGINFO("Compatible clients: %s", MCS_CLIENT_VERSIONS);
 	LOGINFO("Compatible protocol versions %s", MCS_PROTOCOL_VERSIONS);
 
@@ -292,7 +291,7 @@ void cServer::PrepareKeys(void)
 	// TODO: Save and load key for persistence across sessions
 	// But generating the key takes only a moment, do we even need that?
 	
-	LOG("Generating protocol encryption keypair...");
+	LOGD("Generating protocol encryption keypair...");
 	
 	time_t CurTime = time(NULL);
 	CryptoPP::RandomPool rng;
diff --git a/source/Simulator/FireSimulator.cpp b/source/Simulator/FireSimulator.cpp
index 587f45306..da1dc8d15 100644
--- a/source/Simulator/FireSimulator.cpp
+++ b/source/Simulator/FireSimulator.cpp
@@ -234,10 +234,6 @@ int cFireSimulator::GetBurnStepTime(cChunk * a_Chunk, int a_RelX, int a_RelY, in
 			return m_BurnStepTimeFuel;
 		}
 	}
-	if ((a_RelY < cChunkDef::Height - 1) && IsFuel(a_Chunk->GetBlock(a_RelX, a_RelY - 1, a_RelZ)))
-	{
-		return m_BurnStepTimeFuel;
-	}
 	
 	for (int i = 0; i < ARRAYCOUNT(gCrossCoords); i++)
 	{
@@ -251,7 +247,23 @@ int cFireSimulator::GetBurnStepTime(cChunk * a_Chunk, int a_RelX, int a_RelY, in
 			}
 		}
 	}  // for i - gCrossCoords[]
-	return m_BurnStepTimeNonfuel;
+
+	if ((a_RelY > 0) && (a_RelY < cChunkDef::Height - 1))
+	{
+		// Checked through everything, nothing was flammable
+		// If block below isn't solid, we can't have fire, otherwise, we have non-fueled fire
+		BLOCKTYPE BlockBelow = a_Chunk->GetBlock(a_RelX, a_RelY - 1, a_RelZ);
+		if (g_BlockIsSolid[BlockBelow])
+		{
+			return m_BurnStepTimeNonfuel;
+		}
+		else
+		{
+			// SetBlock just to make sure fire doesn't spawn
+			a_Chunk->SetBlock(a_RelX, a_RelY, a_RelZ, E_BLOCK_AIR, 0);
+			return 0;
+		}
+	}
 }
 
 
diff --git a/source/WebAdmin.cpp b/source/WebAdmin.cpp
index e53fb84e6..ef62961a6 100644
--- a/source/WebAdmin.cpp
+++ b/source/WebAdmin.cpp
@@ -297,7 +297,7 @@ bool cWebAdmin::Init(int a_Port)
 	}
 
 
-	LOG("Starting WebAdmin on port %i", m_Port);
+	LOGINFO("Starting WebAdmin on port %i", m_Port);
 
 #ifdef _WIN32
 	HANDLE hThread = CreateThread(