Skip to content
Permalink
Browse files

Disallow object:remove() if the object is a player

Rebased by Zeno- (conflict in lua_api.txt)
  • Loading branch information
kahrl authored and Zeno- committed Feb 23, 2015
1 parent cd4324e commit 38cf080a9c2a1e5b9ad41cf62d2eacdc92133d16
Showing with 2 additions and 0 deletions.
  1. +1 −0 doc/lua_api.txt
  2. +1 −0 src/script/lua_api/l_object.cpp
@@ -2294,6 +2294,7 @@ This is basically a reference to a C++ `ServerActiveObject`

#### Methods
* `remove()`: remove object (after returning from Lua)
* Note: Doesn't work on players, use minetest.kick_player instead
* `getpos()`: returns `{x=num, y=num, z=num}`
* `setpos(pos)`; `pos`=`{x=num, y=num, z=num}`
* `moveto(pos, continuous=false)`: interpolated move
@@ -131,6 +131,7 @@ int ObjectRef::l_remove(lua_State *L)
ObjectRef *ref = checkobject(L, 1);
ServerActiveObject *co = getobject(ref);
if(co == NULL) return 0;
if(co->getType() == ACTIVEOBJECT_TYPE_PLAYER) return 0;
verbosestream<<"ObjectRef::l_remove(): id="<<co->getId()<<std::endl;
co->m_removed = true;
return 0;

0 comments on commit 38cf080

Please sign in to comment.
You can’t perform that action at this time.