nalc/homedecor_modpack
1
0
Fork 1
forked from mtcontrib/homedecor_modpack
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
bugfix wardrobe save/restore skins for skinsdb

See merge request VanessaE/homedecor_modpack!2
This commit is contained in:
Vanessa Dannenberg
2018-12-16 20:42:15 +00:00
parent 37c6b99ac1 04cb59401b
commit ac71c0f189
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
homedecor/wardrobe.lua
View File

@@ -45,17 +45,16 @@ function homedecor.get_player_skin(player)
end end
function homedecor.set_player_skin(player, skin, save) function homedecor.set_player_skin(player, skin, save)
skin = skin or default_skin
if skinsdb_mod_path then if skinsdb_mod_path then
skins.set_player_skin(player, skin) skins.set_player_skin(player, skin or skins.default)
elseif armor_mod_path then -- if 3D_armor's installed, let it set the skin elseif armor_mod_path then -- if 3D_armor's installed, let it set the skin
armor.textures[player:get_player_name()].skin = skin armor.textures[player:get_player_name()].skin = skin or default_skin
armor:update_player_visuals(player) armor:update_player_visuals(player)
else else
set_player_textures(player, { skin }) set_player_textures(player, { skin or default_skin})
end end
if save then if save and not skinsdb_mod_path then
if skin == default_skin then if skin == default_skin then
skin = "default" skin = "default"
player:set_attribute("homedecor:player_skin", "") player:set_attribute("homedecor:player_skin", "")
@@ -133,13 +132,15 @@ homedecor.register("wardrobe", {
minetest.register_alias("homedecor:wardrobe_bottom", "homedecor:wardrobe") minetest.register_alias("homedecor:wardrobe_bottom", "homedecor:wardrobe")
minetest.register_alias("homedecor:wardrobe_top", "air") minetest.register_alias("homedecor:wardrobe_top", "air")
minetest.register_on_joinplayer(function(player) if not skinsdb_mod_path then -- If not managed by skinsdb
local skin = player:get_attribute("homedecor:player_skin") minetest.register_on_joinplayer(function(player)
local skin = player:get_attribute("homedecor:player_skin")
if skin and skin ~= "" then if skin and skin ~= "" then
-- setting player skin on connect has no effect, so delay skin change -- setting player skin on connect has no effect, so delay skin change
minetest.after(1, function(player, skin) minetest.after(1, function(player, skin)
homedecor.set_player_skin(player, skin) homedecor.set_player_skin(player, skin)
end, player, skin) end, player, skin)
end end
end) end)
end