From 86ef7147b60868f86d38d55a1dcf6271d68427ce Mon Sep 17 00:00:00 2001 From: kwolekr Date: Sun, 17 Nov 2013 02:57:40 -0500 Subject: [PATCH] Fix issue #1009 (minetest.get_connected_players() returns non-existing players) --- builtin/misc.lua | 4 +++- src/script/lua_api/l_object.cpp | 11 +++++++++++ src/script/lua_api/l_object.h | 3 +++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/builtin/misc.lua b/builtin/misc.lua index a6a1718ad..fd80aacf6 100644 --- a/builtin/misc.lua +++ b/builtin/misc.lua @@ -53,7 +53,9 @@ end) function minetest.get_connected_players() local temp_table = {} for index, value in pairs(player_list) do - table.insert(temp_table, value) + if value:is_player_connected() then + table.insert(temp_table, value) + end end return temp_table end diff --git a/src/script/lua_api/l_object.cpp b/src/script/lua_api/l_object.cpp index c324ced1a..cbcaa40eb 100644 --- a/src/script/lua_api/l_object.cpp +++ b/src/script/lua_api/l_object.cpp @@ -621,6 +621,16 @@ int ObjectRef::l_is_player(lua_State *L) return 1; } +// is_player_connected(self) +int ObjectRef::l_is_player_connected(lua_State *L) +{ + NO_MAP_LOCK_REQUIRED; + ObjectRef *ref = checkobject(L, 1); + Player *player = getplayer(ref); + lua_pushboolean(L, (player != NULL && player->peer_id != 0)); + return 1; +} + // get_player_name(self) int ObjectRef::l_get_player_name(lua_State *L) { @@ -1148,6 +1158,7 @@ const luaL_reg ObjectRef::methods[] = { luamethod(ObjectRef, get_luaentity), // Player-only luamethod(ObjectRef, is_player), + luamethod(ObjectRef, is_player_connected), luamethod(ObjectRef, get_player_name), luamethod(ObjectRef, get_look_dir), luamethod(ObjectRef, get_look_pitch), diff --git a/src/script/lua_api/l_object.h b/src/script/lua_api/l_object.h index 8fd6c8e71..4b4f5eff7 100644 --- a/src/script/lua_api/l_object.h +++ b/src/script/lua_api/l_object.h @@ -158,6 +158,9 @@ private: // is_player(self) static int l_is_player(lua_State *L); + // is_player_connected(self) + static int l_is_player_connected(lua_State *L); + // get_player_name(self) static int l_get_player_name(lua_State *L); -- 2.25.1