Fix for invalid str and colour reset in util

This commit is contained in:
Vortrex
2021-11-16 02:03:33 -06:00
parent ef18c9ded0
commit a65809c5ad

View File

@@ -26,6 +26,8 @@ let serverColours = {
clanOrange: "FF9900", clanOrange: "FF9900",
vehiclePurple: "960096", vehiclePurple: "960096",
jobYellow: "FFFF00", jobYellow: "FFFF00",
ALTCOLOUR: "C8C8C8",
MAINCOLOUR: "FFFFFF",
}, },
byName: { byName: {
white: "FFFFFF", white: "FFFFFF",
@@ -299,6 +301,12 @@ function hexFromToColour(colour) {
// =========================================================================== // ===========================================================================
function replaceColoursInMessage(messageText) { function replaceColoursInMessage(messageText) {
if(messageText == null) {
return "";
}
messageText = messageText.replace("{RESETCOLOUR}", "[/#]");
for(let i in getServerColours().hex.byName) { for(let i in getServerColours().hex.byName) {
let find = `{${i}}`; let find = `{${i}}`;
let re = new RegExp(find, 'g'); let re = new RegExp(find, 'g');