3 files changed, 11 insertions, 8 deletions

diff --git a/source/Protocol/Protocol125.cpp b/source/Protocol/Protocol125.cpp
index 1f2acf50c..e481bb9a7 100644
--- a/source/Protocol/Protocol125.cpp
+++ b/source/Protocol/Protocol125.cpp
@@ -14,6 +14,7 @@ Documentation:
 #include "Protocol125.h"
 
 #include "../ClientHandle.h"
+#include "../World.h"
 #include "ChunkDataSerializer.h"
 #include "../Entity.h"
 #include "../Mobs/Monster.h"
diff --git a/source/Protocol/Protocol132.cpp b/source/Protocol/Protocol132.cpp
index 7a3975537..5bf456ce3 100644
--- a/source/Protocol/Protocol132.cpp
+++ b/source/Protocol/Protocol132.cpp
@@ -7,6 +7,7 @@
 #include "Protocol132.h"
 #include "../Root.h"
 #include "../Server.h"
+#include "../World.h"
 #include "../ClientHandle.h"
 #include "../../CryptoPP/randpool.h"
 #include "../Item.h"
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);