Luanti/minetest_game
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge upstream 🐱

Browse source
This commit is contained in:
Milan* 2017-01-13 09:12:24 +01:00
commit 996b93e80e
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
mods/playerskins/init.lua
View file

@ -29,7 +29,8 @@ minetest.register_on_joinplayer(function(player)
-- apply player texture -- apply player texture
minetest.after(1, function() minetest.after(1, function()
if minetest.get_modpath("3d_armor") then if minetest.get_modpath("3d_armor") then
minetest.after(1, function(player) -- FIXME: after function is a placeholder to validate function
minetest.after(0, function(player)
if not player then if not player then
return return
end end

2
mods/wardrobe

@ -1 +1 @@
Subproject commit 71135fc29026647be78daa9d8f554793771d4fe6 Subproject commit 2d50e4a1d0a8b471acbf110846bb6e187ea126b8