forked from mtcontrib/homedecor_modpack
		
	Merge branch 'master' into 'master'
bugfix wardrobe save/restore skins for skinsdb See merge request VanessaE/homedecor_modpack!2
This commit is contained in:
		| @@ -45,17 +45,16 @@ function homedecor.get_player_skin(player) | ||||
| end | ||||
|  | ||||
| function homedecor.set_player_skin(player, skin, save) | ||||
| 	skin = skin or default_skin | ||||
| 	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 | ||||
| 		armor.textures[player:get_player_name()].skin = skin | ||||
| 		armor.textures[player:get_player_name()].skin = skin or default_skin | ||||
| 		armor:update_player_visuals(player) | ||||
| 	else | ||||
| 		set_player_textures(player, { skin }) | ||||
| 		set_player_textures(player, { skin or default_skin}) | ||||
| 	end | ||||
|  | ||||
| 	if save then | ||||
| 	if save and not skinsdb_mod_path then | ||||
| 		if skin == default_skin then | ||||
| 			skin = "default" | ||||
| 			player:set_attribute("homedecor:player_skin", "") | ||||
| @@ -133,6 +132,7 @@ homedecor.register("wardrobe", { | ||||
| minetest.register_alias("homedecor:wardrobe_bottom", "homedecor:wardrobe") | ||||
| minetest.register_alias("homedecor:wardrobe_top", "air") | ||||
|  | ||||
| if not skinsdb_mod_path then -- If not managed by skinsdb | ||||
| 	minetest.register_on_joinplayer(function(player) | ||||
| 		local skin = player:get_attribute("homedecor:player_skin") | ||||
|  | ||||
| @@ -143,3 +143,4 @@ minetest.register_on_joinplayer(function(player) | ||||
| 			end, player, skin) | ||||
| 		end | ||||
| 	end) | ||||
| end | ||||
|   | ||||
		Reference in New Issue
	
	Block a user