From c83c87c08041c09ebcdb7a1e3837d527132000ef Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Mon, 22 Mar 2021 03:12:26 -0500
Subject: [PATCH] Add skin select

---
 scripts/server/client.js | 38 ++++++++++++++++++++++++++++++++------
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/scripts/server/client.js b/scripts/server/client.js
index 71427dd9..e02d272d 100644
--- a/scripts/server/client.js
+++ b/scripts/server/client.js
@@ -65,6 +65,8 @@ function addAllNetworkHandlers() {
 
     addNetworkHandler("ag.player.position", updatePositionInPlayerData);
     addNetworkHandler("ag.player.heading", updateHeadingInPlayerData);
+
+    addNetworkHandler("ag.skinSelected", playerFinishedSkinSelection);
 }
 
 // ===========================================================================
@@ -667,18 +669,13 @@ function updateHeadingInPlayerData(client, heading) {
 
 function forcePlayerIntoSkinItemSelect(client, itemId) {
     getPlayerData(client).itemActionItem = itemId;
-    triggerNetworkEvent("ag.skinSelect", client);
+    triggerNetworkEvent("ag.skinSelect", client, true);
 }
 
 // ===========================================================================
 
 function playerSkinItemSelectComplete(client, skinId) {
     getPlayerCurrentSubAccount(client).skin = skinId;
-    if(!isPlayerWorking(client)) {
-        setPlayerSkin(client, skinId);
-    } else {
-        messagePlayerAlert(client, "Your new skin has been saved but won't be shown until you stop working.")
-    }
 }
 
 // ===========================================================================
@@ -801,4 +798,33 @@ function sendAllFuelStationBlips(client) {
 	}
 }
 
+// ===========================================================================
+
+function sendPlayerSetHealth(client, health) {
+    triggerNetworkEvent("ag.health", client, health);
+}
+
+
+// ===========================================================================
+
+function sendPlayerSetArmour(client, armour) {
+    triggerNetworkEvent("ag.armour", client, armour);
+}
+
+// ===========================================================================
+
+function playerFinishedSkinSelection(client, allowedSkinIndex) {
+    if(allowedSkinIndex == -1) {
+        return false;
+    } else {
+        getPlayerCurrentSubAccount(client).skin = getGameData().allowedSkins[getServerGame()][allowedSkinIndex][0];
+        if(isPlayerWorking(client)) {
+            messagePlayerAlert(client, "Your new skin has been saved but won't be shown until you stop working.");
+            setPlayerSkin(client, getJobData(getPlayerCurrentSubAccount(client).job).uniforms[getPlayerData(client).jobUniform].skinId);
+        }
+        deleteItem(getPlayerData(client).itemActionItem);
+    }
+    triggerNetworkEvent("ag.skinSelect", client, false);
+}
+
 // ===========================================================================
\ No newline at end of file