mirror of
https://github.com/PHIDIAS0303/ExpCluster.git
synced 2025-12-30 20:41:41 +09:00
Merge branch 'core'
This commit is contained in:
@@ -43,16 +43,16 @@ function ExpLib.server_print(player_message,player_name,player_tag,player_colour
|
|||||||
if not player_message then return 'No Message Found' end
|
if not player_message then return 'No Message Found' end
|
||||||
local player = game.player or game.players[player_name]
|
local player = game.player or game.players[player_name]
|
||||||
local tag = player_tag and player_tag ~= '' and ' '..player_tag or ''
|
local tag = player_tag and player_tag ~= '' and ' '..player_tag or ''
|
||||||
local colour = player_colour or '#FFFFFF'
|
local colour = player_colour and player_colour ~= '' and player_colour or '#FFFFFF'
|
||||||
if player then
|
if player then
|
||||||
tag = ' '..player.tag
|
tag = ' '..player.tag
|
||||||
colour = player.color
|
colour = player.color
|
||||||
player_name = player.name
|
player_name = player.name
|
||||||
else
|
else
|
||||||
if defines.color[player_colour] then
|
if colour:find('#') then
|
||||||
colour = defines.color[player_colour]
|
|
||||||
else
|
|
||||||
colour = Color.from_hex(colour)
|
colour = Color.from_hex(colour)
|
||||||
|
else
|
||||||
|
colour = defines.color[player_colour]
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
game.print(player_name..tag..': '..player_message,colour)
|
game.print(player_name..tag..': '..player_message,colour)
|
||||||
|
|||||||
Reference in New Issue
Block a user