BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Fix core.get_player_by_name() returning unusable ObjectRef

Browse Source 
Followup to the previous commit.
This commit is contained in:
sfan5 2020-03-03 21:14:47 +01:00
parent 1761d7d0f8
commit 6d8e2d2483
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/script/lua_api/l_env.cpp
View File

@ -667,15 +667,11 @@ int ModApiEnvMod::l_get_player_by_name(lua_State *L)
// Do it // Do it
const char *name = luaL_checkstring(L, 1); const char *name = luaL_checkstring(L, 1);
RemotePlayer *player = env->getPlayer(name); RemotePlayer *player = env->getPlayer(name);
if (player == NULL){ if (!player || player->getPeerId() == PEER_ID_INEXISTENT)
lua_pushnil(L); return 0;
return 1;
}
PlayerSAO *sao = player->getPlayerSAO(); PlayerSAO *sao = player->getPlayerSAO();
if(sao == NULL){ if (!sao || sao->isGone())
lua_pushnil(L); return 0;
return 1;
}
// Put player on stack // Put player on stack
getScriptApiBase(L)->objectrefGetOrCreate(L, sao); getScriptApiBase(L)->objectrefGetOrCreate(L, sao);
return 1; return 1;