From 43f3269ee385f298f3c22958b45887b237492e6f Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Mon, 25 Oct 2021 13:05:43 -0500
Subject: [PATCH] Fix wrong accent being used for chats

---
 scripts/server/messaging.js | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/scripts/server/messaging.js b/scripts/server/messaging.js
index b26e5b8f..2ee25cdf 100644
--- a/scripts/server/messaging.js
+++ b/scripts/server/messaging.js
@@ -36,16 +36,13 @@ function messagePlayerNormal(client, messageText, colour = COLOUR_WHITE) {
 // ===========================================================================
 
 function messageAdmins(messageText, colour = COLOUR_WHITE) {
-     let plainMessage = removeColoursInMessage(messageText);
+    let plainMessage = removeColoursInMessage(messageText);
+    console.warn(`🛡️ ${plainMessage}`);
 
     let clients = getClients();
     for(let i in clients) {
-        if(isConsole(clients[i])) {
-            logToConsole(LOG_INFO, `[VRR.Messaging] ADMINS: ${plainMessage}`);
-        } else {
-            if(doesPlayerHaveStaffPermission(clients[i], getStaffFlagValue("basicModeration"))) {
-                messagePlayerNormal(clients[i], `🛡️ ${messageText}`, getColourByName("softRed"));
-            }
+        if(doesPlayerHaveStaffPermission(clients[i], getStaffFlagValue("basicModeration"))) {
+            messagePlayerNormal(clients[i], `🛡️ ${messageText}`, getColourByName("softRed"));
         }
     }
 
@@ -147,19 +144,19 @@ function messagePlayerTip(client, messageText) {
 // ===========================================================================
 
 function messagePlayerTalk(client, talkingClient, messageText) {
-    messagePlayerNormal(client, `🗣️ ${getPlayerAccentInlineOutput(client)}${getClientSubAccountName(talkingClient)} says: ${messageText}`, getColourByType("talkMessage"));
+    messagePlayerNormal(client, `🗣️ ${getPlayerAccentInlineOutput(talkingClient)}${getClientSubAccountName(talkingClient)} says: ${messageText}`, getColourByType("talkMessage"));
 }
 
 // ===========================================================================
 
 function messagePlayerWhisper(client, whisperingClient, messageText) {
-    messagePlayerNormal(client, `🤫 ${getPlayerAccentInlineOutput(client)}${getClientSubAccountName(whisperingClient)} whispers: ${messageText}`, getColourByType("whisperMessage"));
+    messagePlayerNormal(client, `🤫 ${getPlayerAccentInlineOutput(whisperingClient)}${getClientSubAccountName(whisperingClient)} whispers: ${messageText}`, getColourByType("whisperMessage"));
 }
 
 // ===========================================================================
 
 function messagePlayerShout(client, shoutingClient, messageText) {
-    messagePlayerNormal(client, `🗣️ ${getPlayerAccentInlineOutput(client)}${getClientSubAccountName(shoutingClient)} shouts: ${messageText}!`, getColourByType("shoutMessage"));
+    messagePlayerNormal(client, `🗣️ ${getPlayerAccentInlineOutput(shoutingClient)}${getClientSubAccountName(shoutingClient)} shouts: ${messageText}!`, getColourByType("shoutMessage"));
 }
 
 // ===========================================================================