From 87af6e0c68a4e750eb66138adb833004cb753a0c Mon Sep 17 00:00:00 2001
From: stujones11 <stujones111@gmail.com>
Date: Sun, 8 Mar 2015 15:21:37 +0000
Subject: [PATCH] Fix missing preview image when using simple_skins mod

---
 3d_armor/armor.lua | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/3d_armor/armor.lua b/3d_armor/armor.lua
index 83b3935..1083837 100644
--- a/3d_armor/armor.lua
+++ b/3d_armor/armor.lua
@@ -124,7 +124,7 @@ armor.set_player_armor = function(self, player)
 	local textures = {}
 	local physics_o = {speed=1,gravity=1,jump=1}
 	local material = {type=nil, count=1}
-	local preview = armor:get_player_skin(name).."_preview.png"
+	local preview = armor:get_preview(name) or "character_preview.png"
 	for _,v in ipairs(self.elements) do
 		elements[v] = false
 	end
@@ -257,7 +257,7 @@ end
 
 armor.get_player_skin = function(self, name)
 	local skin = nil
-	if skin_mod == "skins" then
+	if skin_mod == "skins" or skin_mod == "simple_skins" then
 		skin = skins.skins[name]
 	elseif skin_mod == "u_skins" then
 		skin = u_skins.u_skins[name]
@@ -265,6 +265,12 @@ armor.get_player_skin = function(self, name)
 	return skin or armor.default_skin
 end
 
+armor.get_preview = function(self, name)
+	if skin_mod == "skins" or skin_mod == "u_skins" then
+		return armor:get_player_skin(name).."_preview.png"
+	end
+end
+
 armor.get_armor_formspec = function(self, name)
 	if not name then
 		minetest.log("error", "3d_armor: Player name is nil [get_armor_formspec]")
@@ -424,7 +430,7 @@ minetest.register_on_joinplayer(function(player)
 			armor.textures[name].skin = skin..".png"
 		end
 	elseif minetest.get_modpath("simple_skins") then
-		skin_mod = "skins"
+		skin_mod = "simple_skins"
 		local skin = skins.skins[name]
 		if skin then
 		    armor.textures[name].skin = skin..".png"