Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Dont announce server in singleplayer
  • Loading branch information
proller committed Jul 27, 2013
1 parent 215e37a commit e65d8ad
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion src/convert_json.cpp
Expand Up @@ -55,10 +55,11 @@ Json::Value fetchJsonValue(const std::string url,
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &liststring);
curl_easy_setopt(curl, CURLOPT_TIMEOUT_MS, g_settings->getS32("curl_timeout"));
curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT_MS, g_settings->getS32("curl_timeout"));

if (chunk != 0)
curl_easy_setopt(curl, CURLOPT_HTTPHEADER, chunk);


res = curl_easy_perform(curl);
if (res != CURLE_OK)
errorstream<<"Jsonreader: "<< url <<" not found (" << curl_easy_strerror(res) << ")" <<std::endl;
Expand Down
2 changes: 1 addition & 1 deletion src/server.cpp
Expand Up @@ -1242,7 +1242,7 @@ void Server::AsyncRunStep()
// send masterserver announce
{
float &counter = m_masterserver_timer;
if((!counter || counter >= 300.0) && g_settings->getBool("server_announce") == true)
if(!isSingleplayer() && (!counter || counter >= 300.0) && g_settings->getBool("server_announce") == true)
{
ServerList::sendAnnounce(!counter ? "start" : "update", m_clients_number, m_uptime.get(), m_gamespec.id, m_mods);
counter = 0.01;
Expand Down

0 comments on commit e65d8ad

Please sign in to comment.