From 107ff57b734c1f125c1ce9295ed7961d9f607f1a Mon Sep 17 00:00:00 2001
From: Milan* <tchncs@vivaldi.net>
Date: Fri, 13 Jan 2017 09:11:52 +0100
Subject: [PATCH] make it compatible with 3d_armor

---
 mods/playerskins/depends.txt |  4 +++-
 mods/playerskins/init.lua    | 23 +++++++++++++++++------
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/mods/playerskins/depends.txt b/mods/playerskins/depends.txt
index 331d858c..b9c14495 100644
--- a/mods/playerskins/depends.txt
+++ b/mods/playerskins/depends.txt
@@ -1 +1,3 @@
-default
\ No newline at end of file
+default
+character_creator?
+3d_armor?
diff --git a/mods/playerskins/init.lua b/mods/playerskins/init.lua
index 0134a2f8..b1cb52e9 100644
--- a/mods/playerskins/init.lua
+++ b/mods/playerskins/init.lua
@@ -2,7 +2,7 @@
 -- 
 -- this is a kind of pre-version of the Illuna skinmod.
 -- it is supposed to work together with a skinserver later.
--- since it is very basic and kindly rewritten by tenplus1,
+-- since it is very basic and the base kindly rewritten by tenplus1,
 -- i didn't yet decide about any license and so on.
 
 -- get mod textures path
@@ -13,7 +13,7 @@ minetest.register_on_joinplayer(function(player)
  
     -- get player name from player object
     local name = player:get_player_name()
- 
+
     -- make name lower case and add .png extension
     name = name:lower() .. ".png"
  
@@ -25,12 +25,23 @@ minetest.register_on_joinplayer(function(player)
     if f then
         skin = name -- set new skin name
         f:close() -- close file
- 
+
         -- apply player texture
         minetest.after(1, function()
-            player:set_properties({
+            if minetest.get_modpath("3d_armor") then
+               minetest.after(1, function(player)
+                    if not player then
+                        return
+                    end
+                    local name = player:get_player_name()
+                    armor.textures[player:get_player_name()].skin = skin
+                    armor:set_player_armor(player)
+                end, player)
+               else
+                player:set_properties({
                 textures = {skin},
             })
-        end)
+        end
+    end)
     end
-end)
+end)