Fix 3D armour bug

1 files changed, 6 insertions, 1 deletions

diff --git a/init.lua b/init.lua
index c9cbfca..e573f5c 100644
--- a/init.lua
+++ b/init.lua
@@ -35,7 +35,12 @@ local function get_player_skin(player)
 	elseif skin_mod == "wardrobe" and wardrobe.playerSkins and wardrobe.playerSkins[name] then
 		return wardrobe.playerSkins[name]..armor_tex
 	end
-	return player:get_properties().textures[1]..armor_tex
+	local skin = player:get_properties().textures[1]
+	-- If we just have 3d_armor enabled make sure we get the player skin properly
+	if minetest.global_exists("armor") then
+		skin = armor:get_player_skin(name)
+	end
+	return skin..armor_tex
 end
 
 -- Keep track of attached players (for leaveplayer)