diff options
| author | sfan5 <sfan5@live.de> | 2017-09-15 12:19:01 +0200 |
|---|---|---|
| committer | SmallJoker <mk939@ymail.com> | 2018-06-03 17:31:59 +0200 |
| commit | c2a0333901a696f7dcb67356aeb0206b89be14e6 (patch) | |
| tree | 11d378e7426f53797e94e6f0d103164ffe1356cf /src/script/lua_api/l_object.cpp | |
| parent | 5b2461c713889b9832f5b99c85abf87e5d494242 (diff) | |
| download | minetest-c2a0333901a696f7dcb67356aeb0206b89be14e6.tar.gz minetest-c2a0333901a696f7dcb67356aeb0206b89be14e6.tar.bz2 minetest-c2a0333901a696f7dcb67356aeb0206b89be14e6.zip | |
ServerEnv: Clean up object lifecycle handling (#6414)
* ServerEnv: Clean up object lifecycle handling
Diffstat (limited to 'src/script/lua_api/l_object.cpp')
| -rw-r--r-- | src/script/lua_api/l_object.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/script/lua_api/l_object.cpp b/src/script/lua_api/l_object.cpp index aaab0d98e..0195dc399 100644 --- a/src/script/lua_api/l_object.cpp +++ b/src/script/lua_api/l_object.cpp @@ -137,16 +137,15 @@ int ObjectRef::l_remove(lua_State *L) if (co->getType() == ACTIVEOBJECT_TYPE_PLAYER) return 0; - const UNORDERED_SET<int> &child_ids = co->getAttachmentChildIds(); - UNORDERED_SET<int>::const_iterator it; - for (it = child_ids.begin(); it != child_ids.end(); ++it) { + const std::unordered_set<int> &child_ids = co->getAttachmentChildIds(); + for (int child_id : child_ids) { // Child can be NULL if it was deleted earlier - if (ServerActiveObject *child = env->getActiveObject(*it)) + if (ServerActiveObject *child = env->getActiveObject(child_id)) child->setAttachment(0, "", v3f(0, 0, 0), v3f(0, 0, 0)); } - verbosestream<<"ObjectRef::l_remove(): id="<<co->getId()<<std::endl; - co->m_removed = true; + verbosestream << "ObjectRef::l_remove(): id=" << co->getId() << std::endl; + co->m_pending_removal = true; return 0; } |