Merge remote-tracking branch 'origin/master' into Ranks

2014-08-22 15:18:39 +02:00
parent 0c04bf962e 33b5952532
commit e034b64a5b
84 changed files with 1044 additions and 875 deletions
--- a/src/Server.cpp
+++ b/src/Server.cpp
@@ -116,7 +116,9 @@ cServer::cServer(void) :
 	m_MaxPlayers(0),
 	m_bIsHardcore(false),
 	m_TickThread(*this),
-	m_ShouldAuthenticate(false)
+	m_ShouldAuthenticate(false),
+	m_ShouldLoadOfflinePlayerData(false),
+	m_ShouldLoadNamedPlayerData(true)
 {
 }