From f14628f0961d4864604a15859146454854542eda Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Tue, 30 Nov 2021 21:53:11 -0600
Subject: [PATCH] Return player to old pos on cancel skin select

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

diff --git a/scripts/server/client.js b/scripts/server/client.js
index fba43c76..45f5b06b 100644
--- a/scripts/server/client.js
+++ b/scripts/server/client.js
@@ -863,7 +863,20 @@ function sendPlayerSetArmour(client, armour) {
 function playerFinishedSkinSelection(client, allowedSkinIndex) {
     triggerNetworkEvent("vrr.skinSelect", client, false);
     if(allowedSkinIndex == -1) {
+        messagePlayerAlert(client, "You canceled the skin change.");
         restorePlayerCamera(client);
+
+        if(getPlayerData(client).returnToPosition != null && getPlayerData(client).returnToType == VRR_RETURNTO_TYPE_SKINSELECT) {
+            setPlayerPosition(client, getPlayerData(client).returnToPosition);
+            setPlayerHeading(client, getPlayerData(client).returnToHeading);
+            setPlayerInterior(client, getPlayerData(client).returnToInterior);
+            setPlayerDimension(client, getPlayerData(client).returnToDimension);
+
+            getPlayerData(client).returnToPosition = null;
+            getPlayerData(client).returnToHeading = null;
+            getPlayerData(client).returnToInterior = null;
+            getPlayerData(client).returnToDimension = null;
+        }
         return false;
     } else {
         getPlayerCurrentSubAccount(client).skin = getSkinIndexFromModel(allowedSkins[allowedSkinIndex][0]);
@@ -874,7 +887,7 @@ function playerFinishedSkinSelection(client, allowedSkinIndex) {
             setPlayerSkin(client, getPlayerCurrentSubAccount(client).skin);
         }
 
-        if(getPlayerData(client).returnToPosition != null) {
+        if(getPlayerData(client).returnToPosition != null && getPlayerData(client).returnToType == VRR_RETURNTO_TYPE_SKINSELECT) {
             setPlayerPosition(client, getPlayerData(client).returnToPosition);
             setPlayerHeading(client, getPlayerData(client).returnToHeading);
             setPlayerInterior(client, getPlayerData(client).returnToInterior);