diff options
| author | Bill Derouin <derouinbill@gmail.com> | 2014-01-07 16:31:06 +0100 |
|---|---|---|
| committer | Bill Derouin <derouinbill@gmail.com> | 2014-01-07 16:31:06 +0100 |
| commit | 913841f50115379ebaaba1cb88c3f1cdfed09320 (patch) | |
| tree | 94420b3f5aabe3d3790e1ac68dcb4dfff658d911 /src/Server.cpp | |
| parent | Merge pull request #511 from mc-server/CmakeOutput (diff) | |
| download | cuberite-913841f50115379ebaaba1cb88c3f1cdfed09320.tar cuberite-913841f50115379ebaaba1cb88c3f1cdfed09320.tar.gz cuberite-913841f50115379ebaaba1cb88c3f1cdfed09320.tar.bz2 cuberite-913841f50115379ebaaba1cb88c3f1cdfed09320.tar.lz cuberite-913841f50115379ebaaba1cb88c3f1cdfed09320.tar.xz cuberite-913841f50115379ebaaba1cb88c3f1cdfed09320.tar.zst cuberite-913841f50115379ebaaba1cb88c3f1cdfed09320.zip | |
Diffstat (limited to 'src/Server.cpp')
| -rw-r--r-- | src/Server.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/Server.cpp b/src/Server.cpp index 7dedc3904..e5050f321 100644 --- a/src/Server.cpp +++ b/src/Server.cpp @@ -203,6 +203,8 @@ bool cServer::InitServer(cIniFile & a_SettingsIni) m_PlayerCount = 0; m_PlayerCountDiff = 0; + if (cFile::Exists("favicon.png")) m_Favicon = Base64Encode(cFile::ReadWholeFile("favicon.png")); + if (m_bIsConnected) { LOGERROR("ERROR: Trying to initialize server while server is already running!"); @@ -289,6 +291,15 @@ int cServer::GetNumPlayers(void) +AString cServer::GetFaviconData(void) +{ + return m_Favicon; +} + + + + + void cServer::PrepareKeys(void) { // TODO: Save and load key for persistence across sessions |