diff options
| author | Alexander Harkness <bearbin@gmail.com> | 2014-01-07 18:09:57 +0100 |
|---|---|---|
| committer | Alexander Harkness <bearbin@gmail.com> | 2014-01-07 18:09:57 +0100 |
| commit | 01fcf2fecb1f65f2f5d120ecea9196d21e91060a (patch) | |
| tree | 99ccd42afe1a4eadb2633f22057e40af43599400 /src/Server.cpp | |
| parent | Plugin messages are received and handed to plugins. (diff) | |
| parent | Fixed favicons (diff) | |
| download | cuberite-01fcf2fecb1f65f2f5d120ecea9196d21e91060a.tar cuberite-01fcf2fecb1f65f2f5d120ecea9196d21e91060a.tar.gz cuberite-01fcf2fecb1f65f2f5d120ecea9196d21e91060a.tar.bz2 cuberite-01fcf2fecb1f65f2f5d120ecea9196d21e91060a.tar.lz cuberite-01fcf2fecb1f65f2f5d120ecea9196d21e91060a.tar.xz cuberite-01fcf2fecb1f65f2f5d120ecea9196d21e91060a.tar.zst cuberite-01fcf2fecb1f65f2f5d120ecea9196d21e91060a.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 |