Client: disable pre v25 init sending by default

[oweals/minetest.git] / builtin / mainmenu / tab_server.lua

diff --git a/builtin/mainmenu/tab_server.lua b/builtin/mainmenu/tab_server.lua
index 3459f3f2f56c11bc89a95106bd6d4773057bef1b..6b96825a0fbd6b3f38255cba7ed80b44837a381c 100644 (file)
--- a/builtin/mainmenu/tab_server.lua
+++ b/builtin/mainmenu/tab_server.lua
@@ -103,6 +103,9 @@ local function main_button_handler(this, fields, name, tabdata)
 
        if fields["cb_server_announce"] then
                core.setting_set("server_announce", fields["cb_server_announce"])
+               local selected = core.get_textlist_index("srv_worlds")
+               menu_worldmt(selected, "server_announce", fields["cb_server_announce"])
+
                return true
        end
 
@@ -110,12 +113,12 @@ local function main_button_handler(this, fields, name, tabdata)
                world_doubleclick or
                fields["key_enter"] then
                local selected = core.get_textlist_index("srv_worlds")
-               if selected ~= nil then
+               gamedata.selected_world = menudata.worldlist:get_raw_index(selected)
+               if selected ~= nil and gamedata.selected_world ~= 0 then
                        gamedata.playername     = fields["te_playername"]
                        gamedata.password       = fields["te_passwd"]
                        gamedata.port           = fields["te_serverport"]
                        gamedata.address        = ""
-                       gamedata.selected_world = menudata.worldlist:get_raw_index(selected)
 
                        core.setting_set("port",gamedata.port)
                        if fields["te_serveraddr"] ~= nil then
@@ -130,8 +133,11 @@ local function main_button_handler(this, fields, name, tabdata)
                        end
                        
                        core.start()
-                       return true
+               else
+                       gamedata.errormessage =
+                               fgettext("No world created or selected!")
                end
+               return true
        end
 
        if fields["world_create"] ~= nil then
@@ -180,10 +186,10 @@ local function main_button_handler(this, fields, name, tabdata)
 end
 
 --------------------------------------------------------------------------------
-tab_server = {
+return {
        name = "server",
        caption = fgettext("Server"),
        cbf_formspec = get_formspec,
        cbf_button_handler = main_button_handler,
        on_change = nil
-       }
+}