Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 into commands-refactoring-1
This commit is contained in:
commit
1f1f9f54a2
|
@ -409,9 +409,8 @@ end
|
||||||
function mcl_util.get_color(colorstr)
|
function mcl_util.get_color(colorstr)
|
||||||
local mc_color = mcl_colors[colorstr:upper()]
|
local mc_color = mcl_colors[colorstr:upper()]
|
||||||
if mc_color then
|
if mc_color then
|
||||||
return mc_color
|
colorstr = mc_color
|
||||||
end
|
elseif #colorstr ~= 7 or colorstr:sub(1, 1) ~= "#"then
|
||||||
if #colorstr ~= 7 or colorstr:sub(1, 1) ~= "#"then
|
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
local hex = tonumber(colorstr:sub(2, 7), 16)
|
local hex = tonumber(colorstr:sub(2, 7), 16)
|
||||||
|
|
Loading…
Reference in New Issue