diff options
author | Bill Derouin <derouinbill@gmail.com> | 2014-01-07 16:49:52 +0100 |
---|---|---|
committer | Bill Derouin <derouinbill@gmail.com> | 2014-01-07 16:49:52 +0100 |
commit | 1c2eb4a1c07167e2fb53f9398383d3fda0940b0b (patch) | |
tree | f6228d11f9263619d628ab4d8f3d52a425975937 | |
parent | A few touch ups (diff) | |
download | cuberite-1c2eb4a1c07167e2fb53f9398383d3fda0940b0b.tar cuberite-1c2eb4a1c07167e2fb53f9398383d3fda0940b0b.tar.gz cuberite-1c2eb4a1c07167e2fb53f9398383d3fda0940b0b.tar.bz2 cuberite-1c2eb4a1c07167e2fb53f9398383d3fda0940b0b.tar.lz cuberite-1c2eb4a1c07167e2fb53f9398383d3fda0940b0b.tar.xz cuberite-1c2eb4a1c07167e2fb53f9398383d3fda0940b0b.tar.zst cuberite-1c2eb4a1c07167e2fb53f9398383d3fda0940b0b.zip |
Diffstat (limited to '')
-rw-r--r-- | src/Protocol/Protocol17x.cpp | 12 | ||||
-rw-r--r-- | src/Server.cpp | 2 |
2 files changed, 2 insertions, 12 deletions
diff --git a/src/Protocol/Protocol17x.cpp b/src/Protocol/Protocol17x.cpp index c75fc9878..2d00776ae 100644 --- a/src/Protocol/Protocol17x.cpp +++ b/src/Protocol/Protocol17x.cpp @@ -383,16 +383,6 @@ void cProtocol172::SendExplosion(double a_BlockX, double a_BlockY, double a_Bloc -void cProtocol172::SendFavicon(void) -{ - cPacketizer Pkt(*this, 0x0); // Favicon packet - Pkt.WriteString(cRoot::Get()->GetServer()->GetFaviconData()); -} - - - - - void cProtocol172::SendGameMode(eGameMode a_GameMode) { cPacketizer Pkt(*this, 0x2b); // Change Game State packet @@ -1127,7 +1117,7 @@ void cProtocol172::HandlePacketStatusRequest(cByteBuffer & a_ByteBuffer) cRoot::Get()->GetServer()->GetDescription().c_str() ); AppendPrintf(Response, "\"favicon\":\"data:image/png;base64,%s\"", - cRoot::Get()->GetServer()->GetFaviconData() + cRoot::Get()->GetServer()->GetFaviconData().c_str() ); Response.append("}"); diff --git a/src/Server.cpp b/src/Server.cpp index 0afd8958d..30c401d59 100644 --- a/src/Server.cpp +++ b/src/Server.cpp @@ -296,7 +296,7 @@ int cServer::GetNumPlayers(void) AString cServer::GetFaviconData(void) { - return m_Favicon; + return m_FaviconData; } |