minenux/minetest-engine-multicraft2
1
0
Fork 0
Code Releases Activity

Compare commits

base: minenux:35ea452ff55fc5fa2be209c55586c5b1050695fe
Branches Tags
minenux:master
minenux:minenux
minenux:main
minenux:main-2-0-4
minenux:minenux-minetest5
minenux:multicraft-package
minenux:main-2-0-3
minenux:backport
minenux:mutilcraft-mt53
minenux:2.0.6
minenux:2.0.5
minenux:2.0.4m
minenux:2.0.4
minenux:2.0.3
minenux:2.0.2a
minenux:2.0.1
minenux:2.0.0-5.4.1
minenux:2.0.0-5.4
..
compare: minenux:c047d319898de61f9a97d50e1275d82e879524db
Branches Tags
minenux:master
minenux:minenux
minenux:main
minenux:main-2-0-4
minenux:minenux-minetest5
minenux:multicraft-package
minenux:main-2-0-3
minenux:backport
minenux:mutilcraft-mt53
minenux:2.0.6
minenux:2.0.5
minenux:2.0.4m
minenux:2.0.4
minenux:2.0.3
minenux:2.0.2a
minenux:2.0.1
minenux:2.0.0-5.4.1
minenux:2.0.0-5.4

No commits in common. "35ea452ff55fc5fa2be209c55586c5b1050695fe" and "c047d319898de61f9a97d50e1275d82e879524db" have entirely different histories.
35ea452ff5 ... c047d31989

2 changed files with 10 additions and 11 deletions
Show Stats Expand all files Collapse all files

2
src/server.cpp
View File

@ -3304,7 +3304,7 @@ std::string Server::getStatusString()
os << "# Server: ";
// Version
if (!g_settings->getBool("announce_mt_id"))
if (!g_settings->getBool("announce_mt_id").empty())
os << "version=" << "0.4.16";
else
os << "version=" << g_version_string;

19
src/serverlist.cpp
View File

@ -118,26 +118,25 @@ void sendAnnounce(AnnounceAction action,
server["lag"] = lag;
}
const std::string json1;
const std::string json2;
const std::string json;
if (g_settings->getBool("announce_mt_url")) {
if (g_settings->getBool("announce_mt_id")) {
server["version"] = "0.4.16";//g_version_string;
server["server_id"] = "minetest";
}
json1 = fastWriteJson(server);
sendAnnounceInner(action, json1, base64_decode("c2VydmVycy5taW5ldGVzdC5uZXQ"));
json = fastWriteJson(server);
sendAnnounceInner(action, json, base64_decode("c2VydmVycy5taW5ldGVzdC5uZXQ"));
server["version"] = g_version_string;
server["server_id"] = "multicraft";
json2 = fastWriteJson(server);
sendAnnounceInner(action, json2, base64_decode("c2VydmVycy5tdWx0aWNyYWZ0Lndvcmxk"));
json = fastWriteJson(server);
sendAnnounceInner(action, json, base64_decode("c2VydmVycy5tdWx0aWNyYWZ0Lndvcmxk"));
} else {
json1 = fastWriteJson(server);
sendAnnounceInner(action, json1, g_settings->get("serverlist_url"));
json = fastWriteJson(server);
sendAnnounceInner(action, json, g_settings->get("serverlist_url"));
server["version"] = g_version_string;
server["server_id"] = "multicraft";
json2 = fastWriteJson(server);
sendAnnounceInner(action, json2, base64_decode("c2VydmVycy5tdWx0aWNyYWZ0Lndvcmxk"));
json = fastWriteJson(server);
sendAnnounceInner(action, json, base64_decode("c2VydmVycy5tdWx0aWNyYWZ0Lndvcmxk"));
}
}
#endif