summaryrefslogtreecommitdiffstats
path: root/source/Protocol
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2013-08-11 19:18:06 +0200
committermadmaxoft <github@xoft.cz>2013-08-11 19:18:06 +0200
commiteb9d45e9065a94c93dc2f1624c22f026b9be3d5f (patch)
treee88be00ec679f95f23199a7056166ef792d74cf7 /source/Protocol
parentAdded doxyComments for cIsThread. (diff)
downloadcuberite-eb9d45e9065a94c93dc2f1624c22f026b9be3d5f.tar
cuberite-eb9d45e9065a94c93dc2f1624c22f026b9be3d5f.tar.gz
cuberite-eb9d45e9065a94c93dc2f1624c22f026b9be3d5f.tar.bz2
cuberite-eb9d45e9065a94c93dc2f1624c22f026b9be3d5f.tar.lz
cuberite-eb9d45e9065a94c93dc2f1624c22f026b9be3d5f.tar.xz
cuberite-eb9d45e9065a94c93dc2f1624c22f026b9be3d5f.tar.zst
cuberite-eb9d45e9065a94c93dc2f1624c22f026b9be3d5f.zip
Diffstat (limited to 'source/Protocol')
-rw-r--r--source/Protocol/ProtocolRecognizer.cpp17
1 files changed, 9 insertions, 8 deletions
diff --git a/source/Protocol/ProtocolRecognizer.cpp b/source/Protocol/ProtocolRecognizer.cpp
index 290f2df75..35c8fe993 100644
--- a/source/Protocol/ProtocolRecognizer.cpp
+++ b/source/Protocol/ProtocolRecognizer.cpp
@@ -14,6 +14,7 @@
#include "Protocol16x.h"
#include "../ClientHandle.h"
#include "../Root.h"
+#include "../Server.h"
#include "../World.h"
#include "../ChatColor.h"
@@ -729,11 +730,11 @@ void cProtocolRecognizer::HandleServerPing(void)
{
// http://wiki.vg/wiki/index.php?title=Protocol&oldid=3099#Server_List_Ping_.280xFE.29
Printf(Reply, "%s%s%i%s%i",
- cRoot::Get()->GetDefaultWorld()->GetDescription().c_str(),
- cChatColor::Delimiter.c_str(),
- cRoot::Get()->GetDefaultWorld()->GetNumPlayers(),
- cChatColor::Delimiter.c_str(),
- cRoot::Get()->GetDefaultWorld()->GetMaxPlayers()
+ cRoot::Get()->GetServer()->GetDescription().c_str(),
+ cChatColor::Delimiter.c_str(),
+ cRoot::Get()->GetServer()->GetNumPlayers(),
+ cChatColor::Delimiter.c_str(),
+ cRoot::Get()->GetServer()->GetMaxPlayers()
);
break;
}
@@ -759,9 +760,9 @@ void cProtocolRecognizer::HandleServerPing(void)
// http://wiki.vg/wiki/index.php?title=Server_List_Ping&oldid=3100
AString NumPlayers;
- Printf(NumPlayers, "%d", cRoot::Get()->GetDefaultWorld()->GetNumPlayers());
+ Printf(NumPlayers, "%d", cRoot::Get()->GetServer()->GetNumPlayers());
AString MaxPlayers;
- Printf(MaxPlayers, "%d", cRoot::Get()->GetDefaultWorld()->GetMaxPlayers());
+ Printf(MaxPlayers, "%d", cRoot::Get()->GetServer()->GetMaxPlayers());
AString ProtocolVersionNum;
Printf(ProtocolVersionNum, "%d", cRoot::Get()->m_PrimaryServerVersion);
@@ -775,7 +776,7 @@ void cProtocolRecognizer::HandleServerPing(void)
Reply.push_back(0);
Reply.append(ProtocolVersionTxt);
Reply.push_back(0);
- Reply.append(cRoot::Get()->GetDefaultWorld()->GetDescription());
+ Reply.append(cRoot::Get()->GetServer()->GetDescription());
Reply.push_back(0);
Reply.append(NumPlayers);
Reply.push_back(0);