From a04d145327475b8649a89de2b135dcfacddcde63 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Thu, 6 Jan 2022 13:35:40 -0600
Subject: [PATCH] Update player nametags on spawn

---
 scripts/server/event.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/scripts/server/event.js b/scripts/server/event.js
index 611293ea..e74837f1 100644
--- a/scripts/server/event.js
+++ b/scripts/server/event.js
@@ -527,9 +527,6 @@ function onPlayerSpawn(client) {
         logToConsole(LOG_DEBUG, `[VRR.Event] Setting player armour for ${getPlayerDisplayForConsole(client)} to ${getPlayerCurrentSubAccount(client).armour}`);
         setPlayerArmour(client, getPlayerCurrentSubAccount(client).armour);
 
-        logToConsole(LOG_DEBUG, `[VRR.Event] Updating all player name tags`);
-        updateAllPlayerNameTags();
-
         logToConsole(LOG_DEBUG, `[VRR.Event] Sending ${getPlayerDisplayForConsole(client)}'s job type to their client (${getJobIndexFromDatabaseId(getPlayerCurrentSubAccount(client))})`);
         sendPlayerJobType(client, getPlayerCurrentSubAccount(client).job);
 
@@ -557,9 +554,6 @@ function onPlayerSpawn(client) {
         logToConsole(LOG_DEBUG, `[VRR.Event] Syncing ${getPlayerDisplayForConsole(client)}'s hotbar`);
         updatePlayerHotBar(client);
 
-        logToConsole(LOG_DEBUG, `[VRR.Event] Sending custom keybinds to ${getPlayerDisplayForConsole(client)}`);
-        sendAccountKeyBindsToClient(client);
-
         logToConsole(LOG_DEBUG, `[VRR.Event] Setting ${getPlayerDisplayForConsole(client)}'s switchchar state to false`);
         getPlayerData(client).switchingCharacter = false;
 
@@ -601,6 +595,9 @@ function onPlayerSpawn(client) {
         logToConsole(LOG_DEBUG, `[VRR.Event] Syncing ${getPlayerDisplayForConsole(client)}'s cash ${getPlayerCurrentSubAccount(client).cash}`);
         updatePlayerCash(client);
 
+        logToConsole(LOG_DEBUG, `[VRR.Event] Updating all player name tags`);
+        updateAllPlayerNameTags();
+
         getPlayerData(client).payDayTickStart = sdl.ticks;
     //}
 }