hamyack/GTA4RP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Return player to old pos on cancel skin select

Browse Source
This commit is contained in:
Vortrex
2021-11-30 21:53:11 -06:00
parent 966646cf98
commit f14628f096
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/server/client.js
View File

@@ -863,7 +863,20 @@ function sendPlayerSetArmour(client, armour) {
function playerFinishedSkinSelection(client, allowedSkinIndex) { function playerFinishedSkinSelection(client, allowedSkinIndex) {
triggerNetworkEvent("vrr.skinSelect", client, false); triggerNetworkEvent("vrr.skinSelect", client, false);
if(allowedSkinIndex == -1) { if(allowedSkinIndex == -1) {
messagePlayerAlert(client, "You canceled the skin change.");
restorePlayerCamera(client); 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; return false;
} else { } else {
getPlayerCurrentSubAccount(client).skin = getSkinIndexFromModel(allowedSkins[allowedSkinIndex][0]); getPlayerCurrentSubAccount(client).skin = getSkinIndexFromModel(allowedSkins[allowedSkinIndex][0]);
@@ -874,7 +887,7 @@ function playerFinishedSkinSelection(client, allowedSkinIndex) {
setPlayerSkin(client, getPlayerCurrentSubAccount(client).skin); 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); setPlayerPosition(client, getPlayerData(client).returnToPosition);
setPlayerHeading(client, getPlayerData(client).returnToHeading); setPlayerHeading(client, getPlayerData(client).returnToHeading);
setPlayerInterior(client, getPlayerData(client).returnToInterior); setPlayerInterior(client, getPlayerData(client).returnToInterior);