Add show_statusline_on_connect setting (#5084)

Add show_statusline_on_connect setting

diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index 2dfe86e041365995b1a57884b331d73ef6bfe0b7..0f416bc9a767451c97bb1fd8cd87896588d3d5ac 100644 (file)
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -703,6 +703,9 @@ map-dir (Map directory) path
 #    Setting it to -1 disables the feature.
 item_entity_ttl (Item entity TTL) int 900
 
+#    If enabled, show the server status message on player connection.
+show_statusline_on_connect (Status message on connection) bool true
+
 #    Enable players getting damage and dying.
 enable_damage (Damage) bool false
 

diff --git a/minetest.conf.example b/minetest.conf.example
index 3b686aa61cf4168d1ddd73b66a2c97471fdd7af1..515b6cfd4734c07e869c1428f294415c8217832d 100644 (file)
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -841,6 +841,10 @@
 #    type: int
 # item_entity_ttl = 900
 
+#    If enabled, show the server status message on player connection.
+#    type: bool
+# show_statusline_on_connect = true
+
 #    Enable players getting damage and dying.
 #    type: bool
 # enable_damage = false
@@ -1558,7 +1562,7 @@
 # profiler.default_report_format = txt
 
 #    The file path relative to your worldpath in which profiles will be saved to.
-#    
+#
 #    type: string
 # profiler.report_path = ""
 

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 59cfdd50dce6ed850d3b027720cc1138aae60003..e154a63c80548bb12c7ef78fafe05374e98ac166 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -255,6 +255,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("motd", "");
        settings->setDefault("max_users", "15");
        settings->setDefault("creative_mode", "false");
+       settings->setDefault("show_statusline_on_connect", "true");
        settings->setDefault("enable_damage", "true");
        settings->setDefault("give_initial_stuff", "false");
        settings->setDefault("default_password", "");

diff --git a/src/server.cpp b/src/server.cpp
index 1656b9f5a557c9b2769be576095e1a8d6a2777b8..7e1ab30acb23269ca7d4b7b003290f299bfa9592 100644 (file)
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -1118,7 +1118,7 @@ PlayerSAO* Server::StageTwoClientInit(u16 peer_id)
                SendDeathscreen(peer_id, false, v3f(0,0,0));
 
        // Note things in chat if not in simple singleplayer mode
-       if(!m_simple_singleplayer_mode) {
+       if (!m_simple_singleplayer_mode && g_settings->getBool("show_statusline_on_connect")) {
                // Send information about server to player in chat
                SendChatMessage(peer_id, getStatusString());
        }