minetest
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash when calling remove/kick/ban_player on start (#11672)

master
Wuzzy 2021-10-05 19:53:47 +00:00 committed by GitHub
parent 5aa95fef10
commit bc71622d21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/script/lua_api/l_server.cpp
View File

@ -293,8 +293,10 @@ int ModApiServer::l_ban_player(lua_State *L)
{
NO_MAP_LOCK_REQUIRED;
Server *server = getServer(L);
if (!getEnv(L))
throw LuaError("Can't ban player before server has started up");
Server *server = getServer(L);
const char *name = luaL_checkstring(L, 1);
RemotePlayer *player = server->getEnv().getPlayer(name);
if (!player) {
@ -312,6 +314,10 @@ int ModApiServer::l_ban_player(lua_State *L)
int ModApiServer::l_kick_player(lua_State *L)
{
NO_MAP_LOCK_REQUIRED;
if (!getEnv(L))
throw LuaError("Can't kick player before server has started up");
const char *name = luaL_checkstring(L, 1);
std::string message("Kicked");
if (lua_isstring(L, 2))
@ -334,7 +340,8 @@ int ModApiServer::l_remove_player(lua_State *L)
NO_MAP_LOCK_REQUIRED;
std::string name = luaL_checkstring(L, 1);
ServerEnvironment *s_env = dynamic_cast<ServerEnvironment *>(getEnv(L));
assert(s_env);
if (!s_env)
throw LuaError("Can't remove player before server has started up");
RemotePlayer *player = s_env->getPlayer(name.c_str());
if (!player)