oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Script: Enforce type checks if not nil (#9748)

Browse source 
* Script: Enforce type checks if not nil
This commit is contained in:
SmallJoker 2020-04-27 07:02:39 +02:00 • committed by GitHub
parent 515d38a702
commit be71e70a91
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 72 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/script/lua_api/l_inventory.cpp
View file

@ -487,7 +487,9 @@ int ModApiInventory::l_get_inventory(lua_State *L)
{
InventoryLocation loc;
std::string type = checkstringfield(L, 1, "type");
lua_getfield(L, 1, "type");
std::string type = luaL_checkstring(L, -1);
lua_pop(L, 1);
if(type == "node"){
MAP_LOCK_REQUIRED;
@ -504,11 +506,13 @@ int ModApiInventory::l_get_inventory(lua_State *L)
NO_MAP_LOCK_REQUIRED;
if (type == "player") {
std::string name = checkstringfield(L, 1, "name");
loc.setPlayer(name);
lua_getfield(L, 1, "name");
loc.setPlayer(luaL_checkstring(L, -1));
lua_pop(L, 1);
} else if (type == "detached") {
std::string name = checkstringfield(L, 1, "name");
loc.setDetached(name);
lua_getfield(L, 1, "name");
loc.setDetached(luaL_checkstring(L, -1));
lua_pop(L, 1);
}
if (getServer(L)->getInventory(loc) != NULL)