From 44ad633a2b34b71ec2d43f47da51950a0ed88119 Mon Sep 17 00:00:00 2001 From: Alexander Weber Date: Mon, 25 May 2020 08:24:54 +0200 Subject: [PATCH] use new get_meta() in player_api --- mods/player_api/api.lua | 9 +++++---- mods/skinsdb5/formspecs.lua | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/mods/player_api/api.lua b/mods/player_api/api.lua index 1e0e7204..cf88d786 100644 --- a/mods/player_api/api.lua +++ b/mods/player_api/api.lua @@ -89,8 +89,9 @@ function player_api.set_textures(player, textures) local model = models[player_model[name]] local skin = skins[player_skin[name]] - local textures - if skin.textures then + if textures then + skin_textures[name] = textures + elseif skin.textures then textures = table.copy(skin.textures) skin_textures[name] = skin.textures elseif skin.texture then @@ -134,7 +135,7 @@ function player_api.set_skin(player, skin_name, is_default, is_force) player_api.set_textures(player) if not is_default then - player:set_attribute("player_api:skin", skin_name) + player:get_meta():set_string("player_api:skin", skin_name) end for _, modifier_func in ipairs(registered_on_skin_change) do @@ -144,7 +145,7 @@ end -- Get current assigned or default skin for player function player_api.get_skin(player) - local assigned_skin = player:get_attribute("player_api:skin") + local assigned_skin = player:get_meta():get_string("player_api:skin") if assigned_skin then return assigned_skin, false end diff --git a/mods/skinsdb5/formspecs.lua b/mods/skinsdb5/formspecs.lua index d2ffe72f..74809bb7 100644 --- a/mods/skinsdb5/formspecs.lua +++ b/mods/skinsdb5/formspecs.lua @@ -116,7 +116,7 @@ end function skinsdb5.on_skin_selection_receive_fields(player, context, fields) for field, _ in pairs(fields) do - local current = string.split(field, "$", 2) + local current = field:split("$", 2) if current[1] == "skins_set" then player_api.set_skin(player, context.skins_list[tonumber(current[2])].name) return 'set'