summaryrefslogtreecommitdiff
path: root/src/serverlist.cpp
diff options
context:
space:
mode:
authorKahrl <kahrl@gmx.net>2014-11-10 22:06:24 +0100
committerKahrl <kahrl@gmx.net>2014-11-10 22:27:10 +0100
commit0adadba2182e416f768c83804401e2c177307f0a (patch)
tree087b6256f75331e7dbeb8a32fd42bbd440c25380 /src/serverlist.cpp
parenta1e9732407494edb9cef3ada45cc2781a34ed60c (diff)
downloadminetest-0adadba2182e416f768c83804401e2c177307f0a.tar.gz
minetest-0adadba2182e416f768c83804401e2c177307f0a.tar.bz2
minetest-0adadba2182e416f768c83804401e2c177307f0a.zip
Serverlist: announce mg_name from map_meta.txt instead of minetest.conf
Diffstat (limited to 'src/serverlist.cpp')
-rw-r--r--src/serverlist.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/serverlist.cpp b/src/serverlist.cpp
index 4d770a1c2..65c75fec2 100644
--- a/src/serverlist.cpp
+++ b/src/serverlist.cpp
@@ -194,6 +194,7 @@ void sendAnnounce(const std::string &action,
const u32 game_time,
const float lag,
const std::string &gameid,
+ const std::string &mg_name,
const std::vector<ModSpec> &mods)
{
Json::Value server;
@@ -227,7 +228,7 @@ void sendAnnounce(const std::string &action,
if (action == "start") {
server["dedicated"] = g_settings->getBool("server_dedicated");
server["rollback"] = g_settings->getBool("enable_rollback_recording");
- server["mapgen"] = g_settings->get("mg_name");
+ server["mapgen"] = mg_name;
server["privs"] = g_settings->get("default_privs");
server["can_see_far_names"] = g_settings->getS16("player_transfer_distance") <= 0;
server["mods"] = Json::Value(Json::arrayValue);