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

Compare commits

base: 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
...
compare: 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

2 Commits
c047d31989 ... 35ea452ff5

Author SHA1 Message Date
mckaygerhard
35ea452ff5 fix bad implementation, try to redefine constant variable 
* fix error: passing const string as this argument discards qualifiers
  for server list identification id
* related commit 90573105519953847be513068c1f05f1a1771d7c
 2024-06-02 23:37:43 -04:00
mckaygerhard
3820aa20eb fix wrong access definition q_settings 
* fix error: request for member 'empty' cos is not string
 2024-06-02 22:51:26 -04:00
2 changed files with 11 additions and 10 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: "; os << "# Server: ";
// Version // Version
if (!g_settings->getBool("announce_mt_id").empty()) if (!g_settings->getBool("announce_mt_id"))
os << "version=" << "0.4.16"; os << "version=" << "0.4.16";
else else
os << "version=" << g_version_string; os << "version=" << g_version_string;

19
src/serverlist.cpp
View File

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