hamyack/GTA4RP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use proper string replaces

Browse Source
This commit is contained in:
Vortrex
2022-10-19 23:57:21 -05:00
parent 4185f3b17d
commit 74b766ee58
1 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/server/messaging.js
View File

@@ -41,21 +41,11 @@ function announceAdminAction(localeString, ...args) {
function messagePlayerNormal(client, messageText, colour = COLOUR_WHITE) {
if (client != null) {
if (client.console) {
logToConsole(LOG_INFO, `${messageText}`);
logToConsole(LOG_INFO, `${removeColoursInMessage(messageText)}`);
return false;
}
}
//logToConsole(LOG_INFO, `${messageText}`);
//messageText = replaceColoursInMessage(messageText);
//if(client == null) {
// message(messageText, colour);
//} else {
// messageClient(messageText, client, colour);
//}
sendChatBoxMessageToPlayer(client, messageText, colour);
return true;
}
@@ -173,7 +163,7 @@ function messagePlayerDoAction(client, doingActionClient, messageText) {
// ===========================================================================
function messagePlayerMeAction(client, doingActionClient, messageText) {
messagePlayerNormal(client, `${getClientSubAccountName(doingActionClient)} ${messageText}`, getColourByType("meActionMessage"));
messagePlayerNormal(client, `${getCharacterFullName(doingActionClient)} ${messageText}`, getColourByType("meActionMessage"));
}
// ===========================================================================
@@ -185,7 +175,7 @@ function messagePlayerClanChat(client, clanChattingClient, messageText) {
// ===========================================================================
function messagePlayerAdminChat(client, adminChattingClient, messageText) {
messagePlayerNormal(client, `🛡️ [ADMIN CHAT] {ALTCOLOUR}${getPlayerData(adminChattingClient).accountData.staffTitle} [#CCCCCC]${getPlayerData(adminChattingClient).accountData.name}: {MAINCOLOUR}${messageText}`, getColourByType("orange"));
messagePlayerNormal(client, `🛡️ [ADMIN CHAT] {ALTCOLOUR}${getPlayerData(adminChattingClient).accountData.staffTitle} {lightGrey}${getPlayerData(adminChattingClient).accountData.name}: {MAINCOLOUR}${messageText}`, getColourByType("orange"));
}
// ===========================================================================