From 513cac7f153f31b11cfc09f387ddde6e8f6add27 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Fri, 15 Oct 2021 22:37:53 -0500
Subject: [PATCH] Close skin select before processing change

---
 scripts/server/client.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/server/client.js b/scripts/server/client.js
index a5dde3dc..2cc851ca 100644
--- a/scripts/server/client.js
+++ b/scripts/server/client.js
@@ -713,6 +713,7 @@ function forcePlayerIntoSkinSelect(client) {
         getPlayerData(client).returnToHeading = getPlayerHeading(client);
         getPlayerData(client).returnToInterior = getPlayerInterior(client);
         getPlayerData(client).returnToDimension = getPlayerDimension(client);
+        getPlayerData(client).returnToType = VRR_RETURNTO_TYPE_SKINSELECT;
 
         setPlayerPosition(client, getGameConfig().skinChangePosition[getServerGame()][0]);
         setPlayerHeading(client, getGameConfig().skinChangePosition[getServerGame()][1]);
@@ -859,6 +860,7 @@ function sendPlayerSetArmour(client, armour) {
 // ===========================================================================
 
 function playerFinishedSkinSelection(client, allowedSkinIndex) {
+    triggerNetworkEvent("vrr.skinSelect", client, false);
     if(allowedSkinIndex == -1) {
         restorePlayerCamera(client);
         return false;
@@ -891,7 +893,6 @@ function playerFinishedSkinSelection(client, allowedSkinIndex) {
 
         meActionToNearbyPlayers(client, `changes their skin to ${allowedSkins[getServerGame()][allowedSkinIndex][1]}`);
     }
-    triggerNetworkEvent("vrr.skinSelect", client, false);
 }
 
 // ===========================================================================