oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-09-15 18:57:08 +00:00
Code Wiki Activity

Player attrs: permits to remove an attribute by setting value to nil (#5716)

Browse source 
* Player attrs: permits to remove an attribute by setting value to nil

When doing player:set_attribute("attr", nil) remove attribute

Also remove a useless check on C++ API part (already done by checkplayer)

Fix #5709
This commit is contained in:
Loïc Blot 2017-05-07 12:13:15 +02:00 • committed by GitHub
parent 0d7c37943b
commit c1b3ed4180
4 changed files with 29 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/content_sao.h
View file

@ -277,6 +277,16 @@ public:
return true;
}
inline void removeExtendedAttribute(const std::string &attr)
{
PlayerAttributes::iterator it = m_extra_attributes.find(attr);
if (it == m_extra_attributes.end())
return;
m_extra_attributes.erase(it);
m_extended_attributes_modified = true;
}
inline const PlayerAttributes &getExtendedAttributes()
{
return m_extra_attributes;

7
src/script/lua_api/l_object.cpp
View file

@ -1202,9 +1202,10 @@ int ObjectRef::l_set_attribute(lua_State *L)
}
std::string attr = luaL_checkstring(L, 2);
std::string value = luaL_checkstring(L, 3);
if (co->getType() == ACTIVEOBJECT_TYPE_PLAYER) {
if (lua_isnil(L, 3)) {
co->removeExtendedAttribute(attr);
} else {
std::string value = luaL_checkstring(L, 3);
co->setExtendedAttribute(attr, value);
}
return 1;