From 1e7e41c73e2a13f114cf9bc56d264f67d8be8544 Mon Sep 17 00:00:00 2001 From: Jean-Patrick Guerrero Date: Sat, 2 Jan 2021 12:22:00 +0100 Subject: [PATCH] Fix bug --- init.lua | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/init.lua b/init.lua index 8ac26a5..d077f4a 100644 --- a/init.lua +++ b/init.lua @@ -263,6 +263,10 @@ local function msg(name, str) return chat_send(name, sprintf("[craftguide] %s", str)) end +local function is_num(x) + return type(x) == "number" +end + local function is_str(x) return type(x) == "string" end @@ -1436,15 +1440,18 @@ local function get_model_fs(fs, data, def, model_alias) local _name if v.color then - local hex = sprintf("%02x", v.color) + if is_num(v.color) then + local hex = sprintf("%02x", v.color) - while #hex < 8 do - hex = "0" .. hex + while #hex < 8 do + hex = "0" .. hex + end + + _name = sprintf("%s^[multiply:%s", v.name, + sprintf("#%s%s", sub(hex, 3), sub(hex, 1, 2))) + else + _name = sprintf("%s^[multiply:%s", v.name, v.color) end - - _name = sprintf("%s^[multiply:%s", v.name, - sprintf("#%s%s", sub(hex, 3), sub(hex, 1, 2))) - elseif v.animation then _name = sprintf("%s^[verticalframe:%u:0", v.name, v.animation.aspect_h) end