flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Delete duplicated status request handlers

Browse Source 
Here we go again...
This commit is contained in:
Tiger Wang
2020-07-18 18:57:23 +01:00
parent 7425305154
commit 5141d05ba6
16 changed files with 183 additions and 537 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Protocol/Protocol_1_8.cpp
View File

@@ -2159,6 +2159,15 @@ UInt32 cProtocol_1_8_0::GetPacketID(ePacketType a_PacketType)
cProtocol::Version cProtocol_1_8_0::GetProtocolVersion()
{
return Version::Version_1_8_0;
}
bool cProtocol_1_8_0::HandlePacket(cByteBuffer & a_ByteBuffer, UInt32 a_PacketType)
{
switch (m_State)
@@ -2270,8 +2279,9 @@ void cProtocol_1_8_0::HandlePacketStatusRequest(cByteBuffer & a_ByteBuffer)
// Version:
Json::Value Version;
Version["name"] = "Cuberite 1.8";
Version["protocol"] = 47;
const auto ProtocolVersion = GetProtocolVersion();
Version["name"] = "Cuberite " + cMultiVersionProtocol::GetVersionTextFromInt(ProtocolVersion);
Version["protocol"] = static_cast<std::underlying_type_t<cProtocol::Version>>(ProtocolVersion);
// Players:
Json::Value Players;
@@ -2294,10 +2304,9 @@ void cProtocol_1_8_0::HandlePacketStatusRequest(cByteBuffer & a_ByteBuffer)
ResponseValue["favicon"] = Printf("data:image/png;base64,%s", Favicon.c_str());
}
auto Response = JsonUtils::WriteFastString(ResponseValue);
// Serialize the response into a packet:
cPacketizer Pkt(*this, pktStatusResponse);
Pkt.WriteString(Response);
Pkt.WriteString(JsonUtils::WriteFastString(ResponseValue));
}