mirror of
https://github.com/minetest/minetest.git
synced 2024-09-12 00:26:50 +02:00
Player attrs: permits to remove an attribute by setting value to nil (#5716)
* 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:
parent
0d7c37943b
commit
c1b3ed4180
@ -3028,7 +3028,9 @@ This is basically a reference to a C++ `ServerActiveObject`
|
||||
* `0`: player is drowning,
|
||||
* `1`-`10`: remaining number of bubbles
|
||||
* `11`: bubbles bar is not shown
|
||||
* `set_attribute(attribute, value)`: sets an extra attribute with value on player
|
||||
* `set_attribute(attribute, value)`:
|
||||
* Sets an extra attribute with value on player.
|
||||
* If value is nil, remove attribute from player.
|
||||
* `get_attribute(attribute)`: returns value for extra attribute. Returns nil if no attribute found.
|
||||
* `set_inventory_formspec(formspec)`
|
||||
* Redefine player's inventory form
|
||||
|
@ -18,6 +18,8 @@ dofile(minetest.get_modpath("default").."/mapgen.lua")
|
||||
minetest.register_on_joinplayer(function(player)
|
||||
local cb = function(player)
|
||||
minetest.chat_send_player(player:get_player_name(), "This is the [minimal] \"Minimal Development Test\" game. Use [minetest_game] for the real thing.")
|
||||
player:set_attribute("test_attribute", "test_me")
|
||||
player:set_attribute("remove_this", nil)
|
||||
end
|
||||
minetest.after(2.0, cb, player)
|
||||
end)
|
||||
|
@ -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;
|
||||
|
@ -1202,9 +1202,10 @@ int ObjectRef::l_set_attribute(lua_State *L)
|
||||
}
|
||||
|
||||
std::string attr = luaL_checkstring(L, 2);
|
||||
if (lua_isnil(L, 3)) {
|
||||
co->removeExtendedAttribute(attr);
|
||||
} else {
|
||||
std::string value = luaL_checkstring(L, 3);
|
||||
|
||||
if (co->getType() == ACTIVEOBJECT_TYPE_PLAYER) {
|
||||
co->setExtendedAttribute(attr, value);
|
||||
}
|
||||
return 1;
|
||||
|
Loading…
Reference in New Issue
Block a user