BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

MetaData: restore undocumented set_string behaviour (#14396)

Browse Source
This commit is contained in:
SmallJoker 2024-02-25 16:03:05 +01:00 committed by GitHub
parent b4be483d3e
commit fa1d80b53b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
games/devtest/mods/unittests/metadata.lua
View File

@ -77,6 +77,29 @@ local function test_metadata(meta)
assert(not meta:equals(compare_meta)) assert(not meta:equals(compare_meta))
end end
local function test_metadata_compat(meta)
-- key/value removal using set_string (undocumented, deprecated way)
meta:set_string("key", "value")
assert(meta:get_string("key") == "value")
meta:set_string("key", nil) -- ignore warning
assert(meta:to_table().fields["key"] == nil)
-- undocumented but supported consequence of Lua's
-- automatic string <--> number cast
meta:set_string("key", 2)
assert(meta:get_string("key") == "2")
-- from_table with non-string keys (supported)
local values = meta:to_table()
values.fields["new"] = 420
meta:from_table(values)
assert(meta:get_int("new") == 420)
values.fields["new"] = nil
meta:from_table(values)
assert(meta:get("new") == nil)
end
local storage_a = core.get_mod_storage() local storage_a = core.get_mod_storage()
local storage_b = core.get_mod_storage() local storage_b = core.get_mod_storage()
local function test_mod_storage() local function test_mod_storage()
@ -86,7 +109,9 @@ end
unittests.register("test_mod_storage", test_mod_storage) unittests.register("test_mod_storage", test_mod_storage)
local function test_item_metadata() local function test_item_metadata()
test_metadata(ItemStack("unittest:coal_lump"):get_meta()) local meta = ItemStack("unittest:coal_lump"):get_meta()
test_metadata(meta)
test_metadata_compat(meta)
end end
unittests.register("test_item_metadata", test_item_metadata) unittests.register("test_item_metadata", test_item_metadata)

8
src/script/lua_api/l_metadata.cpp
View File

@ -115,7 +115,13 @@ int MetaDataRef::l_set_string(lua_State *L)
MetaDataRef *ref = checkAnyMetadata(L, 1); MetaDataRef *ref = checkAnyMetadata(L, 1);
std::string name = luaL_checkstring(L, 2); std::string name = luaL_checkstring(L, 2);
auto str = readParam<std::string_view>(L, 3); std::string_view str;
if (!lua_isnoneornil(L, 3)) {
str = readParam<std::string_view>(L, 3);
} else {
log_deprecated(L, "Value passed to set_string is nil. This behaviour is"
" undocumented and will result in an error in the future.", 1, true);
}
IMetadata *meta = ref->getmeta(!str.empty()); IMetadata *meta = ref->getmeta(!str.empty());
if (meta != NULL && meta->setString(name, str)) if (meta != NULL && meta->setString(name, str))