From a65809c5ad2c2d82d1afabb3e8fb2416d472d38f Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Tue, 16 Nov 2021 02:03:33 -0600
Subject: [PATCH] Fix for invalid str and colour reset in util

---
 scripts/server/colour.js | 8 ++++++++
 1 file changed, 8 insertions(+)

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