diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-01-07 17:53:40 +0100 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-01-07 17:53:40 +0100 |
| commit | 1d96a615b5d1578912ec2e95c03dee6781cb3396 (patch) | |
| tree | bf8ba708d71ccbd03adb8a282deaa8e65c78fbbe /src/Server.cpp | |
| parent | Merge pull request #514 from derouinw/master (diff) | |
| download | cuberite-1d96a615b5d1578912ec2e95c03dee6781cb3396.tar cuberite-1d96a615b5d1578912ec2e95c03dee6781cb3396.tar.gz cuberite-1d96a615b5d1578912ec2e95c03dee6781cb3396.tar.bz2 cuberite-1d96a615b5d1578912ec2e95c03dee6781cb3396.tar.lz cuberite-1d96a615b5d1578912ec2e95c03dee6781cb3396.tar.xz cuberite-1d96a615b5d1578912ec2e95c03dee6781cb3396.tar.zst cuberite-1d96a615b5d1578912ec2e95c03dee6781cb3396.zip | |
Diffstat (limited to 'src/Server.cpp')
| -rw-r--r-- | src/Server.cpp | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/Server.cpp b/src/Server.cpp index b0439391c..49067c17f 100644 --- a/src/Server.cpp +++ b/src/Server.cpp @@ -203,10 +203,7 @@ bool cServer::InitServer(cIniFile & a_SettingsIni) m_PlayerCount = 0; m_PlayerCountDiff = 0; - if (cFile::Exists("favicon.png")) - { - m_FaviconData = Base64Encode(cFile::ReadWholeFile("favicon.png")); - } + m_FaviconData = Base64Encode(cFile::ReadWholeFile("favicon.png")); // Will return empty string if file nonexistant; client doesn't mind if (m_bIsConnected) { @@ -294,15 +291,6 @@ int cServer::GetNumPlayers(void) -const AString & cServer::GetFaviconData(void) const -{ - return m_FaviconData; -} - - - - - void cServer::PrepareKeys(void) { // TODO: Save and load key for persistence across sessions |