From b74deeca509043b88ccd088a0c214cbae8b5c775 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Mon, 14 Mar 2022 05:45:48 -0500
Subject: [PATCH] Fix for IV skin change

---
 scripts/client/skin-select.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/scripts/client/skin-select.js b/scripts/client/skin-select.js
index 13af8975..abd8cc52 100644
--- a/scripts/client/skin-select.js
+++ b/scripts/client/skin-select.js
@@ -54,7 +54,7 @@ function processSkinSelectKeyPress(keyCode) {
             logToConsole(LOG_DEBUG, `Switching to skin ${allowedSkins[skinSelectorIndex][1]} (Index: ${skinSelectorIndex}, Skin: ${allowedSkins[skinSelectorIndex][0]})`);
             skinSelectMessageTextTop = allowedSkins[skinSelectorIndex][1];
             if(getGame() == VRR_GAME_GTA_IV) {
-                let skinId = allowedSkins[skinSelectorIndex][1];
+                let skinId = allowedSkins[skinSelectorIndex][0];
                 if(natives.isModelInCdimage(skinId)) {
                     natives.requestModel(skinId);
                     natives.loadAllObjectsNow();
@@ -74,7 +74,7 @@ function processSkinSelectKeyPress(keyCode) {
             logToConsole(LOG_DEBUG, `Switching to skin ${allowedSkins[skinSelectorIndex][1]} (Index: ${skinSelectorIndex}, Skin: ${allowedSkins[skinSelectorIndex][0]})`);
             skinSelectMessageTextTop = allowedSkins[skinSelectorIndex][1];
             if(getGame() == VRR_GAME_GTA_IV) {
-                let skinId = allowedSkins[skinSelectorIndex][1];
+                let skinId = allowedSkins[skinSelectorIndex][0];
                 if(natives.isModelInCdimage(skinId)) {
                     natives.requestModel(skinId);
                     natives.loadAllObjectsNow();
@@ -132,8 +132,14 @@ function toggleSkinSelect(state) {
         }
 
         if(getGame() == VRR_GAME_GTA_IV) {
-            //natives.changePlayerModel(natives.getPlayerId(), allowedSkins[skinSelectorIndex][0]);
-            localPlayer.skin = allowedSkins[skinSelectorIndex][0];
+            let skinId = allowedSkins[skinSelectorIndex][0];
+            if(natives.isModelInCdimage(skinId)) {
+                natives.requestModel(skinId);
+                natives.loadAllObjectsNow();
+                if(natives.hasModelLoaded(skinId)) {
+                    natives.changePlayerModel(natives.getPlayerId(), skinId);
+                }
+            }
         } else {
             localPlayer.skin = allowedSkins[skinSelectorIndex][0];
         }