diff --git a/builtin/mainmenu/tab_online.lua b/builtin/mainmenu/tab_online.lua index b010aad11..e85625c01 100644 --- a/builtin/mainmenu/tab_online.lua +++ b/builtin/mainmenu/tab_online.lua @@ -73,7 +73,7 @@ local function get_formspec(tabview, name, tabdata) --favourites retval = retval .. "tablecolumns[" .. - image_column(fgettext(""), "server_id") .. ";" .. + image_column(fgettext("")) .. ";" .. image_column(fgettext("Favorite"), "favorite") .. ";" .. image_column(fgettext("Ping")) .. ",padding=0.25;" .. "color,span=3;" .. diff --git a/games/default/files/drops/init.lua b/games/default/files/drops/init.lua index 70fd7aa91..9e4a803a8 100644 --- a/games/default/files/drops/init.lua +++ b/games/default/files/drops/init.lua @@ -64,7 +64,7 @@ if minetest.setting_getbool("creative_mode") == false then local obj = minetest.add_item(pos, name) if obj ~= nil then obj:get_luaentity().collect = true - obj:get_luaentity().age = age + obj:get_luaentity().age = 0 obj:setvelocity({x=math.random(-3,3), y=math.random(2,5), z=math.random(-3,3)}) end end diff --git a/src/script/lua_api/l_mainmenu.cpp b/src/script/lua_api/l_mainmenu.cpp index 22a37f2a3..588046412 100644 --- a/src/script/lua_api/l_mainmenu.cpp +++ b/src/script/lua_api/l_mainmenu.cpp @@ -480,10 +480,11 @@ int ModApiMainMenu::l_get_favorites(lua_State *L) for (unsigned int i = 0; i < servers.size(); i++) { // only list compatible servers - if (!servers[i]["proto_min"].asString().size() || + if (listtype == "online" && ( + !servers[i]["proto_min"].asString().size() || !servers[i]["proto_max"].asString().size() || servers[i]["proto_min"].asInt() > CLIENT_PROTOCOL_VERSION_MAX || - servers[i]["proto_max"].asInt() < CLIENT_PROTOCOL_VERSION_MIN) + servers[i]["proto_max"].asInt() < CLIENT_PROTOCOL_VERSION_MIN)) continue; lua_pushnumber(L,index);