summaryrefslogtreecommitdiffstats
path: root/src/Protocol
diff options
context:
space:
mode:
authorHowaner <franzi.moos@googlemail.com>2014-08-20 22:22:38 +0200
committerHowaner <franzi.moos@googlemail.com>2014-08-20 22:22:38 +0200
commit4da61e67d7638c46dc56fe451e81a5b4b0f134db (patch)
tree2e79681edadd6be596cdf8c18a29ea2c9a7be55d /src/Protocol
parentAdded a_ClientHandle to the HOOK_SERVER_PING hook. (diff)
downloadcuberite-4da61e67d7638c46dc56fe451e81a5b4b0f134db.tar
cuberite-4da61e67d7638c46dc56fe451e81a5b4b0f134db.tar.gz
cuberite-4da61e67d7638c46dc56fe451e81a5b4b0f134db.tar.bz2
cuberite-4da61e67d7638c46dc56fe451e81a5b4b0f134db.tar.lz
cuberite-4da61e67d7638c46dc56fe451e81a5b4b0f134db.tar.xz
cuberite-4da61e67d7638c46dc56fe451e81a5b4b0f134db.tar.zst
cuberite-4da61e67d7638c46dc56fe451e81a5b4b0f134db.zip
Diffstat (limited to '')
-rw-r--r--src/Protocol/Protocol17x.cpp6
-rw-r--r--src/Protocol/ProtocolRecognizer.cpp8
2 files changed, 7 insertions, 7 deletions
diff --git a/src/Protocol/Protocol17x.cpp b/src/Protocol/Protocol17x.cpp
index 565532913..59db0b7d8 100644
--- a/src/Protocol/Protocol17x.cpp
+++ b/src/Protocol/Protocol17x.cpp
@@ -1717,11 +1717,11 @@ void cProtocol172::HandlePacketStatusPing(cByteBuffer & a_ByteBuffer)
void cProtocol172::HandlePacketStatusRequest(cByteBuffer & a_ByteBuffer)
{
cServer * Server = cRoot::Get()->GetServer();
- AString Motd = Server->GetDescription();
+ AString ServerDescription = Server->GetDescription();
int NumPlayers = Server->GetNumPlayers();
int MaxPlayers = Server->GetMaxPlayers();
AString Favicon = Server->GetFaviconData();
- cRoot::Get()->GetPluginManager()->CallHookServerPing(*m_Client, Motd, NumPlayers, MaxPlayers, Favicon);
+ cRoot::Get()->GetPluginManager()->CallHookServerPing(*m_Client, ServerDescription, NumPlayers, MaxPlayers, Favicon);
// Version:
Json::Value Version;
@@ -1736,7 +1736,7 @@ void cProtocol172::HandlePacketStatusRequest(cByteBuffer & a_ByteBuffer)
// Description:
Json::Value Description;
- Description["text"] = Motd.c_str();
+ Description["text"] = ServerDescription.c_str();
// Create the response:
Json::Value ResponseValue;
diff --git a/src/Protocol/ProtocolRecognizer.cpp b/src/Protocol/ProtocolRecognizer.cpp
index af5a8a416..6e6cb3caf 100644
--- a/src/Protocol/ProtocolRecognizer.cpp
+++ b/src/Protocol/ProtocolRecognizer.cpp
@@ -1015,11 +1015,11 @@ void cProtocolRecognizer::SendLengthlessServerPing(void)
AString Reply;
cServer * Server = cRoot::Get()->GetServer();
- AString Motd = Server->GetDescription();
+ AString ServerDescription = Server->GetDescription();
int NumPlayers = Server->GetNumPlayers();
int MaxPlayers = Server->GetMaxPlayers();
AString Favicon = Server->GetFaviconData();
- cRoot::Get()->GetPluginManager()->CallHookServerPing(*m_Client, Motd, NumPlayers, MaxPlayers, Favicon);
+ cRoot::Get()->GetPluginManager()->CallHookServerPing(*m_Client, ServerDescription, NumPlayers, MaxPlayers, Favicon);
switch (cRoot::Get()->GetPrimaryServerVersion())
{
@@ -1028,7 +1028,7 @@ void cProtocolRecognizer::SendLengthlessServerPing(void)
{
// http://wiki.vg/wiki/index.php?title=Protocol&oldid=3099#Server_List_Ping_.280xFE.29
Printf(Reply, "%s%s%i%s%i",
- Motd.c_str(),
+ ServerDescription.c_str(),
cChatColor::Delimiter,
NumPlayers,
cChatColor::Delimiter,
@@ -1072,7 +1072,7 @@ void cProtocolRecognizer::SendLengthlessServerPing(void)
Reply.push_back(0);
Reply.append(ProtocolVersionTxt);
Reply.push_back(0);
- Reply.append(Motd);
+ Reply.append(ServerDescription);
Reply.push_back(0);
Reply.append(Printf("%d", NumPlayers));
Reply.push_back(0);